新建合同校验在执行中合同

src/main/java/common/model/Contract.java

@@ -64,6 +64,8 @@ public class Contract {
     private Long intervaIncomeShare;//区间分摊收入(*100的结果)
     private Long incomeShareAll;//分摊总收入(*100的结果)
 
+    private Integer shareSign;//标记是否计算分摊收入 1 计算 0 不计算
+
     private String searchName;
 
     private List<String> customBodyNames;
@@ -551,4 +553,14 @@ public class Contract {
     public void setCustomBodyNames(List<String> customBodyNames) {
         this.customBodyNames = customBodyNames;
     }
+
+
+
+    public Integer getShareSign() {
+        return shareSign;
+    }
+
+    public void setShareSign(Integer shareSign) {
+        this.shareSign = shareSign;
+    }
 }

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -468,11 +468,20 @@ public class ContractServiceImpl implements ContractService {
                 // 合同编号已存在
                 contractExist.setId(-100L);
                 contractExist.setErroMessage("合同编号已存在");
-
                 return contractExist;
             }
         }
 
+        List<String> codes = contractRepository.findContractBodyNames(resource.getCustomerBody(), resource.getContractCode());
+
+        if (!codes.isEmpty()) {
+            // 合同编号已存在
+            resource.setId(-200L);
+            resource.setErroMessage("当前" + resource.getCustomerBody() +
+                    "仍有其他正在执行的合同" + String.join(",\n", codes));
+            return resource;
+        }
+
         resource.setInvoice(0L);
         Long extraFlow = resource.getExtraFlow();
         if (extraFlow == null) {

src/main/java/common/service/impl/ShareIncomeServiceImpl.java

@@ -95,6 +95,11 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
 
         for (Contract contract : contracts) {
 
+            if (contract.getShareSign() != null && contract.getShareSign().intValue() == 0) {
+                //不参与分摊计算
+                continue;
+            }
+
 //            this.caculateShareIncome(contract, start, end);
             this.shareIncome4Contract(contract, start, end);
             contract.setMyBodyName(bodiesNameMap.get(contract.getMyBodyCode()));