Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/ccpm/controller/CcpmList.java

@@ -141,6 +141,7 @@ public class CcpmList  {
                         cwProjectRecords.setProjectName(recordsVo.getProjectName());
                         cwProjectRecords.setProjectType(recordsVo.getProjectType());
                         cwProjectRecords.setStatus(recordsVo.getProjectStatus()+"");
+                        cwProjectRecords.setCreateById("1");
                         cwProjectRecords.setTenantId("ccpm");
                         //获取项目所在地
                         List<Area> areaDTO = SpringUtil.getBean(IAreaApi.class).getAreaDTOByName(recordsVo.getArea().getName());
@@ -172,6 +173,7 @@ public class CcpmList  {
                         cwProjectReviewNew.setProjectId(recordsVo.getId());
                         cwProjectReviewNew.setReviewStatus(recordsVo.getProjectReportStatus().toString());
                         cwProjectReviewNew.setTenantId("ccpm");
+                        cwProjectReviewNew.setCreateById("1");
                         cwProjectReviewNewMapper.insert(cwProjectReviewNew);
                     }
                     //报告
@@ -181,6 +183,7 @@ public class CcpmList  {
                         report.setId(id);
                         report.setProjectId(recordsVo.getId());
                         report.setTenantId("ccpm");
+                        report.setCreateById("1");
                         cwProjectReportMapper.insert(report);
 
                         //报告编号
@@ -189,6 +192,7 @@ public class CcpmList  {
                         cwProjectInfoData.setReportId(id);
                         cwProjectInfoData.setReportNo(recordsVo.getProjectReportNumber());
                         cwProjectInfoData.setTenantId("ccpm");
+                        cwProjectInfoData.setCreateById("1");
                         cwProjectInfoMapper.insert(cwProjectInfoData);
                     }
                     //报告签发
@@ -202,6 +206,7 @@ public class CcpmList  {
 
                         }
                         cwProjectReportSignAndIssue.setTenantId("ccpm");
+                        cwProjectReportSignAndIssue.setCreateById("1");
                         cwProjectReportSignAndIssueMapper.insert(cwProjectReportSignAndIssue);
                     }
 
@@ -215,6 +220,7 @@ public class CcpmList  {
                             cwProjectReportOnlineArchiving.setStatus("");
                         }
                         cwProjectReportOnlineArchiving.setTenantId("ccpm");
+                        cwProjectReportOnlineArchiving.setCreateById("1");
                         cwProjectReportOnlineArchivingMapper.insert(cwProjectReportOnlineArchiving);
                     }
                     //纸质归档
@@ -228,6 +234,8 @@ public class CcpmList  {
                             cwProjectReportPaperArchiving.setStatus("");
                         }
                         cwProjectReportPaperArchiving.setTenantId("ccpm");
+                        cwProjectReportPaperArchiving.setCreateById("1");
+                        cwProjectReportPaperArchiving.setUpdateById("1");
                         cwProjectReportPaperArchivingMapper.insert(cwProjectReportPaperArchiving);
                     }
                 }
