From 1981a23e68167d95b99222ee673a7f13283d5675 Mon Sep 17 00:00:00 2001 From: pengwei Date: Thu, 6 Nov 2025 14:45:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=B4=E6=9D=83=E7=9D=A3=E5=AF=9F?= =?UTF-8?q?=E3=80=81=E5=AE=A1=E8=AE=A1=E7=9B=91=E7=9D=A3=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E9=97=AE=E9=A2=98=E6=B6=88=E8=B4=B9=EF=BC=88?= =?UTF-8?q?1=E3=80=81=E7=BB=B4=E6=9D=83=E7=9D=A3=E5=8A=9E=EF=BC=9A?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=A1=88=E4=BB=B6=E7=B1=BB=E5=9E=8B=EF=BC=8C?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=97=A0=E9=9C=80=E4=BD=BF=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E7=BB=B4=E6=9D=83=E6=A1=88=E4=BB=B6=E3=80=82=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=202=E3=80=81?= =?UTF-8?q?=E7=BB=B4=E6=9D=83=E5=88=97=E8=A1=A8=EF=BC=9A=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=BB=B4=E6=9D=83=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=E3=80=82?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=203=E3=80=81=E5=B7=A6=E5=8F=B3=E6=8B=89=E5=8A=A8=E7=9A=84?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E8=BD=B4=E5=8A=A0=E5=AE=BD=EF=BC=9B=E5=AE=A1?= =?UTF-8?q?=E8=AE=A1=E7=9B=91=E7=9D=A3=E5=8F=B0=E8=B4=A6-=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E4=B8=8E=E9=99=84=E4=BB=B6=E5=8E=8B=E7=BC=A9=E5=8C=85?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E6=97=A0=E6=B3=95=E5=AF=B9=E5=BA=94=E3=80=82?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=204=E3=80=81=E7=A7=BB=E5=8A=A8=E7=9D=A3=E5=AF=9F=EF=BC=9A?= =?UTF-8?q?=E7=9D=A3=E5=AF=9F=E9=97=AE=E9=A2=98=E7=BC=96=E8=BE=91=EF=BC=9A?= =?UTF-8?q?=E6=B6=89=E5=8F=8A=E5=8D=95=E4=BD=8D=E3=80=81=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=8C?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9=E3=80=82?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=205=E3=80=81=E4=BA=BA=E5=91=98=E6=8A=BD=E6=A3=80-=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E6=8A=BD=E6=A3=80=E4=BA=BA=E5=91=98=EF=BC=9A=E8=A1=A5?= =?UTF-8?q?=E5=85=851=E4=BD=8D=E4=BA=BA=E5=91=98=E5=90=8E=E5=8E=9F?= =?UTF-8?q?=E5=90=8D=E5=8D=9520=E4=BA=BA=E5=91=98=E4=B8=8D=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E3=80=82=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=206=E3=80=81=E6=8A=BD=E6=A3=80=E4=BA=BA?= =?UTF-8?q?=E5=91=98=EF=BC=9A=E6=97=A0=E6=B3=95=E5=AF=BC=E5=87=BA=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=95=B0=E6=8D=AE=E5=BA=93=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E3=80=82=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/config/InterceptorConfig.java | 2 +- .../books/NegativeBookController.java | 35 ++++++--- .../rightsComfort/RightPersonController.java | 7 ++ .../rightsComfort/RightsController.java | 75 ++++++++++++++++++- .../java/com/biutag/supervision/job/Job.java | 39 +++++++--- .../pojo/entity/DwdAsjZfbaWfrwfxx.java | 3 + .../supervision/pojo/entity/RpcApply.java | 3 + .../pojo/param/RpcApplyQueryParam.java | 4 + .../supervision/pojo/vo/RightsExcelVo.java | 50 +++++++++++++ .../supervision/pojo/vo/RpcApplyVo.java | 2 + .../service/NegativeBlameService.java | 2 +- .../supervision/service/RpcApplyService.java | 2 + src/main/resources/mapper/RpcApplyMapper.xml | 3 + src/main/resources/mapper/SamplingMapper.xml | 3 +- .../SupervisionApplicationTests.java | 2 +- 15 files changed, 207 insertions(+), 25 deletions(-) create mode 100644 src/main/java/com/biutag/supervision/pojo/vo/RightsExcelVo.java diff --git a/src/main/java/com/biutag/supervision/config/InterceptorConfig.java b/src/main/java/com/biutag/supervision/config/InterceptorConfig.java index 405a810..f3899c5 100644 --- a/src/main/java/com/biutag/supervision/config/InterceptorConfig.java +++ b/src/main/java/com/biutag/supervision/config/InterceptorConfig.java @@ -47,7 +47,7 @@ public class InterceptorConfig implements WebMvcConfigurer { .excludePathPatterns("/common/**") .excludePathPatterns("/app/**") // excel导出 - .excludePathPatterns("/data/petitionComplaint12337/export/result","/err","/sampling/export/samplingPoling", "/negative/books/export/**","/data/petitionComplaint/export/**","/confinement/export","/books/dataThread/export") + .excludePathPatterns("/rights/export/result","/data/petitionComplaint12337/export/result","/err","/sampling/export/samplingPoling", "/negative/books/export/**","/data/petitionComplaint/export/**","/confinement/export","/books/dataThread/export") .excludePathPatterns(List.of("/doc.html", "/webjars/**", "/favicon.ico", "/v3/api-docs/**")); registry.addInterceptor(new ApiInterceptor()) .addPathPatterns("/api/jwdc/**"); diff --git a/src/main/java/com/biutag/supervision/controller/books/NegativeBookController.java b/src/main/java/com/biutag/supervision/controller/books/NegativeBookController.java index 527124a..17dc4b2 100644 --- a/src/main/java/com/biutag/supervision/controller/books/NegativeBookController.java +++ b/src/main/java/com/biutag/supervision/controller/books/NegativeBookController.java @@ -11,10 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.biutag.supervision.constants.enums.*; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.dto.flow.VerifyData; -import com.biutag.supervision.pojo.entity.Negative; -import com.biutag.supervision.pojo.entity.NegativeBlame; -import com.biutag.supervision.pojo.entity.NegativeFile; -import com.biutag.supervision.pojo.entity.NegativeProblemRelation; +import com.biutag.supervision.pojo.entity.*; import com.biutag.supervision.pojo.param.NegativeQueryParam; import com.biutag.supervision.pojo.vo.*; import com.biutag.supervision.service.*; @@ -313,21 +310,38 @@ public class NegativeBookController { boolean emptyFlag = negativeIds.isEmpty(); List negativeBlames = emptyFlag ? new ArrayList<>() : blameService.listByNegativeIds(negativeIds); List problemRelations = emptyFlag ? new ArrayList<>() : negativeProblemRelationService.list(negativeIds); - List negativeFiles = emptyFlag ? new ArrayList<>() : negativeFileService.listByNegativeIds(negativeIds); + Map> map =new HashMap<>(); + map = negativeBlames.stream().filter(s->StrUtil.isNotBlank(s.getNegativeId())).collect( + Collectors.groupingBy(NegativeBlame::getNegativeId) + ); + AtomicInteger index = new AtomicInteger(1); + Map> finalMap = map; List list = pages.getRecords().stream().map((item) -> { NegativeAuditExportVo vo = new NegativeAuditExportVo(); BeanUtil.copyProperties(item, vo); int indexNumber = index.getAndIncrement(); + + + + vo.setIndexNumber(indexNumber); vo.setProblems(problemRelations.stream() .filter(problem -> StrUtil.isNotBlank(problem.getOneLevelContent()) && StrUtil.isNotBlank(problem.getTwoLevelContent()) && StrUtil.isNotBlank(problem.getThreeLevelContentOther())) .map(problem -> String.format("%s / %s / %s", problem.getOneLevelContent(), problem.getTwoLevelContent(), problem.getThreeLevelContentOther())) .collect(Collectors.joining("、"))); - vo.setProblems(negativeBlames.stream() - .filter(blame -> StrUtil.isNotBlank(blame.getBlameName()) && StrUtil.isNotBlank(blame.getBlameEmpNo())) - .map(blame -> blame.getBlameName() + "-" + blame.getBlameEmpNo()) - .collect(Collectors.joining("、"))); +// vo.setProblems(negativeBlames.stream() +// .filter(blame -> StrUtil.isNotBlank(blame.getBlameName()) && StrUtil.isNotBlank(blame.getBlameEmpNo())) +// .map(blame -> blame.getBlameName() + "-" + blame.getBlameEmpNo()) +// .collect(Collectors.joining("、"))); + if(finalMap.containsKey(item.getId())){ + List blames = finalMap.get(item.getId()); + String data = blames.stream().filter(s -> StrUtil.isNotBlank(s.getBlameName()) && StrUtil.isNotBlank(s.getBlameEmpNo())) + .map(blame -> blame.getBlameName() + "-" + blame.getBlameEmpNo()).collect(Collectors.joining("、")); + vo.setBlames(data); + } + + // AtomicInteger i = new AtomicInteger(0); // List imageDataList = negativeFiles.stream().filter(file -> item.getId().equals(file.getNegtiveId())) // // 过滤图片 @@ -372,6 +386,8 @@ public class NegativeBookController { return; } Map> maps= negativeFiles.stream().collect(Collectors.groupingBy(NegativeFile::getNegtiveId)); + + List folderNames = new ArrayList<>(); // 临时保存下载的文件 String tempDir = "downloads"; @@ -380,6 +396,7 @@ public class NegativeBookController { String serialNumber =String.valueOf(negativeIds.indexOf(s) +1); //问题附件 List fileUrls = maps.get(s); + Collections.reverse(fileUrls); try { Files.createDirectories(Paths.get(tempDir)); diff --git a/src/main/java/com/biutag/supervision/controller/rightsComfort/RightPersonController.java b/src/main/java/com/biutag/supervision/controller/rightsComfort/RightPersonController.java index b83b870..066aff8 100644 --- a/src/main/java/com/biutag/supervision/controller/rightsComfort/RightPersonController.java +++ b/src/main/java/com/biutag/supervision/controller/rightsComfort/RightPersonController.java @@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.biutag.supervision.pojo.Result; +import com.biutag.supervision.pojo.entity.RpcInfringerResult; import com.biutag.supervision.pojo.entity.RpcRightPerson; import com.biutag.supervision.pojo.entity.SupDepart; import com.biutag.supervision.pojo.param.RpcRightPersonQueryParam; +import com.biutag.supervision.service.RpcInfringerResultService; import com.biutag.supervision.service.RpcRightPersonService; import com.biutag.supervision.service.SupDepartService; import lombok.RequiredArgsConstructor; @@ -31,6 +33,8 @@ public class RightPersonController { private final SupDepartService departService; + + @GetMapping public Result> list(RpcRightPersonQueryParam queryParam) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() @@ -74,4 +78,7 @@ public class RightPersonController { return Result.success(); } + + + } diff --git a/src/main/java/com/biutag/supervision/controller/rightsComfort/RightsController.java b/src/main/java/com/biutag/supervision/controller/rightsComfort/RightsController.java index aa9530f..b195cf1 100644 --- a/src/main/java/com/biutag/supervision/controller/rightsComfort/RightsController.java +++ b/src/main/java/com/biutag/supervision/controller/rightsComfort/RightsController.java @@ -1,16 +1,39 @@ package com.biutag.supervision.controller.rightsComfort; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.excel.EasyExcel; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.biutag.supervision.constants.enums.RpcApplyTypeEnum; +import com.biutag.supervision.mapper.RpcApplyMapper; import com.biutag.supervision.pojo.Result; +import com.biutag.supervision.pojo.dto.DataPetition12337ExportDto; +import com.biutag.supervision.pojo.entity.Negative; +import com.biutag.supervision.pojo.entity.RpcApply; import com.biutag.supervision.pojo.entity.RpcApplyPerson; +import com.biutag.supervision.pojo.entity.RpcInfringerResult; import com.biutag.supervision.pojo.param.RpcApplyQueryParam; +import com.biutag.supervision.pojo.vo.RightsExcelVo; import com.biutag.supervision.pojo.vo.RpcApplyVo; import com.biutag.supervision.service.RpcApplyPersonService; import com.biutag.supervision.service.RpcApplyService; +import com.biutag.supervision.service.RpcInfringerResultService; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; +import java.io.IOException; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + /** * @author wxc * @date 2025/2/13 @@ -22,19 +45,69 @@ public class RightsController { private final RpcApplyService rpcApplyService; + private final RpcApplyMapper rpcApplyMapper; + private final RpcApplyPersonService rpcApplyPersonService; + private final RpcInfringerResultService infringerResultService; + @GetMapping public Result> list(RpcApplyQueryParam queryParam) { // return Result.success(rpcApplyService.page(queryParam, RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue())); return Result.success(rpcApplyService.pageData(queryParam,RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue())); } - + @GetMapping("/getInfringerData/{id}") + public Result getInfringerData(@PathVariable String id){ + List results = infringerResultService.list( + new LambdaQueryWrapper() + .eq(RpcInfringerResult::getRpcId,id) + ); + return Result.success(results); + } @DeleteMapping("{id}") public Result del(@PathVariable String id) { rpcApplyPersonService.removeById(id); return Result.success(); } + + @GetMapping("/export/result") + public void exportResult(RpcApplyQueryParam queryParam, HttpServletResponse response) throws IOException { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StrUtil.isNotBlank(queryParam.getApplicantEmpName()), "a.applicant_emp_name", queryParam.getApplicantEmpName()) + .eq(StrUtil.isNotBlank(queryParam.getDepartId()), "a.depart_id", queryParam.getDepartId()) + .eq("a.type", RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue()) + .eq(StrUtil.isNotBlank(queryParam.getCaseType()),"a.case_type",queryParam.getCaseType()) + .like(StrUtil.isNotBlank(queryParam.getCaseCategory()),"a.case_category",queryParam.getCaseCategory()) + .eq(StrUtil.isNotBlank(queryParam.getRpcStatus()), "a.rpc_status", queryParam.getRpcStatus()) + .orderByDesc("a.crt_time"); + if (queryParam.getApplyDate() != null && queryParam.getApplyDate().size() == 2) { + queryWrapper.between("a.apply_date", queryParam.getApplyDate().get(0), queryParam.getApplyDate().get(1)); + } + if (queryParam.getHappenTime() != null && queryParam.getHappenTime().size() == 2) { + queryWrapper.between("a.happen_time", queryParam.getHappenTime().get(0), queryParam.getHappenTime().get(1)); + } + if(StrUtil.isNotBlank(queryParam.getCode())){ + queryWrapper.eq("a.verified","2"); + } + Page Records= rpcApplyMapper.queryRightsPage(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); + + List applyList = Records.getRecords(); + if(CollectionUtil.isNotEmpty(applyList)){ + List excelVos = BeanUtil.copyToList(applyList, RightsExcelVo.class); + excelVos= excelVos.stream().map(s->{ + String type = "1".equals(s.getCaseType())?"刑事案件":"民事案件"; + s.setCaseType(type); + return s; + }).toList(); + String headerValue = "attachment; filename=\"" + URLEncoder.encode(String.format("长沙市公安局维护民警执法权威案件督办表_%s.xlsx", DateUtil.format(new Date(), "yyMMdd")), "UTF-8") + "\""; + response.setHeader("Content-Disposition", headerValue); + response.setContentType("application/octet-stream"); + EasyExcel.write(response.getOutputStream(), RightsExcelVo.class).inMemory(Boolean.TRUE).sheet("长沙市公安局维护民警执法权威案件督办").doWrite(excelVos); + } + + } + + } diff --git a/src/main/java/com/biutag/supervision/job/Job.java b/src/main/java/com/biutag/supervision/job/Job.java index a4e1956..d7f7523 100644 --- a/src/main/java/com/biutag/supervision/job/Job.java +++ b/src/main/java/com/biutag/supervision/job/Job.java @@ -124,6 +124,7 @@ public class Job { private final RpcApplySuperviseService rpcApplySuperviseService; private final TXsshrxxbService tXsshrxxbService; private final RpcPersonService rpcPersonService; + private final SupDictDataService dictDataService; // 每天一次 23:30:00 //todo 维权信息 @@ -133,13 +134,20 @@ public class Job { log.info("维权信息抓取中---------------------"); // 维权 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -// Date startTime = sdf.parse("2025-01-01 00:00:00"); -// Date endTime = sdf.parse("2025-12-30 00:00:00"); + Date startTime = sdf.parse("2025-01-01 00:00:00"); + Date endTime = sdf.parse("2025-12-30 00:00:00"); - Date startTime = Date.from(LocalDateTime.now().minusDays(1).withHour(0).withMinute(0).withSecond(0).withNano(0).atZone(ZoneId.systemDefault()).toInstant()); - Date endTime = Date.from(LocalDateTime.now().minusDays(1).withHour(23).withMinute(59).withSecond(59).atZone(ZoneId.systemDefault()).toInstant()); +// Date startTime = Date.from(LocalDateTime.now().minusDays(1).withHour(0).withMinute(0).withSecond(0).withNano(0).atZone(ZoneId.systemDefault()).toInstant()); +// Date endTime = Date.from(LocalDateTime.now().minusDays(1).withHour(23).withMinute(59).withSecond(59).atZone(ZoneId.systemDefault()).toInstant()); + //获取过滤关键字 + List dictData =dictDataService.list(new LambdaQueryWrapper().eq(SupDictData::getDictType,"protectRightsFile")); + List files = new ArrayList<>(); + if(CollectionUtil.isNotEmpty(dictData)){ + files=dictData.stream().map(s->s.getDictValue()).toList(); + } + List shrxxList = dwdAsjZfbaShrxxService.list(startTime,endTime); if(CollectionUtil.isEmpty(shrxxList)){ log.info("时间范围内无受害人信息"); @@ -204,12 +212,17 @@ public class Job { //案件 rpc_apply for (String ajbh : ajbhList){ try{ -//获取案件基本信息 + //获取案件基本信息 DwdAsjZfbaAjjbxx ajjbxx = dwdAsjZfbaAjjbxxMapper.selectByAjbh(ajbh); if(ObjectUtil.isEmpty(ajjbxx)){ log.info("案件[" + ajbh + "]未找到基本信息"); continue; } + List file = files.stream().filter(s->ajjbxx.getAjlbmc().contains(s)).toList(); + if(CollectionUtil.isNotEmpty(file)){ + log.info("案件["+ajbh+"]已过滤,案件类型名称为["+ajjbxx.getAjlbmc()+"]"); + continue; + } //获取受害人列表 List tXsshrxxbList = xsshrxxbMap.get(ajbh); if(CollectionUtil.isEmpty(tXsshrxxbList)){ @@ -301,7 +314,9 @@ public class Job { } } - + if(StrUtil.isNotBlank(rpcApply.getHandleDepartId())){ + rpcApply.setHandleDepartName(ajjbxx.getBadwidmc()); + } } @@ -328,6 +343,14 @@ public class Job { .map(DwdAsjZfbaWfrwfxx::getClfs) .collect(Collectors.joining(";")); rpcApply.setInfringerName(suspectNames); + + String jysm = wfrwfxxes.stream() + .filter(obj -> StrUtil.isNotBlank(obj.getJysm())) + .map(DwdAsjZfbaWfrwfxx::getClfs) + .collect(Collectors.joining(";")); + + rpcApply.setJysm(jysm); + // 只有当存在实际处理方式时才覆盖默认值 if (StrUtil.isNotBlank(disposeMethods)) { rpcApply.setInfringerHandle(disposeMethods); @@ -389,10 +412,6 @@ public class Job { } } - - - - } diff --git a/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaWfrwfxx.java b/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaWfrwfxx.java index 6d4e316..7b0e2be 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaWfrwfxx.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaWfrwfxx.java @@ -26,6 +26,9 @@ public class DwdAsjZfbaWfrwfxx { @TableField("xbmc") private String xbmc; + @TableField("jysm") + private String jysm; + } diff --git a/src/main/java/com/biutag/supervision/pojo/entity/RpcApply.java b/src/main/java/com/biutag/supervision/pojo/entity/RpcApply.java index d710d46..0576fb1 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/RpcApply.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/RpcApply.java @@ -124,4 +124,7 @@ public class RpcApply { @TableField("case_name") private String caseName; + @TableField("jysm") + private String jysm; + } diff --git a/src/main/java/com/biutag/supervision/pojo/param/RpcApplyQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/RpcApplyQueryParam.java index 6c8eb5b..0cb798b 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/RpcApplyQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/RpcApplyQueryParam.java @@ -21,6 +21,10 @@ public class RpcApplyQueryParam extends BasePage { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private List happenTime; + private String caseType; + + private String caseCategory; + private String applicantEmpName; private String departId; diff --git a/src/main/java/com/biutag/supervision/pojo/vo/RightsExcelVo.java b/src/main/java/com/biutag/supervision/pojo/vo/RightsExcelVo.java new file mode 100644 index 0000000..20950f5 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/vo/RightsExcelVo.java @@ -0,0 +1,50 @@ +package com.biutag.supervision.pojo.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class RightsExcelVo { + + @ExcelProperty({"长沙市公安局维护民警执法权威案件督办表","案件管辖公安机关"}) + private String departName; + + @ExcelProperty({"长沙市公安局维护民警执法权威案件督办表","案件名称"}) + private String caseName; + + @ExcelProperty({"长沙市公安局维护民警执法权威案件督办表","发案时间"}) + private LocalDateTime happenTime; + + @ExcelProperty({"长沙市公安局维护民警执法权威案件督办表","简要案情"}) + private String factReason; + + @ExcelProperty({"长沙市公安局维护民警执法权威案件督办表","受（立）案情况"}) + private String caseType; + + @ExcelProperty({"长沙市公安局维护民警执法权威案件督办表","采取强制措施情况","行政处罚情况"}) + private String jysm; + + @ExcelProperty({"长沙市公安局维护民警执法权威案件督办表","采取强制措施情况","撤案时间"}) + private String withdrawalTime; + @ExcelProperty({"长沙市公安局维护民警执法权威案件督办表","采取强制措施情况","刑拘时间"}) + private String detentionTime; + @ExcelProperty({"长沙市公安局维护民警执法权威案件督办表","采取强制措施情况","取保候审时间"}) + private String pendingTime; + @ExcelProperty({"长沙市公安局维护民警执法权威案件督办表","采取强制措施情况","监视居住时间"}) + private String residential; + @ExcelProperty({"长沙市公安局维护民警执法权威案件督办表","采取强制措施情况","起诉时间"}) + private String prosecution; + + @ExcelProperty({"长沙市公安局维护民警执法权威案件督办表","抚慰民辅警情况"}) + private String officerSituation; + + @ExcelProperty({"长沙市公安局维护民警执法权威案件督办表","案件报送情况"}) + private String caseSubmission; + + @ExcelProperty({"长沙市公安局维护民警执法权威案件督办表","变更强制措施报送情况"}) + private String measure; + + +} diff --git a/src/main/java/com/biutag/supervision/pojo/vo/RpcApplyVo.java b/src/main/java/com/biutag/supervision/pojo/vo/RpcApplyVo.java index 2273d96..fe6708f 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/RpcApplyVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/RpcApplyVo.java @@ -123,4 +123,6 @@ public class RpcApplyVo { private String caseSubmission; private String changeMandate; + + private String jysm; } diff --git a/src/main/java/com/biutag/supervision/service/NegativeBlameService.java b/src/main/java/com/biutag/supervision/service/NegativeBlameService.java index b658677..feb87f8 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeBlameService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeBlameService.java @@ -39,7 +39,7 @@ public class NegativeBlameService extends ServiceImpl listByNegativeIds(Collection negativeIds) { - return list(new LambdaQueryWrapper().eq(NegativeBlame::getNegativeId, negativeIds)); + return list(new LambdaQueryWrapper().in(NegativeBlame::getNegativeId, negativeIds)); } public boolean remove(String negativeId) { diff --git a/src/main/java/com/biutag/supervision/service/RpcApplyService.java b/src/main/java/com/biutag/supervision/service/RpcApplyService.java index 8e1e320..fd4a113 100644 --- a/src/main/java/com/biutag/supervision/service/RpcApplyService.java +++ b/src/main/java/com/biutag/supervision/service/RpcApplyService.java @@ -102,6 +102,8 @@ public class RpcApplyService extends ServiceImpl { queryWrapper.like(StrUtil.isNotBlank(queryParam.getApplicantEmpName()), "a.applicant_emp_name", queryParam.getApplicantEmpName()) .eq(StrUtil.isNotBlank(queryParam.getDepartId()), "a.depart_id", queryParam.getDepartId()) .eq("a.type", type) + .eq(StrUtil.isNotBlank(queryParam.getCaseType()),"a.case_type",queryParam.getCaseType()) + .like(StrUtil.isNotBlank(queryParam.getCaseCategory()),"a.case_category",queryParam.getCaseCategory()) .eq(StrUtil.isNotBlank(queryParam.getRpcStatus()), "a.rpc_status", queryParam.getRpcStatus()) .orderByDesc("a.crt_time"); if (queryParam.getApplyDate() != null && queryParam.getApplyDate().size() == 2) { diff --git a/src/main/resources/mapper/RpcApplyMapper.xml b/src/main/resources/mapper/RpcApplyMapper.xml index 39e24a7..ab0d1a1 100644 --- a/src/main/resources/mapper/RpcApplyMapper.xml +++ b/src/main/resources/mapper/RpcApplyMapper.xml @@ -19,6 +19,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rap.emp_no as applicantEmpNo, a.happen_time as happentime, a.depart_name as departName, + a.case_type as caseType, + a.apply_date as applyDate, + a.case_category as caseCategory, a.case_number as caseNumber, a.fact_reason as factReason, rap.id as personId, diff --git a/src/main/resources/mapper/SamplingMapper.xml b/src/main/resources/mapper/SamplingMapper.xml index f7aff7b..3779447 100644 --- a/src/main/resources/mapper/SamplingMapper.xml +++ b/src/main/resources/mapper/SamplingMapper.xml @@ -168,8 +168,7 @@ LEFT JOIN sup_depart b on a.org_id = b.id - sup.position is null - and a.del =0 + a.del =0 and a.id_code in diff --git a/src/test/java/com/biutag/supervision/SupervisionApplicationTests.java b/src/test/java/com/biutag/supervision/SupervisionApplicationTests.java index 90f9c30..8b2ba39 100644 --- a/src/test/java/com/biutag/supervision/SupervisionApplicationTests.java +++ b/src/test/java/com/biutag/supervision/SupervisionApplicationTests.java @@ -61,7 +61,7 @@ class SupervisionApplicationTests { void testFun() throws ParseException { - job.testFun(); + job.rights(); } public String getPathTrace(SupDepart depart) {