操作记录返回操作人

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/controller/ContractController.java

@@ -1,9 +1,9 @@
 package cn.com.ty.lift.business.contract.controller;
 
 import cn.com.ty.lift.business.contract.dao.entity.Contracts;
-import cn.com.ty.lift.business.contract.dao.entity.ContractsHistory;
 import cn.com.ty.lift.business.contract.dao.entity.model.request.ContractRequest;
 import cn.com.ty.lift.business.contract.dao.entity.model.response.ContractResponse;
+import cn.com.ty.lift.business.contract.dao.entity.model.response.ContractsHistoryResponse;
 import cn.com.ty.lift.business.contract.service.ContractHistoryService;
 import cn.com.ty.lift.business.contract.service.ContractService;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
@@ -57,7 +57,7 @@ public class ContractController {
     @PostMapping("history/list")
     @Validation(fields = {"contractId"})
     public RestResponse historyList(@RequestBody ContractRequest request) {
-        IPage<ContractsHistory> page = contractHistoryService.list(request);
+        IPage<ContractsHistoryResponse> page = contractHistoryService.list(request);
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }
 

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

@@ -0,0 +1,59 @@
+package cn.com.ty.lift.business.contract.dao.entity.model.response;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author bieao
+ * @date 2020/5/9
+ * @description 合同操作记录返回
+ */
+@Data
+public class ContractsHistoryResponse {
+
+    /**
+     * 记录ID
+     */
+    private Long id;
+
+    /**
+     * 合同ID
+     */
+    private Long contractsId;
+
+    /**
+     * 合同编号
+     */
+    private String code;
+
+    /**
+     * 操作项
+     */
+    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/contract/dao/mapper/ContractsHistoryMapper.java

@@ -1,7 +1,10 @@
 package cn.com.ty.lift.business.contract.dao.mapper;
 
 import cn.com.ty.lift.business.contract.dao.entity.ContractsHistory;
+import cn.com.ty.lift.business.contract.dao.entity.model.response.ContractsHistoryResponse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author bieao
@@ -10,4 +13,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ContractsHistoryMapper extends BaseMapper<ContractsHistory> {
 
+    IPage<ContractsHistoryResponse> queryContractHistory(IPage<ContractsHistoryResponse> page, @Param("contractId") Long contractId);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/ContractHistoryService.java

@@ -4,10 +4,9 @@ import cn.com.ty.lift.business.common.BeanUtils;
 import cn.com.ty.lift.business.contract.dao.entity.Contracts;
 import cn.com.ty.lift.business.contract.dao.entity.ContractsHistory;
 import cn.com.ty.lift.business.contract.dao.entity.model.request.ContractRequest;
+import cn.com.ty.lift.business.contract.dao.entity.model.response.ContractsHistoryResponse;
 import cn.com.ty.lift.business.contract.dao.mapper.ContractsHistoryMapper;
 import cn.hutool.core.map.MapUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-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;
@@ -36,11 +35,8 @@ public class ContractHistoryService extends ServiceImpl<ContractsHistoryMapper,
      * @description 根据合同编号查询合同历史记录
      * @date 2020/1/8 11:37 上午
      */
-    public IPage<ContractsHistory> list(ContractRequest request) {
-        QueryWrapper<ContractsHistory> queryWrapper = new QueryWrapper<>();
-        LambdaQueryWrapper<ContractsHistory> lambdaQueryWrapper = queryWrapper.lambda();
-        lambdaQueryWrapper.eq(ContractsHistory::getContractsId, request.getContractId());
-        return page(request.getPage(), lambdaQueryWrapper);
+    public IPage<ContractsHistoryResponse> list(ContractRequest request) {
+       return baseMapper.queryContractHistory(request.getPage(),request.getContractId());
     }
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/library/controller/LiftController.java

@@ -1,9 +1,9 @@
 package cn.com.ty.lift.business.library.controller;
 
 import cn.com.ty.lift.business.framework.util.MessageUtils;
-import cn.com.ty.lift.business.library.dao.entity.LiftHistory;
 import cn.com.ty.lift.business.library.dao.entity.model.request.LiftExtensionRequest;
 import cn.com.ty.lift.business.library.dao.entity.model.request.LiftRequest;
+import cn.com.ty.lift.business.library.dao.entity.model.response.LiftHistoryResponse;
 import cn.com.ty.lift.business.library.dao.entity.model.response.LiftResponse;
 import cn.com.ty.lift.business.library.service.LiftHistoryService;
 import cn.com.ty.lift.business.library.service.LiftService;
@@ -65,7 +65,7 @@ public class LiftController {
     @PostMapping("history/list")
     @Validation(fields = {"mtCompanyId", "liftId"})
     public RestResponse historyList(@Val @RequestBody LiftRequest request) {
-        IPage<LiftHistory> page = liftHistoryService.historyList(request);
+        IPage<LiftHistoryResponse> page = liftHistoryService.historyList(request);
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }
 

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

@@ -0,0 +1,64 @@
+package cn.com.ty.lift.business.library.dao.entity.model.response;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author bieao
+ * @date 2020/5/12
+ * @description 电梯操作记录返回
+ */
+@Data
+public class LiftHistoryResponse {
+
+    /**
+     * 记录ID
+     */
+    private Long id;
+
+    /**
+     * 维保公司ID
+     */
+    private Long mtCompanyId;
+
+    /**
+     * 电梯ID
+     */
+    private Long liftId;
+
+    /**
+     * 电梯编号 每个团队单独编号，直梯：ZT000001，扶梯：FT000001
+     */
+    private String code;
+
+    /**
+     * 操作描述
+     */
+    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/library/dao/mapper/LiftHistoryMapper.java

@@ -1,7 +1,10 @@
 package cn.com.ty.lift.business.library.dao.mapper;
 
 import cn.com.ty.lift.business.library.dao.entity.LiftHistory;
+import cn.com.ty.lift.business.library.dao.entity.model.request.LiftRequest;
+import cn.com.ty.lift.business.library.dao.entity.model.response.LiftHistoryResponse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  * <p>
@@ -13,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface LiftHistoryMapper extends BaseMapper<LiftHistory> {
 
+    IPage<LiftHistoryResponse> queryLiftHistory(IPage<LiftHistoryResponse> page, LiftRequest request);
+
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftHistoryService.java

@@ -4,6 +4,7 @@ import cn.com.ty.lift.business.common.BeanUtils;
 import cn.com.ty.lift.business.library.dao.entity.Lift;
 import cn.com.ty.lift.business.library.dao.entity.LiftHistory;
 import cn.com.ty.lift.business.library.dao.entity.model.request.LiftRequest;
+import cn.com.ty.lift.business.library.dao.entity.model.response.LiftHistoryResponse;
 import cn.com.ty.lift.business.library.dao.mapper.LiftHistoryMapper;
 import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -38,11 +39,8 @@ public class LiftHistoryService extends ServiceImpl<LiftHistoryMapper, LiftHisto
      * @description 查询电梯操作记录列表
      * @date 2020/4/27 2:19 下午
      */
-    public IPage<LiftHistory> historyList(LiftRequest request) {
-        QueryWrapper<LiftHistory> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("mt_company_id", request.getMtCompanyId());
-        queryWrapper.eq("lift_id", request.getLiftId());
-        return page(request.getPage(), queryWrapper);
+    public IPage<LiftHistoryResponse> historyList(LiftRequest request) {
+      return baseMapper.queryLiftHistory(request.getPage(),request);
     }
 
     /**

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

@@ -4,8 +4,8 @@ import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanPrintResponse;
 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.model.request.ProjectRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectHistoryResponse;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectResponse;
 import cn.com.ty.lift.business.project.service.ProjectHistoryService;
 import cn.com.ty.lift.business.project.service.ProjectService;
@@ -101,7 +101,7 @@ public class ProjectController {
     @PostMapping("history/list")
     @Validation(fields = {"mtCompanyId", "projectId"})
     public RestResponse historyList(@Val @RequestBody ProjectRequest request) {
-        IPage<ProjectHistory> page = projectHistoryService.historyList(request);
+        IPage<ProjectHistoryResponse> page = projectHistoryService.historyList(request);
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }
 

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

@@ -0,0 +1,72 @@
+package cn.com.ty.lift.business.project.dao.entity.model.response;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author bieao
+ * @date 2020/5/12
+ * @description 项目操作记录返回
+ */
+@Data
+public class ProjectHistoryResponse {
+
+    /**
+     * 记录ID
+     */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 维保公司ID
+     */
+    private Long mtCompanyId;
+
+    /**
+     * 项目ID
+     */
+    private Long projectId;
+
+    /**
+     * 项目编号
+     */
+    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/project/dao/mapper/ProjectHistoryMapper.java

@@ -2,6 +2,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.request.ProjectRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectHistoryResponse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
@@ -12,5 +13,5 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  */
 public interface ProjectHistoryMapper extends BaseMapper<ProjectHistory> {
 
-    IPage<ProjectHistory> findByCondition(IPage<ProjectHistory> page, ProjectRequest request);
+    IPage<ProjectHistoryResponse> queryProjectHistory(IPage<ProjectHistoryResponse> page, ProjectRequest request);
 }

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

@@ -4,6 +4,7 @@ import cn.com.ty.lift.business.common.BeanUtils;
 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.model.request.ProjectRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectHistoryResponse;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectHistoryMapper;
 import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -36,11 +37,8 @@ public class ProjectHistoryService extends ServiceImpl<ProjectHistoryMapper, Pro
      * @description 查询项目操作记录列表
      * @date 2020/4/27 2:19 下午
      */
-    public IPage<ProjectHistory> historyList(ProjectRequest request) {
-        QueryWrapper<ProjectHistory> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("mt_company_id", request.getMtCompanyId());
-        queryWrapper.eq("project_id", request.getProjectId());
-        return page(request.getPage(), queryWrapper);
+    public IPage<ProjectHistoryResponse> historyList(ProjectRequest request) {
+       return baseMapper.queryProjectHistory(request.getPage(),request);
     }
 
     /**

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

@@ -0,0 +1,36 @@
+<?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.contract.dao.mapper.ContractsHistoryMapper">
+    <resultMap id="BaseResultMap" type="cn.com.ty.lift.business.contract.dao.entity.ContractsHistory">
+        <id column="id" property="id" jdbcType="BIGINT"/>
+        <result column="mt_company_id" property="mtCompanyId" jdbcType="BIGINT"/>
+        <result column="contracts_id" property="contractsId" jdbcType="BIGINT"/>
+        <result column="code" property="code" 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, contracts_id, code, description,before_content, after_content, operator_id, operate_date
+	</sql>
+
+    <select id="queryContractHistory" parameterType="java.lang.Long"
+            resultType="cn.com.ty.lift.business.contract.dao.entity.model.response.ContractsHistoryResponse">
+        SELECT ch.id,
+               ch.contracts_id,
+               ch.code,
+               ch.description,
+               ch.before_content,
+               ch.after_content,
+               ch.operator_id,
+               ch.operate_date,
+               ui.name AS operatorName
+        FROM contracts_history ch
+                 LEFT JOIN user_info ui ON ch.operator_id = ui.user_id
+        WHERE contracts_id = #{contractId}
+    </select>
+
+</mapper>

lift-business-service/src/main/resources/mapper/lift/LiftHistoryMapper.xml

@@ -0,0 +1,38 @@
+<?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.library.dao.mapper.LiftHistoryMapper">
+    <resultMap id="BaseResultMap" type="cn.com.ty.lift.business.library.dao.entity.LiftHistory">
+        <id column="id" property="id" jdbcType="BIGINT"/>
+        <result column="mt_company_id" property="mtCompanyId" jdbcType="BIGINT"/>
+        <result column="lift_id" property="liftId" jdbcType="BIGINT"/>
+        <result column="code" property="code" jdbcType="CHAR"/>
+        <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="queryLiftHistory" parameterType="cn.com.ty.lift.business.library.dao.entity.model.request.LiftRequest"
+        resultType="cn.com.ty.lift.business.library.dao.entity.model.response.LiftHistoryResponse">
+        SELECT lh.id,
+               lh.mt_company_id,
+               lh.lift_id,
+               lh.code,
+               lh.description,
+               lh.before_content,
+               lh.after_content,
+               lh.operator_id,
+               lh.operate_date,
+               ui.name AS operatorName
+        FROM lift_history lh
+                 LEFT JOIN user_info ui ON lh.operator_id = ui.user_id
+        WHERE mt_company_id = #{request.mtCompanyId}
+          AND lift_id = #{request.liftId}
+    </select>
+
+</mapper>

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

@@ -18,4 +18,23 @@
 		id, mt_company_id, project_id, code, name, description,before_content, after_content, operator_id, operate_date
 	</sql>
 
+    <select id="queryProjectHistory" parameterType="cn.com.ty.lift.business.project.dao.entity.model.request.ProjectRequest"
+        resultType="cn.com.ty.lift.business.project.dao.entity.model.response.ProjectHistoryResponse">
+        SELECT ph.id,
+               ph.mt_company_id,
+               ph.project_id,
+               ph.code,
+               ph.name,
+               ph.description,
+               ph.before_content,
+               ph.after_content,
+               ph.operator_id,
+               ph.operate_date,
+               ui.name AS operatorName
+        FROM project_history ph
+                 LEFT JOIN user_info ui ON ph.operator_id = ui.user_id
+        WHERE mt_company_id = #{request.mtCompanyId}
+              AND project_id = #{request.projectId}
+    </select>
+
 </mapper>