diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/susnate/controller/NateOperCombinedController.java b/src/main/java/com/chinaweal/aiccs/aiccs/susnate/controller/NateOperCombinedController.java index 6c95c86..2adbb93 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/susnate/controller/NateOperCombinedController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/susnate/controller/NateOperCombinedController.java @@ -15,6 +15,7 @@ import com.chinaweal.aiccs.aiccs.susnate.vo.NateOperCombinedVO; import com.chinaweal.aiccs.common.base.controller.BaseController; import com.chinaweal.aiccs.common.constant.CommonConstants; import com.chinaweal.aiccs.common.util.StringUtils; +import com.chinaweal.aicorg.model.AICUser; import com.chinaweal.youfool.framework.springboot.base.query.BaseQuery; import com.chinaweal.youfool.framework.springboot.rest.RestResult; import com.chinaweal.youfool.framework.springboot.rest.ResultCode; @@ -27,7 +28,9 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; +import java.time.LocalDateTime; import java.util.UUID; /** @@ -52,12 +55,15 @@ public class NateOperCombinedController extends BaseController { @ApiOperation(value = "0.融合新增冒用身份登记信息", position = 0) @PostMapping("/addNateOperCombined") @Transactional(rollbackFor = Exception.class) - public RestResult addNateOperCombined(@Valid @RequestBody NateOperCombinedAddDTO dto, BindingResult bindingResult) { + public RestResult addNateOperCombined(@Valid @RequestBody NateOperCombinedAddDTO dto, BindingResult bindingResult, HttpServletRequest request) { if (bindingResult.hasErrors()) { return RestResult.error(ResultCode.PARAM_IS_INVALID, bindingResult.getFieldError().getDefaultMessage()); } String id = StringUtils.getUUID(); + LocalDateTime now = LocalDateTime.now(); + + AICUser loginUser = getLoginUser(request); // 构建涉嫌冒用信息实体 ESusNateOperReg susEntity = new ESusNateOperReg(); @@ -81,6 +87,8 @@ public class NateOperCombinedController extends BaseController { susEntity.setJudAuthCn(dto.getJudAuthCn()); susEntity.setJudDate(dto.getJudDate()); susEntity.setDstate(CommonConstants.FALSE_0); + susEntity.setSExtDataTime(now); + susEntity.setSExtFromNode(loginUser.getRegionID()); // 构建冒用处理决定信息实体 ENateOperRegDec decEntity = new ENateOperRegDec(); @@ -97,6 +105,8 @@ public class NateOperCombinedController extends BaseController { decEntity.setJudDate(dto.getJudDate()); decEntity.setNoticedate(dto.getNoticeDate()); decEntity.setDstate(CommonConstants.FALSE_0); + decEntity.setSExtDataTime(now); + susEntity.setSExtFromNode(loginUser.getRegionID()); // 保存两个实体 iESusNateOperRegService.save(susEntity); @@ -138,6 +148,7 @@ public class NateOperCombinedController extends BaseController { } String id = dto.getId(); + LocalDateTime now = LocalDateTime.now(); // 构建涉嫌冒用信息实体 ESusNateOperReg susEntity = new ESusNateOperReg(); @@ -160,6 +171,7 @@ public class NateOperCombinedController extends BaseController { susEntity.setJudAuth(dto.getJudAuth()); susEntity.setJudAuthCn(dto.getJudAuthCn()); susEntity.setJudDate(dto.getJudDate()); + susEntity.setSExtDataTime(now); // 构建冒用处理决定信息实体 ENateOperRegDec decEntity = new ENateOperRegDec(); @@ -175,6 +187,7 @@ public class NateOperCombinedController extends BaseController { decEntity.setJudAuthCn(dto.getJudAuthCn()); decEntity.setJudDate(dto.getJudDate()); decEntity.setNoticedate(dto.getNoticeDate()); + decEntity.setSExtDataTime(now); // 更新两个实体 iESusNateOperRegService.updateById(susEntity); @@ -216,13 +229,14 @@ public class NateOperCombinedController extends BaseController { } String id = dto.getId(); - + LocalDateTime now = LocalDateTime.now(); // 软删除涉嫌冒用信息 LambdaQueryWrapper susWrapper = new LambdaQueryWrapper<>(); susWrapper.eq(ESusNateOperReg::getPersonateId, id); ESusNateOperReg susEntity = iESusNateOperRegService.getOne(susWrapper, false); if (susEntity != null) { susEntity.setDstate(CommonConstants.DELETED_2); + susEntity.setSExtDataTime(now); iESusNateOperRegService.updateById(susEntity); } @@ -232,6 +246,7 @@ public class NateOperCombinedController extends BaseController { ENateOperRegDec decEntity = iENateOperRegDecService.getOne(decWrapper, false); if (decEntity != null) { decEntity.setDstate(CommonConstants.DELETED_2); + decEntity.setSExtDataTime(now); iENateOperRegDecService.updateById(decEntity); }