流程调整

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

@@ -197,10 +197,20 @@ 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);
+            StringBuilder builder = new StringBuilder();
+            String houseId = record.getHouseId();
+            String[] split = houseId.split(",");
+            for (String s : split){
+                ParkRoomResponse response = roomExtendMapper.getFullName(s);
+                builder.append(response.getGroupName()).append("-")
+                        .append(response.getDiscName()).append("-")
+                        .append(response.getBuildName()).append("-")
+                        .append(response.getRoomNo()).append(",");
+            }
+            if(builder.length()>1){
+                builder.deleteCharAt(builder.length()-1);
+            }
+            record.setHouseName(builder.toString());
             record.setFlowNum(modelService.getMaxNum());
             record.setUpdatedAt(new Date());
             record.setCreatedAt(record.getUpdatedAt());

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

@@ -193,10 +193,20 @@ 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);
+            StringBuilder builder = new StringBuilder();
+            String houseId = record.getHouseId();
+            String[] split = houseId.split(",");
+            for (String s : split){
+                ParkRoomResponse response = roomExtendMapper.getFullName(s);
+                builder.append(response.getGroupName()).append("-")
+                                .append(response.getDiscName()).append("-")
+                                .append(response.getBuildName()).append("-")
+                                .append(response.getRoomNo()).append(",");
+            }
+            if(builder.length()>1){
+                builder.deleteCharAt(builder.length()-1);
+            }
+            record.setHouseName(builder.toString());
             record.setFlowNum(modelService.getMaxNum());
             record.setUpdatedAt(new Date());
             record.setCreatedAt(record.getUpdatedAt());

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

@@ -195,10 +195,20 @@ 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);
+            StringBuilder builder = new StringBuilder();
+            String houseId = record.getHouseId();
+            String[] split = houseId.split(",");
+            for (String s : split){
+                ParkRoomResponse response = roomExtendMapper.getFullName(s);
+                builder.append(response.getGroupName()).append("-")
+                        .append(response.getDiscName()).append("-")
+                        .append(response.getBuildName()).append("-")
+                        .append(response.getRoomNo()).append(",");
+            }
+            if(builder.length()>1){
+                builder.deleteCharAt(builder.length()-1);
+            }
+            record.setHouseName(builder.toString());
             record.setFlowNum(modelService.getMaxNum());
             record.setUpdatedAt(new Date());
             record.setCreatedAt(record.getUpdatedAt());

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

@@ -199,10 +199,20 @@ 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);
+            StringBuilder builder = new StringBuilder();
+            String houseId = record.getHouseId();
+            String[] split = houseId.split(",");
+            for (String s : split){
+                ParkRoomResponse response = roomExtendMapper.getFullName(s);
+                builder.append(response.getGroupName()).append("-")
+                        .append(response.getDiscName()).append("-")
+                        .append(response.getBuildName()).append("-")
+                        .append(response.getRoomNo()).append(",");
+            }
+            if(builder.length()>1){
+                builder.deleteCharAt(builder.length()-1);
+            }
+            record.setHouseName(builder.toString());
             record.setFlowNum(modelService.getMaxNum());
             record.setUpdatedAt(new Date());
             record.setCreatedAt(record.getUpdatedAt());

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

@@ -197,10 +197,20 @@ 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);
+            StringBuilder builder = new StringBuilder();
+            String houseId = record.getHouseId();
+            String[] split = houseId.split(",");
+            for (String s : split){
+                ParkRoomResponse response = roomExtendMapper.getFullName(s);
+                builder.append(response.getGroupName()).append("-")
+                        .append(response.getDiscName()).append("-")
+                        .append(response.getBuildName()).append("-")
+                        .append(response.getRoomNo()).append(",");
+            }
+            if(builder.length()>1){
+                builder.deleteCharAt(builder.length()-1);
+            }
+            record.setHouseName(builder.toString());
             record.setFlowNum(modelService.getMaxNum());
             record.setUpdatedAt(new Date());
             record.setCreatedAt(record.getUpdatedAt());

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

@@ -198,10 +198,20 @@ 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);
+            StringBuilder builder = new StringBuilder();
+            String houseId = record.getHouseId();
+            String[] split = houseId.split(",");
+            for (String s : split){
+                ParkRoomResponse response = roomExtendMapper.getFullName(s);
+                builder.append(response.getGroupName()).append("-")
+                        .append(response.getDiscName()).append("-")
+                        .append(response.getBuildName()).append("-")
+                        .append(response.getRoomNo()).append(",");
+            }
+            if(builder.length()>1){
+                builder.deleteCharAt(builder.length()-1);
+            }
+            record.setHouseName(builder.toString());
             record.setFlowNum(modelService.getMaxNum());
             record.setUpdatedAt(new Date());
             record.setCreatedAt(record.getUpdatedAt());

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

@@ -225,7 +225,7 @@ public class ApplyBuyingMoreService implements BaseService<ApplyBuyingMore, Appl
                     String syscode = "AJ";
                     String requestname = applyTheme;
                     String workflowname = ConstantFlowType.BUYING_MORE_NAME;
-                    String pcurl = serverUrl + "&loginid=" + username;
+                    String pcurl = serverUrl + "?loginid=" + username;
                     String appurl = "";
                     String isremark = "0";
                     String viewtype = "0";
