Merge branches 'develop' and 'huangyuan-user' 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/contract/controller/PaymentController.java

@@ -1,10 +1,13 @@
 package cn.com.ty.lift.business.contract.controller;
 
+import cn.com.ty.lift.business.contract.dao.entity.PaymentHistory;
+import cn.com.ty.lift.business.contract.dao.entity.model.request.ContractsHistoryRequest;
 import cn.com.ty.lift.business.contract.dao.entity.model.request.PaymentDetailRequest;
 import cn.com.ty.lift.business.contract.dao.entity.model.request.PaymentModifyRequest;
 import cn.com.ty.lift.business.contract.dao.entity.model.request.PaymentRequest;
 import cn.com.ty.lift.business.contract.dao.entity.model.response.PaymentDetailResponse;
 import cn.com.ty.lift.business.contract.dao.entity.model.response.PaymentResponse;
+import cn.com.ty.lift.business.contract.service.PaymentHistoryService;
 import cn.com.ty.lift.business.contract.service.PaymentService;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
@@ -31,6 +34,9 @@ public class PaymentController {
     @Resource
     private PaymentService paymentService;
 
+    @Resource
+    private PaymentHistoryService paymentHistoryService;
+
     /**
      * @param request 收款列表查询条件
      * @return RestResponse 付款分页列表结果
@@ -53,7 +59,7 @@ public class PaymentController {
      * @date 2020/2/24 10:47 上午
      */
     @PostMapping("detail")
-    public RestResponse detail(@RequestBody PaymentDetailRequest request){
+    public RestResponse detail(@Valid @RequestBody PaymentDetailRequest request){
        PaymentDetailResponse response = paymentService.detail(request);
        if (ObjectUtil.isEmpty(response)){
            return RestResponse.success();
@@ -68,7 +74,7 @@ public class PaymentController {
      * @date 2020/2/24 10:47 上午
      */
     @PostMapping("batch/modify")
-    public RestResponse batchModify(@RequestBody PaymentModifyRequest request) {
+    public RestResponse batchModify(@Valid @RequestBody PaymentModifyRequest request) {
         boolean result = paymentService.modifyBatchById(request.getPaymentList());
         if (result) {
             return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
@@ -76,4 +82,19 @@ public class PaymentController {
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         }
     }
+
+    /**
+     * @param request 操作记录查询条件
+     * @return RestResponse 付款操作记录分页列表结果
+     * @description 查询付款操作记录列表
+     * @date 2020/2/26 5:13 下午
+     */
+    @PostMapping("history/list")
+    public RestResponse historyList(@Valid @RequestBody ContractsHistoryRequest request) {
+        IPage<PaymentHistory> page = paymentHistoryService.list(request);
+        if (CollUtil.isEmpty(page.getRecords())) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(page, MessageUtils.get("msg.query.success"));
+    }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/entity/ContractsHistory.java

@@ -24,7 +24,7 @@ public class ContractsHistory implements Serializable {
     private Long id;
 
     /**
-     * 合同编号
+     * 合同ID
      */
     private Long contractsId;
 

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/entity/PaymentHistory.java

@@ -0,0 +1,60 @@
+package cn.com.ty.lift.business.contract.dao.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author bieao
+ * @date 2020/2/26
+ * @description 付款操作记录
+ */
+@Data
+public class PaymentHistory {
+
+    /**
+     * 记录ID
+     */
+    @TableId(value = "id",type = IdType.ID_WORKER)
+    private Long id;
+
+    /**
+     * 合同ID
+     */
+    private Long contractsId;
+
+    /**
+     * 付款ID
+     */
+    private Long paymentId;
+
+    /**
+     * 操作项
+     */
+    private String description;
+
+    /**
+     * 操作前内容
+     */
+    private String beforeContent;
+
+    /**
+     * 操作后内容
+     */
+    private String afterContent;
+
+    /**
+     * 操作人
+     */
+    private Long operatorId;
+
+    /**
+     * 操作时间
+     */
+    private LocalDateTime operateDate;
+
+
+    private Integer pid;
+}

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

@@ -1,6 +1,6 @@
 package cn.com.ty.lift.business.contract.dao.entity.model.request;
 
-import cn.com.xwy.boot.controller.BaseRequestModel;
+import cn.com.ty.lift.common.model.PageRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ContractsHistoryRequest extends BaseRequestModel {
+public class ContractsHistoryRequest extends PageRequest {
 
     /**
      * 合同id

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/mapper/ContractsHistoryMapper.java

@@ -1,9 +1,7 @@
 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.request.ContractsHistoryRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  * @author bieao
@@ -12,6 +10,4 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  */
 public interface ContractsHistoryMapper extends BaseMapper<ContractsHistory> {
 
-    IPage<ContractsHistory> findByCondition(IPage page, ContractsHistoryRequest request);
-
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/mapper/PaymentHistoryMapper.java

@@ -0,0 +1,12 @@
+package cn.com.ty.lift.business.contract.dao.mapper;
+
+import cn.com.ty.lift.business.contract.dao.entity.PaymentHistory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author bieao
+ * @date 2020/2/26
+ * @description 付款操作记录数据层
+ */
+public interface PaymentHistoryMapper extends BaseMapper<PaymentHistory> {
+}

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

@@ -6,7 +6,6 @@ import cn.com.ty.lift.business.contract.dao.mapper.ContractsHistoryMapper;
 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.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -25,10 +24,9 @@ public class ContractHistoryService extends ServiceImpl<ContractsHistoryMapper,
      * @date 2020/1/8 11:37 上午
      */
     public IPage<ContractsHistory> list(ContractsHistoryRequest request) {
-        IPage<ContractsHistory> page = new Page<>(request.getPageNum(), request.getPageSize());
         QueryWrapper<ContractsHistory> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<ContractsHistory> lambdaQueryWrapper = queryWrapper.lambda();
         lambdaQueryWrapper.eq(ContractsHistory::getContractsId, request.getContractId());
-        return page(page, lambdaQueryWrapper);
+        return page(request.getPage(), lambdaQueryWrapper);
     }
 }

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

@@ -0,0 +1,32 @@
+package cn.com.ty.lift.business.contract.service;
+
+import cn.com.ty.lift.business.contract.dao.entity.PaymentHistory;
+import cn.com.ty.lift.business.contract.dao.entity.model.request.ContractsHistoryRequest;
+import cn.com.ty.lift.business.contract.dao.mapper.PaymentHistoryMapper;
+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 org.springframework.stereotype.Service;
+
+/**
+ * @author bieao
+ * @date 2020/2/26
+ * @description 付款操作记录业务层
+ */
+@Service
+public class PaymentHistoryService extends ServiceImpl<PaymentHistoryMapper, PaymentHistory> {
+
+    /**
+     * @param request 付款编号
+     * @return IPage<PaymentHistory> 付款历史记录
+     * @description 根据付款编号查询合同历史记录
+     * @date 2020/2/26 5:24 下午
+     */
+    public IPage<PaymentHistory> list(ContractsHistoryRequest request) {
+        QueryWrapper<PaymentHistory> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<PaymentHistory> lambdaQueryWrapper = queryWrapper.lambda();
+        lambdaQueryWrapper.eq(PaymentHistory::getContractsId, request.getContractId());
+        return page(request.getPage(), lambdaQueryWrapper);
+    }
+}

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

@@ -136,7 +136,7 @@ public class LiftController {
      */
     @PostMapping("detail")
     public RestResponse detail(@Valid @RequestBody LiftDetailRequest request) {
-        LiftExtendResponse response = liftService.detail(request.getId(), request.getProjectId());
+        Object response = liftService.detail(request.getId(), request.getProjectId());
         if (ObjectUtil.isEmpty(response)) {
             return RestResponse.success();
         }
@@ -151,7 +151,7 @@ public class LiftController {
      */
     @PostMapping("preJudgment")
     public RestResponse preJudgment(@RequestBody LiftExtensionRequest request) {
-        return liftService.preJudgment(request.getMtCompanyId(), request.getCode(), request.getProjectId());
+        return liftService.preJudgment(request.getMtCompanyId(), request.getCode());
     }
 
     /**

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

@@ -13,22 +13,22 @@ public class LiftResponse {
     /**
      * 电梯ID
      */
-    private String id;
+    private Long id;
 
     /**
      * 公司电梯关联主键id
      */
-    private String companyRelevanceId;
+    private Long companyRelevanceId;
 
     /**
      * 项目电梯关联主键id
      */
-    private String projectRelevanceId;
+    private Long projectRelevanceId;
 
     /**
      * 项目id
      */
-    private String projectId;
+    private Long projectId;
 
     /**
      * 电梯编号
@@ -64,7 +64,7 @@ public class LiftResponse {
     /**
      * 维保工id
      */
-    private String workerId;
+    private Long workerId;
     /**
      * 首保时间
      */

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

@@ -102,7 +102,10 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
      * @description 查询电梯详情
      * @date 2019/12/6 10:51 AM
      */
-    public LiftExtendResponse detail(Long id, Long projectId) {
+    public Object detail(Long id, Long projectId) {
+        if (ObjectUtil.isEmpty(projectId)) {
+            return getOne(null, id);
+        }
         return baseMapper.queryById(id, projectId);
     }
 
@@ -114,7 +117,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
      * @description 新增电梯前置判断条件
      * @date 2019/12/20 2:31 PM
      */
-    public RestResponse preJudgment(Long mtCompanyId, String registrationCode,Long projectId) {
+    public RestResponse preJudgment(Long mtCompanyId, String registrationCode) {
         //查询电梯表是否有该电梯
         Optional<Lift> lift = getOne(registrationCode, null);
         Long liftId = lift.map(Lift::getId).orElse(null);
@@ -127,7 +130,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
             if (result) {
                 return RestResponse.fail(MessageUtils.get("msg.lift.exist"));
             } else {
-                LiftExtendResponse detail = detail(liftId,projectId);
+                Object detail = detail(liftId, null);
                 return RestResponse.success(detail, MessageUtils.get("msg.lift.company.exist"));
             }
         } else {
@@ -193,7 +196,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
         Lift lift = request.getLift();
         /*if (judge(mtCompanyId))
         return RestResponse.fail(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.limit.num"));*/
-        RestResponse response = preJudgment(mtCompanyId, lift.getRegistrationCode(),request.getProjectId());
+        RestResponse response = preJudgment(mtCompanyId, lift.getRegistrationCode());
         if (ApiConstants.RESULT_ERROR.equals(response.getStatusCode())) return response;
         //新增标记 (0:新增,1:查询后带入)
         if ("0".equals(mark)) {

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

@@ -54,11 +54,6 @@ public class ProjectLiftRelevance extends BaseEntity {
      */
     private Integer liftLocked;
 
-    /**
-     * 是否删除 0否 1是
-     */
-    private Integer deleteFlag;
-
     /**
      * 首保时间
      */

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

@@ -1,26 +0,0 @@
-<?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="contracts_id" property="contractsId" jdbcType="BIGINT"/>
-        <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"/>
-        <result column="pid" property="pid" jdbcType="INTEGER"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-		id, contracts_id, description,before_content, after_content, operator_id, operate_date, pid
-	</sql>
-
-    <select id="findByCondition" resultMap="BaseResultMap" parameterType="java.lang.Long">
-        select
-        <include refid="Base_Column_List"/>
-        from contracts_history
-        where id = #{id,jdbcType=BIGINT}
-    </select>
-
-</mapper>

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

@@ -81,7 +81,7 @@
         LEFT JOIN project_lift_relevance plr ON pclr.mt_company_id = plr.mt_company_id and pclr.lift_id = plr.lift_id
         LEFT JOIN project p ON pclr.mt_company_id = p.mt_company_id and plr.project_id = p.id
         LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
-        WHERE plr.delete_flag = '0'
+        WHERE 1=1
         <if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
             AND pclr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
         </if>
@@ -100,6 +100,12 @@
         <if test="request.registrationCode!=null and request.registrationCode!=''">
             AND l.registration_code LIKE #{request.registrationCode,jdbcType=VARCHAR}
         </if>
+        <if test="request.regionId!=null and request.regionId!=''">
+            AND p.region_id = #{request.regionId,jdbcType=BIGINT}
+        </if>
+        <if test="request.projectId!=null and request.projectId!=''">
+            AND p.id = #{request.projectId,jdbcType=BIGINT}
+        </if>
     </select>
 
     <!-- 查询项目下电梯列表 -->
@@ -126,7 +132,7 @@
         LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
         LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
         LEFT JOIN platform_company_lift_relevance pclr ON plr.lift_id = pclr.lift_id AND pclr.id = plr.relevance_id
-        WHERE plr.delete_flag = '0'
+        WHERE 1=1
         <if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
             AND plr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
         </if>
@@ -138,29 +144,29 @@
     <!-- 选择电梯 -->
     <select id="chooseLiftList" resultType="cn.com.ty.lift.business.library.dao.entity.model.response.LiftResponse"
             parameterType="cn.com.ty.lift.business.library.dao.entity.model.request.LiftChooseRequest">
-        SELECT
-        l.id AS id,
-        l.lift_code AS liftCode,
-        l.registration_code AS registrationCode,
-        l.lift_type AS liftType,
-        l.device_position AS devicePosition,
-        lb.name AS liftBrand,
-        l.annual_inspection_date AS annualInspectionDate,
-        pclr.lift_company_status AS liftStatus,
-        pclr.id AS companyRelevanceId,
-        ui.name AS workerName,
-        plr.worker_id AS workerId
+        SELECT  l.id                     AS id,
+                l.lift_code              AS liftCode,
+                l.registration_code      AS registrationCode,
+                l.lift_type              AS liftType,
+                l.device_position        AS devicePosition,
+                lb.name                  AS liftBrand,
+                l.annual_inspection_date AS annualInspectionDate,
+                pclr.lift_company_status AS liftStatus,
+                pclr.id                  AS companyRelevanceId,
+                ui.name                  AS workerName,
+                plr.worker_id            AS workerId
         FROM platform_company_lift_relevance pclr
-        LEFT JOIN lift l ON pclr.lift_id = l.id
-        LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
-        LEFT JOIN project_lift_relevance plr ON pclr.lift_id = plr.lift_id
+                LEFT JOIN lift l ON pclr.lift_id = l.id
+                LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
+                LEFT JOIN project_lift_relevance plr ON pclr.lift_id = plr.lift_id
         AND pclr.id = plr.relevance_id
-        LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
+                LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
         WHERE pclr.lift_company_status != '1'
-        AND plr.delete_flag = '0'
+        AND l.lift_status = '2'
         <if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
             AND pclr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
         </if>
+        AND plr.project_id IS NULL
     </select>
 
     <!--根据公司和项目查询电梯 -->
@@ -188,7 +194,7 @@
                  LEFT JOIN project_lift_relevance plr ON l.id = plr.lift_id
                  LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
         WHERE l.id = #{id,jdbcType=BIGINT}
-          and plr.project_id = #{projectId};
+          AND plr.project_id = #{projectId}
     </select>
 
     <select id="queryLiftListByIdList" parameterType="java.util.List"

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

@@ -8,7 +8,6 @@
 		<result column="relevance_id" property="relevanceId" jdbcType="BIGINT" />
 		<result column="worker_id" property="workerId" jdbcType="BIGINT" />
 		<result column="lift_locked" property="liftLocked" jdbcType="BIT" />
-		<result column="delete_flag" property="deleteFlag" jdbcType="TINYINT" />
 		<result column="mt_companyId" property="mtCompanyId" jdbcType="BIGINT" />
 		<result column="first_time" property="firstTime" jdbcType="DATE" />
 		<result column="out_service_date" property="outServiceDate" jdbcType="DATE" />