Browse Source

fix:大屏完善(分县、视频督察、监督管理);维权督办的完善

master
pengwei 8 months ago
parent
commit
2e7b586f09
  1. 248
      src/main/java/com/biutag/supervision/job/Job.java
  2. 4
      src/main/java/com/biutag/supervision/mapper/ModelClueMapper.java
  3. 8
      src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
  4. 2
      src/main/java/com/biutag/supervision/mapper/RpcApplyPersonMapper.java
  5. 14
      src/main/java/com/biutag/supervision/mapper/RpcApplySuperviseMapper.java
  6. 2
      src/main/java/com/biutag/supervision/pojo/entity/AlarmFile.java
  7. 3
      src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaAjjbxx.java
  8. 6
      src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaWfrwfxx.java
  9. 6
      src/main/java/com/biutag/supervision/pojo/entity/RpcApplyPerson.java
  10. 3
      src/main/java/com/biutag/supervision/pojo/entity/RpcApplySupervise.java
  11. 1
      src/main/java/com/biutag/supervision/pojo/entity/RpcInfringerResult.java
  12. 4
      src/main/java/com/biutag/supervision/pojo/param/RpcApplySupervisionQueryParam.java
  13. 2
      src/main/java/com/biutag/supervision/pojo/vo/OrganizeProblemRankVo.java
  14. 3
      src/main/java/com/biutag/supervision/pojo/vo/RankVo.java
  15. 6
      src/main/java/com/biutag/supervision/pojo/vo/RpcApplyVo.java
  16. 10
      src/main/java/com/biutag/supervision/service/RpcApplyPersonService.java
  17. 46
      src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java
  18. 27
      src/main/resources/mapper/RpcApplyPersonMapper.xml

248
src/main/java/com/biutag/supervision/job/Job.java

