1.清空维保计划接口修改 2.app端保养任务列表接口提交

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

@@ -6,7 +6,6 @@ import cn.com.ty.lift.business.maintenance.dao.entity.model.request.*;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse;
 import cn.com.ty.lift.business.maintenance.service.MaintenancePlanService;
 import cn.com.ty.lift.common.base.ExportRequest;
-import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -71,7 +70,7 @@ public class MaintenanceController {
     public RestResponse generatePlan(@Valid @RequestBody MaintenanceGenerateRequest request) {
         boolean result = maintenancePlanService.insertBatch(request);
         if (result) {
-            return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.add.success"));
+            return RestResponse.success(null, MessageUtils.get("msg.add.success"));
         } else {
             return RestResponse.fail(MessageUtils.get("msg.add.fail"));
         }
@@ -87,23 +86,23 @@ public class MaintenanceController {
     public RestResponse modifyPlan(@Valid @RequestBody MaintenanceModifyRequest request) {
         boolean result = maintenancePlanService.modifyPlan(request);
         if (result) {
-            return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.success"));
+            return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
         } else {
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         }
     }
 
     /**
-     * @param request idList 维保计划表主键id列表
+     * @param request 公司id，项目id，电梯id
      * @return 是否成功
      * @description 清空维保计划
      * @date 2019/12/17 3:14 PM
      */
     @PostMapping("batch/clean")
     public RestResponse batchCleanPlan(@Valid @RequestBody MaintenanceCleanRequest request) {
-        boolean result = maintenancePlanService.batchCleanPlan(request.getIdList());
+        boolean result = maintenancePlanService.removeMaintenancePlan(request.getMtCompanyId(), request.getLiftIdList());
         if (result) {
-            return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.success"));
+            return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
         } else {
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         }

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

@@ -0,0 +1,29 @@
+package cn.com.ty.lift.business.maintenance.dao.entity.model.request;
+
+import cn.com.xwy.boot.controller.BaseRequestModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author bieao
+ * @date 2020/1/6
+ * @description 保养任务
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MaintenanceAppRequest extends BaseRequestModel {
+
+    /**
+     * 用户id
+     */
+    @NotNull(message = "notEmpty")
+    private Long workerId;
+
+    /**
+     * 维保计划状态
+     */
+    @NotNull(message = "notEmpty")
+    private String status;
+}

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

@@ -3,6 +3,7 @@ package cn.com.ty.lift.business.maintenance.dao.entity.model.request;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -14,8 +15,14 @@ import java.util.List;
 public class MaintenanceCleanRequest {
 
     /**
-     * 维保计划主键id列表
+     * 电梯id列表
      */
     @NotEmpty(message = "notEmpty")
-    private List<Long> idList;
+    private List<Long> liftIdList;
+
+    /**
+     * 公司id
+     */
+    @NotNull(message = "notEmpty")
+    private Long mtCompanyId;
 }

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

@@ -0,0 +1,42 @@
+package cn.com.ty.lift.business.maintenance.dao.entity.model.response;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * @author bieao
+ * @date 2020/1/6
+ * @description 保养任务返回体
+ */
+@Data
+public class MaintenanceAppResponse {
+    /**
+     * 项目名称
+     */
+    private String projectName;
+    /**
+     * 电梯注册代码
+     */
+    private String registrationCode;
+    /**
+     * 设备内部编号
+     */
+    private String useCompanyCode;
+    /**
+     * 电梯类型
+     */
+    private Integer liftType;
+    /**
+     * 维保工
+     */
+    private String workerName;
+    /**
+     * 计划保养时间
+     */
+    private LocalDate planDate;
+    /**
+     * 保养类型
+     */
+    private String maintenanceType;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/mapper/MaintenancePlanMapper.java

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.business.maintenance.dao.mapper;
 
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceAppRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenancePlanRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceModifyRequest;
@@ -20,4 +21,12 @@ public interface MaintenancePlanMapper extends BaseMapper<MaintenancePlan> {
     List<MaintenancePlan> findIdList(@Param("request") MaintenanceModifyRequest request);
 
     IPage<MaintenancePlanResponse> findByCondition(IPage<MaintenancePlanResponse> page, @Param("request") MaintenancePlanRequest request);
+
+    /**
+     * @param request 用户id和维保状态
+     * @return RestResponse 保养任务列表
+     * @description 根据用户id和维保状态查询保养任务列表
+     * @date 2020/1/6 11:29 上午
+     */
+    IPage<MaintenancePlanResponse> findListByWorkerId(IPage<MaintenancePlanResponse> page ,@Param("request") MaintenanceAppRequest request);
 }

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

@@ -196,17 +196,6 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         return updateBatchById(resultList, resultList.size());
     }
 
-    /**
-     * @param idList 维保计划主键id列表
-     * @return 是否成功
-     * @description 批量清除维保计划
-     * @date 2019/12/28 2:00 PM
-     */
-    public boolean batchCleanPlan(List<Long> idList) {
-        return removeByIds(idList);
-    }
-
-
     /**
      * @param mtCompanyId 公司id
      * @param liftList 电梯id列表

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

@@ -1,14 +1,16 @@
 package cn.com.ty.lift.business.project.controller;
 
 import cn.com.ty.lift.business.framework.util.MessageUtils;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceAppRequest;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse;
 import cn.com.ty.lift.business.project.dao.entity.model.request.CompanyRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectDetailRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectCompanyResponse;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectDetailResponse;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectLiftResponse;
 import cn.com.ty.lift.business.project.service.ProjectAppService;
-import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -40,10 +42,10 @@ public class ProjectAppController {
     @PostMapping("project/list")
     public RestResponse list(@Valid @RequestBody CompanyRequest request) {
         IPage<ProjectCompanyResponse> page = projectAppService.list(request);
-        if (ObjectUtil.isEmpty(page.getRecords())) {
+        if (CollUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }
-        return RestResponse.success(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
+        return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }
 
     /**
@@ -55,10 +57,10 @@ public class ProjectAppController {
     @PostMapping("lift/list")
     public RestResponse list(@Valid @RequestBody ProjectDetailRequest request) {
         IPage<ProjectLiftResponse> page = projectAppService.list(request);
-        if (ObjectUtil.isEmpty(page.getRecords())) {
+        if (CollUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }
-        return RestResponse.success(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
+        return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }
 
     /**
@@ -73,6 +75,21 @@ public class ProjectAppController {
         if (ObjectUtil.isEmpty(response)) {
             return RestResponse.success();
         }
-        return RestResponse.success(response, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
+        return RestResponse.success(response, MessageUtils.get("msg.query.success"));
+    }
+
+    /**
+     * @param request 用户id和维保状态
+     * @return RestResponse 保养任务列表
+     * @description 根据用户id和维保状态查询保养任务列表
+     * @date 2020/1/6 11:29 上午
+     */
+    @PostMapping("maintenance/task")
+    public RestResponse taskList(@Valid @RequestBody MaintenanceAppRequest request) {
+        IPage<MaintenancePlanResponse> response = projectAppService.taskList(request);
+        if (CollUtil.isEmpty(response.getRecords())) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(response, MessageUtils.get("msg.query.success"));
     }
 }

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

@@ -1,5 +1,8 @@
 package cn.com.ty.lift.business.project.service;
 
+import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceAppRequest;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse;
+import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenancePlanMapper;
 import cn.com.ty.lift.business.project.dao.entity.Project;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectAppUser;
 import cn.com.ty.lift.business.project.dao.entity.model.request.CompanyRequest;
@@ -33,6 +36,9 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper,Project> {
     @Resource
     private ProjectUserMapper projectUserMapper;
 
+    @Resource
+    private MaintenancePlanMapper maintenancePlanMapper;
+
     /**
      * @param request 公司id
      * @return RestResponse 项目列表
@@ -68,4 +74,15 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper,Project> {
         return response;
     }
 
+    /**
+     * @param request 用户id和维保状态
+     * @return RestResponse 保养任务列表
+     * @description 根据用户id和维保状态查询保养任务列表
+     * @date 2020/1/6 11:29 上午
+     */
+    public IPage<MaintenancePlanResponse> taskList(MaintenanceAppRequest request) {
+        IPage<MaintenancePlanResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return maintenancePlanMapper.findListByWorkerId(page, request);
+    }
+
 }

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

@@ -89,4 +89,27 @@
         </if>
 	</select>
 
+	<!--app端 保养任务列表 -->
+	<select id="findListByWorkerId" resultType="cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenanceAppResponse"
+			parameterType="cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceAppRequest">
+		SELECT p.project_name      AS projectName,
+			   l.registration_code AS registrationCode,
+			   l.use_company_code  AS useCompanyCode,
+			   l.lift_type         AS liftType,
+			   ui.name             AS workerName,
+			   mp.plan_date        AS planDate,
+			   mp.type             AS maintenanceType
+		FROM maintenance_plan mp
+				 LEFT JOIN project p ON mp.project_id = p.id
+				 LEFT JOIN lift l ON mp.lift_id = l.id
+				 LEFT JOIN user_info ui ON mp.worker_id = ui.user_id
+		WHERE 1=1
+		<if test="request.workerId!=null and request.workerId!=''">
+			AND mp.worker_id = #{request.workerId,jdbcType=BIGINT}
+		</if>
+		<if test="request.status!=null and request.status!=''">
+			AND mp.status = #{request.status,jdbcType=VARCHAR}
+		</if>
+	</select>
+
 </mapper>

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

@@ -153,7 +153,7 @@
 		LEFT JOIN project p ON plr.project_id = p.id
 		WHERE 1=1
 		<if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
-			AND plr.mt_company_id = #{request.companyId,jdbcType=VARCHAR}
+			AND plr.mt_company_id = #{request.mtCompanyId,jdbcType=VARCHAR}
 		</if>
 	</select>