fix:补充录入警号

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<Negative>().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));

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())){

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<DwdRyZfbaBaryxx> {
+}

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;
 
 }

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;
+}

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;

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<DwdRyZfbaBaryxxMapper, DwdRyZfbaBaryxx> {
+}