为出入库添加申请人部门

src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@@ -2045,7 +2045,7 @@ public class PageController {
         recordP.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(recordP.getApplicantTime())));
         recordP.setDepartmentheadTime(DateUtil.TimeStampToDateTime(Long.valueOf(recordP.getDepartmentheadTime())));
         recordP.setDepositoryManagerName(depositoryManagerNames.toString());
-        recordP.setApplicantName(userByPort.getName());
+        recordP.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName());
         recordP.setDepartmentheadName(departmentHeadName.toString());
         recordP.setDepositoryName(depositoryName.toString());
         recordP.setQuantity(sumQuantity);
@@ -2193,7 +2193,7 @@ public class PageController {
             if (Integer.compare(flagForGroup, 2) != 0) {
                 // 如果不是组合
                 UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationInRecordPById.getApplicantId(), userKey, token);
-                applicationInRecordPById.setApplicantName(userByPort.getName());
+                applicationInRecordPById.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName());
                 applicationInRecordPById.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationInRecordPById.getApplicantTime())));
                 if (applicationInRecordPById.getPrice() != null) {
                     applicationInRecordPById.setPrice(applicationInRecordPById.getPrice() / 100);
@@ -3654,7 +3654,7 @@ public class PageController {
                 ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(minRecordId);
                 ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(applicationOutMinById.getParentId());
                 UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationOutRecordPById.getApplicantId(), userKey, token);
-                applicationOutRecordPById.setApplicantName(userByPort.getName());
+                applicationOutRecordPById.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName());
                 SimpleTaskP simpleTaskP = new SimpleTaskP(applicationOutRecordPById, applicationOutMinById);
                 list.add(simpleTaskP);
             }

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -473,6 +473,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 计算出库物料总数
+     *
      * @param state
      * @return
      */
@@ -5082,7 +5083,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             SimpleApplicationOutOrInRecordP d = new SimpleApplicationOutOrInRecordP(record);
             UserByPort userByPort = LinkInterfaceUtil.FindUserById(record.getApplicantId(), userKey, token);
             d.setApplyRemark(d.getApplyRemark() == null ? "" : d.getApplyRemark());
-            d.setApplicantName(userByPort.getName());
+            d.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName());
+
             result.add(d);
         }
         return result;
@@ -5094,7 +5096,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             SimpleApplicationOutOrInRecordP d = new SimpleApplicationOutOrInRecordP(record);
             UserByPort userByPort = LinkInterfaceUtil.FindUserById(record.getApplicantId(), userKey, token);
             d.setApplyRemark(d.getApplyRemark() == null ? "" : d.getApplyRemark());
-            d.setApplicantName(userByPort.getName());
+            d.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName());
             result.add(d);
         }
         return result;

src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java

@@ -43,27 +43,20 @@ public class StockTakingServiceImpl implements StockTakingService {
 
     @Autowired
     RedissonClient redissonClient;
-
-    @Autowired
-    private RedisPool redisPool;
-
     @Autowired
     MaterialMapper materialMapper;
-
     @Autowired
     DepositoryRecordService depositoryRecordService;
-
     @Autowired
     DepositoryRecordMapper depositoryRecordMapper;
-
     @Autowired
     QyWxOperationService qyWxOperationService;
-
     @Autowired
     SplitUnitMapper splitUnitMapper;
-
     @Autowired
     SplitUnitService splitUnitService;
+    @Autowired
+    private RedisPool redisPool;
 
     /**
      * 用于插入盘点记录主表
@@ -265,7 +258,7 @@ public class StockTakingServiceImpl implements StockTakingService {
             Depository depositoryRecordById = depositoryMapper.findDepositoryById(stockTaking.getDepositoryId());
             ssp.setDepositoryName(depositoryRecordById.getDname());
             UserByPort userByPort = LinkInterfaceUtil.FindUserById(stockTaking.getOriginator(), userKey, token);
-            ssp.setOriginatorName(userByPort.getName());
+            ssp.setOriginatorName(userByPort.getMaindeparmentname() + "_" + userByPort.getName());
             stockTakingPS.add(ssp);
         }
         return stockTakingPS;
@@ -1878,8 +1871,7 @@ public class StockTakingServiceImpl implements StockTakingService {
                     map.put("state", 1);
                 }
 
-            }
+            } else {
-            else {
                 map.put("departmentManagerState", 2);
                 map.put("completeTime", DateUtil.DateTimeToTimeStamp(simpleTime));
                 map.put("state", 2);
@@ -1890,8 +1882,7 @@ public class StockTakingServiceImpl implements StockTakingService {
             map.put("departmentManager", approver_user.getNumber());
             stockTakingMapper.updateStockTaking(map);
             return result;
-        }
+        } else {
-        else {
             // 如果当前盘点记录已经审核过
 
             // 不做任何处理