From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/shop/src/main/java/com/doumee/api/business/ApplyChangeController.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/server/shop/src/main/java/com/doumee/api/business/ApplyChangeController.java b/server/shop/src/main/java/com/doumee/api/business/ApplyChangeController.java
index 4aa2039..0b84cd2 100644
--- a/server/shop/src/main/java/com/doumee/api/business/ApplyChangeController.java
+++ b/server/shop/src/main/java/com/doumee/api/business/ApplyChangeController.java
@@ -3,23 +3,33 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
+import com.doumee.dao.business.dto.ApplyChangeCyclePriceDTO;
import com.doumee.dao.business.dto.ApplyChangeOptDTO;
import com.doumee.dao.business.model.ApplyChange;
import com.doumee.dao.business.model.InsuranceApply;
+import com.doumee.dao.business.vo.CountCyclePriceVO;
import com.doumee.service.business.ApplyChangeService;
import com.doumee.service.business.InsuranceApplyService;
+import com.doumee.service.business.impl.UnionChangeServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* @author 姹熻箘韫�
@@ -34,6 +44,8 @@
private ApplyChangeService applyChangeService;
@Autowired
private InsuranceApplyService insuranceApplyService;
+ @Autowired
+ private UnionChangeServiceImpl unionChangeServiceImpl;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -161,7 +173,7 @@
@PostMapping("/check")
@RequiresPermissions("business:applychange:check")
public ApiResponse check(@RequestBody ApplyChange model) {
- return ApiResponse.success(applyChangeService.check(model));
+ return ApiResponse.success(applyChangeService.check(model,unionChangeServiceImpl));
}
@ApiOperation("鏌ヨ鏈堝害缁熻鏁版嵁")
@@ -179,4 +191,29 @@
}
+ @ApiOperation("鍔犲噺淇濅笟鍔¤ˉ鍏呴噾棰�")
+ @PostMapping("/getChangeCountCyclePriceVO")
+ public ApiResponse<CountCyclePriceVO> getChangeCountCyclePriceVO (@RequestBody ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO) {
+ applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(new Date(),1));
+ return ApiResponse.success("鎿嶄綔鎴愬姛",applyChangeService.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO));
+ }
+ @ApiOperation("瀵煎嚭淇濆崟涓嬫墍鏈夊姞鍑忎繚璇︽儏鍗�")
+ @PostMapping("/exportApplyJiajianBaoExcel")
+ @RequiresPermissions("business:applychange:exportExcel")
+ public void exportApplyJiajianBaoExcel (@RequestBody InsuranceApply insuranceApply, HttpServletResponse response) {
+ insuranceApply = insuranceApplyService.findDetail(insuranceApply.getId());
+ if(Objects.isNull(insuranceApply)){
+ throw new BusinessException(com.doumee.core.constants.ResponseStatus.DATA_EMPTY);
+ }
+ List<ApplyChange> applyChangeList = applyChangeService.findListByApplyId(insuranceApply.getId(), Constants.ZERO);
+ List<ApplyChange> excelList = new ArrayList<>();
+ if(CollectionUtils.isEmpty(applyChangeList)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏃犲彲瀵煎嚭鐨勫姞鍑忎繚璁板綍");
+ }else{
+ for (ApplyChange applyChange:applyChangeList) {
+ excelList.add(applyChangeService.exportJiajianBaoExcel(applyChange));
+ }
+ }
+ ExcelExporter.build(ApplyChange.class).exportApplyJiajianBaoExcel(insuranceApply,excelList, response);
+ }
}
--
Gitblit v1.9.3