优化

王富生
1 parent 7590852d
Showing 2 changed files with 9 additions and 14 deletions
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
@@ -38,11 +38,9 @@
             a.creator_name,
             a.create_time
         FROM
-            garden_inspection_plan_commit a,
-            garden_inspection_plan b
-        where a.batch_no=b.batch_no
-        AND a.deleted = b. deleted
-          AND a.deleted = 0
+            garden_inspection_plan_commit a
+            INNER JOIN  garden_inspection_plan b ON a.batch_no = b.batch_no AND  a.deleted= b.deleted
+        where a.deleted = 0
         <if test="req.planNo != null and req.planNo !=''">
             and a.plan_no = #{req.planNo}
         </if>
@@ -125,15 +123,10 @@
             c.user_name,
             c.finish_time,
             c.remark
-        FROM
-            garden_inspection_plan a,
-            garden_inspection_plan_detail b,
-            garden_inspection_plan_commit c
-        WHERE a.batch_no = b.batch_no
-          AND b.plan_no=c.plan_no
-          AND a.dept_id =b.dept_id
-          AND a.deleted = b.deleted
-          AND a.deleted = 0
+        FROM garden_inspection_plan_detail b
+            INNER JOIN garden_inspection_plan a  ON a.batch_no = b.batch_no
+           INNER JOIN garden_inspection_plan_commit c ON c.plan_no = a.plan_no AND b.batch_no = c.batch_no
+        WHERE  a.deleted = 0
           AND b.plan_no = #{planNo}
         <if test="busiLineList != null and busiLineList.size() > 0">
             AND a.busi_line IN
@@ -141,5 +134,6 @@
                 #{id}
             </foreach>
         </if>
+        ODER BY c.id DESC
     </select>
 </mapper>
@@ -115,5 +115,6 @@
       INNER JOIN garden_maintain_plan b ON a.batch_no = b.batch_no
       INNER JOIN  garden_maintain_plan_commit c ON a.batch_no = c.batch_no AND a.plan_no = c.plan_no
        WHERE  a.plan_no = #{req.planNo}
+       ODER BY c.id DESC
    </select>
 </mapper>