审批，投诉，报表修改

ZQN

2024-06-22 484bc1f21e7d29b480005f9c7077b03c64d8f86e

审批，投诉，报表修改

 project-admin/src/main/java/com/project/ProjectApplication.java

@@ -16,8 +16,8 @@
{
    public static void main(String[] args)
    {
        // System.setProperty("spring.devtools.restart.enabled", "false");
        System.setProperty("spring.devtools.restart.enabled", "false");
        SpringApplication.run(ProjectApplication.class, args);
        System.out.println(" ~~ 项目管理系统启动成功 ~~ ");
        System.out.println(" ~~ 《沈丘扫码入企》系统启动成功  ~~ ");
    }
}

 project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java

@@ -164,7 +164,7 @@
    @ApiOperation("执法单投诉")
    @Log(title = "执法单投诉", businessType = BusinessType.UPDATE)
    @PostMapping("/orderComplaint")
    public AjaxResult orderComplaint(OrderComplaintBo bo)
    public AjaxResult orderComplaint(@RequestBody OrderComplaintBo bo)
    {
        return AjaxResult.success(iEnforceOrderService.orderComplaint(bo));
    }

 project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java

@@ -6,6 +6,7 @@
import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
import com.project.enforce.domain.vo.EnforceOrderVo;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

@@ -23,4 +24,8 @@


    List<EnforceOrderVo> selectScanList(@Param("companyCode") String companyCode,@Param("userId") Long userId);

    @Select("SELECT COUNT(DISTINCT company_id) FROM enforce_order")
    Integer getDistinctCompanyNum();

}

 project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java

@@ -142,4 +142,11 @@
     * @return    列表
     */
    List<EnforceOrderVo> queryCommonList(EnforceOrderQueryBo bo);

    /**
     * 获取不同企业id数量
     * @return    int
     */
    Integer getDistinctCompanyNum();

}

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

@@ -43,7 +43,7 @@
    @Transactional
    public Boolean checkOrder(CheckBo bo)
    {
        if (StringUtils.isNotEmpty(bo.getIds())){
        if (StringUtils.isEmpty(bo.getIds())){
            throw new BaseException("请选择要审批的单据！");
        }
        switch (bo.getCheckType())

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

@@ -53,6 +53,7 @@
    private final IEnforceComplaintLogService complaintLogService;
    private final IEnforceEvaluateLogService evaluateLogService;
    private final YPSmsService smsService;
    private final EnforceOrderMapper orderMapper;

    /**
     * 通用列表-无权限
@@ -65,6 +66,11 @@
        QueryWrapper<EnforceOrder> qw = getQw(bo);
        List<EnforceOrder> list = this.list(qw);
        return Convert.toList(EnforceOrderVo.class , list);
    }

    @Override
    public Integer getDistinctCompanyNum() {
        return orderMapper.getDistinctCompanyNum();
    }

    /**
@@ -171,12 +177,14 @@
            if (one!=null){
                String questionStatic = one.getQuestionStatic();
                if (StringUtils.isNotEmpty(questionStatic)){
                    EnforceEvaluateVo evaluateVo = Convert.convert(EnforceEvaluateVo.class, one);
                    try {
                        EnforceEvaluateVo evaluateVo = JsonUtils.jsonToPojo(questionStatic, EnforceEvaluateVo.class);
                        vo.setEvaluateVo(evaluateVo);
                        List<EnforceEvaluateQuestion> questions = JsonUtils.jsonToList(questionStatic, EnforceEvaluateQuestion.class);
                        evaluateVo.setQuestionList(questions);
                    } catch (Exception e) {
                        throw new BaseException("评价问券解析异常！");
                    }
                    vo.setEvaluateVo(evaluateVo);
                }
            }
        }

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

@@ -51,7 +51,7 @@
    public Map<String, Object> getTotalInfo()
    {
        int companyNum = companyService.count(companyService.lq().eq(SysCompany::getCompanyStatus, 0));
        int enforceCompanyNum = orderService.count(orderService.lq().groupBy(EnforceOrder::getCompanyId));
        int enforceCompanyNum = orderService.getDistinctCompanyNum();
        int enforceDeptNum = deptService.count(deptService.lq().eq(SysDept::getParentId,100));
        int enforceUserNum = userService.count(userService.lq().ne(SysUser::getUserType,"02"));
        int enforceOrderNum = orderService.count();