@@ -255,11 +263,19 @@ public class CcpmList  {
                 for (WorkContractInfoVo contractInfoVo : workContractInfoVos) {
                     ContractInfo workContractInfo = new ContractInfo();
                     workContractInfo.setId(contractInfoVo.getId());//id
+                    workContractInfo.setCreateById("1");
                     workContractInfo.setCreateTime(new Date());
                     workContractInfo.setContractName(contractInfoVo.getName());//合同名称
                     workContractInfo.setContractNo(contractInfoVo.getContractNum());//合同编号
                     workContractInfo.setClientContacts(contractInfoVo.getClient().getId());//客户id
                     workContractInfo.setStatus(contractInfoVo.getContractState());//合同状态
+                    //合同金额
+                    if (StringUtils.isNotBlank(contractInfoVo.getContractPrice())){
+                        double newPrice = Double.parseDouble(contractInfoVo.getContractPrice());
+                        workContractInfo.setContractAmount(newPrice);
+                        workContractInfo.setActualContractAmount(newPrice);
+                    }
+
                     workContractInfo.setTenantId("ccpm");
                     //合同金额类别
                     if (StringUtils.isNotBlank(contractInfoVo.getContractInformation())){
@@ -272,10 +288,10 @@ public class CcpmList  {
                     //收费标准
                     if (StringUtils.isNotBlank(contractInfoVo.getChargeCriterion())){
                         String dictValue = SpringUtil.getBean(IDictApi.class).getDictValue(contractInfoVo.getChargeCriterion(), "contract_fee_new", "");
-                        workContractInfo.setContractFee(dictValue);
+                        workContractInfo.setFees(dictValue);
                     }
                     if (StringUtils.isNotBlank(contractInfoVo.getOtherDetails())){
-                        workContractInfo.setFees(contractInfoVo.getOtherDetails());
+                        workContractInfo.setContractFee(contractInfoVo.getOtherDetails());
                     }
                     //对方合同编号
                     workContractInfo.setContractOpposite(contractInfoVo.getContractOpposite());
@@ -286,6 +302,7 @@ public class CcpmList  {
                     workContractInfo.setFiledNo(contractInfoVo.getRecordNum());//案卷号
                     workContractFile.setFiledPaperType(contractInfoVo.getContrractRecordStatus());
                     workContractFile.setTenantId("ccpm");
+                    workContractFile.setCreateById("1");
                     contractFilePaperMapper.insert(workContractFile);
                 }
             }
@@ -308,6 +325,7 @@ public class CcpmList  {
                 //客户基本信息
                 CwWorkClientBase cwWorkClientBase = new CwWorkClientBase();
                 cwWorkClientBase.setId(workClientInfoVo.getId());
+                cwWorkClientBase.setCreateById("1");
                 cwWorkClientBase.setName(workClientInfoVo.getName());//客户名称
                 cwWorkClientBase.setIsUscCode(workClientInfoVo.getHasUscc()+"");//是否有统一社会信用代码
                 cwWorkClientBase.setUscCode(workClientInfoVo.getUscCode());//统一社会信用代码

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/ccpm/controller/receiveData.java

@@ -27,6 +27,7 @@ import com.jeeplus.finance.workClientInfo.mapper.CwWorkClientTypeMapper;
 import com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBillingDTO;
 import com.jeeplus.sys.domain.Area;
 import com.jeeplus.sys.feign.IAreaApi;
+import com.jeeplus.sys.feign.IDictApi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -89,6 +90,7 @@ public class receiveData {
             //客户基本信息
             CwWorkClientBase clientBase = new CwWorkClientBase();
             clientBase.setId(workClientInfoVo.getId());
+            clientBase.setCreateById("1");
             clientBase.setName(workClientInfoVo.getName());//客户名称
             clientBase.setIsUscCode(workClientInfoVo.getHasUscc() + "");//是否有统一社会信用代码
             clientBase.setUscCode(workClientInfoVo.getUscCode());//统一社会信用代码
@@ -139,10 +141,17 @@ public class receiveData {
             ContractInfo workContractInfo = new ContractInfo();
             workContractInfo.setId(workContractInfoVo.getId());//id
             workContractInfo.setCreateTime(new Date());
+            workContractInfo.setCreateById("1");
             workContractInfo.setContractName(workContractInfoVo.getName());//合同名称
             workContractInfo.setContractNo(workContractInfoVo.getContractNum());//合同编号
             workContractInfo.setClientContacts(workContractInfoVo.getClient().getId());//客户id
             workContractInfo.setStatus(workContractInfoVo.getContractState());//合同状态
+            //合同金额
+            if (StringUtils.isNotBlank(workContractInfoVo.getContractPrice())){
+                double newPrice = Double.parseDouble(workContractInfoVo.getContractPrice());
+                workContractInfo.setContractAmount(newPrice);
+                workContractInfo.setActualContractAmount(newPrice);
+            }
             workContractInfo.setTenantId("ccpm");
             //合同金额类别
             if (StringUtils.isNotBlank(workContractInfoVo.getContractInformation())){
@@ -152,6 +161,13 @@ public class receiveData {
                     workContractInfo.setContractAmountType("2");//费率合同
                 }
             }
+            if (StringUtils.isNotBlank(workContractInfoVo.getChargeCriterion())){
+                String dictValue = SpringUtil.getBean(IDictApi.class).getDictValue(workContractInfoVo.getChargeCriterion(), "contract_fee_new", "");
+                workContractInfo.setFees(dictValue);
+            }
+            if (StringUtils.isNotBlank(workContractInfoVo.getOtherDetails())){
+                workContractInfo.setContractFee(workContractInfoVo.getOtherDetails());
+            }
             contractInfoMapper.insert(workContractInfo);
             //先删除
             contractFilePaperMapper.deleteInfoByContractId(workContractInfoVo.getId());
@@ -161,6 +177,7 @@ public class receiveData {
             workContractInfo.setFiledNo(workContractInfoVo.getRecordNum());//案卷号
             workContractFile.setFiledPaperType(workContractInfoVo.getContrractRecordStatus());
             workContractFile.setTenantId("ccpm");
+            workContractFile.setCreateById("1");
             contractFilePaperMapper.insert(workContractFile);
         }
 
@@ -175,6 +192,7 @@ public class receiveData {
 
             CwProjectRecords cwProjectRecords = new CwProjectRecords();
             cwProjectRecords.setId(ruralProjectRecordsVo.getId());//项目id
+            cwProjectRecords.setCreateById("1");
             cwProjectRecords.setProjectNumber(ruralProjectRecordsVo.getProjectId());//项目编号
             cwProjectRecords.setContractId(ruralProjectRecordsVo.getWorkContractInfo().getId());
             cwProjectRecords.setProjectName(ruralProjectRecordsVo.getProjectName());