打包分页模糊，工序权限修改

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java

@@ -40,7 +40,7 @@ public class ProductionProcessController {
 
     @GetMapping("/page")
     @Operation(summary = "查看生产工序分页")
-    @PreAuthorize("@ss.hasPermission('manage:process:query')")
+    @PreAuthorize("@ss.hasPermission('product:process:query')")
     public CommonResult<PageResult<ProcessRespVO>> getUserPage(@Valid ProcessPageReqVO pageReqVO) {
 
         return success(productionProcessService.getProcessPage(pageReqVO));
@@ -53,7 +53,7 @@ public class ProductionProcessController {
 
     @PutMapping("/update")
     @Operation(summary = "修改生产工序明细和步骤表的状态")
-    @PreAuthorize("@ss.hasPermission('manage:process:update')")
+    @PreAuthorize("@ss.hasPermission('product:process:work')")
     public  CommonResult<Boolean> updateProcessStatus(@Valid @RequestBody OrderProcessStepItemVO reqVo){
         productionProcessService.updateProcessStatus(reqVo);
         return success(true);
@@ -64,7 +64,7 @@ public class ProductionProcessController {
 
     @GetMapping("/selectPlate")
     @Operation(summary = "查看当前生产单的工序对应的板件信息")
-    @PreAuthorize("@ss.hasPermission('manage:process:view')")
+    @PreAuthorize("@ss.hasPermission('product:process:view')")
     public CommonResult<OrderPlateReqVO>  selectPlate(@Valid ProcessPlateReqVO reqVO){
         return success(productionProcessService.selectPlate(reqVO));
     }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.java

@@ -44,16 +44,16 @@ public interface ProductionStatusMapper extends BaseMapperX<OrderDO> {
     PrintOrderRespVO selectPrintOrder(@Param("orderNo") Long orderNo,@Param("organId")Long organId);
 
 
-    default List<OrderDO> selectPackPage(PackPageReqVO pageReqVO,Long organId) {
-        return selectList(new LambdaQueryWrapperX<OrderDO>()
-                .eq(OrderDO::getOrganId,organId)
-                .likeIfPresent(OrderDO::getId, String.valueOf(pageReqVO.getOrderId()))
-                .eqIfPresent(OrderDO::getCustomOrderNo, pageReqVO.getCustomOrderNo())
-                .likeIfPresent(OrderDO::getCustomer, pageReqVO.getCustomer())
-                .likeIfPresent(OrderDO::getAddress, pageReqVO.getAddress())
-                .eqIfPresent(OrderDO::getStatus, pageReqVO.getStatus())
-                .orderByDesc(OrderDO::getCreateTime));
-    }
+//    default List<OrderDO> selectOrderIds(PackPageReqVO pageReqVO,Long organId) {
+//        return selectList(new LambdaQueryWrapperX<OrderDO>()
+//                .eq(OrderDO::getOrganId,organId)
+//                .eqIfPresent(OrderDO::getId, pageReqVO.getOrderId())
+//                .eqIfPresent(OrderDO::getCustomOrderNo, pageReqVO.getCustomOrderNo())
+//                .likeIfPresent(OrderDO::getCustomer, pageReqVO.getCustomer())
+//                .likeIfPresent(OrderDO::getAddress, pageReqVO.getAddress())
+//                .eqIfPresent(OrderDO::getStatus, pageReqVO.getStatus())
+//                .orderByDesc(OrderDO::getCreateTime));
+//    }
 
     IPage<PackRespVO> selectOrderPlate( @Param("page") IPage page, @Param("orderIds") List<Long> orderIds, @Param("organId")  Long organId);
 
@@ -64,4 +64,6 @@ public interface ProductionStatusMapper extends BaseMapperX<OrderDO> {
 
 
 
+    List<OrderDO> selectOrderIds(@Param("pageReqVO") PackPageReqVO pageReqVO,@Param("organId") Long organId);
+
 }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java

@@ -74,7 +74,7 @@ public class PackServiceImpl implements PackService {
         PageDTO<PackRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
 
         // 根据生产状态查询生产单号
-        List<Long> orderIds = productionStatusMapper.selectPackPage(pageReqVO,getUserOrganId()).stream().map(OrderDO::getId).collect(Collectors.toList());
+        List<Long> orderIds = productionStatusMapper.selectOrderIds(pageReqVO,getUserOrganId()).stream().map(m->m.getId()).collect(Collectors.toList());
 
         if(orderIds.isEmpty()){
             return null;

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml

@@ -57,7 +57,7 @@
     </resultMap>
 
     <select id="selectOrderPlate"
-            parameterType="java.util.List"
+            parameterType="java.lang.Long"
             resultMap="PackMap">
 
 
@@ -82,8 +82,11 @@
             o.organ_id = #{organId} and oi.plate_id != 0 and
             o.id in
                 <foreach item="id" collection="orderIds" open="(" separator="," close=")">
-                    #{id}
+                    <if test="id !=null">
+                        #{id}
+                    </if>
                 </foreach>
+
         group by orderNo,customOrderNo,dealer,createTime,deliveryDate,customer,phoneNumber,address,salesman,splitter,status
 
 
@@ -134,4 +137,40 @@
     </select>
 
 
+    <select id="selectOrderIds" resultType="com.cf.imes.module.manage.dal.dataobject.process.OrderDO" parameterType="map">
+
+
+        select * from orders
+        <where>
+
+            organ_id =#{organId}
+            and deleted = false
+
+            <if test="pageReqVO.orderId !=null">
+                and id like concat('%', #{pageReqVO.orderId},'%')
+            </if>
+
+            <if test="pageReqVO.status !=null">
+                and status = #{pageReqVO.status}
+            </if>
+
+            <if test="pageReqVO.customOrderNo !=null">
+                and custom_order_no like concat('%',#{pageReqVO.customOrderNo},'%')
+            </if>
+
+            <if test="pageReqVO.customer !=null">
+                and customer like concat('%', #{pageReqVO.customer},'%')
+            </if>
+
+            <if test="pageReqVO.address !=null">
+                and address like concat('%', #{pageReqVO.address},'%')
+            </if>
+
+        </where>
+
+
+
+    </select>
+
+
 </mapper>