年检和保养按角色查询任务

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

@@ -56,6 +56,10 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
      * @return IPage<InspectionResponse>
      */
     public IPage<InspectionResponse> pageByCondition(InspectionRequest request) {
+        //总经理查询所有年检任务
+        if (CommonEnum.DefaultRole.HIGH_DIRECTOR.getCode().equals(request.getCurrentRoleCode())) {
+            request.setUserId(null);
+        }
         return baseMapper.pageByCondition(request.getPage(), request);
     }
 

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

@@ -160,9 +160,10 @@
 			  <when test="request.userId > 0 and request.currentRoleCode == 'REGION_DIRECTOR' ">
 				  AND pu.user_id = #{request.userId,jdbcType=BIGINT}
 			  </when>
-		      <otherwise>
+		      <when test="request.userId !=null">
 				  AND mp.worker_id = #{request.userId,jdbcType=BIGINT}
-			  </otherwise>
+			  </when>
+		   <otherwise/>
 		  </choose>
 		<if test="request.status!=null and request.status!=''">
 			AND mp.status = #{request.status,jdbcType=VARCHAR}
@@ -200,9 +201,10 @@
 			<when test="request.userId > 0 and request.currentRoleCode == 'REGION_DIRECTOR' ">
 				AND pu.user_id = #{request.userId,jdbcType=BIGINT}
 			</when>
-			<otherwise>
+			<when test="request.userId !=null">
 				AND mp.worker_id = #{request.userId,jdbcType=BIGINT}
-			</otherwise>
+			</when>
+			<otherwise/>
 		</choose>
 		<if test="request.beginTime!=null">
 			AND <![CDATA[ mp.plan_date >= #{request.beginTime}]]>

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

@@ -131,9 +131,10 @@
             <when test="request.userId > 0 and request.currentRoleCode == 'REGION_DIRECTOR' ">
                 AND pu.user_id = #{request.userId,jdbcType=BIGINT}
             </when>
-            <otherwise>
+            <when test="request.userId !=null">
                 AND mr.worker_id1 = #{request.userId,jdbcType=BIGINT}
-            </otherwise>
+            </when>
+            <otherwise/>
         </choose>
 		<if test="request.status!=null and request.status!=''">
 			AND mr.status = #{request.status,jdbcType=VARCHAR}
@@ -171,9 +172,10 @@
             <when test="request.userId > 0 and request.currentRoleCode == 'REGION_DIRECTOR' ">
                 AND pu.user_id = #{request.userId,jdbcType=BIGINT}
             </when>
-            <otherwise>
+            <when test="request.userId !=null">
                 AND mr.worker_id1 = #{request.userId,jdbcType=BIGINT}
-            </otherwise>
+            </when>
+            <otherwise/>
         </choose>
         <if test="request.beginTime!=null">
             AND <![CDATA[ mr.plan_date >= #{request.beginTime}]]>