@ -106,120 +106,138 @@ public class Job {
// 每天一次 23:30:00 // 每天一次 23:30:00
//todo 维权信息 //todo 维权信息
// @Scheduled(cron = "0 30 23 * * ?") // @Scheduled(cron = "0 30 23 * * ?")
// public void rights() { public void rights() {
// log.info("rights--------------------"); log.info("rights--------------------");
// log.info("维权信息抓取中---------------------"); log.info("维权信息抓取中---------------------");
// // 维权 // 维权
// List<DwdAsjZfbaShrxx2> shrxxList = dwdAsjZfbaShrxx2Service.listAll(); List<DwdAsjZfbaShrxx2> shrxxList = dwdAsjZfbaShrxx2Service.listAll();
// log.info("数据:{}条", shrxxList.size()); log.info("数据:{}条", shrxxList.size());
// shrxxList.forEach(item -> { shrxxList.forEach(item -> {
// RpcApplySupervise rpcApply = new RpcApplySupervise(); RpcApplySupervise rpcApply = new RpcApplySupervise();
// rpcApply.setRpcId(item.getZj()); rpcApply.setRpcId(item.getZj());
// rpcApply.setCrtTime(LocalDateTime.now()); rpcApply.setCrtTime(LocalDateTime.now());
// rpcApply.setUptTime(LocalDateTime.now()); rpcApply.setUptTime(LocalDateTime.now());
// // 姓名 // 姓名
// rpcApply.setApplicantEmpName(item.getXm()); rpcApply.setApplicantEmpName(item.getXm());
// // 受害日期 // 受害日期
// if (Objects.nonNull(item.getShrq())) { if (Objects.nonNull(item.getShrq())) {
// rpcApply.setHappenTime(item.getShrq().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); rpcApply.setHappenTime(item.getShrq().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
// } }
//
// // 案件编号 // 案件编号
// rpcApply.setCaseNumber(item.getAjbh()); rpcApply.setCaseNumber(item.getAjbh());
// // 受害人警号 // 受害人警号
// SupPolice police = policeService.getByIdCode(item.getGmsfhm()); SupPolice police = policeService.getByIdCode(item.getGmsfhm());
//
// if (Objects.nonNull(police)) {
// if (Objects.nonNull(police)) { // 警号
// // 警号 rpcApply.setApplicantEmpNo(police.getEmpNo());
// rpcApply.setApplicantEmpNo(police.getEmpNo()); // //警员身份
//
//// SupDepart depart = departService.getById(police.getOrgId()); // SupDepart depart = departService.getById(police.getOrgId());
//// rpcApply.setDepartId(depart.getId()); // rpcApply.setDepartId(depart.getId());
//// rpcApply.setDepartId(depart.getName()); // rpcApply.setDepartId(depart.getName());
// } }
// if (StrUtil.isNotBlank(item.getAjbh())) { if (StrUtil.isNotBlank(item.getAjbh())) {
// DwdAsjZfbaAjjbxx ajjbxx = dwdAsjZfbaAjjbxxMapper.selectByAjbh(item.getAjbh()); DwdAsjZfbaAjjbxx ajjbxx = dwdAsjZfbaAjjbxxMapper.selectByAjbh(item.getAjbh());
// //获取办案人id //获取办案人id
// if(StrUtil.isNotEmpty(ajjbxx.getBar1id())){ if(StrUtil.isNotEmpty(ajjbxx.getBar1id())){
// DwdRyZfbaBaryxx dwdRyZfbaBaryxx = dwdRyZfbaBaryxxService.getById(ajjbxx.getBar1id()); DwdRyZfbaBaryxx dwdRyZfbaBaryxx = dwdRyZfbaBaryxxService.getById(ajjbxx.getBar1id());
// if(ObjectUtil.isNotEmpty(dwdRyZfbaBaryxx)){ if(ObjectUtil.isNotEmpty(dwdRyZfbaBaryxx)){
// SupPolice policeData = policeService.getByIdCode(dwdRyZfbaBaryxx.getZjhm()); SupPolice policeData = policeService.getByIdCode(dwdRyZfbaBaryxx.getZjhm());
// rpcApply.setInputEmpNo(policeData.getEmpNo()); rpcApply.setInputEmpNo(policeData.getEmpNo());
// } }
//
// } }
//
// //获取单位进行处理
// if(StrUtil.isNotEmpty(ajjbxx.getBadwidmc())){
//
// SupDepart supDepart=supDepartMapper.selectOne(new LambdaQueryWrapper<SupDepart>().eq(SupDepart::getName,ajjbxx.getBadwidmc())); //获取单位进行处理
// rpcApply.setDepartId(supDepart.getId()); if(StrUtil.isNotEmpty(ajjbxx.getBadwidmc())){
// rpcApply.setDepartName(supDepart.getShortName());
// SupDepart supDepart=supDepartMapper.selectOne(new LambdaQueryWrapper<SupDepart>().eq(SupDepart::getName,ajjbxx.getBadwidmc()));
// //获取二级单位的信息 rpcApply.setDepartId(supDepart.getId());
// String[] depts = ajjbxx.getBadwidmc().split("局"); rpcApply.setDepartName(supDepart.getShortName());
// String StatisticsGroupName = null;
// if(depts.length >= 2){ //获取二级单位的信息
// StatisticsGroupName = depts[0]+"局"+depts[1]+"局"; String[] depts = ajjbxx.getBadwidmc().split("局");
// }else{ String StatisticsGroupName = null;
// StatisticsGroupName = depts[0]+"局"; if(depts.length >= 2){
// } StatisticsGroupName = depts[0]+"局"+depts[1]+"局";
// }else{
// SupDepart groupDept= supDepartMapper.selectOne(new LambdaQueryWrapper<SupDepart>().eq(SupDepart::getName,StatisticsGroupName)); StatisticsGroupName = depts[0]+"局";
// rpcApply.setSecondDepartId(groupDept.getId()); }
// }
// // 案件信息 SupDepart groupDept= supDepartMapper.selectOne(new LambdaQueryWrapper<SupDepart>().eq(SupDepart::getName,StatisticsGroupName));
// rpcApply.setFactReason(ajjbxx.getJyaq()); rpcApply.setSecondDepartId(groupDept.getId());
// if ("刑事".equals(ajjbxx.getAjbzmc())) { }
// rpcApply.setInfringerHandle("刑事追究"); // 案件信息
// rpcApply.setCaseType("1"); rpcApply.setFactReason(ajjbxx.getJyaq());
// } if ("刑事".equals(ajjbxx.getAjbzmc())) {
// if ("行政".equals(ajjbxx.getAjbzmc())) { rpcApply.setInfringerHandle("刑事追究");
// rpcApply.setInfringerHandle("行政处罚"); rpcApply.setCaseType("1");
// rpcApply.setCaseType("2"); }
// } if ("行政".equals(ajjbxx.getAjbzmc())) {
// rpcApply.setCaseCategory(ajjbxx.getAjlbmc()); rpcApply.setInfringerHandle("行政处罚");
// } rpcApply.setCaseType("2");
// // 申请类型 }
// rpcApply.setType(RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue()); rpcApply.setCaseCategory(ajjbxx.getAjlbmc());
// // 已办结 }
// rpcApply.setRpcStatus(ComfortStatus.completed.name()); // 申请类型
// // 数据来源 rpcApply.setType(RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue());
// rpcApply.setSource("gbase"); // 已办结
// rpcApplySuperviseService.save(rpcApply); rpcApply.setRpcStatus(ComfortStatus.completed.name());
// // 数据来源
// //受害人列表 rpcApply.setSource("gbase");
// RpcApplyPerson rpcApplyPerson= new RpcApplyPerson(); rpcApplySuperviseService.save(rpcApply);
// rpcApplyPerson.setType(RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue());
// rpcApplyPerson.setInjurySeverity(item.getShcdmc()); //受害人列表
// rpcApplyPerson.setCreatTime(LocalDateTime.now()); RpcApplyPerson rpcApplyPerson= new RpcApplyPerson();
// rpcApplyPerson.setUdpTime(LocalDateTime.now()); rpcApplyPerson.setType(RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue());
// rpcApplyPerson.setId(IdUtil.fastSimpleUUID()); rpcApplyPerson.setInjurySeverity(item.getShcdmc());
// if(Objects.nonNull(police)){ rpcApplyPerson.setCreatTime(LocalDateTime.now());
// rpcApply.setApplicantEmpNo(police.getEmpNo()); rpcApplyPerson.setUdpTime(LocalDateTime.now());
// } rpcApplyPerson.setId(IdUtil.fastSimpleUUID());
// rpcApplyPerson.setRpcId(item.getZj()); //身份证
// //存储受害人信息 rpcApplyPerson.setIdCode(item.getGmsfhm());
// rpcApplyPersonService.save(rpcApplyPerson); //受到侵权形式
// // rpcApplyPerson.setFormsOfTort(item.getShxsmc());
//
// //存储犯人信息 if(Objects.nonNull(police)){
// List<DwdAsjZfbaWfrwfxx> wfrwfxxes = dwdAsjZfbaWfrwfxxMapper.selectList(new LambdaQueryWrapper<DwdAsjZfbaWfrwfxx>().eq(DwdAsjZfbaWfrwfxx::getAjbh,item.getAjbh())); rpcApply.setApplicantEmpNo(police.getEmpNo());
// log.info("违法人员信息数据:{}条", wfrwfxxes.size()); }
// if (ArrayUtil.isNotEmpty(wfrwfxxes)){ rpcApplyPerson.setRpcId(item.getZj());
// wfrwfxxes.forEach(x->{ //警员身份
// RpcInfringerResult rpcInfringerResult =new RpcInfringerResult(); if(ObjectUtil.isNotEmpty(police)){
// rpcInfringerResult.setId(IdUtil.fastSimpleUUID()); rpcApplyPerson.setEmpType(police.getJobType());
// rpcInfringerResult.setRpcId(item.getZj()); }
// rpcInfringerResult.setTortName(x.getXm()); //存储受害人信息
// rpcInfringerResult.setDefendHandleWayName(x.getClfs()); rpcApplyPersonService.save(rpcApplyPerson);
// //保存犯人信息
// rpcInfringerResultService.save(rpcInfringerResult);
// }); //存储犯人信息
// } List<DwdAsjZfbaWfrwfxx> wfrwfxxes = dwdAsjZfbaWfrwfxxMapper.selectList(new LambdaQueryWrapper<DwdAsjZfbaWfrwfxx>().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);
});
}
});
}
} }

