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/emergency/mapper/EmergencyRepairMapper.java

@@ -34,7 +34,5 @@ public interface EmergencyRepairMapper extends BaseMapper<EmergencyRepair> {
 
     List<RepairResponse> listByIdList(@Param("cond") RepairRequest request);
 
-    long countDoingByWorker(@Param("cond") CommonRequest request);
-
     long countDoingByUser(@Param("cond") CommonRequest request);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/service/EmergencyRepairService.java

@@ -511,15 +511,6 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
     }
 
     public long countDoingByUser(CommonRequest request){
-        String currentRoleCode = request.getCurrentRoleCode();
-        if(Objects.nonNull(currentRoleCode)){
-            if(Objects.equals(CommonEnum.DefaultRole.MTWORK.getCode(), currentRoleCode)){
-                return baseMapper.countDoingByWorker(request);
-            }else{
-                return baseMapper.countDoingByUser(request);
-            }
-        }else{
-            return 0;
-        }
+        return baseMapper.countDoingByUser(request);
     }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/MaintenanceRecordController.java

@@ -8,6 +8,7 @@ import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MtRecordRequ
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MtOptionTree;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MtPlanResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MtRecordResponse;
+import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenanceRecordMapper;
 import cn.com.ty.lift.business.maintenance.service.*;
 import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
