1.控制台业务数据总数调整

src/main/resources/mapper/modules/admin/TaskStatisticsMapper.xml

@@ -105,37 +105,43 @@
         COUNT(0)
         FROM (
         SELECT
+        a.userId as "userId"
+        FROM (
+        SELECT
         io.userid AS "userId"
-
         FROM
         ins_area_company iac
         LEFT JOIN ins_orders io ON io.orderno = iac.orderno
+        LEFT JOIN sys_user su ON su.id = io.userid
         LEFT JOIN ins_fee_order_new ifon ON iac.id = ifon.ins_order_no
-        LEFT JOIN sys_dept sd ON sd.id = io.deptid
-        LEFT JOIN sys_user_role sur ON sur.user_id = io.userid
         WHERE
         iac.orderstatus = '3'
-        AND iac.del_flag = '1'
+        AND (iac.del_flag = '1' OR io.del_flag IS NULL OR io.del_flag = 1)
         <if test="vo.signingTimeStart != null and vo.signingTimeStart!='' and vo.signingTimeEnd != null and vo.signingTimeEnd != ''">
-            AND iac.signing_time BETWEEN #{vo.signingTimeStart} AND #{vo.signingTimeEnd}
+            AND DATE_FORMAT(iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{vo.signingTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{vo.signingTimeEnd}, '%Y-%m-%d')
         </if>
         <if test="vo.enterTimeStart != null and vo.enterTimeStart!='' and vo.enterTimeEnd != null and vo.enterTimeEnd != ''">
-            AND iac.createtime BETWEEN #{vo.enterTimeStart} AND #{vo.enterTimeEnd}
+            AND DATE_FORMAT(iac.createtime, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{vo.enterTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{vo.enterTimeEnd}, '%Y-%m-%d')
         </if>
         <if test="vo.userIds  !=null  and vo.userIds!=''  and vo.userIds.size()>0">
-            AND iac.leader_id IN
+            AND su.leader_id IN
             <foreach collection="vo.userIds" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
-        <if test="vo.leaderName !=null  and vo.leaderName!=''">
-            AND iac.leader_name = #{vo.leaderName}
-        </if>
+        GROUP BY
+        io.userid
+        ) a
+        LEFT JOIN sys_user su ON a.userId = su.id
+        LEFT JOIN sys_dept sd ON sd.id = su.dept_id
+        LEFT JOIN sys_user_role sur ON sur.user_id = su.id
+        WHERE
+        1 = 1
         <if test="vo.userId !=null  and vo.userId!=''">
-            AND io.userid = #{vo.userId}
+            AND su.id = #{vo.userId}
         </if>
         <if test="vo.userName !=null  and vo.userName!=''">
-            AND io.username = #{vo.userName}
+            AND su.name = #{vo.userName}
         </if>
         <if test="vo.managementSource !=null  and vo.managementSource!=''">
             AND sd.management_source = #{vo.managementSource}
@@ -159,9 +165,7 @@
         <if test="vo.deptId !=null  and vo.deptId!=''">
             AND sd.id LIKE CONCAT('%', #{vo.deptId}, '%')
         </if>
-        GROUP BY
-        io.userid
-        ) a;
+        ) a
     </select>
 
     <select id="getBusinessAgentDataTotalAdd" resultType="com.ydtech.modules.admin.model.vo.BusinessAgentData">