处理合同状态

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

@@ -808,6 +808,10 @@ public class ContractServiceImpl implements ContractService {
             }
         }
 
+        if (resource.getStatus() == null) {
+            resource.setStatus(ContractStatusEnum.NFORMAL.getKey());
+        }
+
         this.calculateShareIncome(resource);
 
         resource.setId(contract.getId());
@@ -1645,9 +1649,9 @@ public class ContractServiceImpl implements ContractService {
 
         if (showTip) {
             //获取相关执行合同名称
-            List<String> codes = contractRepository.findContractBodyNames(contract.getCustomerBody(),contract.getContractCode());
+            List<String> codes = contractRepository.findContractBodyNames(contract.getCustomerBody(), contract.getContractCode());
             contract.setCustomBodyNames(codes);
-        }else{
+        } else {
             contract.setCustomBodyNames(new ArrayList<>());
         }
 
@@ -2223,7 +2227,7 @@ public class ContractServiceImpl implements ContractService {
         }
 
         int row_already = titleKey.size();
-        String extend_row_sql = "platform,product,my_body_code,create_time,code_num,type,status,ds," +
+        String extend_row_sql = "platform,product,my_body_code,create_time,code_num,type,status,back_status,ds," +
                 "create_account,create_name,extra_flow,relation_contract,invoice_money,first_back_id";
 
         int extend_size = extend_row_sql.split(",").length;
@@ -2318,21 +2322,23 @@ public class ContractServiceImpl implements ContractService {
             }
 
 
+            //platform,product,my_body_code,create_time,code_num,type,status,back_status,ds,
             s_data[row_already] = platform;
             s_data[row_already + 1] = platform;
             s_data[row_already + 2] = bodyCode;
             s_data[row_already + 3] = new Date();
             s_data[row_already + 4] = 0;
             s_data[row_already + 5] = "main";
-            s_data[row_already + 6] = "backnone";
-            s_data[row_already + 7] = ds;
+            s_data[row_already + 6] = ContractStatusEnum.NFORMAL.getKey(); //常规合同
+            s_data[row_already + 7] = 1; //未回款
+            s_data[row_already + 8] = ds;
 //            create_account,create_name,extra_flow,relation_contract,invoice_money,first_back_id
-            s_data[row_already + 8] = 0;
-            s_data[row_already + 9] = "导入";
-            s_data[row_already + 10] = 0;
-            s_data[row_already + 11] = -1;
-            s_data[row_already + 12] = 0;
+            s_data[row_already + 9] = 0;
+            s_data[row_already + 10] = "导入";
+            s_data[row_already + 11] = 0;
+            s_data[row_already + 12] = -1;
             s_data[row_already + 13] = 0;
+            s_data[row_already + 14] = 0;
             //批量添加数据
             args_data.add(s_data);
         }