企业端-投诉事项查询列表更新

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseComplaintController.java

@@ -2,6 +2,7 @@ package com.zdxt.enforcementcode.controller.app.enterprise;
 
 import com.zdxt.enforcementcode.domain.bo.MssqOrderFlowBo;
 import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseComplaintBo;
+import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnforcementRegistrationVo;
 import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnterpriseComplaintVo;
 import com.zdxt.enforcementcode.service.enterprise.IAppEnterpriseComplaintService;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -76,9 +77,9 @@ public class AppEnterpriseComplaintController extends BaseController {
      */
     @ApiResponse(description = "投诉建议-行政和非行政未被投诉列表")
     @GetMapping("/listNotComplaint")
-    public TableDataInfo<AppEnterpriseComplaintVo> listNotComplaint(@ModelAttribute AppEnterpriseComplaintBo bo, PageQuery pageQuery) {
+    public TableDataInfo<AppEnforcementRegistrationVo> listNotComplaint(@ModelAttribute AppEnterpriseComplaintBo bo, PageQuery pageQuery) {
         // 校验企业信用代码
-        TableDataInfo<AppEnterpriseComplaintVo> list = appEnterpriseComplaintService.getAllCheckList(bo, pageQuery);
+        TableDataInfo<AppEnforcementRegistrationVo> list = appEnterpriseComplaintService.getAllCheckList(bo, pageQuery);
         return list;
     }
 

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/AppEnforcementRegistrationVo.java

@@ -362,4 +362,30 @@ public class AppEnforcementRegistrationVo implements Serializable {
 
     @ExcelProperty(value = "文件列表")
     private List<ZdxtFileVo> fileList;
+
+    /**
+     * 其他执法人员ID
+     */
+    private String lawEnforcerOtherId;
+
+    /**
+     * 其他执法人员
+     */
+
+    private String lawEnforcerOther;
+
+    /**
+     * 执法事项内容
+     */
+    private String title;
+
+    /**
+     * 任务来源
+     */
+    private String lawEnforcementType;
+
+    /**
+     * 数据类型
+     */
+    private  Integer dataType;
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppEnterpriseComplaintMapper.java

@@ -2,6 +2,7 @@ package com.zdxt.enforcementcode.mapper.enterprise;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zdxt.enforcementcode.domain.EnterpriseComplaint;
+import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnforcementRegistrationVo;
 import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnterpriseComplaintVo;
 import org.apache.ibatis.annotations.Param;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -21,14 +22,14 @@ public interface AppEnterpriseComplaintMapper extends BaseMapperPlus<EnterpriseC
      * @param deptList 部门ID列表
      * @return 检查结果列表
      */
-    List<AppEnterpriseComplaintVo> selectAllCheckList(
+    List<AppEnforcementRegistrationVo> selectAllCheckList(
         @Param("enterpriseNumber") String enterpriseNumber,
         @Param("searchValue") String searchValue,
         @Param("checkCategoryCode") String checkCategoryCode,
         @Param("beginTime") Date beginTime,
         @Param("endTime") Date endTime,
         @Param("deptList") List<String> deptList,
-        Page<AppEnterpriseComplaintVo> page
+        Page<AppEnforcementRegistrationVo> page
     );
 
     /**

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseComplaintService.java

@@ -3,6 +3,7 @@ package com.zdxt.enforcementcode.service.enterprise;
 import com.zdxt.enforcementcode.domain.bo.EnterpriseComplaintBo;
 import com.zdxt.enforcementcode.domain.bo.MssqOrderFlowBo;
 import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseComplaintBo;
+import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnforcementRegistrationVo;
 import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnterpriseComplaintVo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -63,7 +64,7 @@ public interface IAppEnterpriseComplaintService {
      * @param pageQuery 分页参数
      * @return 分页结果
      */
-    TableDataInfo<AppEnterpriseComplaintVo> getAllCheckList(AppEnterpriseComplaintBo bo, PageQuery pageQuery);
+    TableDataInfo<AppEnforcementRegistrationVo> getAllCheckList(AppEnterpriseComplaintBo bo, PageQuery pageQuery);
 
     /**
      * 企业端-查询投诉建议处理进度

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java

@@ -14,6 +14,7 @@ import com.zdxt.enforcementcode.domain.bo.MssqAddOrderBo;
 import com.zdxt.enforcementcode.domain.bo.MssqOrderFlowBo;
 import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseComplaintBo;
 import com.zdxt.enforcementcode.domain.vo.ZdxtFileVo;
+import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnforcementRegistrationVo;
 import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnterpriseComplaintVo;
 import com.zdxt.enforcementcode.mapper.EnterpriseInformationMapper;
 import com.zdxt.enforcementcode.mapper.ZdxtFileMapper;
@@ -201,7 +202,7 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain
      * @return 投诉建议列表
      */
     @Override
-    public TableDataInfo<AppEnterpriseComplaintVo> getAllCheckList(AppEnterpriseComplaintBo bo, PageQuery pageQuery) {
+    public TableDataInfo<AppEnforcementRegistrationVo> getAllCheckList(AppEnterpriseComplaintBo bo, PageQuery pageQuery) {
 
         //根据部门查询 企业统一社会信用代码
         String deptId=LoginHelper.getDeptId();
@@ -225,8 +226,8 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain
         String checkCategoryCode = processSearchValue(bo.getSearchValue(), checkCategoryMap);
 
         // 4. 调用 Mapper 查询数据库
-        Page<AppEnterpriseComplaintVo> page = pageQuery.build();
-        List<AppEnterpriseComplaintVo> list = baseMapper.selectAllCheckList(
+        Page<AppEnforcementRegistrationVo> page = pageQuery.build();
+        List<AppEnforcementRegistrationVo> list = baseMapper.selectAllCheckList(
             bo.getEnterpriseNumber(),
             bo.getSearchValue(),
             checkCategoryCode,
@@ -236,25 +237,7 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain
             page
         );
 
-        // 5. 设置总数
-        Long total = baseMapper.countAllCheckList(
-            bo.getEnterpriseNumber(),
-            bo.getSearchValue(),
-            checkCategoryCode,
-            bo.getBeginTime(),
-            bo.getEndTime(),
-            deptList
-        );
-        page.setRecords(list);
-        page.setTotal(total);
-
-        // 6. 对返回数据进行转换
-        List<AppEnterpriseComplaintVo> records = page.getRecords();
-        if (records != null && !records.isEmpty()) {
-            convertResultData(records, checkCategoryMap);
-        }
-
-        return TableDataInfo.build(page);
+        return TableDataInfo.build(list);
     }
 
     /**
@@ -373,42 +356,7 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain
         return null;
     }
 
-    /**
-     * 转换结果数据
-     * @param records 查询结果列表
-     * @param checkCategoryMap 执法类别字典映射
-     */
-    private void convertResultData(List<AppEnterpriseComplaintVo> records, Map<String, String> checkCategoryMap) {
-        for (AppEnterpriseComplaintVo vo : records) {
-            // 执法类别代码 → 中文名称
-            if (StringUtils.isNotBlank(vo.getCheckCategoryCode()) && checkCategoryMap.containsKey(vo.getCheckCategoryCode())) {
-                vo.setCheckCategoryCode(checkCategoryMap.get(vo.getCheckCategoryCode()));
-            }
-
-            // 执法人员ID → 姓名+执法证号/加密手机号
-            if (StringUtils.isNotBlank(vo.getLawEnforcerId())) {
-                vo.setLinkman(formatLawEnforcer(vo.getLawEnforcerId(), vo.getLinkman(), vo.getLinkmanTel()));
-            }
-
-            // 其他执法人员ID → 姓名+证件号列表
-            if (StringUtils.isNotBlank(vo.getLawEnforcerIdTwo())) {
-                List<String> enforcerList = formatOtherLawEnforcers(
-                    vo.getLawEnforcerIdTwo(),
-                    vo.getLawEnforcerTwo(),
-                    vo.getLinkmanTelTwo()
-                );
-                vo.setLawEnforcer2List(enforcerList);
-            }
 
-            // 查询附件列表
-            if (vo.getId() != null) {
-                LambdaQueryWrapper<ZdxtFile> fileLqw = Wrappers.lambdaQuery();
-                fileLqw.eq(ZdxtFile::getBusinessId, vo.getId());
-                List<ZdxtFileVo> fileList = zdxtFileMapper.selectVoList(fileLqw);
-                vo.setFileList(fileList);
-            }
-        }
-    }
 
     /**
      * 格式化执法人员信息

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/AppEnterpriseComplaintMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zdxt.enforcementcode.mapper.enterprise.AppEnterpriseComplaintMapper">
 
     <!-- 查询行政和非行政未被投诉的检查记录列表 -->
-    <select id="selectAllCheckList" resultType="com.zdxt.enforcementcode.domain.vo.enterprise.AppEnterpriseComplaintVo">
+    <select id="selectAllCheckList" resultType="com.zdxt.enforcementcode.domain.vo.enterprise.AppEnforcementRegistrationVo">
         SELECT * FROM (
             <!-- 行政检查 -->
             SELECT