Merge branch 'feature-wcz' of lift-manager/lift-server into develop

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

@@ -101,6 +101,7 @@
             FROM
                 annual_inspection ai
             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
@@ -124,14 +125,12 @@
                 <if test="cond.projectId != null and cond.projectId > 0">
                     AND pr.id = #{cond.projectId}
                 </if>
+                <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
-        <where>
-            <if test="cond.workerId != null and cond.workerId > 0">
-                AND ui.user_id = #{cond.workerId}
-            </if>
-        </where>
 	</select>
 
     <select id="pageByLift" resultMap="BaseResultMap" parameterType="cn.com.ty.lift.business.annualinspection.dto.InspectionRequest" >
@@ -216,6 +215,7 @@
             FROM
                 annual_inspection ai
             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
@@ -225,17 +225,14 @@
                     AND ai.status = #{cond.status}
                 </if>
                 <if test="cond.mtCompanyId != null and cond.mtCompanyId > 0">
-                    AND plr.mt_company_id = #{cond.mtCompanyId}
+                    AND ai.mt_company_id = #{cond.mtCompanyId}
+                </if>
+                <if test="cond.userId != null and cond.userId > 0">
+                    AND pu.user_id = #{cond.userId}
                 </if>
             </where>
             ) t
         LEFT JOIN user_info ui ON ui.user_id = t.worker_id
-        LEFT JOIN project_user pu ON pu.project_id = t.project_id
-        <where>
-            <if test="cond.userId != null and cond.userId > 0">
-                AND pu.user_id = #{cond.userId}
-            </if>
-        </where>
     </select>
 
     <select id="countDoingByUser" resultType="java.lang.Long" parameterType="cn.com.ty.lift.business.common.CommonRequest">