Merge branch 'test' into test-dj

src/main/java/com/ydtech/modules/admin/service/impl/TaskStatisticsServiceImpl.java

@@ -124,6 +124,7 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
         taskStatisticsVo.setEndDate(dateMapByType.get("endDate"));
 
         IPage<TaskStatisticsDto> list = this.insAreaCompanyMapper.queryPageTaskStatistics(page,taskStatisticsVo);
+        Long  total  = this.insAreaCompanyMapper.queryPageTaskStatisticsTotal(taskStatisticsVo);
         if (list != null && !list.getRecords().isEmpty()) {
             List<TaskStatisticsDto> records = list.getRecords();
             for (TaskStatisticsDto record : records) {
@@ -159,7 +160,6 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
                 taskStatisticsVo.setUserId(null);
             }
         }
-        Long  total  = this.insAreaCompanyMapper.queryPageTaskStatisticsTotal(taskStatisticsVo);
         list.setTotal(total);
         return list;
     }

src/main/java/com/ydtech/modules/order/components/zijin/ZijinDuplicateInsuranceComponents.java

@@ -78,7 +78,8 @@ public class ZijinDuplicateInsuranceComponents extends ResponseMessageAbstractHa
 
         //及时起保的
         if(CalculateFlagEnum.CF_2.getCode().equals(calculateFlag)){
-            jqEndDate = GuorenDuplicateInsuranceComponent.getTimelyEndDate(rtnMsg, TIMELY_JQ_REGEX);
+//            jqEndDate = GuorenDuplicateInsuranceComponent.getTimelyEndDate(rtnMsg, TIMELY_JQ_REGEX);
+            jqEndDate = GuorenDuplicateInsuranceComponent.getEndDate(rtnMsg, DAN_JQ_REGEX); // 获取日期修改
             if(jqEndDate.equals("")){
                 //正常的日期
                 jqEndDate = GuorenDuplicateInsuranceComponent.getEndDate(rtnMsg, DAN_JQ_REGEX);

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -1851,7 +1851,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                             retailProportion.getJqRetailLevel3Proportion(),
                             retailProportion.getSyRetailLevel3Proportion(),
                             retailProportion.getNoRetailLevel3Proportion());
-                    if (insFeeOrderNew.getFirstLevelUserId() != null) {
+                    if (insFeeOrderNew.getThreeLevelUserId() != null) {
                         SysUser byId = sysUserService.getById(insFeeOrderNew.getThreeLevelUserId());
                         retailFeeLevel3.setUserName(byId.getName() + "(" + byId.getId() + ")");
                     }

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

@@ -1896,15 +1896,21 @@
             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
+                SELECT
+                suborder AS "suborder",
+                min(create_time) AS "createTime"
+                FROM
+                ins_orders_track iot_
+                WHERE
+                order_status =3
+                GROUP BY
+                suborder
+                )  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 !=''">
@@ -1972,15 +1978,21 @@
             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
+                SELECT
+                suborder AS "suborder",
+                min(create_time) AS "createTime"
+                FROM
+                ins_orders_track iot_
+                WHERE
+                order_status =3
+                GROUP BY
+                suborder
             )  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}