@@ -309,7 +309,7 @@ public class ApplyBuyingMoreService implements BaseService<ApplyBuyingMore, Appl
                 String requestname = flowMain.getApplyTheme();
                 String workflowname = ConstantFlowType.BUYING_MORE_NAME;
                 String nodeName = flowMainPush.getNodeName();
-                String pcurl = serverUrl + "&loginid=" + username;
+                String pcurl = serverUrl + "?loginid=" + username;
                 String appurl = "";
                 String isremark = "0";
                 String viewtype = "0";

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

@@ -226,7 +226,7 @@ public class ApplyCheckInService implements BaseService<ApplyCheckIn, ApplyCheck
                     String syscode = "AJ";
                     String requestname = applyTheme;
                     String workflowname = ConstantFlowType.CHECK_IN_NAME;
-                    String pcurl = serverUrl + "&loginid=" + username;
+                    String pcurl = serverUrl + "?loginid=" + username;
                     String appurl = "";
                     String isremark = "0";
                     String viewtype = "0";
@@ -310,7 +310,7 @@ public class ApplyCheckInService implements BaseService<ApplyCheckIn, ApplyCheck
                 String requestname = flowMain.getApplyTheme();
                 String workflowname = ConstantFlowType.CHECK_IN_NAME;
                 String nodeName = flowMainPush.getNodeName();
-                String pcurl = serverUrl + "&loginid=" + username;
+                String pcurl = serverUrl + "?loginid=" + username;
                 String appurl = "";
                 String isremark = "0";
                 String viewtype = "0";

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

@@ -222,7 +222,7 @@ public class ApplyContractService implements BaseService<ApplyContract, ApplyCon
                     String syscode = "AJ";
                     String requestname = applyTheme;
                     String workflowname = ConstantFlowType.CONTRACT_NAME;
-                    String pcurl = serverUrl + "&loginid=" + username;
+                    String pcurl = serverUrl + "?loginid=" + username;
                     String appurl = "";
                     String isremark = "0";
                     String viewtype = "0";
@@ -306,7 +306,7 @@ public class ApplyContractService implements BaseService<ApplyContract, ApplyCon
                 String requestname = flowMain.getApplyTheme();
                 String workflowname = ConstantFlowType.CONTRACT_NAME;
                 String nodeName = flowMainPush.getNodeName();
-                String pcurl = serverUrl + "&loginid=" + username;
+                String pcurl = serverUrl + "?loginid=" + username;
                 String appurl = "";
                 String isremark = "0";
                 String viewtype = "0";

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

@@ -225,7 +225,7 @@ public class ApplyFinanceService implements BaseService<ApplyFinance, ApplyFinan
                     String syscode = "AJ";
                     String requestname = applyTheme;
                     String workflowname = ConstantFlowType.FINANCE_NAME;
-                    String pcurl = serverUrl + "&loginid=" + username;
+                    String pcurl = serverUrl + "?loginid=" + username;
                     String appurl = "";
                     String isremark = "0";
                     String viewtype = "0";
@@ -309,7 +309,7 @@ public class ApplyFinanceService implements BaseService<ApplyFinance, ApplyFinan
                 String requestname = flowMain.getApplyTheme();
                 String workflowname = ConstantFlowType.FINANCE_NAME;
                 String nodeName = flowMainPush.getNodeName();
-                String pcurl = serverUrl + "&loginid=" + username;
+                String pcurl = serverUrl + "?loginid=" + username;
                 String appurl = "";
                 String isremark = "0";
                 String viewtype = "0";

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

@@ -232,7 +232,7 @@ public class ApplyInvoiceRedService implements BaseService<ApplyInvoiceRed, Appl
                     String syscode = "AJ";
                     String requestname = applyTheme;
                     String workflowname = ConstantFlowType.INVOICE_RED_NAME;
-                    String pcurl = serverUrl + "&loginid=" + username;
+                    String pcurl = serverUrl + "?loginid=" + username;
                     String appurl = "";
                     String isremark = "0";
                     String viewtype = "0";
@@ -316,7 +316,7 @@ public class ApplyInvoiceRedService implements BaseService<ApplyInvoiceRed, Appl
                 String requestname = flowMain.getApplyTheme();
                 String workflowname = ConstantFlowType.INVOICE_RED_NAME;
                 String nodeName = flowMainPush.getNodeName();
-                String pcurl = serverUrl + "&loginid=" + username;
+                String pcurl = serverUrl + "?loginid=" + username;
                 String appurl = "";
                 String isremark = "0";
                 String viewtype = "0";

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

@@ -225,7 +225,7 @@ public class ApplyReceivablesAdjustService implements BaseService<ApplyReceivabl
                     String syscode = "AJ";
                     String requestname = applyTheme;
                     String workflowname = ConstantFlowType.RECEIVABLES_ADJUST_NAME;
-                    String pcurl = serverUrl + "&loginid=" + username;
+                    String pcurl = serverUrl + "?loginid=" + username;
                     String appurl = "";
                     String isremark = "0";
                     String viewtype = "0";
@@ -309,7 +309,7 @@ public class ApplyReceivablesAdjustService implements BaseService<ApplyReceivabl
                 String requestname = flowMain.getApplyTheme();
                 String workflowname = ConstantFlowType.RECEIVABLES_ADJUST_NAME;
                 String nodeName = flowMainPush.getNodeName();
-                String pcurl = serverUrl + "&loginid=" + username;
+                String pcurl = serverUrl + "?loginid=" + username;
                 String appurl = "";
                 String isremark = "0";
                 String viewtype = "0";