diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java index 587557511..b81de7ab4 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java @@ -17,7 +17,6 @@ public enum ShopSubStageEnum { SHOP_STAGE_2(ShopStageEnum.SHOP_STAGE_1, 20, "上传租赁合同", 14), SHOP_STAGE_4(ShopStageEnum.SHOP_STAGE_2, 40, "证照办理", 24), SHOP_STAGE_5(ShopStageEnum.SHOP_STAGE_2, 50, "员工招聘", 23), - SHOP_STAGE_6(ShopStageEnum.SHOP_STAGE_2, 60, "加盟商/员工培训", 30), SHOP_STAGE_7(ShopStageEnum.SHOP_STAGE_2, 70, "缴纳加盟费/保证金", 1), SHOP_STAGE_8(ShopStageEnum.SHOP_STAGE_2, 80, "加盟合同签约", 4), SHOP_STAGE_9(ShopStageEnum.SHOP_STAGE_2, 90, "设计阶段", 21), @@ -88,7 +87,6 @@ public enum ShopSubStageEnum { return ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70; case SHOP_STAGE_2: case SHOP_STAGE_4: - case SHOP_STAGE_6: case SHOP_STAGE_8: case SHOP_STAGE_9: case SHOP_STAGE_11: @@ -112,7 +110,6 @@ public enum ShopSubStageEnum { case SHOP_STAGE_1: case SHOP_STAGE_2: case SHOP_STAGE_5: - case SHOP_STAGE_6: case SHOP_STAGE_7: case SHOP_STAGE_8: return planCompleteTime.plusDays(getPlanCompleteDays()).toString(); diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java index c8cf688de..14a8ecc1b 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java @@ -35,10 +35,6 @@ public enum ShopSubStageStatusEnum { SHOP_SUB_STAGE_STATUS_50(ShopSubStageEnum.SHOP_STAGE_5, 500, "登记中", Boolean.FALSE), SHOP_SUB_STAGE_STATUS_51(ShopSubStageEnum.SHOP_STAGE_5, 510, "已完成", Boolean.TRUE), - //加盟商/员工培训 - SHOP_SUB_STAGE_STATUS_60(ShopSubStageEnum.SHOP_STAGE_6, 600, "培训中", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_61(ShopSubStageEnum.SHOP_STAGE_6, 610, "已完成", Boolean.TRUE), - //缴纳加盟费/保证金 SHOP_SUB_STAGE_STATUS_70(ShopSubStageEnum.SHOP_STAGE_7, 700, "待发布账单", Boolean.FALSE), SHOP_SUB_STAGE_STATUS_71(ShopSubStageEnum.SHOP_STAGE_7, 710, "待缴费", Boolean.FALSE), diff --git a/coolstore-partner-dao/src/main/resources/mapper/TempUserDetailMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/TempUserDetailMapper.xml index 55cff28c6..93bf3dcd4 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/TempUserDetailMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/TempUserDetailMapper.xml @@ -26,5 +26,7 @@ + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/TempUserDetailDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/TempUserDetailDO.java index b4d59ba0c..821709dae 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/TempUserDetailDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/TempUserDetailDO.java @@ -1,5 +1,6 @@ package com.cool.store.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -126,4 +127,9 @@ public class TempUserDetailDO { * 是否删除：0.否 1.是 */ private Boolean deleted; + @Column(name = "train_time") + private Date trainTime; + + @Column(name = "completion_certificate") + private String completionCertificate; } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/TempUserDetailRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/TempUserDetailRequest.java index 603a9d3d8..d56d68c35 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/TempUserDetailRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/TempUserDetailRequest.java @@ -54,4 +54,10 @@ public class TempUserDetailRequest { @ApiModelProperty("登记时间") private Date registerTime; + + @ApiModelProperty("培训时间") + private Date trainTime; + + @ApiModelProperty("结业证书") + private String completionCertificate; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/TempUserDetailInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/TempUserDetailInfoVO.java index 62fbc1a0b..7915df4e8 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/TempUserDetailInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/TempUserDetailInfoVO.java @@ -114,4 +114,10 @@ public class TempUserDetailInfoVO { @ApiModelProperty("来源：create-创建 sync-钉钉同步") private String source; + @ApiModelProperty("培训时间") + private Date trainTime; + + @ApiModelProperty("结业证书") + private String completionCertificate; + } \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java index 71c04f7ff..d375639d7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java @@ -614,12 +614,12 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { // 培训全部结束 //登记人员，培训状态由未开始到培训中 - ShopStageInfoDO shopStageInfoDO = shopStageInfoDAO.getShopSubStageInfo(tempUserDetailDO.getShopId(), ShopSubStageEnum.SHOP_STAGE_6); - if(shopStageInfoDO != null && shopStageInfoDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_60.getShopSubStageStatus())){ - shopStageInfoDAO.updateShopStageInfo(tempUserDetailDO.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_61); - //状态结束 - preparationService.whetherToOpenForAcceptance(tempUserDetailDO.getShopId()); - } +// ShopStageInfoDO shopStageInfoDO = shopStageInfoDAO.getShopSubStageInfo(tempUserDetailDO.getShopId(), ShopSubStageEnum.SHOP_STAGE_6); +// if(shopStageInfoDO != null && shopStageInfoDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_60.getShopSubStageStatus())){ +// shopStageInfoDAO.updateShopStageInfo(tempUserDetailDO.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_61); +// //状态结束 +// preparationService.whetherToOpenForAcceptance(tempUserDetailDO.getShopId()); +// } Map messageMap = new HashMap<>(); messageMap.put("storeName", shopInfoDO.getShopName()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java index 361b0f57c..410f0952d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java @@ -120,15 +120,17 @@ public class TempUserDetailServiceImpl implements TempUserDetailService { tempUserDetailDO.setIdCardPositiveUrl(tempUserDetailRequest.getIdNumPhoto()); tempUserDetailDO.setHealthCertificateUrl(tempUserDetailRequest.getHealthCertificate()); tempUserDetailDO.setRegisterTime(tempUserDetailRequest.getRegisterTime()); + tempUserDetailDO.setTrainTime(tempUserDetailRequest.getTrainTime()); + tempUserDetailDO.setCompletionCertificate(tempUserDetailRequest.getCompletionCertificate()); tempUserDetailDO.setSubmitTime(new Date()); tempUserDetailDO.setSource("create"); tempUserDetailDAO.insertSelective(tempUserDetailDO); //登记人员，培训状态由未开始到培训中 - ShopStageInfoDO shopStageInfoDO = shopStageInfoDAO.getShopSubStageInfo(tempUserDetailDO.getShopId(), ShopSubStageEnum.SHOP_STAGE_6); - if(shopStageInfoDO != null && shopStageInfoDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus())){ - shopStageInfoDAO.updateShopStageInfo(tempUserDetailDO.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_60); - } +// ShopStageInfoDO shopStageInfoDO = shopStageInfoDAO.getShopSubStageInfo(tempUserDetailDO.getShopId(), ShopSubStageEnum.SHOP_STAGE_6); +// if(shopStageInfoDO != null && shopStageInfoDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus())){ +// shopStageInfoDAO.updateShopStageInfo(tempUserDetailDO.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_60); +// } // List userIdList = enterpriseUserRoleDao.getUserIdsByRoleIdList(Collections.singletonList(UserRoleEnum.TRAINER.getCode())); // RegionDO regionDO = regionDao.getRegionById(shopInfoDO.getRegionId()); @@ -164,6 +166,8 @@ public class TempUserDetailServiceImpl implements TempUserDetailService { tempUserDetailInfoVO.setIdCardPositiveUrl(tempUserDetailDO.getIdCardPositiveUrl()); tempUserDetailInfoVO.setHealthCertificateUrl(tempUserDetailDO.getHealthCertificateUrl()); tempUserDetailInfoVO.setRegisterTime(tempUserDetailDO.getRegisterTime()); + tempUserDetailInfoVO.setTrainTime(tempUserDetailDO.getTrainTime()); + tempUserDetailInfoVO.setCompletionCertificate(tempUserDetailDO.getCompletionCertificate()); return tempUserDetailInfoVO; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTempUserDetailController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTempUserDetailController.java index d546ea9f8..d5c5d23a6 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTempUserDetailController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTempUserDetailController.java @@ -3,6 +3,7 @@ package com.cool.store.controller.webb; import com.cool.store.dto.ehr.StaffBaseInfoDTO; import com.cool.store.request.IdRequest; import com.cool.store.request.ShopIdRequest; +import com.cool.store.request.TempUserDetailRequest; import com.cool.store.response.ResponseResult; import com.cool.store.service.TempUserDetailService; import com.cool.store.vo.TempUserDetailInfoVO; @@ -46,6 +47,13 @@ public class PCTempUserDetailController { return ResponseResult.success(tempUserDetailService.getUserInfoByIdCard((idCard))); } + @PostMapping(path = "/addTempUserDetail") + @ApiOperation("培训登记-确认登记") + public ResponseResult addTempUserDetail(@RequestBody TempUserDetailRequest tempUserDetailRequest) { + tempUserDetailService.addTempUserDetail((tempUserDetailRequest)); + return ResponseResult.success(Boolean.TRUE); + } + @GetMapping(path = "/getUserInfoByIdUserDetailId") @ApiImplicitParams({