Merge branch 'dongdingding' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationJava into duhanyu

ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml

@@ -243,6 +243,9 @@
           and id = #{assetId}
     </select>
     <select id="dwHc" resultType="com.ruoyi.tc.entity.response.AssetdwHcResponse">
+        select
+        h.dwmc,h.task_id,h.latest_create_time,h.task_deadline,h.total,h.checked,h.notChecked,h.dsp,h.shthcs,h.taskStatus
+        from(
         SELECT
         s.dwmc,
         s.task_id,
@@ -402,14 +405,14 @@
         ssdw,
         task_id
         ) AS s left join asset_task b on s.task_id=b.id
+        GROUP BY
+        s.dwmc ,
+        s.task_id)h
         <where>
             <if test="req.taskStatus != null and  req.taskStatus != ''">
-                b.task_status = #{req.taskStatus}
+                h.taskStatus = #{req.taskStatus}
             </if>
         </where>
-        GROUP BY
-        s.dwmc ,
-        s.task_id
 
 
     </select>