ic_nat_compare_rec_relation

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java

@@ -60,31 +60,6 @@ public class IcNatCompareRecordDTO implements Serializable {
      */
 	private String icResiUserId;
 
-    /**
-     * 导入时间
-     */
-	private Date importTime;
-
-    /**
-     * 操作人
-     */
-	private String staffId;
-
-    /**
-     * 操作人姓名
-     */
-	private String staffName;
-
-    /**
-     * 操作人员所属组织id
-     */
-	private String agencyId;
-
-    /**
-     * agency_id组织的所有上级
-     */
-    private String pids;
-
     /**
      * 最近一次核酸时间:接口填入
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatCompareRecordController.java

@@ -1,18 +1,34 @@
 package com.epmet.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.MaskResponse;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
 import com.epmet.dto.IcNatCompareRecordDTO;
+import com.epmet.dto.IcTripReportRecordDTO;
+import com.epmet.dto.form.PageTripReportFormDTO;
 import com.epmet.dto.form.yqfk.IcNatCompareRecordPageFormDTO;
 import com.epmet.service.IcNatCompareRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+
 
 /**
  * 核算比对记录
@@ -20,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-09-26
  */
+@Slf4j
 @RestController
 @RequestMapping("icNatCompareRecord")
 public class IcNatCompareRecordController {
@@ -42,7 +59,45 @@ public class IcNatCompareRecordController {
         return new Result<PageData<IcNatCompareRecordDTO>>().ok(page);
     }
 
+    /**
+     * pc:行程上报-导出
+     * @param tokenDto
+     * @param formDTO
+     * @param response
+     */
+    @NoRepeatSubmit
+    @PostMapping("export")
+    public void export(@LoginUser TokenDto tokenDto, @RequestBody PageTripReportFormDTO formDTO, HttpServletResponse response) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        // formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        // formDTO.setUserId("35005df15fb0f7c791344f0b424870b7");
+        formDTO.setIsPage(false);
+        ExcelWriter excelWriter = null;
+        formDTO.setPageSize(NumConstant.TEN_THOUSAND);
+        int pageNo = formDTO.getPageNo();
+        try {
+            // 这里 需要指定写用哪个class去写
+            String today= DateUtils.format(new Date(),DateUtils.DATE_PATTERN_MMDD);
+            String fileName = "行程上报信息".concat(today);
+            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcTripReportRecordDTO.class).build();
+            WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
+            PageData<IcTripReportRecordDTO> data = null;
+            do {
+                // data = icTripReportRecordService.page(formDTO);
+                formDTO.setPageNo(++pageNo);
+                excelWriter.write(data.getList(), writeSheet);
+            } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize());
 
+        } catch (Exception e) {
+            log.error("export exception", e);
+        } finally {
+            // 千万别忘记finish 会帮忙关闭流
+            if (excelWriter != null) {
+                excelWriter.finish();
+            }
+        }
+    }
 
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatCompareRecordEntity.java

@@ -46,31 +46,6 @@ public class IcNatCompareRecordEntity extends BaseEpmetEntity {
      */
 	private String icResiUserId;
 
-    /**
-     * 导入时间
-     */
-	private Date importTime;
-
-    /**
-     * 操作人
-     */
-	private String staffId;
-
-    /**
-     * 操作人姓名
-     */
-	private String staffName;
-
-    /**
-     * 操作人员所属组织id
-     */
-	private String agencyId;
-
-	/**
-	 * agency_id组织的所有上级
-	 */
-	private String pids;
-
     /**
      * 最近一次核酸时间:接口填入
      */

epmet-user/epmet-user-server/src/main/resources/mapper/IcNatCompareRecordDao.xml

@@ -6,7 +6,7 @@
     <!-- 分页查询 -->
     <select id="pageList" parameterType="com.epmet.dto.form.yqfk.IcNatCompareRecordPageFormDTO" resultType="com.epmet.dto.IcNatCompareRecordDTO">
         SELECT
-            C.ID,
+            r.ID,
             c.MOBILE,
             c.ID_CARD,
             c.`NAME`,
@@ -18,18 +18,20 @@
             ( CASE WHEN c.IS_RESI_USER = '0' THEN '否' ELSE '是' END ) AS isResiUserDesc,
             C.MOBILE AS realMobile,
             C.ID_CARD AS realIdCard,
-            c.STAFF_ID,
-            c.STAFF_NAME,
-            c.AGENCY_ID,
-            c.pids,
-            c.IMPORT_TIME,
+            r.STAFF_ID,
+            r.STAFF_NAME,
+            r.AGENCY_ID,
+            r.pids,
+            r.IMPORT_TIME,
+            r.IMPORT_DATE,
             c.IC_RESI_USER_ID,
-            c.CUSTOMER_ID
-        FROM
-            ic_nat_compare_record c
+            r.CUSTOMER_ID
+        FROM ic_nat_compare_rec_relation r
+         left join ic_nat_compare_record c  on (r.COMPARE_REC_ID=c.ID)
         WHERE
-            c.DEL_FLAG = '0'
-          AND c.CUSTOMER_ID = #{customerId}
+            r.DEL_FLAG = '0'
+          AND r.CUSTOMER_ID = #{customerId}
+          AND c.del_flag='0'
         <if test='null != isResiUser and "" != isResiUser'>
             AND c.IS_RESI_USER = #{isResiUser}
         </if>
@@ -43,12 +45,12 @@
             AND c.`NAME` LIKE CONCAT('%',#{name},'%')
         </if>
         <if test='null != importTime and "" != importTime'>
-            AND DATE_FORMAT( c.IMPORT_TIME, '%Y%m%d' ) = #{importTime}
+            AND DATE_FORMAT( r.IMPORT_DATE, '%Y%m%d' ) = #{importTime}
         </if>
         <if test='null != agencyId and "" != agencyId'>
-            AND c.AGENCY_ID = #{agencyId} or c.pids like concat('%',#{agencyId},'%')
+            AND r.AGENCY_ID = #{agencyId} or r.pids like concat('%',#{agencyId},'%')
         </if>
         ORDER BY
-            C.IMPORT_TIME DESC
+            r.IMPORT_TIME DESC
     </select>
 </mapper>