Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-wcz

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

@@ -8,6 +8,7 @@ import cn.com.ty.lift.business.capital.service.CapitalRepairHistoryService;
 import cn.com.ty.lift.business.capital.service.CapitalRepairService;
 import cn.com.ty.lift.business.capital.service.SignInService;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
+import cn.com.ty.lift.business.library.dao.entity.model.response.LiftResponse;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
 import cn.com.ty.lift.business.project.service.ProjectUserService;
 import cn.com.ty.lift.common.verify.Val;
@@ -58,6 +59,19 @@ public class CapitalRepairController {
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }
 
+    /**
+     * @param request 电梯列表查询条件
+     * @return RestResponse 大修项目下电梯列表
+     * @description 查询大修项目下电梯列表
+     * @date 2020/4/29 3:02 下午
+     */
+    @PostMapping("lift/list")
+    @Validation(fields = {"mtCompanyId", "projectId"})
+    public RestResponse liftProjectList(@Val @RequestBody CapitalRepairRequest request) {
+        IPage<LiftResponse> page = capitalRepairService.liftProjectList(request);
+        return RestResponse.success(page, MessageUtils.get("msg.query.success"));
+    }
+
     /**
      * @param request 大修项目操作记录查询条件
      * @return RestResponse 大修项目操作记录分页列表结果

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/entity/CapitalRepairLiftRelevance.java

@@ -40,6 +40,11 @@ public class CapitalRepairLiftRelevance extends BaseEntity {
      */
     private Long workerId;
 
+    /**
+     * 是否锁定 0否 1是
+     */
+    private Integer liftLocked;
+
     /**
      * 是否删除 0否 1是
      */

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

@@ -3,6 +3,7 @@ package cn.com.ty.lift.business.capital.dao.mapper;
 import cn.com.ty.lift.business.capital.dao.entity.CapitalRepair;
 import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairRequest;
 import cn.com.ty.lift.business.capital.dao.entity.model.response.CapitalRepairResponse;
+import cn.com.ty.lift.business.library.dao.entity.model.response.LiftResponse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
@@ -16,4 +17,6 @@ public interface CapitalRepairMapper extends BaseMapper<CapitalRepair> {
 
     IPage<CapitalRepairResponse> findByCondition(IPage<CapitalRepairResponse> page, @Param("request") CapitalRepairRequest request);
 
+    IPage<LiftResponse> findLiftListByProjectId(IPage<LiftResponse> page, @Param("request") CapitalRepairRequest request);
+
 }

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

@@ -7,6 +7,7 @@ import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairReq
 import cn.com.ty.lift.business.capital.dao.entity.model.response.CapitalRepairResponse;
 import cn.com.ty.lift.business.capital.dao.mapper.CapitalRepairMapper;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
+import cn.com.ty.lift.business.library.dao.entity.model.response.LiftResponse;
 import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
 import cn.com.ty.lift.business.maintenance.service.MaintenanceService;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
@@ -25,7 +26,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
-import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -68,6 +68,16 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
         return baseMapper.findByCondition(request.getPage(), request);
     }
 
+    /**
+     * @param request 电梯列表查询条件
+     * @return IPage<LiftResponse> 大修项目电梯列表
+     * @description 查询大修项目电梯列表
+     * @date 2020/4/29 3:50 下午
+     */
+    public IPage<LiftResponse> liftProjectList(CapitalRepairRequest request) {
+        return baseMapper.findLiftListByProjectId(request.getPage(), request);
+    }
+
     /**
      * @param mtCompanyId   公司id
      * @param projectStatus 项目状态

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

@@ -52,8 +52,7 @@
                pc.name           AS companyName,
                c.overdue_date    AS overdueDate,
                c.overdue_reason  AS overdueReason,
-               c.overdue_flag    AS overdueFlag,
-               c.img_url         AS imgUrl
+               c.overdue_flag    AS overdueFlag
         FROM capital_repair c
         LEFT JOIN region r ON c.region_id = r.id
         LEFT JOIN user_info ui ON r.user_id = ui.user_id
@@ -69,4 +68,37 @@
             AND project_name LIKE concat('%',#{request.projectName,jdbcType=VARCHAR},'%')
         </if>
     </select>
+
+    <!-- 查询大修项目下电梯列表 -->
+    <select id="findLiftListByProjectId"
+            resultType="cn.com.ty.lift.business.library.dao.entity.model.response.LiftResponse"
+            parameterType="cn.com.ty.lift.business.library.dao.entity.model.request.LiftRequest">
+        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.id                  AS companyRelevanceId,
+                pclr.lift_company_status AS liftStatus,
+                crlr.project_id          AS projectId,
+                crlr.worker_id           AS workerId,
+                ui.name                  AS workerName,
+                crlr.lift_locked         AS liftLocked
+        FROM capital_repair_lift_relevance crlr
+                LEFT JOIN lift l ON crlr.lift_id = l.id
+                LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
+                LEFT JOIN user_info ui ON crlr.worker_id = ui.user_id
+                LEFT JOIN platform_company_lift_relevance pclr ON crlr.lift_id = pclr.lift_id
+                AND crlr.mt_company_id = pclr.mt_company_id
+       <where>
+           <if test="request.mtCompanyId!=null and request.mtCompanyId > 0">
+               AND crlr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
+           </if>
+           <if test="request.projectId!=null and request.projectId > 0">
+               AND crlr.project_id = #{request.projectId,jdbcType=BIGINT}
+           </if>
+       </where>
+    </select>
 </mapper>

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

@@ -68,22 +68,22 @@
 		LEFT JOIN region r ON p.region_id = r.id
 		WHERE plr.mt_company_id = #{request.mtCompanyId,jdbcType=VARCHAR}
 		AND pclr.lift_company_status != '1'
-		<if test="request.projectId!=null and request.projectId!=''">
+		<if test="request.projectId!=null and request.projectId > 0">
 			AND p.id = #{request.projectId,jdbcType=BIGINT}
 		</if>
-		<if test="request.workerId!=null and request.workerId!=''">
+		<if test="request.workerId!=null and request.workerId > 0">
 			AND mp.worker_id = #{request.workerId,jdbcType=BIGINT}
 		</if>
-		<if test="request.regionId!=null and request.regionId!=''">
+		<if test="request.regionId!=null and request.regionId > 0">
 			AND p.region_id = #{request.regionId,jdbcType=BIGINT}
 		</if>
-		<if test="request.planInterval!=null and request.planInterval!=''">
+		<if test="request.planInterval!=null and request.planInterval > 0">
 			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 test="request.beginTime!=null">
+			AND <![CDATA[mp.plan_date > #{request.beginTime}]]>
 		</if>
-		<if test="request.endTime!=null and request.endTime!=''">
+		<if test="request.endTime!=null">
 			AND <![CDATA[mp.plan_date < #{request.endTime,jdbcType=VARCHAR}]]>
 		</if>
 		<if test="request.registrationCode!=null and request.registrationCode!=''">