app端保养列表增加时间区间查询

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

@@ -58,11 +58,17 @@ public class MaintenanceRecordRequest extends PageRequest {
     private String coordinate;
 
     /**
-     * 当前日期
+     * 开始日期
      */
-    @NotNull(message = "当前日期不能为空")
+    @NotNull(message = "开始日期不能为空")
     private LocalDate currentTime;
 
+    /**
+     * 结束日期
+     */
+    @NotNull(message = "结束日期不能为空")
+    private LocalDate endTime;
+
     /**
      * 保养信息
      */

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

@@ -78,4 +78,9 @@ public class ProjectDetailResponse {
      * 是否维保班长
      */
     private String isMonitor;
+
+    /**
+     * 项目状态
+     */
+    private String projectStatus;
 }

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

@@ -128,6 +128,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
     public Map<String, Object> planTask(MaintenanceRecordRequest request) {
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Long> countMap = new HashMap<>();
+        request.setEndTime(request.getCurrentTime().with(TemporalAdjusters.lastDayOfMonth()));
         IPage<MaintenanceAppResponse> page = maintenancePlanMapper.findPlanByWorkerId(request.getPage(), request);
 
         List<MaintenanceAppResponse> records = page.getRecords();
@@ -179,6 +180,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
     public Map<String, Object> recordTask(MaintenanceRecordRequest request) {
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Long> countMap = new HashMap<>();
+        request.setEndTime(request.getCurrentTime().with(TemporalAdjusters.lastDayOfMonth()));
         IPage<MaintenanceAppResponse> page = maintenanceRecordMapper.findRecordByWorkerId(request.getPage(), request);
         List<MaintenanceAppResponse> records = page.getRecords();
         if (CollUtil.isNotEmpty(records)) {

lift-business-service/src/main/resources/mapper/capital/CapitalRepairLiftRelevanceMapper.xml

@@ -87,7 +87,8 @@
                     r.area_name     AS areaName,
                     r.clerk         AS clerk_id,
                     r.id            AS regionId,
-                    cr.pp_contact_id AS contact_id
+                    cr.pp_contact_id AS contact_id,
+                    cr.project_status AS projectStatus
         FROM capital_repair cr
                 LEFT JOIN region r ON cr.region_id = r.id
                 LEFT JOIN user_info ui ON r.user_id = ui.user_id

lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml

@@ -134,7 +134,10 @@
 			AND mp.status = #{request.status,jdbcType=VARCHAR}
 		</if>
 		<if test="request.currentTime!=null">
-			AND mp.plan_date = #{request.currentTime}
+			AND <![CDATA[ mp.plan_date >= #{request.currentTime}]]>
+		</if>
+		<if test="request.endTime!=null">
+			AND <![CDATA[ mp.plan_date <= #{request.endTime,jdbcType=VARCHAR}]]>
 		</if>
 	</select>
 
@@ -152,7 +155,10 @@
 			AND pu.user_id = #{request.workerId,jdbcType=BIGINT}
 		</if>
 		<if test="request.currentTime!=null">
-			AND mp.plan_date = #{request.currentTime}
+			AND <![CDATA[ mp.plan_date >= #{request.currentTime}]]>
+		</if>
+		<if test="request.endTime!=null">
+			AND <![CDATA[ mp.plan_date <= #{request.endTime,jdbcType=VARCHAR}]]>
 		</if>
 	</select>
 

lift-business-service/src/main/resources/mapper/maintenance/MaintenanceRecordMapper.xml

@@ -130,7 +130,10 @@
 			AND mr.status = #{request.status,jdbcType=VARCHAR}
 		</if>
         <if test="request.currentTime!=null">
-            AND mr.plan_date = #{request.currentTime}
+            AND <![CDATA[ mr.plan_date >= #{request.currentTime}]]>
+        </if>
+        <if test="request.endTime!=null">
+            AND <![CDATA[ mr.plan_date <= #{request.endTime,jdbcType=VARCHAR}]]>
         </if>
 	</select>
 
@@ -147,7 +150,10 @@
             AND mr.worker_id1 = #{request.workerId,jdbcType=BIGINT}
         </if>
         <if test="request.currentTime!=null">
-            AND mr.plan_date = #{request.currentTime}
+            AND <![CDATA[ mr.plan_date >= #{request.currentTime}]]>
+        </if>
+        <if test="request.endTime!=null">
+            AND <![CDATA[ mr.plan_date <= #{request.endTime,jdbcType=VARCHAR}]]>
         </if>
     </select>