1.数据岔行 未收金额在开票未结算

 2.协议数据中“协议名称”取的是协议信息中的“协议描述”   协议数据中“协议名称”改为“协议描述”
 3.查询协议数据不太方便  增加“是否启用”、“是否有效”、“对接人”筛选项
 4.建议增加提现中数据
 5.查询不方便  增加管理人筛选  控制台/前线数据/代理人数据

src/main/java/com/ydtech/modules/admin/controller/taskStatistics/TaskStatisticsController.java

@@ -273,7 +273,6 @@ public class TaskStatisticsController {
                     taskStatisticsVo.setDeptIds(kztGetDeptUtilsDto.getIds());
                 } else if ("2".equals(kztGetDeptUtilsDto.getType())) {
                     taskStatisticsVo.setUserIds(kztGetDeptUtilsDto.getIds());
-                    taskStatisticsVo.setProportionUserIds(kztGetDeptUtilsDto.getIds());
                 }
             }
             BusinessAgentData result = taskStatisticsService.getBusinessAgentDataTotal(taskStatisticsVo);

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

@@ -72,5 +72,14 @@ public class AgreeReportQueryDto {
 
     @ApiModelProperty(value = "部门ids")
     private List<String> deptIds;
+    @ApiModelProperty(value = "是否启用")
+    private String isEenabled;
+
+    @ApiModelProperty(value = "是否有效")
+    private String validStatus;
+
+
+    @ApiModelProperty(value = "对接人")
+    private String dockingPerson;
 
 }

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

@@ -68,4 +68,7 @@ public class SysPartnerConsoleDto implements Serializable {
 
     //用户创建时间
     private String createTime;
+
+    @ApiModelProperty(value = "提现中")
+    private BigDecimal withdrawingAmount;
 }

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

@@ -71,6 +71,9 @@ public class QxFrontlineAgentVo implements Serializable {
     @ApiModelProperty(value = "领导人id")
     private String leaderId;
 
+    @ApiModelProperty(value = "领导人名称")
+    private String leaderName;
+
     @ApiModelProperty(value = "类型  1 近1天 2近7天 3.近30天")
     private String days;
 

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

@@ -303,6 +303,7 @@ public class DeptBalanceServiceImpl implements DeptBalanceService {
                 record.setWithdrawn(ysTXAmount);
                 record.setNotWithdrawn(ssKTAmount);
                 record.setTotalIncome(sumAmount);
+                record.setWithdrawingAmount(txzTXAmount);
             }
         }
         return sysUserListPage;

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

@@ -1395,6 +1395,9 @@
             <if test="vo.leaderId != null and vo.leaderId != ''">
                 and su.leader_id   =#{vo.leaderId}
             </if>
+            <if test="vo.leaderName != null and vo.leaderName != ''">
+                and su.leader_name   =#{vo.leaderName}
+            </if>
 
             <if test="vo.deptIds != null and vo.deptIds != '' and vo.deptIds.size() > 0">
                 AND sd.id  in

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

@@ -171,8 +171,8 @@
         pa.agreement_name AS agreementName,
         pa.docking_person AS dockingPerson,
         pa.create_time AS createTime,
-        pa.valid_status AS isEenabled,
-        NOW() BETWEEN pa.start_date AND pa.end_date as "validStatus",
+        pa.valid_status AS validStatus,
+        NOW() BETWEEN pa.start_date AND pa.end_date as "isEenabled",
         eic_hz.id AS partnerCompaniesId,
         eic_hz.NAME AS partnerCompaniesName,
         pa.partner_companies_id,
@@ -244,6 +244,23 @@
             <if test="vo.houseId != null and vo.houseId != ''">
                 and pa.dept_id like concat('%',#{vo.houseId},'%')
             </if>
+            <if test="vo.validStatus !=null and  vo.validStatus !=''">
+                and pa.valid_status =#{vo.validStatus}
+            </if>
+            <if test="vo.dockingPerson !=null and  vo.dockingPerson !=''">
+                and pa.docking_person =#{vo.dockingPerson}
+            </if>
+            <if test="vo.isEenabled!=null  and vo.isEenabled !='' ">
+                <choose>
+                    <when test='vo.isEenabled == "0"'>
+                     and   NOW() NOT  BETWEEN pa.start_date AND pa.end_date
+                    </when>
+                    <when test='vo.isEenabled == "1"'>
+                        and   NOW() BETWEEN pa.start_date AND pa.end_date
+                    </when>
+                </choose>
+            </if>
+
         </where>
         ORDER BY
         pa.serial_number