1.控制台查询

src/main/java/com/ydtech/modules/admin/model/dto/SysPartnerConsoleDto.java

@@ -60,5 +60,11 @@ public class SysPartnerConsoleDto implements Serializable {
     @ApiModelProperty(value = "头像")
     private String filePath;
 
+    @ApiModelProperty(value = "机构级别")
+    private String comlevel;
+
+    @ApiModelProperty(value = "性别")
+    private String sex;
+
 
 }

src/main/java/com/ydtech/modules/admin/model/dto/TaskStatisticsDto.java

@@ -93,4 +93,7 @@ public class TaskStatisticsDto {
 
     @ApiModelProperty(value = "保险公司图标")
     private String logo;
+
+    @ApiModelProperty(value = "天数")
+    private String days;
 }

src/main/java/com/ydtech/modules/admin/model/report/company/CompanyQutationCountDataQueryDto.java

@@ -46,5 +46,8 @@ public class CompanyQutationCountDataQueryDto {
     @ApiModelProperty("机构来源(1-渠道、2-个代)")
     private String  managementSource;
 
+    @ApiModelProperty("天数")
+    private String  days;
+
 
 }

src/main/java/com/ydtech/modules/admin/model/report/user/agree/AgreeReportDto.java

@@ -101,9 +101,9 @@ public class AgreeReportDto {
     @ApiModelProperty(value = "对接人")
     private String  dockingPerson;
 
-    @ApiModelProperty(value = "是否启用")
+    @ApiModelProperty(value = "是否有效")
     private String  validStatus;
 
-    @ApiModelProperty(value = "是否有效")
+    @ApiModelProperty(value = "是否启用")
     private String  isEenabled;
 }

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

@@ -4,6 +4,7 @@ package com.ydtech.modules.admin.model.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.validation.constraints.Min;
 import java.io.Serializable;
@@ -37,11 +38,28 @@ public class DeptBalanceVo implements Serializable {
     private String deptId;
 
     @ApiModelProperty(value = "用户id")
-    private String userId;
+    private String userCode;
 
     @ApiModelProperty(value = "用户idList")
     private List<String> userIdList;
 
     @ApiModelProperty(value = "是否是个代渠道")
     private String managementSource;
+    @ApiModelProperty(value = "手机号")
+    private String  phoneNumber ;
+
+    @ApiModelProperty(value = "姓名")
+    private String  name;
+
+    @ApiModelProperty(value = "开始时间")
+    private String  beginDate;
+
+    @ApiModelProperty(value = "结束时间")
+    private String  endDate;
+
+    @ApiModelProperty(value = "天数")
+    private String  days;
+
+
+
 }

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

@@ -13,17 +13,17 @@ import com.ydtech.modules.admin.model.SysPartner;
 import com.ydtech.modules.admin.model.SysRelationPerson;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.dto.DeptBalanceDto;
+import com.ydtech.modules.admin.model.dto.MySumAmountQueryDto;
 import com.ydtech.modules.admin.model.dto.SysPartnerConsoleDto;
+import com.ydtech.modules.admin.model.po.SysUserAccount;
 import com.ydtech.modules.admin.model.vo.DeptBalanceVo;
 import com.ydtech.modules.admin.model.vo.PartnerBalanceVo;
 import com.ydtech.modules.admin.model.vo.SysAmountAuditingVo;
 import com.ydtech.modules.admin.model.vo.SysUserVO;
-import com.ydtech.modules.admin.service.DeptBalanceService;
-import com.ydtech.modules.admin.service.SysAgencyLeaderService;
-import com.ydtech.modules.admin.service.SysAmountAuditingService;
-import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.admin.service.*;
 import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.order.service.InsOrdersService;
