年检排序及sql修改

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

@@ -107,10 +107,10 @@ public class AnnualInspectionController {
     public RestResponse page(@Val @RequestBody InspectionRequest request) {
         //计划与执行: 按年检时间由近及远排序,已完成: 按年检完成时间由近及远排序
         if(Objects.equals(request.getStatus(), ValuePool.INSPECTION_STATUS_TO_DO)){
-            request.addDesc("plan_date");
+            request.addAsc("plan_date");
         }
         if(Objects.equals(request.getStatus(), ValuePool.INSPECTION_STATUS_COMPLETE)){
-            request.addDesc("finish_time");
+            request.addAsc("finish_time");
         }
         IPage<InspectionResponse> pages = annualInspectionService.pageByCondition(request);
         long count = annualInspectionService.countByCondition(request);

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

@@ -394,6 +394,8 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
             if (!ret)
                 return RestResponse.fail(MessageUtils.get("msg.longitude.error"));
         }
+        LocalDate lastDay = lift.getAnnualInspectionDate().with(TemporalAdjusters.lastDayOfMonth());
+        lift.setAnnualInspectionDate(lastDay);
         boolean result = updateById(lift);
         if (!result)
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));

lift-business-service/src/main/resources/mapper/annualinspection/AnnualInspectionMapper.xml

@@ -85,6 +85,7 @@
     <!--多条件分页查询年检记录-->
 	<select id="pageByCondition" resultMap="BaseResultMap" parameterType="cn.com.ty.lift.business.annualinspection.dto.InspectionRequest" >
         SELECT
+            DISTINCT
             t.*,
             ui.name AS worker_name
         FROM
@@ -100,13 +101,15 @@
                 plr.worker_id
             FROM
                 annual_inspection ai
+            LEFT JOIN platform_company_lift_relevance pclr
+            ON ai.mt_company_id = pclr.mt_company_id AND ai.lift_id = pclr.lift_id
             LEFT JOIN project_lift_relevance plr ON ai.lift_id = plr.lift_id AND ai.mt_company_id = plr.mt_company_id
             LEFT JOIN project_user pu ON pu.project_id = plr.project_id AND pu.mt_company_id = ai.mt_company_id
             LEFT JOIN lift li ON ai.lift_id = li.id
             LEFT JOIN project pr ON pr.id = plr.project_id
             LEFT JOIN region re ON pr.region_id = re.id
             LEFT JOIN user_info ui ON ui.user_id = re.user_id
-            <where>
+            WHERE plr.delete_flag = '0' AND pclr.lift_company_status != '1'
                 <if test="cond.status != null">
                     AND ai.status = #{cond.status}
                 </if>
@@ -128,7 +131,6 @@
                 <if test="cond.workerId != null and cond.workerId > 0">
                     AND pu.user_id = #{cond.workerId}
                 </if>
-            </where>
             ) t
         LEFT JOIN user_info ui ON ui.user_id = t.worker_id
 	</select>