执法评价相关添加

ZQN

2024-06-22 b2c1822dc9ae8a67872193d182d9335d9a99655c

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

@@ -7,21 +7,21 @@
import com.project.common.annotation.DataScope;
import com.project.common.core.domain.entity.SysUser;
import com.project.common.enums.OrderPre;
import com.project.common.exception.base.BaseException;
import com.project.common.sms.YPSmsApi;
import com.project.common.utils.DateUtils;
import com.project.common.utils.JsonUtils;
import com.project.common.utils.SecurityUtils;
import com.project.common.utils.StringUtils;
import com.project.enforce.domain.EnforceCheckLog;
import com.project.enforce.domain.EnforceOrder;
import com.project.enforce.domain.EnforcePeer;
import com.project.enforce.domain.bo.editBo.EnforceOrderBo;
import com.project.enforce.domain.*;
import com.project.enforce.domain.bo.editBo.*;
import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo;
import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
import com.project.enforce.domain.vo.EnforceEvaluateVo;
import com.project.enforce.domain.vo.EnforceOrderVo;
import com.project.enforce.domain.vo.OrderNodeVo;
import com.project.enforce.mapper.EnforceOrderMapper;
import com.project.enforce.service.IEnforceCheckLogService;
import com.project.enforce.service.IEnforceOrderService;
import com.project.enforce.service.IEnforcePeerService;
import com.project.enforce.service.*;
import com.project.system.service.ISysDeptService;
import com.project.system.service.ISysOrderNoService;
import com.project.system.service.ISysUserService;
@@ -49,15 +49,24 @@
    private final ISysOrderNoService orderNoService;
    private final IEnforcePeerService peerService;
    private final IEnforceCheckLogService checkLogService;
    private final IEnforceComplaintLogService complaintLogService;
    private final IEnforceEvaluateLogService evaluateLogService;

    @Override//列表查询
    @DataScope(deptAlias = "apply_dept_id", userAlias = "apply_id")
    public List<EnforceOrderVo> queryList(EnforceOrderQueryBo bo)
    {
        QueryWrapper<EnforceOrder> qw = getQw(bo);
        if (StringUtils.isNotEmpty(bo.getParams())) {
            qw.apply(bo.getParams().get("dataScope") != null, bo.getParams().get("dataScope").toString());//数据权限控制
        }
        qw.apply(StringUtils.isNotEmpty(bo.getParams().get("dataScope").toString()), bo.getParams().get("dataScope").toString());//数据权限控制
        List<EnforceOrder> list = this.list(qw);
        return Convert.toList(EnforceOrderVo.class , list);
    }

    @Override//执法上报列表
    @DataScope(deptAlias = "execute_dept_id", userAlias = "execute_id")
    public List<EnforceOrderVo> getExecuteList(EnforceOrderQueryBo bo) {
        QueryWrapper<EnforceOrder> qw = getQw(bo);
        qw.apply(StringUtils.isNotEmpty(bo.getParams().get("dataScope").toString()), bo.getParams().get("dataScope").toString());//数据权限控制
        List<EnforceOrder> list = this.list(qw);
        return Convert.toList(EnforceOrderVo.class , list);
    }
@@ -76,10 +85,20 @@
        return this.baseMapper.selectCheckList(bo);
    }

    @Override
    public List<EnforceOrderVo> queryCheckedList(OrderCheckedQueryBo bo)
    {
        bo.setUserId(SecurityUtils.getUserId());
        return this.baseMapper.selectCheckedList(bo);
    }

    @Override//信息公式列表
    public List<EnforceOrderVo> showList()
    {
        List<EnforceOrder> list = this.list(lq().eq(EnforceOrder::getIsShow, 1));
        List<EnforceOrder> list = this.list(lq()
                .eq(EnforceOrder::getIsShow, 1)
                .eq(EnforceOrder::getOrderStatus, 4)
        );
        return Convert.toList(EnforceOrderVo.class, list);
    }

@@ -90,6 +109,20 @@
        EnforceOrderVo vo = Convert.convert(EnforceOrderVo.class, db);
        List<EnforcePeer> peers = peerService.list(peerService.lq().eq(EnforcePeer::getOrderId, orderId).eq(EnforcePeer::getPeerType,2));
        vo.setPeers(peers);
        if (db.getIsEva()==1){
            EnforceEvaluateLog one = evaluateLogService.getOne(evaluateLogService.lq().eq(EnforceEvaluateLog::getOrderId, orderId));
            if (one!=null){
                String questionStatic = one.getQuestionStatic();
                if (StringUtils.isNotEmpty(questionStatic)){
                    try {
                        EnforceEvaluateVo evaluateVo = JsonUtils.jsonToPojo(questionStatic, EnforceEvaluateVo.class);
                        vo.setEvaluateVo(evaluateVo);
                    } catch (Exception e) {
                        throw new BaseException("评价问券解析异常！");
                    }
                }
            }
        }
        return vo;
    }

