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

lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/model/LiftRequest.java

@@ -1,6 +1,8 @@
 package cn.com.ty.lift.business.library.dao.entity.model;
 
+import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author bieao
@@ -8,7 +10,8 @@ import lombok.Data;
  * @description 电梯档案列表请求体
  */
 @Data
-public class LiftRequest {
+@EqualsAndHashCode(callSuper = true)
+public class LiftRequest extends BaseRequestModel {
 
     /**
      * 电梯状态（服务中：1，停止：0）
@@ -54,14 +57,4 @@ public class LiftRequest {
      * 公司ID
      */
     private Long companyId;
-
-    /**
-     * 当前第几页
-     */
-    private Integer pageNum;
-
-    /**
-     * 每页条数
-     */
-    private Integer pageSize;
 }

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

@@ -2,12 +2,14 @@ package cn.com.ty.lift.business.maintenance.controller;
 
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanRequest;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.UpdateMaintenancePlanReq;
 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.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +29,21 @@ public class MaintenanceController {
     @Resource
     private MaintenancePlanService maintenancePlanService;
 
+    /**
+     * @param request 维保计划列表
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 查询维保计划
+     * @date 2019/12/24 10:47 AM
+     */
+    @PostMapping("plan/list")
+    public RestResponse list(@RequestBody MaintenancePlanRequest request) {
+        IPage<MaintenancePlanResponse> page = maintenancePlanService.list(request);
+        if (ObjectUtil.isEmpty(page.getRecords())) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(page, MessageUtils.get("msg.query.success"));
+    }
+
     /**
      * @param request 电梯列表
      * @return 1.成功, 0.失败, 消息描述
@@ -44,7 +61,7 @@ public class MaintenanceController {
     }
 
     /**
-     * @param request 电梯列表
+     * @param request 修改维保计划请求
      * @return 1.成功, 0.失败, 消息描述
      * @description 修改维保计划
      * @date 2019/12/16 2:36 PM

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/MaintenanceRecord.java

@@ -3,7 +3,9 @@ package cn.com.ty.lift.business.maintenance.dao.entity;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import cn.com.ty.lift.business.common.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 实体类 - 表：maintenance_record
@@ -11,62 +13,141 @@ import lombok.Data;
  * @since 2019-12-12 11:27:30
  */
 @Data
-public class MaintenanceRecord {
+@EqualsAndHashCode(callSuper = true)
+public class MaintenanceRecord extends BaseEntity {
+
+	/**
+	 * 保养记录ID
+	 */
 	private Long id;
 
+	/**
+	 * 维保计划ID
+	 */
 	private Long mtPlanId;
 
+	/**
+	 * 电梯ID
+	 */
 	private Long liftId;
 
+	/**
+	 * 项目ID
+	 */
 	private Long projectId;
 
+	/**
+	 * 维保公司ID
+	 */
 	private Long mtCompanyId;
 
+	/**
+	 * 维保工ID
+	 */
 	private Long workerId;
 
+	/**
+	 * 编号,电梯编号+4位流水号'
+	 */
 	private String code;
 
+	/**
+	 * 电梯类型 1直梯，2扶梯
+	 */
 	private Byte liftType;
 
+	/**
+	 * 保养类型 1.半月，2.季度，3.半年，4.全年
+	 */
 	private Byte type;
 
+	/**
+	 * 计划保养时间
+	 */
 	private Date planDate;
 
+	/**
+	 * 实际保养时间
+	 */
 	private Date workDate;
 
+	/**
+	 * 停梯时间
+	 */
 	private Date stopDate;
 
+	/**
+	 * 恢复时间
+	 */
 	private Date recoveryDate;
 
+	/**
+	 * 保养建议
+	 */
 	private String maintenanceAdvice;
 
+	/**
+	 * 保养项目  用键值对的方式存储，如(1:0,2:1,3:1...)
+	 */
 	private String maintenanceOption;
 
+	/**
+	 * 签到位置
+	 */
 	private String position;
 
+	/**
+	 * 状态 1：已签到，未完成保养，2：完成保养，未选择评价方式，3：待评价，4：完成。
+	 */
 	private Byte status;
 
+	/**
+	 * 是否正常 0：正常 1：提前 2：延期
+	 */
 	private Byte isRegular;
 
-	private Long creatorId;
-
-	private Date createDate;
-
+	/**
+	 * 维保人员1
+	 */
 	private Long workerId1;
 
+	/**
+	 * 是否补录 0：正常 1：补录
+	 */
 	private Byte isRepair;
 
+	/**
+	 * 补录原因
+	 */
 	private String repairReason;
 
+	/**
+	 * 维保工签名1
+	 */
 	private String signatureImg1;
 
+	/**
+	 * 维保工签名2
+	 */
 	private String signatureImg2;
 
+	/**
+	 * 零配件
+	 */
 	private String sparepart;
 
+	/**
+	 * 配件费
+	 */
 	private BigDecimal partsCost;
 
+	/**
+	 * 工时费
+	 */
 	private BigDecimal manCost;
 
+	/**
+	 * 安全确认
+	 */
 	private String safetyConfirm;
 }

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

@@ -2,8 +2,10 @@ package cn.com.ty.lift.business.maintenance.dao.entity.model;
 
 import cn.com.ty.lift.business.library.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
+import cn.com.xwy.boot.controller.BaseRequestModel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 import java.util.List;
@@ -14,7 +16,8 @@ import java.util.List;
  * @description 维保计划列表请求体
  */
 @Data
-public class MaintenancePlanRequest {
+@EqualsAndHashCode(callSuper = true)
+public class MaintenancePlanRequest extends BaseRequestModel {
     /**
      * 电梯列表
      */

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

@@ -13,6 +13,10 @@ public class MaintenancePlanResponse {
      * 维保计划id
      */
     private Long id;
+    /**
+     * 是否制定维保计划（0：未制定，1：已制定）
+     */
+    private String status;
     /**
      * 电梯id
      */
@@ -65,4 +69,8 @@ public class MaintenancePlanResponse {
      * 区域名称
      */
     private String regionName;
+    /**
+     * 维保工
+     */
+    private String workerName;
 }

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

@@ -1,7 +1,11 @@
 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.MaintenancePlanRequest;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanResponse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
@@ -14,4 +18,6 @@ import java.util.List;
 public interface MaintenancePlanMapper extends BaseMapper<MaintenancePlan> {
 
     List<MaintenancePlan> findIdList(Date currentTime);
+
+    IPage<MaintenancePlanResponse> findByCondition(IPage page, @Param("request") MaintenancePlanRequest request);
 }

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

@@ -4,6 +4,7 @@ import cn.com.ty.lift.business.library.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.library.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanRequest;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.UpdateMaintenancePlanReq;
 import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenancePlanMapper;
 import cn.com.ty.lift.business.project.dao.entity.Project;
@@ -11,6 +12,8 @@ import cn.com.ty.lift.business.project.service.ProjectService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.ty.lift.common.export.ExportUtils;
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -49,6 +52,17 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         put("planDate", "计划时间");
     }};
 
+    /**
+     * @param request 维保计划列表
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 查询维保计划
+     * @date 2019/12/24 10:47 AM
+     */
+    public IPage<MaintenancePlanResponse> list(MaintenancePlanRequest request) {
+        IPage<MaintenancePlanResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return planMapper.findByCondition(page, request);
+    }
+
     /**
      * @param request 电梯列表
      * @return 是否成功
@@ -91,6 +105,8 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         int periods = request.getPeriods();
         //获取保养间隔
         int interval = request.getInterval();
+        //获取首保时间
+        Date firstTime = request.getFirstTime();
         for (MaintenancePlan plan : plans) {
             //获取项目id
             Long projectId = plan.getProjectId();
@@ -110,7 +126,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
                 entry.setWorkerId(plan.getWorkerId());
                 entry.setType(maintenanceType[periods - 1]);
                 if (i == 0) {
-                    entry.setPlanDate(plan.getPlanDate());
+                    entry.setPlanDate(firstTime);
                 } else {
                     //设置维护保养时间
                     MaintenancePlan maintenancePlan = planList.get(i - 1);
@@ -129,7 +145,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         List<ProjectLiftRelevance> entryList = request.getRelevanceList();
         for (ProjectLiftRelevance entry : entryList) {
             entry.setPlanInterval(interval);
-            entry.setFirstTime(request.getFirstTime());
+            entry.setFirstTime(firstTime);
         }
         projectLiftRelevanceService.updateBatchById(entryList);
         return planList;

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

@@ -8,7 +8,6 @@ import cn.com.ty.lift.business.library.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.business.project.dao.entity.Project;
 import cn.com.ty.lift.business.project.dao.entity.ProjectHistory;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
-import cn.com.ty.lift.business.project.dao.entity.model.ProjectHistoryRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectIDResponse;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectResponse;
@@ -78,8 +77,8 @@ public class ProjectController {
      * @date 2019/12/2 11:41 AM
      */
     @PostMapping("history/list")
-    public RestResponse list(@RequestBody ProjectHistoryRequest request) {
-        IPage<ProjectHistory> page = projectService.list(request);
+    public RestResponse historyList(@RequestBody ProjectRequest request) {
+        IPage<ProjectHistory> page = projectService.historyList(request);
         if (ObjectUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }

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

@@ -1,27 +0,0 @@
-package cn.com.ty.lift.business.project.dao.entity.model;
-
-import lombok.Data;
-
-/**
- * @author bieao
- * @date 2019/12/2
- * @description 项目操作记录列表请求体
- */
-@Data
-public class ProjectHistoryRequest {
-
-    /**
-     * 项目编号
-     */
-    private String projectCode;
-
-    /**
-     * 当前页码
-     */
-    private int pageNum;
-
-    /**
-     * 每页条数
-     */
-    private int pageSize;
-}

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

@@ -1,6 +1,8 @@
 package cn.com.ty.lift.business.project.dao.entity.model;
 
+import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author bieao
@@ -8,7 +10,8 @@ import lombok.Data;
  * @description 项目管理列表请求体
  */
 @Data
-public class ProjectRequest {
+@EqualsAndHashCode(callSuper = true)
+public class ProjectRequest extends BaseRequestModel {
     /**
      * 省编码
      */
@@ -58,14 +61,4 @@ public class ProjectRequest {
      * 维保公司id
      */
     private String mtCompanyId;
-
-    /**
-     * 当前页码
-     */
-    private Integer pageNum;
-
-    /**
-     * 每页条数
-     */
-    private Integer pageSize;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/mapper/ProjectHistoryMapper.java

@@ -1,7 +1,7 @@
 package cn.com.ty.lift.business.project.dao.mapper;
 
 import cn.com.ty.lift.business.project.dao.entity.ProjectHistory;
-import cn.com.ty.lift.business.project.dao.entity.model.ProjectHistoryRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.ProjectRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
@@ -12,5 +12,5 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  */
 public interface ProjectHistoryMapper extends BaseMapper<ProjectHistory> {
 
-    IPage<ProjectHistory> findByCondition(IPage<ProjectHistory> page, ProjectHistoryRequest request);
+    IPage<ProjectHistory> findByCondition(IPage<ProjectHistory> page, ProjectRequest request);
 }

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

@@ -3,7 +3,6 @@ package cn.com.ty.lift.business.project.service;
 import cn.com.ty.lift.business.project.dao.entity.Project;
 import cn.com.ty.lift.business.project.dao.entity.ProjectHistory;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
-import cn.com.ty.lift.business.project.dao.entity.model.ProjectHistoryRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectIDResponse;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectResponse;
@@ -83,11 +82,9 @@ public class ProjectService {
      * @description 查询项目操作记录列表
      * @date 2019/11/27 2:10 PM
      */
-    public IPage<ProjectHistory> list(ProjectHistoryRequest request) {
+    public IPage<ProjectHistory> historyList(ProjectRequest request) {
         IPage<ProjectHistory> page = new Page<>(request.getPageNum(), request.getPageSize());
-
         return projectHistoryMapper.findByCondition(page, request);
-
     }
 
     /**

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

@@ -21,29 +21,33 @@
 
 	<select id="findByCondition" resultType="cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanResponse" parameterType="cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanRequest">
 		SELECT
-		  mp.id                    AS id,
-		  mp.plan_date             AS planDate,
-		  mp.id                    AS liftId,
-		  l.registration_code      AS registrationCode,
-		  l.device_position        AS devicePosition,
-		  plr.id                   AS relevanceId,
-          plr.company_id           AS mtCompanyId,
-          plr.worker_id            AS workerId,
-		  plr.plan_interval        AS planInterval,
-          p.id                     AS projectId,
-		  p.project_name           AS projectName,
-		  p.project_code           AS projectCode,
-		  pclr.lift_company_status AS liftStatus,
-		  r.area_name              AS regionName,
-		  ui.name                  AS workerName
-		FROM maintenance_plan mp
-		left join platform_company_lift_relevance pclr ON mp.mt_company_id = pclr.company_id AND mp.lift_id = pclr.lift_id
-		LEFT JOIN lift l ON mp.lift_id = l.id
-		left join project_lift_relevance plr ON mp.mt_company_id = plr.company_id AND mp.project_id = plr.project_id AND mp.lift_id = plr.lift_id
-		LEFT JOIN project p ON mp.mt_company_id = p.mt_company_id AND plr.project_id = p.id
+		mp.id                       AS id,
+		if(isnull(mp.id), '0', '1') AS status,
+		mp.plan_date                AS planDate,
+		l.id                        AS liftId,
+		l.registration_code         AS registrationCode,
+		l.device_position           AS devicePosition,
+		plr.id                      AS relevanceId,
+		plr.company_id              AS mtCompanyId,
+		plr.worker_id               AS workerId,
+		plr.plan_interval           AS planInterval,
+		p.id                        AS projectId,
+		p.project_name              AS projectName,
+		p.project_code              AS projectCode,
+		pclr.lift_company_status    AS liftStatus,
+		r.area_name                 AS regionName,
+		ui.name                     AS workerName
+		FROM
+		project_lift_relevance plr
+		LEFT JOIN platform_company_lift_relevance pclr ON plr.company_id = pclr.company_id AND plr.lift_id = pclr.lift_id
+		LEFT JOIN lift l ON plr.lift_id = l.id
+		LEFT JOIN project p ON plr.company_id = p.mt_company_id AND plr.project_id = p.id
+		LEFT JOIN maintenance_plan mp ON plr.company_id = mp.mt_company_id AND plr.project_id = mp.project_id
+		AND mp.status = 0 AND mp.plan_date = (SELECT MIN(plan_date) FROM maintenance_plan WHERE status = 0
+		AND mt_company_id = #{request.mtCompanyId,jdbcType=VARCHAR}) AND plr.lift_id = mp.lift_id
 		LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
 		LEFT JOIN region r ON p.region_id = r.id
-		WHERE mp.mt_company_id = #{request.mtCompanyId,jdbcType=VARCHAR}
+		WHERE plr.company_id = #{request.mtCompanyId,jdbcType=VARCHAR}
 		<if test="request.projectId!=null and request.projectId!=''">
 			AND p.id = #{request.projectId,jdbcType=BIGINT}
 		</if>
@@ -53,6 +57,9 @@
 		<if test="request.regionId!=null and request.regionId!=''">
 			AND p.region_id = #{request.regionId,jdbcType=BIGINT}
 		</if>
+		<if test="request.planInterval!=null and request.planInterval!=''">
+			AND plr.plan_interval = #{request.planInterval,jdbcType=INTEGER}
+		</if>
 		<if test="request.beginTime!=null and request.beginTime!=''">
 			AND mp.plan_date > #{request.beginTime,jdbcType=VARCHAR}
 		</if>
@@ -60,14 +67,14 @@
 			AND <![CDATA[mp.plan_date < #{request.endTime,jdbcType=VARCHAR}]]>
 		</if>
 		<if test="request.registrationCode!=null and request.registrationCode!=''">
-			AND l.registration_code like #{request.registrationCode,jdbcType=VARCHAR}
+			AND l.registration_code LIKE #{request.registrationCode,jdbcType=VARCHAR}
 		</if>
 	</select>
 
 	<select id="findIdList" resultMap="BaseResultMap" parameterType="java.util.Date">
 		SELECT
 		id,
-		plan_date as planDate
+		plan_date AS planDate
 		FROM maintenance_plan
 		WHERE plan_date > #{currentTime,jdbcType=TIMESTAMP}
 	</select>

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

@@ -22,7 +22,7 @@
         select
         <include refid="Base_Column_List"/>
         from project_history
-        where id = #{id,jdbcType=BIGINT}
+        where id = #{request.id,jdbcType=BIGINT}
     </select>
 
 </mapper>

pom.xml

@@ -34,7 +34,7 @@
 
     <repositories>
         <repository>
-            <id>local</id>
+            <id>reserved</id>
             <url>http://132.232.206.88:8081/repository/local</url>
         </repository>
         <repository>