diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java index 0725ef38da6f8ac598381438dd42f81e82212d4a..8f34a9287a3af867926d043a8f0e35adb8955a90 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java @@ -5,6 +5,7 @@ import java.math.BigDecimal; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.RandomUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.mortals.framework.common.Rest; import com.mortals.framework.exception.AppException; @@ -377,7 +378,6 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { if (PerformTypeEnum.鑰冨嫟缁╂晥.getValue().equals(performReq.getPerformType())) { CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(performReq.getId(), context); BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity)); - } else if (PerformTypeEnum.璇勪环宸瘎缁╂晥.getValue().equals(performReq.getPerformType())) { CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(performReq.getId(), context); BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity)); @@ -413,6 +413,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { } rest.setData(performDetailInfo); + log.info("rspperformDetailInfo:{}", JSON.toJSONString(performDetailInfo)); + recordSysLog(request, busiDesc + " 銆愭垚鍔熴€�"); } catch (Exception e) { log.error(busiDesc, e); diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java index 8985692a62139b75767d6ddb1bebb01728dbeccf..f35ca8594ea981206e2b56d82f0dfc5db1d5ab5d 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java @@ -50,6 +50,14 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta // return "1000"+data.getWorkNum(); } + @Override + protected void saveBefore(StaffEntity entity, Context context) throws AppException { + int count = this.count(new StaffQuery().workNum(entity.getWorkNum()), context); + if(count>0){ + throw new AppException("宸ュ彿閲嶅锛�"); + } + } + @Override public StaffInfoVo queryAll() { StaffInfoVo staffInfoVo = new StaffInfoVo(); @@ -103,6 +111,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta userEntity.setUserType(UserType.WORK_PERSON.getValue()); userEntity.setSiteIds("1"); userEntity.setAreaCodes("511500000000"); + userEntity.setMobile(entity.getPhoneNumber()); userEntity.setStatus(UserStatus.NORMAL.getValue()); userEntity.setCreateUserId(this.getContextUserId(context)); userEntity.setCreateTime(new Date());