Merge remote-tracking branch 'origin/master'

liyj

2024-09-10 abb0d631ffed8b67b0a78205ba127b46a4cb546b

Merge remote-tracking branch 'origin/master'

 dyh-eureka/src/main/resources/config/application-test.yml

@@ -1,6 +1,6 @@
#server配置
server:
  port: 8001
  port: 9001

#spring配置
spring:
@@ -15,7 +15,7 @@
eureka:
  client:
    serviceUrl:
      defaultZone: http://120.79.193.119:8001/eureka #集群部署,互相注册
      defaultZone: http://localhost:9001/eureka #集群部署,互相注册
    register-with-eureka: false #是否注册到注册中心 单点部署设置false 集群部署设置true
    fetch-registry: false #是否从注册中心拉取注册服务列表 单点部署设置false 集群部署设置true
  server:

 dyh-gateway/src/main/resources/config/application-test.yml

@@ -1,6 +1,6 @@
#server配置
server:
  port: 8002
  port: 9002

#spring配置
spring:
@@ -16,7 +16,7 @@
  client:
    service-url:
      #注册中心单机
      defaultZone: http://120.79.193.119:8001/eureka
      defaultZone: http://localhost:9001/eureka
      #注册中心集群
      #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
    #是否注册到注册中心

 dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java

@@ -17,6 +17,12 @@
    CASE_CANAL_2("22_00001-2", "线上来访"),

    /**
     * 事项来源，22_00001-1：大厅来访，22_00001-2：线上来访
     */
    VISIT_WAY_1("24_00002-1", "来访"),
    VISIT_WAY_2("24_00002-2", "线上"),

    /**
     * 当事人地位
     */
    PERSON_TYPE_1("15_020008-1", "申请方当事人"),

 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUnitMapper.java

@@ -74,4 +74,10 @@
     */
    void updateDispNormCauseTargetUnitName(@Param("unitName") String unitName, @Param("unitName") String unitId);

    /**
     * 查询某一单位下所有管辖单位
     * @param unitId 单位编号
     * @return String
     */
    List<CtUnit> listAllChild(@Param("unitId") String unitId);
}

 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml

@@ -351,4 +351,37 @@
        set target_unit_name = #{unitName}
        where target_unit_id = #{unitId}
    </update>

    <!-- 查询某一单位下下一级所有管辖单位-->
    <select id="listAllChild" resultMap="dataResult">
        WITH RECURSIVE unit_hierarchy(id, parent_id, name) AS (
        -- 锚成员 (起始点)
        SELECT
        id ,
        parent_id,
        unit_name
        FROM
        dyh_ct_unit
        WHERE
        id = #{unitId}

        UNION ALL

        -- 递归成员
        SELECT
        u.id,
        u.parent_id,
        u.unit_name
        FROM
        dyh_ct_unit u
        JOIN
        unit_hierarchy h ON u.parent_id = h.id where u.delete_status = 0
        )
        SELECT
        id AS id,
        parent_id AS parent_id,
        name AS unit_name
        FROM
        unit_hierarchy;
    </select>
</mapper> 

 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java

@@ -312,13 +312,7 @@
        // 获取当前登录用户
        CtUserDTO loginUser = ctUserService.clientGetUserAll(userId);
        // 组织条件
        QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
        if (RoleBaseEnum.checkAdminPower(loginUser)){
            ctUnitQueryWrapper.eq("cust_id", loginUser.getCustId()).select("id", "unit_name", "parent_id");
        }else {
            ctUnitQueryWrapper.eq("id", loginUser.getUnitId()).select("id", "unit_name", "parent_id");
        }
        List<CtUnit> ctUnitList = this.list(ctUnitQueryWrapper);
        List<CtUnit> ctUnitList = mapper.listAllChild(loginUser.getUnitId());
        List<SelectTermDTO> unitSelectTerms = new ArrayList<>();

        List<String> unitIdList= ctUnitList.stream().map(CtUnit::getId).collect(Collectors.toList());

 dyh-service/dyh-cust/src/main/resources/config/application-test.yml

@@ -10,7 +10,7 @@
    name: dyh-cust
  #数据源配置
  datasource:
    url: jdbc:dm://183.2.142.46:9006?schema=gzdyh_dev
    url: jdbc:dm://183.2.142.46:9016?schema=gzdyh_dev
    username: SYSDBA
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver

 dyh-service/dyh-disp/src/main/resources/config/application-test.yml

@@ -10,9 +10,9 @@
    name: dyh-disp
  #数据源配置
  datasource:
    url: jdbc:dm://192.168.3.51:5236?schema=gzdyh_dev
    url: jdbc:dm://localhost:9016?schema=gzdyh_dev
    username: SYSDBA
    password: hugeinfo123
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver
    type: com.alibaba.druid.pool.DruidDataSource
    druid:

 dyh-service/dyh-disp/src/main/resources/config/application.yml

@@ -2,8 +2,8 @@
spring:
  profiles:
    active:
      - dev
  #      - test
#      - dev
        - test
  #      - prod

  devtools:

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/ai/controller/domain/dto/CaseInfoDetailDto.java

@@ -5,15 +5,15 @@
@Data
public class CaseInfoDetailDto {
    /**
     * 案件名称
     * 案件名称  公用，title
     */
    private String caseTitle;
    /**
     * 案件描述
     * 案件描述  公用，描述
     */
    private String caseDesc;
    /**
     * 案件要求
     * 群众诉求  纠纷类使用
     */
    private String caseClaim;
    /**
@@ -26,12 +26,12 @@
    private String caseId;

    /**
     * 和解协议
     * 和解协议  纠纷类时叫和解协议;判决类是叫判决文书
     */
    private String agreeContent;

    /**
     * 立案依据
     * 立案依据  判决类使用，相关法条
     */
    private String legalBasis;
}

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoUnfoldWebController.java

@@ -368,22 +368,6 @@
    }

    /**
     * PC端-选择经办人
     * @url {ctx}/api/web/caseInfoUnfold/choosePrincipal?
     * @param caseId 纠纷编号
     * @return Object
     */
    @GetMapping("/choosePrincipal")
    public Object choosePrincipal(@RequestParam(value = "caseId") String caseId, @RequestParam(value = "userId") String userId) {
        try {
            service.choosePrincipal(caseId, userId);
            return ReturnSucUtils.getRepInfo();
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo(e.getMessage());
        }
    }

    /**
     * 查询办理结果
     * @url {ctx}/api/web/caseInfoUnfold/getTransactResult
     * @param caseId 事项ID
@@ -398,4 +382,19 @@
        }
    }

    /**
     * PC端-选择经办人
     * @url {ctx}/api/web/caseInfoUnfold/choosePrincipal?
     * @param caseId 纠纷编号
     * @return Object
     */
    @GetMapping("/choosePrincipal")
    public Object choosePrincipal(@RequestParam(value = "caseId") String caseId, @RequestParam(value = "userId") String userId) {
        try {
            service.choosePrincipal(caseId, userId);
            return ReturnSucUtils.getRepInfo();
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo(e.getMessage());
        }
    }
}

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java