4
src/main/java/com/biutag/supervision/mapper/ModelClueMapper.java

@ -17,10 +17,10 @@ public interface ModelClueMapper extends BaseMapper<ModelClue> {
Page<ModelClueModel> queryPage(@Param("page") Page<ModelClue> page, @Param(Constants.WRAPPER) QueryWrapper<ModelClue> queryWrapper); Page<ModelClueModel> queryPage(@Param("page") Page<ModelClue> page, @Param(Constants.WRAPPER) QueryWrapper<ModelClue> queryWrapper);
@Select("${newSql}") @Select("${newSql}")
List<Map<String, Object>> selectByUniqueKeys(@org.apache.ibatis.annotations.Param("newSql") String newSql); List<Map<String, Object>> selectByUniqueKeys(@Param("newSql") String newSql);
List<ModelClue> selectByModelId(@Param("modelId") int modelId); List<ModelClue> selectByModelId(@Param("modelId") int modelId);
int updateInvolveDepartId(@Param("id") int id, @Param("newDepartId") String newDepartId); int updateInvolveDepartId(@Param("id") int id, @Param("newDepartId") String newDepartId);
} }

8
src/main/java/com/biutag/supervision/mapper/NegativeMapper.java

@ -153,7 +153,9 @@ public interface NegativeMapper extends BaseMapper<Negative> {
"sd.short_name AS label, " + "sd.short_name AS label, " +
"sd.id AS departId, " + "sd.id AS departId, " +
"COUNT(DISTINCT ng.id) AS denominator, " + "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 rate, " +
"ROUND( COUNT( DISTINCT IF(ng.processing_status='completed', ng.id, NULL) )/COUNT( DISTINCT ng.id )*100, 1) AS `value` " + "ROUND( COUNT( DISTINCT IF(ng.processing_status='completed', ng.id, NULL) )/COUNT( DISTINCT ng.id )*100, 1) AS `value` " +
"FROM negative ng " + "FROM negative ng " +
@ -267,7 +269,9 @@ public interface NegativeMapper extends BaseMapper<Negative> {
List<EchartsVo> getVideoSuperviseProblemTypeRate(Date beginTime, Date endTime); List<EchartsVo> getVideoSuperviseProblemTypeRate(Date beginTime, Date endTime);
@Select("SELECT d.short_name AS label, " + @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 " + " FROM negative ng " +
"INNER JOIN sup_depart d ON ng.second_involve_depart_id = d.id " + "INNER JOIN sup_depart d ON ng.second_involve_depart_id = d.id " +
"WHERE ng.checkStatus in (1, 2) " + "WHERE ng.checkStatus in (1, 2) " +

2
src/main/java/com/biutag/supervision/mapper/RpcApplyPersonMapper.java

@ -23,4 +23,6 @@ public interface RpcApplyPersonMapper extends BaseMapper<RpcApplyPerson> {
" left join sup_police as sup " + " left join sup_police as sup " +
" on a.emp_no = sup.emp_no where a.rpc_id = #{id} " ) " on a.emp_no = sup.emp_no where a.rpc_id = #{id} " )
List<RpcApplyPerson> selectPerson(String id); List<RpcApplyPerson> selectPerson(String id);
int upRpcApplyPersonSupervise(@Param("rpcApplyPerso") RpcApplyPerson rpcApplyPerso);
} }

