From 9c27236c084f5e99f3b404508d628390ecc5c5ee Mon Sep 17 00:00:00 2001 From: pengwei Date: Fri, 6 Jun 2025 16:35:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=A1=A5=E5=85=85=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E8=AD=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/work/NegativeController.java | 4 ++++ .../java/com/biutag/supervision/job/Job.java | 17 +++++++++++++---- .../mapper/DwdRyZfbaBaryxxMapper.java | 9 +++++++++ .../pojo/entity/DwdAsjZfbaAjjbxx.java | 3 +++ .../pojo/entity/DwdRyZfbaBaryxx.java | 17 +++++++++++++++++ .../supervision/pojo/entity/RpcApply.java | 3 +++ .../service/DwdRyZfbaBaryxxService.java | 10 ++++++++++ 7 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/biutag/supervision/mapper/DwdRyZfbaBaryxxMapper.java create mode 100644 src/main/java/com/biutag/supervision/pojo/entity/DwdRyZfbaBaryxx.java create mode 100644 src/main/java/com/biutag/supervision/service/DwdRyZfbaBaryxxService.java diff --git a/src/main/java/com/biutag/supervision/controller/work/NegativeController.java b/src/main/java/com/biutag/supervision/controller/work/NegativeController.java index f83e5e6..6824c8a 100644 --- a/src/main/java/com/biutag/supervision/controller/work/NegativeController.java +++ b/src/main/java/com/biutag/supervision/controller/work/NegativeController.java @@ -1,5 +1,6 @@ package com.biutag.supervision.controller.work; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -88,6 +89,9 @@ public class NegativeController { } Negative negative = negativeService.getOne(new LambdaUpdateWrapper().eq(Negative::getOriginId, dataCaseVerif.getOriginId())); if (negative == null) { +// NegativeDetail detail=new NegativeDetail(); +// BeanUtil.copyProperties(dataCaseVerif,detail); +// return Result.success(detail); throw new RuntimeException("案件核查处置意见数据异常！"); } return Result.success(negativeService.get(negative.getId(), null)); diff --git a/src/main/java/com/biutag/supervision/job/Job.java b/src/main/java/com/biutag/supervision/job/Job.java index 619ca3e..f9c36c5 100644 --- a/src/main/java/com/biutag/supervision/job/Job.java +++ b/src/main/java/com/biutag/supervision/job/Job.java @@ -1,9 +1,6 @@ package com.biutag.supervision.job; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.biutag.supervision.constants.enums.ComfortStatus; @@ -104,6 +101,7 @@ public class Job { private final RpcApplyPersonService rpcApplyPersonService; private final DwdAsjZfbaWfrwfxxMapper dwdAsjZfbaWfrwfxxMapper; private final RpcInfringerResultService rpcInfringerResultService; + private final DwdRyZfbaBaryxxService dwdRyZfbaBaryxxService; // 每天一次 23:30:00 //todo 维权信息 @Scheduled(cron = "0 30 23 * * ?") @@ -129,16 +127,27 @@ public class Job { 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())){ diff --git a/src/main/java/com/biutag/supervision/mapper/DwdRyZfbaBaryxxMapper.java b/src/main/java/com/biutag/supervision/mapper/DwdRyZfbaBaryxxMapper.java new file mode 100644 index 0000000..2dbec27 --- /dev/null +++ b/src/main/java/com/biutag/supervision/mapper/DwdRyZfbaBaryxxMapper.java @@ -0,0 +1,9 @@ +package com.biutag.supervision.mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.biutag.supervision.pojo.entity.DwdRyZfbaBaryxx; + +@DS("slave2") +public interface DwdRyZfbaBaryxxMapper extends BaseMapper { +} 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 70ba8c5..1cd1455 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaAjjbxx.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/DwdAsjZfbaAjjbxx.java @@ -36,5 +36,8 @@ public class DwdAsjZfbaAjjbxx { //具体案件类型 @TableField("ajlbmc") private String ajlbmc; + //办案人员1ID + @TableField("bar1id") + private String bar1id; } diff --git a/src/main/java/com/biutag/supervision/pojo/entity/DwdRyZfbaBaryxx.java b/src/main/java/com/biutag/supervision/pojo/entity/DwdRyZfbaBaryxx.java new file mode 100644 index 0000000..1f0c408 --- /dev/null +++ b/src/main/java/com/biutag/supervision/pojo/entity/DwdRyZfbaBaryxx.java @@ -0,0 +1,17 @@ +package com.biutag.supervision.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Getter; +import lombok.Setter; + +/** + * 保案人员信息 + * */ +@Getter +@Setter +public class DwdRyZfbaBaryxx { + @TableField("zj") + private String zj; + @TableField("zjhm") + private String zjhm; +} 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 e0c16a9..5c6c993 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/RpcApply.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/RpcApply.java @@ -67,6 +67,8 @@ public class RpcApply { private String incidentLink; private String incidentLinkName; + //录入人警号 + private String inputEmpNo; // 侵权形式 private String formsOfTort; @@ -101,6 +103,7 @@ public class RpcApply { private Integer numberIndex; + private String documentFile; private String approver; diff --git a/src/main/java/com/biutag/supervision/service/DwdRyZfbaBaryxxService.java b/src/main/java/com/biutag/supervision/service/DwdRyZfbaBaryxxService.java new file mode 100644 index 0000000..60e3754 --- /dev/null +++ b/src/main/java/com/biutag/supervision/service/DwdRyZfbaBaryxxService.java @@ -0,0 +1,10 @@ +package com.biutag.supervision.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.biutag.supervision.mapper.DwdRyZfbaBaryxxMapper; +import com.biutag.supervision.pojo.entity.DwdRyZfbaBaryxx; +import org.springframework.stereotype.Service; + +@Service +public class DwdRyZfbaBaryxxService extends ServiceImpl { +}