@@ -552,6 +552,32 @@
    public Object pageQueryAll(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
        try {
            Map<String, Object> terms = getParameter();
//            // 来访时间
            String visitTimeStart = request.getParameter("visitTimeStart");
            String visitTimeEnd = request.getParameter("visitTimeEnd");
            if(StringUtils.isNotBlank(visitTimeStart) && StringUtils.isNotBlank(visitTimeEnd)) {
                terms.put("visitTimeStart", visitTimeStart + " 00:00:00");
                terms.put("visitTimeEnd", visitTimeEnd + " 23:59:59");
            }
            String createStart = request.getParameter("createStart");
            String createEnd = request.getParameter("createEnd");
            if(StringUtils.isNotBlank(createStart) && StringUtils.isNotBlank(createEnd)) {
                terms.put("createStart", createStart+ " 00:00:00");
                terms.put("createEnd", createEnd+ " 23:59:59");
            }
            String closeStart = request.getParameter("closeStart");
            String closeEnd = request.getParameter("closeEnd");
            if(StringUtils.isNotBlank(closeStart) && StringUtils.isNotBlank(closeEnd)) {
                terms.put("createStart", closeStart+ " 00:00:00");
                terms.put("createEnd", closeEnd+ " 23:59:59");
            }
            String fileStart = request.getParameter("fileStart");
            String fileEnd = request.getParameter("fileEnd");
            if(StringUtils.isNotBlank(fileStart) && StringUtils.isNotBlank(fileEnd)) {
                terms.put("createStart", fileStart+ " 00:00:00");
                terms.put("createEnd", fileEnd+ " 23:59:59");
            }

            Sort sort = Sort.by(Sort.Direction.DESC, "a.create_time");
            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
            Page<CasePageDTO> caseInfoPage = service.pageQueryAll(pageRequest, terms);

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java

@@ -11,12 +11,11 @@
import cn.huge.module.cases.domain.po.CaseReturn;
import cn.huge.module.cases.domain.po.CaseTask;
import cn.huge.module.cases.domain.po.CaseWindupApply;
import cn.huge.module.cases.service.CaseAppearService;
import cn.huge.module.cases.service.CaseReturnService;
import cn.huge.module.cases.service.CaseTaskService;
import cn.huge.module.cases.service.CaseWindupApplyService;
import cn.huge.module.cases.service.*;
import cn.huge.module.client.api.SysClient;
import cn.huge.module.client.api.impl.CustClientImpl;
import cn.huge.module.client.api.impl.SysClientImpl;
import cn.huge.module.cust.dto.CtUserDTO;
import cn.huge.module.sys.dto.FileIdTypeInfoBaseDTO;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
@@ -61,6 +60,10 @@
    private CaseAppearService caseAppearService;
    @Autowired
    private SysClientImpl sysClient;
    @Autowired
    private CustClientImpl custClient;
    @Autowired
    private CaseSuperviseService superviseService;

    /**
    * web端-任务处理页面-初始化tab和按钮
@@ -71,7 +74,7 @@
    @GetMapping("/getTabButton")
    public Object getTabButton(@RequestParam(value = "caseTaskId") String caseTaskId, @CurrentUser String userId) {
        try {
            return ReturnSucUtils.getRepInfo(service.webGetTabButton("caseTaskId", userId));
            return ReturnSucUtils.getRepInfo(service.webGetTabButton(caseTaskId, userId));
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo();
        }
@@ -287,7 +290,7 @@
    }

    /**
     * web端-查询流程进度
     * web端-首页-查询待办数量
     * @url {ctx}/api/web/caseTask/getCountList
     * @return Object
     */
@@ -306,11 +309,14 @@
     * @param page 页码
     * @param size 每页数量
     * @param status 状态，1：待分派，2：已分派
     * @param sortType 排序方式（1：正序；2：倒序）
     * @param sortColmn 排序字段（1：流转时间；2：分派时限；3：事项等级）
     * @return
     */
    @GetMapping("/pageMyTaskFp")
    public Object pageMyTaskFp(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
                             @RequestParam(value = "status") int status, @CurrentUser String userId) {
                               @RequestParam(value = "status") int status, @CurrentUser String userId,
                               @RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn) {
        try {
            Map<String, Object> terms = Maps.newHashMap();
            // 流程/分派时间区间
@@ -325,7 +331,35 @@
            if (StringUtils.isNotBlank(partyName)){
                terms.put("partyName", partyName);
            }
            return ReturnSucUtils.getRepInfo();
            Sort sort = null;
            String sortName = null;
            switch (sortColmn){
                case 1:
                    sortName = "t1.create_time";
                    break;
                case 2:
                    sortName = "t1.expire_time";
                    break;
                case 3:
                    sortName = "t2.case_level";
                    break;
            }
            switch (sortType){
                case 1:
                    sort = Sort.by(Sort.Direction.ASC, sortName);
                    break;
                case 2:
                    sort = Sort.by(Sort.Direction.DESC, sortName);
                    break;
            }
            if(ObjectUtils.isEmpty(sort)){
                sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
            }
            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            terms.put("candeUnitId",loginUser.getUnitId());
            terms.put("status", status);
            return ReturnSucUtils.getRepInfo(service.pageMyTaskFp(pageRequest, terms));
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo();
        }
@@ -337,11 +371,14 @@
     * @param page 页码
     * @param size 每页数量
     * @param status 状态，1：待签收，2：已签收
     * @param sortType 排序方式（1：正序；2：倒序）
     * @param sortColmn 排序字段（1：流转时间；2：分派时限；3：事项等级）
     * @return
     */
    @GetMapping("/pageMyTaskQs")
    public Object pageMyTaskQs(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
                             @RequestParam(value = "status") int status, @CurrentUser String userId) {
                               @RequestParam(value = "status") int status, @CurrentUser String userId,
                               @RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn) {
        try {
            Map<String, Object> terms = Maps.newHashMap();
            // 流程/签收时间区间
@@ -356,7 +393,35 @@
            if (StringUtils.isNotBlank(partyName)){
                terms.put("partyName", partyName);
            }
            return ReturnSucUtils.getRepInfo();
            Sort sort = null;
            String sortName = null;
            switch (sortColmn){
                case 1:
                    sortName = "t1.create_time";
                    break;
                case 2:
                    sortName = "t1.expire_time";
                    break;
                case 3:
                    sortName = "t2.case_level";
                    break;
            }
            switch (sortType){
                case 1:
                    sort = Sort.by(Sort.Direction.ASC, sortName);
                    break;
                case 2:
                    sort = Sort.by(Sort.Direction.DESC, sortName);
                    break;
            }
            if(ObjectUtils.isEmpty(sort)){
                sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
            }
            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            terms.put("candeUnitId",loginUser.getUnitId());
            terms.put("signStatus", status);
            return ReturnSucUtils.getRepInfo(service.pageMyTaskQs(pageRequest, terms));
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo();
        }
@@ -368,10 +433,13 @@
     * @param page 页码
     * @param size 每页数量
     * @param status 状态，1：待受理，2：已受理
     * @param sortType 排序方式（1：正序；2：倒序）
     * @param sortColmn 排序字段（1：流转时间；2：分派时限；3：事项等级）
     * @return
     */
    @GetMapping("/pageMyTaskSl")
    public Object pageMyTaskSl(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
                               @RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn,
                               @RequestParam(value = "status") int status, @CurrentUser String userId) {
        try {
            Map<String, Object> terms = Maps.newHashMap();
@@ -387,23 +455,53 @@
            if (StringUtils.isNotBlank(partyName)){
                terms.put("partyName", partyName);
            }
            return ReturnSucUtils.getRepInfo();
            Sort sort = null;
            String sortName = null;
            switch (sortColmn){
                case 1:
                    sortName = "t1.create_time";
                    break;
                case 2:
                    sortName = "t1.expire_time";
                    break;
                case 3:
                    sortName = "t2.case_level";
                    break;
            }
            switch (sortType){
                case 1:
                    sort = Sort.by(Sort.Direction.ASC, sortName);
                    break;
                case 2:
                    sort = Sort.by(Sort.Direction.DESC, sortName);
                    break;
            }
            if(ObjectUtils.isEmpty(sort)){
                sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
            }
            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            terms.put("candeUnitId",loginUser.getUnitId());
            terms.put("status", status);
            return ReturnSucUtils.getRepInfo(service.pageMyTaskSl(pageRequest, terms));
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo();
        }
    }

    /**
     * web端-工作台-查询待办任务-办理任务
     * @url {ctx}/api/web/caseTask/pageMyTaskBl
     * web端-工作台-查询待办任务-办理中
     * @url {ctx}/api/web/caseTask/pageMyTaskBlz
     * @param page 页码
     * @param size 每页数量
     * @param status 状态，1：办理中，2：结案申请，3：已结案
     * @param sortType 排序方式（1：正序；2：倒序）
     * @param sortColmn 排序字段（1：流转时间/已办天数；2：分派时限；3：事项等级）
     * @return
     */
    @GetMapping("/pageMyTaskBl")
    public Object pageMyTaskBl(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
                               @RequestParam(value = "status") int status, @CurrentUser String userId) {
    @GetMapping("/pageMyTaskBlz")
    public Object pageMyTaskBlz(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
                                @RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn,
                                @CurrentUser String userId) {
        try {
            Map<String, Object> terms = Maps.newHashMap();
            // 流程/结案申请/结案时间区间
@@ -418,7 +516,94 @@
            if (StringUtils.isNotBlank(partyName)){
                terms.put("partyName", partyName);
            }
            return ReturnSucUtils.getRepInfo();
            Sort sort = null;
            String sortName = null;
            switch (sortColmn){
                case 1:
                    sortName = "t1.create_time";
                    break;
                case 2:
                    sortName = "t1.expire_time";
                    break;
                case 3:
                    sortName = "t2.case_level";
                    break;
            }
            switch (sortType){
                case 1:
                    sort = Sort.by(Sort.Direction.ASC, sortName);
                    break;
                case 2:
                    sort = Sort.by(Sort.Direction.DESC, sortName);
                    break;
            }
            if(ObjectUtils.isEmpty(sort)){
                sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
            }

            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            terms.put("candeUnitId",loginUser.getUnitId());
            return ReturnSucUtils.getRepInfo(service.pageMyTaskBlz(pageRequest, terms));
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo();
        }
    }

    /**
     * web端-工作台-查询待办任务-办理任务
     * @url {ctx}/api/web/caseTask/pageMyTaskBl
     * @param page 页码
     * @param size 每页数量
     * @param status 状态，1：结案申请，2：已结案
     * @param sortType 排序方式（1：正序；2：倒序）
     * @param sortColmn 排序字段（1：结案申请时间；2：事项等级）
     * @return
     */
    @GetMapping("/pageMyTaskBl")
    public Object pageMyTaskBl(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
                               @RequestParam(value = "status") int status, @CurrentUser String userId,
                               @RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn) {
        try {
            Map<String, Object> terms = Maps.newHashMap();
            // 流程/结案申请/结案时间区间
            String timeStart = request.getParameter("timeStart");
            String timeEnd = request.getParameter("timeEnd");
            if(StringUtils.isNotBlank(timeStart) && StringUtils.isNotBlank(timeEnd)) {
                terms.put("timeStart", timeStart);
                terms.put("timeEnd", timeEnd);
            }
            // 查询申请方/被申请方关键词
            String partyName = request.getParameter("partyName");
            if (StringUtils.isNotBlank(partyName)){
                terms.put("partyName", partyName);
            }
            Sort sort = null;
            String sortName = null;
            switch (sortColmn){
                case 1:
                    sortName = "t1.apply_time";
                    break;
                case 2:
                    sortName = "t1.case_level";
                    break;
            }
            switch (sortType){
                case 1:
                    sort = Sort.by(Sort.Direction.ASC, sortName);
                    break;
                case 2:
                    sort = Sort.by(Sort.Direction.DESC, sortName);
                    break;
            }
            if(ObjectUtils.isEmpty(sort)){
                sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
            }
            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            terms.put("applyUnitId",loginUser.getUnitId());
            terms.put("applyStatus", status);
            return ReturnSucUtils.getRepInfo(service.pageMyTaskBl(pageRequest, terms));
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo();
        }
@@ -429,14 +614,15 @@
     * @url {ctx}/api/web/caseTask/pageMyTaskSh
     * @param page 页码
     * @param size 每页数量
     * @param status 状态，1：待审核，2：已审核
     * @param status 状态，0：待审核，1：已审核
     * @param type 审核类型，1：回退审核，2：上报审核，3：结案审核，4：联合处置审核
     * @param sortType 排序方式（1：正序；2：倒序）
     * @return
     */
    @GetMapping("/pageMyTaskSh")
    public Object pageMyTaskSh(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
                               @RequestParam(value = "status") int status, @RequestParam(value = "type") int type,
                               @CurrentUser String userId) {
                               @CurrentUser String userId, @RequestParam(value = "sortType") int sortType) {
        try {
            Map<String, Object> terms = Maps.newHashMap();
            // 回退/上报/结案申请/联合处置申请/审核时间区间
@@ -451,7 +637,98 @@
            if (StringUtils.isNotBlank(partyName)){
                terms.put("partyName", partyName);
            }
            return ReturnSucUtils.getRepInfo();
            Sort sort = null;
            String sortName = null;
            switch (type){
                case 1:
                    sortName = "t1.return_time";
                    break;
                case 2:
                    sortName = "t1.appear_time";
                    break;
                case 3:
                    sortName = "t1.apply_time";
                    break;
                case 4:
                    sortName = "t1.apply_time";
                    break;
            }
            switch (sortType){
                case 1:
                    sort = Sort.by(Sort.Direction.ASC, sortName);
                    break;
                case 2:
                    sort = Sort.by(Sort.Direction.DESC, sortName);
                    break;
            }
            if(ObjectUtils.isEmpty(sort)){
                sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
            }
            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            terms.put("auditUnitId",loginUser.getUnitId());
            terms.put("applyStatus", status);
            return ReturnSucUtils.getRepInfo(service.pageMyTaskSh(pageRequest, type, terms));
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo();
        }
    }

    /**
     * web端-工作台-查询待办任务-督办
     * @url {ctx}/api/web/caseTask/pageMyTaskDb
     * @param page 页码
     * @param size 每页数量
     * @param status 状态，0：未回复，1：已回复
     * @param sortType 排序方式（1：正序；2：倒序）
     * @param sortColmn 排序字段（1：督办时间/回复时限；2：事项等级）
     * @return
     */
    @GetMapping("/pageMyTaskDb")
    public Object pageMyTaskDb(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
                               @RequestParam(value = "status") int status, @CurrentUser String userId,
                               @RequestParam(value = "sortType") int sortType, @RequestParam(value = "sortColmn") int sortColmn) {
        try {
            Map<String, Object> terms = Maps.newHashMap();
            // 流程/结案申请/结案时间区间
            String timeStart = request.getParameter("timeStart");
            String timeEnd = request.getParameter("timeEnd");
            if(StringUtils.isNotBlank(timeStart) && StringUtils.isNotBlank(timeEnd)) {
                terms.put("timeStart", timeStart);
                terms.put("timeEnd", timeEnd);
            }
            // 查询申请方/被申请方关键词
            String partyName = request.getParameter("partyName");
            if (StringUtils.isNotBlank(partyName)){
                terms.put("partyName", partyName);
            }
            Sort sort = null;
            String sortName = null;
            switch (sortColmn){
                case 1:
                    sortName = "t1.sup_time";
                    break;
                case 2:
                    sortName = "t1.case_level";
                    break;
            }
            switch (sortType){
                case 1:
                    sort = Sort.by(Sort.Direction.ASC, sortName);
                    break;
                case 2:
                    sort = Sort.by(Sort.Direction.DESC, sortName);
                    break;
            }
            if(ObjectUtils.isEmpty(sort)){
                sort = Sort.by(Sort.Direction.DESC, "t1.create_time");
            }
            PageRequest pageRequest = PageRequest.of(page-1, size, sort);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            terms.put("quiltUnitId",loginUser.getUnitId());
            terms.put("supStatus", status);

            return ReturnSucUtils.getRepInfo(superviseService.pageMyTaskDb(pageRequest, terms));
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo();
        }

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java

@@ -82,7 +82,6 @@
    @GetMapping("/pageCard")
    public Object pageCard( @CurrentUser String userId,@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
        try {
//            String userId = "2408301111391000";
            Map<String, Object> terms = getParameter();
            Sort sort = Sort.by(Sort.Direction.DESC, "create_time");
            PageRequest pageRequest = PageRequest.of(page-1, size, sort);

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseAppearMapper.java

@@ -1,5 +1,6 @@
package cn.huge.module.cases.dao.mapper;

import cn.huge.module.cases.domain.dto.FrontPageListDTO;
import cn.huge.module.cases.domain.po.CaseAppear;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
@@ -61,4 +62,25 @@
    */
    List<CaseAppear> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);

    /**
     * 首页查询
     * @param auditUnitId 审核组织编号
     * @return long
     */
    long countAppearReview(@Param("auditUnitId") String auditUnitId);

    /**
     * 首页-待审核条件统计
     * @param terms 条件
     * @return long
     */
    long countMyTaskAppearReview(@Param("terms") Map<String, Object> terms);

    /**
     * 首页-待审核分页查询
     * @param page 分页对象
     * @param terms 条件
     * @return List<FrontPageListDTO>
     */
    List<FrontPageListDTO> pageMyTaskAppearReview(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
}

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseAssistApplyMapper.java

@@ -1,5 +1,6 @@
package cn.huge.module.cases.dao.mapper;

import cn.huge.module.cases.domain.dto.FrontPageListDTO;
import cn.huge.module.cases.domain.po.CaseAssistApply;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
@@ -61,4 +62,26 @@
    */
    List<CaseAssistApply> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);

    /**
     * 首页查询
     * @param auditUnitId 审核组织编号
     * @return long
     */
    long countAssistReview(@Param("auditUnitId") String auditUnitId);

    /**
     * 首页-待审核条件统计
     * @param terms 条件
     * @return long
     */
    long countMyTaskAssistReview(@Param("terms") Map<String, Object> terms);

    /**
     * 首页-待审核分页查询
     * @param page 分页对象
     * @param terms 条件
     * @return List<FrontPageListDTO>
     */
    List<FrontPageListDTO> pageMyTaskAssistReview(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);

}

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseReturnMapper.java

@@ -1,5 +1,6 @@
package cn.huge.module.cases.dao.mapper;

import cn.huge.module.cases.domain.dto.FrontPageListDTO;
import cn.huge.module.cases.domain.po.CaseReturn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
@@ -61,4 +62,25 @@
    */
    List<CaseReturn> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);

    /**
     * 首页查询
     * @param auditUnitId 审核组织编号
     * @return long
     */
    long countReturnReview(@Param("auditUnitId") String auditUnitId);

    /**
     * 首页-待审核条件统计
     * @param terms 条件
     * @return long
     */
    long countMyTaskReturnReview(@Param("terms") Map<String, Object> terms);

    /**
     * 首页-待审核分页查询
     * @param page 分页对象
     * @param terms 条件
     * @return List<FrontPageListDTO>
     */
    List<FrontPageListDTO> pageMyTaskReturnReview(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
}

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseSuperviseMapper.java

@@ -77,6 +77,20 @@
    List<CaseSupervise> pageCaseSupervise(@Param("caseId") String caseId, @Param("page") PageRequest page, @Param("supStatus") int supStatus, @Param("quiltUnitId") String quiltUnitId);

    /**
     * 首页督办条件统计
     * @param terms 条件
     */
    long countMyTaskDb(@Param("terms") Map<String, Object> terms);

    /**
     * 首页督办分页查询
     * @param page 分页对象
     * @param terms 条件
     * @return List<CaseSupervise>
     */
    List<CaseSupervise> pageMyTaskDb(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);

    /**
     * 首页-督办数量
     * @param supStatus 回复状态
     *  @param quiltUnitId 被督办组织编号

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java

@@ -1,6 +1,7 @@
package cn.huge.module.cases.dao.mapper;

import cn.huge.module.cases.domain.dto.FrontPageCountDTO;
import cn.huge.module.cases.domain.dto.FrontPageListDTO;
import cn.huge.module.cases.domain.po.CaseTask;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
@@ -68,4 +69,65 @@
     * @return long
     */
    FrontPageCountDTO countTaskList(@Param("terms") Map<String, Object> terms);

    /**
     * 首页-受分派条件统计
     * @param terms 条件
     * @return long
     */
    long countMyTaskFp(@Param("terms") Map<String, Object> terms);

    /**
     * 首页-受分派分页查询
     * @param page 分页对象
     * @param terms 条件
     * @return List<FrontPageListDTO>
     */
    List<FrontPageListDTO> pageMyTaskFp(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);

    /**
     * 首页-受签收条件统计
     * @param terms 条件
     * @return long
     */
    long countMyTaskQs(@Param("terms") Map<String, Object> terms);

    /**
     * 首页-受签收分页查询
     * @param page 分页对象
     * @param terms 条件
     * @return List<FrontPageListDTO>
     */
    List<FrontPageListDTO> pageMyTaskQs(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);

    /**
     * 首页-受待理条件统计
     * @param terms 条件
     * @return long
     */
    long countMyTaskSl(@Param("terms") Map<String, Object> terms);

    /**
     * 首页-受待理分页查询
     * @param page 分页对象
     * @param terms 条件
     * @return List<FrontPageListDTO>
     */
    List<FrontPageListDTO> pageMyTaskSl(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);

    /**
     * 首页-待审核条件统计
     * @param terms 条件
     * @return long
     */
    long countMyTaskProcessing(@Param("terms") Map<String, Object> terms);

    /**
     * 首页-待审核分页查询
     * @param page 分页对象
     * @param terms 条件
     * @return List<FrontPageListDTO>
     */
    List<FrontPageListDTO> pageMyTaskProcessing(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);

}

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseWindupApplyMapper.java

@@ -1,5 +1,7 @@
package cn.huge.module.cases.dao.mapper;

import cn.huge.module.cases.domain.dto.FrontPageListDTO;
import cn.huge.module.cases.domain.po.CaseAssistApply;
import cn.huge.module.cases.domain.po.CaseWindupApply;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
@@ -61,4 +63,40 @@
    */
    List<CaseWindupApply> pageTerms(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);

    /**
     * 首页查询
     * @param auditUnitId 审核组织编号
     * @return long
     */
    long countApplyReview(@Param("auditUnitId") String auditUnitId);

    /**
     * 首页-待审核条件统计
     * @param terms 条件
     * @return long
     */
    long countMyTaskApplyReview(@Param("terms") Map<String, Object> terms);

    /**
     * 首页-待审核分页查询
     * @param page 分页对象
     * @param terms 条件
     * @return List<FrontPageListDTO>
     */
    List<FrontPageListDTO> pageMyTaskApplyReview(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);

    /**
     * 首页-待审核条件统计
     * @param terms 条件
     * @return long
     */
    long countMySubmitApplyReview(@Param("terms") Map<String, Object> terms);

    /**
     * 首页-待审核分页查询
     * @param page 分页对象
     * @param terms 条件
     * @return List<FrontPageListDTO>
     */
    List<FrontPageListDTO> pageMySubmitApplyReview(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
}

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAppearMapper.xml

@@ -229,4 +229,85 @@
        limit #{page.offset}, #{page.size}
    </select>

    <!--  首页统计  -->
    <select id="countAppearReview" resultType="java.lang.Long">
        select
        COUNT(1)
        from
        <include refid="table-name" />
        where
        delete_status = 0
        and apply_status = 0
        and audit_unit_id = #{auditUnitId}
    </select>

    <!-- 首页-待审核结果集 -->
    <resultMap id="MyTaskApplyReviewResult" type="cn.huge.module.cases.domain.dto.FrontPageListDTO">
        <result property="ownerId" column="ownerId"/>
        <result property="caseId" column="caseId"/>
        <result property="turnaroundTime" column="turnaroundTime"/>
        <result property="timeLimit" column="timeLimit"/>
        <result property="caseGrade" column="caseGrade"/>
        <result property="caseSource" column="caseSource"/>
        <result property="caseType" column="caseType"/>
        <result property="plaintiffs" column="plaintiffs"/>
        <result property="defendants" column="defendants"/>
        <result property="processingDays" column="processingDays"/>
        <result property="mediResult" column="mediResult"/>
        <result property="organizingUnit" column="organizingUnit"/>
        <result property="cooperatingUnit" column="cooperatingUnit"/>
        <result property="manager" column="manager"/>
        <result property="mediResult" column="mediResult"/>
        <result property="backUnit" column="backUnit"/>
        <result property="reason" column="reason"/>
        <result property="opinion" column="opinion"/>
    </resultMap>

    <!--  首页-待审核统计  -->
    <select id="countMyTaskAppearReview" resultType="java.lang.Long">
        select
        COUNT(t1.id)
        from
            dyh_case_appear t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.delete_status = 0
        and t1.apply_status = #{terms.applyStatus}
        and t1.audit_unit_id = #{terms.auditUnitId}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.appear_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.appear_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
    </select>
    <!--  首页-待审核分页查询  -->
    <select id="pageMyTaskAppearReview" resultMap="MyTaskApplyReviewResult">
        SELECT t1.case_task_id as ownerId, t1.case_id as caseId,
        t1.appear_time as turnaroundTime, t1.appear_unit_name as organizingUnit, t1.appear_content as opinion,
        t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
        concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
        FROM
        dyh_case_appear t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.delete_status = 0
        and t1.apply_status = #{terms.applyStatus}
        and t1.audit_unit_id = #{terms.auditUnitId}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.appear_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.appear_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
        <if test="page.sort != null">
            <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
                isnull(${s.property}), ${s.property} ${s.direction}
            </foreach>
        </if>
        <if test="page.sort == null">
            order by isnull(t1.create_time), t1.create_time desc
        </if>
        limit #{page.offset}, #{page.size}
    </select>
</mapper> 

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml

@@ -235,4 +235,85 @@
        limit #{page.offset}, #{page.size}
    </select>

    <!--  首页统计  -->
    <select id="countAssistReview" resultType="java.lang.Long">
        select
        COUNT(1)
        from
        <include refid="table-name" />
        where
        delete_status = 0
        and apply_status = 0
        and audit_unit_id = #{auditUnitId}
    </select>

    <!-- 首页-待审核 -->
    <resultMap id="MyTaskApplyReviewResult" type="cn.huge.module.cases.domain.dto.FrontPageListDTO">
        <result property="ownerId" column="ownerId"/>
        <result property="caseId" column="caseId"/>
        <result property="turnaroundTime" column="turnaroundTime"/>
        <result property="timeLimit" column="timeLimit"/>
        <result property="caseGrade" column="caseGrade"/>
        <result property="caseSource" column="caseSource"/>
        <result property="caseType" column="caseType"/>
        <result property="plaintiffs" column="plaintiffs"/>
        <result property="defendants" column="defendants"/>
        <result property="processingDays" column="processingDays"/>
        <result property="mediResult" column="mediResult"/>
        <result property="organizingUnit" column="organizingUnit"/>
        <result property="cooperatingUnit" column="cooperatingUnit"/>
        <result property="manager" column="manager"/>
        <result property="mediResult" column="mediResult"/>
        <result property="backUnit" column="backUnit"/>
        <result property="reason" column="reason"/>
        <result property="opinion" column="opinion"/>
    </resultMap>

    <!--  首页-待审核统计  -->
    <select id="countMyTaskAssistReview" resultType="java.lang.Long">
        select
        COUNT(t1.id)
        from
            dyh_case_assist_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.delete_status = 0
        and t1.apply_status = #{terms.applyStatus}
        and t1.audit_unit_id = #{terms.auditUnitId}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
    </select>
    <!--  首页-待审核分页查询  -->
    <select id="pageMyTaskAssistReview" resultMap="MyTaskApplyReviewResult">
        SELECT t1.id as ownerId, t1.case_id as CaseId,
        t1.apply_time as turnaroundTime, t1.apply_unit_name as organizingUnit, t1.apply_assist_unit_name as cooperatingUnit,
        t1.apply_content as reason,t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
        concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
        FROM
        dyh_case_assist_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.delete_status = 0
        and t1.apply_status = #{terms.applyStatus}
        and t1.audit_unit_id = #{terms.auditUnitId}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
        <if test="page.sort != null">
            <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
                isnull(${s.property}), ${s.property} ${s.direction}
            </foreach>
        </if>
        <if test="page.sort == null">
            order by isnull(t1.create_time), t1.create_time desc
        </if>
        limit #{page.offset}, #{page.size}
    </select>
</mapper> 

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml

@@ -70,7 +70,7 @@
            <result property="statusName" column="status_name"/>
            <result property="process" column="process"/>
            <result property="processName" column="process_name"/>
            <result property="infoProcess" column="infoProcess"/>
            <result property="infoProcess" column="info_process"/>
            <result property="infoProcessName" column="info_process_name"/>
            <result property="wantUnitId" column="want_unit_id"/>
            <result property="wantUnitName" column="want_unit_name"/>
@@ -274,6 +274,23 @@
            <if test="terms.inputUnitName != null and terms.inputUnitName !=''">
                and a.input_unit_name = #{terms.inputUnitName}
            </if>
            <if test="terms.visitTimeStart != null and terms.visitTimeStart !='' and terms.visitTimeEnd != null and terms.visitTimeEnd !=''">
                and (DATE_FORMAT(a.visit_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{terms.visitTimeStart}
                and DATE_FORMAT(a.visit_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{terms.visitTimeEnd})
            </if>
            <if test="terms.createStart != null and terms.createStart !='' and terms.createEnd != null and terms.createEnd !=''">
                and (DATE_FORMAT(a.create_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{terms.createStart}
                and DATE_FORMAT(a.create_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{terms.createEnd})
            </if>
            <if test="terms.closeStart != null and terms.closeStart !='' and terms.closeEnd != null and terms.closeEnd !=''">
                and (DATE_FORMAT(b.close_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{terms.closeStart}
                and DATE_FORMAT(b.close_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{terms.closeEnd})
            </if>
            <if test="terms.fileStart != null and terms.fileStart !='' and terms.fileEnd != null and terms.fileEnd !=''">
                and (DATE_FORMAT(b.file_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{terms.fileStart}
                and DATE_FORMAT(b.file_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{terms.fileEnd})
            </if>

        </if>
    </sql>
    <!-- 条件 -->

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseReturnMapper.xml

@@ -229,4 +229,86 @@
        limit #{page.offset}, #{page.size}
    </select>

    <!--  首页统计  -->
    <select id="countReturnReview" resultType="java.lang.Long">
        select
        COUNT(1)
        from
        <include refid="table-name" />
        where
        delete_status = 0
        and return_status = 0
        and audit_unit_id = #{auditUnitId}
    </select>

    <!-- 首页-待审核结果集 -->
    <resultMap id="MyTaskApplyReviewResult" type="cn.huge.module.cases.domain.dto.FrontPageListDTO">
        <result property="ownerId" column="ownerId"/>
        <result property="caseId" column="caseId"/>
        <result property="turnaroundTime" column="turnaroundTime"/>
        <result property="timeLimit" column="timeLimit"/>
        <result property="caseGrade" column="caseGrade"/>
        <result property="caseSource" column="caseSource"/>
        <result property="caseType" column="caseType"/>
        <result property="plaintiffs" column="plaintiffs"/>
        <result property="defendants" column="defendants"/>
        <result property="processingDays" column="processingDays"/>
        <result property="mediResult" column="mediResult"/>
        <result property="organizingUnit" column="organizingUnit"/>
        <result property="cooperatingUnit" column="cooperatingUnit"/>
        <result property="manager" column="manager"/>
        <result property="mediResult" column="mediResult"/>
        <result property="backUnit" column="backUnit"/>
        <result property="reason" column="reason"/>
        <result property="opinion" column="opinion"/>
    </resultMap>

    <!--  首页-待审核统计  -->
    <select id="countMyTaskReturnReview" resultType="java.lang.Long">
        select
        COUNT(t1.id)
        from
            dyh_case_return t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.delete_status = 0
        and t1.return_status = #{terms.applyStatus}
        and t1.audit_unit_id = #{terms.auditUnitId}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.return_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.return_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
    </select>

    <!--  首页-待审核条件统计  -->
    <select id="pageMyTaskReturnReview" resultMap="MyTaskApplyReviewResult">
        SELECT t1.case_task_id as ownerId, t1.case_id as caseId,
        t1.return_time as turnaroundTime, t1.return_unit_name as organizingUnit, t1.return_content as reason,
               t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
               concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
        FROM
        dyh_case_return t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.delete_status = 0
        and t1.return_status = #{terms.applyStatus}
        and t1.audit_unit_id = #{terms.auditUnitId}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.return_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.return_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
        <if test="page.sort != null">
            <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
                isnull(${s.property}), ${s.property} ${s.direction}
            </foreach>
        </if>
        <if test="page.sort == null">
            order by isnull(t1.create_time), t1.create_time desc
        </if>
        limit #{page.offset}, #{page.size}
    </select>
</mapper> 

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml

@@ -14,6 +14,8 @@
            <result property="id" column="id"/>
            <result property="caseId" column="case_id"/>
            <result property="supContent" column="sup_content"/>
            <result property="supUnitId" column="sup_unit_id"/>
            <result property="supUnitName" column="sup_unit_name"/>
            <result property="supUserId" column="sup_user_id"/>
            <result property="supUserName" column="sup_user_name"/>
            <result property="supTime" column="sup_time"/>
@@ -37,6 +39,8 @@
        id,
        case_id,
        sup_content,
        sup_unit_id,
        sup_unit_name,
        sup_user_id,
        sup_user_name,
        sup_time,
@@ -57,6 +61,8 @@
    <sql id="set-part">
            <if test="entity.caseId != null">case_id = #{entity.caseId},</if>
            <if test="entity.supContent != null">sup_content = #{entity.supContent},</if>
            <if test="entity.supUnitId != null">sup_unit_id = #{entity.supUnitId},</if>
            <if test="entity.supUnitName != null">sup_unit_name = #{entity.supUnitName},</if>
            <if test="entity.supUserId != null">sup_user_id = #{entity.supUserId},</if>
            <if test="entity.supUserName != null">sup_user_name = #{entity.supUserName},</if>
            <if test="entity.supTime != null">sup_time = #{entity.supTime},</if>
@@ -85,6 +91,12 @@
                </if>
                <if test="terms.supContent != null and terms.supContent !=''">
                    and sup_content = #{terms.supContent}
                </if>
                <if test="terms.supUnitId != null and terms.supUnitId !=''">
                    and sup_unit_id = #{terms.supUnitId}
                </if>
                <if test="terms.supUnitName != null and terms.supUnitName !=''">
                    and sup_unit_name = #{terms.supUnitName}
                </if>
                <if test="terms.supUserId != null and terms.supUserId !=''">
                    and sup_user_id = #{terms.supUserId}
@@ -215,7 +227,7 @@
        from
        <include refid="table-name" />
        where case_id = #{caseId}
        and delete_status = '0'
        and delete_status = 0
        and sup_status = #{supStatus}
        and quilt_unit_id = #{quiltUnitId}
    </select>
@@ -227,9 +239,52 @@
        FROM
        <include refid="table-name" />
        where case_id = #{caseId}
        and delete_status = '0'
        and delete_status = 0
        and sup_status = #{supStatus}
        and quilt_unit_id = #{quiltUnitId}
        <if test="page.sort != null">
            <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
                isnull(${s.property}), ${s.property} ${s.direction}
            </foreach>
        </if>
        <if test="page.sort == null">
            order by isnull(sup_time), sup_time desc
        </if>
        limit #{page.offset}, #{page.size}
    </select>

    <!--  首页督办条件统计  -->
    <select id="countMyTaskDb" resultType="java.lang.Long">
        select
        COUNT(1)
        from
            dyh_case_supervise t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        delete_status = 0
        and sup_status = #{terms.supStatus}
        and quilt_unit_id = #{terms.quiltUnitId}
    </select>

    <!--  首页督办分页查询  -->
    <select id="pageMyTaskDb" resultMap="dataResult">
        SELECT
        t1.sup_time as turnaroundTime, t1.DATEADD(hour, t1.replyTerm, t1.sup_time) as timeLimit, t1.sup_unit_name as organizingUnit,
        t1.sup_content as opinion, t2.case_level as caseGrade, t2.canal_name as caseSource,
        t2.case_type_name as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
        concat(t2.defendants, t2.dagents) as defendants
        FROM
        dyh_case_supervise t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.delete_status = 0
        and t1.sup_status = #{terms.supStatus}
        and t1.quilt_unit_id = #{terms.quiltUnitId}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
        <if test="page.sort != null">
            <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
                isnull(${s.property}), ${s.property} ${s.direction}
@@ -248,7 +303,7 @@
        from
        <include refid="table-name" />
        where
        delete_status = '0'
        delete_status = 0
        and sup_status = #{supStatus}
        and quilt_unit_id = #{quiltUnitId}
    </select>

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml

@@ -339,6 +339,7 @@

    <!--  结果集-->
    <resultMap id="FrontPageCountResult" type="cn.huge.module.cases.domain.dto.FrontPageCountDTO">
        <result property="waitDisp" column="waitDisp"/>
        <result property="waitSign" column="waitSign"/>
        <result property="waitAccept" column="waitAccept"/>
        <result property="waitAccept" column="waitAccept"/>
@@ -346,16 +347,243 @@
    <!--  查询任务数量  -->
    <select id="countTaskList" resultMap="FrontPageCountResult">
        select
        count(case when node_id = 'ZJ_DFP' or  node_id = 'QJ_DFP' or  node_id = 'SJ_DFP' then id end) as waitDisp,
        count(case when sign_status = 1 then id end) as waitSign,
        count(case when node_id = then id end) as waitAccept,
        count(case when node_id = then id end) as Processing
        count(case when node_id = 'ZJ_DSL' or  node_id = 'QJ_DFP' or  node_id = 'SJ_DFP' then id end) as waitAccept,
        count(case when node_id = 'BLFK' then id end) as Processing
        from
        <include refid="table-name" />
        where
        cande_unit_id = #{terms.candeUnitId}
        and (cande_dept_id = #{terms.candeDeptId} or cande_dept_id is null)
        and delete_status = '0'
        and status = '1'
        and delete_status = 0
        and status = 1
    </select>

</mapper> 
    <!-- 首页-待办理结果集 -->
    <resultMap id="MyTaskApplyReviewResult" type="cn.huge.module.cases.domain.dto.FrontPageListDTO">
        <result property="ownerId" column="ownerId"/>
        <result property="caseId" column="caseId"/>
        <result property="turnaroundTime" column="turnaroundTime"/>
        <result property="timeLimit" column="timeLimit"/>
        <result property="caseGrade" column="caseGrade"/>
        <result property="caseSource" column="caseSource"/>
        <result property="caseType" column="caseType"/>
        <result property="plaintiffs" column="plaintiffs"/>
        <result property="defendants" column="defendants"/>
        <result property="processingDays" column="processingDays"/>
        <result property="mediResult" column="mediResult"/>
        <result property="organizingUnit" column="organizingUnit"/>
        <result property="cooperatingUnit" column="cooperatingUnit"/>
        <result property="manager" column="manager"/>
        <result property="mediResult" column="mediResult"/>
        <result property="backUnit" column="backUnit"/>
        <result property="reason" column="reason"/>
        <result property="opinion" column="opinion"/>
        <result property="process" column="process"/>
    </resultMap>

    <!--  首页-待分派条件统计  -->
    <select id="countMyTaskFp" resultType="java.lang.Long">
        select
        COUNT(t1.id)
        from
        dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        cande_unit_id = #{terms.candeUnitId}
        and (t1.node_id = 'ZJ_DFP' or  t1.node_id = 'QJ_DFP' or  t1.node_id = 'SJ_DFP')
        and t1.delete_status = 0
        and t1.status = #{terms.status}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
    </select>
    <!--  首页-待分派分页查询  -->
    <select id="pageMyTaskFp" resultMap="MyTaskApplyReviewResult">
        SELECT t1.id as ownerId, t1.case_id as caseId,
        t1.create_time as turnaroundTime, t1.expire_time as timeLimit, t2.case_level as caseGrade, t2.canal_name as caseSource,
        t2.case_type_name as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants
        FROM
        dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.cande_unit_id = #{terms.candeUnitId}
        and (t1.node_id = 'ZJ_DFP' or  t1.node_id = 'QJ_DFP' or  t1.node_id = 'SJ_DFP')
        and t1.delete_status = 0
        and t1.status = #{terms.status}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
        <if test="page.sort != null">
            <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
                isnull(${s.property}), ${s.property} ${s.direction}
            </foreach>
        </if>
        <if test="page.sort == null">
            order by isnull(t1.create_time), t1.create_time desc
        </if>
        limit #{page.offset}, #{page.size}
    </select>

    <!--  首页-待签收条件统计  -->
    <select id="countMyTaskQs" resultType="java.lang.Long">
        select
        COUNT(t1.id)
        from
        dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.cande_unit_id = #{terms.candeUnitId}
        and t1.sign_status = #{terms.signStatus}
        and t1.delete_status = 0
        and t1.status = '1'
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
    </select>
    <!--  首页-待签收分页查询  -->
    <select id="pageMyTaskQs" resultMap="MyTaskApplyReviewResult">
        SELECT t1.id as ownerId, t1.case_id as caseId,
        t1.create_time as turnaroundTime, t1.expire_time as timeLimit,  t2.case_level as caseGrade, t2.canal_name as caseSource,
        t2.case_type_name as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
        concat(t2.defendants, t2.dagents) as defendants
        FROM
        dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.cande_unit_id = #{terms.candeUnitId}
        and t1.sign_status = #{terms.signStatus}
        and t1.delete_status = 0
        and t1.status = '1'
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
        <if test="page.sort != null">
            <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
                isnull(${s.property}), ${s.property} ${s.direction}
            </foreach>
        </if>
        <if test="page.sort == null">
            order by isnull(t1.create_time), t1.create_time desc
        </if>
        limit #{page.offset}, #{page.size}
    </select>

    <!--  首页-待受理条件统计  -->
    <select id="countMyTaskSl" resultType="java.lang.Long">
        select
        COUNT(t1.id)
        from
        dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.cande_unit_id = #{terms.candeUnitId}
        and (t1.node_id = 'ZJ_DSL' or  t1.node_id = 'QJ_DFP' or  t1.node_id = 'SJ_DFP')
        and t1.delete_status = 0
        and t1.sign_status != 1
        and t1.status = #{terms.status}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
    </select>
    <!--  首页-待受理分页查询  -->
    <select id="pageMyTaskSl" resultMap="MyTaskApplyReviewResult">
        SELECT t1.id as ownerId, t1.case_id as caseId,
        t1.create_time as turnaroundTime, t1.expire_time as timeLimit,
        t2.case_level as caseGrade, t2.canal_name as caseSource,
        t2.case_type_name as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
        concat(t2.defendants, t2.dagents) as defendants
        FROM
        dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.cande_unit_id = #{terms.candeUnitId}
        and (t1.node_id = 'ZJ_DSL' or  t1.node_id = 'QJ_DFP' or  t1.node_id = 'SJ_DFP')
        and t1.delete_status = 0
        and t1.sign_status != 1
        and t1.status = #{terms.status}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
        <if test="page.sort != null">
            <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
                isnull(${s.property}), ${s.property} ${s.direction}
            </foreach>
        </if>
        <if test="page.sort == null">
            order by isnull(t1.create_time), t1.create_time desc
        </if>
        limit #{page.offset}, #{page.size}
    </select>

    <!--  首页-办理中条件统计  -->
    <select id="countMyTaskProcessing" resultType="java.lang.Long">
        select
        COUNT(t1.id)
        from
        dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.cande_unit_id = #{terms.candeUnitId}
        and t1.node_id = 'BLFK'
        and t1.delete_status = 0
        and t1.status = 1
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
    </select>
    <!--  首页-办理中分页查询  -->
    <select id="pageMyTaskProcessing" resultMap="MyTaskApplyReviewResult">
        SELECT t1.id as ownerId, t1.case_id as caseId,
        t1.create_time as turnaroundTime, t1.cande_unit_name as organizingUnit,  t2.case_level as caseGrade, t2.canal_name as caseSource,
        t2.case_type_name as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
        concat(t2.defendants, t2.dagents) as defendants
        FROM
        dyh_case_task t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.cande_unit_id = #{terms.candeUnitId}
        and t1.node_id = 'BLFK'
        and t1.delete_status = 0
        and t1.status = 1
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
        <if test="page.sort != null">
            <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
                isnull(${s.property}), ${s.property} ${s.direction}
            </foreach>
        </if>
        <if test="page.sort == null">
            order by isnull(t1.create_time), t1.create_time desc
        </if>
        limit #{page.offset}, #{page.size}
    </select>



</mapper>

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml

@@ -265,4 +265,136 @@
        limit #{page.offset}, #{page.size}
    </select>

    <!--  首页统计  -->
    <select id="countApplyReview" resultType="java.lang.Long">
        select
        COUNT(1)
        from
        <include refid="table-name" />
        where
        delete_status = 0
        and apply_status = 0
        and audit_unit_id = #{auditUnitId}
    </select>

    <!-- 首页-待审核结果集 -->
    <resultMap id="MyTaskApplyReviewResult" type="cn.huge.module.cases.domain.dto.FrontPageListDTO">
        <result property="ownerId" column="ownerId"/>
        <result property="caseId" column="caseId"/>
        <result property="turnaroundTime" column="turnaroundTime"/>
        <result property="timeLimit" column="timeLimit"/>
        <result property="caseGrade" column="caseGrade"/>
        <result property="caseSource" column="caseSource"/>
        <result property="caseType" column="caseType"/>
        <result property="plaintiffs" column="plaintiffs"/>
        <result property="defendants" column="defendants"/>
        <result property="processingDays" column="processingDays"/>
        <result property="mediResult" column="mediResult"/>
        <result property="organizingUnit" column="organizingUnit"/>
        <result property="cooperatingUnit" column="cooperatingUnit"/>
        <result property="manager" column="manager"/>
        <result property="mediResult" column="mediResult"/>
        <result property="backUnit" column="backUnit"/>
        <result property="reason" column="reason"/>
        <result property="opinion" column="opinion"/>
        <result property="process" column="process"/>
    </resultMap>

    <!--  首页-待审核条件统计  -->
    <select id="countMyTaskApplyReview" resultType="java.lang.Long">
        select
        COUNT(t1.id)
        from
            dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
            t1.delete_status = 0
        and t1.apply_status = #{terms.applyStatus}
        and t1.audit_unit_id = #{terms.auditUnitId}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
    </select>
    <!--  首页-待审核分页查询  -->
    <select id="pageMyTaskApplyReview" resultMap="MyTaskApplyReviewResult">
        SELECT t1.case_task_id as ownerId, t1.case_id as caseId,
        t1.apply_time as turnaroundTime, t1.apply_unit_name as organizingUnit, t1.medi_result_name as mediResult,
               t1.fail_reason as reason, t2.case_level as caseGrade, t2.canal_name as caseSource,
               t2.case_type_name as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs,
               concat(t2.defendants, t2.dagents) as defendants
        FROM
        dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.delete_status = 0
        and t1.apply_status = #{terms.applyStatus}
        and t1.audit_unit_id = #{terms.auditUnitId}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
        <if test="page.sort != null">
            <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
                isnull(${s.property}), ${s.property} ${s.direction}
            </foreach>
        </if>
        <if test="page.sort == null">
            order by isnull(t1.create_time), t1.create_time desc
        </if>
        limit #{page.offset}, #{page.size}
    </select>

    <!--  首页-结案申请条件统计  -->
    <select id="countMySubmitApplyReview" resultType="java.lang.Long">
        select
        COUNT(t1.id)
        from
        dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.delete_status = 0
        and t1.apply_status = #{terms.applyStatus}
        and t1.apply_unit_id = #{terms.applyUnitId}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
    </select>
    <!--  首页-结案申请分页查询  -->
    <select id="pageMySubmitApplyReview" resultMap="MyTaskApplyReviewResult">
        SELECT t1.case_task_id as ownerId, t1.case_id as caseId, t2.process_name as process,
        t1.apply_time as turnaroundTime, t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType,
               t1.apply_unit_name as organizingUnit, t1.medi_result_name as mediResult,t1.fail_reason as reason,
         concat(t2.plaintiffs, t2.pagents) as plaintiffs,
        concat(t2.defendants, t2.dagents) as defendants
        FROM
        dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
        where
        t1.delete_status = 0
        and t1.apply_status = #{terms.applyStatus}
        and t1.apply_unit_id = #{terms.applyUnitId}
        <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
            and (DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{terms.timeStart}
            and DATE_FORMAT(t1.apply_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{terms.timeEnd})
        </if>
        <if test="terms.partyName != null and terms.partyName !=''">
            and (concat(t2.plaintiffs, t2.pagents, t2.defendants, t2.dagents) like concat('%', #{terms.partyName}, '%')
        </if>
        <if test="page.sort != null">
            <foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
                isnull(${s.property}), ${s.property} ${s.direction}
            </foreach>
        </if>
        <if test="page.sort == null">
            order by isnull(t1.create_time), t1.create_time desc
        </if>
        limit #{page.offset}, #{page.size}
    </select>
</mapper> 

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeChatDTO.java

@@ -67,4 +67,13 @@
     * 被申请人集合
     * */
    private List<CasePersonWechatDTO> defendantList;

    /**
     * 申请代理人集合
     * */
    private List<CasePersonWechatDTO> pagentList;
    /**
     * 被申请代理人集合
     * */
    private List<CasePersonWechatDTO> dagentList;
}

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java

@@ -57,14 +57,26 @@
     */
    private String mediResultName;
    /**
     * 实际调解部门编号
     * 实际调解部门编号(承办部门)
     */
    private String mediateDeptId;

    /**
     * 实际调解部门名称
     * 实际调解部门名称(承办部门)
     */
    private String mediateDeptName;

    /**
     * 实际调解部门编号(配合部门)
     */
    private String assistUnitId;

    /**
     * 实际调解部门名称(配合部门)
     * assist_unit_name
     */
    private String assistUnitName;

    /**
     * 登记组织编号
     */

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePersonWechatDTO.java

@@ -9,6 +9,7 @@
 */
@Data
public class CasePersonWechatDTO {
    private String id;
    /**
     * 姓名/企业/机构名称
     */

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageCountDTO.java

@@ -10,7 +10,7 @@
    /**
     * 待分派
     */
    private Long waitDispatch;
    private Long waitDisp;

    /**
     * 待签收

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java

@@ -1,5 +1,6 @@
package cn.huge.module.cases.domain.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.util.Date;
@@ -7,13 +8,25 @@
@Data
public class FrontPageListDTO {
    /**
     * 所属编号
     */
    private String ownerId;

    /**
     * 事项ID
     */
    private String caseId;

    /**
     * 流转时间
     */
    @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
    private Date turnaroundTime;

    /**
     * 时限
     */
    @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
    private Date timeLimit;

    /**
@@ -44,7 +57,7 @@
    /**
     * 已办天数
     */
    private Integer processingDays;
    private Long processingDays;

    /**
     * 承办部门
@@ -81,5 +94,8 @@
     */
    private String opinion;


    /**
     * 事项状态
     */
    private String process;
}

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java

@@ -42,6 +42,18 @@
    private String supContent;

    /**
     * 督办人编号
     */
    @TableField(value = "sup_unit_id")
    private String supUnitId;

    /**
     * 督办人名称
     */
    @TableField(value = "sup_unit_name")
    private String supUnitName;

    /**
    * 督办人编号
    */
    @TableField(value = "sup_user_id")

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java

@@ -189,30 +189,36 @@
     * @return Page
     */
    public Map<String, Object> listFeedback(String id) {
        Map<String, Object> result = new HashMap<>();
        try {
            Map<String, Object> result = new HashMap<>();
            CaseInfoUnfold caseInfoUnfold = unfoldService.getById(id);
            if(ObjectUtils.isNotEmpty(caseInfoUnfold)){
                result.put("manager", caseInfoUnfold.getMediator());
            }
            QueryWrapper<CaseFeedback> caseFeedbackQueryWrapper = new QueryWrapper<>();
            caseFeedbackQueryWrapper.eq("case_id", id);
            List<CaseFeedback> caseFeedbackList = mapper.selectList(caseFeedbackQueryWrapper);

        CaseInfoUnfold caseInfoUnfold = unfoldService.getById(id);
        result.put("manager", caseInfoUnfold.getMediator());
        QueryWrapper<CaseFeedback> caseFeedbackQueryWrapper = new QueryWrapper<>();
        caseFeedbackQueryWrapper.eq("case_id", id);
        List<CaseFeedback> caseFeedbackList = mapper.selectList(caseFeedbackQueryWrapper);
            String ownerIds = caseFeedbackList.stream().map(CaseFeedback::getId).collect(Collectors.joining("','"));
            ownerIds = "'"+ ownerIds + "'";
            Map<String, Object> map = new HashMap<>();
            map.put("mainId", id);
            map.put("ownerIds", ownerIds);
            List<FileIdInfoBaseDTO> fileInfoList = sysClient.listIdInfoByOwnerIdList(map);

        String ownerIds = caseFeedbackList.stream().map(CaseFeedback::getId).collect(Collectors.joining("','"));
        ownerIds = "'"+ ownerIds + "'";
        Map<String, Object> map = new HashMap<>();
        map.put("mainId", id);
        map.put("ownerIds", ownerIds);
        List<FileIdInfoBaseDTO> fileInfoList = sysClient.listIdInfoByOwnerIdList(map);

        for(CaseFeedback caseFeedback: caseFeedbackList){
            for(FileIdInfoBaseDTO fileInfo: fileInfoList){
                if(caseFeedback.getId().equals(fileInfo.getOwnerId())){
                    caseFeedback.setFileInfoList(fileInfo.getFileList());
            for(CaseFeedback caseFeedback: caseFeedbackList){
                for(FileIdInfoBaseDTO fileInfo: fileInfoList){
                    if(caseFeedback.getId().equals(fileInfo.getOwnerId())){
                        caseFeedback.setFileInfoList(fileInfo.getFileList());
                    }
                }
            }
            result.put("caseFeedbackList", caseFeedbackList);
            return result;
        }catch (Exception e){
            log.error("[caseFeedbackService.listFeedback]调用失败，异常信息："+e, e);
            throw new ServiceException("caseFeedbackService.listFeedback", e);
        }
        result.put("caseFeedbackList", caseFeedbackList);
        return result;
    }

    /**

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java

@@ -22,6 +22,7 @@
import cn.huge.module.draft.service.CasedraftInfoService;
import cn.huge.module.mediate.dto.WechatBindCaseDTO;
import cn.huge.module.sys.dto.FileIdTypeInfoBaseDTO;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.collections.CollectionUtils;
@@ -197,8 +198,10 @@
            caseInfo.setDagents(dagents.toString());
            caseInfo.setCaseRef(utilsClient.createCaseRef());
            caseInfo.setCanal(CaseBaseConstsEnum.CASE_CANAL_1.getIndex());
            caseInfo.setCaseDes(CaseBaseConstsEnum.CASE_CANAL_1.getDes());
            //todo case_title生成、经纬度转换、来访形式
            caseInfo.setCanalName(CaseBaseConstsEnum.CASE_CANAL_1.getDes());
            caseInfo.setVisitWay(CaseBaseConstsEnum.VISIT_WAY_1.getIndex());
            caseInfo.setVisitWayName(CaseBaseConstsEnum.VISIT_WAY_1.getDes());
            //todo case_title生成、经纬度转换
            if(0 == registerSaveDTO.getOperateType()){
                caseInfo.setInputUnitId(loginUser.getUnitId());
                caseInfo.setInputUnitName(loginUser.getUnitName());
@@ -272,13 +275,13 @@
                //绑定当事人小程序
                this.setPartyUserId(casePerson);
                //添加申请方和被申请方人名组合
                if(CaseBaseConstsEnum.PERSON_TYPE_1.equals(casePerson.getPerType())){
                if(CaseBaseConstsEnum.PERSON_TYPE_1.getIndex().equals(casePerson.getPerType())){
                    //申请方
                    if (StringUtils.isNotEmpty(plaintiffs.toString())) {
                        plaintiffs.append(BaseConsts.COMMA);
                    }
                    plaintiffs.append(casePerson.getTrueName());
                }else if(CaseBaseConstsEnum.PERSON_TYPE_2.equals(casePerson.getPerType())){
                }else if(CaseBaseConstsEnum.PERSON_TYPE_2.getIndex().equals(casePerson.getPerType())){
                    //被申请方
                    if (StringUtils.isNotEmpty(defendants.toString())) {
                        defendants.append(BaseConsts.COMMA);
@@ -306,12 +309,12 @@
                caseAgent.setUpdateTime(now);
                //绑定当事人小程序
                this.setPartyUserId(caseAgent);
                if(CaseBaseConstsEnum.PERSON_TYPE_3.equals(caseAgent.getPerType())) {
                if(CaseBaseConstsEnum.PERSON_TYPE_3.getIndex().equals(caseAgent.getPerType())) {
                    if (StringUtils.isNotEmpty(pagents.toString())) {
                        pagents.append(BaseConsts.COMMA);
                    }
                    pagents.append(caseAgent.getTrueName());
                }else if(CaseBaseConstsEnum.PERSON_TYPE_4.equals(caseAgent.getPerType())) {
                }else if(CaseBaseConstsEnum.PERSON_TYPE_4.getIndex().equals(caseAgent.getPerType())) {
                    if (StringUtils.isNotEmpty(dagents.toString())) {
                        dagents.append(BaseConsts.COMMA);
                    }
@@ -534,7 +537,6 @@
            StringBuffer defendants = new StringBuffer();
            StringBuffer pagents = new StringBuffer();
            StringBuffer dagents = new StringBuffer();
            int peopleNum = 0;

            CaseInfo caseInfo = new CaseInfo();
            CaseInfoUnfold caseInfoUnfold = new CaseInfoUnfold();
@@ -560,8 +562,7 @@
            caseInfoUnfold.setUpdateTime(nowDate);

            // 常规登记-保存当事人
            peopleNum += this.saveCasePersonWechat(registerSaveDTO, plaintiffs, pagents, defendants, dagents,loginUser);
            caseInfo.setPeopleNum(peopleNum);
            this.saveCasePersonWechat(registerSaveDTO, plaintiffs, pagents, defendants, dagents,loginUser);
            caseInfo.setPlaintiffs(plaintiffs.toString());
            caseInfo.setPagents(pagents.toString());
            caseInfo.setDefendants(defendants.toString());
@@ -670,14 +671,18 @@
     * @return Page
     */
    public Page<CaseInfoWeChatDTO> pageQueryWechat(String userId, PageRequest page, Map<String, Object> terms){
        PaUserDTO loginUser = custClient.paclientGetUser(userId);
        List<CaseInfoWeChatDTO> list = new ArrayList<>();
        String personType = terms.get("personType")+"";
        if(ObjectUtils.isEmpty(personType)){
            throw new RuntimeException("请选择人员类型");
        }
        if(ObjectUtils.isEmpty(loginUser.getIdcard())){
            return new PageImpl<CaseInfoWeChatDTO>(list, page, 0);
        }
        QueryWrapper<CasePerson> personWrapper = new QueryWrapper<>();
        personWrapper.select("case_id");
        personWrapper.eq("party_user_id", userId);
        personWrapper.eq("certi_no", loginUser.getIdcard());
        if("1".equals(personType)){
            personWrapper.eq("per_type",CaseBaseConstsEnum.PERSON_TYPE_1.getIndex());
        }else {

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java

@@ -149,6 +149,8 @@
                Date nowDate = DateUtils.getNowDate();
                caseSuperviseNew.setSupUserId(loginUser.getId());
                caseSuperviseNew.setSupUserName(loginUser.getTrueName());
                caseSuperviseNew.setSupUnitId(loginUser.getUnitId());
                caseSuperviseNew.setSupUnitId(loginUser.getUnitName());
                caseSuperviseNew.setSupTime(nowDate);
                caseSuperviseNew.setQuiltUnitId(quiltUnitDTO.getQuiltUnitId());
                caseSuperviseNew.setQuiltUnitName(quiltUnitDTO.getQuiltUnitName());
@@ -217,6 +219,22 @@
    }

    /**
     * 首页-督办
     * @param page
     * @param terms
     */
    public Page<CaseSupervise> pageMyTaskDb(PageRequest page, Map<String, Object> terms){
        try{
            long countSuperviseList = mapper.countMyTaskDb(terms);
            List<CaseSupervise> caseSuperviseList = mapper.pageMyTaskDb(page, terms);
            return new PageImpl<CaseSupervise>(caseSuperviseList, page, countSuperviseList);
        }catch (Exception e){
            log.error("[CaseSuperviseService.pageReplied]调用失败，异常信息："+e, e);
            throw new ServiceException("CaseSuperviseService.pageReplied", e);
        }
    }

    /**
     * 查询督办数量
     * @param supStatus 回复状态
     * @param quiltUnitId 被督办组织编号

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java

@@ -3,7 +3,14 @@
import cn.huge.base.common.exception.ServiceException;
import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.IdUtils;
import cn.huge.module.cases.dao.mapper.*;
import cn.huge.module.cases.domain.dto.*;
import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.module.cases.domain.dto.CaseFlowDTO;
import cn.huge.module.cases.domain.dto.TabButtonDTO;
import cn.huge.module.cases.domain.dto.TabButtonInfoDTO;
import cn.huge.module.cases.domain.po.CaseAssistApply;
import cn.huge.module.cases.domain.po.CaseInfoUnfold;
import cn.huge.module.cases.domain.dto.*;
import cn.huge.module.cases.domain.po.*;
import cn.huge.module.client.api.impl.CustClientImpl;
@@ -11,10 +18,14 @@
import cn.huge.module.client.api.impl.SysClientImpl;
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.cases.dao.mapper.CaseTaskMapper;
import cn.huge.module.cases.domain.po.CaseTask;
import cn.huge.module.constant.BaseConsts;
import cn.huge.module.cust.constant.UserBaseConsts;
import cn.huge.module.cust.dto.CtUnitDTO;
import cn.huge.module.cust.dto.CtUserDTO;
import cn.huge.module.mediate.constant.AuditBaseConsts;
import cn.huge.module.mediate.constant.AuditBaseConstsEnum;
import cn.huge.module.mediate.constant.CaseBaseConsts;
import cn.huge.module.disp.constant.DispBaseConstsEnum;
import cn.huge.module.disp.dto.CaseDispBaseDTO;
import cn.huge.module.disp.dto.DispCaseBaseDTO;
@@ -31,6 +42,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
@@ -38,6 +50,8 @@
import org.springframework.data.domain.PageRequest;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.PostConstruct;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;

@@ -75,6 +89,21 @@
    private CaseInfoUnfoldService caseInfoUnfoldService;
    @Autowired
    private CaseWindupApplyService caseWindupApplyService;

    @Autowired
    private CaseWindupApplyMapper caseWindupApplyMapper;

    @Autowired
    private CaseReturnMapper caseReturnMapper;

    @Autowired
    private CaseAppearMapper caseAppearMapper;

    @Autowired
    private CaseAssistApplyMapper caseAssistApplyMapper;

    @Autowired
    private CaseAssistApplyService assistApplyService;

    /**
    * 更新对象
@@ -429,22 +458,187 @@
    }

    /**
     * 按条件统计
     * 获取首页统计数量
     * @param userId 用户编号
     * @return long
     */
    public Map<String, Long> getCountList(String userId){
        CtUserDTO loginUser = custClient.clientGetUserAll(userId);
        Map<String, Object> terms = new HashMap<>();
        terms.put("candeUnitId", loginUser.getUnitId());
        terms.put("candeDeptId", loginUser.getDeptId());
        mapper.countTaskList(terms);
        superviseService.countCaseSuperviseList(0,loginUser.getUnitId());
        Map<String, Long> result = new HashMap<>();
        return result;
    public FrontPageCountDTO getCountList(String userId){
        try {
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            Map<String, Object> terms = new HashMap<>();
            terms.put("candeUnitId", loginUser.getUnitId());
            terms.put("candeDeptId", loginUser.getDeptId());
            FrontPageCountDTO frontPageCountDTO = mapper.countTaskList(terms);
            long supervise = superviseService.countCaseSuperviseList(0,loginUser.getUnitId());
            frontPageCountDTO.setSupervise(supervise);
            long countApplyReview = caseWindupApplyMapper.countApplyReview(loginUser.getUnitId());
            long countReturnReview = caseReturnMapper.countReturnReview(loginUser.getUnitId());
            long countAppearReview = caseAppearMapper.countAppearReview(loginUser.getUnitId());
            long countAssistReview = caseAssistApplyMapper.countAssistReview(loginUser.getUnitId());
            frontPageCountDTO.setWaitReview(countApplyReview+countReturnReview+countAppearReview+countAssistReview);
            return frontPageCountDTO;
        }catch (Exception e) {
            log.error("[CaseTaskService.getCountList]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.getCountList", e);
        }
    }

    /**
     * 首页-查询待办任务-受分派
     * @param page 分页对象
     * @param terms 条件
     * @return Page
     */
    public Page<FrontPageListDTO> pageMyTaskFp(PageRequest page, Map<String, Object> terms){
        try {
            long total = mapper.countMyTaskFp(terms);
            List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskFp(page, terms);
            return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskFp]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskFp", e);
        }

    }

    /**
     * 首页-查询待办任务-受签收
     * @param page 分页对象
     * @param terms 条件
     * @return Page
     */
    public Page<FrontPageListDTO> pageMyTaskQs(PageRequest page, Map<String, Object> terms){
        try {
            long total = mapper.countMyTaskQs(terms);
            List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskQs(page, terms);
            return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
        }
    }

    /**
     * 首页-查询待办任务-受待理
     * @param page 分页对象
     * @param terms 条件
     * @return Page
     */
    public Page<FrontPageListDTO> pageMyTaskSl(PageRequest page, Map<String, Object> terms){
        try {
            long total = mapper.countMyTaskSl(terms);
            List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskSl(page, terms);
            return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
        }
    }

    /**
     * 首页-查询待办任务-办理中
     * @param page 分页对象
     * @param terms 条件
     * @return Page
     */
    public Page<FrontPageListDTO> pageMyTaskBlz(PageRequest page, Map<String, Object> terms){
        try {
            long total = mapper.countMyTaskProcessing(terms);
            List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskProcessing(page, terms);
            List<String> caseIdList = new ArrayList<>();
            Date now = DateUtils.getNowDate();
            for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
                long milliseconds1 = frontPageListDTO.getTurnaroundTime().getTime();
                long milliseconds2 = now.getTime();
                long diff = milliseconds2 - milliseconds1;
                long daysBetween = diff / (24 * 60 * 60 * 1000);
                frontPageListDTO.setProcessingDays(daysBetween);
                caseIdList.add(frontPageListDTO.getCaseId());
            }
            if(CollectionUtils.isNotEmpty(caseIdList)){
                QueryWrapper<CaseAssistApply> assistApplyQueryWrapper = new QueryWrapper<>();
                assistApplyQueryWrapper.in("case_id", caseIdList).eq("apply_status", AuditBaseConsts.AUDIT_STATUS_1)
                        .eq("audit_result", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
                List<CaseAssistApply> caseAssistApplyList = assistApplyService.list(assistApplyQueryWrapper);
                for(CaseAssistApply caseAssistApply: caseAssistApplyList){
                    for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
                        if(frontPageListDTO.getCaseId().equals(caseAssistApply.getCaseId())){
                            frontPageListDTO.setCooperatingUnit(caseAssistApply.getApplyAssistUnitName());
                        }
                    }
                }
            }

            return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
        }
    }

    /**
     * 首页-查询待办任务-办理任务
     * @param page 分页对象
     * @param terms 条件
     * @return Page
     */
    public Page<FrontPageListDTO> pageMyTaskBl(PageRequest page, Map<String, Object> terms){
        try {
            long total = caseWindupApplyMapper.countMySubmitApplyReview(terms);
            List<FrontPageListDTO> frontPageListDTOList = caseWindupApplyMapper.pageMySubmitApplyReview(page, terms);

            List<String> caseIdList = new ArrayList<>();
            caseIdList = frontPageListDTOList.stream().map(FrontPageListDTO ::getCaseId).collect(Collectors.toList());
            if(CollectionUtils.isNotEmpty(caseIdList)){
                QueryWrapper<CaseAssistApply> assistApplyQueryWrapper = new QueryWrapper<>();
                assistApplyQueryWrapper.in("case_id", caseIdList).eq("apply_status", AuditBaseConsts.AUDIT_STATUS_1)
                        .eq("audit_result", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
                List<CaseAssistApply> caseAssistApplyList = assistApplyService.list(assistApplyQueryWrapper);
                for(CaseAssistApply caseAssistApply: caseAssistApplyList){
                    for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
                        if(frontPageListDTO.getCaseId().equals(caseAssistApply.getCaseId())){
                            frontPageListDTO.setCooperatingUnit(caseAssistApply.getApplyAssistUnitName());
                        }
                    }
                }
            }
            return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
        }
    }

    /**
     * 首页-待审核分页查询
     * @param page 分页对象
     * @param terms 条件
     * @return Page
     */
    public Page<FrontPageListDTO> pageMyTaskSh(PageRequest page, int type, Map<String, Object> terms){
        try {
            long total = 0;
            List<FrontPageListDTO> frontPageListDTOList = new ArrayList<>();
            if(1 == type){
                total = caseReturnMapper.countMyTaskReturnReview(terms);
                frontPageListDTOList = caseReturnMapper.pageMyTaskReturnReview(page,terms);
            }else if(2 == type){
                total = caseAppearMapper.countMyTaskAppearReview(terms);
                frontPageListDTOList = caseAppearMapper.pageMyTaskAppearReview(page, terms);
            }else if(3 == type){
                total = caseWindupApplyMapper.countMyTaskApplyReview(terms);
                frontPageListDTOList = caseWindupApplyMapper.pageMyTaskApplyReview(page, terms);
            }else if(4 == type){
                total = caseAssistApplyMapper.countMyTaskAssistReview(terms);
                frontPageListDTOList = caseAssistApplyMapper.pageMyTaskAssistReview(page, terms);
            }
            return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
        }catch (Exception e) {
            log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
            throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
        }
    }
    /**
     * wechat端-查询流程进度
     * @param caseId 纠纷编号
     * @return

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java

@@ -232,13 +232,13 @@
                casedraftPerson.setUpdateTime(now);

                //添加申请方和被申请方人名组合
                if(CaseBaseConstsEnum.PERSON_TYPE_1.equals(casedraftPerson.getPerType())){
                if(CaseBaseConstsEnum.PERSON_TYPE_1.getIndex().equals(casedraftPerson.getPerType())){
                    //申请方
                    if (StringUtils.isNotEmpty(plaintiffs.toString())) {
                        plaintiffs.append(BaseConsts.COMMA);
                    }
                    plaintiffs.append(casedraftPerson.getTrueName());
                }else if(CaseBaseConstsEnum.PERSON_TYPE_2.equals(casedraftPerson.getPerType())){
                }else if(CaseBaseConstsEnum.PERSON_TYPE_2.getIndex().equals(casedraftPerson.getPerType())){
                    //被申请方
                    if (StringUtils.isNotEmpty(defendants.toString())) {
                        defendants.append(BaseConsts.COMMA);
@@ -265,12 +265,12 @@
                casedraftAgent.setCustId(draftRegisterSaveDTO.getCustId());
                casedraftAgent.setUpdateTime(now);

                if(CaseBaseConstsEnum.PERSON_TYPE_3.equals(casedraftAgent.getPerType())) {
                if(CaseBaseConstsEnum.PERSON_TYPE_3.getIndex().equals(casedraftAgent.getPerType())) {
                    if (StringUtils.isNotEmpty(pagents.toString())) {
                        pagents.append(BaseConsts.COMMA);
                    }
                    pagents.append(casedraftAgent.getTrueName());
                }else if(CaseBaseConstsEnum.PERSON_TYPE_4.equals(casedraftAgent.getPerType())) {
                }else if(CaseBaseConstsEnum.PERSON_TYPE_4.getIndex().equals(casedraftAgent.getPerType())) {
                    if (StringUtils.isNotEmpty(dagents.toString())) {
                        dagents.append(BaseConsts.COMMA);
                    }

 dyh-service/dyh-mediate/src/main/resources/config/application-test.yml

@@ -10,7 +10,7 @@
    name: dyh-mediate
  #数据源配置
  datasource:
    url: jdbc:dm://183.2.142.46:9006?schema=gzdyh_dev
    url: jdbc:dm://183.2.142.46:9016?schema=gzdyh_dev
    username: SYSDBA
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver

 dyh-service/dyh-sync/pom.xml

@@ -73,7 +73,7 @@
    </dependencies>

    <build>
        <finalName>dyh-sys</finalName>
        <finalName>dyh-sync</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

 dyh-service/dyh-sync/src/main/resources/config/application-test.yml

@@ -10,14 +10,19 @@
    name: dyh-sync
  #数据源配置
  datasource:
    url: jdbc:mysql://120.79.193.119:3306/bydyh2.0_v101_prod?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
    username: root
    password: hugeinfo123
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:dm://localhost:9016?schema=gzdyh_dev
    username: SYSDBA
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver
    type: com.alibaba.druid.pool.DruidDataSource
    druid:
      stat-view-servlet:
        # 关闭 Druid 的统计视图
        enabled: false
      # 定期检查空闲连接的有效性
      test-while-idle: true
      # 用来验证数据库连接是否仍然可用的 SQL 查询
      validation-query: SELECT 1

#注册中心配置
eureka:

 dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/web/FileInfoWebController.java

@@ -286,7 +286,7 @@
     * @return Object
     * @url {ctx}/api/web/fileInfo/deleteFileById?id=
     */
    @DeleteMapping("/deleteFileByIds")
    @GetMapping("/deleteFileByIds")
    public Object deleteFileByIds(@RequestParam(value = "ids") String ids) {
        try {
            String[] id = ids.split(",");
@@ -299,7 +299,7 @@
        }
    }

    @DeleteMapping("/deleteFileById")
    @GetMapping("/deleteFileById")
    public Object deleteFileById(@RequestParam(value = "id") String id) {
        try {
            service.deleteFileById(id);

 dyh-service/dyh-sys/src/main/java/cn/huge/module/file/utils/FtpUtils.java

@@ -7,6 +7,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPReply;
import org.springframework.stereotype.Component;

@@ -120,7 +121,8 @@
            ftpClient.connect(FtpFileConfig.getHostname(), FtpFileConfig.getPort());
            if (FTPReply.isPositiveCompletion(ftpClient.getReplyCode())) {
                log.info("连接ftp成功！");
                ftpClient.login(FtpFileConfig.getUsername(), FtpFileConfig.getPassword());
                boolean login = ftpClient.login(FtpFileConfig.getUsername(), FtpFileConfig.getPassword());
                log.info("登录ftp成功:{}",login);
                if (FTPReply.isPositiveCompletion(ftpClient.getReplyCode())) {
                    // 设置以二进制方式传输
                    ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE);
@@ -130,6 +132,7 @@
                    ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE);
                    // 设置缓冲区大小
                    ftpClient.setBufferSize(1024);

                    log.info("登录ftp成功！");
                    flag = true;
                } else {
@@ -198,7 +201,9 @@
        try {
            fileName = new String(fileName.getBytes("UTF-8"), "iso-8859-1");
            log.info("上传文件名为：" + fileName);
            ftpClient.storeFile(fileName, fileInputStream);
            boolean b = ftpClient.storeFile(fileName, fileInputStream);
            String status = ftpClient.getStatus();
            log.info("上传状态：{},{}" ,b, status);
            int reply = ftpClient.getReplyCode();
            if (FTPReply.isPositiveCompletion(reply)) {
                flag = true;

 dyh-service/dyh-sys/src/main/resources/config/application-test.yml

@@ -10,7 +10,7 @@
    name: dyh-sys
  #数据源配置
  datasource:
    url: jdbc:dm://183.2.142.46:9006?schema=gzdyh_dev
    url: jdbc:dm://183.2.142.46:9016?schema=gzdyh_dev
    username: SYSDBA
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver
@@ -49,7 +49,7 @@
  client:
    service-url:
      #注册中心单机
      defaultZone: http://localhost:9001/eureka
      defaultZone: http://192.168.234.57:9001/eureka
      #注册中心集群
      #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
    #是否注册到注册中心
@@ -95,7 +95,19 @@
    ssl:
      enabled: false

#科大讯飞配置
#ftp服务配置
ftp:
  #服务器ip地址
  hostname: 192.168.234.34
  #端口
  port: 21
  #用户名
  username: hugeinfo
  #密码
  password: hugeinfo123
  #附件存储根目录
  rootdir: /deploy/ftp/gzdyh

xfyun:
  host_url: https://iat-api.xfyun.cn/v2/iat
  appid: 5c7b00be

 dyh-service/dyh-utils/pom.xml

@@ -137,7 +137,7 @@
                            <addClasspath>true</addClasspath>
                            <classpathPrefix>lib/</classpathPrefix>
                            <useUniqueVersions>false</useUniqueVersions>
                            <mainClass>cn.huge.module.DyhSyncApplication</mainClass>
                            <mainClass>cn.huge.module.DyhUtilsApplication</mainClass>
                        </manifest>
                        <manifestEntries>
                            <!--MANIFEST.MF 中 Class-Path 加入资源文件目录 -->

 dyh-service/dyh-utils/src/main/resources/config/application-test.yml

@@ -1,7 +1,7 @@
#server配置
server:
  #端口
  port: 9009
  port: 9003

#Spring配置
spring:
@@ -10,7 +10,7 @@
    name: dyh-utils
  #数据源配置
  datasource:
    url: jdbc:dm://183.2.142.46:9006?schema=gzdyh_dev
    url: jdbc:dm://183.2.142.46:9016?schema=gzdyh_dev
    username: SYSDBA
    password: SYSDBA
    driver-class-name: dm.jdbc.driver.DmDriver