14
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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
@Mapper @Mapper
public interface RpcApplySuperviseMapper extends BaseMapper<RpcApplySupervise> { public interface RpcApplySuperviseMapper extends BaseMapper<RpcApplySupervise> {
@ -21,8 +22,7 @@ public interface RpcApplySuperviseMapper extends BaseMapper<RpcApplySupervise>
" a.*, " + " a.*, " +
" p.*, " + " p.*, " +
" ap.injury_severity AS injuryServerity, " + " ap.injury_severity AS injuryServerity, " +
" ap.injury_severity_name as injuryServerityName, " + " ap.injury_severity_name as injuryServerityName " +
" sup.job_type AS policeJob " +
" FROM " + " FROM " +
" rpc_apply_supervise a " + " rpc_apply_supervise a " +
" LEFT JOIN rpc_person p ON a.rpc_id = p.rpc_id " + " LEFT JOIN rpc_person p ON a.rpc_id = p.rpc_id " +
@ -32,5 +32,15 @@ public interface RpcApplySuperviseMapper extends BaseMapper<RpcApplySupervise>
) )
RpcApplyVo selectDataById(String id); 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);
} }

2
src/main/java/com/biutag/supervision/pojo/entity/AlarmFile.java

@ -44,7 +44,7 @@ public class AlarmFile {
@TableField("`crt_user`") @TableField("`crt_user`")
String crtUser; String crtUser;
/** /**
* 创建单位 * 创建单位 todo
*/ */
@TableField("`crt_depart_id`") @TableField("`crt_depart_id`")
String crtDepartId; String crtDepartId;

3
src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaAjjbxx.java

@ -39,5 +39,8 @@ public class DwdAsjZfbaAjjbxx {
//办案人员1ID //办案人员1ID
@TableField("bar1id") @TableField("bar1id")
private String bar1id; private String bar1id;
//案件状态名称
@TableField("ajztmc")
private String ajztmc;
} }

6
src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaWfrwfxx.java

@ -20,4 +20,10 @@ public class DwdAsjZfbaWfrwfxx {
@TableField("clfs") @TableField("clfs")
private String clfs; private String clfs;
@TableField("zjhm")
private String zjhm;
@TableField("xbmc")
private String xbmc;
} }

6
src/main/java/com/biutag/supervision/pojo/entity/RpcApplyPerson.java

@ -29,8 +29,10 @@ public class RpcApplyPerson {
// 受伤程度 // 受伤程度
@TableField("injury_severity")
private String injurySeverity; private String injurySeverity;
@TableField("injury_severity_name")
private String injurySeverityName; private String injurySeverityName;
//办理结果 //办理结果
@ -41,8 +43,12 @@ public class RpcApplyPerson {
@TableField("id_code") @TableField("id_code")
private String idCode; private String idCode;
//侵权形式
@TableField("forms_of_tort")
private String formsOfTort;
//警员身份 //警员身份
@TableField("emp_type")
private String empType; private String empType;
//警员姓名 //警员姓名
private String empName; private String empName;

3
src/main/java/com/biutag/supervision/pojo/entity/RpcApplySupervise.java

@ -127,5 +127,8 @@ public class RpcApplySupervise {
//案件报送情况 //案件报送情况
@TableField("case_submission") @TableField("case_submission")
private String caseSubmission; private String caseSubmission;
//案发警种
@TableField("police_job")
private String policeJob;
} }

1
src/main/java/com/biutag/supervision/pojo/entity/RpcInfringerResult.java

@ -28,6 +28,7 @@ public class RpcInfringerResult {
@TableField("defend_handle_way") @TableField("defend_handle_way")
private String defendHandleWay; private String defendHandleWay;
// 处理方式-名称 // 处理方式-名称
@TableField("defend_handle_way_name") @TableField("defend_handle_way_name")
private String defendHandleWayName; private String defendHandleWayName;

4
src/main/java/com/biutag/supervision/pojo/param/RpcApplySupervisionQueryParam.java

@ -25,9 +25,11 @@ public class RpcApplySupervisionQueryParam extends Page {
//案件管辖单位 //案件管辖单位
private String departId; private String departId;
//侵权形式 //侵权形式
private String InfringerHandle; private String infringerHandle;
//是否属实 //是否属实
private String verified; private String verified;
//案件编号 //案件编号
private String caseNumber; private String caseNumber;
//选择的标签页
private String activeName;
} }

2
src/main/java/com/biutag/supervision/pojo/vo/OrganizeProblemRankVo.java

@ -11,5 +11,7 @@ import lombok.Data;
public class OrganizeProblemRankVo { public class OrganizeProblemRankVo {
private String label; // 部门名 private String label; // 部门名
private String value; // 问题数 private String value; // 问题数
private String cityNumber;//市局问题数
private String countyNumber; //县局问题数
} }

3
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 departId; // 部门id
private String numerator; // 分子 private String numerator; // 分子
private String denominator; // 分母 private String denominator; // 分母
private String cityNumber;//市局问题数
private String countyNumber; //县局问题数
private String rate; // 率 private String rate; // 率
private String value; // 率 private String value; // 率
} }

