fix(jyjc):定（首）检验列表（企业）/ 电梯检测 列表数据导出

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionApplicationService.java

@@ -18,5 +18,5 @@ public interface IJyjcInspectionApplicationService {
 
     Page<JyjcInspectionApplicationModel> queryForPageList(Page<JyjcInspectionApplication> page, JyjcInspectionApplicationModel model);
 
-    void DSExport(HttpServletResponse response, List<String> ids);
+    void export(String bizType, HttpServletResponse response, List<String> ids);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

@@ -283,10 +283,10 @@ public class JyjcInspectionApplicationController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/DS/export")
-    @ApiOperation(httpMethod = "GET", value = "定（首）检验列表（企业）列表数据导出", notes = "定（首）检验列表（企业）列表数据导出")
-    public void DSExport(HttpServletResponse response, String ids) {
+    @GetMapping(value = "/{bizType}/export")
+    @ApiOperation(httpMethod = "GET", value = "定（首）检验列表（企业）/电梯检测 列表数据导出", notes = "定（首）检验列表（企业）/电梯检测 列表数据导出")
+    public void export(@PathVariable(value = "bizType")String bizType, HttpServletResponse response, String ids) {
         Assert.hasText(ids,"未选择导出数据");
-        jyjcInspectionApplicationServiceImpl.DSExport(response, Arrays.asList(ids.split(",")));
+        jyjcInspectionApplicationServiceImpl.export(bizType,response, Arrays.asList(ids.split(",")));
     }
 }

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

@@ -175,6 +175,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
     private static final String SUMMIT_TYPE = "0";
 
+    private static final String FIRST_INSPECT = "firstInspect";
+
     /**
      * 省特检院等特殊公司code
      */
@@ -532,14 +534,16 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     }
 
     /**
-     * 定（首）检验列表（企业）列表数据导出
+     * 定（首）检验列表（企业）/ 电梯检测 列表数据导出
+     * @param bizType
      * @param response
      * @param ids
      */
     @Override
-    public void DSExport(HttpServletResponse response, List<String> ids) {
+    public void export(String bizType, HttpServletResponse response, List<String> ids) {
         List<JyjcInspectionApplicationVo> exportData = this.baseMapper.queryExportInIds(ids);
-        ExcelUtil.createTemplate(response, "定（首）检验列表数据", "定（首）检验列表", exportData, JyjcInspectionApplicationVo.class, null, false);
+        String typeName = FIRST_INSPECT.equals(bizType) ? "定（首）检验列表" : "电梯检测列表";
+        ExcelUtil.createTemplate(response, typeName + "数据", typeName, exportData, JyjcInspectionApplicationVo.class, null, false);
     }
 
     private String getCompanyIdentityByType(String companyType) {