考虑多选甲方单位、合作单位

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBrandProjectController.java

@@ -84,21 +84,57 @@ public class CmcBrandProjectController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcBrandProject cmcBrandProject)
     {
-        if (!cmcBrandProject.getPartnerId().matches("-?\\d+(\\.\\d+)?")) {
-            CmcPartner cmcPartner = new CmcPartner();
-            cmcPartner.setPartnerId(String.valueOf(cmcPartnerService.selectCmcPartnerList(new CmcPartner()).size() + 1));
-            cmcPartner.setPartnerName(cmcBrandProject.getPartnerId());
-            cmcPartner.setTelephone(cmcBrandProject.getTelephone());
-            cmcPartner.setContactPerson(cmcBrandProject.getContactPerson());
-            cmcPartnerService.insertCmcPartner(cmcPartner);
-            cmcBrandProject.setPartnerId(cmcPartner.getPartnerId());
+        if (cmcBrandProject.getPartnerId().split(",").length == 0) {
+            if (!cmcBrandProject.getPartnerId().matches("-?\\d+(\\.\\d+)?")) {
+                CmcPartner cmcPartner = new CmcPartner();
+                cmcPartner.setPartnerId(String.valueOf(cmcPartnerService.selectCmcPartnerList(new CmcPartner()).size() + 1));
+                cmcPartner.setPartnerName(cmcBrandProject.getPartnerId());
+                cmcPartner.setTelephone(cmcBrandProject.getTelephone());
+                cmcPartner.setContactPerson(cmcBrandProject.getContactPerson());
+                cmcPartnerService.insertCmcPartner(cmcPartner);
+                cmcBrandProject.setPartnerId(cmcPartner.getPartnerId());
+            }
         }
-        if (!cmcBrandProject.getPartyAId().matches("-?\\d+(\\.\\d+)?")) {
-            CmcPartyA cmcPartyA = new CmcPartyA();
-            cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
-            cmcPartyA.setPartyAName(cmcBrandProject.getPartnerId());
-            cmcPartyAService.insertCmcPartyA(cmcPartyA);
-            cmcBrandProject.setPartyAId(cmcPartyA.getPartyAId());
+        if (cmcBrandProject.getPartnerId().split(",").length > 0) {
+            StringBuilder partnerIds = new StringBuilder();
+            for (int i = 0; i < cmcBrandProject.getPartnerId().split(",").length; i++) {
+                if (!cmcBrandProject.getPartnerId().split(",")[i].matches("-?\\d+(\\.\\d+)?")) {
+                    CmcPartner cmcPartner = new CmcPartner();
+                    cmcPartner.setPartnerId(String.valueOf(cmcPartnerService.selectCmcPartnerList(new CmcPartner()).size() + 1));
+                    cmcPartner.setPartnerName(cmcBrandProject.getPartnerId().split(",")[i]);
+                    cmcPartner.setTelephone(cmcBrandProject.getTelephone().split(",")[i]);
+                    cmcPartner.setContactPerson(cmcBrandProject.getContactPerson().split(",")[i]);
+                    cmcPartnerService.insertCmcPartner(cmcPartner);
+                    partnerIds.append(cmcPartner.getPartnerId()).append(",");
+                }
+                else
+                    partnerIds.append(cmcBrandProject.getPartnerId().split(",")[i]).append(",");
+            }
+            cmcBrandProject.setPartnerId(partnerIds.substring(0, partnerIds.length() - 1));
+        }
+        if (cmcBrandProject.getPartyAId().split(",").length == 0) {
+            if (!cmcBrandProject.getPartyAId().matches("-?\\d+(\\.\\d+)?")) {
+                CmcPartyA cmcPartyA = new CmcPartyA();
+                cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
+                cmcPartyA.setPartyAName(cmcBrandProject.getPartyAId());
+                cmcPartyAService.insertCmcPartyA(cmcPartyA);
+                cmcBrandProject.setPartyAId(cmcPartyA.getPartyAId());
+            }
+        }
+        if (cmcBrandProject.getPartyAId().split(",").length > 0) {
+            StringBuilder partyAIds = new StringBuilder();
+            for (int i = 0; i < cmcBrandProject.getPartyAId().split(",").length; i++) {
+                if (!cmcBrandProject.getPartyAId().split(",")[i].matches("-?\\d+(\\.\\d+)?")) {
+                    CmcPartyA cmcPartyA = new CmcPartyA();
+                    cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
+                    cmcPartyA.setPartyAName(cmcBrandProject.getPartyAId().split(",")[i]);
+                    cmcPartyAService.insertCmcPartyA(cmcPartyA);
+                    partyAIds.append(cmcPartyA.getPartyAId()).append(",");
+                }
+                else
+                    partyAIds.append(cmcBrandProject.getPartyAId().split(",")[i]).append(",");
+            }
+            cmcBrandProject.setPartyAId(partyAIds.substring(0, partyAIds.length() - 1));
         }
         cmcBrandProject.setProjectId(new SnowFlake().generateId());
         return toAjax(cmcBrandProjectService.insertCmcBrandProject(cmcBrandProject));

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -125,12 +125,29 @@ public class CmcProjectController extends BaseController
     {
         cmcProject.setRegisterTime(new Date());
         cmcProject.setIsFinished("0");
-        if (!cmcProject.getPartyAId().matches("-?\\d+(\\.\\d+)?")) {
-            CmcPartyA cmcPartyA = new CmcPartyA();
-            cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
-            cmcPartyA.setPartyAName(cmcProject.getPartyAId());
-            cmcPartyAService.insertCmcPartyA(cmcPartyA);
-            cmcProject.setPartyAId(cmcPartyA.getPartyAId());
+        if (cmcProject.getPartyAId().split(",").length == 0) {
+            if (!cmcProject.getPartyAId().matches("-?\\d+(\\.\\d+)?")) {
+                CmcPartyA cmcPartyA = new CmcPartyA();
+                cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
+                cmcPartyA.setPartyAName(cmcProject.getPartyAId());
+                cmcPartyAService.insertCmcPartyA(cmcPartyA);
+                cmcProject.setPartyAId(cmcPartyA.getPartyAId());
+            }
+        }
+        if (cmcProject.getPartyAId().split(",").length > 0) {
+            StringBuilder partyAIds = new StringBuilder();
+            for (int i = 0; i < cmcProject.getPartyAId().split(",").length; i++) {
+                if (!cmcProject.getPartyAId().split(",")[i].matches("-?\\d+(\\.\\d+)?")) {
+                    CmcPartyA cmcPartyA = new CmcPartyA();
+                    cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
+                    cmcPartyA.setPartyAName(cmcProject.getPartyAId().split(",")[i]);
+                    cmcPartyAService.insertCmcPartyA(cmcPartyA);
+                    partyAIds.append(cmcPartyA.getPartyAId()).append(",");
+                }
+                else
+                    partyAIds.append(cmcProject.getPartyAId().split(",")[i]).append(",");
+            }
+            cmcProject.setPartyAId(partyAIds.substring(0, partyAIds.length() - 1));
         }
         return toAjax(cmcProjectService.insertCmcProject(cmcProject));
     }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSubContractController.java

@@ -80,14 +80,33 @@ public class CmcSubContractController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcSubContract cmcSubContract)
     {
-        if (!cmcSubContract.getPartnerId().matches("-?\\d+(\\.\\d+)?")) {
-            CmcPartner cmcPartner = new CmcPartner();
-            cmcPartner.setPartnerId(String.valueOf(cmcPartnerService.selectCmcPartnerList(new CmcPartner()).size() + 1));
-            cmcPartner.setPartnerName(cmcSubContract.getPartnerId());
-            cmcPartner.setTelephone(cmcSubContract.getTelephone());
-            cmcPartner.setContactPerson(cmcSubContract.getContactPerson());
-            cmcPartnerService.insertCmcPartner(cmcPartner);
-            cmcSubContract.setPartnerId(cmcPartner.getPartnerId());
+        if (cmcSubContract.getPartnerId().split(",").length == 0) {
+            if (!cmcSubContract.getPartnerId().matches("-?\\d+(\\.\\d+)?")) {
+                CmcPartner cmcPartner = new CmcPartner();
+                cmcPartner.setPartnerId(String.valueOf(cmcPartnerService.selectCmcPartnerList(new CmcPartner()).size() + 1));
+                cmcPartner.setPartnerName(cmcSubContract.getPartnerId());
+                cmcPartner.setTelephone(cmcSubContract.getTelephone());
+                cmcPartner.setContactPerson(cmcSubContract.getContactPerson());
+                cmcPartnerService.insertCmcPartner(cmcPartner);
+                cmcSubContract.setPartnerId(cmcPartner.getPartnerId());
+            }
+        }
+        if (cmcSubContract.getPartnerId().split(",").length > 0) {
+            StringBuilder partnerIds = new StringBuilder();
+            for (int i = 0; i < cmcSubContract.getPartnerId().split(",").length; i++) {
+                if (!cmcSubContract.getPartnerId().split(",")[i].matches("-?\\d+(\\.\\d+)?")) {
+                    CmcPartner cmcPartner = new CmcPartner();
+                    cmcPartner.setPartnerId(String.valueOf(cmcPartnerService.selectCmcPartnerList(new CmcPartner()).size() + 1));
+                    cmcPartner.setPartnerName(cmcSubContract.getPartnerId().split(",")[i]);
+                    cmcPartner.setTelephone(cmcSubContract.getTelephone().split(",")[i]);
+                    cmcPartner.setContactPerson(cmcSubContract.getContactPerson().split(",")[i]);
+                    cmcPartnerService.insertCmcPartner(cmcPartner);
+                    partnerIds.append(cmcPartner.getPartnerId()).append(",");
+                }
+                else
+                    partnerIds.append(cmcSubContract.getPartnerId().split(",")[i]).append(",");
+            }
+            cmcSubContract.setPartnerId(partnerIds.substring(0, partnerIds.length() - 1));
         }
         return toAjax(cmcSubContractService.insertCmcSubContract(cmcSubContract));
     }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcTenderController.java

@@ -79,12 +79,29 @@ public class CmcTenderController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcTender cmcTender)
     {
-        if (!cmcTender.getPartyAId().matches("-?\\d+(\\.\\d+)?")) {
-            CmcPartyA cmcPartyA = new CmcPartyA();
-            cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
-            cmcPartyA.setPartyAName(cmcTender.getPartyAId());
-            cmcPartyAService.insertCmcPartyA(cmcPartyA);
-            cmcTender.setPartyAId(cmcPartyA.getPartyAId());
+        if (cmcTender.getPartyAId().split(",").length == 0) {
+            if (!cmcTender.getPartyAId().matches("-?\\d+(\\.\\d+)?")) {
+                CmcPartyA cmcPartyA = new CmcPartyA();
+                cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
+                cmcPartyA.setPartyAName(cmcTender.getPartyAId());
+                cmcPartyAService.insertCmcPartyA(cmcPartyA);
+                cmcTender.setPartyAId(cmcPartyA.getPartyAId());
+            }
+        }
+        if (cmcTender.getPartyAId().split(",").length > 0) {
+            StringBuilder partyAIds = new StringBuilder();
+            for (int i = 0; i < cmcTender.getPartyAId().split(",").length; i++) {
+                if (!cmcTender.getPartyAId().split(",")[i].matches("-?\\d+(\\.\\d+)?")) {
+                    CmcPartyA cmcPartyA = new CmcPartyA();
+                    cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
+                    cmcPartyA.setPartyAName(cmcTender.getPartyAId().split(",")[i]);
+                    cmcPartyAService.insertCmcPartyA(cmcPartyA);
+                    partyAIds.append(cmcPartyA.getPartyAId()).append(",");
+                }
+                else
+                    partyAIds.append(cmcTender.getPartyAId().split(",")[i]).append(",");
+            }
+            cmcTender.setPartyAId(partyAIds.substring(0, partyAIds.length() - 1));
         }
         return toAjax(cmcTenderService.insertCmcTender(cmcTender));
     }