6
src/main/java/com/biutag/supervision/pojo/vo/RpcApplyVo.java

@ -87,6 +87,7 @@ public class RpcApplyVo {
// 是否属实 // 是否属实
private String verified; private String verified;
//侵权人处理方式 //侵权人处理方式
private String infringerHandle; private String infringerHandle;
//受伤程度编码 //受伤程度编码
@ -99,5 +100,10 @@ public class RpcApplyVo {
private String caseName; private String caseName;
//警种 //警种
private String policeJob; private String policeJob;
//案发环节
private String incidentLinkName;
//案件报送情况
private String caseSubmission;
private String changeMandate;
} }

10
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 com.biutag.supervision.mapper.RpcApplyPersonMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
@Service @Service
public class RpcApplyPersonService extends ServiceImpl<RpcApplyPersonMapper, RpcApplyPerson> { public class RpcApplyPersonService extends ServiceImpl<RpcApplyPersonMapper, RpcApplyPerson> {
List<RpcApplyPerson> selectPerson(String id){
return baseMapper.selectPerson(id);
}
int upRpcApplyPersonSupervise(RpcApplyPerson rpcApplyPerson){
return baseMapper.upRpcApplyPersonSupervise(rpcApplyPerson);
}
} }

46
src/main/java/com/biutag/supervision/service/RpcApplySuperviseService.java

