[chg]修改电梯列表查询

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

@@ -11,29 +11,24 @@ import lombok.Data;
 public class LiftRequest {
 
     /**
-     * 电梯状态
+     * 电梯状态（服务中：1，停止：0）
      */
     private Byte liftStatus;
 
     /**
-     * 区域
+     * 区域ID
      */
     private Long regionId;
 
     /**
-     * 项目名
+     * 项目ID
      */
-    private String projectName;
+    private String projectId;
 
     /**
-     * 电梯号
+     * 电梯品牌、电梯注册代码
      */
-    private String liftCode;
-
-    /**
-     * 电梯品牌
-     */
-    private String liftBrand;
+    private String condition;
 
     /**
      * 电梯类型

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

@@ -40,7 +40,7 @@ public class LiftResponse {
     /**
      * 维保工
      */
-    private String workerId;
+    private String workerName;
     /**
      * 首保时间
      */

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

@@ -26,4 +26,9 @@ public class SelectBatchPlatformCompanyRequest {
      */
     private String operate;
 
+    /**
+     * 维保公司id
+     */
+    private Long mtCompanyId;
+
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/mapper/LiftMapper.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
 
 /**
  * @author bieao
@@ -16,6 +15,6 @@ import java.util.List;
  */
 public interface LiftMapper extends BaseMapper<Lift> {
 
-    List<LiftResponse> findByCondition(IPage page, @Param("request") LiftRequest request);
+    IPage<LiftResponse> findByCondition(IPage<LiftResponse> page, @Param("request") LiftRequest request);
 
 }

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

@@ -16,6 +16,7 @@ import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.constants.RedisConstants;
 import cn.com.ty.lift.common.export.ExportUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -70,12 +71,14 @@ public class LiftService {
      */
     public RestResponse list(LiftRequest request) {
         IPage<LiftResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        List<LiftResponse> lifts = liftMapper.findByCondition(page, request);
-        if (lifts.isEmpty()) {
-            page.setRecords(new ArrayList<>());
+        if (request.getCondition() != null) {
+            request.setCondition(StrUtil.format("%{}%", request.getCondition()));
+        }
+        IPage<LiftResponse> lifts = liftMapper.findByCondition(page, request);
+        List<LiftResponse> responseList = lifts.getRecords();
+        if (responseList.isEmpty()) {
             return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
         }
-        page.setRecords(lifts);
         return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
     }
 
@@ -118,15 +121,15 @@ public class LiftService {
     }
 
     /**
-     * @param lift 电梯
+     * @param mtCompanyId 维保公司id
      * @return 比较结果
      * @description 判断当前公司台量是否大于企业设置的台量
      * @date 2019/12/12 5:27 PM
      */
-    public boolean judge(Lift lift) {
-        MaintenanceCompany company = maintenanceService.selectById(lift.getMtCompanyId());
+    public boolean judge(Long mtCompanyId) {
+        MaintenanceCompany company = maintenanceService.selectById(mtCompanyId);
         Integer limitedNum = company.getLimitedNum();
-        Integer currentNum = platformService.countLiftNum(lift.getMtCompanyId());
+        Integer currentNum = platformService.countLiftNum(mtCompanyId);
         return currentNum >= limitedNum;
     }
 
@@ -138,7 +141,8 @@ public class LiftService {
      */
     @Transactional
     public RestResponse add(Lift lift) {
-        if (judge(lift))
+        Long mtCompanyId = lift.getMtCompanyId();
+        if (judge(mtCompanyId))
             return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.limit.num"));
         //新增电梯表
         int liftResult = liftMapper.insert(lift);

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

@@ -31,6 +31,9 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
     @Resource
     private ProjectMapper projectMapper;
 
+    @Resource
+    private LiftService liftService;
+
     /**
      * @param extension
      * @return PlatformCompanyLiftRelevance
@@ -82,6 +85,10 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
         switch (operate) {
             //恢复服务
             case "1":
+                boolean judgeResult = liftService.judge(request.getMtCompanyId());
+                if (!judgeResult){
+                    return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.limit.num"));
+                }
                 break;
             //停止服务
             case "2":

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

@@ -26,17 +26,9 @@ public class ProjectRequest {
      */
     private Long regionId;
     /**
-     * 项目名称
+     * 项目名称、项目编号、甲方名称、项目地址
      */
-    private String projectName;
-    /**
-     * 项目编号
-     */
-    private String projectCode;
-    /**
-     * 项目地址
-     */
-    private String address;
+    private String condition;
 
     /**
      * 项目状态

lift-business-service/src/main/resources/application.yml

@@ -23,9 +23,7 @@ spring:
         max-idle: 8 #最大空闲链接
         max-wait: 20000ms
         min-idle: 0
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
+
 #自动添加createTime、isDelete 等字段
 xwy:
   mybatis:

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

@@ -60,26 +60,19 @@
 	<!-- 根据区域，项目，电梯号，电梯品牌，电梯类型，维保工查询电梯列表信息-->
 	<select id="findByCondition" resultType="cn.com.ty.lift.business.library.dao.entity.model.LiftResponse" parameterType="cn.com.ty.lift.business.library.dao.entity.model.LiftRequest" >
 		SELECT
-		a.lift_code           as liftCode,
-		a.registration_code   as registrationCode,
-		a.lift_brand          as liftBrand,
-		a.lift_type           as liftType,
-		a.device_position     as devicePosition,
-		b.project_name        as projectName,
-		c.user_id             as workerId,
-		d.lift_company_status as liftStatus,
-		e.plan_date           as planDate
-		FROM lift a, project b, project_lift_relevance c, platform_company_lift_relevance d ,maintenance_plan e
-		where a.id = c.lift_id and b.id = c.project_id and c.lift_id = d.lift_id and a.id = e.lift_id
-		and c.delete_flag = 0
-		<if test="request.liftBrand!=null and request.liftBrand!=''">
-			and lift_brand = #{request.liftBrand,jdbcType=VARCHAR}
-		</if>
+		l.lift_code           as liftCode,
+		l.registration_code   as registrationCode,
+		lb.name               as liftBrand,
+		l.lift_type           as liftType,
+		l.device_position     as devicePosition
+		FROM lift l,lift_brand lb
+		where lb.code = l.lift_brand
 		<if test="request.liftType!=null and request.liftType!=''">
-			and lift_type = #{request.liftType,jdbcType=VARCHAR}
+			and l.lift_type = #{request.liftType,jdbcType=VARCHAR}
 		</if>
-		<if test="request.regionId!=null and request.regionId!=''">
-			and b.region_id = #{request.regionId,jdbcType=VARCHAR}
+		<if test="request.condition!=null and request.condition!=''">
+			and (lb.name like #{request.condition,jdbcType=VARCHAR}
+			or l.registration_code like #{request.condition,jdbcType=VARCHAR})
 		</if>
 	</select>
 

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

@@ -66,14 +66,10 @@
 		<if test="request.regionId!=null and request.regionId!=''">
 			and region_id = #{request.regionId,jdbcType=VARCHAR}
 		</if>
-		<if test="request.projectName!=null and request.projectName!=''">
-			and project_name = #{request.projectName,jdbcType=VARCHAR}
-		</if>
-		<if test="request.projectCode!=null and request.projectCode!=''">
-			and project_code = #{request.projectCode,jdbcType=VARCHAR}
-		</if>
-		<if test="request.address!=null and request.address!=''">
-			and address = #{request.address,jdbcType=VARCHAR}
+		<if test="request.condition!=null and request.condition!=''">
+			(or project_name like #{request.condition,jdbcType=VARCHAR}
+			or project_code like #{request.condition,jdbcType=VARCHAR}
+			or address like #{request.condition,jdbcType=VARCHAR})
 		</if>
 		<if test="request.projectStatus!=null and request.projectStatus!=''">
 			and project_status = #{request.projectStatus,jdbcType=VARCHAR}