流程优化

hx-common/service-flow/src/main/java/com/fjhx/mapper/example/ExampleInfoMapper.java

@@ -19,6 +19,6 @@ import java.util.Map;
  */
 public interface ExampleInfoMapper extends BaseMapper<ExampleInfo> {
 
-    List<Map<String, Object>> getWaitingProcessingPage(@Param("page") Page<ExampleInfo> page, @Param("ew") QueryWrapper<Object> wrapper);
+    Page<Map<String, Object>> getWaitingProcessingPage(@Param("page") Page<ExampleInfo> page, @Param("ew") QueryWrapper<Object> wrapper);
 
 }

hx-common/service-flow/src/main/java/com/fjhx/service/example/ExampleInfoService.java

@@ -1,5 +1,6 @@
 package com.fjhx.service.example;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
 import com.fjhx.entity.example.ExampleInfo;
 
@@ -16,7 +17,7 @@ import java.util.Map;
  */
 public interface ExampleInfoService extends BaseService<ExampleInfo> {
 
-    List<Map<String, Object>> getWaitingProcessingPage(Map<String, String> condition);
+    Page<Map<String, Object>> getWaitingProcessingPage(Map<String, String> condition);
 
     List<Map<String, Object>> record(Long flowLinkNo);
 

hx-common/service-flow/src/main/java/com/fjhx/service/example/impl/ExampleInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.fjhx.service.example.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseEntity;
 import com.fjhx.constants.FlowConstant;
@@ -51,7 +52,7 @@ public class ExampleInfoServiceImpl extends ServiceImpl<ExampleInfoMapper, Examp
     private ProcessNodeButtonService processNodeButtonService;
 
     @Override
-    public List<Map<String, Object>> getWaitingProcessingPage(Map<String, String> condition) {
+    public Page<Map<String, Object>> getWaitingProcessingPage(Map<String, String> condition) {
 
         BladeUser user = AuthUtil.getUser();
         Assert.notEmpty(user, "没有找到用户信息");
@@ -83,7 +84,19 @@ public class ExampleInfoServiceImpl extends ServiceImpl<ExampleInfoMapper, Examp
                                 }))
                 );
 
-        return baseMapper.getWaitingProcessingPage(createPage(condition), wrapper);
+        Page<Map<String, Object>> waitingProcessingPage = baseMapper.getWaitingProcessingPage(createPage(condition), wrapper);
+
+        // 赋值创建人名称
+        List<Map<String, Object>> records = waitingProcessingPage.getRecords();
+
+        if (records.size() > 0) {
+            Map<Long, String> userNameMap = UserClientUtil.getUserNameMapFunctionLong(records, item -> (Long) item.get("createUser"));
+            for (Map<String, Object> record : records) {
+                record.put("userName", userNameMap.get((Long) record.get("createUser")));
+            }
+        }
+
+        return waitingProcessingPage;
     }
 
     @Override

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockBackPlanServiceImpl.java

@@ -140,7 +140,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
 
         // 转仓
         List<Map<String, Object>> transferPickingList = baseMapper.getTransferPickingList(Wrappers.query()
-                .ge("std.check_time", DateUtil.format(beginDate, "yyyy-MM-dd 7:30:00"))
+                .ge("st.check_time", DateUtil.format(beginDate, "yyyy-MM-dd 7:30:00"))
                 .eq("st.status", StatusConstant.YES)
         );
         pickingList.addAll(transferPickingList);
@@ -202,7 +202,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
 
         // 转仓
         List<Map<String, Object>> transferBackList = baseMapper.getTransferBackList(Wrappers.query()
-                .ge("std.check_time", DateUtil.format(beginDate, "yyyy-MM-dd 9:30:00"))
+                .ge("st.check_time", DateUtil.format(beginDate, "yyyy-MM-dd 9:30:00"))
                 .eq("st.status", StatusConstant.YES)
         );
         backList.addAll(transferBackList);
@@ -283,7 +283,6 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
         }
 
         stockBackPlanDetailsService.saveBatch(new ArrayList<>(stockBackPlanMap.values()));
-
     }
 
     private StockBackPlanDetails createStockBackPlanDetails(String jobNo, String materialName, Date planDate) {
@@ -337,7 +336,6 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
             BigDecimal quantity = stockBackPlan.getQuantity();
             stockBackPlan.setQuantity(quantity.add(plantotalsquare));
         }
-
     }
 
 }

hx-service/storage/src/main/java/com/fjhx/task/controller/ScheduleTaskController.java

@@ -64,5 +64,4 @@ public class ScheduleTaskController {
         stockBackPlanService.statisticsScheduleDateTask();
     }
 
-
 }