|
@@ -305,7 +305,6 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
|
|
}
|
|
}
|
|
//出库
|
|
//出库
|
|
outStoreFormDTO.setStatus(OutStoreStatusEnum.NOT_EXECUTE.getValue());
|
|
outStoreFormDTO.setStatus(OutStoreStatusEnum.NOT_EXECUTE.getValue());
|
|
- outStoreFormDTO.setOutFlag(1);
|
|
|
|
BigDecimal outStoreCount=outStoreFormMapper.getOutStoreFormCount1(outStoreFormDTO);
|
|
BigDecimal outStoreCount=outStoreFormMapper.getOutStoreFormCount1(outStoreFormDTO);
|
|
noticeNumberVO.setOutStoreNum(outStoreCount==null?initNum:outStoreCount);
|
|
noticeNumberVO.setOutStoreNum(outStoreCount==null?initNum:outStoreCount);
|
|
if (noticeNumberVO.getRoleFlag()!=5) {
|
|
if (noticeNumberVO.getRoleFlag()!=5) {
|
|
@@ -409,9 +408,9 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
|
|
repairApplicationFormVOS= mapper.getRepairCount(repairApplicationFormDTO);
|
|
repairApplicationFormVOS= mapper.getRepairCount(repairApplicationFormDTO);
|
|
noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);
|
|
noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);
|
|
|
|
|
|
- outStoreFormDTO.setCreatedUserId(userInfo.getUserId());
|
|
|
|
|
|
+ outStoreFormDTO.setUserId(userInfo.getUserId());
|
|
outStoreFormDTO.setOutFlag(1);
|
|
outStoreFormDTO.setOutFlag(1);
|
|
- noticeNumberVO=addStoreNums(noticeNumberVO,inStoreFormDTO,outStoreFormDTO,storeCheckJobDTO);
|
|
|
|
|
|
+ noticeNumberVO = addStoreNums(noticeNumberVO,inStoreFormDTO,outStoreFormDTO,storeCheckJobDTO);
|
|
}
|
|
}
|
|
else if(sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE)){
|
|
else if(sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE)){
|
|
//维修管理员,先获取其deptid
|
|
//维修管理员,先获取其deptid
|