[chg] 查询待确认年检和根据用户查询年检加上区分当前登录角色

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/controller/AnnualInspectionController.java

@@ -137,7 +137,7 @@ public class AnnualInspectionController {
     @Validation(fields = {"mtCompanyId"})
     public RestResponse toConfirm(@Val @RequestBody InspectionRequest request){
         request.addAsc("annual_inspection_date");
-        IPage<LiftAnnualInspectionResponse> pages = liftService.toConfirmAnnualInspection(request.getPage(), request.getMtCompanyId(), 45);
+        IPage<LiftAnnualInspectionResponse> pages = liftService.toConfirmAnnualInspection(request.getPage(), request.getMtCompanyId(), request.getUserId(), request.getCurrentRoleCode(), 45);
         return RestResponse.success(pages);
     }
 

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/dto/InspectionRequest.java

@@ -148,4 +148,9 @@ public class InspectionRequest extends PageRequest {
     @NotNull(message = "请设置下次年检时间")
     @FutureOrPresent(message = "下次年检时间不得晚于标准北京时间")
     private LocalDate nextInspectionTime;
+
+    /**
+     * 当前用户角色code
+     */
+    private String currentRoleCode;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/service/AnnualInspectionService.java

@@ -83,6 +83,9 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
      * @return IPage<InspectionResponse>
      */
     public IPage<InspectionResponse> pageByUser(InspectionRequest request) {
+        if(Objects.equals(request.getCurrentRoleCode(), CommonEnum.DefaultRole.HIGH_DIRECTOR.getCode())){
+            request.setUserId(0L);
+        }
         return baseMapper.pageByUser(request.getPage(), request);
     }
 

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

@@ -43,7 +43,7 @@ public interface LiftMapper extends BaseMapper<Lift> {
     /**
      * 查询待确认的年检信息
      */
-    IPage<LiftAnnualInspectionResponse> toConfirmAnnualInspection(IPage<LiftAnnualInspectionResponse> page, @Param("mtCompanyId") Long mtCompanyId, @Param("days") int days);
+    IPage<LiftAnnualInspectionResponse> toConfirmAnnualInspection(IPage<LiftAnnualInspectionResponse> page, @Param("mtCompanyId") Long mtCompanyId, @Param("userId") Long userId, @Param("days") int days);
 
     List<Lift> groupByRegistrationCode();
 

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

@@ -37,7 +37,6 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -604,8 +603,11 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
      *
      * @return
      */
-    public IPage<LiftAnnualInspectionResponse> toConfirmAnnualInspection(IPage<LiftAnnualInspectionResponse> page, Long mtCompanyId, int days) {
-        return baseMapper.toConfirmAnnualInspection(page, mtCompanyId, days);
+    public IPage<LiftAnnualInspectionResponse> toConfirmAnnualInspection(IPage<LiftAnnualInspectionResponse> page, Long mtCompanyId, Long userId, String currentRoleCode, int days) {
+        if (Objects.equals(currentRoleCode, CommonEnum.DefaultRole.HIGH_DIRECTOR.getCode())) {
+            userId = 0L;
+        }
+        return baseMapper.toConfirmAnnualInspection(page, mtCompanyId, userId, days);
     }
 
     /**

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

@@ -239,6 +239,7 @@
             li.annual_inspection_date AS plan_date
         FROM lift li
         LEFT JOIN project_lift_relevance plr ON li.id = plr.lift_id
+        LEFT JOIN project_user pu ON pu.project_id = plr.project_id AND pu.mt_company_id = ai.mt_company_id
         LEFT JOIN project pr ON plr.project_id = pr.id
         LEFT JOIN region re ON re.id = pr.region_id
         LEFT JOIN user_info ui ON re.user_id = ui.user_id
@@ -249,6 +250,9 @@
         <if test="mtCompanyId != null and mtCompanyId > 0">
             AND plr.mt_company_id = #{mtCompanyId}
         </if>
+        <if test="userId != null and userId > 0">
+            AND pu.userId = #{userId}
+        </if>
     </select>
     <select id="groupByRegistrationCode" resultType="cn.com.ty.lift.business.library.dao.entity.Lift">
         SELECT