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

k94314517

2024-05-08 0f409b25f91717e00e10c37738740b22583cb4ff

 server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java

@@ -6,6 +6,7 @@
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.dao.business.dto.InsuranceApplyQueryDTO;
import com.doumee.dao.business.model.InsuranceApply;
import com.doumee.service.business.InsuranceApplyService;
@@ -18,6 +19,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

/**
 * @author 江蹄蹄
@@ -130,7 +132,8 @@
    @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);
        return ApiResponse.success(pageData);
    }

    @ApiOperation("导出Excel")
@@ -143,7 +146,8 @@
    @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);
        ExcelExporter.build(InsuranceApply.class).exportApplyDetail(insuranceApply,  response);
    }

    @ApiOperation("根据ID查询")