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/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/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/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/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; @@ -534,7 +535,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 +560,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 +669,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 {
