From 4e7a24ffb131b89948dce9f2380cc3b91db20b85 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期三, 25 六月 2025 15:17:38 +0800 Subject: [PATCH] git ch --- server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java | 42 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 39 insertions(+), 3 deletions(-) diff --git a/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java b/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java index a3710bd..43f74a6 100644 --- a/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java +++ b/server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java @@ -6,6 +6,7 @@ import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageWrap; import com.doumee.core.model.PageData; +import com.doumee.core.utils.Constants; import com.doumee.dao.business.dto.ApplyDetailPageDTO; import com.doumee.dao.business.model.ApplyDetail; import com.doumee.service.business.ApplyDetailService; @@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -72,14 +74,41 @@ @PostMapping("/page") @RequiresPermissions("business:applydetail:query") public ApiResponse<PageData<ApplyDetail>> findPage (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap) { - return ApiResponse.success(applyDetailService.findPageForCompany(pageWrap)); + PageData<ApplyDetail> pageData = applyDetailService.findPageForCompany(pageWrap); + pageData.getRecords().forEach(i->{ + if(i.getSolutionType().equals(Constants.ONE)&&!i.getStatus().equals(Constants.InsuranceApplyStatus.WTB_DONE.getKey())){ + i.setFee(null); + } + }); + return ApiResponse.success(pageData); } - @ApiOperation("瀵煎嚭Excel") + @ApiOperation("鍒楄〃鏌ヨ") + @PostMapping("/findList") + @RequiresPermissions("business:applydetail:query") + public ApiResponse<List<ApplyDetail>> findList (@RequestBody ApplyDetailPageDTO applyDetailPageDTO) { + return ApiResponse.success(applyDetailService.findListForCompany(applyDetailPageDTO)); + } + + @ApiOperation("鏌ヨ鍏ㄩ儴") + @PostMapping("/list") + @RequiresPermissions("business:applydetail:query") + public ApiResponse<List<ApplyDetail>> list (@RequestBody ApplyDetail pageWrap) { + return ApiResponse.success(applyDetailService.findList(pageWrap)); + } + + @ApiOperation("瀵煎嚭鍦ㄤ繚浜哄憳璇﹀崟Excel") @PostMapping("/exportExcel") @RequiresPermissions("business:applydetail:exportExcel") public void exportExcel (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap, HttpServletResponse response) { - ExcelExporter.build(ApplyDetail.class).export(applyDetailService.findPageForCompany(pageWrap).getRecords(), "鎶曚繚鐢宠鏄庣粏淇℃伅琛�", response); + pageWrap.getModel().setIsExcel(Constants.ONE); + PageData<ApplyDetail> pageData = applyDetailService.findPageForCompany(pageWrap); + pageData.getRecords().forEach(i->{ + if(i.getSolutionType().equals(Constants.ONE)&&!i.getStatus().equals(Constants.InsuranceApplyStatus.WTB_DONE.getKey())){ + i.setFee(BigDecimal.ZERO); + } + }); + ExcelExporter.build(ApplyDetail.class).exportWithSheetAndFirstAndEnd(pageData.getRecords(), pageWrap.getModel().getSolutionName()+".xlsx","銆�"+pageWrap.getModel().getSolutionName()+"銆�"+"淇濆崟浜哄憳淇℃伅",null, "淇濆崟浜哄憳",response); } @ApiOperation("鏍规嵁ID鏌ヨ") @@ -97,6 +126,13 @@ } + @ApiOperation("鏌ヨ浜哄憳鍙姤妗堟暟鎹�") + @GetMapping("/getMemberSettleClaimsList") + public ApiResponse<List<ApplyDetail>> getMemberSettleClaimsList(@RequestParam Integer memberId) { + return ApiResponse.success(applyDetailService.getMemberSettleClaimsList(memberId)); + } + + } -- Gitblit v1.9.3