Merge branch 'master' of http://111.61.77.35:9999/wanghao/zh-baseversion-project

pom.xml

@@ -221,6 +221,12 @@
                 <version>1.2.9</version>
             </dependency>
 
+            <!--ureport2-->
+            <dependency>
+                <groupId>com.bstek.ureport</groupId>
+                <artifactId>ureport2-console</artifactId>
+                <version>2.2.9</version>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>

zh-baseversion-admin/src/main/java/com/zehong/GassafetyProgressApplication.java

@@ -3,12 +3,14 @@ package com.zehong;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.ImportResource;
 
 /**
  * 启动程序
  * 
  * @author zehong
  */
+@ImportResource("classpath:ureport-console-context.xml")
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class GassafetyProgressApplication
 {

zh-baseversion-admin/src/main/java/com/zehong/web/controller/complainDeal/TComplainDealController.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.zehong.common.core.domain.model.LoginUser;
 import com.zehong.framework.web.service.TokenService;
+import com.zehong.system.domain.vo.ComplainDealSummaryAnalysisTableVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,6 +25,7 @@ import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.common.core.page.TableDataInfo;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * 投诉处置Controller
@@ -116,4 +118,32 @@ public class TComplainDealController extends BaseController
         return AjaxResult.success(tComplainDealService.selectUserByenterproseId(enterproseId));
     }
 
+    /**
+     * 投诉处置统计分析
+     * @return r
+     */
+    @GetMapping("/complainDealSummaryAnalysisMethod")
+    public AjaxResult complainDealSummaryAnalysisMethod() {
+        return AjaxResult.success(tComplainDealService.complainDealSummaryAnalysisMethod());
+    }
+
+    /**
+     * 投诉处置统计分析 - 表格形式
+     * @return r
+     */
+    @GetMapping("/complainDealSummaryAnalysisMethodTableViews")
+    public AjaxResult complainDealSummaryAnalysisMethodTableViews(ComplainDealSummaryAnalysisTableVo complainDealSummaryAnalysisTableVo) {
+        return AjaxResult.success(tComplainDealService.complainDealSummaryAnalysisMethodTableViews(complainDealSummaryAnalysisTableVo));
+    }
+
+    /**
+     * 导出投诉处置列表
+     */
+    @Log(title = "投诉处置", businessType = BusinessType.EXPORT)
+    @PostMapping("/complainDealSummaryAnalysisExport")
+    public void complainDealSummaryAnalysisExport(HttpServletResponse httpServletResponse,
+                                                  @RequestBody ComplainDealSummaryAnalysisTableVo complainDealSummaryAnalysisTableVo) throws Exception
+    {
+        tComplainDealService.complainDealSummaryAnalysisExport(httpServletResponse,complainDealSummaryAnalysisTableVo);
+    }
 }

zh-baseversion-admin/src/main/java/com/zehong/web/controller/complainDeal/TComplainDealEvaluateController.java

