修复bug

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/Project.java

@@ -6,11 +6,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 实体类 - 表：project
@@ -204,5 +206,5 @@ public class Project extends BaseEntity {
      *首次签约时间
      */
     @FieldName(name = "首次签约时间")
-    private LocalDateTime firstSignTime;
+    private LocalDate firstSignTime;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/model/request/ProjectRequest.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.business.project.dao.entity.model.request;
 import cn.com.ty.lift.business.project.dao.entity.Project;
 import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
+import cn.com.ty.lift.common.constants.FieldName;
 import cn.com.ty.lift.common.model.PageRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -168,4 +169,6 @@ public class ProjectRequest extends PageRequest {
      */
     private String look;
 
+    private LocalDate firstSignTime;
+
 }

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

@@ -472,12 +472,29 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
      */
     @Transactional(rollbackFor = Exception.class)
     public RestResponse modify(Project project) {
+        /**
+         * 获取项目id
+         */
         Long projectId = project.getId();
+
+        /**
+         * 获取维保公司id
+         */
         Long mtCompanyId = project.getMtCompanyId();
+        /**
+         * 根据项目id查询原来的项目信息
+         */
         Optional<Project> oldProject = getOne(projectId);
-        if (!oldProject.isPresent())
-            return RestResponse.fail(MessageUtils.get("msg.project.not.exist"));
+
+        /**
+         * 如果项目不存在则抛出错误
+         */
+        if (!oldProject.isPresent()) return RestResponse.fail(MessageUtils.get("msg.project.not.exist"));
+        /**
+         * 项目id和维保公司id获取maxworkDate
+         */
         LocalDate maxWorkDate = maintenancePlanService.queryWorkDateByProjectId(projectId,mtCompanyId );
+
         LocalDate endDate = project.getEndDate();
         Project entry = oldProject.get();
         //结束时间不应早于最近一次维保记录
@@ -486,7 +503,9 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
             //结束时间比最近一次维保记录晚的话，维保计划相应按照新结束时间往后推三个月
         } else {
             List<MaintenancePlan> planList = maintenancePlanService.queryLiftListByProjectId(projectId, mtCompanyId);
-            boolean result = maintenancePlanService.removeByIds(planList);
+
+            List<Long> collect = planList.stream().map(MaintenancePlan::getId).collect(Collectors.toList());
+            boolean result = maintenancePlanService.removeByIds(collect);
             if (!result)
                 return RestResponse.fail(MessageUtils.get("msg.delete.fail"));
             List<ProjectLiftRelevance> list = projectLiftRelevanceService.queryPlanInterval(projectId, mtCompanyId);

lift-business-service/src/main/resources/mapper/contract/ContractsMapper.xml

@@ -109,7 +109,7 @@
                c.code as contractCode,
 
                <!--客户名称-->
-               (select attestation_name from mt_company_attestation where mt_company_attestation.mt_company_id=c.mt_company_id) as memberName,
+               c.given_user as memberName,
 
                <!--收款类型-->
                case when pay.type = 1 then '维保费' else '大修费' end as payType,
@@ -124,7 +124,7 @@
                CONCAT(c.lift_num,'台',case when pay.periods = '' or pay.periods is null then '1' else  pay.periods end,'期',p.start_date,'至',p.end_date) as projectContent,
 
                <!--本期应收-->
-               planMoney as nowMoney,
+               pay.plan_money as nowMoney,
 
                <!--合同金额-->
                c.moneys as moneys,