Browse Source

修复bug:年检统计sql错误

别傲 5 years ago
parent
commit
6a0bf6b112

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

@@ -271,22 +271,10 @@
         SELECT count(1) toConfirm
         FROM lift li
         LEFT JOIN platform_company_lift_relevance pclr ON li.id = pclr.lift_id AND pclr.lift_company_status!=1
-        <choose>
-            <when test=" request.currentRoleCode == 'REGION_DIRECTOR' or request.currentRoleCode == 'CLERK' or request.currentRoleCode == 'ROLEMTWORK' ">
-                LEFT JOIN project_lift_relevance plr ON li.id = plr.lift_id AND plr.delete_flag = '0'
-                LEFT JOIN annual_inspection ai ON ai.lift_id = li.id AND ai.plan_date = li.annual_inspection_date
-                AND ai.mt_company_id = plr.mt_company_id
-            </when>
-            <when test="request.currentRoleCode == 'REGION_DIRECTOR' or request.currentRoleCode == 'CLERK' ">
-                LEFT JOIN project_user pu ON pu.project_id = plr.project_id
-                LEFT JOIN annual_inspection ai ON ai.lift_id = li.id AND ai.plan_date = li.annual_inspection_date AND
-                pu.mt_company_id = ai.mt_company_id
-            </when>
-            <otherwise>
-                LEFT JOIN annual_inspection ai ON ai.lift_id = li.id AND pclr.mt_company_id = ai.mt_company_id
-                AND ai.plan_date = li.annual_inspection_date
-            </otherwise>
-        </choose>
+        LEFT JOIN project_lift_relevance plr ON li.id = plr.lift_id AND plr.delete_flag = '0'
+        LEFT JOIN annual_inspection ai ON ai.lift_id = li.id AND ai.plan_date = li.annual_inspection_date
+        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
         WHERE <![CDATA[li.annual_inspection_date <= date_add(curdate(), INTERVAL 45 DAY)]]>
         AND <![CDATA[li.annual_inspection_date >= curdate() AND isnull(ai.id)]]>
         AND pclr.mt_company_id = #{request.mtCompanyId}