创建合同bug修改

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/ContractService.java

@@ -69,18 +69,22 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
     @Transactional(rollbackFor = Exception.class)
     public RestResponse add(ContractRequest request) {
         Contracts contracts = request.getContracts();
-        //插入项目信息
-        Project project = new Project();
-        project.setProjectName(request.getProjectName());
-        project.setAddress(request.getProjectAddress());
-        project.setNum(contracts.getLiftNum());
-        project.setStartDate(contracts.getStarDate());
-        project.setEndDate(contracts.getEndDate());
-        project.setMtCompanyId(contracts.getMtCompanyId());
-        boolean pro = projectService.saveProject(project);
-        if (!pro) return RestResponse.fail(MessageUtils.get("msg.add.fail"));
-
-        contracts.setProjectId(project.getId());
+        Long projectId = request.getProjectId();
+        if (Objects.isNull(projectId)) {
+            //插入项目信息
+            Project project = new Project();
+            project.setProjectName(request.getProjectName());
+            project.setAddress(request.getProjectAddress());
+            project.setNum(contracts.getLiftNum());
+            project.setStartDate(contracts.getStarDate());
+            project.setEndDate(contracts.getEndDate());
+            project.setMtCompanyId(contracts.getMtCompanyId());
+            boolean pro = projectService.saveProject(project);
+            if (!pro) return RestResponse.fail(MessageUtils.get("msg.add.fail"));
+            contracts.setProjectId(project.getId());
+        } else {
+            contracts.setProjectId(projectId);
+        }
         if (ObjectUtil.isEmpty(contracts.getCode())) {
             //按当前日期时间戳自动生成合同编号
             String contractCode = DateUtils.generateCode();