响应

ZQN

2024-06-24 4172b0bdc098d4a8055bdb0b1bfb4cbf866e47a0

响应

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

@@ -109,6 +109,7 @@
                .set(EnforceComplaintLog::getInId,loginUser.getUserId())
                .set(EnforceComplaintLog::getInUser,loginUser.getNickName())
                .set(EnforceComplaintLog::getInTime, DateUtils.getNowDate())
                .set(EnforceComplaintLog::getComplaintStatus, 1)
                .eq(EnforceComplaintLog::getId, bo.getId())
        );
    }

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

@@ -82,7 +82,7 @@
    public List<EnforceOrderVo> queryCompanyList(EnforceOrderQueryBo bo)
    {
        QueryWrapper<EnforceOrder> qw = getQw(bo);
        qw.ge("order_status",2);
        qw.ge("order_status",4);
        List<EnforceOrder> list = this.list(qw);
        return Convert.toList(EnforceOrderVo.class , list);
    }
@@ -305,6 +305,9 @@
    public Boolean doScanOrder(Long orderId)
    {
        EnforceOrder order = this.getById(orderId);
        if (order.getOrderStatus()!=2){
            throw new BaseException("执法单还未审批！");
        }
        order.setOrderStatus(3);
        SysUser user = SecurityUtils.getLoginUser().getUser();
        order.setExecuteId(user.getUserId());
@@ -326,7 +329,6 @@
        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())
@@ -351,6 +353,9 @@
            throw new BaseException("请填写投诉内容！");
        }
        EnforceOrder order = this.getById(bo.getOrderId());
        if (order.getOrderStatus()!=4){
            throw new BaseException("执法单未上报执法结果！");
        }
        //添加投诉记录
        EnforceComplaintLogBo complaintLogBo = Convert.convert(EnforceComplaintLogBo.class, order);
        complaintLogBo.setComplaintType(bo.getComplaintType());

 project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java

@@ -99,20 +99,7 @@
    @Override//企业被执法次数分布
    public List<KeyVal> getCompanyCount(ReportQueryBo bo)
    {
        List<KeyVal> list = reportMapper.getCompanyCount(bo);
        Map<String, Object> resultMap = list.stream().collect(Collectors.toMap(KeyVal::getK, KeyVal::getV));

        List<SysCompany> companies = companyService.list(companyService.lq().eq(SysCompany::getCompanyStatus, 0));

        return companies.stream().map(e -> {
            KeyVal keyVal;
            if (resultMap.get(e.getCompanyId().toString()) == null) {
                keyVal = new KeyVal(e.getCompanyName(), 0);
            } else {
                keyVal = new KeyVal(e.getCompanyName(), resultMap.get(e.getCompanyId().toString()));
            }
            return keyVal;
        }).collect(Collectors.toList());
        return reportMapper.getCompanyCount(bo);
    }

    @Override//执法类型

 project-report/src/main/resources/mapper/report/ReportMapper.xml

@@ -47,16 +47,19 @@
    <select id="getCompanyCount"
            parameterType="com.project.report.domain.bo.query.ReportQueryBo"
            resultType="com.project.common.vo.KeyVal">

        select
        company_id AS k,
        IFNULL(count(order_id),0) as v
        from enforce_order
            sc.company_name AS k,
            IFNULL(count(eo.order_id),0) as v
        from sys_company sc
        left join enforce_order eo on sc.company_id=eo.company_id
        where 1=1
        and sc.check_status=2
        <if test="beginTime!=null and beginTime!=''">
            AND apply_time &gt;= #{beginTime}
            AND eo.apply_time &gt;= #{beginTime}
        </if>
        <if test="endTime!=null and endTime!=''">
            AND apply_time &lt;= #{endTime}
            AND eo.apply_time &lt;= #{endTime}
        </if>
        GROUP BY k order by v desc
    </select>