报表差导出

web/src/main/java/com/jpsoft/insurance/modules/base/controller/AdvisoryController.java

@@ -247,4 +247,52 @@ public class AdvisoryController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageListExport",method = RequestMethod.POST)
+    public MessageResult<Map> pageListExport(
+            Date[] createTime, String insuredArea,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (createTime.length > 0) {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            searchParams.put("startTime", simpleDateFormat.format(createTime[0]) + " 00:00:00");
+            searchParams.put("endTime", simpleDateFormat.format(createTime[1]) + "23:59:59");
+        }
+        if (StringUtils.isNotEmpty(insuredArea)) {
+            searchParams.put("insuredArea", insuredArea);
+        }
+
+        String meaning = "";
+        DataDictionary dataDictionary = new DataDictionary();
+        Page<Advisory> page = advisoryService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        for(Advisory advisory : page.getResult()){
+            dataDictionary = dataDictionaryService.findByCatalogNameAndValue("证件类型", advisory.getCardType());
+            advisory.setCardTypeName(dataDictionary.getName());
+            dataDictionary = dataDictionaryService.findByCatalogNameAndValue("参保类型", advisory.getInsuranceType());
+            advisory.setInsuranceTypeName(dataDictionary.getName());
+            dataDictionary = dataDictionaryService.findByCatalogNameAndValue("参保区域", advisory.getInsuredArea());
+            advisory.setInsuredAreaName(dataDictionary.getName());
+
+            meaning = advisory.getIsPrecisionPoverty() ? "√" : "×";
+            advisory.setIsPrecisionPovertyName(meaning);
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
 }

web/src/main/java/com/jpsoft/insurance/modules/base/controller/ReportController.java

@@ -261,4 +261,64 @@ public class ReportController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageListExport",method = RequestMethod.POST)
+    public MessageResult<Map> pageListExport(
+            Date[] createTime, String insuredArea, String insuranceType,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (createTime.length > 0) {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            searchParams.put("startTime", simpleDateFormat.format(createTime[0]) + " 00:00:00");
+            searchParams.put("endTime", simpleDateFormat.format(createTime[1]) + "23:59:59");
+        }
+        if (StringUtils.isNotEmpty(insuredArea)) {
+            searchParams.put("insuredArea", insuredArea);
+        }
+        if (StringUtils.isNotEmpty(insuranceType)) {
+            searchParams.put("insuranceType", insuranceType);
+        }
+
+        String meaning = "";
+        DataDictionary dataDictionary = new DataDictionary();
+        Page<Report> page = reportService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        for(Report report : page.getResult()){
+            dataDictionary = dataDictionaryService.findByCatalogNameAndValue("证件类型", report.getCardType());
+            report.setCardTypeName(dataDictionary.getName());
+            dataDictionary = dataDictionaryService.findByCatalogNameAndValue("参保类型", report.getInsuranceType());
+            report.setInsuranceTypeName(dataDictionary.getName());
+            dataDictionary = dataDictionaryService.findByCatalogNameAndValue("参保区域", report.getInsuredArea());
+            report.setInsuredAreaName(dataDictionary.getName());
+            dataDictionary = dataDictionaryService.findByCatalogNameAndValue("就诊医院", report.getVisitingHospital());
+            report.setVisitingHospitalName(dataDictionary.getName());
+
+            meaning = report.getIsPrecisionPoverty() ? "√" : "×";
+            report.setIsPrecisionPovertyName(meaning);
+            meaning = report.getIs5days() ? "√" : "×";
+            report.setIs5daysName(meaning);
+            meaning = report.getIsDischarged() ? "√" : "×";
+            report.setIsDischargedName(meaning);
+
+            User user = userService.get(report.getCreateBy());
+            report.setCreateByName(user.getRealName());
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
 }