Forráskód Böngészése

死亡人员导入(将上传修改的变更人修改为第三方名字)

LIVE_YE 3 éve
szülő
commit
d6c2174a92

+ 8 - 2
boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -20,6 +20,7 @@ import com.boman.domain.constant.CacheConstants;
 import com.boman.domain.dto.AjaxResult;
 import com.boman.domain.utils.ThreadPoolService;
 import com.boman.system.api.RemoteDeptService;
+import com.boman.system.api.RemoteDictDataService;
 import com.boman.system.api.model.LoginUser;
 import com.boman.web.core.domain.ConfirmInfoUser;
 import com.boman.web.core.domain.GridInfo;
@@ -87,6 +88,9 @@ public class CzrkServiceImpl implements ICzrkService {
     @Resource
     private ThirdPartInfoMapper thirdPartInfoMapper;
 
+    @Resource
+    private RemoteDictDataService remoteDictDataService;
+
     /**
      * 2022/3/24修复人员认领接口列表,逻辑:所有人都能看到所有没有确认,没有认领的人员
      *
@@ -1092,6 +1096,8 @@ public class CzrkServiceImpl implements ICzrkService {
         if (StringUtils.isNull(thirdPartInfoList) || thirdPartInfoList.size() == 0) {
             throw new CustomException("导入数据不能为空!");
         }
+        //获取上传死亡人员第三方数据remoteDictDataService
+        String sourceName = remoteDictDataService.selectDictLabel("data_sources",source);
         //获取登录人员
         SysUser sysUser = AuthUtils.getLoginUser().getSysUser();
         int successNum = 0;
@@ -1141,8 +1147,8 @@ public class CzrkServiceImpl implements ICzrkService {
                 if(ObjectUtils.isNotEmpty(czrkSjk)){
                     //数据库存在该人员
                     czrkSjk.setStatus("4");
-                    czrkSjk.setChangUser("第三方");
-                    czrkSjk.setChangNikeUser("第三方");
+                    czrkSjk.setChangUser(sourceName);
+                    czrkSjk.setChangNikeUser(sourceName);
                     czrkMapper.changeCzrk(czrkSjk);
                     thirdPartInfo.setIsLocal("是");
                     if(StringUtils.isNotEmpty(czrkSjk.getVillageTownsId())){