付款列表增加应收时间、项目列表增加是否有合同字段

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/SignInService.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -64,26 +65,24 @@ public class SignInService extends ServiceImpl<SignInMapper, SignIn> {
                 CommonEnum.DefaultRole.MTWORK.getCode().equals(user.getUserRole())
         )).collect(Collectors.toList());
 
-        String monitor = StrUtil.EMPTY;
-        for (ProjectUserResponse entry : responseList) {
-            if (request.getUserId().equals(entry.getUserId())) {
-                monitor = entry.getIsMonitor();
+        Optional<ProjectUserResponse> first = responseList.stream().filter(entry -> entry.getUserId().equals(request.getUserId())).findFirst();
+        first.ifPresent(response -> {
+            String monitor = response.getIsMonitor();
+            //当前用户非维保班长的考勤记录
+            if ("0".equals(monitor)) {
+                recordList.removeIf(entry -> !entry.getUserId().equals(request.getUserId()));
             }
-        }
-        //当前用户非维保班长的考勤记录
-        if ("0".equals(monitor)) {
-            recordList.removeIf(entry -> !entry.getUserId().equals(request.getUserId()));
-        }
-        //组装所有项目成员的考勤记录
-        for (ProjectUserResponse entry : responseList) {
-            List<SignIn> list = new ArrayList<>();
-            for (SignIn signIn : recordList) {
-                if (entry.getUserId().equals(signIn.getUserId())) {
-                    list.add(signIn);
-                    entry.setAttendanceRecord(list);
+            //组装所有项目成员的考勤记录
+            for (ProjectUserResponse entry : responseList) {
+                List<SignIn> list = new ArrayList<>();
+                for (SignIn signIn : recordList) {
+                    if (entry.getUserId().equals(signIn.getUserId())) {
+                        list.add(signIn);
+                        entry.setAttendanceRecord(list);
+                    }
                 }
             }
-        }
+        });
         return responseList;
     }
 

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

@@ -24,10 +24,6 @@ public class PaymentRequest extends PageRequest {
      * 项目名称
      */
     private String projectName;
-    /**
-     * 合同编号
-     */
-    private String contractCode;
     /**
      * 付款类型  (1:维保，2:大修)
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/entity/model/response/PaymentResponse.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.business.contract.dao.entity.model.response;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 
 /**
  * @author bieao
@@ -43,6 +44,10 @@ public class PaymentResponse {
      * 未收金额
      */
     private BigDecimal unCollectedAmount;
+    /**
+     * 应收时间
+     */
+    private LocalDate planDate;
     /**
      * 收款人
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenancePlanService.java

@@ -154,12 +154,11 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         List<MaintenancePlan> planList = new ArrayList<>();
         plans.forEach(plan -> {
             Optional<Project> project = projects.stream().filter(p -> p.getId().equals(plan.getProjectId())).findFirst();
-            if (project.isPresent()) {
-                Project entry = project.get();
+            project.ifPresent(entry -> {
                 //项目结束时间默认增加三个月
                 LocalDate endDate = entry.getEndDate().plusMonths(3);
-                planList.addAll(generatePlan(plan, periods, interval, firstTime,endDate));
-            }
+                planList.addAll(generatePlan(plan, periods, interval, firstTime, endDate));
+            });
         });
         //更新项目电梯关联表中电梯的首保时间和保养间隔
         List<ProjectLiftRelevance> entryList = request.getRelevanceList();

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

@@ -106,7 +106,12 @@ public class ProjectResponse {
     private Integer locked;
 
     /**
-     * 项目状态
+     * 项目状态 （1:未开始,2:服务中,3:停止,4:逾期）
      */
     private String projectStatus;
+
+    /**
+     * 是否有合同 （1:有,0:无）
+     */
+    private String existContract;
 }

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

@@ -41,14 +41,12 @@
 			   pa.plan_money                   AS receivableAmount,
 			   pa.work_money                   AS receivedAmount,
 			   (pa.plan_money - pa.work_money) AS unCollectedAmount,
+		       pa.plan_date                    AS planDate,
 			   pa.cashier_user                 AS cashierUser
 		FROM contracts c
 				 LEFT JOIN payment pa ON c.id = pa.contracts_id
 				 LEFT JOIN project p ON c.project_id = p.id
 		WHERE c.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
-		<if test="request.contractCode!=null and request.contractCode!=''">
-			AND c.code LIKE CONCAT('%',#{request.contractCode,jdbcType=BIGINT},'%')
-		</if>
 		<if test="request.projectName!=null and request.projectName!=''">
 			AND p.project_name LIKE CONCAT('%',#{request.projectName,jdbcType=VARCHAR},'%')
 		</if>

lift-business-service/src/main/resources/mapper/project/ProjectMapper.xml

@@ -64,11 +64,13 @@
 		p.project_status AS projectStatus,
         r.area_name     AS regionName,
         ui.name         AS userName,
-        pc.name         AS companyName
+        pc.name         AS companyName,
+		if(isnull(c.id),'0','1') AS existContract
         FROM project p
         LEFT JOIN region r ON p.region_id = r.id
         LEFT JOIN user_info ui ON r.user_id = ui.user_id
         LEFT JOIN property_company pc ON p.pp_company_id = pc.id
+		LEFT JOIN contracts c ON p.id = c.project_id
         WHERE p.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
 		<if test="request.provinceCode!=null and request.provinceCode!=''">
 			AND p.province_code= #{request.provinceCode,jdbcType=VARCHAR}