调整

epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/form/JiMuReportFormDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.commons.feignclient.dtos.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/8/8 15:08
+ * @DESC
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class JiMuReportFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3590609549416867701L;
+
+    /**
+     * 报表IDs
+     */
+    private List<String> reportIds;
+
+    /**
+     * 类别
+     */
+    private List<String> categoryKeys;
+}

epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/result/JiMuReportResultDTO.java

@@ -0,0 +1,22 @@
+package com.epmet.commons.feignclient.dtos.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/8/8 15:10
+ * @DESC
+ */
+@Data
+public class JiMuReportResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -4048477731892329569L;
+
+    private String code;
+
+    private String name;
+
+    private String id;
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/ReportListFormDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/8/8 15:16
+ * @DESC
+ */
+@Data
+public class ReportListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -4459838228433571457L;
+
+    private List<String> categoryKeys;
+}

epmet-module/oper-customize/oper-customize-server/pom.xml

@@ -22,6 +22,11 @@
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-feignclient</artifactId>
+            <version>2.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-mybatis</artifactId>

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcCustomerReportController.java

@@ -1,11 +1,13 @@
 package com.epmet.controller;
 
+import com.epmet.commons.feignclient.dtos.result.JiMuReportResultDTO;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.PreviewReportFormDTO;
 import com.epmet.dto.form.ReportEditFormDTO;
+import com.epmet.dto.form.ReportListFormDTO;
 import com.epmet.dto.result.PreviewReportResDTO;
 import com.epmet.dto.result.ReportResultDTO;
 import com.epmet.service.IcCustomerReportService;
@@ -70,4 +72,15 @@ public class IcCustomerReportController {
         return new Result();
     }
 
+    /**
+     * Desc: 居民信息/房屋信息-查询报表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/8/8 15:20
+     */
+    @PostMapping("report-list")
+    public Result<List<JiMuReportResultDTO>> reportIdAndName(@RequestBody ReportListFormDTO formDTO){
+        return new Result<List<JiMuReportResultDTO>>().ok(icCustomerReportService.reportIdAndName(formDTO));
+    }
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcCustomerReportDao.java

@@ -25,6 +25,14 @@ public interface IcCustomerReportDao extends BaseDao<IcCustomerReportEntity> {
      */
     List<ReportResultDTO> reportList();
 
+    /**
+     * Desc: 根据客户IDs获取ids
+     * @param customerIds
+     * @author zxc
+     * @date 2022/8/8 15:39
+     */
+    List<String> getIdsByCustomer(@Param("customerIds") List<String> customerIds,@Param("reportId") String reportId);
+
     void delCustomerReport(@Param("customerIds") List<String> customerIds);
 
     void delCustomerReportFun(@Param("reportIds") List<String> reportIds);

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcCustomerReportService.java

@@ -1,11 +1,11 @@
 package com.epmet.service;
 
+import com.epmet.commons.feignclient.dtos.result.JiMuReportResultDTO;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.form.PreviewReportFormDTO;
-import com.epmet.dto.result.PreviewReportResDTO;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.IcCustomerReportDTO;
 import com.epmet.dto.form.ReportEditFormDTO;
+import com.epmet.dto.form.ReportListFormDTO;
+import com.epmet.dto.result.PreviewReportResDTO;
 import com.epmet.dto.result.ReportResultDTO;
 import com.epmet.entity.IcCustomerReportEntity;
 
@@ -41,4 +41,12 @@ public interface IcCustomerReportService extends BaseService<IcCustomerReportEnt
      * @date 2022/8/8 14:09
      */
     void reportEdit(ReportEditFormDTO formDTO);
+
+    /**
+     * Desc: 居民信息/房屋信息-查询报表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/8/8 15:20
+     */
+    List<JiMuReportResultDTO> reportIdAndName(ReportListFormDTO formDTO);
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java

@@ -1,6 +1,8 @@
 package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.epmet.commons.feignclient.dtos.result.JiMuReportResultDTO;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -16,6 +18,7 @@ import com.epmet.dao.IcCustomerReportDao;
 import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.form.PreviewReportFormDTO;
 import com.epmet.dto.form.ReportEditFormDTO;
+import com.epmet.dto.form.ReportListFormDTO;
 import com.epmet.dto.result.PreviewReportResDTO;
 import com.epmet.dto.result.ReportResultDTO;
 import com.epmet.entity.IcCustomerReportEntity;
@@ -129,13 +132,17 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerRepor
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void reportEdit(ReportEditFormDTO formDTO) {
+        List<String> reportIds = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(formDTO.getCustomerList())){
+            reportIds = baseDao.getIdsByCustomer(formDTO.getCustomerList().stream().map(m -> m.getCustomerId()).collect(Collectors.toList()), formDTO.getReportId());
+        }
         if (formDTO.getType().equals(CustomerFunctionConstant.REPORT_EDIT)){
             // 单个编辑
             baseDao.delCustomerReport(Arrays.asList(formDTO.getCustomerList().get(NumConstant.ZERO).getCustomerId()));
         }else if (formDTO.getType().equals(CustomerFunctionConstant.REPORT_ADD)){
             baseDao.delCustomerReport(null);
         }
-        baseDao.delCustomerReportFun(Arrays.asList(formDTO.getReportId()));
+        baseDao.delCustomerReportFun(reportIds);
         if (CollectionUtils.isNotEmpty(formDTO.getCustomerList())){
             List<IcCustomerReportEntity> entities = new ArrayList<>();
             List<IcReportFunEntity> funEntities = new ArrayList<>();
@@ -143,10 +150,11 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerRepor
                 IcCustomerReportEntity reportEntity = new IcCustomerReportEntity();
                 reportEntity.setReportId(formDTO.getReportId());
                 reportEntity.setCustomerId(c.getCustomerId());
+                reportEntity.setId(IdWorker.getIdStr());
                 if (CollectionUtils.isNotEmpty(c.getCategoryKeys())){
                     c.getCategoryKeys().forEach(key -> {
                         IcReportFunEntity funEntity = new IcReportFunEntity();
-                        funEntity.setCustomerReportId(formDTO.getReportId());
+                        funEntity.setCustomerReportId(reportEntity.getId());
                         funEntity.setFunCategoryKey(key);
                         funEntities.add(funEntity);
                     });
@@ -157,6 +165,17 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerRepor
         }
     }
 
+    /**
+     * Desc: 居民信息/房屋信息-查询报表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/8/8 15:20
+     */
+    @Override
+    public List<JiMuReportResultDTO> reportIdAndName(ReportListFormDTO formDTO) {
+        return null;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public void insetCustomerReportAndFun(List<IcCustomerReportEntity> reportEntities,List<IcReportFunEntity> funEntities){
         if (CollectionUtils.isNotEmpty(reportEntities)){

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcCustomerReportDao.xml

@@ -35,4 +35,16 @@
         WHERE cr.DEL_FLAG = 0
         ORDER BY cr.CREATED_TIME DESC
     </select>
+
+    <!-- 根据客户IDs获取ids -->
+    <select id="getIdsByCustomer" resultType="java.lang.String">
+        SELECT ID FROM ic_customer_report
+        WHERE DEL_FLAG = 0
+          AND REPORT_ID = #{reportId}
+          AND CUSTOMER_ID IN (
+            <foreach collection="customerIds" item="c" separator=",">
+                #{c}
+            </foreach>
+        )
+    </select>
 </mapper>