审批修改

ZQN

2024-06-25 101192fd84bb38911ea7bc84c21cfe2b9ba378c7

 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());