Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/entity/Contracts.java

@@ -2,7 +2,6 @@ package cn.com.ty.lift.business.contract.dao.entity;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 import cn.com.ty.lift.business.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -72,7 +71,7 @@ public class Contracts extends BaseEntity {
     /**
      * 签约时间
      */
-    private LocalDateTime givenDate;
+    private LocalDate givenDate;
 
     /**
      * 签约人

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

@@ -82,7 +82,7 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
      * @description 保存项目信息
      * @date 2020/1/14 4:30 下午
      */
-    public boolean saveProject(Contracts contracts, ContractsExtend extend, Project project) {
+    public Project saveProject(Contracts contracts, ContractsExtend extend, Project project) {
         project.setProjectName(extend.getProjectName());
         project.setAddress(extend.getProjectAddress());
         project.setNum(contracts.getLiftNum());
@@ -117,8 +117,8 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
             return RestResponse.fail(MessageUtils.get("msg.add.fail"));
         }
         //插入项目信息
-        boolean info = saveProject(contracts, extend, project);
-        if (!info) {
+        Project info = saveProject(contracts, extend, project);
+        if (ObjectUtil.isEmpty(info)) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(MessageUtils.get("msg.add.fail"));
         }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

@@ -179,11 +179,14 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      * @description 保存项目信息
      * @date 2020/1/14 4:12 下午
      */
-    public boolean saveProject(Project project) {
+    public Project saveProject(Project project) {
         //按当前日期时间戳自动生成项目编号
         String projectCode = DateUtils.generateCode();
         project.setProjectCode("XM" + projectCode);
-        return save(project);
+        project.setProjectStatus(project.getStartDate().isAfter(LocalDate.now()) ? "1" : "2");
+        boolean result = save(project);
+        if (result) return project;
+        return null;
     }
 
     /**
@@ -194,14 +197,8 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      */
     @Transactional(rollbackFor = Exception.class)
     public RestResponse add(ProjectExtensionRequest request) {
-        Project project = request.getProject();
-        if (project.getStartDate().isAfter(LocalDate.now())) {
-            project.setProjectStatus("1");
-        } else {
-            project.setProjectStatus("2");
-        }
-        boolean ret = saveProject(project);
-        if (!ret) {
+        Project project = saveProject(request.getProject());
+        if (ObjectUtil.isEmpty(project)) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(MessageUtils.get("msg.add.fail"));
         }