+import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
 import com.ydtech.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -51,6 +51,10 @@ public class DeptBalanceServiceImpl implements DeptBalanceService {
     private SysUserService sysUserService;
     @Autowired
     private SysAmountAuditingService sysAmountAuditingService;
+    @Autowired
+    private InsFeeOrderNewService insFeeOrderNewService;
+    @Autowired
+    private SysUserAccountService sysUserAccountService;
 
     /**
      * @version
@@ -138,7 +142,6 @@ public class DeptBalanceServiceImpl implements DeptBalanceService {
                 item.setDeptManagementFee(allDeptManagementFee);
                 item.setWithdrawn(allWithdrawn);
                 item.setNotWithdrawn(allNotWithdrawn);
-
             }
             return HttpResult.ok(sysPartnersPage);
         } catch (Exception e) {
@@ -240,15 +243,21 @@ public class DeptBalanceServiceImpl implements DeptBalanceService {
                     record.setTotalIncome(orderAmount.get("totalIncome"));
                 }
 //                          已提现
-                SysAmountAuditingVo sysAmountAuditingVo = new SysAmountAuditingVo();
-                sysAmountAuditingVo.setUserId(userId);
-                sysAmountAuditingVo.setAuditingStatus("3");
-                BigDecimal withdrawn = sysAmountAuditingService.querySumAmount(sysAmountAuditingVo);
-                record.setWithdrawn(withdrawn);
+                BigDecimal ysTXAmount= insFeeOrderNewService.findMyAmountYTXmount(record.getUserId(),"3");
 //                          未提现
-                sysAmountAuditingVo.setAuditingStatus("2");
-                BigDecimal notWithdrawn = sysAmountAuditingService.querySumAmount(sysAmountAuditingVo);
-                record.setNotWithdrawn(notWithdrawn);
+                MySumAmountQueryDto mySumAmountQueryDto = new MySumAmountQueryDto();
+                mySumAmountQueryDto.setAuditstatus("1");
+                SysUserAccount sysUserAccountEntity = sysUserAccountService.getById(record.getUserId());
+                BigDecimal ssKTAmount =BigDecimal.ZERO;
+                BigDecimal txzTXAmount= insFeeOrderNewService.findMyAmountYTXmount(mySumAmountQueryDto.getUserId(),"2");
+
+                if(sysUserAccountEntity!=null){
+                    ssKTAmount = sysUserAccountEntity.getSumAmount()==null?BigDecimal.ZERO: sysUserAccountEntity.getSumAmount();
+                }
+                BigDecimal sumAmount=ysTXAmount.add(ssKTAmount).add(txzTXAmount);
+                record.setWithdrawn(ysTXAmount);
+                record.setNotWithdrawn(ssKTAmount);
+                record.setTotalIncome(sumAmount);
             }
         }
         return sysUserListPage;

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

@@ -268,9 +268,18 @@ public class UserReportServiceImpl implements UserReportService {
                 wrapper.eq("operatorCode", userId);
                 wrapper.eq("status", "1");
                 List<SysUser> sysUsers = sysUserMapper.selectList(wrapper);
-                if (!sysUsers.isEmpty()) {
-                    List<String> collect = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
-                    QxFrontlineAgentDto qxFrontlineAgentDto = new QxFrontlineAgentDto();
+                List<String> collect = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
+                QxFrontlineAgentDto qxFrontlineAgentDto = new QxFrontlineAgentDto();
+                qxFrontlineAgentDto.setIds(new ArrayList<>());
+
+                if (!collect.isEmpty()) {
+                    qxFrontlineAgentDto.setCreatetimeEnd(qxFrontlineAgentVo.getCreatetimeEnd());
+                    qxFrontlineAgentDto.setCreatetimeStart(qxFrontlineAgentVo.getCreatetimeStart());
+                    qxFrontlineAgentDto.getIds().addAll(collect);
+                    QxFrontlineAgentDto taskStatisticsDto = insAreaCompanyMapper.getOrderManpowerNew(qxFrontlineAgentDto);
+                    item.setTotalPremium(taskStatisticsDto.getTotalPremium());
+                }else {
+                    collect.add(userId);
                     qxFrontlineAgentDto.setCreatetimeEnd(qxFrontlineAgentVo.getCreatetimeEnd());
                     qxFrontlineAgentDto.setCreatetimeStart(qxFrontlineAgentVo.getCreatetimeStart());
                     qxFrontlineAgentDto.getIds().addAll(collect);

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

@@ -8,29 +8,41 @@
         sd.id as "deptId",
         sd.name as "deptName",
         sd.address as "deptAddress",
-        su.name as "userName",
+        sa.user_name as "userName",
         sd.comlevel as "comLevel",
         IFNULL(b.sumPremium,0) as "deptManagementFee",
-        IFNULL(b.sumPremium,0) * IFNULL((sal.proportional /100),0) as "totalIncome",
-        IFNULL(b.sumPremium,0) * IFNULL((sal.proportional /100),0) -IFNULL(c.sumHistoryFee,0) as "notWithdrawn",
+        IFNULL(b.sumPremium,0) * IFNULL((sa.proportional /100),0) as "totalIncome",
+        IFNULL(b.sumPremium,0) * IFNULL((sa.proportional /100),0) -IFNULL(c.sumHistoryFee,0) as "notWithdrawn",
         IFNULL(c.sumHistoryFee,0) as "withdrawn"
         FROM
-        sys_dept sd
-        left join sys_agency_leader sal on sal.dept_id =sd.id
-        left join sys_user su on su.id =sal.user_id
-        left join (
-        select io.userid as "userId", sum(iac.sumpremium) as "sumPremium"
-        from ins_orders io
-        left join ins_area_company iac on iac.orderno =io.orderno
-        where iac.orderstatus='3'
-        GROUP BY io.userid
-        ) b on b.userId = su.id
-        left join (
-        select sum(safa.history_fee) as "sumHistoryFee",safa.user_id as "userId" from sys_agency_fee_approval_record
-        safa
-        where safa.`status`='1'
-        group by safa.user_id
-        ) c on c.userId =su.id
+        sys_agency_leader sa
+        LEFT JOIN sys_dept sd ON sd.id = sa.dept_id
+        LEFT JOIN (
+        SELECT
+        io.userid AS "userId",
+        sum( IFNULL( iac.jqpremium, 0 ) )+ sum(
+        IFNULL( sypremium, 0 )) + sum(
+        IFNULL( jypremium, 0 )) AS "sumPremium"
+        FROM
+        ins_orders io
+        LEFT JOIN ins_area_company iac ON iac.orderno = io.orderno
+        WHERE
+        iac.orderstatus = '3'
+        AND io.orderstatus = '3'
+        GROUP BY
+        io.userid
+        ) b ON b.userId = sa.user_id
+        LEFT JOIN (
+        SELECT
+        sum( safa.history_fee ) AS "sumHistoryFee",
+        safa.user_id AS "userId"
+        FROM
+        sys_agency_fee_approval_record safa
+        WHERE
+        safa.`status` = '1'
+        GROUP BY
+        safa.user_id
+        ) c ON c.userId = sa.user_id
         <where>
             1=1
             <if test="vo.provinceId != null and vo.provinceId != ''">
@@ -103,18 +115,37 @@
         su.name as "userName",
         sd.id as "deptId",
         sd.name as "deptName",
-        inf.file_path  as "filePath"
+        inf.file_path  as "filePath",
+        suif.sex as "sex"
         from sys_user su
         left join sys_dept sd on sd.id=su.dept_id
         LEFT JOIN  ins_upload_files   inf on  su.head_sculpture  =inf.id
+        LEFT JOIN  sys_user_info suif  on suif.id =su.id
         <where>
             1=1
+            and su.id  LIKE '%M%'
             <if test="vo.managementSource !=null  and  vo.managementSource !=''">
               and  sd.management_source =#{vo.managementSource}
             </if>
             <if test="vo.deptId !=null  and  vo.deptId !=''">
                 and sd.id like  concat('%',#{vo.deptId},'%')
             </if>
+            <if test="vo.phoneNumber !=null  and  vo.phoneNumber !=''">
+                and su.mobile =#{vo.phoneNumber}
+            </if>
+            <if test="vo.name !=null  and  vo.name !=''">
+                and su.name =#{vo.name}
+            </if>
+            <if test="vo.userCode !=null  and  vo.userCode !=''">
+                and su.id= #{vo.userCode}
+            </if>
+            <if test="vo.days !=null  and vo.days !='' ">
+                and su.create_time >= DATE_SUB(NOW(), INTERVAL #{vo.days} DAY)
+            </if>
+
+            <if test="vo.beginDate !=null and vo.beginDate != '' and vo.endDate !=null and vo.endDate != ''">
+                AND   DATE_FORMAT( su.create_time, '%Y-%m-%d')   BETWEEN #{vo.beginDate} AND #{vo.endDate}
+            </if>
 
         </where>
     </select>

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

@@ -13,8 +13,23 @@
     </resultMap>
 
     <select id="queryPage" resultType="com.ydtech.modules.admin.model.dto.SysPartnerConsoleDto">
-        select *
+        select
+        sp.id as "id",
+        sp.user_id as "userId",
+        sp.user_name as "userName",
+        sp.type as "type",
+        sp.proportional as "proportional",
+        sp.suggest_id as "suggestId",
+        sp.suggest_name as "suggestName",
+        sp.create_time as "createTime",
+        sp.create_by as "createBy",
+        sp.del_flag as "delFlag",
+        sp.del_flag as "delFlag",
+        sd.name as "deptName",
+        sd.comlevel as "comlevel"
         from sys_partner sp
+        left join  sys_user su on  su.id =  sp.user_id
+        left join  sys_dept sd on  sd.id =  su.dept_id
         <where>
             1=1
             and sp.del_flag ='1'
@@ -24,6 +39,21 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="vo.phoneNumber !=null  and  vo.phoneNumber !=''">
+                and su.mobile =#{vo.phoneNumber}
+            </if>
+            <if test="vo.name !=null  and  vo.name !=''">
+                and su.name =#{vo.name}
+            </if>
+            <if test="vo.userCode !=null  and  vo.userCode !=''">
+                and su.id= #{vo.userCode}
+            </if>
+            <if test="vo.days !=null  and vo.days !='' ">
+                and su.create_time >= DATE_SUB(NOW(), INTERVAL #{vo.days} DAY)
+            </if>
+            <if test="vo.beginDate !=null and vo.beginDate != '' and vo.endDate !=null and vo.endDate != ''">
+                AND DATE_FORMAT( su.create_time, '%Y-%m-%d')   BETWEEN #{vo.beginDate} AND #{vo.endDate}
+            </if>
         </where>
     </select>
 

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -2882,9 +2882,17 @@
                 FROM
                     `ins_fee_audit` ifa
                         LEFT JOIN ins_area_company iac ON iac.id = ifa.ins_order_no
-                WHERE
+                <where>
                     ifa.auditstatus = '1'
-                  AND iac.signing_time IS NOT NULL
+                    AND iac.signing_time IS NOT NULL
+                    <if test="vo.year !=null  and  vo.year !=''">
+                       and DATE_FORMAT( iac.signing_time, '%Y') =#{vo.year}
+                    </if>
+                    <if test="vo.days !=null  and vo.days !='' ">
+                        and iac.signing_time >= DATE_SUB(NOW(), INTERVAL #{vo.days} DAY)
+                    </if>
+                </where>
+
                 GROUP BY
                     DATE_FORMAT( iac.signing_time, '%Y-%m' )
             ) a
@@ -2894,6 +2902,9 @@
                     DATE_FORMAT( ipi.signdate, '%Y-%m' ) AS "signingTime"
                 FROM
                     ins_ply_income ipi
+                <where>
+                    1=1
+                </where>
                 GROUP BY
                     DATE_FORMAT( ipi.signdate, '%Y-%m' )
             ) b ON a.signingTime = b.signingTime
@@ -2903,7 +2914,9 @@
                 from sys_amount_auditing a
                          left join sys_user_account_history b on a.id = b.auditiing_id
                          left join sys_user su on su.id =a.user_id
-                where a.auditing_status= '3'
+                <where>
+                    a.auditing_status= '3'
+                </where>
                 GROUP BY DATE_FORMAT( a.auditing_time, '%Y-%m' )
             ) c  on  c.auditingTime  =a.signingTime
         left  join  (
@@ -2917,10 +2930,11 @@
                         LEFT JOIN ins_fee_audit ifa ON ifo.ins_order_no = ifa.ins_order_no
                         LEFT JOIN ins_area_company iac ON ifa.ins_order_no = iac.id
                         LEFT JOIN ins_orders io ON iac.orderno = io.orderno
-                WHERE
+                <where>
                     ifa.auditstatus = '1'
-                  AND iac.orderstatus = '3'
-                  AND io.orderstatus = '3'
+                    AND iac.orderstatus = '3'
+                    AND io.orderstatus = '3'
+                </where>
                 GROUP BY
                     DATE_FORMAT( iac.signing_time, '%Y-%m' )
             ) d  on  d.signingTime =a.signingTime
@@ -2936,20 +2950,22 @@
                                                                                                                                             left  join  inv_account_expenses  b  on a.parent_id =b.expenses_id
                         where   b.category  is  not  null
                     )  b on a.fund_use  = b.bCategory  and  a.fund_fen  = b.aCategory
-                WHERE
+                <where>
                     a.out_card_num IN (
-                        SELECT
-                            bank_card_num
-                        FROM
-                            inv_account_card iac
-                                LEFT JOIN inv_account ia ON iac.account_id = ia.account_id
-                        WHERE
-                            ia.del_flag = '0'
-                          AND ia.outer_flag LIKE concat( '%', '0', '%' )
+                    SELECT
+                    bank_card_num
+                    FROM
+                    inv_account_card iac
+                    LEFT JOIN inv_account ia ON iac.account_id = ia.account_id
+                    WHERE
+                    ia.del_flag = '0'
+                    AND ia.outer_flag LIKE concat( '%', '0', '%' )
                     )
-                  AND a.revenue_outlay = '1'
-                  AND a.del_flag = '0'
-                  AND b.expenditureDetails = '1'
+                    AND a.revenue_outlay = '1'
+                    AND a.del_flag = '0'
+                    AND b.expenditureDetails = '1'
+                </where>
+
                 GROUP BY  DATE_FORMAT( a.create_time, '%Y-%m' )  , b.expenditureDetails
             ) e on  e.createTime =a.signingTime
         left  join (
@@ -2964,20 +2980,21 @@
                                                                                                                                             left  join  inv_account_expenses  b  on a.parent_id =b.expenses_id
                         where   b.category  is  not  null
                     )  b on a.fund_use  = b.bCategory  and  a.fund_fen  = b.aCategory
-                WHERE
+                <where>
                     a.out_card_num IN (
-                        SELECT
-                            bank_card_num
-                        FROM
-                            inv_account_card iac
-                                LEFT JOIN inv_account ia ON iac.account_id = ia.account_id
-                        WHERE
-                            ia.del_flag = '0'
-                          AND ia.outer_flag LIKE concat( '%', '0', '%' )
+                    SELECT
+                    bank_card_num
+                    FROM
+                    inv_account_card iac
+                    LEFT JOIN inv_account ia ON iac.account_id = ia.account_id
+                    WHERE
+                    ia.del_flag = '0'
+                    AND ia.outer_flag LIKE concat( '%', '0', '%' )
                     )
-                  AND a.revenue_outlay = '1'
-                  AND a.del_flag = '0'
-                  AND b.expenditureDetails = '2'
+                    AND a.revenue_outlay = '1'
+                    AND a.del_flag = '0'
+                    AND b.expenditureDetails = '2'
+                </where>
                 GROUP BY  DATE_FORMAT( a.create_time, '%Y-%m' )  , b.expenditureDetails
             ) f on  f.createTime =a.signingTime
             left join  (
@@ -2992,20 +3009,21 @@
                                                                                                                                             left  join  inv_account_expenses  b  on a.parent_id =b.expenses_id
                         where   b.category  is  not  null
                     )  b on a.fund_use  = b.bCategory  and  a.fund_fen  = b.aCategory
-                WHERE
+                <where>
                     a.out_card_num IN (
-                        SELECT
-                            bank_card_num
-                        FROM
-                            inv_account_card iac
-                                LEFT JOIN inv_account ia ON iac.account_id = ia.account_id
-                        WHERE
-                            ia.del_flag = '0'
-                          AND ia.outer_flag LIKE concat( '%', '0', '%' )
+                    SELECT
+                    bank_card_num
+                    FROM
+                    inv_account_card iac
+                    LEFT JOIN inv_account ia ON iac.account_id = ia.account_id
+                    WHERE
+                    ia.del_flag = '0'
+                    AND ia.outer_flag LIKE concat( '%', '0', '%' )
                     )
-                  AND a.revenue_outlay = '1'
-                  AND a.del_flag = '0'
-                  AND b.expenditureDetails = '3'
+                    AND a.revenue_outlay = '1'
+                    AND a.del_flag = '0'
+                    AND b.expenditureDetails = '3'
+                </where>
                 GROUP BY  DATE_FORMAT( a.create_time, '%Y-%m' )  , b.expenditureDetails
             ) j on  j.createTime =a.signingTime
          left  join (
@@ -3020,20 +3038,21 @@
                                                                                                                                             left  join  inv_account_expenses  b  on a.parent_id =b.expenses_id
                         where   b.category  is  not  null
                     )  b on a.fund_use  = b.bCategory  and  a.fund_fen  = b.aCategory
-                WHERE
+                <where>
                     a.out_card_num IN (
-                        SELECT
-                            bank_card_num
-                        FROM
-                            inv_account_card iac
-                                LEFT JOIN inv_account ia ON iac.account_id = ia.account_id
-                        WHERE
-                            ia.del_flag = '0'
-                          AND ia.outer_flag LIKE concat( '%', '0', '%' )
+                    SELECT
+                    bank_card_num
+                    FROM
+                    inv_account_card iac
+                    LEFT JOIN inv_account ia ON iac.account_id = ia.account_id
+                    WHERE
+                    ia.del_flag = '0'
+                    AND ia.outer_flag LIKE concat( '%', '0', '%' )
                     )
-                  AND a.revenue_outlay = '1'
-                  AND a.del_flag = '0'
-                  AND b.expenditureDetails = '4'
+                    AND a.revenue_outlay = '1'
+                    AND a.del_flag = '0'
+                    AND b.expenditureDetails = '4'
+                </where>
                 GROUP BY  DATE_FORMAT( a.create_time, '%Y-%m' )  , b.expenditureDetails
             )  g  on  g.createTime  =a.signingTime
 

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

@@ -851,9 +851,6 @@
             agree.partner_companies_id AS parterCompanyId,
             ins.NAME AS parterCompanyName,
             count(iac.orderstatus) AS qutationCount,
-            '-' as  bigQutationCount,
-            '-' as  bigUnderwritingCount,
-            '-' as  bigCloseRate,
             COUNT( CASE WHEN iac.orderstatus = 2 THEN 1 END ) AS underwritingCount,
             COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) AS qutationInsureCount,
             COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END )/ count(iac.orderstatus) AS passRate,
@@ -879,6 +876,9 @@
             <if test="vo.managementSource  != null  and  vo.managementSource!=''">
                 AND  sd.management_source  =#{vo.managementSource}
             </if>
+            <if test="vo.days !=null  and vo.days !='' ">
+                and iac.signing_time >= DATE_SUB(NOW(), INTERVAL #{vo.days} DAY)
+            </if>
         GROUP BY
             agree.insurance_company_id,
             agree.insurance_company,
@@ -1423,6 +1423,9 @@
         <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
             AND iac.signing_time BETWEEN #{vo.createtimeStart} AND #{vo.createtimeStart}
         </if>
+        <if test="vo.days !=null  and vo.days !='' ">
+            and iac.signing_time >= DATE_SUB(NOW(), INTERVAL #{vo.days} DAY)
+        </if>
         <if test="vo.provinceId != null and vo.provinceId != ''">
             and io.deptid like "${vo.provinceId}%"
         </if>

src/main/resources/mapper/modules/protocol/PtlAgreementMapper.xml

@@ -171,7 +171,8 @@
         pa.agreement_name AS agreementName,
         pa.docking_person AS dockingPerson,
         pa.create_time AS createTime,
-        pa.valid_status AS validStatus,
+        pa.valid_status AS isEenabled,
+        NOW() BETWEEN pa.start_date AND pa.end_date as "validStatus",
         eic_hz.id AS partnerCompaniesId,
         eic_hz.NAME AS partnerCompaniesName,
         pa.partner_companies_id,
@@ -190,9 +191,7 @@
         LEFT JOIN esm_ins_company eic_hz ON pa.partner_companies_id = eic_hz.id
         left join sys_area area on  RPAD(SUBSTRING( pa.partner_companies_id, 6, 4 ),6,0)= area.area_code
         <where>
-        ( now() BETWEEN pa.start_date AND pa.end_date )
-        AND ( paa.template_id IS NOT NULL )
-        AND pa.valid_status = 1
+         ( paa.template_id IS NOT NULL )
         <if test="vo.deptId  !=null  and   vo.deptId  !=''" >
             AND pa.id IN ( SELECT DISTINCT agreement_id FROM ptl_agreement_dept WHERE dept_id LIKE concat(#{vo.deptId},'%') )
         </if>