@@ -56,6 +57,7 @@ public class MaintenanceRecordController {
     private MaintenanceOptionService    maintenanceOptionService;
     private ProjectLiftRelevanceService projectLiftRelevanceService;
     private EvaluationService           evaluationService;
+    private MaintenanceRecordMapper     maintenanceRecordMapper;
 
     /**
      * 根据条件分页查询维保-日常保养
@@ -314,7 +316,10 @@ public class MaintenanceRecordController {
     @PostMapping("fill")
     @Validation(fields = {"id", "maintenanceOption", "imgs"})
     public RestResponse fill(@Val @RequestBody MtRecordRequest request) {
-        MaintenanceRecord entity = maintenanceRecordService.getById(request.getId());
+        Long planId = request.getId();
+        //根据计划id获取记录id
+        Long recordId = maintenanceRecordMapper.getRecordIdByPlanId(planId);
+        MaintenanceRecord entity = maintenanceRecordService.getById(recordId);
         Validate.notNull(entity, ValuePool.MAINTENANCE_RECORD_NOT_EXIST);
 
         entity.setMaintenanceOption(request.getMaintenanceOption());

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/PropertyMaintenanceController.java

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.business.maintenance.controller;
 
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.PropertyMaintenanceVO;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.DynamicMessageResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.PropertyMtResponse;
 import cn.com.ty.lift.business.maintenance.service.PropertyMaintenanceService;
 import cn.com.xwy.boot.web.dto.RestResponse;
@@ -28,4 +29,16 @@ public class PropertyMaintenanceController {
     public RestResponse<?> maintenanceNumForMonth(@RequestBody PropertyMaintenanceVO propertyMaintenanceVO) {
         return propertyMaintenanceService.queryMaintenancePlanMonth(propertyMaintenanceVO);
     }
+
+    @PostMapping("repair/message")
+    public RestResponse<?> repairMessage(@RequestBody PropertyMaintenanceVO propertyMaintenanceVO) {
+        IPage<DynamicMessageResponse> dynamicMessageResponsePage = new Page<>(propertyMaintenanceVO.getPageNum(), propertyMaintenanceVO.getPageSize());
+        return propertyMaintenanceService.queryEmergencyRepairDynamicMessage(dynamicMessageResponsePage, propertyMaintenanceVO);
+    }
+
+    @PostMapping("maintenance/message")
+    public RestResponse<?> maintenanceMessage(@RequestBody PropertyMaintenanceVO propertyMaintenanceVO) {
+        IPage<DynamicMessageResponse> dynamicMessageResponsePage = new Page<>(propertyMaintenanceVO.getPageNum(), propertyMaintenanceVO.getPageSize());
+        return propertyMaintenanceService.queryMaintenanceSuccessDynamicMessage(dynamicMessageResponsePage, propertyMaintenanceVO);
+    }
 }

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

@@ -22,7 +22,7 @@ public class MtRecordRequest extends PageRequest {
     /**
      * 主键id
      */
-    @Min(value = 1,message = "维保记录ID有误")
+    @Min(value = 1,message = "维保计划ID有误")
     private Long id;
     /**
      * 电梯id

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

@@ -0,0 +1,10 @@
+package cn.com.ty.lift.business.maintenance.dao.entity.model.response;
+
+import lombok.Data;
+
+@Data
+public class DynamicMessageResponse {
+    private Long id;
+    private String devicePosition;
+    private Integer hasEvaluate;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/mapper/MaintenanceRecordMapper.java

@@ -10,6 +10,7 @@ import cn.com.ty.lift.business.maintenance.dao.entity.model.response.*;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -66,4 +67,7 @@ public interface MaintenanceRecordMapper extends BaseMapper<MaintenanceRecord> {
     MtRecordResponse infoById(@Param("cond") MtRecordRequest request);
 
     IPage<MtRecordResponse> pageByLift(IPage<MtRecordResponse> page, @Param("cond") MtRecordRequest request);
+
+    @Select("SELECT id FROM maintenance_record WHERE mt_plan_id = #{planId}")
+    Long getRecordIdByPlanId(Long planId);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/mapper/PropertyMaintenanceMapper.java

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.business.maintenance.dao.mapper;
 
 import cn.com.ty.lift.business.maintenance.dao.entity.model.dto.MaintenancePlanMonthTaskNum;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.DynamicMessageResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.PropertyMtResponse;
 import cn.com.ty.lift.common.constants.SqlConstants;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,4 +19,10 @@ public interface PropertyMaintenanceMapper {
 
     @Select(SqlConstants.QUERY_MAINTENANCE_PLAN_MONTH_TASK_NUM)
     List<MaintenancePlanMonthTaskNum> queryMaintenancePlanMonth(Long userId, String yearMonth);
+
+    @Select(SqlConstants.QUERY_EMERGENCY_REPAIR_DYNAMIC_MESSAGE)
+    List<DynamicMessageResponse> queryEmergencyRepairDynamicMessage(IPage<DynamicMessageResponse> page, Long userId);
+
+    @Select(SqlConstants.QUERY_MAINTENANCE_SUCCESS_DYNAMIC_MESSAGE)
+    List<DynamicMessageResponse> queryMaintenanceSuccessDynamicMessage(IPage<DynamicMessageResponse> page, Long userId);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/PropertyMaintenanceService.java

@@ -2,6 +2,7 @@ package cn.com.ty.lift.business.maintenance.service;
 
 import cn.com.ty.lift.business.maintenance.dao.entity.model.dto.MaintenancePlanMonthTaskNum;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.PropertyMaintenanceVO;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.DynamicMessageResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.PropertyCalendarResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.PropertyMtResponse;
 import cn.com.ty.lift.business.maintenance.dao.mapper.PropertyMaintenanceMapper;
@@ -126,4 +127,26 @@ public class PropertyMaintenanceService {
         }
         return page;
     }
+
+    /**
+     * 物管，动态消息，急修分页
+     *
+     * @param dynamicMessageResponseIPage pageNum,pageSize
+     * @param propertyMaintenanceVO       userId
+     * @return 急修分页
+     */
+    public RestResponse<?> queryEmergencyRepairDynamicMessage(IPage<DynamicMessageResponse> dynamicMessageResponseIPage, PropertyMaintenanceVO propertyMaintenanceVO) {
+        return RestResponse.success(propertyMaintenanceMapper.queryEmergencyRepairDynamicMessage(dynamicMessageResponseIPage, propertyMaintenanceVO.getUserId()));
+    }
+
+    /**
+     * 物管，动态消息，维保分页
+     *
+     * @param dynamicMessageResponseIPage pageNum,pageSize
+     * @param propertyMaintenanceVO       userId
+     * @return 维保分页
+     */
+    public RestResponse<?> queryMaintenanceSuccessDynamicMessage(IPage<DynamicMessageResponse> dynamicMessageResponseIPage, PropertyMaintenanceVO propertyMaintenanceVO) {
+        return RestResponse.success(propertyMaintenanceMapper.queryMaintenanceSuccessDynamicMessage(dynamicMessageResponseIPage, propertyMaintenanceVO.getUserId()));
+    }
 }

lift-business-service/src/main/resources/mapper/emergency/EmergencyRepairMapper.xml

@@ -297,33 +297,26 @@
 		</where>
 	</select>
 
-    <select id="countDoingByWorker" resultType="java.lang.Long" parameterType="cn.com.ty.lift.business.common.CommonRequest">
-        SELECT
-            count(*)
-        FROM
-            emergency_repair er
-        WHERE er.status IN (0, 1)
-        <if test="cond.userId != null and cond.userId > 0">
-            AND er.worker_id1 = #{cond.userId}
-        </if>
-        <if test="cond.mtCompanyId != null and cond.mtCompanyId > 0">
-            AND er.mt_company_id = #{cond.mtCompanyId}
-        </if>
-
-    </select>
-
     <select id="countDoingByUser" resultType="java.lang.Long" parameterType="cn.com.ty.lift.business.common.CommonRequest">
         SELECT
