问题修改

ZQN

2024-06-24 d3ca2cb702a3574d67c58cef63a2cfeccf214169

 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java

@@ -126,12 +126,12 @@
    {
        SysUser loginUser = SecurityUtils.getLoginUser().getUser();
        bo.setCheckIds(loginUser.getPhonenumber());
        List<Long> deptIds = deptService.getApplyDeptIdsByLoginUserId(loginUser.getUserId());
        if (StringUtils.isNotEmpty(deptIds)){
            bo.setApplyDeptIds(deptIds);
        } else {
            bo.setApplyDeptIds(null);
        }
//        List<Long> deptIds = deptService.getApplyDeptIdsByLoginUserId(loginUser.getUserId());
//        if (StringUtils.isNotEmpty(deptIds)){
//            bo.setApplyDeptIds(deptIds);
//        } else {
//            bo.setApplyDeptIds(null);
//        }
        return this.baseMapper.selectCheckList(bo);
    }

@@ -305,14 +305,17 @@
    public Boolean doScanOrder(Long orderId)
    {
        EnforceOrder order = this.getById(orderId);
        if (order.getOrderStatus()!=2){
        if (order.getOrderStatus()<2){
            throw new BaseException("执法单还未审批！");
        }
        if (order.getOrderStatus()>2){
            throw new BaseException("执法单已确认执法！");
        }
        order.setOrderStatus(3);
        SysUser user = SecurityUtils.getLoginUser().getUser();
        order.setExecuteId(user.getUserId());
        order.setExecuteUser(user.getNickName());
        order.setExecutePhone(user.getRecommendPhone());
        order.setExecutePhone(user.getPhonenumber());
        order.setExecuteDeptId(user.getDeptId());
        order.setExecuteDeptName(deptService.getDeptAllName(user.getDeptId()));
        order.setInTime(DateUtils.getNowDate());
@@ -336,6 +339,7 @@
                .set(StringUtils.isNotEmpty(resultBo.getRegionVideos()), EnforceOrder::getRegionVideos, resultBo.getRegionVideos())
                .set( EnforceOrder::getOrderStatus, 4)
                .set( EnforceOrder::getExecuteTime, DateUtils.getNowDate())
                .eq( EnforceOrder::getOrderId, resultBo.getOrderId())
        );
    }