feat: export plan info 2

hnqz-upms/hnqz-upms-biz/pom.xml

@@ -123,7 +123,7 @@
 		<dependency>
 			<groupId>com.pig4cloud.excel</groupId>
 			<artifactId>excel-spring-boot-starter</artifactId>
-			<version>0.4.1</version>
+			<version>1.2.7</version>
 		</dependency>
 
 		<dependency>

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/RiskControlController.java

@@ -3,6 +3,7 @@ package com.qunzhixinxi.hnqz.admin.controller;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
+import com.pig4cloud.plugin.excel.annotation.Sheet;
 import com.qunzhixinxi.hnqz.admin.api.entity.SingleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonth;
 import com.qunzhixinxi.hnqz.admin.api.entity.SingleMemberSettleAmountOverrunInSeveralMonths;
 import com.qunzhixinxi.hnqz.admin.api.entity.SingleMemberSettleSameAmountInSeveralMonths;
@@ -57,7 +58,8 @@ public class RiskControlController {
 	 *
 	 * @return 风控结果
 	 */
-	@ResponseExcel(name = "SingleMemberSettleSameAmountInSeveralMonths", sheet = "风控数据")
+	// @ResponseExcel(name = "SingleMemberSettleSameAmountInSeveralMonths", sheet = "风控数据")
+	@ResponseExcel(name = "SingleMemberSettleSameAmountInSeveralMonths", sheets ={ @Sheet(sheetName = "风控数据")})
 	@GetMapping(value = "/member/settle-same-amount/export/{uuid}")
 	public List<SingleMemberSettleSameAmountInSeveralMonths> exportSingleMemberSettleSameAmountInSeveralMonths(@PathVariable(value = "uuid") String uuid) {
 
@@ -85,7 +87,8 @@ public class RiskControlController {
 	 *
 	 * @return 风控结果
 	 */
-	@ResponseExcel(name = "SingleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonth", sheet = "风控数据")
+	// @ResponseExcel(name = "SingleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonth", sheet = "风控数据")
+	@ResponseExcel(name = "SingleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonth", sheets ={ @Sheet(sheetName = "风控数据")})
 	@GetMapping(value = "/enterprise/settle-same-amount/export/{uuid}")
 	public List<SingleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonth> exportSingleEnterpriseSettleSameAmountForSeveralMembersInCurrentMonth(@PathVariable(value = "uuid") String uuid) {
 
@@ -114,7 +117,8 @@ public class RiskControlController {
 	 *
 	 * @return 风控结果
 	 */
-	@ResponseExcel(name = "SingleMemberSettleAmountOverrunInSeveralMonths", sheet = "风控数据")
+	// @ResponseExcel(name = "SingleMemberSettleAmountOverrunInSeveralMonths", sheet = "风控数据")
+	@ResponseExcel(name = "SingleMemberSettleAmountOverrunInSeveralMonths", sheets ={ @Sheet(sheetName = "风控数据")})
 	@GetMapping(value = "/member/settle-amount/overrun/export/{uuid}")
 	public List<SingleMemberSettleAmountOverrunInSeveralMonths> exportSingleMemberSettleAmountOverrunInSeveralMonths(@PathVariable(value = "uuid") String uuid) {
 
@@ -143,7 +147,8 @@ public class RiskControlController {
 	 *
 	 * @return 风控结果
 	 */
-	@ResponseExcel(name = "SingleMemberWithoutSuchTaskTypesInSeveralMonths", sheet = "风控数据")
+	// @ResponseExcel(name = "SingleMemberWithoutSuchTaskTypesInSeveralMonths", sheet = "风控数据")
+	@ResponseExcel(name = "SingleMemberWithoutSuchTaskTypesInSeveralMonths", sheets ={ @Sheet(sheetName = "风控数据")})
 	@GetMapping(value = "/member/task-type/export/{uuid}")
 	public List<SingleMemberWithoutSuchTaskTypesInSeveralMonths> exportSingleMemberWithoutSuchTaskTypesInSeveralMonths(@PathVariable(value = "uuid") String uuid) {
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysImplementPlanController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.plugin.excel.annotation.RequestExcel;
 import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
+import com.pig4cloud.plugin.excel.annotation.Sheet;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysImplementPlanDTO;
@@ -52,9 +53,9 @@ public class SysImplementPlanController {
     }
 
 
-    @ResponseExcel(sheet = "目标（计划）信息")
+    @ResponseExcel(name = "planInfoExport", sheets = {@Sheet(sheetName = "目标（计划）信息")})
     @GetMapping(value = "/plan/info/export")
-    public List<PlanInfoExportModel> exportPlan(@Validated SysImplementPlanDTO.OnPage query)   {
+    public List<PlanInfoExportModel> exportPlan(@Validated SysImplementPlanDTO.OnPage query) {
         return implementPlanManager.exportPlan(query, SecurityUtils.getUser());
     }
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.ArrayListMultimap;
 import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
+import com.pig4cloud.plugin.excel.annotation.Sheet;
 import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
 import com.google.common.collect.Multimap;
 import com.pig4cloud.plugin.excel.annotation.RequestExcel;
@@ -2500,7 +2501,7 @@ public class WmScorePackageController {
      *
      * @param acceptUser 接单对象，模糊查询
      */
-    @ResponseExcel(name = "exportPackageSettle", sheet = "个人承接积分值导出")
+    @ResponseExcel(name = "exportPackageSettle", sheets ={ @Sheet(sheetName = "个人承接积分值导出")})
     @SysLog("个人承接积分值导出-用于BC")
     @GetMapping("/export-score-package-for-bc")
     public List<WmScorePackageExcelModel> exportScorePackageForBC(
@@ -2678,7 +2679,8 @@ public class WmScorePackageController {
      *
      * @param acceptUser 接单对象，模糊查询
      */
-    @ResponseExcel(name = "exportPackageSettle", sheet = "个人承接积分值导出")
+    // @ResponseExcel(name = "exportPackageSettle", sheet = "个人承接积分值导出")
+    @ResponseExcel(name = "exportPackageSettle",  sheets ={ @Sheet(sheetName = "个人承接积分值导出")})
     @SysLog("个人承接积分值导出")
     @GetMapping("/export-score-package")
     public List<WmScorePackageExcelModel> exportScorePackage(
@@ -2707,7 +2709,8 @@ public class WmScorePackageController {
      *
      * @param acceptUser 接单对象，模糊查询
      */
-    @ResponseExcel(name = "exportPackageSettle", sheet = "个人承接积分值-其他导出")
+    // @ResponseExcel(name = "exportPackageSettle", sheet = "个人承接积分值-其他导出")
+    @ResponseExcel(name = "exportPackageSettle",  sheets ={ @Sheet(sheetName = "个人承接积分值-其他导出")})
     @SysLog("个人承接积分值-其他导出-用于BC")
     @GetMapping("/export-score-package-mah-for-bc")
     public List<WmScorePackageExcelModel> exportPackageSettleForMahForBC(
@@ -2860,7 +2863,8 @@ public class WmScorePackageController {
      *
      * @param acceptUser 接单对象，模糊查询
      */
-    @ResponseExcel(name = "exportPackageSettle", sheet = "个人承接积分值-其他导出")
+    // @ResponseExcel(name = "exportPackageSettle", sheet = "个人承接积分值-其他导出")
+    @ResponseExcel(name = "exportPackageSettle", sheets ={ @Sheet(sheetName = "个人承接积分值-其他导出")})
     @SysLog("个人承接积分值-其他导出")
     @GetMapping("/export-score-package-mah")
     public List<WmScorePackageExcelModel> exportPackageSettleForMah(