1.控制台 财务费用校验 增加审核时间的筛选

src/main/java/com/ydtech/modules/admin/model/vo/TaskStatisticsVo.java

@@ -75,6 +75,12 @@ public class TaskStatisticsVo implements Serializable {
     @ApiModelProperty(value = "时间筛选结束")
     private String endDate;
 
+    @ApiModelProperty("审核开始时间")
+    private String auditTimeStart;
+
+    @ApiModelProperty("审核结束时间")
+    private String auditTimeEnd;
+
 
     @ApiModelProperty(value = "天数")
     private String dateType;

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -1769,6 +1769,11 @@
             <if test="taskStatisticsVo.beginDate !=null and taskStatisticsVo.beginDate != '' and taskStatisticsVo.endDate !=null and taskStatisticsVo.endDate != ''">
                 AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN  DATE_FORMAT( #{taskStatisticsVo.beginDate}, '%Y-%m-%d')   AND  DATE_FORMAT( #{taskStatisticsVo.endDate}, '%Y-%m-%d')
             </if>
+
+            <if test="taskStatisticsVo.auditTimeStart !=null and taskStatisticsVo.auditTimeEnd != '' and taskStatisticsVo.auditTimeStart !=null and taskStatisticsVo.auditTimeEnd != ''">
+                AND   DATE_FORMAT( ifa.audittime, '%Y-%m-%d')   BETWEEN  DATE_FORMAT( #{taskStatisticsVo.auditTimeStart}, '%Y-%m-%d')   AND  DATE_FORMAT( #{taskStatisticsVo.auditTimeEnd}, '%Y-%m-%d')
+            </if>
+
             <if test="taskStatisticsVo.deptIds != null and taskStatisticsVo.deptIds != '' and taskStatisticsVo.deptIds.size() > 0">
                 AND io.deptid  in
                 <foreach collection="taskStatisticsVo.deptIds" item="item" open="(" separator="," close=")">
@@ -1819,6 +1824,10 @@
                 and su.name =#{taskStatisticsVo.reviewer}
             </if>
 
+            <if test="taskStatisticsVo.auditTimeStart !=null and taskStatisticsVo.auditTimeEnd != '' and taskStatisticsVo.auditTimeStart !=null and taskStatisticsVo.auditTimeEnd != ''">
+                AND   DATE_FORMAT( ifa.audittime, '%Y-%m-%d')   BETWEEN  DATE_FORMAT( #{taskStatisticsVo.auditTimeStart}, '%Y-%m-%d')   AND  DATE_FORMAT( #{taskStatisticsVo.auditTimeEnd}, '%Y-%m-%d')
+            </if>
+
             <if test="taskStatisticsVo.companyId !=null  and  taskStatisticsVo.companyId !=''">
                 and iac.company_id =#{taskStatisticsVo.companyId}
             </if>
@@ -1929,7 +1938,7 @@
     <select id="costCenterDetailsLicense" resultType="com.ydtech.modules.admin.model.dto.TaskStatisticsDto">
         SELECT
             io.licenseno as "licenseno",
-            iac.createtime as "createTime",
+            iot.createTime as "createTime",
             ifa.audittime as "auditTime",
             IFNULL(TIMESTAMPDIFF(SECOND, iac.createtime, ifa.audittime),0) as "timeDifference"
         FROM
@@ -1938,12 +1947,16 @@
             LEFT JOIN ins_area_company iac ON iac.orderno = io.orderno
             LEFT JOIN ptl_agreement pa ON pa.id = iac.agreement_id
             LEFT JOIN esm_ins_company eic ON eic.id = pa.partner_companies_id
+            left join (
+            select  distinct   suborder  as "suborder" , order_status as "orderStatus",create_time as "createTime"  from   ins_orders_track
+            )  iot  on iot.suborder  =  iac.id
             left join sys_user  su  on su.id =ifa.audituser
         <where>
             1=1
             and iac.id = ifa.ins_order_no
             AND iac.orderstatus = 3
             AND io.orderstatus = 3
+            AND iot.orderStatus ='3'
             AND ifa.audituser != '自动审核'
             AND (ifa.auditstatus ='1' or ifa.auditstatus ='0')
             <if test="taskStatisticsVo.reviewer !=null  and  taskStatisticsVo.reviewer !=''">
@@ -1970,6 +1983,10 @@
                 AND   DATE_FORMAT( ifa.audittime, '%Y-%m-%d')  BETWEEN  DATE_FORMAT( #{taskStatisticsVo.createtimeStart}, '%Y-%m-%d')   AND  DATE_FORMAT( #{taskStatisticsVo.createtimeEnd}, '%Y-%m-%d')
             </if>
 
+            <if test="taskStatisticsVo.auditTimeStart !=null and taskStatisticsVo.auditTimeEnd != '' and taskStatisticsVo.auditTimeStart !=null and taskStatisticsVo.auditTimeEnd != ''">
+                AND   DATE_FORMAT( ifa.audittime, '%Y-%m-%d')   BETWEEN  DATE_FORMAT( #{taskStatisticsVo.auditTimeStart}, '%Y-%m-%d')   AND  DATE_FORMAT( #{taskStatisticsVo.auditTimeEnd}, '%Y-%m-%d')
+            </if>
+
             <if test="taskStatisticsVo.beginDate !=null and taskStatisticsVo.beginDate != '' and taskStatisticsVo.endDate !=null and taskStatisticsVo.endDate != ''">
                 AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN  DATE_FORMAT( #{taskStatisticsVo.beginDate}, '%Y-%m-%d')   AND  DATE_FORMAT( #{taskStatisticsVo.endDate}, '%Y-%m-%d')
             </if>
@@ -1997,8 +2014,8 @@
     <select id="costCenterSecond" resultType="com.ydtech.modules.admin.model.dto.TaskStatisticsDtoNew">
         SELECT
         IFNULL(count(io.licenseno),0) as "orderNumber",
-        IFNULL(sum(TIMESTAMPDIFF(SECOND, iac.createtime, ifa.audittime)),0) as "sumSecond",
-        ROUND(IFNULL(sum(TIMESTAMPDIFF(SECOND, iac.createtime, ifa.audittime)),0) / count(io.licenseno),2)  as "averageSecond"
+        IFNULL(sum(TIMESTAMPDIFF(SECOND, iot.createTime, ifa.audittime)),0) as "sumSecond",
+        ROUND(IFNULL(sum(TIMESTAMPDIFF(SECOND, iot.createTime, ifa.audittime)),0) / count(io.licenseno),2)  as "averageSecond"
         FROM
             ins_fee_audit ifa
             LEFT JOIN ins_orders io ON io.orderno = ifa.orderno
@@ -2006,12 +2023,16 @@
             LEFT JOIN ptl_agreement pa ON pa.id = iac.agreement_id
             LEFT JOIN esm_ins_company eic ON eic.id = pa.partner_companies_id
             left join sys_user  su  on su.id =ifa.audituser
+            left join (
+            select  distinct   suborder  as "suborder" , order_status as "orderStatus",create_time as "createTime"  from   ins_orders_track
+            )  iot  on iot.suborder  =  iac.id
         <where>
             1=1
             and iac.id = ifa.ins_order_no
             AND iac.orderstatus = 3
             AND io.orderstatus = 3
             AND ifa.audituser != '自动审核'
+            AND iot.orderStatus ='3'
             AND (ifa.auditstatus ='1' or ifa.auditstatus ='0')
             <if test="taskStatisticsVo.reviewer !=null  and  taskStatisticsVo.reviewer !=''">
                 and su.name =#{taskStatisticsVo.reviewer}