流程

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyBuyingMoreController.java

@@ -1,5 +1,7 @@
 package com.idea.oa.apply.controller;
 
+import com.idea.buildManage.mapper.ParkRoomExtendMapper;
+import com.idea.buildManage.response.ParkRoomResponse;
 import com.idea.oa.apply.model.inout.AddConfirmResult;
 import com.idea.oa.apply.model.inout.ApplyBuyingMoreDto;
 import com.idea.oa.apply.service.ApplyBuyingMoreService;
@@ -56,11 +58,13 @@ public class ApplyBuyingMoreController extends BaseController {
     private FrameUserService frameUserService;
     @Autowired
     private ParkWaitHandleService parkWaitHandleService;
+    @Autowired
+    private ParkRoomExtendMapper roomExtendMapper;
 
 
 
     /**
-     * 付款记录编号 : 付款领用单20240401-002
+     * 回购记录编号 : 回购领用单20240401-002
      *
      * @return
      */
@@ -138,7 +142,7 @@ public class ApplyBuyingMoreController extends BaseController {
 
 
     /**
-     * 发起付款申请流程
+     * 发起回购申请流程
      *
      * @param record
      * @return
@@ -193,19 +197,24 @@ public class ApplyBuyingMoreController extends BaseController {
 
         String id = UUIDUtils.middleUUID();
         {
+            ParkRoomResponse response = roomExtendMapper.getFullName(record.getHouseId());
+            String fullname = response.getGroupName() + "-" + response.getDiscName() + "-" + response.getBuildName() 
+                    + "-" + response.getRoomNo();
+            record.setHouseName(fullname);
+            record.setFlowNum(modelService.getMaxNum());
             record.setUpdatedAt(new Date());
             record.setCreatedAt(record.getUpdatedAt());
             record.setCreatedBy(ShiroUtils.getUser().getId());
             record.setUpdatedBy(record.getCreatedBy());
             record.setCreatedByDept(ShiroUtils.getUser().getDepartment());
-            record.setFlowNum(UUIDUtils.middleUUID());
+//            record.setFlowNum(UUIDUtils.middleUUID());
             record.setStatus(0);
             record.setId(id);
             modelService.insertWithoutId(record);
         }
 
         HashMap<String, Object> feeMoneyTotalMap = null;//new HashMap<>();
-        String applyTheme = "" + ShiroUtils.getUser().getTruename() + "的付款申请单";
+        String applyTheme = "" + ShiroUtils.getUser().getTruename() + "的回购申请单";
         AjaxResult ajaxResult = flowMainService.doFlowMain(applyTheme, record.getId(), addSystemRemark, record.getCcList(), ConstantFlowType.BUYING_MORE_PROCESSDEFINE, ConstantFlowType.BUYING_MORE_DEPLOYMENTID, feeMoneyTotalMap, ConstantFlowType.BUYING_MORE_NAME, ConstantFlowType.BUYING_MORE, ShiroUtils.getUser(), deptId, tagerUserId);
 
         modelService.startOaAndHandle(record.getId(), applyTheme);

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyCheckInController.java

@@ -1,5 +1,7 @@
 package com.idea.oa.apply.controller;
 
+import com.idea.buildManage.mapper.ParkRoomExtendMapper;
+import com.idea.buildManage.response.ParkRoomResponse;
 import com.idea.oa.apply.model.inout.AddConfirmResult;
 import com.idea.oa.apply.model.inout.ApplyCheckInDto;
 import com.idea.oa.apply.model.inout.ApplyPaymentSettleIn;
@@ -57,6 +59,8 @@ public class ApplyCheckInController extends BaseController {
     private FrameUserService frameUserService;
     @Autowired
     private ParkWaitHandleService parkWaitHandleService;
+    @Autowired
+    private ParkRoomExtendMapper roomExtendMapper;
 
 
 
@@ -189,6 +193,11 @@ public class ApplyCheckInController extends BaseController {
 
         String id = UUIDUtils.middleUUID();
         {
+            ParkRoomResponse response = roomExtendMapper.getFullName(record.getHouseId());
+            String fullname = response.getGroupName() + "-" + response.getDiscName() + "-" + response.getBuildName()
+                    + "-" + response.getRoomNo();
+            record.setHouseName(fullname);
+            record.setFlowNum(modelService.getMaxNum());
             record.setUpdatedAt(new Date());
             record.setCreatedAt(record.getUpdatedAt());
             record.setCreatedBy(ShiroUtils.getUser().getId());

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyContractController.java

@@ -1,5 +1,7 @@
 package com.idea.oa.apply.controller;
 
+import com.idea.buildManage.mapper.ParkRoomExtendMapper;
+import com.idea.buildManage.response.ParkRoomResponse;
 import com.idea.oa.apply.model.inout.AddConfirmResult;
 import com.idea.oa.apply.model.inout.ApplyContractDto;
 import com.idea.oa.apply.service.ApplyContractService;
@@ -56,7 +58,8 @@ public class ApplyContractController extends BaseController {
     private FrameUserService frameUserService;
     @Autowired
     private ParkWaitHandleService parkWaitHandleService;
-
+    @Autowired
+    private ParkRoomExtendMapper roomExtendMapper;
 
 
     /**
@@ -192,6 +195,11 @@ public class ApplyContractController extends BaseController {
 
         String id = UUIDUtils.middleUUID();
         {
+            ParkRoomResponse response = roomExtendMapper.getFullName(record.getHouseId());
+            String fullname = response.getGroupName() + "-" + response.getDiscName() + "-" + response.getBuildName()
+                    + "-" + response.getRoomNo();
+            record.setHouseName(fullname);
+            record.setFlowNum(modelService.getMaxNum());
             record.setUpdatedAt(new Date());
             record.setCreatedAt(record.getUpdatedAt());
             record.setCreatedBy(ShiroUtils.getUser().getId());

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyFinanceController.java

@@ -1,5 +1,7 @@
 package com.idea.oa.apply.controller;
 
+import com.idea.buildManage.mapper.ParkRoomExtendMapper;
+import com.idea.buildManage.response.ParkRoomResponse;
 import com.idea.oa.apply.model.ApplyFinance;
 import com.idea.oa.apply.model.inout.AddConfirmResult;
 import com.idea.oa.apply.model.inout.ApplyFinanceDto;
@@ -59,7 +61,8 @@ public class ApplyFinanceController extends BaseController {
     private FrameUserService frameUserService;
     @Autowired
     private ParkWaitHandleService parkWaitHandleService;
-
+    @Autowired
+    private ParkRoomExtendMapper roomExtendMapper;
 
 
     /**
@@ -196,6 +199,11 @@ public class ApplyFinanceController extends BaseController {
 
         String id = UUIDUtils.middleUUID();
         {
+            ParkRoomResponse response = roomExtendMapper.getFullName(record.getHouseId());
+            String fullname = response.getGroupName() + "-" + response.getDiscName() + "-" + response.getBuildName()
+                    + "-" + response.getRoomNo();
+            record.setHouseName(fullname);
+            record.setFlowNum(modelService.getMaxNum());
             record.setUpdatedAt(new Date());
             record.setCreatedAt(record.getUpdatedAt());
             record.setCreatedBy(ShiroUtils.getUser().getId());

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyInvoiceRedController.java

@@ -1,5 +1,7 @@
 package com.idea.oa.apply.controller;
 
+import com.idea.buildManage.mapper.ParkRoomExtendMapper;
+import com.idea.buildManage.response.ParkRoomResponse;
 import com.idea.oa.apply.model.inout.AddConfirmResult;
 import com.idea.oa.apply.model.inout.ApplyInvoiceRedDto;
 import com.idea.oa.apply.model.inout.ApplyInvoiceRedDto;
@@ -58,7 +60,8 @@ public class ApplyInvoiceRedController extends BaseController {
     private FrameUserService frameUserService;
     @Autowired
     private ParkWaitHandleService parkWaitHandleService;
-
+    @Autowired
+    private ParkRoomExtendMapper roomExtendMapper;
 
 
     /**
@@ -194,6 +197,11 @@ public class ApplyInvoiceRedController extends BaseController {
 
         String id = UUIDUtils.middleUUID();
         {
+            ParkRoomResponse response = roomExtendMapper.getFullName(record.getHouseId());
+            String fullname = response.getGroupName() + "-" + response.getDiscName() + "-" + response.getBuildName()
+                    + "-" + response.getRoomNo();
+            record.setHouseName(fullname);
+            record.setFlowNum(modelService.getMaxNum());
             record.setUpdatedAt(new Date());
             record.setCreatedAt(record.getUpdatedAt());
             record.setCreatedBy(ShiroUtils.getUser().getId());

pro-base/src/main/java/com/idea/oa/apply/controller/ApplyReceivablesAdjustController.java

@@ -1,5 +1,7 @@
 package com.idea.oa.apply.controller;
 
+import com.idea.buildManage.mapper.ParkRoomExtendMapper;
+import com.idea.buildManage.response.ParkRoomResponse;
 import com.idea.oa.apply.model.inout.AddConfirmResult;
 import com.idea.oa.apply.model.inout.ApplyReceivablesAdjustDto;
 import com.idea.oa.apply.model.inout.ApplyReceivablesAdjustDto;
@@ -58,6 +60,8 @@ public class ApplyReceivablesAdjustController extends BaseController {
     private FrameUserService frameUserService;
     @Autowired
     private ParkWaitHandleService parkWaitHandleService;
+    @Autowired
+    private ParkRoomExtendMapper roomExtendMapper;
 
 
 
@@ -194,6 +198,11 @@ public class ApplyReceivablesAdjustController extends BaseController {
 
         String id = UUIDUtils.middleUUID();
         {
+            ParkRoomResponse response = roomExtendMapper.getFullName(record.getHouseId());
+            String fullname = response.getGroupName() + "-" + response.getDiscName() + "-" + response.getBuildName()
+                    + "-" + response.getRoomNo();
+            record.setHouseName(fullname);
+            record.setFlowNum(modelService.getMaxNum());
             record.setUpdatedAt(new Date());
             record.setCreatedAt(record.getUpdatedAt());
             record.setCreatedBy(ShiroUtils.getUser().getId());

pro-base/src/main/java/com/idea/oa/apply/service/ApplyBuyingMoreService.java

@@ -143,7 +143,7 @@ public class ApplyBuyingMoreService implements BaseService<ApplyBuyingMore, Appl
 
         String flowNum = "";
         String maxNum = applyBuyingMoreExtendMapper.selectMaxNum();
-        if(StringUtils.isNotEmpty(maxNum)){
+        if(StringUtils.isEmpty(maxNum)){
             maxNum = "0001";
         }else {
             maxNum.substring(10);

pro-base/src/main/java/com/idea/oa/apply/service/ApplyCheckInService.java

@@ -144,7 +144,7 @@ public class ApplyCheckInService implements BaseService<ApplyCheckIn, ApplyCheck
 
         String flowNum = "";
         String maxNum = applyCheckInExtendMapper.selectMaxNum();
-        if(StringUtils.isNotEmpty(maxNum)){
+        if(StringUtils.isEmpty(maxNum)){
             maxNum = "0001";
         }else {
             maxNum.substring(10);

pro-base/src/main/java/com/idea/oa/apply/service/ApplyContractService.java

@@ -140,7 +140,7 @@ public class ApplyContractService implements BaseService<ApplyContract, ApplyCon
 
         String flowNum = "";
         String maxNum = applyContractExtendMapper.selectMaxNum();
-        if(StringUtils.isNotEmpty(maxNum)){
+        if(StringUtils.isEmpty(maxNum)){
             maxNum = "0001";
         }else {
             maxNum.substring(10);

pro-base/src/main/java/com/idea/oa/apply/service/ApplyFinanceService.java

@@ -143,7 +143,7 @@ public class ApplyFinanceService implements BaseService<ApplyFinance, ApplyFinan
 
         String flowNum = "";
         String maxNum = applyFinanceExtendMapper.selectMaxNum();
-        if(StringUtils.isNotEmpty(maxNum)){
+        if(StringUtils.isEmpty(maxNum)){
             maxNum = "0001";
         }else {
             maxNum.substring(10);

pro-base/src/main/java/com/idea/oa/apply/service/ApplyInvoiceRedService.java

@@ -29,12 +29,12 @@ import com.rockstar.frame.model.FrameUser;
 import com.rockstar.frame.service.FramePermissionService;
 import com.rockstar.frame.service.FrameUserService;
 import com.rockstar.shiro.util.ShiroUtils;
+import com.rockstar.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -145,42 +145,20 @@ public class ApplyInvoiceRedService implements BaseService<ApplyInvoiceRed, Appl
      * @return
      */
     public String getMaxNum() {
-        String maxnum = null;
-        try {
-            int c = 0;
-            while ("#".equals(RedisToUse.pmnumber)) {
-                try {
-                    c++;
-                    Thread.sleep(100);//等待毫秒
-                } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
-                }
-                if (c >= 1000) {
-                    break;
-                }
-            }
-            maxnum = RedisToUse.pmnumber;
-            RedisToUse.pmnumber = "#";
-            if (maxnum == null) {
-                maxnum = applyInvoiceRedExtendMapper.selectMaxNum();
-            }
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-            String topName = "付款领用单" + sdf.format(new Date()) + "-";
-//        20221111-04
-            if (StringUtils.isEmpty(maxnum)) {
-                maxnum = topName + "001";
-            } else {
-                String substring = maxnum.substring(0, topName.length());
-                if (topName.equals(substring)) {
-                    maxnum = RedisToUse.addNumber(topName, maxnum);
-                } else {
-                    maxnum = topName + "001";
-                }
-            }
-        } finally {
-            RedisToUse.pmnumber = maxnum;
+
+        // RZ202412110001
+
+        String flowNum = "";
+        String maxNum = applyInvoiceRedExtendMapper.selectMaxNum();
+        if(StringUtils.isEmpty(maxNum)){
+            maxNum = "0001";
+        }else {
+            maxNum.substring(10);
         }
-        return maxnum;
+        String yyyyMMdd = DateUtils.parseDateToStr("yyyyMMdd", new Date());
+        flowNum = "RZ" + yyyyMMdd + maxNum;
+
+        return flowNum;
     }
 
     /**

pro-base/src/main/java/com/idea/oa/apply/service/ApplyReceivablesAdjustService.java

@@ -143,7 +143,7 @@ public class ApplyReceivablesAdjustService implements BaseService<ApplyReceivabl
 
         String flowNum = "";
         String maxNum = applyReceivablesAdjustExtendMapper.selectMaxNum();
-        if(StringUtils.isNotEmpty(maxNum)){
+        if(StringUtils.isEmpty(maxNum)){
             maxNum = "0001";
         }else {
             maxNum.substring(10);