Merge branch 'master_chujiang_0731' into master_quotation

@@ -2,6 +2,7 @@ package com.lframework.xingyun.sc.controller.shipments.car;
 
 
 import cn.hutool.core.io.resource.ClassPathResource;
 import cn.hutool.core.io.resource.ClassPathResource;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
@@ -13,6 +14,8 @@ import com.lframework.xingyun.sc.entity.CarRequestPlan;
 import com.lframework.xingyun.sc.entity.RequestCarTicket;
 import com.lframework.xingyun.sc.entity.RequestCarTicket;
 import com.lframework.xingyun.sc.service.shipments.car.CarRequestPlanService;
 import com.lframework.xingyun.sc.service.shipments.car.CarRequestPlanService;
 import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
+import com.lframework.starter.web.inner.service.system.SysRoleService;
+import com.lframework.starter.web.inner.entity.SysRole;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateCarRequestPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateCarRequestPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryCarRequestPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryCarRequestPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
@@ -62,6 +65,8 @@ public class CarRequestPlanController extends DefaultBaseController {
     private CarRequestPlanService carRequestPlanService;
     private CarRequestPlanService carRequestPlanService;
     @Autowired
     @Autowired
     private RequestCarTicketService requestCarTicketService;
     private RequestCarTicketService requestCarTicketService;
+    @Autowired
+    private SysRoleService sysRoleService;
 
 
     /**
     /**
      * 查询列表
      * 查询列表
@@ -71,6 +76,9 @@ public class CarRequestPlanController extends DefaultBaseController {
     @GetMapping("/query")
     @GetMapping("/query")
     public InvokeResult<PageResult<GetCarRequestPlanBo>> query(@Valid QueryCarRequestPlanVo vo) {
     public InvokeResult<PageResult<GetCarRequestPlanBo>> query(@Valid QueryCarRequestPlanVo vo) {
 
 
+        // wlgs角色只能查看要车单运作科审核人已填写的数据
+        applyWlgsRoleFilter(vo);
+
         PageResult<CarRequestPlan> pageResult = carRequestPlanService.query(getPageIndex(vo), getPageSize(vo), vo);
         PageResult<CarRequestPlan> pageResult = carRequestPlanService.query(getPageIndex(vo), getPageSize(vo), vo);
 
 
         List<CarRequestPlan> datas = pageResult.getDatas();
         List<CarRequestPlan> datas = pageResult.getDatas();
@@ -338,4 +346,19 @@ public class CarRequestPlanController extends DefaultBaseController {
 
 
         return result;
         return result;
     }
     }
+
+    /**
+     * wlgs角色只能查看要车单运作科审核人已填写的数据
+     */
+    private void applyWlgsRoleFilter(QueryCarRequestPlanVo vo) {
+        String currentUserId = SecurityUtil.getCurrentUser().getId();
+        List<SysRole> roles = sysRoleService.getByUserId(currentUserId);
+        if (CollectionUtil.isEmpty(roles)) {
+            return;
+        }
+        List<String> roleCodes = roles.stream().map(SysRole::getCode).collect(Collectors.toList());
+        if (roleCodes.contains("wlgs")) {
+            vo.setOperationsDepartmentAuditorNotNull(true);
+        }
+    }
 }
 }

@@ -44,7 +44,7 @@ public class RequestCarTicketController extends DefaultBaseController {
      * 查询列表
      * 查询列表
      */
      */
     @ApiOperation("查询列表")
     @ApiOperation("查询列表")
-    @HasPermission({"shipping-plan-manage:car-request-order:query"})
+    @HasPermission({"shipping-plan-manage:car-request-order:query", "shipping-plan-manage:car-request-plan:query"})
     @GetMapping("/query")
     @GetMapping("/query")
     public InvokeResult<PageResult<GetRequestCarTicketBo>> query(@Valid QueryRequestCarTicketVo vo) {
     public InvokeResult<PageResult<GetRequestCarTicketBo>> query(@Valid QueryRequestCarTicketVo vo) {
 
 

@@ -31,5 +31,10 @@ public class QueryCarRequestPlanVo extends PageVo implements BaseVo, Serializabl
     @ApiModelProperty("装货厂别")
     @ApiModelProperty("装货厂别")
     private String workshopId;
     private String workshopId;
 
 
+    /**
+     * 是否只查运作科审核人已填写的数据（wlgs角色专用）
+     */
+    @ApiModelProperty("是否只查运作科审核人已填写的数据")
+    private Boolean operationsDepartmentAuditorNotNull;
 
 
 }
 }

@@ -59,4 +59,10 @@ public class QueryShipmentDetailStatisticsVo extends PageVo implements BaseVo, S
 
 
     @ApiModelProperty("订货日期")
     @ApiModelProperty("订货日期")
     private String orderDateEnd;
     private String orderDateEnd;
+
+    @ApiModelProperty("发货日期")
+    private String shipmentDateStart;
+
+    @ApiModelProperty("发货日期")
+    private String shipmentDateEnd;
 }
 }

@@ -47,6 +47,14 @@
             <if test="vo.workshopId != null and vo.workshopId != ''">
             <if test="vo.workshopId != null and vo.workshopId != ''">
                 AND tb.workshop_id = #{vo.workshopId}
                 AND tb.workshop_id = #{vo.workshopId}
             </if>
             </if>
+            <if test="vo.operationsDepartmentAuditorNotNull != null and vo.operationsDepartmentAuditorNotNull == true">
+                AND EXISTS (
+                    SELECT 1 FROM request_car_ticket rct
+                    WHERE rct.plan_id = tb.id
+                    AND rct.operations_department_auditor IS NOT NULL
+                    AND rct.operations_department_auditor != ''
+                )
+            </if>
         </where>
         </where>
         ORDER BY tb.request_car_date DESC
         ORDER BY tb.request_car_date DESC
     </select>
     </select>

@@ -124,6 +124,14 @@
                AND tb.order_date <= #{vo.orderDateEnd}
                AND tb.order_date <= #{vo.orderDateEnd}
                 ]]>
                 ]]>
             </if>
             </if>
+            <if test="vo.shipmentDateStart != null">
+                AND tb.shipment_date >= #{vo.shipmentDateStart}
+            </if>
+            <if test="vo.shipmentDateEnd != null">
+                <![CDATA[
+               AND tb.shipment_date <= #{vo.shipmentDateEnd}
+                ]]>
+            </if>
         </where>
         </where>
         ORDER BY tb.shipment_date DESC
         ORDER BY tb.shipment_date DESC
     </select>
     </select>