+package com.zehong.web.controller.complainDeal;
+
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.core.page.TableDataInfo;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.system.domain.TComplainDealEvaluate;
+import com.zehong.system.service.ITComplainDealEvaluateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 燃气投诉处置-评价Controller
+ * 
+ * @author zehong
+ * @date 2024-06-06
+ */
+@RestController
+@RequestMapping("/complainDeal/evaluate")
+public class TComplainDealEvaluateController extends BaseController
+{
+    @Autowired
+    private ITComplainDealEvaluateService tComplainDealEvaluateService;
+
+    /**
+     * 查询燃气投诉处置-评价列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TComplainDealEvaluate tComplainDealEvaluate)
+    {
+        startPage();
+        List<TComplainDealEvaluate> list = tComplainDealEvaluateService.selectTComplainDealEvaluateList(tComplainDealEvaluate);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出燃气投诉处置-评价列表
+     */
+    @Log(title = "燃气投诉处置-评价", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TComplainDealEvaluate tComplainDealEvaluate)
+    {
+        List<TComplainDealEvaluate> list = tComplainDealEvaluateService.selectTComplainDealEvaluateList(tComplainDealEvaluate);
+        ExcelUtil<TComplainDealEvaluate> util = new ExcelUtil<TComplainDealEvaluate>(TComplainDealEvaluate.class);
+        return util.exportExcel(list, "燃气投诉处置-评价数据");
+    }
+
+    /**
+     * 获取燃气投诉处置-评价详细信息
+     */
+    @GetMapping(value = "/{complainDealEvaluateId}")
+    public AjaxResult getInfo(@PathVariable("complainDealEvaluateId") Long complainDealEvaluateId)
+    {
+        return AjaxResult.success(tComplainDealEvaluateService.selectTComplainDealEvaluateById(complainDealEvaluateId));
+    }
+
+    /**
+     * 获取燃气投诉处置-评价详细信息
+     */
+    @GetMapping(value = "/getByComplainDealId/{complainDealId}")
+    public AjaxResult getByComplainDealId(@PathVariable("complainDealId") Long complainDealId)
+    {
+        return AjaxResult.success(tComplainDealEvaluateService.selectTComplainDealEvaluateByComplainDealId(complainDealId));
+    }
+
+    /**
+     * 新增燃气投诉处置-评价
+     */
+    @Log(title = "燃气投诉处置-评价", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TComplainDealEvaluate tComplainDealEvaluate)
+    {
+        return toAjax(tComplainDealEvaluateService.insertTComplainDealEvaluate(tComplainDealEvaluate));
+    }
+
+    /**
+     * 修改燃气投诉处置-评价
+     */
+    @Log(title = "燃气投诉处置-评价", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TComplainDealEvaluate tComplainDealEvaluate)
+    {
+        return toAjax(tComplainDealEvaluateService.updateTComplainDealEvaluate(tComplainDealEvaluate));
+    }
+
+    /**
+     * 删除燃气投诉处置-评价
+     */
+    @Log(title = "燃气投诉处置-评价", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{complainDealEvaluateIds}")
+    public AjaxResult remove(@PathVariable Long[] complainDealEvaluateIds)
+    {
+        return toAjax(tComplainDealEvaluateService.deleteTComplainDealEvaluateByIds(complainDealEvaluateIds));
+    }
+}

zh-baseversion-admin/src/main/java/com/zehong/web/controller/complainDeal/TComplainDealManSysSetController.java

+package com.zehong.web.controller.complainDeal;
+
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.system.domain.TComplainDealManSysSet;
+import com.zehong.system.service.ITComplainDealManSysSetService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 燃气投诉处置的管理制度维护Controller
+ * 
+ * @author zehong
+ * @date 2024-06-05
+ */
+@RestController
+@RequestMapping("/complainDeal/set")
+public class TComplainDealManSysSetController extends BaseController
+{
+    @Autowired
+    private ITComplainDealManSysSetService tComplainDealManSysSetService;
+
+    /**
+     * 查询燃气投诉处置的管理制度维护列表
+     */
+    @GetMapping("/list")
+    public AjaxResult list(TComplainDealManSysSet tComplainDealManSysSet)
+    {
+        List<TComplainDealManSysSet> list = tComplainDealManSysSetService.selectTComplainDealManSysSetList(tComplainDealManSysSet);
+        return AjaxResult.success(list);
+    }
+
+
+    /**
+     * 查询燃气投诉处置的管理制度维护列表
+     */
+    @PostMapping("/batchUpdate")
+    public AjaxResult batchUpdate(@RequestBody List<TComplainDealManSysSet> tComplainDealManSysSets)
+    {
+        tComplainDealManSysSetService.batchUpdate(tComplainDealManSysSets);
+        return AjaxResult.success(tComplainDealManSysSets);
+    }
+
+    /**
+     * 导出燃气投诉处置的管理制度维护列表
+     */
+    @Log(title = "燃气投诉处置的管理制度维护", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TComplainDealManSysSet tComplainDealManSysSet)
+    {
+        List<TComplainDealManSysSet> list = tComplainDealManSysSetService.selectTComplainDealManSysSetList(tComplainDealManSysSet);
+        ExcelUtil<TComplainDealManSysSet> util = new ExcelUtil<TComplainDealManSysSet>(TComplainDealManSysSet.class);
+        return util.exportExcel(list, "燃气投诉处置的管理制度维护数据");
+    }
+
+    /**
+     * 获取燃气投诉处置的管理制度维护详细信息
+     */
+    @GetMapping(value = "/{fComplainDealManSysSetId}")
+    public AjaxResult getInfo(@PathVariable("fComplainDealManSysSetId") Long fComplainDealManSysSetId)
+    {
+        return AjaxResult.success(tComplainDealManSysSetService.selectTComplainDealManSysSetById(fComplainDealManSysSetId));
+    }
+
+    /**
+     * 新增燃气投诉处置的管理制度维护
+     */
+    @Log(title = "燃气投诉处置的管理制度维护", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TComplainDealManSysSet tComplainDealManSysSet)
+    {
+        return toAjax(tComplainDealManSysSetService.insertTComplainDealManSysSet(tComplainDealManSysSet));
+    }
+
+    /**
+     * 修改燃气投诉处置的管理制度维护
+     */
+    @Log(title = "燃气投诉处置的管理制度维护", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TComplainDealManSysSet tComplainDealManSysSet)
+    {
+        return toAjax(tComplainDealManSysSetService.updateTComplainDealManSysSet(tComplainDealManSysSet));
+    }
+
+    /**
+     * 删除燃气投诉处置的管理制度维护
+     */
+    @Log(title = "燃气投诉处置的管理制度维护", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fComplainDealManSysSetIds}")
+    public AjaxResult remove(@PathVariable Long[] fComplainDealManSysSetIds)
+    {
+        return toAjax(tComplainDealManSysSetService.deleteTComplainDealManSysSetByIds(fComplainDealManSysSetIds));
+    }
+}

zh-baseversion-admin/src/main/java/com/zehong/web/controller/complainDeal/TComplainDealOverSuperController.java

+package com.zehong.web.controller.complainDeal;
+
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.core.domain.entity.SysUser;
+import com.zehong.common.core.domain.model.LoginUser;
+import com.zehong.common.core.page.TableDataInfo;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.common.utils.ServletUtils;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.framework.web.service.TokenService;
+import com.zehong.system.domain.TComplainDealOverSuper;
+import com.zehong.system.service.ITComplainDealOverSuperService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 燃气投诉处置-超时督办Controller
+ * 
+ * @author zehong
+ * @date 2024-06-13
+ */
+@RestController
+@RequestMapping("/complainDeal/super")
+public class TComplainDealOverSuperController extends BaseController
+{
+    @Autowired
+    private ITComplainDealOverSuperService tComplainDealOverSuperService;
+
+    @Autowired
+    private TokenService tokenService;
+    /**
+     * 查询燃气投诉处置-超时督办列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TComplainDealOverSuper tComplainDealOverSuper)
+    {
+        startPage();
+        List<TComplainDealOverSuper> list = tComplainDealOverSuperService.selectTComplainDealOverSuperList(tComplainDealOverSuper);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出燃气投诉处置-超时督办列表
+     */
+    @Log(title = "燃气投诉处置-超时督办", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TComplainDealOverSuper tComplainDealOverSuper)
+    {
+        List<TComplainDealOverSuper> list = tComplainDealOverSuperService.selectTComplainDealOverSuperList(tComplainDealOverSuper);
+        ExcelUtil<TComplainDealOverSuper> util = new ExcelUtil<TComplainDealOverSuper>(TComplainDealOverSuper.class);
+        return util.exportExcel(list, "燃气投诉处置-超时督办数据");
+    }
+
+    /**
+     * 获取燃气投诉处置-超时督办详细信息
+     */
+    @GetMapping(value = "/{complainDealOverSuperId}")
+    public AjaxResult getInfo(@PathVariable("complainDealOverSuperId") Long complainDealOverSuperId)
+    {
+        return AjaxResult.success(tComplainDealOverSuperService.selectTComplainDealOverSuperById(complainDealOverSuperId));
+    }
+
+    /**
+     * 新增燃气投诉处置-超时督办
+     */
+    @Log(title = "燃气投诉处置-超时督办", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TComplainDealOverSuper tComplainDealOverSuper)
+    {
+        return toAjax(tComplainDealOverSuperService.insertTComplainDealOverSuper(tComplainDealOverSuper));
+    }
+
+    /**
+     * 修改燃气投诉处置-超时督办
+     */
+    @Log(title = "燃气投诉处置-超时督办", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TComplainDealOverSuper tComplainDealOverSuper)
+    {
+
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        //说明是企业反馈了
+        if (!"-2".equals(user.getDeptId())) {
+            tComplainDealOverSuper.setOvertimeSupervision("1");
+        }
+
+        return toAjax(tComplainDealOverSuperService.updateTComplainDealOverSuper(tComplainDealOverSuper));
+    }
+
+    /**
+     * 删除燃气投诉处置-超时督办
+     */
+    @Log(title = "燃气投诉处置-超时督办", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{complainDealOverSuperIds}")
+    public AjaxResult remove(@PathVariable Long[] complainDealOverSuperIds)
+    {
+        return toAjax(tComplainDealOverSuperService.deleteTComplainDealOverSuperByIds(complainDealOverSuperIds));
+    }
+
+
+    /**
+     * 查询燃气投诉处置-超时督办列表-根据处置id 和 状态
+     */
+    @GetMapping("/getOverSuperByComplainDealIdAndStatus")
+    public AjaxResult getOverSuperByComplainDealIdAndStatus(TComplainDealOverSuper tComplainDealOverSuper) {
+        return AjaxResult.success(tComplainDealOverSuperService.getOverSuperByComplainDealIdAndStatus(tComplainDealOverSuper));
+    }
+
+    /**
+     *
+     * 超时督办确认反馈
+     * @param tComplainDealOverSuper t
+     * @return a
+     */
+    @PostMapping("/overtimeSupervisionFeedbackConfirmation")
+    public AjaxResult overtimeSupervisionFeedbackConfirmation(@RequestBody TComplainDealOverSuper tComplainDealOverSuper){
+        return toAjax(tComplainDealOverSuperService.overtimeSupervisionFeedbackConfirmation(tComplainDealOverSuper));
+    }
+}

zh-baseversion-admin/src/main/java/com/zehong/web/controller/complainDeal/TComplainDealTransferController.java

+package com.zehong.web.controller.complainDeal;
+
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.core.page.TableDataInfo;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.system.domain.TComplainDealTransfer;
+import com.zehong.system.service.ITComplainDealTransferService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 燃气投诉处置-转办记录Controller
+ * 
+ * @author zehong
+ * @date 2024-06-06
+ */
+@RestController
+@RequestMapping("/complainDeal/transfer")
+public class TComplainDealTransferController extends BaseController
+{
+    @Autowired
+    private ITComplainDealTransferService tComplainDealTransferService;
+
+    /**
+     * 查询燃气投诉处置-转办记录列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TComplainDealTransfer tComplainDealTransfer)
+    {
+        startPage();
+        List<TComplainDealTransfer> list = tComplainDealTransferService.selectTComplainDealTransferList(tComplainDealTransfer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出燃气投诉处置-转办记录列表
+     */
+    @Log(title = "燃气投诉处置-转办记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TComplainDealTransfer tComplainDealTransfer)
+    {
+        List<TComplainDealTransfer> list = tComplainDealTransferService.selectTComplainDealTransferList(tComplainDealTransfer);
+        ExcelUtil<TComplainDealTransfer> util = new ExcelUtil<TComplainDealTransfer>(TComplainDealTransfer.class);
+        return util.exportExcel(list, "燃气投诉处置-转办记录数据");
+    }
+
+    /**
+     * 获取燃气投诉处置-转办记录详细信息-根据 投诉处置id查
+     */
+    @GetMapping(value = "/{complainDealTransferId}")
+    public AjaxResult getInfo(@PathVariable("complainDealTransferId") Long complainDealTransferId)
+    {
+        return AjaxResult.success(tComplainDealTransferService.selectTComplainDealTransferById(complainDealTransferId));
+    }
+
+    /**
+     * 获取燃气投诉处置-转办记录详细信息-根据 投诉处置id查
+     */
+    @GetMapping(value = "/queryByComplainDealId/{complainDealId}")
+    public AjaxResult queryComplainDealTransferListByComplainDealId(@PathVariable("complainDealId") Long complainDealId)
+    {
+        return AjaxResult.success(tComplainDealTransferService.queryComplainDealTransferListByComplainDealId(complainDealId));
+    }
+
+
+    /**
+     * 新增燃气投诉处置-转办记录
+     */
+    @Log(title = "燃气投诉处置-转办记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TComplainDealTransfer tComplainDealTransfer)
+    {
+        return  tComplainDealTransferService.insertTComplainDealTransfer(tComplainDealTransfer);
+    }
+
+    /**
+     * 修改燃气投诉处置-转办记录
+     */
+    @Log(title = "燃气投诉处置-转办记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TComplainDealTransfer tComplainDealTransfer)
+    {
+        return toAjax(tComplainDealTransferService.updateTComplainDealTransfer(tComplainDealTransfer));
+    }
+
+    /**
+     * 删除燃气投诉处置-转办记录
+     */
+    @Log(title = "燃气投诉处置-转办记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{complainDealTransferIds}")
+    public AjaxResult remove(@PathVariable Long[] complainDealTransferIds)
+    {
+        return toAjax(tComplainDealTransferService.deleteTComplainDealTransferByIds(complainDealTransferIds));
+    }
+}

zh-baseversion-admin/src/main/resources/application-dev.yml

@@ -95,3 +95,5 @@ zehong:
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
+  # ureport访问路径-测试
+  ureporturl: http://127.0.0.1:8905/gassafety

zh-baseversion-admin/src/main/resources/application-prd.yml

@@ -95,3 +95,5 @@ zehong:
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
+  # ureport访问路径-测试
+  ureporturl: http://127.0.0.1:8905/gassafety

zh-baseversion-admin/src/main/resources/application-test.yml

@@ -94,6 +94,8 @@ zehong:
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
+  # ureport访问路径-测试
+  ureporturl: http://127.0.0.1:8905/gassafety
 zhengfu:
   #appId
   appId: 6e2c7b5a4g1h0fd9

zh-baseversion-admin/src/main/resources/ureport.properties

+ureport.disableHttpSessionReportCache=false
+ureport.disableFileProvider=true
+ureport.fileStoreDir=${zehong.profile}/ureport2
+ureport.debug=true

zh-baseversion-common/pom.xml

@@ -134,6 +134,18 @@
             <version>4.5.2</version>
         </dependency>
 
+        <!--        easyexcel-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>3.3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>ooxml-schemas</artifactId>
+            <version>1.4</version>
+        </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file

zh-baseversion-framework/src/main/java/com/zehong/framework/config/SecurityConfig.java

@@ -121,6 +121,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/common/download/resource**").anonymous()
                 .antMatchers("/swagger-ui.html").anonymous()
                 .antMatchers("/swagger-resources/**").anonymous()
+                .antMatchers("/ureport/**").anonymous()
                 .antMatchers("/webjars/**").anonymous()
                 .antMatchers("/*/api-docs").anonymous()
                 .antMatchers("/druid/**").anonymous()

zh-baseversion-system/pom.xml

@@ -27,6 +27,11 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
+        <!--ureport2 依赖-->
+        <dependency>
+            <groupId>com.bstek.ureport</groupId>
+            <artifactId>ureport2-console</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

zh-baseversion-system/src/main/java/com/zehong/system/config/easyexcel/CustomCellWriteHeightConfig.java

+package com.zehong.system.config.easyexcel;
+
+import com.alibaba.excel.write.handler.context.RowWriteHandlerContext;
+import com.alibaba.excel.write.style.row.AbstractRowHeightStyleStrategy;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.Row;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Iterator;
+
+public class CustomCellWriteHeightConfig extends AbstractRowHeightStyleStrategy {
+
+    /**
+     * 默认高度
+     */
+    private static final Integer DEFAULT_HEIGHT = 300;
+
+    @Override
+    protected void setHeadColumnHeight(Row row, int relativeRowIndex) {
+        row.setHeight((short) (2 * DEFAULT_HEIGHT));
+    }
+
+    @Override
+    protected void setContentColumnHeight(Row row, int relativeRowIndex) {
+        Iterator<Cell> cellIterator = row.cellIterator();
+        if (!cellIterator.hasNext()) {
+            return;
+        }
+        // 默认为 1 行高度
+        int maxHeight = 1;
+        while (cellIterator.hasNext()) {
+            Cell cell = cellIterator.next();
+            if (cell.getCellType() == CellType.STRING) {
+                String value = cell.getStringCellValue();
+                for (int i = 0; i < value.length(); i += 10) {
+                    if (i + 10 < value.length()) {
+                        value = value.substring(0, i) + "\n" + value.substring(i, i + 10) + value.substring(i + 10);
+                    } else {
+                        value = value.substring(0, i) + "\n" + value.substring(i);
+                    }
+                }
+                if (value.contains("\n")) {
+                    int length = value.split("\n").length;
+                    maxHeight = Math.max(maxHeight, length);
+                }
+            }
+
+        }
+        row.setHeight((short) (maxHeight * DEFAULT_HEIGHT));
+    }
+
+    @Override
+    public void afterRowDispose(RowWriteHandlerContext context) {
+        if (context.getHead() != null) {
+            if(ObjectUtils.isEmpty(context.getRelativeRowIndex())){
+                return;
+            }
+            if (Boolean.TRUE.equals(context.getHead())) {
+                this.setHeadColumnHeight(context.getRow(), context.getRelativeRowIndex());
+            } else {
+                this.setContentColumnHeight(context.getRow(), context.getRelativeRowIndex());
+            }
+
+        }
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/config/easyexcel/CustomCellWriteWidthConfig.java

+package com.zehong.system.config.easyexcel;
+
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.metadata.data.CellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Sheet;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class CustomCellWriteWidthConfig extends AbstractColumnWidthStyleStrategy {
+
+    private final Map<Integer, Map<Integer, Integer>> CACHE = new HashMap<>();
+
+    @Override
+    protected void setColumnWidth(WriteSheetHolder writeSheetHolder, List<WriteCellData<?>> cellDataList, Cell cell, Head head, Integer integer, Boolean isHead) {
+        boolean needSetWidth = isHead || !CollectionUtils.isEmpty(cellDataList);
+        if (needSetWidth) {
+            Map<Integer, Integer> maxColumnWidthMap = CACHE.computeIfAbsent(writeSheetHolder.getSheetNo(), k -> new HashMap<>());
+            Integer columnWidth = this.dataLength(cellDataList, cell, isHead);
+            if (columnWidth > 0) {
+                if (columnWidth > 10) {
+                    columnWidth = 20;
+                }else{
+                    columnWidth = 10;
+                }
+                Integer maxColumnWidth = maxColumnWidthMap.get(cell.getColumnIndex());
+                if (maxColumnWidth == null || columnWidth > maxColumnWidth) {
+                    maxColumnWidthMap.put(cell.getColumnIndex(), columnWidth);
+                    Sheet sheet = writeSheetHolder.getSheet();
+                    sheet.setColumnWidth(cell.getColumnIndex(), 256 * columnWidth + 184);
+                }
+            }
+        }
+    }
+
+    /**
+     * 计算长度
+     *
+     * @param cellDataList
+     * @param cell
+     * @param isHead
+     * @return
+     */
+    private Integer dataLength(List<WriteCellData<?>> cellDataList, Cell cell, Boolean isHead) {
+        if (isHead) {
+            return cell.getStringCellValue().getBytes().length;
+        } else {
+            CellData<?> cellData = cellDataList.get(0);
+            CellDataTypeEnum type = cellData.getType();
+            if (type == null) {
+                return -1;
+            } else {
+                switch (type) {
+                    case STRING:
+                        // 换行符（数据需要提前解析好）
+                        int index = cellData.getStringValue().indexOf("\n");
+                        return index != -1 ?
+                                cellData.getStringValue().substring(0, index).getBytes().length + 1 : cellData.getStringValue().getBytes().length + 1;
+                    case BOOLEAN:
+                        return cellData.getBooleanValue().toString().getBytes().length;
+                    case NUMBER:
+                        return cellData.getNumberValue().toString().getBytes().length;
+                    default:
+                        return -1;
+                }
+            }
+        }
+    }
+
+}

zh-baseversion-system/src/main/java/com/zehong/system/config/ureport/FileReportProvider.java

+package com.zehong.system.config.ureport;
+
+import com.bstek.ureport.exception.ReportException;
+import com.bstek.ureport.provider.report.ReportFile;
+import com.bstek.ureport.provider.report.ReportProvider;
+import com.zehong.common.utils.ServletUtils;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.*;
+
+@Component
+@PropertySource(value = { "classpath:ureport.properties" })
+public abstract class FileReportProvider implements ReportProvider {
+
+    private String prefix="file:";
+    private boolean disabled;
+
+    @Getter
+    @Setter
+    @Value("${ureport.fileStoreDir}")
+    private String fileStoreDir;
+
+    @PostConstruct
+    public void init(){
+        File file = new File(fileStoreDir);
+        if(!file.exists()){
+            file.mkdirs();
+        }
+    }
+
+    @Override
+    public InputStream loadReport(String file) {
+        HttpServletRequest request = ServletUtils.getRequest();
+        if(file.startsWith(prefix)){
+            file=file.substring(prefix.length(),file.length());
+        }
+        String fullPath=fileStoreDir+"/"+file;
+        try {
+            return new FileInputStream(fullPath);
+        } catch (FileNotFoundException e) {
+            throw new ReportException(e);
+        }
+    }
+
+    public abstract void deleteReport(String file);
+//    @Override
+//    public void deleteReport(String file) {
+//        if(file.startsWith(prefix)){
+//            file=file.substring(prefix.length(),file.length());
+//        }
+//        String fullPath=fileStoreDir+"/"+file;
+//        File f=new File(fullPath);
+//        if(f.exists()){
+//            f.delete();
+//        }
+//    }
+
+    @Override
+    public List<ReportFile> getReportFiles() {
+        File file=new File(fileStoreDir);
+        List<ReportFile> list=new ArrayList<ReportFile>();
+        for(File f:file.listFiles()){
+            Calendar calendar=Calendar.getInstance();
+            calendar.setTimeInMillis(f.lastModified());
+            list.add(new ReportFile(f.getName(),calendar.getTime()));
+        }
+        Collections.sort(list, new Comparator<ReportFile>(){
+            @Override
+            public int compare(ReportFile f1, ReportFile f2) {
+                return f2.getUpdateDate().compareTo(f1.getUpdateDate());
+            }
+        });
+        return list;
+    }
+
+    public abstract void saveReport(String file, String content);
+
+//    @Override
+//    public void saveReport(String file, String content) {
+//        if(file.startsWith(prefix)){
+//            file=file.substring(prefix.length(),file.length());
+//        }
+//        String fullPath=fileStoreDir+"/"+file;
+//        FileOutputStream outStream=null;
+//        try{
+//            outStream=new FileOutputStream(new File(fullPath));
+//            IOUtils.write(content, outStream,"utf-8");
+//        }catch(Exception ex){
+//            throw new ReportException(ex);
+//        }finally{
+//            if(outStream!=null){
+//                try {
+//                    outStream.close();
+//                } catch (IOException e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//        }
+//    }
+
+    @Override
+    public String getName() {
+        return "自定义文件系统";
+    }
+
+    @Override
+    public boolean disabled() {
+        return false;
+    }
+
+    @Override
+    public String getPrefix() {
+        return prefix;
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/config/ureport/ResponseData.java

+package com.zehong.system.config.ureport;
+
+import com.zehong.common.constant.HttpStatus;
+import lombok.Data;
+
+@Data
+public class ResponseData<T> {
+
+    private Boolean success;
+
+    private Integer code;
+
+    private String msg;
+
+    private T data;
+
+    public ResponseData(){
+
+    }
+
+    public ResponseData(Boolean success, Integer code, String msg, T data) {
+        this.success = success;
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
+    }
+
+    public static <T> ResponseData<T> success(String msg, T data){
+        return new ResponseData<T>(true, HttpStatus.SUCCESS,msg,data);
+    }
+
+    public static <T> ResponseData<T> success(String msg){
+        return ResponseData.success(msg,null);
+    }
+
+    public static <T> ResponseData<T> success(T data){
+        return ResponseData.success(null,data);
+    }
+
+    public static <T> ResponseData<T> success(){
+        return ResponseData.success("请求成功",null);
+    }
+
+    public static <T> ResponseData<T> error(Integer code, String msg, T data){
+        return new ResponseData<T>(false,code,msg,data);
+    }
+
+    public static <T> ResponseData<T> error(Integer code, String msg){
+        return ResponseData.error(code,msg,null);
+    }
+
+    public static <T> ResponseData<T> error(String msg){
+        return ResponseData.error(HttpStatus.ERROR,msg,null);
+    }
+
+    public static <T> ResponseData<T> error(){
+        return ResponseData.error(HttpStatus.ERROR,"操作失败",null);
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/config/ureport/UReportConfig.java

+package com.zehong.system.config.ureport;
+
+import com.bstek.ureport.console.UReportServlet;
+import com.bstek.ureport.definition.datasource.BuildinDatasource;
+import lombok.SneakyThrows;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+
+
+@Configuration
+public class UReportConfig implements BuildinDatasource {
+    @Autowired
+    private DataSource datasource;
+
+    @Bean
+    public ServletRegistrationBean ureport2Servlet() {
+        ServletRegistrationBean registrationBean = new ServletRegistrationBean(new UReportServlet(), "/ureport/*");
+        return registrationBean;
+    }
+
+    @Override
+    public String name() {
+        return "内部数据源";
+    }
+
+    @SneakyThrows
+    @Override
+    public Connection getConnection() {
+        return datasource.getConnection();
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/config/ureport/UreportBusinessService.java

+package com.zehong.system.config.ureport;
+
+import com.bstek.ureport.exception.ReportException;
+import com.zehong.system.domain.BaseExportTemp;
+import com.zehong.system.mapper.BaseExportTempMapper;
+import org.apache.commons.io.IOUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Date;
+
+@Service
+public class UreportBusinessService extends FileReportProvider{
+    @Resource
+    private BaseExportTempMapper baseExportTempMapper;
+
+    @Override
+    public void deleteReport(String file) {
+        if(file.startsWith(getPrefix())){
+            file=file.substring(getPrefix().length(),file.length());
+        }
+        String fullPath=getFileStoreDir()+"/"+file;
+
+        //删除数据库记录
+        BaseExportTemp baseExportTemp = baseExportTempMapper.selectSignleByFullPath(fullPath);
+        if(baseExportTemp!=null){
+            baseExportTempMapper.deleteBaseExportTempById(baseExportTemp.getId());
+        }
+
+        File f=new File(fullPath);
+        if(f.exists()){
+            f.delete();
+        }
+    }
+
+    @Override
+    public void saveReport(String file, String content) {
+        if(file.startsWith(getPrefix())){
+            file=file.substring(getPrefix().length(),file.length());
+        }
+        String fullPath=getFileStoreDir()+"/"+file;
+        FileOutputStream outStream=null;
+        try{
+            outStream=new FileOutputStream(new File(fullPath));
+            IOUtils.write(content, outStream,"utf-8");
+            //判断模板是否已存在---根据模板fullPath查询
+            BaseExportTemp baseExportTemp = baseExportTempMapper.selectSignleByFullPath(fullPath);
+            if(baseExportTemp!=null){
+                //更新模板数据库
+                baseExportTemp.setContent(content);
+                baseExportTemp.setUpdateTime(new Date());
+                baseExportTempMapper.updateBaseExportTemp(baseExportTemp);
+            }else{
+                //将模板数据保存在数据库中
+                baseExportTemp = new BaseExportTemp();
+                baseExportTemp.setContent(content);
+                baseExportTemp.setFileStoreDir(getFileStoreDir());
+                baseExportTemp.setFullPath(fullPath);
+                baseExportTemp.setName(file.replaceAll("\\.ureport\\.xml",""));
+                baseExportTemp.setPrefix(getPrefix());
+                baseExportTemp.setTempFileName(file);
+                baseExportTemp.setCreateTime(new Date());
+                baseExportTempMapper.insertBaseExportTemp(baseExportTemp);
+            }
+        }catch(Exception ex){
+            throw new ReportException(ex);
+        }finally{
+            if(outStream!=null){
+                try {
+                    outStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/controller/BaseExportTempController.java

+package com.zehong.system.controller;
+
+import com.zehong.common.annotation.RepeatSubmit;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.core.page.TableDataInfo;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.system.config.ureport.ResponseData;
+import com.zehong.system.domain.BaseExportTemp;
+import com.zehong.system.domain.dto.BaseTempExportDTO;
+import com.zehong.system.service.IBaseExportTempService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * ureport2模板管理Controller
+ *
+ * @author wanghao
+ * @date 2024-06-11
+ */
+@RestController
+@RequestMapping("/base/baseExportTemp")
+public class BaseExportTempController extends BaseController
+{
+    @Autowired
+    private IBaseExportTempService baseExportTempService;
+
+    @Autowired
+    Environment environment;
+    /**
+     * 查询ureport2模板管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('base:baseExportTemp:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BaseExportTemp baseExportTemp)
+    {
+        startPage();
+        List<BaseExportTemp> list = baseExportTempService.selectBaseExportTempList(baseExportTemp);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出ureport2模板管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('base:baseExportTemp:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BaseExportTemp baseExportTemp)
+    {
+        List<BaseExportTemp> list = baseExportTempService.selectBaseExportTempList(baseExportTemp);
+        ExcelUtil<BaseExportTemp> util = new ExcelUtil<BaseExportTemp>(BaseExportTemp.class);
+        util.exportExcel(list, "ureport2模板管理数据");
+    }
+
+    /**
+     * 获取ureport2模板管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('base:baseExportTemp:query')")
+    @GetMapping(value = "/{id}")
+    public ResponseData<BaseExportTemp> getInfo(@PathVariable("id") Long id)
+    {
+        return ResponseData.success(baseExportTempService.selectBaseExportTempById(id));
+    }
+
+    /**
+     * 新增ureport2模板管理
+     */
+    @PreAuthorize("@ss.hasPermi('base:baseExportTemp:add')")
+    @PostMapping
+    @RepeatSubmit
+    public ResponseData add(@RequestBody @Valid BaseExportTemp baseExportTemp)
+    {
+        int i = baseExportTempService.insertBaseExportTemp(baseExportTemp);
+        if(i>0){
+            //返回主键
+            return ResponseData.success(baseExportTemp.getId());
+        }else{
+            return ResponseData.error();
+        }
+    }
+
+    /**
+     * 修改ureport2模板管理
+     */
+    @PreAuthorize("@ss.hasPermi('base:baseExportTemp:edit')")
+    @PutMapping
+    @RepeatSubmit
+    public ResponseData edit(@RequestBody @Valid BaseExportTemp baseExportTemp)
+    {
+        int i = baseExportTempService.updateBaseExportTemp(baseExportTemp);
+        if(i>0){
+            //返回主键
+            return ResponseData.success(baseExportTemp.getId());
+        }else{
+            return ResponseData.error();
+        }
+    }
+
+    /**
+     * 删除ureport2模板管理
+     */
+    @PreAuthorize("@ss.hasPermi('base:baseExportTemp:remove')")
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        //return toResult(baseExportTempService.deleteBaseExportTempByIds(ids));
+        //逻辑删除
+        return AjaxResult.success(baseExportTempService.setDeleteByIds(ids));
+    }
+
+    /**
+     * 查询ureport2模板管理列表---不进行分页
+     */
+    @PreAuthorize("@ss.hasPermi('base:baseExportTemp:list')")
+    @PostMapping("/getDataList")
+    public ResponseData<List<BaseExportTemp>> getDataList(@RequestBody BaseExportTemp baseExportTemp)
+    {
+        List<BaseExportTemp> list = baseExportTempService.selectBaseExportTempList(baseExportTemp);
+        return ResponseData.success(list);
+    }
+
+    /**
+     * 跳转到添加模板页面
+     * @return
+     */
+    @GetMapping("/addTemp")
+    @PreAuthorize("@ss.hasPermi('baseExportTemp:baseExportTemp:add')")
+    public String addTemp(){
+//        return "http://"+ IpUtils.getHostIp() +":"+environment.getProperty("server.port")+"/ureport/designer";
+        return environment.getProperty("zehong.ureporturl")+"/ureport/designer";
+    }
+
+    /**
+     * 跳转到修改模板页面
+     * @return
+     */
+    @GetMapping("/editTemp/{id}")
+    @PreAuthorize("@ss.hasPermi('baseExportTemp:baseExportTemp:edit')")
+    public String editTemp(@PathVariable Long id){
+        BaseExportTemp baseExportTemp1 = baseExportTempService.selectBaseExportTempById(id);
+        if(baseExportTemp1==null){
+            throw new SecurityException("当前模板不存在");
+        }
+//        return "http://"+ IpUtils.getHostIp() +":"+environment.getProperty("server.port")+"/ureport/designer"+"?_u="+baseExportTemp1.getPrefix()+baseExportTemp1.getTempFileName();
+        return environment.getProperty("zehong.ureporturl")+"/ureport/designer"+"?_u="+baseExportTemp1.getPrefix()+baseExportTemp1.getTempFileName();
+    }
+
+    /**
+     * 跳转到预览模板页面
+     * @return
+     */
+    @GetMapping("/previwTemp/{id}")
+    @PreAuthorize("@ss.hasPermi('baseExportTemp:baseExportTemp:list')")
+    public String previwTemp(@PathVariable Long id){
+        BaseExportTemp baseExportTemp1 = baseExportTempService.selectBaseExportTempById(id);
+        if(baseExportTemp1==null){
+            throw new SecurityException("当前模板不存在");
+        }
+//        return "http://"+ IpUtils.getHostIp() +":"+environment.getProperty("server.port")+"/ureport/preview?_u="+baseExportTemp1.getPrefix()+baseExportTemp1.getTempFileName();
+        return environment.getProperty("zehong.ureporturl")+"/ureport/preview?_u="+baseExportTemp1.getPrefix()+baseExportTemp1.getTempFileName();
+    }
+    /**
+     * 实际业务--跳转到预览模板页面
+     * @return
+     */
+    @GetMapping("/businessPreviwTemp")
+    public String businessPreviwTemp(@Valid BaseTempExportDTO baseTempExportDTO){
+        BaseExportTemp baseExportTemp1 = baseExportTempService.selectParamByCode(baseTempExportDTO.getCode());
+        if(baseExportTemp1==null){
+            throw new SecurityException("当前模板不存在");
+        }
+        String extraStr = "";
+        if(StringUtils.isNotBlank(baseTempExportDTO.getOrderNo())){
+            extraStr = extraStr+"&orderNo="+baseTempExportDTO.getOrderNo();
+        }
+        if(baseTempExportDTO.getExtraParams()!=null){
+            String extraParams = baseTempExportDTO.getExtraParams().stream().collect(Collectors.joining(","));
+            extraStr = extraStr+"&extraParams="+extraParams;
+        }
+//        return "http://"+ IpUtils.getHostIp() +":"
+//                +environment.getProperty("server.port")+"/ureport/preview?_u="
+//                +baseExportTemp1.getPrefix()+baseExportTemp1.getTempFileName()
+//                +"&orderNo="+orderNo;
+        //直接跳转到PDF预览页面
+//        return "http://"+ IpUtils.getHostIp() +":"
+//                +environment.getProperty("server.port")+"/ureport/pdf/show?_u="
+//                +baseExportTemp1.getPrefix()+baseExportTemp1.getTempFileName()
+//                +"&orderNo="+orderNo;
+        return environment.getProperty("zehong.ureporturl")+"/ureport/pdf/show?_u="
+                +baseExportTemp1.getPrefix()+baseExportTemp1.getTempFileName()
+                +extraStr;
+    }
+
+    /**
+     * 实际业务--导出excel
+     * @return
+     */
+    @GetMapping("/businessExportExcel")
+    public String businessExportExcel(@Valid BaseTempExportDTO baseTempExportDTO){
+        BaseExportTemp baseExportTemp1 = baseExportTempService.selectParamByCode(baseTempExportDTO.getCode());
+        if(baseExportTemp1==null){
+            throw new SecurityException("当前模板不存在");
+        }
+//        return "http://"+ IpUtils.getHostIp() +":"
+//                +environment.getProperty("server.port")+"/ureport/preview?_u="
+//                +baseExportTemp1.getPrefix()+baseExportTemp1.getTempFileName()
+//                +"&orderNo="+orderNo;
+        //直接跳转到PDF预览页面
+//        return "http://"+ IpUtils.getHostIp() +":"
+//                +environment.getProperty("server.port")+"/ureport/excel?_u="
+//                +baseExportTemp1.getPrefix()+baseExportTemp1.getTempFileName()
+//                +"&orderNo="+orderNo;
+        String extraStr = "";
+        if(StringUtils.isNotBlank(baseTempExportDTO.getOrderNo())){
+            extraStr = extraStr+"&orderNo="+baseTempExportDTO.getOrderNo();
+        }
+        if(baseTempExportDTO.getBeginTime()!=null){
+            extraStr = extraStr+"&beginTime="+ DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",baseTempExportDTO.getBeginTime());
+        }
+        if(baseTempExportDTO.getEndTime()!=null){
+            extraStr = extraStr+"&endTime="+ DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",baseTempExportDTO.getEndTime());
+        }
+        if(baseTempExportDTO.getExtraParams()!=null){
+            String extraParams = baseTempExportDTO.getExtraParams().stream().collect(Collectors.joining(","));
+            extraStr = extraStr+"&extraParams="+extraParams;
+        }
+        return environment.getProperty("zehong.ureporturl")+"/ureport/excel?_u="
+                +baseExportTemp1.getPrefix()+baseExportTemp1.getTempFileName()
+                +extraStr;
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/BaseExportTemp.java

+package com.zehong.system.domain;
+
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+@Data
+public class BaseExportTemp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 模板名称 */
+    @Excel(name = "模板名称")
+    private String name;
+
+    /** 模板编号(该编号取自字典表) */
+    @Excel(name = "模板编号(该编号取自字典表)")
+    private String code;
+
+    /** 模板文件名称 */
+    @Excel(name = "模板文件名称")
+    private String tempFileName;
+
+    /** 访问前缀 */
+    @Excel(name = "访问前缀")
+    private String prefix;
+
+    /** 存储目录 */
+    @Excel(name = "存储目录")
+    private String fileStoreDir;
+
+    /** 完整路径 */
+    @Excel(name = "完整路径")
+    private String fullPath;
+
+    /** 模板内容 */
+    @Excel(name = "模板内容")
+    private String content;
+
+    /** 创建人主键 */
+    @Excel(name = "创建人主键")
+    private Long createUserId;
+
+    /** 创建人姓名 */
+    @Excel(name = "创建人姓名")
+    private String createUserName;
+
+    /** 更新人主键 */
+    @Excel(name = "更新人主键")
+    private Long updateUserId;
+
+    /** 更新人姓名 */
+    @Excel(name = "更新人姓名")
+    private String updateUserName;
+
+    /** 启用禁用状态(字典通用是否) */
+    @Excel(name = "启用禁用状态(字典通用是否)")
+    private String enableFlag;
+
+    /** 删除状态(通用是否) */
+    @Excel(name = "删除状态(通用是否)")
+    private String deleteFlag;
+
+    /** 备用字段1 */
+    @Excel(name = "备用字段1")
+    private String spareParam1;
+
+    /** 备用字段2 */
+    @Excel(name = "备用字段2")
+    private String spareParam2;
+
+    /** 备用字段3 */
+    @Excel(name = "备用字段3")
+    private String spareParam3;
+
+    /** 备用字段4 */
+    @Excel(name = "备用字段4")
+    private String spareParam4;
+
+    /** 备用字段5 */
+    @Excel(name = "备用字段5")
+    private String spareParam5;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("code", getCode())
+                .append("tempFileName", getTempFileName())
+                .append("prefix", getPrefix())
+                .append("fileStoreDir", getFileStoreDir())
+                .append("fullPath", getFullPath())
+                .append("content", getContent())
+                .append("createUserId", getCreateUserId())
+                .append("createUserName", getCreateUserName())
+                .append("createTime", getCreateTime())
+                .append("updateUserId", getUpdateUserId())
+                .append("updateUserName", getUpdateUserName())
+                .append("updateTime", getUpdateTime())
+                .append("enableFlag", getEnableFlag())
+                .append("deleteFlag", getDeleteFlag())
+                .append("remark", getRemark())
+                .append("spareParam1", getSpareParam1())
+                .append("spareParam2", getSpareParam2())
+                .append("spareParam3", getSpareParam3())
+                .append("spareParam4", getSpareParam4())
+                .append("spareParam5", getSpareParam5())
+                .toString();
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/TComplainDeal.java

@@ -61,7 +61,7 @@ public class TComplainDeal extends BaseEntity
     private String complainAssignMan;
 
     /** 任务状态：1.派发中 2.反馈 3.归档 */
-    @Excel(name = "任务状态：1.派发中 2.反馈 3.归档")
+    @Excel(name = "任务状态：1.派发中 2.反馈 3.归档 4.企业退回")
     private String complainStatus;
 
     /** 是否删除(0正常，1删除) */
@@ -72,6 +72,27 @@ public class TComplainDeal extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /*投诉类别 */
+    private String complainType;
+
+    //    超时督办 0-创建，1-企业反馈，2-确认反馈，不确认时监管部门直接改成 0
+    private String overtimeSupervision;
+
+    //   所属区域
+    private String township;
+    /*
+     * 省厅数据源或平台自建数据源(0-自建，1-省厅)，默认0-自建
+     */
+    private String provincialDataFlag;
+
+    public String getProvincialDataFlag() {
+        return provincialDataFlag;
+    }
+
+    public void setProvincialDataFlag(String provincialDataFlag) {
+        this.provincialDataFlag = provincialDataFlag;
+    }
+
     public void setComplainDealId(Long complainDealId)
     {
         this.complainDealId = complainDealId;
@@ -198,6 +219,30 @@ public class TComplainDeal extends BaseEntity
         this.dealTime = dealTime;
     }
 
+    public String getComplainType() {
+        return complainType;
+    }
+
+    public void setComplainType(String complainType) {
+        this.complainType = complainType;
+    }
+
+    public String getOvertimeSupervision() {
+        return overtimeSupervision;
+    }
+
+    public void setOvertimeSupervision(String overtimeSupervision) {
+        this.overtimeSupervision = overtimeSupervision;
+    }
+
+    public String getTownship() {
+        return township;
+    }
+
+    public void setTownship(String township) {
+        this.township = township;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

zh-baseversion-system/src/main/java/com/zehong/system/domain/TComplainDealEvaluate.java

+package com.zehong.system.domain;
+
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 燃气投诉处置-评价对象 t_complain_deal_evaluate
+ * 
+ * @author zehong
+ * @date 2024-06-14
+ */
+public class TComplainDealEvaluate extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 投诉处置评价id */
+    private Long complainDealEvaluateId;
+
+    /** 投诉处置id */
+    private Long complainDealId;
+
+    /** 评价内容 */
+    @Excel(name = "评价内容")
+    private String evaluateContent;
+
+    /** 评分 */
+    @Excel(name = "评分")
+    private Long evaluateRate;
+
+    public void setComplainDealEvaluateId(Long complainDealEvaluateId) 
+    {
+        this.complainDealEvaluateId = complainDealEvaluateId;
+    }
+
+    public Long getComplainDealEvaluateId() 
+    {
+        return complainDealEvaluateId;
+    }
+    public void setEvaluateContent(String evaluateContent) 
+    {
+        this.evaluateContent = evaluateContent;
+    }
+
+    public String getEvaluateContent() 
+    {
+        return evaluateContent;
+    }
+    public void setEvaluateRate(Long evaluateRate)
+    {
+        this.evaluateRate = evaluateRate;
+    }
+
+    public Long getEvaluateRate()
+    {
+        return evaluateRate;
+    }
+
+    public Long getComplainDealId() {
+        return complainDealId;
+    }
+
+    public void setComplainDealId(Long complainDealId) {
+        this.complainDealId = complainDealId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("complainDealEvaluateId", getComplainDealEvaluateId())
+            .append("evaluateContent", getEvaluateContent())
+            .append("evaluateRate", getEvaluateRate())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/TComplainDealManSysSet.java

+package com.zehong.system.domain;
+
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 燃气投诉处置的管理制度维护对象 t_complain_deal_man_sys_set
+ *
+ * @author zehong
+ * @date 2024-06-05
+ */
+public class TComplainDealManSysSet extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long fComplainDealManSysSetId;
+
+    /** 制度类型 1-投诉举报，2-服务申请，3-咨询建议 */
+    @Excel(name = "制度类型 1-投诉举报，2-服务申请，3-咨询建议")
+    private String fType;
+
+    /** 办结及时时长-天 */
+    @Excel(name = "办结及时时长-天")
+    private Long fDay;
+
+    /** 办结及时时长-小时 */
+    @Excel(name = "办结及时时长-小时")
+    private Long fHours;
+
+    /** 办结及时时长-分钟 */
+    @Excel(name = "办结及时时长-分钟")
+    private Long fMinutes;
+
+    /** 办结及时时长-秒 */
+    @Excel(name = "办结及时时长-秒")
+    private Long fSeconds;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String fRemarks;
+
+    public void setfComplainDealManSysSetId(Long fComplainDealManSysSetId)
+    {
+        this.fComplainDealManSysSetId = fComplainDealManSysSetId;
+    }
+
+    public Long getfComplainDealManSysSetId()
+    {
+        return fComplainDealManSysSetId;
+    }
+    public void setfType(String fType)
+    {
+        this.fType = fType;
+    }
+
+    public String getfType()
+    {
+        return fType;
+    }
+    public void setfDay(Long fDay)
+    {
+        this.fDay = fDay;
+    }
+
+    public Long getfDay()
+    {
+        return fDay;
+    }
+    public void setfHours(Long fHours)
+    {
+        this.fHours = fHours;
+    }
+
+    public Long getfHours()
+    {
+        return fHours;
+    }
+    public void setfMinutes(Long fMinutes)
+    {
+        this.fMinutes = fMinutes;
+    }
+
+    public Long getfMinutes()
+    {
+        return fMinutes;
+    }
+    public void setfSeconds(Long fSeconds)
+    {
+        this.fSeconds = fSeconds;
+    }
+
+    public Long getfSeconds()
+    {
+        return fSeconds;
+    }
+    public void setfRemarks(String fRemarks)
+    {
+        this.fRemarks = fRemarks;
+    }
+
+    public String getfRemarks()
+    {
+        return fRemarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("fComplainDealManSysSetId", getfComplainDealManSysSetId())
+                .append("fType", getfType())
+                .append("fDay", getfDay())
+                .append("fHours", getfHours())
+                .append("fMinutes", getfMinutes())
+                .append("fSeconds", getfSeconds())
+                .append("fRemarks", getfRemarks())
+                .toString();
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/TComplainDealOverSuper.java

+package com.zehong.system.domain;
+
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 燃气投诉处置-超时督办对象 t_complain_deal_over_super
+ * 
+ * @author zehong
+ * @date 2024-06-14
+ */
+public class TComplainDealOverSuper extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long complainDealOverSuperId;
+
+    /** 投诉处置id */
+    @Excel(name = "投诉处置id")
+    private Long complainDealId;
+
+    /** 督办事由 */
+    @Excel(name = "督办事由")
+    private String supervisionReasons;
+
+    /** 反馈 */
+    @Excel(name = "反馈")
+    private String concent;
+
+    /** 超时督办：0-创建，1-企业反馈，2-确认反馈，不确认时监管部门直接改成 0 */
+    @Excel(name = "超时督办：0-创建，1-企业反馈，2-确认反馈，不确认时监管部门直接改成 0")
+    private String overtimeSupervision;
+
+    public void setComplainDealOverSuperId(Long complainDealOverSuperId) 
+    {
+        this.complainDealOverSuperId = complainDealOverSuperId;
+    }
+
+    public Long getComplainDealOverSuperId() 
+    {
+        return complainDealOverSuperId;
+    }
+    public void setComplainDealId(Long complainDealId) 
+    {
+        this.complainDealId = complainDealId;
+    }
+
+    public Long getComplainDealId() 
+    {
+        return complainDealId;
+    }
+    public void setSupervisionReasons(String supervisionReasons) 
+    {
+        this.supervisionReasons = supervisionReasons;
+    }
+
+    public String getSupervisionReasons() 
+    {
+        return supervisionReasons;
+    }
+    public void setConcent(String concent) 
+    {
+        this.concent = concent;
+    }
+
+    public String getConcent() 
+    {
+        return concent;
+    }
+    public void setOvertimeSupervision(String overtimeSupervision) 
+    {
+        this.overtimeSupervision = overtimeSupervision;
+    }
+
+    public String getOvertimeSupervision() 
+    {
+        return overtimeSupervision;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("complainDealOverSuperId", getComplainDealOverSuperId())
+            .append("complainDealId", getComplainDealId())
+            .append("supervisionReasons", getSupervisionReasons())
+            .append("concent", getConcent())
+            .append("overtimeSupervision", getOvertimeSupervision())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/TComplainDealTransfer.java

+package com.zehong.system.domain;
+
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 燃气投诉处置-转办记录对象 t_complain_deal_transfer
+ * 
+ * @author zehong
+ * @date 2024-06-14
+ */
+public class TComplainDealTransfer extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 投诉处置转办id */
+    private Long complainDealTransferId;
+
+    /** 投诉处置id */
+    @Excel(name = "投诉处置id")
+    private Long complainDealId;
+
+    /** 企业id-省平台调整改成字符创 uuid */
+    @Excel(name = "企业id-省平台调整改成字符创 uuid")
+    private String enterpriseId;
+
+    /** 企业名称-结果反显 */
+    @Excel(name = "企业名称-结果反显")
+    private String enterpriseName;
+
+    /** 指派人 */
+    @Excel(name = "指派人id")
+    private Long complainAssignManId;
+
+    /** 指派人id */
+    @Excel(name = "指派人")
+    private String complainAssignMan;
+
+    /** 原因 */
+    @Excel(name = "原因")
+    private String reasonConcent;
+
+    public void setComplainDealTransferId(Long complainDealTransferId) 
+    {
+        this.complainDealTransferId = complainDealTransferId;
+    }
+
+    public Long getComplainDealTransferId() 
+    {
+        return complainDealTransferId;
+    }
+    public void setComplainDealId(Long complainDealId) 
+    {
+        this.complainDealId = complainDealId;
+    }
+
+    public Long getComplainDealId() 
+    {
+        return complainDealId;
+    }
+    public void setEnterpriseId(String enterpriseId) 
+    {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getEnterpriseId() 
+    {
+        return enterpriseId;
+    }
+    public void setEnterpriseName(String enterpriseName) 
+    {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getEnterpriseName() 
+    {
+        return enterpriseName;
+    }
+    public void setReasonConcent(String reasonConcent) 
+    {
+        this.reasonConcent = reasonConcent;
+    }
+
+    public String getReasonConcent() 
+    {
+        return reasonConcent;
+    }
+
+    public Long getComplainAssignManId() {
+        return complainAssignManId;
+    }
+
+    public void setComplainAssignManId(Long complainAssignManId) {
+        this.complainAssignManId = complainAssignManId;
+    }
+
+    public String getComplainAssignMan() {
+        return complainAssignMan;
+    }
+
+    public void setComplainAssignMan(String complainAssignMan) {
+        this.complainAssignMan = complainAssignMan;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("complainDealTransferId", getComplainDealTransferId())
+            .append("complainDealId", getComplainDealId())
+            .append("enterpriseId", getEnterpriseId())
+            .append("enterpriseName", getEnterpriseName())
+            .append("reasonConcent", getReasonConcent())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/dto/BaseTempExportDTO.java

+package com.zehong.system.domain.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class BaseTempExportDTO {
+
+    @NotBlank(message = "模板代码不能为空")
+    private String code;
+    private String orderNo;
+    private Date beginTime;
+    private Date endTime;
+    private List<String> extraParams;
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/dto/TComplainDealDTO.java

+package com.zehong.system.domain.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 投诉处置对象 t_complain_deal_dto
+ *
+ * @author zehong
+ * @date 2024-06-12
+ */
+@Data
+public class TComplainDealDTO {
+
+    /** 投诉处置id */
+    private Long complainDealId;
+
+    /** 创建时间 */
+    private String createTimeYear;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    /** 任务状态：1.派发中 2.反馈 3.归档 */
+    private String complainStatus;
+
+    /*投诉类别 */
+    private String complainType;
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/vo/ComplainDealSummaryAnalysisTableVo.java

+package com.zehong.system.domain.vo;
+
+/**
+ * 投诉处置统计分析 - 表格形式
+ */
+public class ComplainDealSummaryAnalysisTableVo {
+
+    /**
+     * 日期
+     */
+    private String date;
+
+    /**
+     * 发生量
+     */
+    private String amount;
+
+    /**
+     * 办结率
+     */
+    private String completionRate;
+
+    /**
+     * 办结及时率
+     */
+    private String timelyCompletionRate;
+
+    /**
+     * 投诉类别
+     */
+    private String complainType;
+
+    /**
+     * 导出时传的 动态标头
+     */
+    private String dynamicTitle;
+
+    public String getDynamicTitle() {
+        return dynamicTitle;
+    }
+
+    public void setDynamicTitle(String dynamicTitle) {
+        this.dynamicTitle = dynamicTitle;
+    }
+
+    public String getComplainType() {
+        return complainType;
+    }
+
+    public void setComplainType(String complainType) {
+        this.complainType = complainType;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public String getCompletionRate() {
+        return completionRate;
+    }
+
+    public void setCompletionRate(String completionRate) {
+        this.completionRate = completionRate;
+    }
+
+    public String getTimelyCompletionRate() {
+        return timelyCompletionRate;
+    }
+
+    public void setTimelyCompletionRate(String timelyCompletionRate) {
+        this.timelyCompletionRate = timelyCompletionRate;
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/vo/ComplainDealSummaryAnalysisVo.java

+package com.zehong.system.domain.vo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 投诉处置统计分析
+ */
+public class ComplainDealSummaryAnalysisVo {
+
+    /*
+    * 类型 发生量统计分析*/
+    private List<Map<String,String>> typeOfNumberOfComplaints;
+
+    /*
+     * 区域 发生量统计分析*/
+    private List<Map<String,String>> regionOfNumberOfComplaints;
+
+
+    /*
+     * 类型 办结率分析*/
+    private List<Map<String,String>> typeOfCompletionRate;
+
+    /*
+     * 区域 办结率分析*/
+    private List<Map<String,String>> regionOfCompletionRate;
+
+
+    /*
+     * 类型 办结及时率分析*/
+    private List<Map<String,String>> typeOfTimelyCompletionRate;
+
+    /*
+     * 区域 办结及时率分析*/
+    private List<Map<String,String>> regionOfTimelyCompletionRate;
+
+    public List<Map<String, String>> getTypeOfNumberOfComplaints() {
+        return typeOfNumberOfComplaints;
+    }
+
+    public void setTypeOfNumberOfComplaints(List<Map<String, String>> typeOfNumberOfComplaints) {
+        this.typeOfNumberOfComplaints = typeOfNumberOfComplaints;
+    }
+
+    public List<Map<String, String>> getRegionOfNumberOfComplaints() {
+        return regionOfNumberOfComplaints;
+    }
+
+    public void setRegionOfNumberOfComplaints(List<Map<String, String>> regionOfNumberOfComplaints) {
+        this.regionOfNumberOfComplaints = regionOfNumberOfComplaints;
+    }
+
+    public List<Map<String, String>> getTypeOfCompletionRate() {
+        return typeOfCompletionRate;
+    }
+
+    public void setTypeOfCompletionRate(List<Map<String, String>> typeOfCompletionRate) {
+        this.typeOfCompletionRate = typeOfCompletionRate;
+    }
+
+    public List<Map<String, String>> getRegionOfCompletionRate() {
+        return regionOfCompletionRate;
+    }
+
+    public void setRegionOfCompletionRate(List<Map<String, String>> regionOfCompletionRate) {
+        this.regionOfCompletionRate = regionOfCompletionRate;
+    }
+
+    public List<Map<String, String>> getTypeOfTimelyCompletionRate() {
+        return typeOfTimelyCompletionRate;
+    }
+
+    public void setTypeOfTimelyCompletionRate(List<Map<String, String>> typeOfTimelyCompletionRate) {
+        this.typeOfTimelyCompletionRate = typeOfTimelyCompletionRate;
+    }
+
+    public List<Map<String, String>> getRegionOfTimelyCompletionRate() {
+        return regionOfTimelyCompletionRate;
+    }
+
+    public void setRegionOfTimelyCompletionRate(List<Map<String, String>> regionOfTimelyCompletionRate) {
+        this.regionOfTimelyCompletionRate = regionOfTimelyCompletionRate;
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/mapper/BaseExportTempMapper.java

+package com.zehong.system.mapper;
+
+import com.zehong.system.domain.BaseExportTemp;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * ureport2模板管理Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-01-21
+ */
+public interface BaseExportTempMapper 
+{
+    /**
+     * 查询ureport2模板管理
+     * 
+     * @param id ureport2模板管理主键
+     * @return ureport2模板管理
+     */
+    public BaseExportTemp selectBaseExportTempById(Long id);
+
+    /**
+     * 查询ureport2模板管理列表
+     * 
+     * @param baseExportTemp ureport2模板管理
+     * @return ureport2模板管理集合
+     */
+    public List<BaseExportTemp> selectBaseExportTempList(BaseExportTemp baseExportTemp);
+
+    /**
+     * 新增ureport2模板管理
+     * 
+     * @param baseExportTemp ureport2模板管理
+     * @return 结果
+     */
+    public int insertBaseExportTemp(BaseExportTemp baseExportTemp);
+
+    /**
+     * 修改ureport2模板管理
+     * 
+     * @param baseExportTemp ureport2模板管理
+     * @return 结果
+     */
+    public int updateBaseExportTemp(BaseExportTemp baseExportTemp);
+
+    /**
+     * 删除ureport2模板管理
+     * 
+     * @param id ureport2模板管理主键
+     * @return 结果
+     */
+    public int deleteBaseExportTempById(Long id);
+
+    /**
+     * 批量删除ureport2模板管理
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBaseExportTempByIds(Long[] ids);
+    /**
+     * 删除ureport2模板管理
+     *
+     * @param id ureport2模板管理ID
+     * @return 结果
+     */
+    public int setDeleteById(@Param("id")Long id,@Param("operId")Long operId,@Param("operName")String operName);
+
+    /**
+     * 批量删除ureport2模板管理---逻辑删除
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int setDeleteByIds(@Param("ids")Long[] ids,@Param("operId")Long operId,@Param("operName")String operName);
+
+    /**
+     * 根据code查询参数
+     * @param code
+     * @return
+     */
+    public BaseExportTemp selectParamByCode(@Param("code") String code);
+
+    /**
+     * 根据模板的存放路径查询唯一的模板信息
+     * @param fullPath
+     * @return
+     */
+    public BaseExportTemp selectSignleByFullPath(@Param("fullPath") String fullPath);
+}

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TComplainDealEvaluateMapper.java

+package com.zehong.system.mapper;
+
+import com.zehong.system.domain.TComplainDealEvaluate;
+
+import java.util.List;
+
+/**
+ * 燃气投诉处置-评价Mapper接口
+ * 
+ * @author zehong
+ * @date 2024-06-06
+ */
+public interface TComplainDealEvaluateMapper 
+{
+    /**
+     * 查询燃气投诉处置-评价
+     * 
+     * @param complainDealEvaluateId 燃气投诉处置-评价ID
+     * @return 燃气投诉处置-评价
+     */
+    public TComplainDealEvaluate selectTComplainDealEvaluateById(Long complainDealEvaluateId);
+
+    /**
+     * 查询燃气投诉处置-评价
+     *
+     * @param complainDealId 燃气投诉处置Id
+     * @return 燃气投诉处置-评价
+     */
+    public TComplainDealEvaluate selectTComplainDealEvaluateByComplainDealId(Long complainDealId);
+
+    /**
+     * 查询燃气投诉处置-评价列表
+     * 
+     * @param tComplainDealEvaluate 燃气投诉处置-评价
+     * @return 燃气投诉处置-评价集合
+     */
+    public List<TComplainDealEvaluate> selectTComplainDealEvaluateList(TComplainDealEvaluate tComplainDealEvaluate);
+
+    /**
+     * 新增燃气投诉处置-评价
+     * 
+     * @param tComplainDealEvaluate 燃气投诉处置-评价
+     * @return 结果
+     */
+    public int insertTComplainDealEvaluate(TComplainDealEvaluate tComplainDealEvaluate);
+
+    /**
+     * 修改燃气投诉处置-评价
+     * 
+     * @param tComplainDealEvaluate 燃气投诉处置-评价
+     * @return 结果
+     */
+    public int updateTComplainDealEvaluate(TComplainDealEvaluate tComplainDealEvaluate);
+
+    /**
+     * 删除燃气投诉处置-评价
+     * 
+     * @param complainDealEvaluateId 燃气投诉处置-评价ID
+     * @return 结果
+     */
+    public int deleteTComplainDealEvaluateById(Long complainDealEvaluateId);
+
+    /**
+     * 批量删除燃气投诉处置-评价
+     * 
+     * @param complainDealEvaluateIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTComplainDealEvaluateByIds(Long[] complainDealEvaluateIds);
+}

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TComplainDealManSysSetMapper.java

+package com.zehong.system.mapper;
+
+import com.zehong.system.domain.TComplainDealManSysSet;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * 燃气投诉处置的管理制度维护Mapper接口
+ * 
+ * @author zehong
+ * @date 2024-06-05
+ */
+public interface TComplainDealManSysSetMapper 
+{
+    /**
+     * 查询燃气投诉处置的管理制度维护
+     * 
+     * @param fComplainDealManSysSetId 燃气投诉处置的管理制度维护ID
+     * @return 燃气投诉处置的管理制度维护
+     */
+    public TComplainDealManSysSet selectTComplainDealManSysSetById(Long fComplainDealManSysSetId);
+
+    /**
+     * 查询燃气投诉处置的管理制度维护列表
+     * 
+     * @param tComplainDealManSysSet 燃气投诉处置的管理制度维护
+     * @return 燃气投诉处置的管理制度维护集合
+     */
+    public List<TComplainDealManSysSet> selectTComplainDealManSysSetList(TComplainDealManSysSet tComplainDealManSysSet);
+
+    /**
+     * 批量修改
+     * @param tComplainDealManSysSets p
+     * @return r
+     */
+    public void batchUpdate(@Param("complainDealManSysSets") List<TComplainDealManSysSet> tComplainDealManSysSets);
+
+    /**
+     * 新增燃气投诉处置的管理制度维护
+     * 
+     * @param tComplainDealManSysSet 燃气投诉处置的管理制度维护
+     * @return 结果
+     */
+    public int insertTComplainDealManSysSet(TComplainDealManSysSet tComplainDealManSysSet);
+
+    /**
+     * 修改燃气投诉处置的管理制度维护
+     * 
+     * @param tComplainDealManSysSet 燃气投诉处置的管理制度维护
+     * @return 结果
+     */
+    public int updateTComplainDealManSysSet(TComplainDealManSysSet tComplainDealManSysSet);
+
+    /**
+     * 删除燃气投诉处置的管理制度维护
+     * 
+     * @param fComplainDealManSysSetId 燃气投诉处置的管理制度维护ID
+     * @return 结果
+     */
+    public int deleteTComplainDealManSysSetById(Long fComplainDealManSysSetId);
+
+    /**
+     * 批量删除燃气投诉处置的管理制度维护
+     * 
+     * @param fComplainDealManSysSetIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTComplainDealManSysSetByIds(Long[] fComplainDealManSysSetIds);
+}

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TComplainDealMapper.java

 package com.zehong.system.mapper;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 import com.zehong.system.domain.TComplainDeal;
+import com.zehong.system.domain.dto.TComplainDealDTO;
 import com.zehong.system.domain.vo.HomepageVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -47,6 +48,26 @@ public interface TComplainDealMapper
      */
     public int insertTComplainDeal(TComplainDeal tComplainDeal);
 
+    /**
+     * 查询所有归档的，并且没删除的
+     * @return
+     */
+    public List<TComplainDeal> queryAllByNotDelete();
+
+    /**
+     * 查询所有归档的，并且没删除的，看是否有时间范围查询
+     * @return
+     */
+    public List<TComplainDealDTO> queryAllByNotDeleteAndCreateTime(@Param("startOfMonth") Date startOfMonth,
+                                                                   @Param("endOfMonth") Date endOfMonth,
+                                                                   @Param("complaintCategory") String complaintCategory);
+    /**
+     * 修改投诉处置
+     *
+     * @param tComplainDeal 投诉处置
+     * @return 结果
+     */
+    public int clearTComplainDeal(TComplainDeal tComplainDeal);
     /**
      * 修改投诉处置
      * 

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TComplainDealOverSuperMapper.java

+package com.zehong.system.mapper;
+
+import com.zehong.system.domain.TComplainDealOverSuper;
+
+import java.util.List;
+
+/**
+ * 燃气投诉处置-超时督办Mapper接口
+ * 
+ * @author zehong
+ * @date 2024-06-13
+ */
+public interface TComplainDealOverSuperMapper 
+{
+    /**
+     * 查询燃气投诉处置-超时督办
+     * 
+     * @param complainDealOverSuperId 燃气投诉处置-超时督办ID
+     * @return 燃气投诉处置-超时督办
+     */
+    public TComplainDealOverSuper selectTComplainDealOverSuperById(Long complainDealOverSuperId);
+
+    /**
+     * 查询燃气投诉处置-超时督办列表
+     * 
+     * @param tComplainDealOverSuper 燃气投诉处置-超时督办
+     * @return 燃气投诉处置-超时督办集合
+     */
+    public List<TComplainDealOverSuper> selectTComplainDealOverSuperList(TComplainDealOverSuper tComplainDealOverSuper);
+
+    /**
+     * 新增燃气投诉处置-超时督办
+     * 
+     * @param tComplainDealOverSuper 燃气投诉处置-超时督办
+     * @return 结果
+     */
+    public int insertTComplainDealOverSuper(TComplainDealOverSuper tComplainDealOverSuper);
+
+    /**
+     * 修改燃气投诉处置-超时督办
+     * 
+     * @param tComplainDealOverSuper 燃气投诉处置-超时督办
+     * @return 结果
+     */
+    public int updateTComplainDealOverSuper(TComplainDealOverSuper tComplainDealOverSuper);
+
+    /**
+     * 删除燃气投诉处置-超时督办
+     * 
+     * @param complainDealOverSuperId 燃气投诉处置-超时督办ID
+     * @return 结果
+     */
+    public int deleteTComplainDealOverSuperById(Long complainDealOverSuperId);
+
+    /**
+     * 查询燃气投诉处置-超时督办列表-根据处置id 和 状态
+     * @param tComplainDealOverSuper
+     * @return
+     */
+    TComplainDealOverSuper getOverSuperByComplainDealIdAndStatus(TComplainDealOverSuper tComplainDealOverSuper);
+
+    /**
+     * 批量删除燃气投诉处置-超时督办
+     * 
+     * @param complainDealOverSuperIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTComplainDealOverSuperByIds(Long[] complainDealOverSuperIds);
+}

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TComplainDealTransferMapper.java

+package com.zehong.system.mapper;
+
+import com.zehong.system.domain.TComplainDealTransfer;
+
+import java.util.List;
+
+/**
+ * 燃气投诉处置-转办记录Mapper接口
+ * 
+ * @author zehong
+ * @date 2024-06-06
+ */
+public interface TComplainDealTransferMapper 
+{
+    /**
+     * 查询燃气投诉处置-转办记录
+     * 
+     * @param complainDealTransferId 燃气投诉处置-转办记录ID
+     * @return 燃气投诉处置-转办记录
+     */
+    public TComplainDealTransfer selectTComplainDealTransferById(Long complainDealTransferId);
+
+    /**
+     * 查询燃气投诉处置-转办记录列表
+     * 
+     * @param tComplainDealTransfer 燃气投诉处置-转办记录
+     * @return 燃气投诉处置-转办记录集合
+     */
+    public List<TComplainDealTransfer> selectTComplainDealTransferList(TComplainDealTransfer tComplainDealTransfer);
+
+    /**
+     * 查询燃气投诉处置-转办记录列表
+     *
+     * @param complainDealId 燃气投诉处置Id
+     * @return 燃气投诉处置-转办记录集合
+     */
+    public List<TComplainDealTransfer> queryComplainDealTransferListByComplainDealId(Long complainDealId);
+
+
+
+    /**
+     * 新增燃气投诉处置-转办记录
+     * 
+     * @param tComplainDealTransfer 燃气投诉处置-转办记录
+     * @return 结果
+     */
+    public int insertTComplainDealTransfer(TComplainDealTransfer tComplainDealTransfer);
+
+    /**
+     * 修改燃气投诉处置-转办记录
+     * 
+     * @param tComplainDealTransfer 燃气投诉处置-转办记录
+     * @return 结果
+     */
+    public int updateTComplainDealTransfer(TComplainDealTransfer tComplainDealTransfer);
+
+    /**
+     * 删除燃气投诉处置-转办记录
+     * 
+     * @param complainDealTransferId 燃气投诉处置-转办记录ID
+     * @return 结果
+     */
+    public int deleteTComplainDealTransferById(Long complainDealTransferId);
+
+    /**
+     * 批量删除燃气投诉处置-转办记录
+     * 
+     * @param complainDealTransferIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTComplainDealTransferByIds(Long[] complainDealTransferIds);
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/IBaseExportTempService.java

+package com.zehong.system.service;
+
+import com.zehong.system.domain.BaseExportTemp;
+
+import java.util.List;
+
+/**
+ * ureport2模板管理Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-01-21
+ */
+public interface IBaseExportTempService 
+{
+    /**
+     * 查询ureport2模板管理
+     * 
+     * @param id ureport2模板管理主键
+     * @return ureport2模板管理
+     */
+    public BaseExportTemp selectBaseExportTempById(Long id);
+
+    /**
+     * 查询ureport2模板管理列表
+     * 
+     * @param baseExportTemp ureport2模板管理
+     * @return ureport2模板管理集合
+     */
+    public List<BaseExportTemp> selectBaseExportTempList(BaseExportTemp baseExportTemp);
+
+    /**
+     * 新增ureport2模板管理
+     * 
+     * @param baseExportTemp ureport2模板管理
+     * @return 结果
+     */
+    public int insertBaseExportTemp(BaseExportTemp baseExportTemp);
+
+    /**
+     * 修改ureport2模板管理
+     * 
+     * @param baseExportTemp ureport2模板管理
+     * @return 结果
+     */
+    public int updateBaseExportTemp(BaseExportTemp baseExportTemp);
+
+    /**
+     * 批量删除ureport2模板管理
+     * 
+     * @param ids 需要删除的ureport2模板管理主键集合
+     * @return 结果
+     */
+    public int deleteBaseExportTempByIds(Long[] ids);
+
+    /**
+     * 删除ureport2模板管理信息
+     * 
+     * @param id ureport2模板管理主键
+     * @return 结果
+     */
+    public int deleteBaseExportTempById(Long id);
+
+    /**
+     * 批量删除---逻辑删除
+     *
+     * @param ids 需要删除的ureport2模板管理ID
+     * @return 结果
+     */
+    public int setDeleteByIds(Long[] ids);
+
+    /**
+     * 删除---逻辑删除
+     *
+     * @param id ureport2模板管理ID
+     * @return 结果
+     */
+    public int setDeleteById(Long id);
+
+    /**
+     * 根据code查询参数
+     * @param code
+     * @return
+     */
+    public BaseExportTemp selectParamByCode(String code);
+
+    /**
+     * 根据模板的存放路径查询唯一的模板信息
+     * @param fullPath
+     * @return
+     */
+    public BaseExportTemp selectSignleByFullPath(String fullPath);
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/ITComplainDealEvaluateService.java

+package com.zehong.system.service;
+
+import com.zehong.system.domain.TComplainDealEvaluate;
+
+import java.util.List;
+
+/**
+ * 燃气投诉处置-评价Service接口
+ * 
+ * @author zehong
+ * @date 2024-06-06
+ */
+public interface ITComplainDealEvaluateService 
+{
+    /**
+     * 查询燃气投诉处置-评价
+     * 
+     * @param complainDealEvaluateId 燃气投诉处置-评价ID
+     * @return 燃气投诉处置-评价
+     */
+    public TComplainDealEvaluate selectTComplainDealEvaluateById(Long complainDealEvaluateId);
+
+    /**
+     * 查询燃气投诉处置-评价
+     *
+     * @param complainDealId 燃气投诉处置
+     * @return 燃气投诉处置-评价
+     */
+    public TComplainDealEvaluate selectTComplainDealEvaluateByComplainDealId(Long complainDealId);
+
+    /**
+     * 查询燃气投诉处置-评价列表
+     * 
+     * @param tComplainDealEvaluate 燃气投诉处置-评价
+     * @return 燃气投诉处置-评价集合
+     */
+    public List<TComplainDealEvaluate> selectTComplainDealEvaluateList(TComplainDealEvaluate tComplainDealEvaluate);
+
+    /**
+     * 新增燃气投诉处置-评价
+     * 
+     * @param tComplainDealEvaluate 燃气投诉处置-评价
+     * @return 结果
+     */
+    public int insertTComplainDealEvaluate(TComplainDealEvaluate tComplainDealEvaluate);
+
+    /**
+     * 修改燃气投诉处置-评价
+     * 
+     * @param tComplainDealEvaluate 燃气投诉处置-评价
+     * @return 结果
+     */
+    public int updateTComplainDealEvaluate(TComplainDealEvaluate tComplainDealEvaluate);
+
+    /**
+     * 批量删除燃气投诉处置-评价
+     * 
+     * @param complainDealEvaluateIds 需要删除的燃气投诉处置-评价ID
+     * @return 结果
+     */
+    public int deleteTComplainDealEvaluateByIds(Long[] complainDealEvaluateIds);
+
+    /**
+     * 删除燃气投诉处置-评价信息
+     * 
+     * @param complainDealEvaluateId 燃气投诉处置-评价ID
+     * @return 结果
+     */
+    public int deleteTComplainDealEvaluateById(Long complainDealEvaluateId);
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/ITComplainDealManSysSetService.java

+package com.zehong.system.service;
+
+import com.zehong.system.domain.TComplainDealManSysSet;
+
+import java.util.List;
+
+/**
+ * 燃气投诉处置的管理制度维护Service接口
+ * 
+ * @author zehong
+ * @date 2024-06-05
+ */
+public interface ITComplainDealManSysSetService 
+{
+    /**
+     * 查询燃气投诉处置的管理制度维护
+     * 
+     * @param fComplainDealManSysSetId 燃气投诉处置的管理制度维护ID
+     * @return 燃气投诉处置的管理制度维护
+     */
+    public TComplainDealManSysSet selectTComplainDealManSysSetById(Long fComplainDealManSysSetId);
+
+    /**
+     * 查询燃气投诉处置的管理制度维护列表
+     * 
+     * @param tComplainDealManSysSet 燃气投诉处置的管理制度维护
+     * @return 燃气投诉处置的管理制度维护集合
+     */
+    public List<TComplainDealManSysSet> selectTComplainDealManSysSetList(TComplainDealManSysSet tComplainDealManSysSet);
+
+    /**
+     * 批量修改
+     * @param tComplainDealManSysSets s
+     */
+    public void batchUpdate(List<TComplainDealManSysSet> tComplainDealManSysSets);
+
+    /**
+     * 新增燃气投诉处置的管理制度维护
+     * 
+     * @param tComplainDealManSysSet 燃气投诉处置的管理制度维护
+     * @return 结果
+     */
+    public int insertTComplainDealManSysSet(TComplainDealManSysSet tComplainDealManSysSet);
+
+    /**
+     * 修改燃气投诉处置的管理制度维护
+     * 
+     * @param tComplainDealManSysSet 燃气投诉处置的管理制度维护
+     * @return 结果
+     */
+    public int updateTComplainDealManSysSet(TComplainDealManSysSet tComplainDealManSysSet);
+
+    /**
+     * 批量删除燃气投诉处置的管理制度维护
+     * 
+     * @param fComplainDealManSysSetIds 需要删除的燃气投诉处置的管理制度维护ID
+     * @return 结果
+     */
+    public int deleteTComplainDealManSysSetByIds(Long[] fComplainDealManSysSetIds);
+
+    /**
+     * 删除燃气投诉处置的管理制度维护信息
+     * 
+     * @param fComplainDealManSysSetId 燃气投诉处置的管理制度维护ID
+     * @return 结果
+     */
+    public int deleteTComplainDealManSysSetById(Long fComplainDealManSysSetId);
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/ITComplainDealOverSuperService.java

+package com.zehong.system.service;
+
+import com.zehong.system.domain.TComplainDealOverSuper;
+
+import java.util.List;
+
+/**
+ * 燃气投诉处置-超时督办Service接口
+ * 
+ * @author zehong
+ * @date 2024-06-13
+ */
+public interface ITComplainDealOverSuperService 
+{
+    /**
+     * 查询燃气投诉处置-超时督办
+     * 
+     * @param complainDealOverSuperId 燃气投诉处置-超时督办ID
+     * @return 燃气投诉处置-超时督办
+     */
+    public TComplainDealOverSuper selectTComplainDealOverSuperById(Long complainDealOverSuperId);
+
+    /**
+     * 查询燃气投诉处置-超时督办列表
+     * 
+     * @param tComplainDealOverSuper 燃气投诉处置-超时督办
+     * @return 燃气投诉处置-超时督办集合
+     */
+    public List<TComplainDealOverSuper> selectTComplainDealOverSuperList(TComplainDealOverSuper tComplainDealOverSuper);
+
+    /**
+     * 新增燃气投诉处置-超时督办
+     * 
+     * @param tComplainDealOverSuper 燃气投诉处置-超时督办
+     * @return 结果
+     */
+    public int insertTComplainDealOverSuper(TComplainDealOverSuper tComplainDealOverSuper);
+
+    /**
+     * 修改燃气投诉处置-超时督办
+     * 
+     * @param tComplainDealOverSuper 燃气投诉处置-超时督办
+     * @return 结果
+     */
+    public int updateTComplainDealOverSuper(TComplainDealOverSuper tComplainDealOverSuper);
+
+    /**
+     * 批量删除燃气投诉处置-超时督办
+     * 
+     * @param complainDealOverSuperIds 需要删除的燃气投诉处置-超时督办ID
+     * @return 结果
+     */
+    public int deleteTComplainDealOverSuperByIds(Long[] complainDealOverSuperIds);
+
+    /**
+     * 删除燃气投诉处置-超时督办信息
+     * 
+     * @param complainDealOverSuperId 燃气投诉处置-超时督办ID
+     * @return 结果
+     */
+    public int deleteTComplainDealOverSuperById(Long complainDealOverSuperId);
+
+    /**
+     * 查询燃气投诉处置-超时督办列表-根据处置id 和 状态
+     * @param tComplainDealOverSuper
+     * @return
+     */
+    public TComplainDealOverSuper getOverSuperByComplainDealIdAndStatus(TComplainDealOverSuper tComplainDealOverSuper);
+
+    /**
+     * 超时督办确认反馈
+     * @param tComplainDealOverSuper s
+     */
+    public int overtimeSupervisionFeedbackConfirmation(TComplainDealOverSuper tComplainDealOverSuper);
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/ITComplainDealService.java

 package com.zehong.system.service;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
 import com.zehong.system.domain.TComplainDeal;
+import com.zehong.system.domain.vo.ComplainDealSummaryAnalysisTableVo;
+import com.zehong.system.domain.vo.ComplainDealSummaryAnalysisVo;
 import com.zehong.system.domain.vo.HomepageVo;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 投诉处置Service接口
  * 
@@ -70,4 +75,12 @@ public interface ITComplainDealService
     public int deleteTComplainDealById(Long complainDealId);
 
     public List<Map<String,Object>> selectUserByenterproseId(String enterproseId);
+
+    public ComplainDealSummaryAnalysisVo complainDealSummaryAnalysisMethod();
+
+    public List<ComplainDealSummaryAnalysisTableVo> complainDealSummaryAnalysisMethodTableViews(ComplainDealSummaryAnalysisTableVo complainDealSummaryAnalysisTableVo);
+
+
+    public void complainDealSummaryAnalysisExport(HttpServletResponse httpServletResponse, ComplainDealSummaryAnalysisTableVo complainDealSummaryAnalysisTableVo) throws IOException;
+
 }

zh-baseversion-system/src/main/java/com/zehong/system/service/ITComplainDealTransferService.java

+package com.zehong.system.service;
+
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.system.domain.TComplainDealTransfer;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 燃气投诉处置-转办记录Service接口
+ * 
+ * @author zehong
+ * @date 2024-06-06
+ */
+public interface ITComplainDealTransferService 
+{
+    /**
+     * 查询燃气投诉处置-转办记录
+     * 
+     * @param complainDealTransferId 燃气投诉处置-转办记录ID
+     * @return 燃气投诉处置-转办记录
+     */
+    public TComplainDealTransfer selectTComplainDealTransferById(Long complainDealTransferId);
+
+    /**
+     * 查询燃气投诉处置-转办记录列表
+     * 
+     * @param tComplainDealTransfer 燃气投诉处置-转办记录
+     * @return 燃气投诉处置-转办记录集合
+     */
+    public List<TComplainDealTransfer> selectTComplainDealTransferList(TComplainDealTransfer tComplainDealTransfer);
+
+    /**
+     * 根据 投诉处置id查询 转办记录列表
+     * @param complainDealId id
+     * @return list
+     */
+    public List<Map<String,Object>> queryComplainDealTransferListByComplainDealId(Long complainDealId);
+
+    /**
+     * 新增燃气投诉处置-转办记录
+     * 
+     * @param tComplainDealTransfer 燃气投诉处置-转办记录
+     * @return 结果
+     */
+    public AjaxResult insertTComplainDealTransfer(TComplainDealTransfer tComplainDealTransfer);
+
+    /**
+     * 修改燃气投诉处置-转办记录
+     * 
+     * @param tComplainDealTransfer 燃气投诉处置-转办记录
+     * @return 结果
+     */
+    public int updateTComplainDealTransfer(TComplainDealTransfer tComplainDealTransfer);
+
+    /**
+     * 批量删除燃气投诉处置-转办记录
+     * 
+     * @param complainDealTransferIds 需要删除的燃气投诉处置-转办记录ID
+     * @return 结果
+     */
+    public int deleteTComplainDealTransferByIds(Long[] complainDealTransferIds);
+
+    /**
+     * 删除燃气投诉处置-转办记录信息
+     * 
+     * @param complainDealTransferId 燃气投诉处置-转办记录ID
+     * @return 结果
+     */
+    public int deleteTComplainDealTransferById(Long complainDealTransferId);
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/BaseExportTempServiceImpl.java

+package com.zehong.system.service.impl;
+
+import com.zehong.common.utils.DateUtils;
+import com.zehong.common.utils.SecurityUtils;
+import com.zehong.system.domain.BaseExportTemp;
+import com.zehong.system.mapper.BaseExportTempMapper;
+import com.zehong.system.service.IBaseExportTempService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * ureport2模板管理Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2022-01-21
+ */
+@Service
+@Transactional
+public class BaseExportTempServiceImpl implements IBaseExportTempService
+{
+    @Resource
+    private BaseExportTempMapper baseExportTempMapper;
+
+    /**
+     * 查询ureport2模板管理
+     * 
+     * @param id ureport2模板管理主键
+     * @return ureport2模板管理
+     */
+    @Override
+    public BaseExportTemp selectBaseExportTempById(Long id)
+    {
+        return baseExportTempMapper.selectBaseExportTempById(id);
+    }
+
+    /**
+     * 查询ureport2模板管理列表
+     * 
+     * @param baseExportTemp ureport2模板管理
+     * @return ureport2模板管理
+     */
+    @Override
+    public List<BaseExportTemp> selectBaseExportTempList(BaseExportTemp baseExportTemp)
+    {
+        return baseExportTempMapper.selectBaseExportTempList(baseExportTemp);
+    }
+
+    /**
+     * 新增ureport2模板管理
+     * 
+     * @param baseExportTemp ureport2模板管理
+     * @return 结果
+     */
+    @Override
+    public int insertBaseExportTemp(BaseExportTemp baseExportTemp) {
+        baseExportTemp.setCreateUserId(SecurityUtils.getLoginUser().getUser().getUserId());
+        baseExportTemp.setCreateUserName(SecurityUtils.getUsername());
+        baseExportTemp.setCreateTime(DateUtils.getNowDate());
+        return baseExportTempMapper.insertBaseExportTemp(baseExportTemp);
+    }
+
+    /**
+     * 修改ureport2模板管理
+     * 
+     * @param baseExportTemp ureport2模板管理
+     * @return 结果
+     */
+    @Override
+    public int updateBaseExportTemp(BaseExportTemp baseExportTemp)
+    {
+        baseExportTemp.setCreateUserId(SecurityUtils.getLoginUser().getUser().getUserId());
+        baseExportTemp.setCreateUserName(SecurityUtils.getUsername());
+        baseExportTemp.setUpdateTime(DateUtils.getNowDate());
+        return baseExportTempMapper.updateBaseExportTemp(baseExportTemp);
+    }
+
+    /**
+     * 批量删除ureport2模板管理
+     * 
+     * @param ids 需要删除的ureport2模板管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBaseExportTempByIds(Long[] ids)
+    {
+        return baseExportTempMapper.deleteBaseExportTempByIds(ids);
+    }
+
+    /**
+     * 删除ureport2模板管理信息
+     * 
+     * @param id ureport2模板管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBaseExportTempById(Long id)
+    {
+        return baseExportTempMapper.deleteBaseExportTempById(id);
+    }
+
+    /**
+     * 批量---逻辑删除
+     *
+     * @param ids 需要删除的ureport2模板管理ID
+     * @return 结果
+     */
+    @Override
+    public int setDeleteByIds(Long[] ids)
+    {
+        Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        String userNickName = SecurityUtils.getUsername();
+        return baseExportTempMapper.setDeleteByIds(ids,userId,userNickName);
+    }
+
+    /**
+     * 删除---逻辑删除
+     *
+     * @param id ureport2模板管理ID
+     * @return 结果
+     */
+    @Override
+    public int setDeleteById(Long id)
+    {
+        Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        String userNickName = SecurityUtils.getUsername();
+        return baseExportTempMapper.setDeleteById(id,userId,userNickName);
+    }
+
+    /**
+     * 根据code查询参数
+     * @param code
+     * @return
+     */
+    public BaseExportTemp selectParamByCode(String code){
+        return baseExportTempMapper.selectParamByCode(code);
+    }
+
+    /**
+     * 根据模板的存放路径查询唯一的模板信息
+     * @param fullPath
+     * @return
+     */
+    public BaseExportTemp selectSignleByFullPath(String fullPath){
+        return baseExportTempMapper.selectSignleByFullPath(fullPath);
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TComplainDealEvaluateServiceImpl.java

+package com.zehong.system.service.impl;
+
+import com.zehong.common.utils.DateUtils;
+import com.zehong.system.domain.TComplainDealEvaluate;
+import com.zehong.system.mapper.TComplainDealEvaluateMapper;
+import com.zehong.system.service.ITComplainDealEvaluateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 燃气投诉处置-评价Service业务层处理
+ * 
+ * @author zehong
+ * @date 2024-06-06
+ */
+@Service
+public class TComplainDealEvaluateServiceImpl implements ITComplainDealEvaluateService
+{
+    @Autowired
+    private TComplainDealEvaluateMapper tComplainDealEvaluateMapper;
+
+    /**
+     * 查询燃气投诉处置-评价
+     * 
+     * @param complainDealEvaluateId 燃气投诉处置-评价ID
+     * @return 燃气投诉处置-评价
+     */
+    @Override
+    public TComplainDealEvaluate selectTComplainDealEvaluateById(Long complainDealEvaluateId)
+    {
+        return tComplainDealEvaluateMapper.selectTComplainDealEvaluateById(complainDealEvaluateId);
+    }
+
+    /**
+     * 查询燃气投诉处置-评价
+     * @param complainDealId 燃气投诉处置
+     * @return
+     */
+    @Override
+    public TComplainDealEvaluate selectTComplainDealEvaluateByComplainDealId(Long complainDealId) {
+        return tComplainDealEvaluateMapper.selectTComplainDealEvaluateByComplainDealId(complainDealId);
+    }
+
+    /**
+     * 查询燃气投诉处置-评价列表
+     * 
+     * @param tComplainDealEvaluate 燃气投诉处置-评价
+     * @return 燃气投诉处置-评价
+     */
+    @Override
+    public List<TComplainDealEvaluate> selectTComplainDealEvaluateList(TComplainDealEvaluate tComplainDealEvaluate)
+    {
+        return tComplainDealEvaluateMapper.selectTComplainDealEvaluateList(tComplainDealEvaluate);
+    }
+
+    /**
+     * 新增燃气投诉处置-评价
+     * 
+     * @param tComplainDealEvaluate 燃气投诉处置-评价
+     * @return 结果
+     */
+    @Override
+    public int insertTComplainDealEvaluate(TComplainDealEvaluate tComplainDealEvaluate)
+    {
+        tComplainDealEvaluate.setCreateTime(DateUtils.getNowDate());
+        return tComplainDealEvaluateMapper.insertTComplainDealEvaluate(tComplainDealEvaluate);
+    }
+
+    /**
+     * 修改燃气投诉处置-评价
+     * 
+     * @param tComplainDealEvaluate 燃气投诉处置-评价
+     * @return 结果
+     */
+    @Override
+    public int updateTComplainDealEvaluate(TComplainDealEvaluate tComplainDealEvaluate)
+    {
+        return tComplainDealEvaluateMapper.updateTComplainDealEvaluate(tComplainDealEvaluate);
+    }
+
+    /**
+     * 批量删除燃气投诉处置-评价
+     * 
+     * @param complainDealEvaluateIds 需要删除的燃气投诉处置-评价ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTComplainDealEvaluateByIds(Long[] complainDealEvaluateIds)
+    {
+        return tComplainDealEvaluateMapper.deleteTComplainDealEvaluateByIds(complainDealEvaluateIds);
+    }
+
+    /**
+     * 删除燃气投诉处置-评价信息
+     * 
+     * @param complainDealEvaluateId 燃气投诉处置-评价ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTComplainDealEvaluateById(Long complainDealEvaluateId)
+    {
+        return tComplainDealEvaluateMapper.deleteTComplainDealEvaluateById(complainDealEvaluateId);
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TComplainDealManSysSetServiceImpl.java

+package com.zehong.system.service.impl;
+
+import com.zehong.system.domain.TComplainDealManSysSet;
+import com.zehong.system.mapper.TComplainDealManSysSetMapper;
+import com.zehong.system.service.ITComplainDealManSysSetService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 燃气投诉处置的管理制度维护Service业务层处理
+ * 
+ * @author zehong
+ * @date 2024-06-05
+ */
+@Service
+public class TComplainDealManSysSetServiceImpl implements ITComplainDealManSysSetService 
+{
+    @Autowired
+    private TComplainDealManSysSetMapper tComplainDealManSysSetMapper;
+
+    /**
+     * 查询燃气投诉处置的管理制度维护
+     * 
+     * @param fComplainDealManSysSetId 燃气投诉处置的管理制度维护ID
+     * @return 燃气投诉处置的管理制度维护
+     */
+    @Override
+    public TComplainDealManSysSet selectTComplainDealManSysSetById(Long fComplainDealManSysSetId)
+    {
+        return tComplainDealManSysSetMapper.selectTComplainDealManSysSetById(fComplainDealManSysSetId);
+    }
+
+    /**
+     * 查询燃气投诉处置的管理制度维护列表
+     * 
+     * @param tComplainDealManSysSet 燃气投诉处置的管理制度维护
+     * @return 燃气投诉处置的管理制度维护
+     */
+    @Override
+    public List<TComplainDealManSysSet> selectTComplainDealManSysSetList(TComplainDealManSysSet tComplainDealManSysSet)
+    {
+        return tComplainDealManSysSetMapper.selectTComplainDealManSysSetList(tComplainDealManSysSet);
+    }
+
+    /**
+     * 批量修改
+     * @param tComplainDealManSysSets s
+     */
+    @Override
+    public void batchUpdate(List<TComplainDealManSysSet> tComplainDealManSysSets) {
+        tComplainDealManSysSetMapper.batchUpdate(tComplainDealManSysSets);
+    }
+
+    /**
+     * 新增燃气投诉处置的管理制度维护
+     * 
+     * @param tComplainDealManSysSet 燃气投诉处置的管理制度维护
+     * @return 结果
+     */
+    @Override
+    public int insertTComplainDealManSysSet(TComplainDealManSysSet tComplainDealManSysSet)
+    {
+        return tComplainDealManSysSetMapper.insertTComplainDealManSysSet(tComplainDealManSysSet);
+    }
+
+    /**
+     * 修改燃气投诉处置的管理制度维护
+     * 
+     * @param tComplainDealManSysSet 燃气投诉处置的管理制度维护
+     * @return 结果
+     */
+    @Override
+    public int updateTComplainDealManSysSet(TComplainDealManSysSet tComplainDealManSysSet)
+    {
+        return tComplainDealManSysSetMapper.updateTComplainDealManSysSet(tComplainDealManSysSet);
+    }
+
+    /**
+     * 批量删除燃气投诉处置的管理制度维护
+     * 
+     * @param fComplainDealManSysSetIds 需要删除的燃气投诉处置的管理制度维护ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTComplainDealManSysSetByIds(Long[] fComplainDealManSysSetIds)
+    {
+        return tComplainDealManSysSetMapper.deleteTComplainDealManSysSetByIds(fComplainDealManSysSetIds);
+    }
+
+    /**
+     * 删除燃气投诉处置的管理制度维护信息
+     * 
+     * @param fComplainDealManSysSetId 燃气投诉处置的管理制度维护ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTComplainDealManSysSetById(Long fComplainDealManSysSetId)
+    {
+        return tComplainDealManSysSetMapper.deleteTComplainDealManSysSetById(fComplainDealManSysSetId);
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TComplainDealOverSuperServiceImpl.java

+package com.zehong.system.service.impl;
+
+import com.zehong.common.core.domain.entity.SysUser;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.common.utils.SecurityUtils;
+import com.zehong.system.domain.TComplainDeal;
+import com.zehong.system.domain.TComplainDealOverSuper;
+import com.zehong.system.mapper.TComplainDealMapper;
+import com.zehong.system.mapper.TComplainDealOverSuperMapper;
+import com.zehong.system.service.ITComplainDealOverSuperService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 燃气投诉处置-超时督办Service业务层处理
+ * 
+ * @author zehong
+ * @date 2024-06-13
+ */
+@Service
+public class TComplainDealOverSuperServiceImpl implements ITComplainDealOverSuperService 
+{
+    @Autowired
+    private TComplainDealOverSuperMapper tComplainDealOverSuperMapper;
+
+    @Autowired
+    private TComplainDealMapper tComplainDealMapper;
+
+    /**
+     * 查询燃气投诉处置-超时督办
+     * 
+     * @param complainDealOverSuperId 燃气投诉处置-超时督办ID
+     * @return 燃气投诉处置-超时督办
+     */
+    @Override
+    public TComplainDealOverSuper selectTComplainDealOverSuperById(Long complainDealOverSuperId)
+    {
+        return tComplainDealOverSuperMapper.selectTComplainDealOverSuperById(complainDealOverSuperId);
+    }
+
+    /**
+     * 查询燃气投诉处置-超时督办列表
+     * 
+     * @param tComplainDealOverSuper 燃气投诉处置-超时督办
+     * @return 燃气投诉处置-超时督办
+     */
+    @Override
+    public List<TComplainDealOverSuper> selectTComplainDealOverSuperList(TComplainDealOverSuper tComplainDealOverSuper)
+    {
+        return tComplainDealOverSuperMapper.selectTComplainDealOverSuperList(tComplainDealOverSuper);
+    }
+
+    /**
+     * 新增燃气投诉处置-超时督办
+     * 
+     * @param tComplainDealOverSuper 燃气投诉处置-超时督办
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor= Exception.class)
+    public int insertTComplainDealOverSuper(TComplainDealOverSuper tComplainDealOverSuper)
+    {
+        tComplainDealOverSuper.setOvertimeSupervision("0");
+        tComplainDealOverSuper.setCreateTime(DateUtils.getNowDate());
+        tComplainDealOverSuperMapper.insertTComplainDealOverSuper(tComplainDealOverSuper);
+
+        // 只根据id 修改 状态值
+        TComplainDeal tComplainDeal = new TComplainDeal();
+        tComplainDeal.setComplainDealId(tComplainDealOverSuper.getComplainDealId());
+        tComplainDeal.setOvertimeSupervision("0");
+        return tComplainDealMapper.updateTComplainDeal(tComplainDeal);
+    }
+
+    /**
+     * 修改燃气投诉处置-超时督办
+     * 
+     * @param tComplainDealOverSuper 燃气投诉处置-超时督办
+     * @return 结果
+     */
+    @Override
+    public int updateTComplainDealOverSuper(TComplainDealOverSuper tComplainDealOverSuper)
+    {
+
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        String deptId = user.getDeptId();
+
+        if (!"-2".equals(deptId)) {
+            // 只根据id 修改 状态值
+            TComplainDeal tComplainDeal = new TComplainDeal();
+            tComplainDeal.setComplainDealId(tComplainDealOverSuper.getComplainDealId());
+            if("0".equals(tComplainDealOverSuper.getOvertimeSupervision())) {
+                tComplainDealOverSuper.setOvertimeSupervision("1");
+            }
+            tComplainDeal.setOvertimeSupervision(tComplainDealOverSuper.getOvertimeSupervision());
+            tComplainDealMapper.updateTComplainDeal(tComplainDeal);
+        }
+        return tComplainDealOverSuperMapper.updateTComplainDealOverSuper(tComplainDealOverSuper);
+    }
+
+    /**
+     * 批量删除燃气投诉处置-超时督办
+     * 
+     * @param complainDealOverSuperIds 需要删除的燃气投诉处置-超时督办ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTComplainDealOverSuperByIds(Long[] complainDealOverSuperIds)
+    {
+        return tComplainDealOverSuperMapper.deleteTComplainDealOverSuperByIds(complainDealOverSuperIds);
+    }
+
+    /**
+     * 删除燃气投诉处置-超时督办信息
+     * 
+     * @param complainDealOverSuperId 燃气投诉处置-超时督办ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTComplainDealOverSuperById(Long complainDealOverSuperId)
+    {
+        return tComplainDealOverSuperMapper.deleteTComplainDealOverSuperById(complainDealOverSuperId);
+    }
+
+    /**
+     * 查询燃气投诉处置-超时督办列表-根据处置id 和 状态
+     * @param tComplainDealOverSuper
+     * @return
+     */
+    @Override
+    public TComplainDealOverSuper getOverSuperByComplainDealIdAndStatus(TComplainDealOverSuper tComplainDealOverSuper) {
+        return tComplainDealOverSuperMapper.getOverSuperByComplainDealIdAndStatus(tComplainDealOverSuper);
+    }
+
+    /**
+     * 超时督办确认反馈
+     * @param tComplainDealOverSuper s
+     */
+    @Override
+    @Transactional(rollbackFor= Exception.class)
+    public int overtimeSupervisionFeedbackConfirmation(TComplainDealOverSuper tComplainDealOverSuper) {
+
+        // 只根据id 修改 状态值
+        TComplainDeal tComplainDeal = new TComplainDeal();
+        tComplainDeal.setComplainDealId(tComplainDealOverSuper.getComplainDealId());
+        tComplainDeal.setOvertimeSupervision(tComplainDealOverSuper.getOvertimeSupervision());
+        tComplainDealMapper.updateTComplainDeal(tComplainDeal);
+
+        return tComplainDealOverSuperMapper.updateTComplainDealOverSuper(tComplainDealOverSuper);
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TComplainDealTransferServiceImpl.java

+package com.zehong.system.service.impl;
+
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.core.domain.model.LoginUser;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.common.utils.SecurityUtils;
+import com.zehong.system.domain.TComplainDeal;
+import com.zehong.system.domain.TComplainDealTransfer;
+import com.zehong.system.mapper.TComplainDealMapper;
+import com.zehong.system.mapper.TComplainDealTransferMapper;
+import com.zehong.system.service.ITComplainDealTransferService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 燃气投诉处置-转办记录Service业务层处理
+ * 
+ * @author zehong
+ * @date 2024-06-06
+ */
+@Service
+public class TComplainDealTransferServiceImpl implements ITComplainDealTransferService 
+{
+    @Autowired
+    private TComplainDealTransferMapper tComplainDealTransferMapper;
+
+    @Autowired
+    private TComplainDealMapper tComplainDealMapper;
+
+    /**
+     * 查询燃气投诉处置-转办记录
+     * 
+     * @param complainDealTransferId 燃气投诉处置-转办记录ID
+     * @return 燃气投诉处置-转办记录
+     */
+    @Override
+    public TComplainDealTransfer selectTComplainDealTransferById(Long complainDealTransferId)
+    {
+        return tComplainDealTransferMapper.selectTComplainDealTransferById(complainDealTransferId);
+    }
+
+    /**
+     * 查询燃气投诉处置-转办记录列表
+     * 
+     * @param tComplainDealTransfer 燃气投诉处置-转办记录
+     * @return 燃气投诉处置-转办记录
+     */
+    @Override
+    public List<TComplainDealTransfer> selectTComplainDealTransferList(TComplainDealTransfer tComplainDealTransfer)
+    {
+        return tComplainDealTransferMapper.selectTComplainDealTransferList(tComplainDealTransfer);
+    }
+
+
+    /**
+     * 根据 投诉处置id查询 转办记录列表
+     * @param complainDealId id
+     * @return list
+     */
+    @Override
+    public List<Map<String,Object>> queryComplainDealTransferListByComplainDealId(Long complainDealId) {
+        List<TComplainDealTransfer> tComplainDealTransfers = tComplainDealTransferMapper.queryComplainDealTransferListByComplainDealId(complainDealId);
+
+        List<Map<String,Object>> list = new ArrayList<>();
+        if (tComplainDealTransfers != null && tComplainDealTransfers.size() > 0) {
+            Map<String,Object> item ;
+            for (TComplainDealTransfer tComplainDealTransfer : tComplainDealTransfers) {
+                item = new HashMap<>();
+                String sj = DateUtils.dateTime(tComplainDealTransfer.getCreateTime());
+                item.put("sj",sj);
+
+                List<Map<String,String>> dictList = new ArrayList<>();
+                Map<String,String> dictListItem = new HashMap<>();
+                dictListItem.put("indexCode","enterpriseName");
+                dictListItem.put("label","企业名称");
+                dictList.add(dictListItem);
+                dictListItem = new HashMap<>();
+                dictListItem.put("indexCode","assignMan");
+                dictListItem.put("label","指派人");
+                dictList.add(dictListItem);
+                dictListItem = new HashMap<>();
+                dictListItem.put("indexCode","reasonConcent");
+                dictListItem.put("label","退回原因");
+                dictList.add(dictListItem);
+                item.put("dictList",dictList);
+
+                List<Map<String,String>> rows = new ArrayList<>();
+                Map<String,String> rowsItem = new HashMap<>();
+                rowsItem.put("enterpriseName", tComplainDealTransfer.getEnterpriseName());
+                rowsItem.put("assignMan", tComplainDealTransfer.getComplainAssignMan());
+                rowsItem.put("reasonConcent", tComplainDealTransfer.getReasonConcent());
+                rows.add(rowsItem);
+                item.put("rows",rows);
+                list.add(item);
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 新增燃气投诉处置-转办记录
+     * 
+     * @param tComplainDealTransfer 燃气投诉处置-转办记录
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor= Exception.class)
+    public AjaxResult insertTComplainDealTransfer(TComplainDealTransfer tComplainDealTransfer)
+    {
+
+        if (tComplainDealTransfer.getComplainDealId() == null) {
+            return AjaxResult.error("参数丢失！！！");
+        }
+
+        //先修改数据的状态 改成4  退回状态，并清理 指派单位，指派人
+        TComplainDeal tComplainDeal = new TComplainDeal();
+        tComplainDeal.setComplainDealId(tComplainDealTransfer.getComplainDealId());
+        tComplainDeal.setComplainStatus("4");
+        tComplainDeal.setComplainAssignEnterproseId(null);
+        tComplainDeal.setComplainAssignEnterproseName(null);
+        tComplainDeal.setComplainAssignMan(null);
+        tComplainDeal.setComplainAssignManId(null);
+        tComplainDealMapper.clearTComplainDeal(tComplainDeal);
+
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+
+        //用户的部门id就是 企业id
+        String deptId = loginUser.getUser().getDeptId();
+        tComplainDealTransfer.setEnterpriseId(deptId);
+
+        tComplainDealTransfer.setCreateBy(loginUser.getUsername());
+        tComplainDealTransfer.setCreateTime(DateUtils.getNowDate());
+        return AjaxResult.success(tComplainDealTransferMapper.insertTComplainDealTransfer(tComplainDealTransfer));
+    }
+
+    /**
+     * 修改燃气投诉处置-转办记录
+     * 
+     * @param tComplainDealTransfer 燃气投诉处置-转办记录
+     * @return 结果
+     */
+    @Override
+    public int updateTComplainDealTransfer(TComplainDealTransfer tComplainDealTransfer)
+    {
+        return tComplainDealTransferMapper.updateTComplainDealTransfer(tComplainDealTransfer);
+    }
+
+    /**
+     * 批量删除燃气投诉处置-转办记录
+     * 
+     * @param complainDealTransferIds 需要删除的燃气投诉处置-转办记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTComplainDealTransferByIds(Long[] complainDealTransferIds)
+    {
+        return tComplainDealTransferMapper.deleteTComplainDealTransferByIds(complainDealTransferIds);
+    }
+
+    /**
+     * 删除燃气投诉处置-转办记录信息
+     * 
+     * @param complainDealTransferId 燃气投诉处置-转办记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTComplainDealTransferById(Long complainDealTransferId)
+    {
+        return tComplainDealTransferMapper.deleteTComplainDealTransferById(complainDealTransferId);
+    }
+}

zh-baseversion-system/src/main/resources/mapper/system/TComplainDealEvaluateMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TComplainDealEvaluateMapper">
+    
+    <resultMap type="TComplainDealEvaluate" id="TComplainDealEvaluateResult">
+        <result property="complainDealEvaluateId"    column="complain_deal_evaluate_id"    />
+        <result property="evaluateContent"    column="evaluate_content"    />
+        <result property="evaluateRate"    column="evaluate_rate"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="complainDealId"    column="complain_deal_id"    />
+    </resultMap>
+
+    <sql id="selectTComplainDealEvaluateVo">
+        select complain_deal_evaluate_id, evaluate_content, evaluate_rate, create_by, create_time,complain_deal_id from t_complain_deal_evaluate
+    </sql>
+
+    <select id="selectTComplainDealEvaluateList" parameterType="TComplainDealEvaluate" resultMap="TComplainDealEvaluateResult">
+        <include refid="selectTComplainDealEvaluateVo"/>
+        <where>  
+            <if test="evaluateContent != null  and evaluateContent != ''"> and evaluate_content = #{evaluateContent}</if>
+            <if test="evaluateRate != null  and evaluateRate != ''"> and evaluate_rate = #{evaluateRate}</if>
+        </where>
+    </select>
+    
+    <select id="selectTComplainDealEvaluateById" parameterType="Long" resultMap="TComplainDealEvaluateResult">
+        <include refid="selectTComplainDealEvaluateVo"/>
+        where complain_deal_evaluate_id = #{complainDealEvaluateId}
+    </select>
+    <select id="selectTComplainDealEvaluateByComplainDealId" parameterType="Long" resultMap="TComplainDealEvaluateResult">
+        <include refid="selectTComplainDealEvaluateVo"/>
+        where complain_deal_id = #{complainDealId}
+    </select>
+        
+    <insert id="insertTComplainDealEvaluate" parameterType="TComplainDealEvaluate" useGeneratedKeys="true" keyProperty="complainDealEvaluateId">
+        insert into t_complain_deal_evaluate
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="evaluateContent != null and evaluateContent != ''">evaluate_content,</if>
+            <if test="evaluateRate != null">evaluate_rate,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="complainDealId != null">complain_deal_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="evaluateContent != null and evaluateContent != ''">#{evaluateContent},</if>
+            <if test="evaluateRate != null">#{evaluateRate},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="complainDealId != null">#{complainDealId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTComplainDealEvaluate" parameterType="TComplainDealEvaluate">
+        update t_complain_deal_evaluate
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="evaluateContent != null and evaluateContent != ''">evaluate_content = #{evaluateContent},</if>
+            <if test="evaluateRate != null">evaluate_rate = #{evaluateRate},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="complainDealId != null">complain_deal_id = #{complainDealId},</if>
+        </trim>
+        where complain_deal_evaluate_id = #{complainDealEvaluateId}
+    </update>
+
+    <delete id="deleteTComplainDealEvaluateById" parameterType="Long">
+        delete from t_complain_deal_evaluate where complain_deal_evaluate_id = #{complainDealEvaluateId}
+    </delete>
+
+    <delete id="deleteTComplainDealEvaluateByIds" parameterType="String">
+        delete from t_complain_deal_evaluate where complain_deal_evaluate_id in 
+        <foreach item="complainDealEvaluateId" collection="array" open="(" separator="," close=")">
+            #{complainDealEvaluateId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

zh-baseversion-system/src/main/resources/mapper/system/TComplainDealManSysSetMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TComplainDealManSysSetMapper">
+
+    <resultMap type="TComplainDealManSysSet" id="TComplainDealManSysSetResult">
+        <result property="fComplainDealManSysSetId"    column="f_complain_deal_man_sys_set_id"    />
+        <result property="fType"    column="f_type"    />
+        <result property="fDay"    column="f_day"    />
+        <result property="fHours"    column="f_hours"    />
+        <result property="fMinutes"    column="f_minutes"    />
+        <result property="fSeconds"    column="f_seconds"    />
+        <result property="fRemarks"    column="f_remarks"    />
+    </resultMap>
+
+    <sql id="selectTComplainDealManSysSetVo">
+        select f_complain_deal_man_sys_set_id, f_type, f_day, f_hours, f_minutes, f_seconds, f_remarks from t_complain_deal_man_sys_set
+    </sql>
+
+    <select id="selectTComplainDealManSysSetList" parameterType="TComplainDealManSysSet" resultMap="TComplainDealManSysSetResult">
+        <include refid="selectTComplainDealManSysSetVo"/>
+        <where>
+            <if test="fType != null  and fType != ''"> and f_type = #{fType}</if>
+            <if test="fDay != null "> and f_day = #{fDay}</if>
+            <if test="fHours != null "> and f_hours = #{fHours}</if>
+            <if test="fMinutes != null "> and f_minutes = #{fMinutes}</if>
+            <if test="fSeconds != null "> and f_seconds = #{fSeconds}</if>
+            <if test="fRemarks != null  and fRemarks != ''"> and f_remarks = #{fRemarks}</if>
+        </where>
+        order by f_complain_deal_man_sys_set_id asc
+    </select>
+
+    <select id="selectTComplainDealManSysSetById" parameterType="Long" resultMap="TComplainDealManSysSetResult">
+        <include refid="selectTComplainDealManSysSetVo"/>
+        where f_complain_deal_man_sys_set_id = #{fComplainDealManSysSetId}
+    </select>
+
+    <insert id="insertTComplainDealManSysSet" parameterType="TComplainDealManSysSet" useGeneratedKeys="true" keyProperty="fComplainDealManSysSetId">
+        insert into t_complain_deal_man_sys_set
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fType != null and fType != ''">f_type,</if>
+            <if test="fDay != null">f_day,</if>
+            <if test="fHours != null">f_hours,</if>
+            <if test="fMinutes != null">f_minutes,</if>
+            <if test="fSeconds != null">f_seconds,</if>
+            <if test="fRemarks != null">f_remarks,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fType != null and fType != ''">#{fType},</if>
+            <if test="fDay != null">#{fDay},</if>
+            <if test="fHours != null">#{fHours},</if>
+            <if test="fMinutes != null">#{fMinutes},</if>
+            <if test="fSeconds != null">#{fSeconds},</if>
+            <if test="fRemarks != null">#{fRemarks},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTComplainDealManSysSet" parameterType="TComplainDealManSysSet">
+        update t_complain_deal_man_sys_set
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fType != null and fType != ''">f_type = #{fType},</if>
+            <if test="fDay != null">f_day = #{fDay},</if>
+            <if test="fHours != null">f_hours = #{fHours},</if>
+            <if test="fMinutes != null">f_minutes = #{fMinutes},</if>
+            <if test="fSeconds != null">f_seconds = #{fSeconds},</if>
+            <if test="fRemarks != null">f_remarks = #{fRemarks},</if>
+        </trim>
+        where f_complain_deal_man_sys_set_id = #{fComplainDealManSysSetId}
+    </update>
+    <update id="batchUpdate" parameterType="list">
+        <foreach collection="complainDealManSysSets" item="item" separator=";">
+            UPDATE t_complain_deal_man_sys_set
+            SET f_day = #{item.fDay},
+                f_hours = #{item.fHours},
+                f_minutes = #{item.fMinutes},
+                f_seconds = #{item.fSeconds},
+            f_remarks = #{item.fRemarks}
+            WHERE f_complain_deal_man_sys_set_id = #{item.fComplainDealManSysSetId}
+        </foreach>
+    </update>
+
+    <delete id="deleteTComplainDealManSysSetById" parameterType="Long">
+        delete from t_complain_deal_man_sys_set where f_complain_deal_man_sys_set_id = #{fComplainDealManSysSetId}
+    </delete>
+
+    <delete id="deleteTComplainDealManSysSetByIds" parameterType="String">
+        delete from t_complain_deal_man_sys_set where f_complain_deal_man_sys_set_id in
+        <foreach item="fComplainDealManSysSetId" collection="array" open="(" separator="," close=")">
+            #{fComplainDealManSysSetId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

zh-baseversion-system/src/main/resources/mapper/system/TComplainDealMapper.xml

@@ -23,10 +23,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="isDel"    column="is_del"    />
         <result property="remarks"    column="remarks"    />
+        <result property="provincialDataFlag"    column="provincial_data_flag" />
+        <result property="complainType"    column="complain_type" />
+        <result property="overtimeSupervision"    column="overtime_supervision" />
+        <result property="township"    column="township" />
     </resultMap>
 
     <sql id="selectTComplainDealVo">
-        select complain_deal_id, complain_name, complain_phone, complain_matter, transfer_record, deal_time,deal_condition, complain_assign_enterprose_name, complain_assign_enterprose_id, complain_assign_man_id, complain_assign_man, complain_status, create_by, create_time, update_by, update_time, is_del, remarks from t_complain_deal
+        select complain_deal_id,
+               complain_name,
+               complain_phone,
+               complain_matter,
+               transfer_record,
+               deal_time,
+               deal_condition,
+               complain_assign_enterprose_name,
+               complain_assign_enterprose_id,
+               complain_assign_man_id,
+               complain_assign_man,
+               complain_status,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               is_del,
+               remarks,provincial_data_flag,complain_type,overtime_supervision,township from t_complain_deal
     </sql>
 
     <select id="selectTComplainDealList" parameterType="TComplainDeal" resultMap="TComplainDealResult">
@@ -44,6 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="complainStatus != null  and complainStatus != ''"> and complain_status = #{complainStatus}</if>
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="provincialDataFlag != null  and provincialDataFlag != ''"> and provincial_data_flag = #{provincialDataFlag}</if>
+            <if test="complainType != null  and complainType != ''"> and complain_type = #{complainType}</if>
+            <if test="overtimeSupervision != null  and overtimeSupervision != ''"> and overtime_supervision = #{overtimeSupervision}</if>
+            <if test="township != null  and township != ''"> and township = #{township}</if>
         </where>
         order by create_time desc
     </select>
@@ -59,6 +84,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from (select * from t_complain_deal where is_del = '0') t
     </select>
 
+    <select id="queryAllByNotDelete" resultMap="TComplainDealResult">
+        <include refid="selectTComplainDealVo"/>
+        where is_del = '0'
+    </select>
+    <select id="queryAllByNotDeleteAndCreateTime" resultType="com.zehong.system.domain.dto.TComplainDealDTO">
+        select complain_deal_id as complainDealId,complain_status as complainStatus ,create_time as createTime, update_time as updateTime,MONTH(create_time) as createTimeYear ,complain_type as complainType from t_complain_deal
+        where is_del = '0'
+        <if test="startOfMonth != null and  endOfMonth != null">
+            and create_time  <![CDATA[>=]]> #{startOfMonth} and create_time  <![CDATA[<=]]> #{endOfMonth}
+        </if>
+        <if test="complaintCategory != null and complaintCategory != '' and complaintCategory != 0 ">
+            and complain_type = #{complaintCategory}
+        </if>
+        order by create_time asc
+    </select>
+
     <insert id="insertTComplainDeal" parameterType="TComplainDeal" useGeneratedKeys="true" keyProperty="complainDealId">
         insert into t_complain_deal
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -79,6 +120,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="isDel != null">is_del,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="provincialDataFlag != null">provincial_data_flag,</if>
+            <if test="complainType != null">complain_type,</if>
+            <if test="overtimeSupervision != null">overtime_supervision,</if>
+            <if test="township != null">township,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="complainName != null">#{complainName},</if>
@@ -98,9 +143,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="provincialDataFlag != null">#{provincialDataFlag},</if>
+            <if test="complainType != null">#{complainType},</if>
+            <if test="overtimeSupervision != null">#{overtimeSupervision},</if>
+            <if test="township != null">#{township},</if>
          </trim>
     </insert>
 
+    <update id="clearTComplainDeal" parameterType="TComplainDeal">
+        update t_complain_deal set complain_assign_enterprose_name = null,
+                                   complain_assign_enterprose_id = null,
+                                   complain_assign_man_id = null,
+                                   complain_assign_man = null,
+                                   complain_status = #{complainStatus}
+        where complain_deal_id = #{complainDealId}
+    </update>
+
     <update id="updateTComplainDeal" parameterType="TComplainDeal">
         update t_complain_deal
         <trim prefix="SET" suffixOverrides=",">
@@ -121,6 +179,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="provincialDataFlag != null">provincial_data_flag = #{provincialDataFlag},</if>
+            <if test="complainType != null">complain_type = #{complainType},</if>
+            <if test="overtimeSupervision != null">overtime_supervision = #{overtimeSupervision},</if>
+            <if test="township != null">township = #{township},</if>
         </trim>
         where complain_deal_id = #{complainDealId}
     </update>

zh-baseversion-system/src/main/resources/mapper/system/TComplainDealOverSuperMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TComplainDealOverSuperMapper">
+    
+    <resultMap type="TComplainDealOverSuper" id="TComplainDealOverSuperResult">
+        <result property="complainDealOverSuperId"    column="complain_deal_over_super_id"    />
+        <result property="complainDealId"    column="complain_deal_id"    />
+        <result property="supervisionReasons"    column="supervision_reasons"    />
+        <result property="concent"    column="concent"    />
+        <result property="overtimeSupervision"    column="overtime_supervision"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectTComplainDealOverSuperVo">
+        select complain_deal_over_super_id, complain_deal_id, supervision_reasons, concent, overtime_supervision, create_by, create_time from t_complain_deal_over_super
+    </sql>
+
+    <select id="selectTComplainDealOverSuperList" parameterType="TComplainDealOverSuper" resultMap="TComplainDealOverSuperResult">
+        <include refid="selectTComplainDealOverSuperVo"/>
+        <where>  
+            <if test="complainDealId != null "> and complain_deal_id = #{complainDealId}</if>
+            <if test="supervisionReasons != null  and supervisionReasons != ''"> and supervision_reasons = #{supervisionReasons}</if>
+            <if test="concent != null  and concent != ''"> and concent = #{concent}</if>
+            <if test="overtimeSupervision != null  and overtimeSupervision != ''"> and overtime_supervision = #{overtimeSupervision}</if>
+        </where>
+    </select>
+    
+    <select id="selectTComplainDealOverSuperById" parameterType="Long" resultMap="TComplainDealOverSuperResult">
+        <include refid="selectTComplainDealOverSuperVo"/>
+        where complain_deal_over_super_id = #{complainDealOverSuperId}
+    </select>
+    <select id="getOverSuperByComplainDealIdAndStatus" resultMap="TComplainDealOverSuperResult">
+        <include refid="selectTComplainDealOverSuperVo"/>
+        where complain_deal_id= #{complainDealId} and overtime_supervision = #{overtimeSupervision}
+    </select>
+        
+    <insert id="insertTComplainDealOverSuper" parameterType="TComplainDealOverSuper" useGeneratedKeys="true" keyProperty="complainDealOverSuperId">
+        insert into t_complain_deal_over_super
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="complainDealId != null">complain_deal_id,</if>
+            <if test="supervisionReasons != null">supervision_reasons,</if>
+            <if test="concent != null">concent,</if>
+            <if test="overtimeSupervision != null">overtime_supervision,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="complainDealId != null">#{complainDealId},</if>
+            <if test="supervisionReasons != null">#{supervisionReasons},</if>
+            <if test="concent != null">#{concent},</if>
+            <if test="overtimeSupervision != null">#{overtimeSupervision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTComplainDealOverSuper" parameterType="TComplainDealOverSuper">
+        update t_complain_deal_over_super
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="complainDealId != null">complain_deal_id = #{complainDealId},</if>
+            <if test="supervisionReasons != null">supervision_reasons = #{supervisionReasons},</if>
+            <if test="concent != null">concent = #{concent},</if>
+            <if test="overtimeSupervision != null">overtime_supervision = #{overtimeSupervision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where complain_deal_over_super_id = #{complainDealOverSuperId}
+    </update>
+
+    <delete id="deleteTComplainDealOverSuperById" parameterType="Long">
+        delete from t_complain_deal_over_super where complain_deal_over_super_id = #{complainDealOverSuperId}
+    </delete>
+
+    <delete id="deleteTComplainDealOverSuperByIds" parameterType="String">
+        delete from t_complain_deal_over_super where complain_deal_over_super_id in 
+        <foreach item="complainDealOverSuperId" collection="array" open="(" separator="," close=")">
+            #{complainDealOverSuperId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

zh-baseversion-system/src/main/resources/mapper/system/TComplainDealTransferMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TComplainDealTransferMapper">
+    
+    <resultMap type="TComplainDealTransfer" id="TComplainDealTransferResult">
+        <result property="complainDealTransferId"    column="complain_deal_transfer_id"    />
+        <result property="complainDealId"    column="complain_deal_id"    />
+        <result property="enterpriseId"    column="enterprise_id"    />
+        <result property="enterpriseName"    column="enterprise_name"    />
+        <result property="complainAssignManId"    column="complain_assign_man_id"    />
+        <result property="complainAssignMan"    column="complain_assign_man"    />
+        <result property="reasonConcent"    column="reason_concent"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectTComplainDealTransferVo">
+        select
+            t.complain_deal_transfer_id,
+            t.complain_deal_id,
+            t.enterprise_id,
+            i.enterprise_name,
+            t.complain_assign_man_id,
+            t.complain_assign_man,
+            t.reason_concent,
+            t.create_by,
+            t.create_time from t_complain_deal_transfer t left join t_enterprise_info i on t.enterprise_id = i.enterprise_id
+    </sql>
+
+    <select id="selectTComplainDealTransferList" parameterType="TComplainDealTransfer" resultMap="TComplainDealTransferResult">
+        <include refid="selectTComplainDealTransferVo"/>
+        <where>  
+            <if test="complainDealId != null "> and complain_deal_id = #{complainDealId}</if>
+            <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="reasonConcent != null  and reasonConcent != ''"> and reason_concent = #{reasonConcent}</if>
+        </where>
+    </select>
+    
+    <select id="selectTComplainDealTransferById" parameterType="Long" resultMap="TComplainDealTransferResult">
+        <include refid="selectTComplainDealTransferVo"/>
+        where complain_deal_transfer_id = #{complainDealTransferId}
+    </select>
+    <select id="queryComplainDealTransferListByComplainDealId" resultMap="TComplainDealTransferResult">
+        <include refid="selectTComplainDealTransferVo"/>
+        where complain_deal_id = #{complainDealId}
+    </select>
+        
+    <insert id="insertTComplainDealTransfer" parameterType="TComplainDealTransfer" useGeneratedKeys="true" keyProperty="complainDealTransferId">
+        insert into t_complain_deal_transfer
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="complainDealId != null">complain_deal_id,</if>
+            <if test="enterpriseId != null and enterpriseId != ''">enterprise_id,</if>
+            <if test="enterpriseName != null">enterprise_name,</if>
+            <if test="reasonConcent != null">reason_concent,</if>
+            <if test="complainAssignManId != null">complain_assign_man_id,</if>
+            <if test="complainAssignMan != null">complain_assign_man,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="complainDealId != null">#{complainDealId},</if>
+            <if test="enterpriseId != null and enterpriseId != ''">#{enterpriseId},</if>
+            <if test="enterpriseName != null">#{enterpriseName},</if>
+            <if test="reasonConcent != null">#{reasonConcent},</if>
+            <if test="complainAssignManId != null">#{complainAssignManId},</if>
+            <if test="complainAssignMan != null">#{complainAssignMan},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTComplainDealTransfer" parameterType="TComplainDealTransfer">
+        update t_complain_deal_transfer
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="complainDealId != null">complain_deal_id = #{complainDealId},</if>
+            <if test="enterpriseId != null and enterpriseId != ''">enterprise_id = #{enterpriseId},</if>
+            <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
+
+            <if test="complainAssignManId != null">enterprise_id = #{complainAssignManId},</if>
+            <if test="complainAssignMan != null">enterprise_name = #{complainAssignMan},</if>
+
+            <if test="reasonConcent != null">reason_concent = #{reasonConcent},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where complain_deal_transfer_id = #{complainDealTransferId}
+    </update>
+
+    <delete id="deleteTComplainDealTransferById" parameterType="Long">
+        delete from t_complain_deal_transfer where complain_deal_transfer_id = #{complainDealTransferId}
+    </delete>
+
+    <delete id="deleteTComplainDealTransferByIds" parameterType="String">
+        delete from t_complain_deal_transfer where complain_deal_transfer_id in 
+        <foreach item="complainDealTransferId" collection="array" open="(" separator="," close=")">
+            #{complainDealTransferId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

zh-baseversion-web/src/api/complainDeal/complainDeal.js

@@ -58,3 +58,132 @@ export function getUserList(cId) {
     method: 'get'
   })
 }
+
+export function getComplainDealManSysSet() {
+  return request({
+    url: '/complainDeal/set/list',
+    method: 'get'
+  })
+}
+
+
+export function batchUpdateComplainDealManSysSet(data) {
+  return request({
+    url: '/complainDeal/set/batchUpdate' ,
+    method: 'post',
+    data: data
+  })
+}
+
+
+export function addComplainTransFer(data) {
+  return request({
+    url: '/complainDeal/transfer' ,
+    method: 'post',
+    data: data
+  })
+}
+
+
+export function listComplainTransFer(complainDealId) {
+  return request({
+    url: '/complainDeal/transfer/queryByComplainDealId/' + complainDealId ,
+    method: 'get'
+  })
+}
+
+export function addComplainEvaluate(data) {
+  return request({
+    url: '/complainDeal/evaluate' ,
+    method: 'post',
+    data: data
+  })
+}
+
+export function updateComplainEvaluate(data) {
+  return request({
+    url: '/complainDeal/evaluate' ,
+    method: 'put',
+    data: data
+  })
+}
+
+export function getComplainEvaluateByComplainDealId(complainDealId) {
+  return request({
+    url: '/complainDeal/evaluate/getByComplainDealId/' + complainDealId ,
+    method: 'get'
+  })
+}
+
+
+export function complainDealSummaryAnalysisMethod() {
+  return request({
+    url: '/complainDeal/complainDealSummaryAnalysisMethod' ,
+    method: 'get'
+  })
+}
+
+
+export function complainDealSummaryAnalysisMethodTableViews(query) {
+  return request({
+    url: '/complainDeal/complainDealSummaryAnalysisMethodTableViews' ,
+    method: 'get',
+    params: query
+  })
+}
+
+
+export function complainDealSummaryAnalysisExport(data) {
+    return request({
+      url: '/complainDeal/complainDealSummaryAnalysisExport' ,
+      method: 'post',
+      data: data,
+      responseType:'blob'
+    })
+}
+
+// 根据 投诉 id 和 督办状态查询数据
+export function getOverSuperByComplainDealIdAndStatus(query) {
+  return request({
+    url: '/complainDeal/super/getOverSuperByComplainDealIdAndStatus' ,
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增-超时督办
+export function addComplainDealOverSuper(data) {
+  return request({
+    url: '/complainDeal/super' ,
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改-超时督办
+export function updateComplainDealOverSuper(data) {
+  return request({
+    url: '/complainDeal/super' ,
+    method: 'put',
+    data: data
+  })
+}
+
+
+// 超时督办 反馈确认
+export function overtimeSupervisionFeedbackConfirmationMethod(data) {
+  return request({
+    url: '/complainDeal/super/overtimeSupervisionFeedbackConfirmation' ,
+    method: 'post',
+    data: data
+  })
+}
+
+// 历史督办记录
+export function historyOvertimeSupervisionListMethod(query) {
+  return request({
+    url: '/complainDeal/super/listNoPage' ,
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

zh-baseversion-web/src/api/system/baseExportTemp.js

+import request from '@/utils/request'
+
+// 查询ureport2模板管理列表
+export function listBaseExportTemp(query) {
+  return request({
+    url: '/base/baseExportTemp/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询ureport2模板管理详细
+export function getBaseExportTemp(id) {
+  return request({
+    url: '/base/baseExportTemp/' + id,
+    method: 'get'
+  })
+}
+
+// 新增ureport2模板管理
+export function addBaseExportTemp(data) {
+  return request({
+    url: '/base/baseExportTemp',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改ureport2模板管理
+export function updateBaseExportTemp(data) {
+  return request({
+    url: '/base/baseExportTemp',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除ureport2模板管理
+export function delBaseExportTemp(id) {
+  return request({
+    url: '/base/baseExportTemp/' + id,
+    method: 'delete'
+  })
+}
+// 新增或编辑模板
+export function addTemp(query) {
+  return request({
+    url: '/base/baseExportTemp/addTemp',
+    method: 'get',
+    params: query
+  })
+}
+// 新增或编辑模板
+export function editTemp(id) {
+  return request({
+    url: '/base/baseExportTemp/editTemp/'+id,
+    method: 'get'
+  })
+}
+// 预览模板
+export function previwTemp(id) {
+  return request({
+    url: '/base/baseExportTemp/previwTemp/'+id,
+    method: 'get'
+  })
+}
+// 业务预览模板
+export function businessPreviwTemp(query) {
+  return request({
+    url: '/base/baseExportTemp/businessPreviwTemp',
+    method: 'get',
+    params:query
+  })
+}
+// 业务---导出Excel
+export function businessExportExcel(query) {
+  return request({
+    url: '/base/baseExportTemp/businessExportExcel',
+    method: 'get',
+    params:query
+  })
+}
\ No newline at end of file