Commit ac93781b authored by 赵啸非's avatar 赵啸非

添加照片海康下载

parent 2e1f8cf0
...@@ -5,6 +5,7 @@ import java.math.BigDecimal; ...@@ -5,6 +5,7 @@ import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
...@@ -377,7 +378,6 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -377,7 +378,6 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
if (PerformTypeEnum.考勤绩效.getValue().equals(performReq.getPerformType())) { if (PerformTypeEnum.考勤绩效.getValue().equals(performReq.getPerformType())) {
CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(performReq.getId(), context); CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(performReq.getId(), context);
BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity)); BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
} else if (PerformTypeEnum.评价差评绩效.getValue().equals(performReq.getPerformType())) { } else if (PerformTypeEnum.评价差评绩效.getValue().equals(performReq.getPerformType())) {
CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(performReq.getId(), context); CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(performReq.getId(), context);
BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity)); BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
...@@ -413,6 +413,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> { ...@@ -413,6 +413,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
} }
rest.setData(performDetailInfo); rest.setData(performDetailInfo);
log.info("rspperformDetailInfo:{}", JSON.toJSONString(performDetailInfo));
recordSysLog(request, busiDesc + " 【成功】"); recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) { } catch (Exception e) {
log.error(busiDesc, e); log.error(busiDesc, e);
......
...@@ -50,6 +50,14 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta ...@@ -50,6 +50,14 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
// return "1000"+data.getWorkNum(); // 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 @Override
public StaffInfoVo queryAll() { public StaffInfoVo queryAll() {
StaffInfoVo staffInfoVo = new StaffInfoVo(); StaffInfoVo staffInfoVo = new StaffInfoVo();
...@@ -103,6 +111,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta ...@@ -103,6 +111,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
userEntity.setUserType(UserType.WORK_PERSON.getValue()); userEntity.setUserType(UserType.WORK_PERSON.getValue());
userEntity.setSiteIds("1"); userEntity.setSiteIds("1");
userEntity.setAreaCodes("511500000000"); userEntity.setAreaCodes("511500000000");
userEntity.setMobile(entity.getPhoneNumber());
userEntity.setStatus(UserStatus.NORMAL.getValue()); userEntity.setStatus(UserStatus.NORMAL.getValue());
userEntity.setCreateUserId(this.getContextUserId(context)); userEntity.setCreateUserId(this.getContextUserId(context));
userEntity.setCreateTime(new Date()); userEntity.setCreateTime(new Date());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment