Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

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

@@ -1,8 +1,8 @@
 package cn.com.ty.lift.business.capital.controller;
 
 import cn.com.ty.lift.business.capital.dao.entity.CapitalRepair;
-import cn.com.ty.lift.business.capital.dao.entity.CapitalRepairHistory;
 import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairRequest;
+import cn.com.ty.lift.business.capital.dao.entity.model.response.CapitalRepairHistoryResponse;
 import cn.com.ty.lift.business.capital.dao.entity.model.response.CapitalRepairResponse;
 import cn.com.ty.lift.business.capital.service.CapitalRepairHistoryService;
 import cn.com.ty.lift.business.capital.service.CapitalRepairLiftRelevanceService;
@@ -85,7 +85,7 @@ public class CapitalRepairController {
     @PostMapping("history/list")
     @Validation(fields = {"mtCompanyId", "projectId"})
     public RestResponse historyList(@Val @RequestBody CapitalRepairRequest request) {
-        IPage<CapitalRepairHistory> page = capitalRepairHistoryService.historyList(request);
+        IPage<CapitalRepairHistoryResponse> page = capitalRepairHistoryService.historyList(request);
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }
 

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

@@ -0,0 +1,69 @@
+package cn.com.ty.lift.business.capital.dao.entity.model.response;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author bieao
+ * @date 2020/5/14
+ * @description 大修操作记录返回
+ */
+@Data
+public class CapitalRepairHistoryResponse {
+
+    /**
+     * 记录ID
+     */
+    private Long id;
+
+    /**
+     * 项目ID
+     */
+    private Long projectId;
+
+    /**
+     * 公司ID
+     */
+    private Long mtCompanyId;
+
+    /**
+     * 项目编号
+     */
+    private String code;
+
+    /**
+     * 项目名称
+     */
+    private String name;
+
+    /**
+     * 操作项
+     */
+    private String description;
+
+    /**
+     * 操作前内容
+     */
+    private String beforeContent;
+
+    /**
+     * 操作后内容
+     */
+    private String afterContent;
+
+    /**
+     * 操作人id
+     */
+    private Long operatorId;
+
+    /**
+     * 操作人
+     */
+    private String operatorName;
+
+    /**
+     * 操作时间
+     */
+    private LocalDateTime operateDate;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/mapper/CapitalRepairHistoryMapper.java

@@ -1,7 +1,10 @@
 package cn.com.ty.lift.business.capital.dao.mapper;
 
 import cn.com.ty.lift.business.capital.dao.entity.CapitalRepairHistory;
+import cn.com.ty.lift.business.capital.dao.entity.model.response.CapitalRepairHistoryResponse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author bieao
@@ -10,5 +13,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CapitalRepairHistoryMapper extends BaseMapper<CapitalRepairHistory> {
 
+    IPage<CapitalRepairHistoryResponse> queryCapitalRepairHistory(IPage<CapitalRepairHistoryResponse> page, @Param("projectId") Long projectId);
 
 }

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

@@ -3,10 +3,10 @@ package cn.com.ty.lift.business.capital.service;
 import cn.com.ty.lift.business.capital.dao.entity.CapitalRepair;
 import cn.com.ty.lift.business.capital.dao.entity.CapitalRepairHistory;
 import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairRequest;
+import cn.com.ty.lift.business.capital.dao.entity.model.response.CapitalRepairHistoryResponse;
 import cn.com.ty.lift.business.capital.dao.mapper.CapitalRepairHistoryMapper;
 import cn.com.ty.lift.business.common.BeanUtils;
 import cn.hutool.core.map.MapUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
@@ -32,15 +32,12 @@ public class CapitalRepairHistoryService extends ServiceImpl<CapitalRepairHistor
 
     /**
      * @param request 大修项目操作记录查询条件
-     * @return IPage<CapitalRepairHistory> 结果集
+     * @return IPage<CapitalRepairHistoryResponse> 结果集
      * @description 查询大修项目操作记录列表
      * @date 2020/4/28 9:57 上午
      */
-    public IPage<CapitalRepairHistory> historyList(CapitalRepairRequest request) {
-        QueryWrapper<CapitalRepairHistory> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("mt_company_id", request.getMtCompanyId());
-        queryWrapper.eq("project_id", request.getProjectId());
-        return page(request.getPage(), queryWrapper);
+    public IPage<CapitalRepairHistoryResponse> historyList(CapitalRepairRequest request) {
+        return baseMapper.queryCapitalRepairHistory(request.getPage(), request.getProjectId());
     }
 
     /**

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

@@ -10,13 +10,28 @@ import lombok.Data;
 @Data
 public class ProjectRelevanceResponse {
     /**
-     * 主键id
+     * 项目关联ID
      */
     private Long id;
     /**
-     * 维保工id
+     * 维保工ID
      */
     private Long workerId;
+
+    /**
+     * 项目ID
+     */
+    private Long projectId;
+
+    /**
+     * 电梯ID
+     */
+    private Long liftId;
+
+    /**
+     * 公司电梯关联ID
+     */
+    private Long relevanceId;
     /**
      * 项目编号
      */

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

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.com.ty.lift.business.capital.dao.mapper.CapitalRepairHistoryMapper">
+    <resultMap id="BaseResultMap" type="cn.com.ty.lift.business.capital.dao.entity.CapitalRepairHistory">
+        <id column="id" property="id" jdbcType="BIGINT"/>
+        <result column="mt_company_id" property="mtCompanyId" jdbcType="BIGINT"/>
+        <result column="project_id" property="projectId" jdbcType="BIGINT"/>
+        <result column="code" property="code" jdbcType="VARCHAR"/>
+        <result column="name" property="name" jdbcType="VARCHAR"/>
+        <result column="description" property="description" jdbcType="VARCHAR"/>
+        <result column="before_content" property="beforeContent" jdbcType="LONGVARCHAR"/>
+        <result column="after_content" property="afterContent" jdbcType="LONGVARCHAR"/>
+        <result column="operator_id" property="operatorId" jdbcType="BIGINT"/>
+        <result column="operate_date" property="operateDate" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id, mt_company_id, project_id, code, name, description,before_content, after_content, operator_id, operate_date
+	</sql>
+
+    <select id="queryCapitalRepairHistory" parameterType="java.lang.Long"
+            resultType="cn.com.ty.lift.business.capital.dao.entity.model.response.CapitalRepairHistoryResponse">
+        SELECT crh.id,
+               crh.project_id,
+               crh.code,
+               crh.description,
+               crh.before_content,
+               crh.after_content,
+               crh.operator_id,
+               crh.operate_date,
+               ui.name AS operatorName
+        FROM capital_repair_history crh
+                 LEFT JOIN user_info ui ON crh.operator_id = ui.user_id
+        WHERE project_id = #{projectId}
+    </select>
+
+</mapper>

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

@@ -30,14 +30,19 @@
 		SELECT
 		   plr.id              AS id,
 		   plr.worker_id       AS workerId,
+		   p.id                AS projectId,
 		   p.project_code      AS projectCode,
   		   p.project_name      AS projectName,
+		   pclr.id             AS relevanceId,
+		   l.id                AS liftId,
            l.lift_code         AS liftCode,
            l.registration_code AS registrationCode,
            l.device_position   AS devicePosition
 		FROM project_lift_relevance plr
 		  LEFT JOIN project p ON plr.project_id = p.id
 		  LEFT JOIN lift l ON plr.lift_id = l.id
+		  LEFT JOIN platform_company_lift_relevance pclr
+					ON l.id = pclr.lift_id AND plr.mt_company_id = pclr.mt_company_id
 		WHERE plr.worker_id = #{request.workerId,jdbcType=BIGINT}
 	</select>