使用登记证导出bugfix

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java

@@ -168,11 +168,7 @@ public class JgUseRegistrationManageController extends BaseController {
                                                                         @RequestParam(value = "sort", required = false) String sort,
                                                                         @RequestParam(value = "current") int current,
                                                                         @RequestParam(value = "size") int size) {
-        Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
-        page.setCurrent(current);
-        page.setSize(size);
-        ReginParams info = getSelectedOrgInfo();
-        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePageForJG(page, dto, sort, info.getCompany().getOrgCode()));
+        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePageForJG(dto, sort, current, size));
     }
     /**
      * 列表分页查询-大屏监督管理使用

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IJgTableDataExportService.java

@@ -19,7 +19,7 @@ public interface IJgTableDataExportService {
 
     void gen(String jsonName, String voName, String tableName);
 
-    void certificate(String uuid, JgUseRegistrationManageDto dto, List<String> ids, String sort);
+    void certificate(String uuid, JgUseRegistrationManageDto dto, Boolean isJG, List<String> ids, String sort);
 
     void maintenance(HttpServletResponse response, List<String> ids);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTableDataExportServiceImpl.java

@@ -250,15 +250,15 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
      * 登记证列表数据导出
      */
     @Override
-    public void certificate(String uuid, JgUseRegistrationManageDto dto, List<String> ids, String sort) {
+    public void certificate(String uuid, JgUseRegistrationManageDto dto, Boolean isJG, List<String> ids, String sort) {
         RequestContextWrapper contextWrapper = RequestContextWrapper.capture();
 
         List<CertificateVo> exportData;
         if (ids.isEmpty()) {
             // 查询首页数据
             int currentPage = 1;
-            Page<JgUseRegistrationManageDto> firstPage = jgUseRegistrationManageServiceImpl.buildFilter(dto, currentPage, PAGE_SIZE);
-            Page<JgUseRegistrationManageDto> dtoPage = jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(firstPage, dto, sort);
+            Page<JgUseRegistrationManageDto> dtoPage = isJG ? jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePageForJG(dto, sort, currentPage, PAGE_SIZE)
+                    : jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(jgUseRegistrationManageServiceImpl.buildFilter(dto, currentPage, PAGE_SIZE), dto, sort);
             long total = dtoPage.getTotal();
             int totalPage = (int) Math.ceil((double) total / PAGE_SIZE);
 
@@ -276,8 +276,8 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
                 CompletableFuture<List<String>> future = CompletableFuture.supplyAsync(() -> {
                     // 恢复上下文到子线程
                     contextWrapper.apply();
-                    Page<JgUseRegistrationManageDto> page = jgUseRegistrationManageServiceImpl.buildFilter(dto, pageIndex, PAGE_SIZE);
-                    Page<JgUseRegistrationManageDto> resultPage = jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(page, dto, sort);
+                    Page<JgUseRegistrationManageDto> resultPage = isJG ? jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePageForJG(dto, sort, pageIndex, PAGE_SIZE)
+                            : jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(jgUseRegistrationManageServiceImpl.buildFilter(dto, pageIndex, PAGE_SIZE), dto, sort);
                     return resultPage.getRecords().stream()
                             .map(JgUseRegistrationManageDto::getSequenceNbr)
                             .map(String::valueOf)
@@ -325,14 +325,18 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
             if ("压力管道".equals(data.getEquList())) {
                 List<IdxBizJgProjectContraption> contraptions = idxBizJgProjectContraptionService.queryProConByCertSeq(data.getSequenceNbr());
                 for (IdxBizJgProjectContraption obj : contraptions) {
-                    BeanUtil.copyProperties(obj, data);
-                    exportData.add(data);
+                    CertificateVo newData = new CertificateVo();
+                    BeanUtil.copyProperties(data, newData);
+                    BeanUtil.copyProperties(obj, newData);
+                    exportData.add(newData);
                 }
             } else {
                 List<JSONObject> jsonObjects = jgUseRegistrationManageServiceImpl.queryEquByCertificateSeq(Long.valueOf(data.getSequenceNbr()));
                 for (JSONObject obj : jsonObjects) {
-                    BeanUtil.copyProperties(obj, data);
-                    exportData.add(data);
+                    CertificateVo newData = new CertificateVo();
+                    BeanUtil.copyProperties(data, newData);
+                    BeanUtil.copyProperties(obj, newData);
+                    exportData.add(newData);
                 }
             }
         });

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationManageServiceImpl.java

@@ -319,15 +319,16 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         return jgUseRegistrationManageMapper.queryForPage(page, dto, sortMap);
     }
 
-    public Page<JgUseRegistrationManageDto> queryForJgUseRegistrationManagePageForJG(Page<JgUseRegistrationManageDto> page,
-                                                                                JgUseRegistrationManageDto dto,
-                                                                                String sort, String orgCode) {
+    public Page<JgUseRegistrationManageDto> queryForJgUseRegistrationManagePageForJG(JgUseRegistrationManageDto dto, String sort, int current, int size) {
+        Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
+        page.setCurrent(current);
+        page.setSize(size);
         SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
         if (ApplicationFormTypeEnum.BF.getBusinessCode().equals(dto.getApplyType()) && (!CylinderTypeEnum.CYLINDER.getCode().equals(dto.getEquCategoryCode()) || dto.getRegType().equals(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName()))){
             dto.setCertificateStatus(null);
             dto.setIsScrap("0");
         }
-        return jgUseRegistrationManageMapper.queryForPageForJG(page, dto, sortMap, orgCode);
+        return jgUseRegistrationManageMapper.queryForPageForJG(page, dto, sortMap, getSelectedOrgInfo().getCompany().getOrgCode());
     }
 
     public Page<JgUseRegistrationManageDto> getRecords(Page<JgUseRegistrationManageDto> page, JgUseRegistrationManageDto dto, String cityCode) {