@@ -172,16 +205,99 @@
                    vos.add(new OrderNodeVo("审批拒绝",checkLog.getCheckUser(),checkLog.getCheckTime(), checkLog.getCheckReason()));
                }
            }
        } else {
            if (order.getInTime()!=null){
                vos.add(new OrderNodeVo("扫码入企",order.getExecuteUser(),order.getInTime(), null));
            }
            if (order.getExecuteTime()!=null){
                vos.add(new OrderNodeVo("结果上报",order.getExecuteUser(),order.getExecuteTime(), null));
            }
        }
        if (order.getInTime()!=null){
            vos.add(new OrderNodeVo("扫码入企",order.getExecuteUser(),order.getInTime(), null));
        }
        if (order.getExecuteTime()!=null){
            vos.add(new OrderNodeVo("结果上报",order.getExecuteUser(),order.getExecuteTime(), null));
        }

        return vos;
    }

    @Override//扫码结果
    public List<EnforceOrderVo> getScanList(String companyCode)
    {
        Long userId = SecurityUtils.getUserId();
        return this.baseMapper.selectScanList(companyCode, userId);
    }

    @Override//确认扫码执法
    @Transactional
    public Boolean doScanOrder(Long orderId)
    {
        EnforceOrder order = this.getById(orderId);
        order.setOrderStatus(3);
        SysUser user = SecurityUtils.getLoginUser().getUser();
        order.setExecuteId(user.getUserId());
        order.setExecuteUser(user.getNickName());
        order.setExecutePhone(user.getRecommendPhone());
        order.setExecuteDeptId(user.getDeptId());
        order.setExecuteDeptName(deptService.getDeptAllName(user.getDeptId()));
        order.setInTime(DateUtils.getNowDate());
        return this.updateById(order);
    }

    @Override//上报结果
    @Transactional
    public Boolean doResultOrder(OrderResultBo resultBo)
    {
        if (resultBo.getRegionStatus()==null){
            throw new BaseException("请填写执法结果");
        }
        if (StringUtils.isEmpty(resultBo.getRegionReason())){
            throw new BaseException("请填写执法结果说明");
        }

        return this.update(lu()
                .set(resultBo.getRegionStatus()!=null, EnforceOrder::getRegionStatus, resultBo.getRegionStatus())
                .set(StringUtils.isNotEmpty(resultBo.getRegionReason()), EnforceOrder::getRegionReason, resultBo.getRegionReason())
                .set(StringUtils.isNotEmpty(resultBo.getRegionImgs()), EnforceOrder::getRegionImgs, resultBo.getRegionImgs())
                .set(StringUtils.isNotEmpty(resultBo.getRegionVideos()), EnforceOrder::getRegionVideos, resultBo.getRegionVideos())
                .set( EnforceOrder::getOrderStatus, 4)
                .set( EnforceOrder::getExecuteTime, DateUtils.getNowDate())
        );
    }

    @Override//执法单投诉
    @Transactional
    public Boolean orderComplaint(OrderComplaintBo bo)
    {
        if (bo.getOrderId()==null){
            throw new BaseException("请选择要投诉的执法单！");
        }
        if (StringUtils.isEmpty(bo.getComplaintType())){
            throw new BaseException("请选择要投诉类型！");
        }
        if (StringUtils.isEmpty(bo.getComplaintReason())){
            throw new BaseException("请填写投诉内容！");
        }
        EnforceOrder order = this.getById(bo.getOrderId());
        //添加投诉记录
        EnforceComplaintLogBo complaintLogBo = Convert.convert(EnforceComplaintLogBo.class, order);
        complaintLogBo.setComplaintType(bo.getComplaintType());
        complaintLogBo.setComplaintReason(bo.getComplaintReason());
        Boolean addLog = complaintLogService.insertByBo(complaintLogBo);
        if (addLog){
            return this.update(lu()
                    .set(EnforceOrder::getIsComplaint,1)
                    .set(EnforceOrder::getComplaintType,bo.getComplaintType())
                    .set(EnforceOrder::getComplaintReason,bo.getComplaintReason())
                    .eq(EnforceOrder::getOrderId,bo.getOrderId())
            );
        }
        return false;
    }

    @Override//执法单投诉节点
    public List<OrderNodeVo> orderComplaintNodeList(Long orderId)
    {
        EnforceComplaintLog log = complaintLogService.getOne(complaintLogService.lq().eq(EnforceComplaintLog::getOrderId, orderId));
        if (log==null){
            return null;
        }
        return complaintLogService.orderNodeList(log.getId());
    }


@@ -235,7 +351,8 @@
        qw.eq(StringUtils.isNotEmpty(bo.getCompanyAddress()), "company_address", bo.getCompanyAddress());
        qw.eq(StringUtils.isNotEmpty(bo.getRegionCode()), "region_code", bo.getRegionCode());
        qw.like(StringUtils.isNotEmpty(bo.getRegionName()), "region_name", bo.getRegionName());
        qw.eq(StringUtils.isNotEmpty(bo.getEnforceReason()), "enforce_reason", bo.getEnforceReason());
        qw.like(StringUtils.isNotEmpty(bo.getEnforceReason()), "enforce_reason", bo.getEnforceReason());
        qw.like(StringUtils.isNotEmpty(bo.getEnforceContent()), "enforce_content", bo.getEnforceContent());
        qw.eq(StringUtils.isNotEmpty(bo.getEnforceType()), "enforce_type", bo.getEnforceType());
        qw.eq(bo.getApplyId() != null, "apply_id", bo.getApplyId());
        qw.eq(StringUtils.isNotEmpty(bo.getApplyUser()), "apply_user", bo.getApplyUser());