project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
@@ -15,6 +15,7 @@ import com.project.system.domain.bo.editBo.CheckBo; import com.project.system.domain.bo.editBo.SysCompanyBo; import com.project.system.service.ISysCompanyService; import com.project.system.service.ISysUserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,6 +35,7 @@ public class CheckServiceImpl implements ICheckService { private final ISysUserService userService; private final ISysCompanyService companyService; private final IEnforceOrderService orderService; private final IEnforceCheckLogService checkLogService; @@ -91,12 +93,18 @@ } else { List<String> phones = orderService.getCheckPhones(order.getCheckLevel()+1, order.getApplyDeptId()); if (StringUtils.isNotEmpty(phones)){ int checkLevel = Integer.parseInt(phones.get(0)); order.setCheckLevel(checkLevel); phones.remove(0); phones.remove(0); order.setCheckStatus(1); //给下一级审批人发送短信 smsService.sendApplyMsg(phones, order.getApplyUser()); String checkPhones = StringUtils.join(phones, ","); orderService.update(orderService.lu().set(EnforceOrder::getCheckIds, checkPhones).eq(EnforceOrder::getOrderId, order.getOrderId())); order.setCheckIds(checkPhones); order.setCheckReason(bo.getCheckReason()); return orderService.updateById(order); } else { order.setCheckStatus(2); order.setOrderStatus(2); @@ -105,11 +113,12 @@ if (order.getIsNoticeCompany()==1){ smsService.sendCompanyMsg(order.getCompanyPhone(), order.getApplyDeptName(), order.getPlanTime()); } //审批等级加1 order.setCheckLevel(order.getCheckLevel()+1); order.setCheckReason(bo.getCheckReason()); return orderService.updateById(order); } //审批等级加1 order.setCheckLevel(order.getCheckLevel()+1); order.setCheckReason(bo.getCheckReason()); orderService.updateById(order); } } @@ -128,7 +137,7 @@ { EnforceCheckLog checkLog = Convert.convert(EnforceCheckLog.class, obj); checkLog.setCheckType(bo.getCheckType()); SysUser loginUser = SecurityUtils.getLoginUser().getUser(); SysUser loginUser = userService.selectUserById(SecurityUtils.getUserId()); checkLog.setCheckId(loginUser.getUserId()); checkLog.setCheckUser(loginUser.getUserName()); checkLog.setCheckPhone(loginUser.getPhonenumber()); project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
@@ -18,6 +18,7 @@ import com.project.enforce.mapper.EnforceComplaintLogMapper; import com.project.enforce.service.IEnforceComplaintLogService; import com.project.system.service.ISysDeptService; import com.project.system.service.ISysUserService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -37,6 +38,7 @@ public class EnforceComplaintLogServiceImpl extends ServiceImpl<EnforceComplaintLogMapper, EnforceComplaintLog> implements IEnforceComplaintLogService { private final ISysDeptService deptService; private final ISysUserService userService; @Override//列表查询 @@ -108,7 +110,7 @@ @Transactional public Boolean inComplaint(ComplaintResultBo bo) { SysUser loginUser = SecurityUtils.getLoginUser().getUser(); SysUser loginUser = userService.selectUserById(SecurityUtils.getUserId()); return this.update(lu() .set(EnforceComplaintLog::getInId,loginUser.getUserId()) .set(EnforceComplaintLog::getInUser,loginUser.getNickName()) @@ -125,7 +127,7 @@ if (StringUtils.isEmpty(bo.getResult())){ throw new BaseException("请填写处理结果"); } SysUser loginUser = SecurityUtils.getLoginUser().getUser(); SysUser loginUser = userService.selectUserById(SecurityUtils.getUserId()); return this.update(lu() .set(EnforceComplaintLog::getResultId,loginUser.getUserId()) .set(EnforceComplaintLog::getResultUser,loginUser.getNickName()) project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -124,7 +124,7 @@ @Override public List<EnforceOrderVo> queryCheckList(EnforceOrderQueryBo bo) { SysUser loginUser = SecurityUtils.getLoginUser().getUser(); SysUser loginUser = userService.selectUserById(SecurityUtils.getUserId()); bo.setCheckIds(loginUser.getPhonenumber()); // List<Long> deptIds = deptService.getApplyDeptIdsByLoginUserId(loginUser.getUserId()); // if (StringUtils.isNotEmpty(deptIds)){ @@ -315,7 +315,7 @@ throw new BaseException("执法单已确认执法！"); } order.setOrderStatus(3); SysUser user = SecurityUtils.getLoginUser().getUser(); SysUser user = userService.selectUserById(SecurityUtils.getUserId()); order.setExecuteId(user.getUserId()); order.setExecuteUser(user.getNickName()); order.setExecutePhone(user.getPhonenumber()); @@ -487,13 +487,13 @@ if (checkLevel==3){ return null; } checkLevel++; String checkKey = "check_enforce_"; List<String> phones = userService.getPhonesByRoleKey(checkKey + checkLevel, deptId); if (StringUtils.isNotEmpty(phones)){ phones.add(0,checkLevel.toString()); return phones; } checkLevel ++; return getCheckPhonesSimple(checkLevel, deptId); }
