资质导出

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/CompanySearchController.java

@@ -69,9 +69,18 @@ public class CompanySearchController {
     /*
      * 查资质
      */
-    @RequestMapping("/zjAptitude")
-    public AjaxResult zjAptitude(@RequestBody JSONObject object) {
-        return opportunityRadarService.zjAptitude(object);
+    @RequestMapping("/zjyjAptitude")
+    public AjaxResult zjyjAptitude(@RequestBody JSONObject object) {
+        return opportunityRadarService.zjyjAptitude(object);
     }
 
+    /*
+     * 查资质   不满足
+     */
+    @RequestMapping("/zjyjAptitude/contrary")
+    public AjaxResult zjyjAptitudeContrary(@RequestBody JSONObject object) {
+        return opportunityRadarService.zjyjAptitudeContrary(object);
+    }
+
+
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/BusinessOpportunityRadarService.java

@@ -218,8 +218,13 @@ public class BusinessOpportunityRadarService {
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
-    public AjaxResult zjAptitude(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/zjyj/zjAptitude", object);
+    public AjaxResult zjyjAptitude(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/zjyj/aptitude", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult zjyjAptitudeContrary(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/zjyj/aptitude/contrary", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/ExportService.java

@@ -38,7 +38,7 @@ public class ExportService {
     private DskOpenApiUtil dskOpenApiUtil;
     @Autowired
     private ISysUserFileRecordService sysUserFileRecordService;
-    @Value("dsk.exportBackUrl")
+    @Value("${dsk.exportBackUrl}")
     private String EXPORT_BACK_URL;
 
     public AjaxResult aptitudeFile(MultipartFile file) throws Exception {
@@ -61,13 +61,13 @@ public class ExportService {
         fileRecord.setType(1);
         //生成中
         fileRecord.setStatus(2);
-        fileRecord.setRemark("集团招标业绩导出");
+        fileRecord.setRemark("资质批量导出");
         Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
         composeQueryDto.setExportUniqueCode(fileId.toString());
         //回调函数
         composeQueryDto.setExportBackUrl(EXPORT_BACK_URL);
-
-        dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/areaGroupByProvince", new JSONObject());
+        composeQueryDto.setExportExeclName("资质批量导出.xlsx");
+        dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/areaGroupByProvince", BeanUtil.beanToMap(composeQueryDto,false,false));
         return AjaxResult.success();
     }