@ -1,5 +1,6 @@
package com.biutag.supervision.service; package com.biutag.supervision.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@ -21,6 +22,7 @@ import com.biutag.supervision.pojo.vo.RpcSuperviseVo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -38,7 +40,10 @@ public class RpcApplySuperviseService extends ServiceImpl<RpcApplySuperviseMappe
private final RpcInfringerResultService rpcInfringerResultService; private final RpcInfringerResultService rpcInfringerResultService;
private final RpcApplyPersonMapper rpcApplyPersonMapper; private final RpcApplyPersonService rpcApplyPersonService;
private final RpcApplyService rpcApplyService;
//分页查询 //分页查询
public Page<RpcApplyVo> pageList(RpcApplySupervisionQueryParam queryParam) { public Page<RpcApplyVo> pageList(RpcApplySupervisionQueryParam queryParam) {
@ -57,6 +62,15 @@ public class RpcApplySuperviseService extends ServiceImpl<RpcApplySuperviseMappe
queryWrapper.in("a.handle_depart_id", childrenIds); queryWrapper.in("a.handle_depart_id", childrenIds);
} }
} }
//待处理维权
if("1".equals(queryParam.getActiveName())){
queryWrapper.eq("a.verified","0");
}
//无效维权
if("2".equals(queryParam.getActiveName())){
queryWrapper.eq("a.verified","1");
}
queryWrapper.like(StrUtil.isNotBlank(queryParam.getCaseName()), "a.case_name", queryParam.getCaseName()) queryWrapper.like(StrUtil.isNotBlank(queryParam.getCaseName()), "a.case_name", queryParam.getCaseName())
.eq(StrUtil.isNotBlank(queryParam.getDepartId()), "a.depart_id", queryParam.getDepartId()) .eq(StrUtil.isNotBlank(queryParam.getDepartId()), "a.depart_id", queryParam.getDepartId())
.eq("a.type", "1") .eq("a.type", "1")
@ -64,6 +78,8 @@ public class RpcApplySuperviseService extends ServiceImpl<RpcApplySuperviseMappe
.eq(StrUtil.isNotBlank(queryParam.getVerified()),"a.verified",queryParam.getVerified()) .eq(StrUtil.isNotBlank(queryParam.getVerified()),"a.verified",queryParam.getVerified())
.eq(StrUtil.isNotBlank(queryParam.getCaseNumber()),"a.case_number",queryParam.getCaseNumber()) .eq(StrUtil.isNotBlank(queryParam.getCaseNumber()),"a.case_number",queryParam.getCaseNumber())
.orderByDesc("a.crt_time"); .orderByDesc("a.crt_time");
if (queryParam.getApplyDate() != null && queryParam.getApplyDate().size() == 2) { if (queryParam.getApplyDate() != null && queryParam.getApplyDate().size() == 2) {
queryWrapper.between("a.apply_date", queryParam.getApplyDate().get(0), queryParam.getApplyDate().get(1)); queryWrapper.between("a.apply_date", queryParam.getApplyDate().get(0), queryParam.getApplyDate().get(1));
} }
@ -90,7 +106,7 @@ public class RpcApplySuperviseService extends ServiceImpl<RpcApplySuperviseMappe
superviseVo.setRpcInfringerResults(rpcInfringerResults); superviseVo.setRpcInfringerResults(rpcInfringerResults);
} }
//获取被侵权人信息 //获取被侵权人信息
List<RpcApplyPerson> rpcApplyPersonList =rpcApplyPersonMapper.selectPerson(id); List<RpcApplyPerson> rpcApplyPersonList =rpcApplyPersonService.selectPerson(id);
if(ArrayUtil.isNotEmpty(rpcApplyPersonList)){ if(ArrayUtil.isNotEmpty(rpcApplyPersonList)){
superviseVo.setRpcApplyPeoples(rpcApplyPersonList); superviseVo.setRpcApplyPeoples(rpcApplyPersonList);
} }
@ -100,4 +116,30 @@ public class RpcApplySuperviseService extends ServiceImpl<RpcApplySuperviseMappe
return null; return null;
} }
} }
//修改数据
@Transactional(rollbackFor = Exception.class)
public void upSuperviseData(RpcSuperviseVo rpcSuperviseVo){
//1、修改案件信箱
if(ObjectUtil.isNotEmpty(rpcSuperviseVo.getRpcApplyVo())){
//案件信息
//案发环节 incidentLinkName、案发警种 policeJob、
// 案件类别 infringerHandle、案件报送情况 caseSubmission、变更强制措施报送情况 changeMandate
baseMapper.upSuperviseData(rpcSuperviseVo.getRpcApplyVo());
RpcApplySupervise supervise = baseMapper.selectById(rpcSuperviseVo.getRpcApplyVo().getRpcId());
RpcApply rpcApply= new RpcApply();
BeanUtil.copyProperties(supervise,rpcApply);
rpcApplyService.saveOrUpdate(rpcApply);
}
//2、修改侵权人
if(ObjectUtil.isNotEmpty(rpcSuperviseVo.getRpcInfringerResults())){
rpcInfringerResultService.updateBatchById(rpcSuperviseVo.getRpcInfringerResults());
}
//3、修改被侵权人
if(ObjectUtil.isNotEmpty(rpcSuperviseVo.getRpcApplyPeoples())){
rpcSuperviseVo.getRpcApplyPeoples().forEach(rpcApplyPersonService::upRpcApplyPersonSupervise);
}
}
} }

27
src/main/resources/mapper/RpcApplyPersonMapper.xml

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.biutag.supervision.mapper.RpcApplyPersonMapper">
<update id="upRpcApplyPersonSupervise" >
update rpc_apply_person
<set>
<if test="rpcApplyPerso.emptype != null and rpcApplyPerso.emptype != '' ">
emp_type = #{rpcApplyPerso.empType,jdbcType=VARCHAR},
</if>
<if test="rpcApplyPerso.injurySeverity != null and rpcApplyPerso.injurySeverity != ''">
injury_severity = #{rpcApplyPerso.injurySeverity},
</if>
<if test="rpcApplyPerso.injurySeverityName != null and rpcApplyPerso.injurySeverityName != ''">
injury_severity_name = #{rpcApplyPerso.injurySeverityName},
</if>
<if test="rpcApplyPerso.formsOfTort != null and rpcApplyPerso.formsOfTort != ''">
forms_of_tort = #{rpcApplyPerso.formsOfTort}
</if>
</set>
<where>
rpc_id = #{rpcApplyPerso.rpcId}
</where>
</update>
</mapper>
Loading…
Cancel
Save