-            count(*)
+            count(1)
         FROM
             emergency_repair er
+        <if test="cond.currentRoleCode == 'REGION_DIRECTOR'">
             LEFT JOIN project_user pu ON er.project_id = pu.project_id AND er.mt_company_id = pu.mt_company_id
-        WHERE er.status IN (0, 1)
-        <if test="cond.userId != null and cond.userId > 0">
-            AND pu.user_id = #{cond.userId}
         </if>
+        WHERE er.status = 1
         <if test="cond.mtCompanyId != null and cond.mtCompanyId > 0">
             AND er.mt_company_id = #{cond.mtCompanyId}
         </if>
+        <choose>
+            <when test="cond.userId != null and cond.currentRoleCode == 'REGION_DIRECTOR' ">
+                AND pu.user_id = #{cond.userId,jdbcType=BIGINT}
+            </when>
+            <when test="cond.userId != null and cond.currentRoleCode == 'ROLEMTWORK' ">
+                AND er.worker_id1 = #{cond.userId,jdbcType=BIGINT}
+            </when>
+            <otherwise/>
+        </choose>
     </select>
 </mapper>

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

@@ -278,15 +278,23 @@
 		SELECT
 			count(1)
 		FROM maintenance_plan mp
-		LEFT JOIN project_user pu ON pu.project_id = mp.project_id AND pu.mt_company_id = mp.mt_company_id
+		<if test="request.currentRoleCode == 'REGION_DIRECTOR'">
+			LEFT JOIN project_user pu ON pu.project_id = mp.project_id AND pu.mt_company_id = mp.mt_company_id
+		</if>
 		WHERE mp.status = '0'
 		AND mp.plan_date = current_date()
-		<if test="request.userId != null and request.userId > 0">
-			AND pu.user_id = #{request.userId}
-		</if>
 		<if test="request.mtCompanyId != null and request.mtCompanyId > 0">
 			AND mp.mt_company_id = #{request.mtCompanyId}
 		</if>
+		<choose>
+			<when test="request.userId != null and request.currentRoleCode == 'REGION_DIRECTOR' ">
+				AND pu.user_id = #{request.userId,jdbcType=BIGINT}
+			</when>
+			<when test="request.userId != null and request.currentRoleCode == 'ROLEMTWORK' ">
+				AND mp.worker_id = #{request.userId,jdbcType=BIGINT}
+			</when>
+			<otherwise/>
+		</choose>
 	</select>
 
 	<select id="exportList" parameterType="java.util.List" resultType="java.util.Map">

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

@@ -43,7 +43,8 @@
 		  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}
+		WHERE plr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
+		   AND plr.worker_id = #{request.workerId,jdbcType=BIGINT}
 	</select>
 
 	<select id="count" resultType="java.lang.Integer">

lift-common/src/main/java/cn.com.ty.lift.common/constants/SqlConstants.java

@@ -80,4 +80,20 @@ public interface SqlConstants {
                     "   where project_id in (select project_id from project_user where user_id = #{userId})" +
                     "       and DATE_FORMAT(plan_date, '%Y-%m') = #{yearMonth}" +
                     "       group by plan_date, status";
+
+    //动态消息，当日急修完成是否已经评价列表
+    String QUERY_EMERGENCY_REPAIR_DYNAMIC_MESSAGE =
+            "select     er.id id,l.device_position devicePosition, has_evaluate hasEvaluate" +
+                    "    from emergency_repair er" +
+                    "       left join lift l on er.lift_id = l.id" +
+                    "    where DATE_FORMAT(er.recovery_date, '%Y%m%d') = DATE_FORMAT(CURDATE(), '%Y%m%d')" +
+                    "       and project_id in (select project_id from project_user where user_id = #{userId})";
+
+    //动态消息，当日维保完成是否已经评价列表
+    String QUERY_MAINTENANCE_SUCCESS_DYNAMIC_MESSAGE =
+            "select     mr.id id,l.device_position devicePosition, has_evaluate hasEvaluate" +
+                    "    from maintenance_record mr" +
+                    "        left join lift l on mr.lift_id = l.id" +
+                    "    where DATE_FORMAT(mr.recovery_date, '%Y%m%d')  = DATE_FORMAT(CURDATE(), '%Y%m%d')" +
+                    "      and project_id in (select project_id from project_user where user_id = #{userId})";
 }