diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml index 9251d8c3b..833887206 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml @@ -6,17 +6,17 @@ - - + + - + - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml index 3c4f2f09a..a0b17555d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml @@ -9,10 +9,10 @@ - + - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml index abc0da398..f5573a7fc 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml @@ -8,9 +8,9 @@ - + - + id, region_id, user_id, type, deleted, create_id, create_time, update_id, update_time diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspection.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspection.java index d463b5570..8adea1070 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspection.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspection.java @@ -1,7 +1,5 @@ package com.cool.store.entity; -import java.time.LocalDateTime; - public class HyInspection { private Long id; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java index 0766bda0f..1970d919b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java @@ -8,6 +8,7 @@ import com.google.common.collect.Lists; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -47,13 +48,13 @@ public class UserRegionMappingDO implements Serializable { private String createId; @ApiModelProperty("创建时间") - private Long createTime; + private Date createTime; @ApiModelProperty("更新人") private String updateId; @ApiModelProperty("更新时间") - private Long updateTime; + private Date updateTime; public static List convertSyncDO(String regionId, List departmentUsers){ if(CollectionUtils.isEmpty(departmentUsers)){ @@ -65,8 +66,8 @@ public class UserRegionMappingDO implements Serializable { userRegion.setRegionId(regionId); userRegion.setUserId(departmentUser.getUserId()); userRegion.setType(DataSourceEnum.SYNC.getCode()); - userRegion.setCreateTime(System.currentTimeMillis()); - userRegion.setUpdateTime(System.currentTimeMillis()); + userRegion.setCreateTime(new Date()); + userRegion.setUpdateTime(new Date()); userRegion.setDeleted(Boolean.FALSE); resultList.add(userRegion); } @@ -83,8 +84,8 @@ public class UserRegionMappingDO implements Serializable { userRegion.setRegionId(regionId); userRegion.setUserId(userId); userRegion.setType(DataSourceEnum.SYNC.getCode()); - userRegion.setCreateTime(System.currentTimeMillis()); - userRegion.setUpdateTime(System.currentTimeMillis()); + userRegion.setCreateTime(new Date()); + userRegion.setUpdateTime(new Date()); userRegion.setDeleted(Boolean.FALSE); resultList.add(userRegion); } @@ -111,8 +112,8 @@ public class UserRegionMappingDO implements Serializable { userRegion.setRegionId(split[split.length-1]); userRegion.setUserId(user.getUserId()); userRegion.setType(DataSourceEnum.SYNC.getCode()); - userRegion.setCreateTime(System.currentTimeMillis()); - userRegion.setUpdateTime(System.currentTimeMillis()); + userRegion.setCreateTime(new Date()); + userRegion.setUpdateTime(new Date()); userRegion.setDeleted(Boolean.FALSE); resultList.add(userRegion); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewInspectionService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewInspectionService.java index 55b814394..a5643bd9a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewInspectionService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/InterviewInspectionService.java @@ -30,7 +30,7 @@ public interface InterviewInspectionService { /** * 提交稽核结果 */ - void submit(InspectionSubmissionDTO dto); + void submit(InspectionSubmissionDTO dto) throws ApiException; /** * 撤销稽核结果 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java index c33a407f0..dd6c97022 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java @@ -19,10 +19,7 @@ import com.cool.store.enums.OperateTypeEnum; import com.cool.store.enums.WorkflowStatusEnum; import com.cool.store.exception.ApiException; import com.cool.store.exception.ServiceException; -import com.cool.store.mapper.DingdingUserMapper; -import com.cool.store.mapper.HyPartnerCertificationInfoMapper; -import com.cool.store.mapper.HyPartnerInterviewMapper; -import com.cool.store.mapper.HyPartnerLineInfoMapper; +import com.cool.store.mapper.*; import com.cool.store.oss.OSSServer; import com.cool.store.request.*; import com.cool.store.request.data.flow.KeyText; @@ -94,6 +91,10 @@ public class FlowServiceImpl implements FlowService { @Autowired private HyPartnerLineInfoService hyPartnerLineInfoService; + + @Autowired + private HyInspectionMapper inspectionMapper; + @Override @Transactional public void createQualifyVerify(CreateQualifyVerifyReq request) throws ApiException, IOException { @@ -260,6 +261,10 @@ public class FlowServiceImpl implements FlowService { //3. 生成通过函并修改数据库相关信息 //TODO 问题：如果因为 pdf 生成失败或者其他原因导致异常，但是由于 MDM 只是做回调，不对回调是否成功负责，会导致流程信息缺失 genPassLetterAndUpdateDB(partnerName, verifyCity, passDate, interviewId); + //4. 向面试稽核表中新增一条信息 + HyInspection hyInspection = new HyInspection(); + hyInspection.setInterviewPlanId(Long.parseLong(interviewPlanId)); + inspectionMapper.insertSelective(hyInspection); //记录日志 LogBasicDTO log = LogBasicDTO.builder().operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC)) .build(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewInspectionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewInspectionServiceImpl.java index 5a2a4cd74..6a3806f3f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewInspectionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewInspectionServiceImpl.java @@ -23,6 +23,7 @@ import com.cool.store.vo.interview.InterviewInspectionVO; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Objects; @@ -43,7 +44,11 @@ public class InterviewInspectionServiceImpl implements InterviewInspectionServic private HyInterviewInspectionLogMapper interviewInspectionLogMapper; @Override - public void submit(InspectionSubmissionDTO dto) { + public void submit(InspectionSubmissionDTO dto) throws ApiException { + HyInspection rawInspection = inspectionMapper.selectByPrimaryKey(dto.getInspectionId()); + if (Objects.isNull(rawInspection)) { + throw new ApiException(ErrorCodeEnum.INSPECTION_INFO_NOT_EXIST); + } HyInspection hyInspection = new HyInspection(); //稽核结果和说明及文件等 hyInspection.setId(dto.getInspectionId()); @@ -55,14 +60,16 @@ public class InterviewInspectionServiceImpl implements InterviewInspectionServic hyInspection.setDescription(dto.getDescription()); String filesStr = spliceFiles(dto.getFiles()); hyInspection.setFiles(filesStr); - //稽核人，稽核时间 + //稽核人，稽核时间，创建人 hyInspection.setOperatorUserId(CurrentUserHolder.getUserId()); hyInspection.setUpdator(CurrentUserHolder.getUserId()); hyInspection.setInspectionTime(DateUtil.now()); + hyInspection.setCreator(rawInspection.getCreator() == null ? CurrentUserHolder.getUserId() : rawInspection.getCreator()); inspectionMapper.updateByPrimaryKeySelective(hyInspection); } @Override + @Transactional public void revoke(InspectionRevocationDTO dto) throws ApiException { //2.1 查询之前的一次操作 HyInspection hyInspection = inspectionMapper.selectByPrimaryKey(dto.getInspectionId()); @@ -78,7 +85,7 @@ public class InterviewInspectionServiceImpl implements InterviewInspectionServic String filesStr = spliceFiles(dto.getFiles()); inspectionLog.setOperationTime(DateUtil.now()); inspectionLog.setFiles(filesStr); - interviewInspectionLogMapper.updateByPrimaryKeySelective(inspectionLog); + interviewInspectionLogMapper.insertSelective(inspectionLog); //2. 撤销操作之前的一次操作写入面试稽核操作记录表 inspectionLog.setOperatorUserId(hyInspection.getOperatorUserId()); inspectionLog.setInspectionId(hyInspection.getId()); @@ -89,7 +96,8 @@ public class InterviewInspectionServiceImpl implements InterviewInspectionServic } inspectionLog.setDescription(hyInspection.getDescription()); inspectionLog.setFiles(hyInspection.getFiles()); - inspectionLog.setOperationTime(DateUtil.now()); + inspectionLog.setOperationTime(hyInspection.getInspectionTime()); + interviewInspectionLogMapper.insertSelective(inspectionLog); //3. 撤销操作之前的一次操作稽核信息状态修改为未稽核，并且将数据状态（其他字段）也恢复到未稽核时的状态 hyInspection.setOperatorUserId(null); hyInspection.setStatus(InspectionStatusEnum.NOT_INSPECT.getCode()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java index f3cd6b128..40c097abc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java @@ -52,7 +52,6 @@ public class LoginServiceImpl implements LoginService { throw new ServiceException(ErrorCodeEnum.USER_NOT_EXIST); } LoginUserInfo currentUser = new LoginUserInfo(); - RefreshUser refreshUser = new RefreshUser(); // 查企业用户 EnterpriseUserDO enterpriseUser = enterpriseUserDAO.getUserInfoById(userId); if(enterpriseUser == null){ diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java b/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java index 016da5c33..7c1c35efc 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java @@ -52,7 +52,7 @@ public class Swagger2Config { .groupName(groupName) .select() .apis(this.scanBasePackage(packages)) - .paths(PathSelectors.regex(".*/inspection/setting/.*|.*getRegionUserAndSubRegion")) + //.paths(PathSelectors.regex(".*/inspection/setting/.*|.*getRegionUserAndSubRegion")) .build() .globalOperationParameters(pars); } diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewInspectionController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewInspectionController.java index e9e607fab..c1b3b3de2 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewInspectionController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewInspectionController.java @@ -33,7 +33,7 @@ public class InterviewInspectionController { @PostMapping("/submission") @ApiOperation("提交稽核结果") - public ResponseResult interviewInspectionSubmit(@RequestBody InspectionSubmissionDTO dto) { + public ResponseResult interviewInspectionSubmit(@RequestBody InspectionSubmissionDTO dto) throws ApiException { interviewInspectionService.submit(dto); return ResponseResult.success(); }