Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

k94314517

2024-04-09 71e2d06dfa28d3bd60b0d9fa6d6c7ff32884a1a9

 server/company/src/main/java/com/doumee/api/business/InsuranceApplyController.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.CountCyclePriceDTO;
import com.doumee.dao.business.dto.InsuranceApplyOptDTO;
import com.doumee.dao.business.dto.InsuranceApplyQueryDTO;
@@ -23,6 +24,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

/**
 * @author 江蹄蹄
@@ -85,7 +87,13 @@
    @PostMapping("/page")
    @RequiresPermissions("business:insuranceapply:query")
    public ApiResponse<PageData<InsuranceApply>> findPage (@RequestBody PageWrap<InsuranceApplyQueryDTO> pageWrap) {
        return ApiResponse.success(insuranceApplyService.findPage(pageWrap));
        PageData<InsuranceApply> pageData = insuranceApplyService.findPage(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("列表")
@@ -106,13 +114,22 @@
    @PostMapping("/exportDetailExcel")
    @RequiresPermissions("business:insuranceapply:exportExcel")
    public void exportDetailExcel (@RequestBody  InsuranceApply model, HttpServletResponse response) {
        ExcelExporter.build(InsuranceApply.class).exportApplyDetail(insuranceApplyService.findDetailForExport(model),  response);
        InsuranceApply insuranceApply =   insuranceApplyService.findDetailForExport(model);
        if(Objects.nonNull(insuranceApply)&&insuranceApply.getSolutionType().equals(Constants.ONE)
                &&!insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
            insuranceApply.setFee(null);
        }
        ExcelExporter.build(InsuranceApply.class).exportApplyDetail(insuranceApply,  response);
    }
    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:insuranceapply:query")
    public ApiResponse<InsuranceApply> findById(@PathVariable Integer id) {
        return ApiResponse.success(insuranceApplyService.findDetail(id));
        InsuranceApply insuranceApply = insuranceApplyService.findDetail(id);
        if(Objects.nonNull(insuranceApply)&&insuranceApply.getSolutionType().equals(Constants.ONE)&&!insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
            insuranceApply.setFee(null);
        }
        return ApiResponse.success(insuranceApply);
    }
    @ApiOperation("企业签署保单")
    @GetMapping("/getSignLink/{id}")
@@ -136,6 +153,13 @@
    }


    @ApiOperation("获取保障中人数")
    @GetMapping("/guaranteeNum")
    public ApiResponse<Integer> guaranteeNum() {
        return ApiResponse.success(insuranceApplyService.guaranteeNum());
    }


    @ApiOperation("测试实际金额")
    @GetMapping("/testFee")
    public ApiResponse testFee(Integer id) {