Browse Source

监督端-涉企情况,投诉情况,计划情况,缺失接口迁移

dev-V1.10.0
niujiyi 1 day ago
parent
commit
a5a2eea7b0
  1. 6
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java
  2. 6
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/StatisticsComplaintController.java
  3. 2
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComplaintsReportService.java
  4. 6
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComprehensiveAnalysisService.java
  5. 4
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComplaintsReportServiceImpl.java
  6. 6
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComprehensiveAnalysisServiceImpl.java

6
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java

@ -1,15 +1,13 @@
package com.zdxt.enforcementcode.controller.app.enforcement; package com.zdxt.enforcementcode.controller.app.enforcement;
import cn.dev33.satoken.annotation.SaIgnore;
import com.zdxt.enforcementcode.common.util.StringUtils; import com.zdxt.enforcementcode.common.util.StringUtils;
import com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo; import com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo;
import com.zdxt.enforcementcode.service.ComprehensiveAnalysisService; import com.zdxt.enforcementcode.service.IComprehensiveAnalysisService;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;
import org.dromara.system.domain.vo.SysDeptVo; import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.mapper.SysDeptMapper; import org.dromara.system.mapper.SysDeptMapper;
import org.dromara.system.mapper.SysUserMapper; import org.dromara.system.mapper.SysUserMapper;
import org.dromara.system.service.ISysDeptService; import org.dromara.system.service.ISysDeptService;
@ -26,7 +24,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
@RequestMapping("/app-enf/appComprehensiveAnalysis") @RequestMapping("/app-enf/appComprehensiveAnalysis")
public class AppComprehensiveAnalysisController extends BaseController { public class AppComprehensiveAnalysisController extends BaseController {
@Autowired @Autowired
private ComprehensiveAnalysisService comprehensiveAnalysisService; private IComprehensiveAnalysisService comprehensiveAnalysisService;
@Autowired @Autowired
private SysDeptMapper deptMapper; private SysDeptMapper deptMapper;
@Autowired @Autowired

6
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/StatisticsComplaintController.java

@ -1,12 +1,11 @@
package com.zdxt.enforcementcode.controller.web.supervision.report; package com.zdxt.enforcementcode.controller.web.supervision.report;
import cn.dev33.satoken.annotation.SaIgnore;
import com.zdxt.enforcementcode.domain.ComplaintStatistics; import com.zdxt.enforcementcode.domain.ComplaintStatistics;
import com.zdxt.enforcementcode.domain.MssqOrderFlow; import com.zdxt.enforcementcode.domain.MssqOrderFlow;
import com.zdxt.enforcementcode.domain.bo.ComplaintStatisticsBo; import com.zdxt.enforcementcode.domain.bo.ComplaintStatisticsBo;
import com.zdxt.enforcementcode.domain.vo.report.*; import com.zdxt.enforcementcode.domain.vo.report.*;
import com.zdxt.enforcementcode.report.IStatisticsComplaintReport; import com.zdxt.enforcementcode.report.IStatisticsComplaintReport;
import com.zdxt.enforcementcode.service.ComplaintsReportService; import com.zdxt.enforcementcode.service.IComplaintsReportService;
import com.zdxt.enforcementcode.service.IEnterpriseComplaintService; import com.zdxt.enforcementcode.service.IEnterpriseComplaintService;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -15,7 +14,6 @@ import org.dromara.common.core.domain.R;
import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.springframework.ui.Model;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -36,7 +34,7 @@ import java.util.Map;
public class StatisticsComplaintController { public class StatisticsComplaintController {
private final IStatisticsComplaintReport reportService; private final IStatisticsComplaintReport reportService;
private final ComplaintsReportService complaintsReportService; private final IComplaintsReportService complaintsReportService;
private final IEnterpriseComplaintService iEnterpriseComplaintService; private final IEnterpriseComplaintService iEnterpriseComplaintService;

2
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ComplaintsReportService.java → zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComplaintsReportService.java

@ -4,7 +4,7 @@ import com.zdxt.enforcementcode.domain.ComplaintStatistics;
import java.util.List; import java.util.List;
public interface ComplaintsReportService { public interface IComplaintsReportService {
/** /**
* 获取投诉举报列表,合并两个投诉表的投诉部门 * 获取投诉举报列表,合并两个投诉表的投诉部门
* @param complaintStatistics * @param complaintStatistics

6
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ComprehensiveAnalysisService.java → zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComprehensiveAnalysisService.java

@ -4,7 +4,11 @@ import com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo;
import java.util.List; import java.util.List;
public interface ComprehensiveAnalysisService { public interface IComprehensiveAnalysisService {
/**
* web:获取综合分析数据
*/
ComprehensiveAnalysisBo whole(ComprehensiveAnalysisBo comprehensiveAnalysis); ComprehensiveAnalysisBo whole(ComprehensiveAnalysisBo comprehensiveAnalysis);

4
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComplaintsReportServiceImpl.java

@ -6,7 +6,7 @@ import com.zdxt.enforcementcode.domain.ZdxtFile;
import com.zdxt.enforcementcode.mapper.ComplaintStatisticsMapper; import com.zdxt.enforcementcode.mapper.ComplaintStatisticsMapper;
import com.zdxt.enforcementcode.mapper.EnterpriseComplaintMapper; import com.zdxt.enforcementcode.mapper.EnterpriseComplaintMapper;
import com.zdxt.enforcementcode.mapper.ZdxtFileMapper; import com.zdxt.enforcementcode.mapper.ZdxtFileMapper;
import com.zdxt.enforcementcode.service.ComplaintsReportService; import com.zdxt.enforcementcode.service.IComplaintsReportService;
import com.zdxt.enforcementcode.service.IEnterpriseComplaintService; import com.zdxt.enforcementcode.service.IEnterpriseComplaintService;
import org.dromara.system.mapper.SysDictDataMapper; import org.dromara.system.mapper.SysDictDataMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -17,7 +17,7 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
public class ComplaintsReportServiceImpl implements ComplaintsReportService { public class ComplaintsReportServiceImpl implements IComplaintsReportService {
@Autowired @Autowired
private ComplaintStatisticsMapper complaintStatisticsMapper; private ComplaintStatisticsMapper complaintStatisticsMapper;
@Autowired @Autowired

6
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComprehensiveAnalysisServiceImpl.java

@ -2,11 +2,9 @@ package com.zdxt.enforcementcode.service.impl;
import com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo; import com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo;
import com.zdxt.enforcementcode.mapper.ComprehensiveAnalysisMapper; import com.zdxt.enforcementcode.mapper.ComprehensiveAnalysisMapper;
import com.zdxt.enforcementcode.service.ComprehensiveAnalysisService; import com.zdxt.enforcementcode.service.IComprehensiveAnalysisService;
import org.dromara.system.domain.SysDept;
import org.dromara.system.domain.bo.SysDictDataBo; import org.dromara.system.domain.bo.SysDictDataBo;
import org.dromara.system.domain.vo.SysDictDataVo; import org.dromara.system.domain.vo.SysDictDataVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.mapper.SysDeptMapper; import org.dromara.system.mapper.SysDeptMapper;
import org.dromara.system.mapper.SysDictDataMapper; import org.dromara.system.mapper.SysDictDataMapper;
import org.dromara.system.mapper.SysUserMapper; import org.dromara.system.mapper.SysUserMapper;
@ -17,7 +15,7 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
public class ComprehensiveAnalysisServiceImpl implements ComprehensiveAnalysisService { public class ComprehensiveAnalysisServiceImpl implements IComprehensiveAnalysisService {
@Autowired @Autowired
private ComprehensiveAnalysisMapper comprehensiveAnalysisMapper; private ComprehensiveAnalysisMapper comprehensiveAnalysisMapper;
@Autowired @Autowired

Loading…
Cancel
Save