From 2e7b586f09de3b029a2108aa4612f9446fae594d Mon Sep 17 00:00:00 2001 From: pengwei Date: Wed, 18 Jun 2025 17:37:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A4=A7=E5=B1=8F=E5=AE=8C=E5=96=84?= =?UTF-8?q?=EF=BC=88=E5=88=86=E5=8E=BF=E3=80=81=E8=A7=86=E9=A2=91=E7=9D=A3?= =?UTF-8?q?=E5=AF=9F=E3=80=81=E7=9B=91=E7=9D=A3=E7=AE=A1=E7=90=86=EF=BC=89?= =?UTF-8?q?=EF=BC=9B=E7=BB=B4=E6=9D=83=E7=9D=A3=E5=8A=9E=E7=9A=84=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/biutag/supervision/job/Job.java | 248 ++++++++++-------- .../supervision/mapper/ModelClueMapper.java | 4 +- .../supervision/mapper/NegativeMapper.java | 8 +- .../mapper/RpcApplyPersonMapper.java | 2 + .../mapper/RpcApplySuperviseMapper.java | 14 +- .../supervision/pojo/entity/AlarmFile.java | 2 +- .../pojo/entity/DwdAsjZfbaAjjbxx.java | 3 + .../pojo/entity/DwdAsjZfbaWfrwfxx.java | 6 + .../pojo/entity/RpcApplyPerson.java | 6 + .../pojo/entity/RpcApplySupervise.java | 3 + .../pojo/entity/RpcInfringerResult.java | 1 + .../param/RpcApplySupervisionQueryParam.java | 4 +- .../pojo/vo/OrganizeProblemRankVo.java | 2 + .../biutag/supervision/pojo/vo/RankVo.java | 3 + .../supervision/pojo/vo/RpcApplyVo.java | 6 + .../service/RpcApplyPersonService.java | 10 + .../service/RpcApplySuperviseService.java | 46 +++- .../resources/mapper/RpcApplyPersonMapper.xml | 27 ++ 18 files changed, 270 insertions(+), 125 deletions(-) create mode 100644 src/main/resources/mapper/RpcApplyPersonMapper.xml diff --git a/src/main/java/com/biutag/supervision/job/Job.java b/src/main/java/com/biutag/supervision/job/Job.java index 48e66f9..c22b0aa 100644 --- a/src/main/java/com/biutag/supervision/job/Job.java +++ b/src/main/java/com/biutag/supervision/job/Job.java @@ -106,120 +106,138 @@ public class Job { // 每天一次 23:30:00 //todo 维权信息 // @Scheduled(cron = "0 30 23 * * ?") -// public void rights() { -// log.info("rights--------------------"); -// log.info("维权信息抓取中---------------------"); -// // 维权 -// List shrxxList = dwdAsjZfbaShrxx2Service.listAll(); -// log.info("数据：{}条", shrxxList.size()); -// shrxxList.forEach(item -> { -// RpcApplySupervise rpcApply = new RpcApplySupervise(); -// rpcApply.setRpcId(item.getZj()); -// rpcApply.setCrtTime(LocalDateTime.now()); -// rpcApply.setUptTime(LocalDateTime.now()); -// // 姓名 -// rpcApply.setApplicantEmpName(item.getXm()); -// // 受害日期 -// if (Objects.nonNull(item.getShrq())) { -// rpcApply.setHappenTime(item.getShrq().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); -// } -// -// // 案件编号 -// rpcApply.setCaseNumber(item.getAjbh()); -// // 受害人警号 -// SupPolice police = policeService.getByIdCode(item.getGmsfhm()); -// -// -// if (Objects.nonNull(police)) { -// // 警号 -// rpcApply.setApplicantEmpNo(police.getEmpNo()); -// -//// SupDepart depart = departService.getById(police.getOrgId()); -//// rpcApply.setDepartId(depart.getId()); -//// rpcApply.setDepartId(depart.getName()); -// } -// if (StrUtil.isNotBlank(item.getAjbh())) { -// DwdAsjZfbaAjjbxx ajjbxx = dwdAsjZfbaAjjbxxMapper.selectByAjbh(item.getAjbh()); -// //获取办案人id -// if(StrUtil.isNotEmpty(ajjbxx.getBar1id())){ -// DwdRyZfbaBaryxx dwdRyZfbaBaryxx = dwdRyZfbaBaryxxService.getById(ajjbxx.getBar1id()); -// if(ObjectUtil.isNotEmpty(dwdRyZfbaBaryxx)){ -// SupPolice policeData = policeService.getByIdCode(dwdRyZfbaBaryxx.getZjhm()); -// rpcApply.setInputEmpNo(policeData.getEmpNo()); -// } -// -// } -// -// //获取单位进行处理 -// if(StrUtil.isNotEmpty(ajjbxx.getBadwidmc())){ -// -// SupDepart supDepart=supDepartMapper.selectOne(new LambdaQueryWrapper().eq(SupDepart::getName,ajjbxx.getBadwidmc())); -// rpcApply.setDepartId(supDepart.getId()); -// rpcApply.setDepartName(supDepart.getShortName()); -// -// //获取二级单位的信息 -// String[] depts = ajjbxx.getBadwidmc().split("局"); -// String StatisticsGroupName = null; -// if(depts.length >= 2){ -// StatisticsGroupName = depts[0]+"局"+depts[1]+"局"; -// }else{ -// StatisticsGroupName = depts[0]+"局"; -// } -// -// SupDepart groupDept= supDepartMapper.selectOne(new LambdaQueryWrapper().eq(SupDepart::getName,StatisticsGroupName)); -// rpcApply.setSecondDepartId(groupDept.getId()); -// } -// // 案件信息 -// rpcApply.setFactReason(ajjbxx.getJyaq()); -// if ("刑事".equals(ajjbxx.getAjbzmc())) { -// rpcApply.setInfringerHandle("刑事追究"); -// rpcApply.setCaseType("1"); -// } -// if ("行政".equals(ajjbxx.getAjbzmc())) { -// rpcApply.setInfringerHandle("行政处罚"); -// rpcApply.setCaseType("2"); -// } -// rpcApply.setCaseCategory(ajjbxx.getAjlbmc()); -// } -// // 申请类型 -// rpcApply.setType(RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue()); -// // 已办结 -// rpcApply.setRpcStatus(ComfortStatus.completed.name()); -// // 数据来源 -// rpcApply.setSource("gbase"); -// rpcApplySuperviseService.save(rpcApply); -// -// //受害人列表 -// RpcApplyPerson rpcApplyPerson= new RpcApplyPerson(); -// rpcApplyPerson.setType(RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue()); -// rpcApplyPerson.setInjurySeverity(item.getShcdmc()); -// rpcApplyPerson.setCreatTime(LocalDateTime.now()); -// rpcApplyPerson.setUdpTime(LocalDateTime.now()); -// rpcApplyPerson.setId(IdUtil.fastSimpleUUID()); -// if(Objects.nonNull(police)){ -// rpcApply.setApplicantEmpNo(police.getEmpNo()); -// } -// rpcApplyPerson.setRpcId(item.getZj()); -// //存储受害人信息 -// rpcApplyPersonService.save(rpcApplyPerson); -// -// -// //存储犯人信息 -// List wfrwfxxes = dwdAsjZfbaWfrwfxxMapper.selectList(new LambdaQueryWrapper().eq(DwdAsjZfbaWfrwfxx::getAjbh,item.getAjbh())); -// log.info("违法人员信息数据：{}条", wfrwfxxes.size()); -// if (ArrayUtil.isNotEmpty(wfrwfxxes)){ -// wfrwfxxes.forEach(x->{ -// RpcInfringerResult rpcInfringerResult =new RpcInfringerResult(); -// rpcInfringerResult.setId(IdUtil.fastSimpleUUID()); -// rpcInfringerResult.setRpcId(item.getZj()); -// rpcInfringerResult.setTortName(x.getXm()); -// rpcInfringerResult.setDefendHandleWayName(x.getClfs()); -// //保存犯人信息 -// rpcInfringerResultService.save(rpcInfringerResult); -// }); -// } -// -// }); -// } + public void rights() { + log.info("rights--------------------"); + log.info("维权信息抓取中---------------------"); + // 维权 + List shrxxList = dwdAsjZfbaShrxx2Service.listAll(); + log.info("数据：{}条", shrxxList.size()); + shrxxList.forEach(item -> { + RpcApplySupervise rpcApply = new RpcApplySupervise(); + rpcApply.setRpcId(item.getZj()); + rpcApply.setCrtTime(LocalDateTime.now()); + rpcApply.setUptTime(LocalDateTime.now()); + // 姓名 + rpcApply.setApplicantEmpName(item.getXm()); + // 受害日期 + if (Objects.nonNull(item.getShrq())) { + rpcApply.setHappenTime(item.getShrq().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); + } + + // 案件编号 + rpcApply.setCaseNumber(item.getAjbh()); + // 受害人警号 + SupPolice police = policeService.getByIdCode(item.getGmsfhm()); + + if (Objects.nonNull(police)) { + // 警号 + rpcApply.setApplicantEmpNo(police.getEmpNo()); +// //警员身份 + +// SupDepart depart = departService.getById(police.getOrgId()); +// rpcApply.setDepartId(depart.getId()); +// rpcApply.setDepartId(depart.getName()); + } + if (StrUtil.isNotBlank(item.getAjbh())) { + DwdAsjZfbaAjjbxx ajjbxx = dwdAsjZfbaAjjbxxMapper.selectByAjbh(item.getAjbh()); + //获取办案人id + if(StrUtil.isNotEmpty(ajjbxx.getBar1id())){ + DwdRyZfbaBaryxx dwdRyZfbaBaryxx = dwdRyZfbaBaryxxService.getById(ajjbxx.getBar1id()); + if(ObjectUtil.isNotEmpty(dwdRyZfbaBaryxx)){ + SupPolice policeData = policeService.getByIdCode(dwdRyZfbaBaryxx.getZjhm()); + rpcApply.setInputEmpNo(policeData.getEmpNo()); + } + + } + + + + + //获取单位进行处理 + if(StrUtil.isNotEmpty(ajjbxx.getBadwidmc())){ + + SupDepart supDepart=supDepartMapper.selectOne(new LambdaQueryWrapper().eq(SupDepart::getName,ajjbxx.getBadwidmc())); + rpcApply.setDepartId(supDepart.getId()); + rpcApply.setDepartName(supDepart.getShortName()); + + //获取二级单位的信息 + String[] depts = ajjbxx.getBadwidmc().split("局"); + String StatisticsGroupName = null; + if(depts.length >= 2){ + StatisticsGroupName = depts[0]+"局"+depts[1]+"局"; + }else{ + StatisticsGroupName = depts[0]+"局"; + } + + SupDepart groupDept= supDepartMapper.selectOne(new LambdaQueryWrapper().eq(SupDepart::getName,StatisticsGroupName)); + rpcApply.setSecondDepartId(groupDept.getId()); + } + // 案件信息 + rpcApply.setFactReason(ajjbxx.getJyaq()); + if ("刑事".equals(ajjbxx.getAjbzmc())) { + rpcApply.setInfringerHandle("刑事追究"); + rpcApply.setCaseType("1"); + } + if ("行政".equals(ajjbxx.getAjbzmc())) { + rpcApply.setInfringerHandle("行政处罚"); + rpcApply.setCaseType("2"); + } + rpcApply.setCaseCategory(ajjbxx.getAjlbmc()); + } + // 申请类型 + rpcApply.setType(RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue()); + // 已办结 + rpcApply.setRpcStatus(ComfortStatus.completed.name()); + // 数据来源 + rpcApply.setSource("gbase"); + rpcApplySuperviseService.save(rpcApply); + + //受害人列表 + RpcApplyPerson rpcApplyPerson= new RpcApplyPerson(); + rpcApplyPerson.setType(RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue()); + rpcApplyPerson.setInjurySeverity(item.getShcdmc()); + rpcApplyPerson.setCreatTime(LocalDateTime.now()); + rpcApplyPerson.setUdpTime(LocalDateTime.now()); + rpcApplyPerson.setId(IdUtil.fastSimpleUUID()); + //身份证 + rpcApplyPerson.setIdCode(item.getGmsfhm()); + //受到侵权形式 +// rpcApplyPerson.setFormsOfTort(item.getShxsmc()); + + if(Objects.nonNull(police)){ + rpcApply.setApplicantEmpNo(police.getEmpNo()); + } + rpcApplyPerson.setRpcId(item.getZj()); + //警员身份 + if(ObjectUtil.isNotEmpty(police)){ + rpcApplyPerson.setEmpType(police.getJobType()); + } + //存储受害人信息 + rpcApplyPersonService.save(rpcApplyPerson); + + + //存储犯人信息 + List wfrwfxxes = dwdAsjZfbaWfrwfxxMapper.selectList(new LambdaQueryWrapper().eq(DwdAsjZfbaWfrwfxx::getAjbh,item.getAjbh())); + log.info("违法人员信息数据：{}条", wfrwfxxes.size()); + if (ArrayUtil.isNotEmpty(wfrwfxxes)){ + wfrwfxxes.forEach(x->{ + RpcInfringerResult rpcInfringerResult =new RpcInfringerResult(); + rpcInfringerResult.setId(IdUtil.fastSimpleUUID()); + rpcInfringerResult.setRpcId(item.getZj()); + rpcInfringerResult.setTortName(x.getXm()); + rpcInfringerResult.setDefendHandleWayName(x.getClfs()); + //身份证 + rpcInfringerResult.setIdCode(x.getZjhm()); + //性别 + if(StrUtil.isNotEmpty(x.getXbmc())){ + rpcInfringerResult.setGender( x.getXbmc().split("性")[0]); + } + //保存犯人信息 + rpcInfringerResultService.save(rpcInfringerResult); + }); + } + + }); + } } diff --git a/src/main/java/com/biutag/supervision/mapper/ModelClueMapper.java b/src/main/java/com/biutag/supervision/mapper/ModelClueMapper.java index e63a720..c9aded1 100644 --- a/src/main/java/com/biutag/supervision/mapper/ModelClueMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/ModelClueMapper.java @@ -17,10 +17,10 @@ public interface ModelClueMapper extends BaseMapper { Page queryPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); @Select("${newSql}") - List> selectByUniqueKeys(@org.apache.ibatis.annotations.Param("newSql") String newSql); + List> selectByUniqueKeys(@Param("newSql") String newSql); List selectByModelId(@Param("modelId") int modelId); int updateInvolveDepartId(@Param("id") int id, @Param("newDepartId") String newDepartId); -} \ No newline at end of file +} diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java index 9997132..a5ce2f2 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java @@ -153,7 +153,9 @@ public interface NegativeMapper extends BaseMapper { "sd.short_name AS label, " + "sd.id AS departId, " + "COUNT(DISTINCT ng.id) AS denominator, " + - "COUNT( DISTINCT IF(ng.isRectifyCode=1, ng.id, NULL) ) AS numerator, " + + "COUNT( DISTINCT IF(ng.isRectifyCode = 1, ng.id, NULL) ) AS numerator, " + + " COUNT(DISTINCT IF(ng.crt_depart_level = 0, ng.id, null)) as cityNumber, "+ + " COUNT(DISTINCT IF(ng.crt_depart_level = 2, ng.id, null)) as countyNumber, "+ "ROUND( COUNT( DISTINCT IF(ng.processing_status='completed', ng.id, NULL) )/COUNT( DISTINCT ng.id )*100, 1) AS rate, " + "ROUND( COUNT( DISTINCT IF(ng.processing_status='completed', ng.id, NULL) )/COUNT( DISTINCT ng.id )*100, 1) AS `value` " + "FROM negative ng " + @@ -267,7 +269,9 @@ public interface NegativeMapper extends BaseMapper { List getVideoSuperviseProblemTypeRate(Date beginTime, Date endTime); @Select("SELECT d.short_name AS label, " + - "count(ng.id) as `value`" + + "count(ng.id) as `value`," + + " COUNT(DISTINCT IF(ng.crt_depart_level = 0, ng.id, null)) as cityNumber, "+ + " COUNT(DISTINCT IF(ng.crt_depart_level = 2, ng.id, null)) as countyNumber "+ " FROM negative ng " + "INNER JOIN sup_depart d ON ng.second_involve_depart_id = d.id " + "WHERE ng.checkStatus in (1, 2) " + diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplyPersonMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplyPersonMapper.java index 1e1fb6f..c200350 100644 --- a/src/main/java/com/biutag/supervision/mapper/RpcApplyPersonMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/RpcApplyPersonMapper.java @@ -23,4 +23,6 @@ public interface RpcApplyPersonMapper extends BaseMapper { " left join sup_police as sup " + " on a.emp_no = sup.emp_no where a.rpc_id = #{id} " ) List selectPerson(String id); + + int upRpcApplyPersonSupervise(@Param("rpcApplyPerso") RpcApplyPerson rpcApplyPerso); } diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplySuperviseMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplySuperviseMapper.java index ac4c81b..aee72d7 100644 --- a/src/main/java/com/biutag/supervision/mapper/RpcApplySuperviseMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/RpcApplySuperviseMapper.java @@ -10,6 +10,7 @@ import com.biutag.supervision.pojo.vo.RpcApplyVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; @Mapper public interface RpcApplySuperviseMapper extends BaseMapper { @@ -21,8 +22,7 @@ public interface RpcApplySuperviseMapper extends BaseMapper " a.*, " + " p.*, " + " ap.injury_severity AS injuryServerity, " + - " ap.injury_severity_name as injuryServerityName, " + - " sup.job_type AS policeJob " + + " ap.injury_severity_name as injuryServerityName " + " FROM " + " rpc_apply_supervise a " + " LEFT JOIN rpc_person p ON a.rpc_id = p.rpc_id " + @@ -32,5 +32,15 @@ public interface RpcApplySuperviseMapper extends BaseMapper ) RpcApplyVo selectDataById(String id); + @Update(" UPDATE rpc_apply_supervise set " + + " Incident_link_name = #{rpcApplyVo.incidentLinkName}, " + + " police_job = #{rpcApplyVo.policeJob}, " + + " infringer_handle = #{rpcApplyVo.infringerHandle}, " + + " case_submission = #{rpcApplyVo.caseSubmission}, " + + " change_mandate = #{rpcApplyVo.changeMandate} , " + + " verified = 2 "+ + " where rpc_id = #{rpcApplyVo.rpcId}") + int upSuperviseData(@Param("rpcApplyVo") RpcApplyVo rpcApplyVo); + } diff --git a/src/main/java/com/biutag/supervision/pojo/entity/AlarmFile.java b/src/main/java/com/biutag/supervision/pojo/entity/AlarmFile.java index f6452fc..29bed35 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/AlarmFile.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/AlarmFile.java @@ -44,7 +44,7 @@ public class AlarmFile { @TableField("`crt_user`") String crtUser; /** - * 创建单位 + * 创建单位 todo */ @TableField("`crt_depart_id`") String crtDepartId; diff --git a/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaAjjbxx.java b/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaAjjbxx.java index 1cd1455..b69f6a6 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaAjjbxx.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaAjjbxx.java @@ -39,5 +39,8 @@ public class DwdAsjZfbaAjjbxx { //办案人员1ID @TableField("bar1id") private String bar1id; + //案件状态名称 + @TableField("ajztmc") + private String ajztmc; } 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 54d039f..6b654e2 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaWfrwfxx.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaWfrwfxx.java @@ -20,4 +20,10 @@ public class DwdAsjZfbaWfrwfxx { @TableField("clfs") private String clfs; + @TableField("zjhm") + private String zjhm; + + @TableField("xbmc") + private String xbmc; + } diff --git a/src/main/java/com/biutag/supervision/pojo/entity/RpcApplyPerson.java b/src/main/java/com/biutag/supervision/pojo/entity/RpcApplyPerson.java index 10d3a08..37515d4 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/RpcApplyPerson.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/RpcApplyPerson.java @@ -29,8 +29,10 @@ public class RpcApplyPerson { // 受伤程度 + @TableField("injury_severity") private String injurySeverity; + @TableField("injury_severity_name") private String injurySeverityName; //办理结果 @@ -41,8 +43,12 @@ public class RpcApplyPerson { @TableField("id_code") private String idCode; + //侵权形式 + @TableField("forms_of_tort") + private String formsOfTort; //警员身份 + @TableField("emp_type") private String empType; //警员姓名 private String empName; diff --git a/src/main/java/com/biutag/supervision/pojo/entity/RpcApplySupervise.java b/src/main/java/com/biutag/supervision/pojo/entity/RpcApplySupervise.java index bf59dd5..0545ed9 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/RpcApplySupervise.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/RpcApplySupervise.java @@ -127,5 +127,8 @@ public class RpcApplySupervise { //案件报送情况 @TableField("case_submission") private String caseSubmission; + //案发警种 + @TableField("police_job") + private String policeJob; } diff --git a/src/main/java/com/biutag/supervision/pojo/entity/RpcInfringerResult.java b/src/main/java/com/biutag/supervision/pojo/entity/RpcInfringerResult.java index dc863f3..edbba69 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/RpcInfringerResult.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/RpcInfringerResult.java @@ -28,6 +28,7 @@ public class RpcInfringerResult { @TableField("defend_handle_way") private String defendHandleWay; + // 处理方式-名称 @TableField("defend_handle_way_name") private String defendHandleWayName; diff --git a/src/main/java/com/biutag/supervision/pojo/param/RpcApplySupervisionQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/RpcApplySupervisionQueryParam.java index de47057..f7cf737 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/RpcApplySupervisionQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/RpcApplySupervisionQueryParam.java @@ -25,9 +25,11 @@ public class RpcApplySupervisionQueryParam extends Page { //案件管辖单位 private String departId; //侵权形式 - private String InfringerHandle; + private String infringerHandle; //是否属实 private String verified; //案件编号 private String caseNumber; + //选择的标签页 + private String activeName; } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/OrganizeProblemRankVo.java b/src/main/java/com/biutag/supervision/pojo/vo/OrganizeProblemRankVo.java index b19719a..211fabb 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/OrganizeProblemRankVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/OrganizeProblemRankVo.java @@ -11,5 +11,7 @@ import lombok.Data; public class OrganizeProblemRankVo { private String label; // 部门名 private String value; // 问题数 + private String cityNumber;//市局问题数 + private String countyNumber; //县局问题数 } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/RankVo.java b/src/main/java/com/biutag/supervision/pojo/vo/RankVo.java index 3fb3dfa..274a2e7 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/RankVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/RankVo.java @@ -16,6 +16,9 @@ public class RankVo implements Serializable { private String departId; // 部门id private String numerator; // 分子 private String denominator; // 分母 + + private String cityNumber;//市局问题数 + private String countyNumber; //县局问题数 private String rate; // 率 private String value; // 率 } 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 7ae0c54..8ddc93f 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/RpcApplyVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/RpcApplyVo.java @@ -87,6 +87,7 @@ public class RpcApplyVo { // 是否属实 private String verified; + //侵权人处理方式 private String infringerHandle; //受伤程度编码 @@ -99,5 +100,10 @@ public class RpcApplyVo { private String caseName; //警种 private String policeJob; + //案发环节 + private String incidentLinkName; + //案件报送情况 + private String caseSubmission; + private String changeMandate; } diff --git a/src/main/java/com/biutag/supervision/service/RpcApplyPersonService.java b/src/main/java/com/biutag/supervision/service/RpcApplyPersonService.java index 4497f75..6c55c41 100644 --- a/src/main/java/com/biutag/supervision/service/RpcApplyPersonService.java +++ b/src/main/java/com/biutag/supervision/service/RpcApplyPersonService.java @@ -5,7 +5,17 @@ import com.biutag.supervision.pojo.entity.RpcApplyPerson; import com.biutag.supervision.mapper.RpcApplyPersonMapper; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class RpcApplyPersonService extends ServiceImpl { + List selectPerson(String id){ + return baseMapper.selectPerson(id); + } + + int upRpcApplyPersonSupervise(RpcApplyPerson rpcApplyPerson){ + return baseMapper.upRpcApplyPersonSupervise(rpcApplyPerson); + } + } diff --git a/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java b/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java index e549fa1..86c1f44 100644 --- a/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java +++ b/src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java @@ -1,5 +1,6 @@ package com.biutag.supervision.service; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -21,6 +22,7 @@ import com.biutag.supervision.pojo.vo.RpcSuperviseVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -38,7 +40,10 @@ public class RpcApplySuperviseService extends ServiceImpl pageList(RpcApplySupervisionQueryParam queryParam) { @@ -57,6 +62,15 @@ public class RpcApplySuperviseService extends ServiceImpl rpcApplyPersonList =rpcApplyPersonMapper.selectPerson(id); + List rpcApplyPersonList =rpcApplyPersonService.selectPerson(id); if(ArrayUtil.isNotEmpty(rpcApplyPersonList)){ superviseVo.setRpcApplyPeoples(rpcApplyPersonList); } @@ -100,4 +116,30 @@ public class RpcApplySuperviseService extends ServiceImpl + + + + + update rpc_apply_person + + + emp_type = #{rpcApplyPerso.empType,jdbcType=VARCHAR}, + + + injury_severity = #{rpcApplyPerso.injurySeverity}, + + + injury_severity_name = #{rpcApplyPerso.injurySeverityName}, + + + forms_of_tort = #{rpcApplyPerso.formsOfTort} + + + + rpc_id = #{rpcApplyPerso.rpcId} + + +