feat: 积分包积分值和相关字段由int改为long类型，相关代码适配

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/UnpackDTO.java

@@ -28,13 +28,13 @@ public class UnpackDTO implements Serializable {
 	 * 原积分包剩余积分包值
 	 */
 	@NotNull(message = "原积分包剩余积分包值必填")
-	private Integer remainPackageScore;
+	private Long remainPackageScore;
 
 	/**
 	 * 已选任务积分值
 	 */
 	@NotNull(message = "已选任务积分值必填")
-	private Integer selectTaskScore;
+	private Long selectTaskScore;
 
 	/**
 	 * 已选任务id列表

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SysDeptInvoice.java

@@ -39,7 +39,7 @@ public class SysDeptInvoice implements Serializable {
     /**
      * 关联积分值
      */
-    private Integer relationPackageScore;
+    private Long relationPackageScore;
 
     /**
      * 关联积分包个数

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmScorePackage.java

@@ -58,7 +58,7 @@ public class WmScorePackage implements Serializable {
   private String scoreName;
 
   /** 积分 */
-  private Integer score;
+  private Long score;
 
   /** 代理商类型 */
   private String agentTypeId;
@@ -165,7 +165,7 @@ public class WmScorePackage implements Serializable {
   private String payRate;
 
   /** 已支付积分值 */
-  private Integer payScore;
+  private Long payScore;
 
   /** 接包对象 */
   private String acceptSug;
@@ -177,20 +177,20 @@ public class WmScorePackage implements Serializable {
   /** 已完成百分比 */
   private String finishRate;
 
-  private Integer ytj;
-  private Integer ysh;
+  private Long ytj;
+  private Long ysh;
 
-  private Integer dsh;
+  private Long dsh;
 
-  private Integer ytjtt;
+  private Long ytjtt;
 
-  private Integer ywctt;
+  private Long ywctt;
 
   @TableField(exist = false)
-  private Integer shtg;
+  private Long shtg;
 
   @TableField(exist = false)
-  private Integer shbtg;
+  private Long shbtg;
 
   @TableField(exist = false)
   private Integer shtgnum;
@@ -222,7 +222,7 @@ public class WmScorePackage implements Serializable {
 
   private String remark;
 
-  private Integer kfpjf;
+  private Long kfpjf;
 
   /** 发票类目 */
   private Integer invoiceCategory;

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/excel/WmScorePackageExcelModel.java

@@ -72,7 +72,7 @@ public class WmScorePackageExcelModel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("完成积分值")
-	private Integer ysh;
+	private Long ysh;
 
 	/**
 	 * 已完成百分比
@@ -86,7 +86,7 @@ public class WmScorePackageExcelModel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("审核通过积分值")
-	private Integer payScore;
+	private Long payScore;
 
 	/**
 	 * 已支付百分比

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/WmScorePackageApiOutput.java

@@ -52,10 +52,10 @@ public class WmScorePackageApiOutput {
 
 	private Integer taskFinishNum;
 
-	private Integer speedProgress;
+	private Long speedProgress;
 
-	private Integer finishScore;
-	private Integer waitApprovalScore;
+	private Long finishScore;
+	private Long waitApprovalScore;
 
 	private Integer waitApprovalTaskNum;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/output/BudgetViewOutput.java

@@ -24,7 +24,7 @@ public class BudgetViewOutput {
 
 	private Integer scoreBudget;
 
-	private Integer scoreIssue;
+	private Long scoreIssue;
 
 	private Integer taskBudget;
 

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/SysDeptInvoiceRelationVO.java

@@ -40,7 +40,7 @@ public class SysDeptInvoiceRelationVO implements Serializable {
     /**
      * 积分包值
      */
-    private Integer score;
+    private Long score;
 
     /**
      * 发布日期

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

@@ -156,7 +156,7 @@ public class SysDeptRechargeController {
             List<SysDeptInvoiceRelationVO> relationVOS = deptInvoiceService.listToInvoiceScore(deptId);
             if (CollUtil.isNotEmpty(relationVOS)) {
                 // 可开票积分
-                result.put("toInvoiceScore", relationVOS.stream().mapToInt(SysDeptInvoiceRelationVO::getScore).sum());
+                result.put("toInvoiceScore", relationVOS.stream().mapToLong(SysDeptInvoiceRelationVO::getScore).sum());
             } else {
                 // 可开票积分
                 result.put("toInvoiceScore", 0);
@@ -173,10 +173,10 @@ public class SysDeptRechargeController {
                     .between(SysDeptInvoice::getApprovalTime, startTime, endTime));
             if (CollUtil.isNotEmpty(monthInvoices)) {
                 // 本月已开票积分
-                result.put("invoicedScore", monthInvoices.stream().mapToInt(SysDeptInvoice::getRelationPackageScore).sum());
+                result.put("invoicedScore", monthInvoices.stream().mapToLong(SysDeptInvoice::getRelationPackageScore).sum());
             } else {
                 // 本月已开票积分
-                result.put("invoicedScore", 0);
+                result.put("invoicedScore", 0L);
             }
         }
 

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

@@ -211,7 +211,7 @@ public class SysExportController {
 
 
 		List<XlsTask> xlsTaskList = new ArrayList<>();
-		Integer totalMoney = 0;
+		long totalMoney = 0L;
 		wmTask.setScorePackageId(null);
 		wmTask.setScorePackageDrugId(null);
 
@@ -794,7 +794,7 @@ public class SysExportController {
 
 			if (listPackageIds.size() > 0) {
 				List<WmScorePackage> wmScorePackageList = wmScorePackageService.listByIds(listPackageIds);
-				Integer totalScorePackage = 0;
+				long totalScorePackage = 0L;
 				BigDecimal settleAmount = new BigDecimal("0");
 				if (wmScorePackageList.size() > 0) {
 					for (WmScorePackage wmScorePackage : wmScorePackageList) {
@@ -859,7 +859,7 @@ public class SysExportController {
 				.in(WmTask::getScorePackageId, wmTask.getExtIds()));
 
 		if (CollUtil.isNotEmpty(tasks)){
-			int sum = tasks.stream().mapToInt(WmTask::getScore).sum();
+			long sum = tasks.stream().mapToLong(WmTask::getScore).sum();
 			excelMap.put("submitAmount", sum);
 		}
 

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

@@ -144,7 +144,7 @@ public class WmDeptTaskController {
 		if ("3".equals(scorePackage.getTypeid())) {
 			// 全职任务
 			// 全职分值
-			result.put("full_time_task_score", String.valueOf(taskList.stream().mapToInt(WmTask::getScore).sum()));
+			result.put("full_time_task_score", String.valueOf(taskList.stream().mapToLong(WmTask::getScore).sum()));
 			// 全职任务数
 			result.put("full_time_task_number", String.valueOf(taskList.size()));
 		} else {
@@ -153,7 +153,7 @@ public class WmDeptTaskController {
 					.filter(task -> personalTaskTypeIds.contains(task.getTaskTypeId()))
 					.collect(Collectors.toList());
 			// 个人任务分值
-			result.put("personal_task_score", String.valueOf(personalTask.stream().mapToInt(WmTask::getScore).sum()));
+			result.put("personal_task_score", String.valueOf(personalTask.stream().mapToLong(WmTask::getScore).sum()));
 			// 个人任务条数
 			result.put("personal_task_number", String.valueOf(personalTask.size()));
 			List<WmTask> p19TaskList = taskList.stream()
@@ -161,7 +161,7 @@ public class WmDeptTaskController {
 					.collect(Collectors.toList());
 
 			// 招商经理任务分值
-			result.put("investment_manager_task_score", String.valueOf(p19TaskList.stream().mapToInt(WmTask::getScore).sum()));
+			result.put("investment_manager_task_score", String.valueOf(p19TaskList.stream().mapToLong(WmTask::getScore).sum()));
 			// 招商经理任务条数
 			result.put("investment_manager_task_number", String.valueOf(p19TaskList.size()));
 
@@ -169,13 +169,13 @@ public class WmDeptTaskController {
 					.filter(task -> entTaskTypeIds.contains(task.getTaskTypeId()))
 					.collect(Collectors.toList());
 			// 企业任务分值
-			result.put("ent_task_score", String.valueOf(entTaskList.stream().mapToInt(WmTask::getScore).sum()));
+			result.put("ent_task_score", String.valueOf(entTaskList.stream().mapToLong(WmTask::getScore).sum()));
 			// 企业任务条数
 			result.put("ent_task_number", String.valueOf(entTaskList.size()));
 		}
 
 		// 审核管理费分值
-		int taskScoreSum = taskList.stream().mapToInt(WmTask::getScore).sum();
+		long taskScoreSum = taskList.stream().mapToLong(WmTask::getScore).sum();
 		BigDecimal auditManagementFee = BigDecimal.valueOf(taskScoreSum)
 				.multiply(scorePackage.getAuditManagementFeeRates())
 				.divide(new BigDecimal("100.00"), RoundingMode.HALF_EVEN);
@@ -183,7 +183,7 @@ public class WmDeptTaskController {
 		// 审核任务数(所有审核通过的任务数)
 		result.put("audit_tasks_number", String.valueOf(taskList.size()));
 		// 实际完成分值(所有审核通过的任务分+审核管理费分值)
-		int totalTaskScore = taskList.stream().mapToInt(WmTask::getScore).sum();
+		long totalTaskScore = taskList.stream().mapToLong(WmTask::getScore).sum();
 		result.put("actual_completion_score", auditManagementFee.add(BigDecimal.valueOf(totalTaskScore)).toString());
 
 		return R.ok(result);
@@ -209,17 +209,17 @@ public class WmDeptTaskController {
                     .eq(WmTask::getEnableFlag, EnableEnum.ENABLE.val())
                     .eq(WmTask::getDelFlag, DelEnum.NOT_DEL.getVal())
                     .eq(WmTask::getTaskStatus, TaskStatusEnum.APPROVED.val()));
-            Map<String, Integer> packageTasksScoreMap = new HashMap<>();
+            Map<String, Long> packageTasksScoreMap = new HashMap<>();
             if (CollUtil.isNotEmpty(queryTaskList)) {
                 packageTasksScoreMap = queryTaskList.stream()
                         .collect(Collectors.groupingBy(WmTask::getScorePackageId,
-                                Collectors.summingInt(WmTask::getScore)));
+                                Collectors.summingLong(WmTask::getScore)));
             }
 
-            Map<String, Integer> finalPackageTasksScoreMap = packageTasksScoreMap;
+            Map<String, Long> finalPackageTasksScoreMap = packageTasksScoreMap;
             packageList.stream()
                     .filter(wmScorePackage -> {
-                        Integer tasksScore = finalPackageTasksScoreMap.getOrDefault(wmScorePackage.getId(), 0);
+                        long tasksScore = finalPackageTasksScoreMap.getOrDefault(wmScorePackage.getId(), 0L);
                         // 是否超过企业任务上限
                         boolean deptLimitFlag = BigDecimal.valueOf(tasksScore)
                                 .compareTo(BigDecimal.valueOf(wmScorePackage.getScore())

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

@@ -13,7 +13,6 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.digest.DigestUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -2063,9 +2062,9 @@ public class ApiController {
                             .eq(WmTask::getDelFlag, DelEnum.NOT_DEL.getVal())
                             .ne(WmTask::getTaskStatus, "4"));
                     item.setTaskFinishNum(wmTaskList.size());
-                    item.setSpeedProgress(0);
-                    item.setFinishScore(0);
-                    item.setWaitApprovalScore(0);
+                    item.setSpeedProgress(0L);
+                    item.setFinishScore(0L);
+                    item.setWaitApprovalScore(0L);
                     item.setWaitApprovalTaskNum(0);
                     if ("3".equals(item.getStatus())) {
                         item.setTaskAddFlag("1");
@@ -2074,8 +2073,8 @@ public class ApiController {
 
                     if (CharSequenceUtil.equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val(), item.getPackageType1())
                             || CharSequenceUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), item.getPackageType1())) {
-                        Integer finishScore = 0;
-                        Integer waitApprovalScore = 0;
+                        long finishScore = 0;
+                        long waitApprovalScore = 0;
                         for (WmTask task : wmTaskList) {
                             finishScore += task.getScore();
                             if ("2".equals(task.getTaskStatus())) {
@@ -2085,15 +2084,15 @@ public class ApiController {
                         item.setFinishScore(finishScore);
                         item.setWaitApprovalScore(waitApprovalScore);
                         if (StringUtils.isNumeric(item.getScore()) && Integer.parseInt(item.getScore()) > 0) {
-                            double d = Math.ceil(finishScore * 100 / Integer.parseInt(item.getScore()));
+                            double d = Math.ceil(finishScore * 100.0 / Long.parseLong(item.getScore()));
                             if (d > 100) {
                                 d = 100;
                             }
-                            item.setSpeedProgress(new Double(d).intValue());
+                            item.setSpeedProgress(Double.valueOf(d).longValue());
                         }
                     } else {
                         Integer waitApprovalTaskNum = 0;
-                        double d = Math.ceil(wmTaskList.size() * 100 / item.getTaskNum());
+                        double d = Math.ceil(wmTaskList.size() * 100.0 / item.getTaskNum());
                         if (d > 100) {
                             d = 100;
                         }
@@ -2103,7 +2102,7 @@ public class ApiController {
                             }
                         }
                         item.setWaitApprovalTaskNum(waitApprovalTaskNum);
-                        item.setSpeedProgress(new Double(d).intValue());
+                        item.setSpeedProgress(Double.valueOf(d).longValue());
                     }
 
 
@@ -2785,7 +2784,7 @@ public class ApiController {
                     String packageEntId = wmScorePackageService.getPackageScoreEntByTaskInfo(wmScorePackage);
                     wmTask.setScorePackageLevel1Id(packageEntId);
                 } catch (Exception ex) {
-
+                    log.error("获取积分包失败", ex);
                 }
                 System.out.println("获取积分包ID：" + tWmScorePackage);
                 if (null == tWmScorePackage) {

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

@@ -423,12 +423,12 @@ public class WmScorePackageController {
                         wmS.setDsh(ext.getDsh());
                     } else {
                         if (null == ext.getYtj() || null == ext.getScore()) {
-                            wmS.setDsh(0);
+                            wmS.setDsh(0L);
                         } else {
                             if (ext.getYtj() >= ext.getScore()) {
-                                wmS.setDsh(100);
+                                wmS.setDsh(100L);
                             } else {
-                                wmS.setDsh(new Double(Math.ceil(100.0 * ext.getYtj() / ext.getScore())).intValue());
+                                wmS.setDsh(Double.valueOf(Math.ceil(100.0 * ext.getYtj() / ext.getScore())).longValue());
                             }
                         }
                     }
@@ -717,12 +717,12 @@ public class WmScorePackageController {
                                     wmS.setDsh(ext.getDsh());
                                 } else {
                                     if (null == ext.getYtj() || null == ext.getScore()) {
-                                        wmS.setYwctt(0);
+                                        wmS.setYwctt(0L);
                                     } else {
                                         if (ext.getYtj() >= ext.getScore()) {
-                                            wmS.setYwctt(100);
+                                            wmS.setYwctt(100L);
                                         } else {
-                                            wmS.setYwctt(new Double(Math.ceil(100.0 * ext.getYtj() / ext.getScore())).intValue());
+                                            wmS.setYwctt(Double.valueOf(Math.ceil(100.0 * ext.getYtj() / ext.getScore())).longValue());
                                         }
                                     }
                                 }
@@ -759,10 +759,10 @@ public class WmScorePackageController {
                                     wmS.setYwctt(ext.getDsh());
                                 } else {
                                     if (null == ext.getYtj() || null == ext.getScore()) {
-                                        wmS.setYwctt(0);
+                                        wmS.setYwctt(0L);
                                     } else {
                                         if (!(ext.getYtj() > ext.getScore())) {
-                                            wmS.setYwctt(new Double(Math.ceil(100.0 * ext.getYtj() / ext.getScore())).intValue());
+                                            wmS.setYwctt(Double.valueOf(Math.ceil(100.0 * ext.getYtj() / ext.getScore())).longValue());
                                         }
                                     }
                                 }
@@ -1712,7 +1712,7 @@ public class WmScorePackageController {
                         }
                         wmScorePackage.setEnableFlag("1");
                         wmScorePackage.setPackageFinishStatus("2");
-                        wmScorePackage2.setKfpjf(new Double(Math.ceil(wmScorePackage2.getKfpjf() + wmId.getScore())).intValue());
+                        wmScorePackage2.setKfpjf(Double.valueOf(Math.ceil(wmScorePackage2.getKfpjf() + wmId.getScore())).longValue());
 
                         wmScorePackage.setPackageIsConduct("0");
 
@@ -1766,7 +1766,7 @@ public class WmScorePackageController {
                 .eq(WmScorePackage::getRelationScoreId, wmScorePackage.getId())
                 .ne(WmScorePackage::getScorePackageStatus, ScorePackageStatusEnum.TERMINATED.val()));
         if (CollUtil.isNotEmpty(subPackages)) {
-            int subPackgesScore = subPackages.stream().mapToInt(WmScorePackage::getScore).sum();
+            long subPackgesScore = subPackages.stream().mapToLong(WmScorePackage::getScore).sum();
             if (wmScorePackage.getScore() < subPackgesScore) {
                 return R.failed(String.format("该积分包已分配%s积分，修改后积分包值需大于该值", subPackgesScore));
             }
@@ -1940,19 +1940,19 @@ public class WmScorePackageController {
                             }
                             if (!wmScorePackage.getRelationScoreId().equals(wmId.getRelationScoreId())) {
                                 if (wmScorePackage.getScore() < wms.getKfpjf() + wmId.getScore()) {
-                                    wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() - wmScorePackage.getScore())).intValue());
+                                    wms.setKfpjf(Double.valueOf(Math.ceil(wms.getKfpjf() - wmScorePackage.getScore())).longValue());
                                 } else {
-                                    wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() - wmScorePackage.getScore())).intValue());
+                                    wms.setKfpjf(Double.valueOf(Math.ceil(wms.getKfpjf() - wmScorePackage.getScore())).longValue());
                                 }
                             } else if (wmScorePackage.getScore() > wms.getKfpjf() + wmId.getScore()) {
                                 return R.failed("可分配积分不足");
                             } else if (wmScorePackage.getScore() < wms.getKfpjf() + wmId.getScore()) {
-                                wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() + wmId.getScore() - wmScorePackage.getScore()))
-                                        .intValue());
+                                wms.setKfpjf(Double.valueOf(Math.ceil(wms.getKfpjf() + wmId.getScore() - wmScorePackage.getScore()))
+                                        .longValue());
                                 wmId.setScore(wmScorePackage.getScore());
                             } else {
-                                wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() + wmId.getScore() - wmScorePackage.getScore()))
-                                        .intValue());
+                                wms.setKfpjf(Double.valueOf(Math.ceil(wms.getKfpjf() + wmId.getScore() - wmScorePackage.getScore()))
+                                        .longValue());
                                 wmId.setScore(wmScorePackage.getScore());
                             }
                         } else if (wms.getKfpjf() != null && CharSequenceUtil.isNotBlank(wmScorePackage.getRelationScoreId()) && wmScorePackage.getScore() > wms.getKfpjf() + wmId.getScore()) {
@@ -1960,7 +1960,7 @@ public class WmScorePackageController {
                         } else if ("".equals(wmScorePackage.getRelationScoreId()) && wms.getId().equals(wmId.getRelationScoreId())) {// 判断关联积分包是否为无
                             wms.setKfpjf(wmId.getScore() + wms.getKfpjf());
                         } else if (wms.getId().equals(wmId.getRelationScoreId())) {
-                            wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() + wmId.getScore())).intValue());
+                            wms.setKfpjf(Double.valueOf(Math.ceil(wms.getKfpjf() + wmId.getScore())).longValue());
                             // 判断是否进行中
                             List<WmScorePackage> wmScorePackages = wmScorePackageService.selectRelationScoreId(wmId.getId());
                             if (CollUtil.isNotEmpty(wmScorePackages)) {
@@ -2048,7 +2048,7 @@ public class WmScorePackageController {
         }
 
         // 查询原积分包值
-        int oldPackageScore = wmScorePackageService.getById(wmScorePackage.getId()).getScore();
+        long oldPackageScore = wmScorePackageService.getById(wmScorePackage.getId()).getScore();
 
         // 屏蔽推广药品企业
         wmScorePackage.setDrugProducerList(null);
@@ -2066,7 +2066,7 @@ public class WmScorePackageController {
         boolean relatedScoreId = CharSequenceUtil.isNotBlank(wmScorePackage.getRelationScoreId()) && Integer.parseInt(wmScorePackage.getRelationScoreId()) > 0;
 
         // 积分值相比修改前的变动（相对于积分余额，增加则为负-消耗，减少则为正-回收）
-        int changeScore = oldPackageScore - wmScorePackage.getScore();
+        long changeScore = oldPackageScore - wmScorePackage.getScore();
 
         if (!relatedScoreId) {
             // 没有关联上级包的情况
@@ -2079,7 +2079,7 @@ public class WmScorePackageController {
                 throw new RuntimeException("积分余额：0。积分不足");
             }
 
-            long currentScore = deptRecharge.getScore() + (long) changeScore;
+            long currentScore = deptRecharge.getScore() + changeScore;
 
             long limitScore = deptRecharge.getScore() + deptRecharge.getOverdrawScore();
             if (changeScore < 0 && Math.abs(changeScore) > limitScore) {
@@ -2104,7 +2104,7 @@ public class WmScorePackageController {
             // 更新积分充值记录
             SysDeptRechargeRecord newRechargeRecord = new SysDeptRechargeRecord();
             newRechargeRecord.setRechargeId(deptRecharge.getId());
-            newRechargeRecord.setChangeScore((long) changeScore);
+            newRechargeRecord.setChangeScore(changeScore);
             newRechargeRecord.setCurrentScore(currentScore);
             newRechargeRecord.setType(RechargeRecordType.RECOVERY);
             newRechargeRecord.setDeptId(deptRecharge.getDeptId());
@@ -2121,7 +2121,7 @@ public class WmScorePackageController {
                         new String[]{wmScorePackage.getRelationScoreId()});
 
                 if (CollUtil.isNotEmpty(scorePackagekfpjf)) {
-                    int kfpjf = scorePackagekfpjf.get(0).getKfpjf();
+                    long kfpjf = scorePackagekfpjf.get(0).getKfpjf();
                     if (Math.abs(changeScore) > kfpjf) {
                         throw new RuntimeException("可分配积分值不足");
                     }
@@ -3431,7 +3431,7 @@ public class WmScorePackageController {
 
             for (BatchPackageExcelModel model : batchPackageExcelModels) {
 
-                scorePackage.setScore(Integer.parseInt(model.getScore()));
+                scorePackage.setScore(Long.parseLong(model.getScore()));
                 scorePackage.setScorePackageName(model.getScorePackageName());
                 scorePackage.setDescription(model.getDescription());
                 scorePackage.setUserList(CharSequenceUtil.isEmpty(model.getTargetId()) ? new ArrayList<>(1) :

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

@@ -762,7 +762,7 @@ public class WmTaskController {
             wmScorePackage = wmScorePackageService.getById(packageId);
 
             if (wmScorePackage.getScore() > 0) {
-                Integer taskScore = 0;
+                long taskScore = 0L;
 
                 // 判断当前积分包已有任务积分
                 WmTask wmTask1 = new WmTask();

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysStatisticManager.java

@@ -422,7 +422,7 @@ public class SysStatisticManager {
                         .in(WmTask::getScorePackageId, collect1));
 
                 if (CollUtil.isNotEmpty(tasks)) {
-                    serviceCompleteRate = String.valueOf(tasks.stream().mapToInt(WmTask::getScore).sum());
+                    serviceCompleteRate = String.valueOf(tasks.stream().mapToLong(WmTask::getScore).sum());
                 }
 
             }
@@ -555,7 +555,7 @@ public class SysStatisticManager {
 
             Map<String, Object> extra = new HashMap<>(9);
 
-            int availScore = (UpmsType.PackageType.TYPE_3.getType().equals(pkg.getTypeid())) ? 0 : pkg.getKfpjf();
+            long availScore = (UpmsType.PackageType.TYPE_3.getType().equals(pkg.getTypeid())) ? 0L : pkg.getKfpjf();
 
             // 执行包分值
             extra.put("pkgScore", pkg.getScore());
@@ -577,9 +577,9 @@ public class SysStatisticManager {
                     .eq(WmTask::getTaskStatus, UpmsState.TaskState.PASSED)
                     .eq(WmTask::getScorePackageId, pkg.getId()));
 
-            int sum = 0;
+            long sum = 0;
             if (CollUtil.isNotEmpty(tasks)) {
-                sum = tasks.stream().mapToInt(WmTask::getScore).sum();
+                sum = tasks.stream().mapToLong(WmTask::getScore).sum();
             }
             extra.put("completedScore", sum);
 
@@ -1041,20 +1041,20 @@ public class SysStatisticManager {
                     deptPkgScoreTotal += userPkgScoreTotal;
 
                     int taskPkgCount = 0;
-                    int taskScoreTotal = 0;
-                    int passedScore = 0;
+                    long taskScoreTotal = 0;
+                    long passedScore = 0;
                     int passedCount = 0;
                     List<WmTask> tasks = userId2TaskMap.get(uId);
                     if (CollUtil.isNotEmpty(tasks)) {
                         Map<String, List<WmTask>> statusMap = tasks.stream().collect(Collectors.groupingBy(WmTask::getTaskStatus));
                         List<WmTask> passed = statusMap.get(UpmsState.TaskState.PASSED.getState());
                         if (CollUtil.isNotEmpty(passed)) {
-                            passedScore = passed.stream().mapToInt(WmTask::getScore).sum();
+                            passedScore = passed.stream().mapToLong(WmTask::getScore).sum();
                             passedCount = passed.size();
                         }
 
                         taskPkgCount = tasks.size();
-                        taskScoreTotal = tasks.stream().mapToInt(WmTask::getScore).sum();
+                        taskScoreTotal = tasks.stream().mapToLong(WmTask::getScore).sum();
                     }
 
                     // 审核通过值
@@ -1168,7 +1168,7 @@ public class SysStatisticManager {
 
             int total = 0;
             int supTotal = 0;
-            int passedScoreTotal = 0;
+            long passedScoreTotal = 0;
             int passedTotal = 0;
             int rejectTotal = 0;
 
@@ -1192,7 +1192,7 @@ public class SysStatisticManager {
 
                     List<Integer> collect2 = supervisions.stream().mapToInt(WmTaskSupervision::getTaskId).boxed().distinct().sorted().collect(Collectors.toList());
 
-                    passedScoreTotal = taskService.listByIds(collect2).stream().mapToInt(WmTask::getScore).sum();
+                    passedScoreTotal = taskService.listByIds(collect2).stream().mapToLong(WmTask::getScore).sum();
 
                     Map<Boolean, List<WmTaskSupervision>> collect1 = supervisions.stream().collect(Collectors.partitioningBy(WmTaskSupervision::getSupervisionResult));
 
@@ -1202,7 +1202,7 @@ public class SysStatisticManager {
             }
 
 
-            Map<String, Integer> stat = new HashMap<>(5);
+            Map<String, Object> stat = new HashMap<>(5);
             // 抽查总数
             stat.put("supTotal", supTotal);
             // 任务总数

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/TaskManager.java

@@ -640,9 +640,9 @@ public class TaskManager {
     // 最后一层审核通过
     if (checkResult && checkReq.getNodeId() == 6) {
       // 查询已提交的任务（除去审核不通过的任务）& 统计判断任务累计积分是否达到积分包的预设值
-      Map<String, Integer> stat = calcTotalScoreAndCount(task.getScorePackageId());
+      Map<String, Long> stat = calcTotalScoreAndCount(task.getScorePackageId());
       //      int tot = stat.get("tot");
-      int passed = stat.get("passed");
+      long passed = stat.get("passed");
 
       boolean finished = (passed + task.getScore()) >= scorePackage.getScore();
 
@@ -684,7 +684,7 @@ public class TaskManager {
     }
   }
 
-  private Map<String, Integer> calcTotalScoreAndCount(String scorePackageId) {
+  private Map<String, Long> calcTotalScoreAndCount(String scorePackageId) {
 
     List<WmTask> submitedTaskList =
         taskMapper.selectList(
@@ -693,14 +693,14 @@ public class TaskManager {
                 .ne(WmTask::getTaskStatus, TaskState.REJECTED.getState())
                 .eq(WmTask::getRealFlag, CommonConstants.STATUS_NORMAL));
 
-    int totalTaskScore = submitedTaskList.stream().mapToInt(WmTask::getScore).sum();
-    int approvedCount =
+    long totalTaskScore = submitedTaskList.stream().mapToLong(WmTask::getScore).sum();
+    long approvedCount =
         submitedTaskList.stream()
             .filter(task -> TaskState.PASSED.getState().equals(task.getTaskStatus()))
-            .map(WmTask::getScore)
-            .reduce(0, Integer::sum);
+            .mapToLong(WmTask::getScore)
+            .sum();
 
-    Map<String, Integer> totalScoreAndCount = new HashMap<>(2);
+    Map<String, Long> totalScoreAndCount = new HashMap<>(2);
     totalScoreAndCount.put("tot", totalTaskScore);
     totalScoreAndCount.put("passed", approvedCount);
     return totalScoreAndCount;
@@ -857,11 +857,11 @@ public class TaskManager {
       pkgId2TasksMap.forEach(
           (k, v) -> {
             // 查询已提交的任务（除去审核不通过的任务）& 统计判断任务累计积分是否达到积分包的预设值
-            Map<String, Integer> stat = calcTotalScoreAndCount(k);
+            Map<String, Long> stat = calcTotalScoreAndCount(k);
             //      int tot = stat.get("tot");
-            int passed = stat.get("passed");
+            long passed = stat.get("passed");
 
-            int sum = v.stream().mapToInt(WmTask::getScore).sum();
+            long sum = v.stream().mapToLong(WmTask::getScore).sum();
 
             boolean finished = (passed + sum) >= id2EntityMap.get(k).getScore();
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmPackageManager.java

@@ -701,7 +701,7 @@ public class WmPackageManager {
 
     // 任务完成百分比（和服务下发的完成百分比一致）
     long approvedTaskScore = tasks.stream().filter(task -> TaskStatusEnum.APPROVED.val().equals(task.getTaskStatus()))
-        .mapToInt(WmTask::getScore).sum();
+        .mapToLong(WmTask::getScore).sum();
     double taskApprovedRate = approvedTaskScore * 100.0 / scorePackage.getScore();
     result.put("taskApprovedScoreRate", String.format("%.2f", taskApprovedRate));
     result.put("taskApprovedScoreRateNinetyPercent", String.format("%.2f", taskApprovedRate * 0.9));

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/ReportExportServiceImpl.java

@@ -145,7 +145,7 @@ public class ReportExportServiceImpl implements ReportExportService {
 
 
 		List<XlsTask> xlsTaskList = new ArrayList<>();//mxTable
-		Integer totalMoney = 0;
+		long totalMoney = 0L;
 //		wmTask.setScorePackageId(null);
 //		wmTask.setScorePackageDrugId(null);
 
@@ -552,9 +552,9 @@ public class ReportExportServiceImpl implements ReportExportService {
 		}
 		// 已提交总值
 		if (CollectionUtil.isNotEmpty(taskList)) {
-			int sum = taskList.stream()
+			long sum = taskList.stream()
 					.filter(wmTask -> wmTask.getScore() != null)
-					.mapToInt(WmTask::getScore)
+					.mapToLong(WmTask::getScore)
 					.sum();
 			excelMap.put("totalSubmitScore", String.format("%.2f", sum / 100.0));
 		}
@@ -803,7 +803,7 @@ public class ReportExportServiceImpl implements ReportExportService {
 
 			if (listPackageIds.size() > 0) {
 				List<WmScorePackage> wmScorePackageList = wmScorePackageService.listByIds(listPackageIds);
-				Integer totalScorePackage = 0;
+				long totalScorePackage = 0L;
 				BigDecimal settleAmount = new BigDecimal("0");
 				if (wmScorePackageList.size() > 0) {
 					for (WmScorePackage wmScorePackage : wmScorePackageList) {
@@ -825,7 +825,7 @@ public class ReportExportServiceImpl implements ReportExportService {
 						.in(WmTask::getScorePackageId, listPackageIds));
 
 				if (CollUtil.isNotEmpty(tasks)){
-					int sum = tasks.stream().mapToInt(WmTask::getScore).sum();
+					long sum = tasks.stream().mapToLong(WmTask::getScore).sum();
 					excelMap.put("submitAmount",sum);
 				}
 			}
@@ -1144,7 +1144,7 @@ public class ReportExportServiceImpl implements ReportExportService {
 
 
 		List<XlsTask> xlsTaskList = new ArrayList<>();//mxTable
-		Integer totalMoney = 0;
+		long totalMoney = 0L;
 //		wmTask.setScorePackageId(null);
 //		wmTask.setScorePackageDrugId(null);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysDeptInvoiceServiceImpl.java

@@ -414,7 +414,7 @@ public class SysDeptInvoiceServiceImpl extends ServiceImpl<SysDeptInvoiceMapper,
         List<WmScorePackage> scorePackages = scorePackageMapper.selectBatchIds(packageIdSet);
 
         // 选择开票的总积分
-        int totalScore = scorePackages.stream().mapToInt(WmScorePackage::getScore).sum();
+        long totalScore = scorePackages.stream().mapToLong(WmScorePackage::getScore).sum();
         // 计算开票金额
         SysDeptRecharge deptRecharge = deptRechargeMapper.selectOne(Wrappers.<SysDeptRecharge>lambdaQuery()
                 .eq(SysDeptRecharge::getDeptId, deptId));

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysExportServiceImpl.java

@@ -155,7 +155,7 @@ public class SysExportServiceImpl implements SysExportService {
 
 			if (listPackageIds.size() > 0) {
 				List<WmScorePackage> wmScorePackageList = wmScorePackageService.listByIds(listPackageIds);
-				Integer totalScorePackage = 0;
+				long totalScorePackage = 0L;
 				BigDecimal settleAmount = new BigDecimal("0");
 				if (wmScorePackageList.size() > 0) {
 					for (WmScorePackage wmScorePackage : wmScorePackageList) {
@@ -172,7 +172,7 @@ public class SysExportServiceImpl implements SysExportService {
 						.in(WmTask::getScorePackageId, listPackageIds));
 
 				if (CollUtil.isNotEmpty(tasks)){
-					int sum = tasks.stream().mapToInt(WmTask::getScore).sum();
+					long sum = tasks.stream().mapToLong(WmTask::getScore).sum();
 					excelMap.put("submitAmount",sum);
 				}
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDeptBudgetServiceImpl.java

@@ -34,7 +34,7 @@ public class WmDeptBudgetServiceImpl extends ServiceImpl<WmDeptBudgetMapper, WmD
 		IPage iPage = wmDeptBudgetMapper.getBudgetViewPage(page,wmDeptBudget);
 		List<BudgetViewOutput> outputList = iPage.getRecords();
 		for (BudgetViewOutput output : outputList) {
-			Integer score = 0;
+			long score = 0;
 			WmScorePackage condition = new WmScorePackage();
 			condition.setSendPackageDeptId(output.getDeclareDept()+"");
 			condition.setDeptId(output.getDeptId()+"");
@@ -56,7 +56,7 @@ public class WmDeptBudgetServiceImpl extends ServiceImpl<WmDeptBudgetMapper, WmD
 		IPage iPage = wmDeptBudgetMapper.getBudgetEntViewPage(page, wmDeptBudget);
 		List<BudgetViewOutput> outputList = iPage.getRecords();
 		for (BudgetViewOutput output : outputList) {
-			Integer score = 0;
+			long score = 0;
 			WmScorePackage condition = new WmScorePackage();
 			condition.setSendPackageDeptId(output.getDeclareDept()+"");
 			condition.setDeptId(output.getDeptId()+"");

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDeptTaskServiceImpl.java

@@ -700,16 +700,16 @@ public class WmDeptTaskServiceImpl implements WmDeptTaskService {
 				.map(WmTaskType::getId).collect(Collectors.toList());
 
 		// 任务总积分(不包括当前提交的积分值)
-		int totalScoreSum = 0;
+		long totalScoreSum = 0;
 		// 企业任务总积分(包括当前提交的积分值)
-		int entTotalScoreSum = 0;
+		long entTotalScoreSum = 0;
 //		totalScoreSum += score;
 		entTotalScoreSum += score;
 		if (CollUtil.isNotEmpty(queryTaskList)) {
-			totalScoreSum += queryTaskList.stream().mapToInt(WmTask::getScore).sum();
+			totalScoreSum += queryTaskList.stream().mapToLong(WmTask::getScore).sum();
 			entTotalScoreSum += queryTaskList.stream()
 					.filter(task -> entTaskTypeIds.contains(task.getTaskTypeId()))
-					.mapToInt(WmTask::getScore).sum();
+					.mapToLong(WmTask::getScore).sum();
 		}
 
 		// 校验是否超过可做任务分值(设n为实际可提交任务总分值, 则n需满足: n + n * 审核管理费比例(%) <= 积分包值)

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmReportServiceImpl.java

@@ -450,10 +450,10 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
                 .ne(WmTask::getTaskStatus, TaskStatusEnum.FAIL_APPROVED.val())
                 .eq(WmTask::getRealFlag, "0"));
         // 统计判断任务累计积分是否达到积分包的预设值
-        int totalTaskScore = submitedTaskList.stream().mapToInt(WmTask::getScore).sum();
-        int approvedCount = submitedTaskList.stream()
+        long totalTaskScore = submitedTaskList.stream().mapToLong(WmTask::getScore).sum();
+        long approvedCount = submitedTaskList.stream()
                 .filter(task -> TaskStatusEnum.APPROVED.val().equals(task.getTaskStatus()))
-                .map(WmTask::getScore).reduce(0, Integer::sum);
+                .mapToLong(WmTask::getScore).sum();
 
         // STEP3: 更新领包记录
         List<WmScorePackageStatus> packageStatusList = wmScorePackageStatusService.list(Wrappers.<WmScorePackageStatus>lambdaQuery()
@@ -507,7 +507,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
                     .eq(WmTask::getRealFlag, "0")
                     .and(wrapper -> wrapper.eq(WmTask::getReportDrugApprovalOpinion, "1")
                             .or().eq(WmTask::getReportOneApprovalOpinion, "1")));
-            int totalScore = approvalTaskList.stream().mapToInt(WmTask::getScore).sum();
+            long totalScore = approvalTaskList.stream().mapToLong(WmTask::getScore).sum();
             String scorePackageStatus = totalScore >= taskScorePackage.getScore() ?
                     ScorePackageStatusEnum.TO_BE_SETTLED.val() : ScorePackageStatusEnum.TO_BE_APPROVAL.val();
             String taskAddFlagStr = totalScore >= taskScorePackage.getScore() ? "0" : "1";
@@ -679,10 +679,10 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
                     .ne(WmTask::getTaskStatus, TaskStatusEnum.FAIL_APPROVED.val())
                     .eq(WmTask::getRealFlag, "0"));
             // 统计判断任务累计积分是否达到积分包的预设值
-            int totalTaskScore = submitedTaskList.stream().mapToInt(WmTask::getScore).sum();
-            int approvedCount = submitedTaskList.stream()
+            long totalTaskScore = submitedTaskList.stream().mapToLong(WmTask::getScore).sum();
+            long approvedCount = submitedTaskList.stream()
                     .filter(task -> TaskStatusEnum.APPROVED.val().equals(task.getTaskStatus()))
-                    .map(WmTask::getScore).reduce(0, Integer::sum);
+                    .mapToLong(WmTask::getScore).sum();
 
             // STEP3: 更新领包记录
             List<WmScorePackageStatus> packageStatusList = wmScorePackageStatusService.list(Wrappers.<WmScorePackageStatus>lambdaQuery()
@@ -737,7 +737,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
                         .eq(WmTask::getRealFlag, "0")
                         .and(wrapper -> wrapper.eq(WmTask::getReportDrugApprovalOpinion, "1")
                                 .or().eq(WmTask::getReportOneApprovalOpinion, "1")));
-                int totalScore = approvalTaskList.stream().mapToInt(WmTask::getScore).sum();
+                long totalScore = approvalTaskList.stream().mapToLong(WmTask::getScore).sum();
                 String scorePackageStatus = totalScore >= taskScorePackage.getScore() ?
                         ScorePackageStatusEnum.TO_BE_SETTLED.val() : approvedCount >= taskScorePackage.getScore() ?
                         ScorePackageStatusEnum.TO_BE_APPROVAL.val() : ScorePackageStatusEnum.IN_PROGRESS.val();
@@ -922,10 +922,10 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
                 updateScorePackage.setId(task.getScorePackageId());
                 if (totalTaskScore >= taskScorePackage.getScore()) {
                     // 上级审核通过的积分值
-                    int superApprovedScore = submitedTaskList.stream()
+                    long superApprovedScore = submitedTaskList.stream()
                             //.filter(t -> TaskStatusEnum.APPROVED.val().equals(t.getTaskStatus()) && ("1".equals(t.getReportDrugApprovalOpinion()) || "1".equals(t.getReportOneApprovalOpinion())))
                             .filter(t -> TaskStatusEnum.APPROVED.val().equals(t.getTaskStatus()) && ("1".equals(t.getReportDrugApprovalOpinion()) && "1".equals(t.getReportOneApprovalOpinion())))
-                            .mapToInt(WmTask::getScore).sum();
+                            .mapToLong(WmTask::getScore).sum();
                     if (superApprovedScore >= taskScorePackage.getScore()) {
                         updateScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.val());
                         updateScorePackage.setPackageFinishTime(LocalDateTime.now());
@@ -953,7 +953,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
                         .eq(WmTask::getReportOneApprovalOpinion, "1");
                 //.and(wrapper -> wrapper.eq(WmTask::getReportDrugApprovalOpinion, "1").or().eq(WmTask::getReportOneApprovalOpinion, "1"));
                 List<WmTask> approvalTaskList = wmTaskService.list(apporvalWrapper);
-                int totalScore = approvalTaskList.stream().mapToInt(WmTask::getScore).sum();
+                long totalScore = approvalTaskList.stream().mapToLong(WmTask::getScore).sum();
                 WmScorePackage taskScorePackage = wmScorePackageService.getById(task.getScorePackageId());
                 if (totalScore >= taskScorePackage.getScore()) {
                     WmScorePackage updateScorePackage = new WmScorePackage();

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackaeServiceImpl.java

@@ -831,18 +831,18 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
         // }
         if (wmScorePackage.getPackageType1().equals("1")) {// 定额
             if (!StringUtil.isEmpty(wmScorePackage.getUserScore()) && wmScorePackage.getUserNum() > 0) {
-                wmScorePackage.setScore(Integer.valueOf(wmScorePackage.getUserScore()) * wmScorePackage.getUserNum());
+                wmScorePackage.setScore(Long.parseLong(wmScorePackage.getUserScore()) * wmScorePackage.getUserNum());
             }
         } else {
             if (!StringUtil.isEmpty(wmScorePackage.getUserScore())) {
                 if (PackageTypeEnum.TYPE1_HCP_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
                     // 如果是患者教育，积分值转换为以'分'为单位保存
-                    int scoreFen = new BigDecimal(wmScorePackage.getUserScore()).multiply(new BigDecimal("100"))
-                            .intValue();
+                    long scoreFen = new BigDecimal(wmScorePackage.getUserScore()).multiply(new BigDecimal("100"))
+                            .longValue();
                     wmScorePackage.setScore(scoreFen);
                     wmScorePackage.setUserScore(String.valueOf(scoreFen));
                 } else {
-                    wmScorePackage.setScore(Integer.valueOf(wmScorePackage.getUserScore()));
+                    wmScorePackage.setScore(Long.valueOf(wmScorePackage.getUserScore()));
                 }
             }
         }
@@ -875,7 +875,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
 //			WmScorePackage wmScorePackage1 = new WmScorePackage();
 //			wmScorePackage1.setId(wmScorePackage.getRelationScoreId());
 //			WmScorePackage wmScorePackage2 = wmScorePackageMapper.selectById(wmScorePackage1.getId());
-            Integer kfpjf = 0;
+            long kfpjf = 0;
 
             List<WmScorePackage> scorePackagekfpjf = this.getScorePackagekfpjf(null, null, new String[]{"0", "1", "2"},
                     new String[]{wmScorePackage.getRelationScoreId()});
@@ -1267,7 +1267,6 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
             }
             if (PackageTypeEnum.TYPE1_HCP_PACKAGE.getName().equals(wmScorePackage1.getPackageType1())) {
                 // 如果是患者教育，则转换积分值 '分'-> '元'
-                Integer score = wmScorePackage1.getScore();
                 String userScore = wmScorePackage1.getUserScore();
                 if (StringUtils.isNumeric(userScore)) {
                     wmScorePackage1.setUserScore(String.format("%.2f", Integer.parseInt(userScore) / 100.0));
@@ -1381,7 +1380,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
         queryWrapper.in(WmScorePackageStatus::getStatus, "2");
         List<WmScorePackageStatus> scorestatusList = wmScorePackageStatusService.list(queryWrapper);
         // 全部终止，终止任务和积分包
-        int recoveryScore = 0;
+        long recoveryScore = 0;
         if ("1".equals(enableType)) {
             wmScorePackage.setScorePackageStatus("6");// 已终止
             // 更新结单
@@ -1410,7 +1409,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
             wmScorePackage.setScorePackageStatus("4");// 已完成待结算
             // 部分终止，收回剩余积分值，没有审核的任务继续审核
             // 先更新任务状态为已审核
-            int resSum = 0;// 收回值
+            long resSum = 0;// 收回值
             boolean pickedButNotSubmitted = false;
             if (CollUtil.isNotEmpty(scorestatusList)) {
                 wmScorePackage.setUserNum(scorestatusList.size());
@@ -1421,13 +1420,13 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
                     wmTask1.setTaskUserId(wmScorePackageStatus.getUserId());
                     wmTask1.setTaskStatus("1,2,3");
                     List<WmTask> taskList1 = wmTaskMapper.selectByTask(wmTask1);
-                    Integer res = 0;
+                    long res = 0;
                     boolean all = false;
                     if (CollUtil.isEmpty(taskList1)) {
                         if (wmScorePackage.getPackageType1().equals("1") || wmScorePackage.getPackageType1()
                                 .equals("5")) {// 定额
                             // 这个用户还没有做任务时，积分值设为0
-                            int userScore = Integer.parseInt(wmScorePackageStatus.getUserScore());
+                            long userScore = Integer.parseInt(wmScorePackageStatus.getUserScore());
                             wmScorePackageStatus.setUserScore("0");
                             // wmScorePackage.setScore(wmScorePackage.getScore() - Integer.parseInt(wmScorePackageStatus.getUserScore()));
                             resSum += userScore;
@@ -1444,23 +1443,23 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
                     } else {
                         if (wmScorePackage.getPackageType1().equals("1") || wmScorePackage.getPackageType1()
                                 .equals("5")) {// 定额
-                            int sum;
+                            long sum;
                             if (wmScorePackage.getRelationScoreId() == null) {
                                 // 审核不通过的不计入
                                 sum = taskList1.stream()
                                         .filter(task1 -> !"4".equals(task1.getTaskStatus()))
-                                        .mapToInt(WmTask::getScore)
+                                        .mapToLong(WmTask::getScore)
                                         .sum();
-                                res = Integer.parseInt(wmScorePackageStatus.getUserScore()) - sum;
+                                res = Long.parseLong(wmScorePackageStatus.getUserScore()) - sum;
                                 if (res > 0) {// 个人积分包值大于任务积分值
                                     wmScorePackageStatus.setUserScore(sum + "");
                                     resSum += res;
                                 }
                             } else {
-                                int passed = taskList1.stream()
+                                long passed = taskList1.stream()
                                         .filter(task -> ReportEnum.APPROVAL_OPINION_YES.getType()
                                                 .equals(task.getReportDrugApprovalOpinion()))
-                                        .mapToInt(WmTask::getScore)
+                                        .mapToLong(WmTask::getScore)
                                         .sum();
                                 if (passed == 0) {
                                     wmScorePackage.setScorePackageStatus("6");// 已终止
@@ -1579,7 +1578,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
             // 新增积分记录
             SysDeptRechargeRecord newRechargeRecord = new SysDeptRechargeRecord();
             newRechargeRecord.setRechargeId(deptRecharge.getId());
-            newRechargeRecord.setChangeScore((long) recoveryScore);
+            newRechargeRecord.setChangeScore(recoveryScore);
             newRechargeRecord.setCurrentScore(currentScore);
             newRechargeRecord.setType(RechargeRecordType.RECOVERY);
             newRechargeRecord.setDeptId(deptRecharge.getDeptId());
@@ -1609,7 +1608,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 // 新增积分记录
                 SysDeptRechargeRecord newRechargeRecord = new SysDeptRechargeRecord();
                 newRechargeRecord.setRechargeId(deptRecharge.getId());
-                newRechargeRecord.setChangeScore((long) recoveryScore);
+                newRechargeRecord.setChangeScore(recoveryScore);
                 newRechargeRecord.setCurrentScore(currentScore);
                 newRechargeRecord.setType(RechargeRecordType.RECOVERY);
                 newRechargeRecord.setDeptId(deptRecharge.getDeptId());
@@ -1629,7 +1628,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
      * @param Id
      * @param score
      */
-    public void updateRelationScore(String Id, Integer score) {
+    public void updateRelationScore(String Id, Long score) {
         WmScorePackage wmScorePackage = wmScorePackageMapper.selectById(Id);
         if (wmScorePackage != null && wmScorePackage.getRelationScoreId() != null) {
             WmScorePackage relationScore = wmScorePackageMapper.selectById(wmScorePackage.getRelationScoreId());
@@ -1652,9 +1651,9 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
         packages.forEach(p -> {
             List<WmScorePackage> scorePackages = relMap.get(p.getId());
-            int sum = 0;
+            long sum = 0;
             if (CollUtil.isNotEmpty(scorePackages)) {
-                sum = scorePackages.stream().mapToInt(WmScorePackage::getScore).sum();
+                sum = scorePackages.stream().mapToLong(WmScorePackage::getScore).sum();
             }
             if (Objects.nonNull(p.getScore())) {
                 p.setScore(p.getScore() - sum);
@@ -1758,18 +1757,18 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
         if (wmScorePackage.getPackageType1().equals("1")) {// 定额
             if (!StringUtil.isEmpty(wmScorePackage.getUserScore()) && wmScorePackage.getUserNum() > 0) {
-                wmScorePackage.setScore(Integer.valueOf(wmScorePackage.getUserScore()) * wmScorePackage.getUserNum());
+                wmScorePackage.setScore(Long.parseLong(wmScorePackage.getUserScore()) * wmScorePackage.getUserNum());
             }
         } else {
             if (!StringUtil.isEmpty(wmScorePackage.getUserScore())) {
                 if (PackageTypeEnum.TYPE1_HCP_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
                     // 如果是患者教育，积分值转换为以'分'为单位保存
-                    int scoreFen = new BigDecimal(wmScorePackage.getUserScore()).multiply(new BigDecimal("100"))
-                            .intValue();
+                    long scoreFen = new BigDecimal(wmScorePackage.getUserScore()).multiply(new BigDecimal("100"))
+                            .longValue();
                     wmScorePackage.setScore(scoreFen);
                     wmScorePackage.setUserScore(String.valueOf(scoreFen));
                 } else {
-                    wmScorePackage.setScore(Integer.valueOf(wmScorePackage.getUserScore()));
+                    wmScorePackage.setScore(Long.valueOf(wmScorePackage.getUserScore()));
                 }
             }
         }
@@ -1777,7 +1776,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
         WmScorePackage oldScorePackage = wmScorePackageMapper.selectById(wmScorePackage.getId());
 
         // 积分值相比修改前的变动（相对于积分余额，增加则为负-消耗，减少则为正-回收）
-        int changeScore = oldScorePackage.getScore() - wmScorePackage.getScore();
+        long changeScore = oldScorePackage.getScore() - wmScorePackage.getScore();
 
         WmScorePackage relationScorePackage = new WmScorePackage();// 关联积分包
         // 判断预积分包值不能大于可分配积分值
@@ -1785,7 +1784,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 .equals("-1")) {
             WmScorePackage wmScorePackage1 = new WmScorePackage();
             wmScorePackage1.setId(wmScorePackage.getRelationScoreId());
-            Integer kfpjf;
+            long kfpjf;
 
             List<WmScorePackage> scorePackagekfpjf = this.getScorePackagekfpjf(null, null, new String[]{"0", "1", "2"},
                     new String[]{wmScorePackage.getRelationScoreId()});
@@ -1975,7 +1974,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
         wmScorePackage.setUpdateUser(SecurityUtils.getUser().getId());
 
         // 查询原积分包值
-        int oldPackageScore = this.getById(wmScorePackage.getId()).getScore();
+        long oldPackageScore = this.getById(wmScorePackage.getId()).getScore();
 
         // 没有上级关联包, 则屏蔽推广药品企业
         wmScorePackage.setDrugProducerList(null);
@@ -2302,7 +2301,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
         List<Map<String, Object>> m = new ArrayList<>(stepB_1.size() + stepB_2.size());
         m.addAll(stepB_1);
         m.addAll(stepB_2);
-        Map<String, Integer> result = step3(m, wmScorePackage);
+        Map<String, Long> result = step3(m, wmScorePackage);
         WmScorePackage p = step4(result, wmScorePackage);
 
         return new AsyncResult<>(p);
@@ -2344,14 +2343,14 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
             );
 
             // 审核通过
-            int shtg = taskList.parallelStream()
+            long shtg = taskList.parallelStream()
                     .filter(t -> StrUtil.equals(t.getReportDrugApprovalOpinion(), "1") || StrUtil.equals(t.getReportOneApprovalOpinion(), "1"))
-                    .mapToInt(WmTask::getScore)
+                    .mapToLong(WmTask::getScore)
                     .sum();
             // 审核 不通过
-            int shbtg = taskList.parallelStream()
+            long shbtg = taskList.parallelStream()
                     .filter(t -> StrUtil.equals(t.getReportDrugApprovalOpinion(), "2") || StrUtil.equals(t.getReportOneApprovalOpinion(), "2"))
-                    .mapToInt(WmTask::getScore)
+                    .mapToLong(WmTask::getScore)
                     .sum();
             // 审核通过数
             long shtgnum = taskList.parallelStream()
@@ -2362,24 +2361,24 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
                     .filter(t -> StrUtil.equals(t.getReportDrugApprovalOpinion(), "2") || StrUtil.equals(t.getReportOneApprovalOpinion(), "2"))
                     .count();
             // 平台未审核
-            int temp = taskList.parallelStream()
+            long temp = taskList.parallelStream()
                     .filter(t -> StrUtil.equals(t.getTaskStatus().trim(), "1"))
-                    .mapToInt(WmTask::getScore)
+                    .mapToLong(WmTask::getScore)
                     .sum();
             // 待审核
-            int dsh = taskList.parallelStream()
+            long dsh = taskList.parallelStream()
                     .filter(t -> StrUtil.equals(t.getTaskStatus().trim(), "2"))
-                    .mapToInt(WmTask::getScore)
+                    .mapToLong(WmTask::getScore)
                     .sum();
             // 已审核
-            int ysh = taskList.parallelStream()
+            long ysh = taskList.parallelStream()
                     .filter(t -> StrUtil.equals(t.getTaskStatus().trim(), "3"))
-                    .mapToInt(WmTask::getScore)
+                    .mapToLong(WmTask::getScore)
                     .sum();
             // 已审核数
             long yshnum = taskList.parallelStream().filter(t -> StrUtil.equals(t.getTaskStatus(), "3")).count();
             // 已提交
-            int ytj = temp + dsh + ysh;
+            long ytj = temp + dsh + ysh;
 
             // 已审核百分比
             long yshtt = 0;
@@ -2388,7 +2387,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
             // 审核不通过百分比
             long shbtgtt = 0;
             if (StrUtil.equals(scorePackage.getPackageType1(), "1")) {
-                int score = scorePackage.getScore();
+                long score = scorePackage.getScore();
                 yshtt = ysh * 100L / score;
                 yshtt = yshtt > 100 ? 100 : yshtt;
 
@@ -2508,7 +2507,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
             if (PackageTypeEnum.TYPE1_HCP_PACKAGE.getName().equals(scorePackage.getPackageType1())) {
                 // 如果是患者教育，则转换积分值 '分'-> '元'
-                Integer score = scorePackage.getScore();
+                long score = scorePackage.getScore();
                 String userScore = scorePackage.getUserScore();
                 if (StringUtils.isNumeric(userScore)) {
                     scorePackage.setUserScore(String.format("%.2f", Integer.parseInt(userScore) / 100.0));
@@ -2570,14 +2569,14 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
         );
 
         // 审核通过
-        int shtg = taskList.parallelStream()
+        long shtg = taskList.parallelStream()
                 .filter(t -> StrUtil.equals(t.getReportDrugApprovalOpinion(), "1") || StrUtil.equals(t.getReportOneApprovalOpinion(), "1"))
-                .mapToInt(WmTask::getScore)
+                .mapToLong(WmTask::getScore)
                 .sum();
         // 审核 不通过
-        int shbtg = taskList.parallelStream()
+        long shbtg = taskList.parallelStream()
                 .filter(t -> StrUtil.equals(t.getReportDrugApprovalOpinion(), "2") || StrUtil.equals(t.getReportOneApprovalOpinion(), "2"))
-                .mapToInt(WmTask::getScore)
+                .mapToLong(WmTask::getScore)
                 .sum();
         // 审核通过数
         long shtgnum = taskList.parallelStream()
@@ -2588,24 +2587,24 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 .filter(t -> StrUtil.equals(t.getReportDrugApprovalOpinion(), "2") || StrUtil.equals(t.getReportOneApprovalOpinion(), "2"))
                 .count();
         // 平台未审核
-        int temp = taskList.parallelStream()
+        long temp = taskList.parallelStream()
                 .filter(t -> StrUtil.equals(t.getTaskStatus(), "1"))
-                .mapToInt(t -> t.getScore() == null ? 0 : t.getScore())
+                .mapToLong(t -> t.getScore() == null ? 0 : t.getScore())
                 .sum();
         // 待审核
-        int dsh = taskList.parallelStream()
+        long dsh = taskList.parallelStream()
                 .filter(t -> StrUtil.equals(t.getTaskStatus(), "2"))
-                .mapToInt(t -> t.getScore() == null ? 0 : t.getScore())
+                .mapToLong(t -> t.getScore() == null ? 0 : t.getScore())
                 .sum();
         // 已审核
-        int ysh = taskList.parallelStream()
+        long ysh = taskList.parallelStream()
                 .filter(t -> StrUtil.equals(t.getTaskStatus(), "3"))
-                .mapToInt(t -> t.getScore() == null ? 0 : t.getScore())
+                .mapToLong(t -> t.getScore() == null ? 0 : t.getScore())
                 .sum();
         // 已审核数
         long yshnum = taskList.parallelStream().filter(t -> StrUtil.equals(t.getTaskStatus(), "3")).count();
         // 已提交
-        int ytj = temp + dsh + ysh;
+        long ytj = temp + dsh + ysh;
 
         // 已审核百分比
         long yshtt = 0;
@@ -2615,7 +2614,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
         long shbtgtt = 0;
         if (StrUtil.equals(scorePackage.getPackageType1(), PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val())
                 || StrUtil.equals(scorePackage.getPackageType1(), PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val())) {
-            int score = scorePackage.getScore();
+            long score = scorePackage.getScore();
             if (score != 0) {
                 yshtt = ysh * 100L / score;
                 yshtt = yshtt > 100 ? 100 : yshtt;
@@ -2752,10 +2751,10 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
         if (PackageTypeEnum.TYPE1_HCP_PACKAGE.getName().equals(scorePackage.getPackageType1())) {
             // 如果是患者教育，则转换积分值 '分'-> '元'
-            Integer score = scorePackage.getScore();
+            long score = scorePackage.getScore();
             String userScore = scorePackage.getUserScore();
             if (StringUtils.isNumeric(userScore)) {
-                scorePackage.setUserScore(String.format("%.2f", Integer.parseInt(userScore) / 100.0));
+                scorePackage.setUserScore(String.format("%.2f", Long.parseLong(userScore) / 100.0));
             }
         }
 
@@ -2844,14 +2843,14 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
         List<String> reportWaitingCheckStatus = Arrays.asList("0", "1", "2", "3", "4");
 
         // 审核通过
-        int shtg = taskList.parallelStream()
+        long shtg = taskList.parallelStream()
                 .filter(t -> StrUtil.equals(t.getReportDrugApprovalOpinion(), "1") && StrUtil.equals(t.getReportOneApprovalOpinion(), "1"))
-                .mapToInt(WmTask::getScore)
+                .mapToLong(WmTask::getScore)
                 .sum();
         // 审核 不通过
-        int shbtg = taskList.parallelStream()
+        long shbtg = taskList.parallelStream()
                 .filter(t -> StrUtil.equals(t.getReportDrugApprovalOpinion(), "2") || StrUtil.equals(t.getReportOneApprovalOpinion(), "2"))
-                .mapToInt(WmTask::getScore)
+                .mapToLong(WmTask::getScore)
                 .sum();
         // 审核通过数
         long shtgnum = taskList.parallelStream()
@@ -2862,25 +2861,25 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 .filter(t -> StrUtil.equals(t.getReportDrugApprovalOpinion(), "2") || StrUtil.equals(t.getReportOneApprovalOpinion(), "2"))
                 .count();
         // 平台未审核
-        int temp = taskList.parallelStream()
+        long temp = taskList.parallelStream()
                 .filter(t -> StrUtil.equals(t.getTaskStatus().trim(), "1"))
                 .mapToInt(t -> t.getScore() == null ? 0 : t.getScore())
                 .sum();
         // 待审核
-        int dsh = taskList.parallelStream()
+        long dsh = taskList.parallelStream()
                 .filter(t -> StrUtil.equals(t.getTaskStatus().trim(), "2"))
                 .mapToInt(t -> t.getScore() == null ? 0 : t.getScore())
                 .sum();
         log.info("dsh_val:<--{}-->", dsh);
         // 已审核
-        int ysh = taskList.parallelStream()
+        long ysh = taskList.parallelStream()
                 .filter(t -> StrUtil.equals(t.getTaskStatus().trim(), "3"))
                 .mapToInt(t -> t.getScore() == null ? 0 : t.getScore())
                 .sum();
         // 已审核数
         long yshnum = taskList.parallelStream().filter(t -> StrUtil.equals(t.getTaskStatus().trim(), "3")).count();
         // 已提交
-        int ytj = temp + dsh + ysh;
+        long ytj = temp + dsh + ysh;
 
         // 已审核百分比
         long yshtt = 0;
@@ -2890,7 +2889,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
         long shbtgtt = 0;
         if (StrUtil.equals(scorePackage.getPackageType1(), PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val())
                 || StrUtil.equals(scorePackage.getPackageType1(), PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val())) {
-            int score = scorePackage.getScore();
+            long score = scorePackage.getScore();
             if (score != 0) {
                 yshtt = ysh * 100L / score;
                 yshtt = yshtt > 100 ? 100 : yshtt;
@@ -3139,9 +3138,9 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
     }
 
 
-    public Map<String, Integer> step3(List<Map<String, Object>> m, WmScorePackage wmScorePackage) {
-        int payScore = 0;
-        int ysh = 0;
+    public Map<String, Long> step3(List<Map<String, Object>> m, WmScorePackage wmScorePackage) {
+        long payScore = 0L;
+        long ysh = 0L;
 
         for (Map<String, Object> tmp : m) {
             for (Map.Entry<String, Object> entry : tmp.entrySet()) {
@@ -3179,19 +3178,19 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
     }
 
 
-    public WmScorePackage step4(Map<String, Integer> payScoreAndYsh, WmScorePackage wmScorePackage) {
-        int payScore = payScoreAndYsh.get("payScore");
-        int ysh = payScoreAndYsh.get("ysh");
+    public WmScorePackage step4(Map<String, Long> payScoreAndYsh, WmScorePackage wmScorePackage) {
+        long payScore = payScoreAndYsh.get("payScore");
+        long ysh = payScoreAndYsh.get("ysh");
 
         // 完成积分值(最终完成积分值 = 完成积分值 * (1+审核管理费比例))
-        int actualScore = BigDecimal.valueOf(ysh).multiply(
+        long actualScore = BigDecimal.valueOf(ysh).multiply(
                 wmScorePackage.getAuditManagementFeeRates().divide(new BigDecimal("100.00"), 2, RoundingMode.HALF_EVEN).add(BigDecimal.ONE)
-        ).intValue();
+        ).longValue();
 
         // payScore(payScore = 完成积分值 * (1+审核管理费比例))
-        int actualPayScore = BigDecimal.valueOf(payScore).multiply(
+        long actualPayScore = BigDecimal.valueOf(payScore).multiply(
                 wmScorePackage.getAuditManagementFeeRates().divide(new BigDecimal("100.00"), 2, RoundingMode.HALF_EVEN).add(BigDecimal.ONE)
-        ).intValue();
+        ).longValue();
 
         BigDecimal payRate = new BigDecimal(actualPayScore).multiply(BigDecimal.valueOf(100))
                 .divide(new BigDecimal(wmScorePackage.getScore()), 2, RoundingMode.HALF_UP);
@@ -3462,7 +3461,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
             throw new RuntimeException("已选择的任务不存在");
         }
         // 校验已选择的任务分值
-        int selectTaskScore = selectTaskList.stream().mapToInt(WmTask::getScore).sum();
+        long selectTaskScore = selectTaskList.stream().mapToLong(WmTask::getScore).sum();
         if (!unpackDTO.getSelectTaskScore().equals(selectTaskScore)) {
             throw new RuntimeException("已选任务分值不正确");
         }
@@ -3471,7 +3470,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
             throw new RuntimeException("“已选总任务积分”必须小于“总积分包值”");
         }
         // 拆包后的原积分包包值：取剩任务分值
-        int oldScorePackageScore = scorePackage.getScore() - selectTaskScore;
+        long oldScorePackageScore = scorePackage.getScore() - selectTaskScore;
         if (!unpackDTO.getRemainPackageScore().equals(oldScorePackageScore)) {
             throw new RuntimeException("原积分包剩余积分包值不正确");
         }
@@ -3591,7 +3590,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
         List<WmTask> taskList = wmTaskMapper.selectList(Wrappers.<WmTask>lambdaQuery().eq(WmTask::getScorePackageId, packageId)
                 .eq(WmTask::getDelFlag, DelEnum.NOT_DEL.getVal())
                 .eq(WmTask::getEnableFlag, EnableEnum.ENABLE.val()));
-        int approvedScore = 0;
+        long approvedScore = 0L;
         if (CollUtil.isNotEmpty(taskList)) {
             // 个人包审核情况
             boolean pendingTaskApprovalFlag = taskList.stream()
@@ -3623,7 +3622,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
                         .collect(Collectors.toList());
                 // 审核通过的积分
                 approvedScore = approvedTasks.stream()
-                        .mapToInt(WmTask::getScore).sum();
+                        .mapToLong(WmTask::getScore).sum();
             } else {
                 // 没有关联大包的情况
                 // 审核通过的任务
@@ -3632,7 +3631,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
                         .collect(Collectors.toList());
                 // 审核通过的积分
                 approvedScore = approvedTasks.stream()
-                        .mapToInt(WmTask::getScore).sum();
+                        .mapToLong(WmTask::getScore).sum();
             }
         }
 
@@ -3707,7 +3706,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 
         // 回收积分
-        int recoveryScore = 0;
+        long recoveryScore = 0;
         if (UpmsType.TerminatePackageType.ALL.equals(terminatePackageType)) {
             // 全部终止
             recoveryScore = scorePackage.getScore();
@@ -3759,13 +3758,13 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
         }
 
         // 已分配积分值
-        int assignedScore = 0;
+        long assignedScore = 0;
         // 查询子包的积分
         List<WmScorePackage> subPackages = this.list(Wrappers.<WmScorePackage>lambdaQuery()
                 .eq(WmScorePackage::getRelationScoreId, packageId)
                 .ne(WmScorePackage::getScorePackageStatus, ScorePackageStatusEnum.TERMINATED.val()));
         if (CollUtil.isNotEmpty(subPackages)) {
-            assignedScore += subPackages.stream().mapToInt(WmScorePackage::getScore).sum();
+            assignedScore += subPackages.stream().mapToLong(WmScorePackage::getScore).sum();
         }
         // 查询企业任务的积分
         List<WmTask> entTaskList = wmTaskMapper.selectList(Wrappers.<WmTask>lambdaQuery()
@@ -3775,9 +3774,9 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
         }
 
         // 实际已分配积分值(实际已分配积分值 = 已分配积分值 * (1+审核管理费比例))
-        int actualAssignedScore = BigDecimal.valueOf(assignedScore).multiply(
+        long actualAssignedScore = BigDecimal.valueOf(assignedScore).multiply(
                 scorePackage.getAuditManagementFeeRates().divide(new BigDecimal("100.00"), RoundingMode.HALF_EVEN).add(BigDecimal.ONE)
-        ).intValue();
+        ).longValue();
         log.info("当前积分包pacakgeId={},已分配积分值={},实际已分配积分值={}", scorePackage.getId(), assignedScore, actualAssignedScore);
 
         log.info("当前积分包终止前数据:{}", scorePackage);
@@ -3804,7 +3803,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
             updateEntity.setId(packageId);
             updateEntity.setEnableType(terminatePackageType.getEnableType());
             updateEntity.setScore(assignedScore);
-            updateEntity.setKfpjf(0);
+            updateEntity.setKfpjf(0L);
             updateEntity.setUpdateTime(now);
             updateEntity.setUpdateUser(userId);
             log.info("更新积分包参数:{}", updateEntity);
@@ -3812,7 +3811,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
         }
 
         // 回收积分值
-        int recoveryScore = 0;
+        long recoveryScore = 0;
         if (UpmsType.TerminatePackageType.ALL.equals(terminatePackageType) || assignedScore <= 0) {
             // 回收整包积分值
             recoveryScore = scorePackage.getScore();
@@ -3847,7 +3846,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
      * @param packageId     积分包id
      * @param recoveryScore 回收积分值
      */
-    private void updateDeptRecharge(String packageId, int recoveryScore) {
+    private void updateDeptRecharge(String packageId, long recoveryScore) {
         Integer userId = SecurityUtils.getUser().getId();
         Integer deptId = SecurityUtils.getUser().getDeptId();
         LocalDateTime now = LocalDateTime.now();
@@ -3878,8 +3877,8 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
         // 新增积分记录
         SysDeptRechargeRecord newRechargeRecord = new SysDeptRechargeRecord();
         newRechargeRecord.setRechargeId(deptRecharge.getId());
-        newRechargeRecord.setChangeScore((long) recoveryScore);
-        newRechargeRecord.setCurrentScore((long) currentScore);
+        newRechargeRecord.setChangeScore(recoveryScore);
+        newRechargeRecord.setCurrentScore(currentScore);
         newRechargeRecord.setType(RechargeRecordType.RECOVERY);
         newRechargeRecord.setDeptId(deptRecharge.getDeptId());
         if (rechargeRecord != null) {
@@ -3927,11 +3926,11 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
                     .eq(WmScorePackage::getDelFlag, DelEnum.NOT_DEL.getVal())
                     .eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE.val())
                     .ne(WmScorePackage::getScorePackageStatus, ScorePackageStatusEnum.TERMINATED.val()));
-            Map<String, Integer> relatedPackageScoresMap = new HashMap<>();
+            Map<String, Long> relatedPackageScoresMap = new HashMap<>();
             if (CollUtil.isNotEmpty(subPackages)) {
                 // 已分配的积分
                 relatedPackageScoresMap = subPackages.stream()
-                        .collect(Collectors.groupingBy(WmScorePackage::getRelationScoreId, Collectors.summingInt(WmScorePackage::getScore)));
+                        .collect(Collectors.groupingBy(WmScorePackage::getRelationScoreId, Collectors.summingLong(WmScorePackage::getScore)));
             }
 
             // 查询当前积分包的直接关联的任务
@@ -3947,18 +3946,18 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
                         .collect(Collectors.groupingBy(WmTask::getScorePackageId, Collectors.summingInt(WmTask::getScore)));
             }
 
-            Map<String, Integer> finalRelatedPackageScoresMap = relatedPackageScoresMap;
+            Map<String, Long> finalRelatedPackageScoresMap = relatedPackageScoresMap;
             Map<String, Integer> finalRelatedTaskScoresMap = relatedTaskScoresMap;
             packages.forEach(pkg -> {
                 String packageId = pkg.getId();
                 // 统计可分配积分值
-                Integer score = pkg.getScore();
+                long score = pkg.getScore();
                 // 实际可下发积分值 = 可分配积分值 / (1+审核管理费比例)
-                int actualScore = BigDecimal.valueOf(score).divide(
+                long actualScore = BigDecimal.valueOf(score).divide(
                         pkg.getAuditManagementFeeRates().divide(new BigDecimal("100.00"), RoundingMode.HALF_EVEN)
                                 .add(BigDecimal.ONE),
                         RoundingMode.HALF_EVEN
-                ).intValue();
+                ).longValue();
 
                 // 减去直接关联的下级包的积分值
                 if (finalRelatedPackageScoresMap.containsKey(packageId)) {
@@ -4129,7 +4128,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
                             new String[]{wmScorePackage.getRelationScoreId()});
 
             if (CollUtil.isNotEmpty(scorePackagekfpjf)) {
-                int kfpjf = scorePackagekfpjf.get(0).getKfpjf();
+                long kfpjf = scorePackagekfpjf.get(0).getKfpjf();
                 if (wmScorePackage.getScore() > kfpjf) {
                     log.error("可分配积分值不足");
                     throw new BizException("可分配积分值不足");
@@ -4292,7 +4291,7 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 WmScorePackage relPkg = this.getById(relPkgId);
                 // 是当前操作人所在企业的的关联包
                 if (relPkg != null && deptId.toString().equals(relPkg.getDeptId())) {
-                    relPkg.setKfpjf((int) Math.ceil(relPkg.getKfpjf() - wmScorePackage.getScore()));
+                    relPkg.setKfpjf(Double.valueOf(Math.ceil(relPkg.getKfpjf() - wmScorePackage.getScore())).longValue());
                     // 判断积分包是否被发放 (原有外包业务逻辑，不知道为什么)
                     int count = this.count(Wrappers.<WmScorePackage>lambdaQuery()
                             .ne(WmScorePackage::getId, wmScorePackage.getId())
@@ -4474,11 +4473,11 @@ public class WmScorePackaeServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 pkg.setStartTime(planIssue);
                 pkg.setEndTime(plan.getPlanExpiry());
                 pkg.setEntTaskLimit(BigDecimal.ZERO);
-                pkg.setKfpjf(0);
+                pkg.setKfpjf(0L);
                 pkg.setPlanId(plan.getPlanId());
                 pkg.setRelatedService(deptId.toString());
                 pkg.setRelationScoreId("");
-                pkg.setScore(plan.getPlanScore().intValue());
+                pkg.setScore(plan.getPlanScore());
                 pkg.setScorePackageName(res.getPkgName());
                 pkg.setWmScoreTaskTypeList(scoreTaskTypes);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageStatusServiceImpl.java

@@ -177,7 +177,7 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
         wmScorePackageStatus = this.getById(wmScorePackageStatus.getId());
         wmScorePackageStatus.setEnableType(enableType);
         WmScorePackage wmScorePackage1 = wmScorePackageMapper.selectById(wmScorePackageStatus.getPackageId());
-        Integer res = 0;
+        long res = 0;
         wmScorePackageStatus.setTaskAddFlag("0");// 不允许新增任务
         if ("1".equals(enableType)) {// 全部收回
             wmScorePackage1.setIsReceive("0");// 允许接单
@@ -211,8 +211,8 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
 
             } else {
                 if (wmScorePackage1.getPackageType1().equals("1")) {// 定额
-                    Integer sum = taskList.stream().mapToInt(WmTask::getScore).sum();
-                    res = Integer.valueOf(wmScorePackageStatus.getUserScore()) - sum;
+                    long sum = taskList.stream().mapToLong(WmTask::getScore).sum();
+                    res = Long.parseLong(wmScorePackageStatus.getUserScore()) - sum;
                     if (res > 0) {// 个人积分包值大于任务积分值
                         wmScorePackageStatus.setUserScore(sum + "");
                     }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -379,7 +379,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                         //    }
                         //}
 
-                        int total1 = wmTasks.stream().mapToInt(WmTask::getScore).sum();
+                        long total1 = wmTasks.stream().mapToLong(WmTask::getScore).sum();
                         Map<String, Object> totalMap = new HashMap<>(6);
                         totalMap.put("score_count", wmTasks.size());
                         totalMap.put("score", total1);
@@ -1140,7 +1140,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                     String sendDeptId = wmScorePackage.getSendPackageDeptId();
                     if (CollUtil.isNotEmpty(wmTasks)) {
                         int total = wmTasks.size();
-                        int sum = wmTasks.stream().mapToInt(WmTask::getScore).sum();
+                        long sum = wmTasks.stream().mapToLong(WmTask::getScore).sum();
                         Integer deptId = SecurityUtils.getUser().getDeptId();
                         Date date = new Date();
                         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -2586,10 +2586,10 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                 .eq(WmTask::getScorePackageId, scorePackageId)
                 .ne(WmTask::getTaskStatus, TaskStatusEnum.FAIL_APPROVED.val())
                 .eq(WmTask::getRealFlag, "0"));
-        int totalCount = wmTaskList.stream().map(WmTask::getScore).reduce(0, Integer::sum);
-        int approvedCount = wmTaskList.stream()
+        long totalCount = wmTaskList.stream().mapToLong(WmTask::getScore).sum();
+        long approvedCount = wmTaskList.stream()
                 .filter(task -> TaskStatusEnum.APPROVED.val().equals(task.getTaskStatus()))
-                .map(WmTask::getScore).reduce(0, Integer::sum);
+                .mapToLong(WmTask::getScore).sum();
 
         // 标记任务总积分 是否超过积分包的值（标记小程序能不能做任务）
         String totalTaskAddFlagStr = totalCount >= wmScorePackage.getScore() ? "0" : "1";
@@ -2745,10 +2745,10 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                 .eq(WmTask::getScorePackageId, scorePackageId)
                 .ne(WmTask::getTaskStatus, TaskStatusEnum.FAIL_APPROVED.val())
                 .eq(WmTask::getRealFlag, "0"));
-        int totalCount = wmTaskList.stream().map(WmTask::getScore).reduce(0, Integer::sum);
-        int approvedCount = wmTaskList.stream()
+        long totalCount = wmTaskList.stream().mapToLong(WmTask::getScore).sum();
+        long approvedCount = wmTaskList.stream()
                 .filter(task -> TaskStatusEnum.APPROVED.val().equals(task.getTaskStatus()))
-                .map(WmTask::getScore).reduce(0, Integer::sum);
+                .mapToLong(WmTask::getScore).sum();
 
         // 标记任务总积分 是否超过积分包的值（标记小程序能不能做任务）
         String totalTaskAddFlagStr = totalCount >= wmScorePackage.getScore() ? "0" : "1";

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskSubmissionPercentRuleServiceImpl.java

@@ -173,8 +173,8 @@ public class WmTaskSubmissionPercentRuleServiceImpl
 					List<WmTask> wmTaskList = wmTaskMapper.selectList(queryWrapper);
 
 					if (CollectionUtil.isNotEmpty(wmTaskList)) {
-						int totalScore = scorePackage.getScore();
-						int partScore = wmTaskList.stream().mapToInt(WmTask::getScore).sum();
+						long totalScore = scorePackage.getScore();
+						long partScore = wmTaskList.stream().mapToLong(WmTask::getScore).sum();
 						double rate = partScore * 100.0 / totalScore;
 						if (rate - Double.parseDouble(rule.getLimitPercent()) >= 0.01) {
 							log.info("两位小数精度校验通过");

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmUserSignServiceImpl.java

@@ -327,7 +327,7 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
         // 20210120 目前 1-定额  1包1人  2-定量   1包多人
         if ("1".equals(tWmScorePackage.getPackageType1())) {
 
-            int totalCount = wmTaskList.stream().mapToInt(WmTask::getScore).sum();
+            long totalCount = wmTaskList.stream().mapToLong(WmTask::getScore).sum();
 
             if (totalCount >= tWmScorePackage.getScore()) {
                 tWmScorePackage.setTaskAddFlag("0");

hnqz-visual/hnqz-report-biz/src/main/java/com/qunzhixinxi/hnqz/report/service/impl/ExcelReportExportServiceImpl.java

@@ -400,13 +400,13 @@ public class ExcelReportExportServiceImpl implements ExcelReportExportService {
             Map<String, Object> briefTable1Params = new HashMap<>();
             briefTable1Params.put("task_type_name", scoreTaskTypeDictMap.get(parentId));
             briefTable1Params.put("task_count", wmTasks.size());
-            briefTable1Params.put("task_sum", wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+            briefTable1Params.put("task_sum", wmTasks.stream().mapToLong(WmTask::getScore).sum());
             briefTable1List.add(briefTable1Params);
         });
         Map<String, Object> briefTable1TotalParams = new HashMap<>();
         briefTable1TotalParams.put("task_type_name", "合计");
         briefTable1TotalParams.put("task_count", taskList.size());
-        briefTable1TotalParams.put("task_sum", taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+        briefTable1TotalParams.put("task_sum", taskList.stream().mapToLong(WmTask::getScore).sum());
         briefTable1List.add(briefTable1TotalParams);
 
         // task通过taskTypeId分组
@@ -418,13 +418,13 @@ public class ExcelReportExportServiceImpl implements ExcelReportExportService {
             Map<String, Object> briefTable1Params = new HashMap<>();
             briefTable1Params.put("task_type_name", taskTypeIdMap.get(taskTypeId).getTaskTypeName());
             briefTable1Params.put("task_count", wmTasks.size());
-            briefTable1Params.put("task_sum", wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+            briefTable1Params.put("task_sum", wmTasks.stream().mapToLong(WmTask::getScore).sum());
             briefTable1bList.add(briefTable1Params);
         });
         Map<String, Object> briefTable11TotalParams = new HashMap<>();
         briefTable11TotalParams.put("task_type_name", "合计");
         briefTable11TotalParams.put("task_count", taskList.size());
-        briefTable11TotalParams.put("task_sum", taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+        briefTable11TotalParams.put("task_sum", taskList.stream().mapToLong(WmTask::getScore).sum());
         briefTable1bList.add(briefTable11TotalParams);
 
         // 封装brief table2数据（统计每个人任务积分、任务数）
@@ -435,13 +435,13 @@ public class ExcelReportExportServiceImpl implements ExcelReportExportService {
             Map<String, Object> briefTable2Map = new HashMap<>();
             briefTable2Map.put("user_name", sysUser.getRealname());
             briefTable2Map.put("user_task_count", wmTasks.size());
-            briefTable2Map.put("user_task_sum", wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+            briefTable2Map.put("user_task_sum", wmTasks.stream().mapToLong(WmTask::getScore).sum());
             briefTable2List.add(briefTable2Map);
         });
         Map<String, Object> briefTable2TotalParams = new HashMap<>();
         briefTable2TotalParams.put("user_name", "合计");
         briefTable2TotalParams.put("user_task_count", taskList.size());
-        briefTable2TotalParams.put("user_task_sum", taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+        briefTable2TotalParams.put("user_task_sum", taskList.stream().mapToLong(WmTask::getScore).sum());
         briefTable2List.add(briefTable2TotalParams);
 
         // 查询所有涉及到的userId
@@ -463,7 +463,7 @@ public class ExcelReportExportServiceImpl implements ExcelReportExportService {
                 Map<String, Object> detailTableMap = new HashMap<>();
                 detailTableMap.put("user_name", userMap.get(Integer.valueOf(k)));
                 detailTableMap.put("task_type", scoreTaskTypeDictMap.get(x));
-                detailTableMap.put("score", y.stream().mapToInt(WmTask::getScore).sum());
+                detailTableMap.put("score", y.stream().mapToLong(WmTask::getScore).sum());
                 detailTableMap.put("finish_time", DateUtil.format(y.stream().max(Comparator.comparing(WmTask::getCreateTime)).get().getCreateTime(), DatePattern.NORM_DATE_PATTERN));
                 detailTableMap.put("ent_name", (wmDaDrugEnt == null) ? ((sysDept == null) ? "无" : sysDept.getName()) : wmDaDrugEnt.getEntname());
                 detailTableList.add(detailTableMap);

hnqz-visual/hnqz-report-biz/src/main/java/com/qunzhixinxi/hnqz/report/service/impl/ExcelReportReviewExportServiceImpl.java

@@ -327,13 +327,13 @@ public class ExcelReportReviewExportServiceImpl implements ExcelReportExportServ
             Map<String, Object> briefTable1Params = new HashMap<>();
             briefTable1Params.put("task_type_name", scoreTaskTypeDictMap.get(parentId));
             briefTable1Params.put("task_count", wmTasks.size());
-            briefTable1Params.put("task_sum", wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+            briefTable1Params.put("task_sum", wmTasks.stream().mapToLong(WmTask::getScore).sum());
             briefTable1List.add(briefTable1Params);
         });
         Map<String, Object> briefTable1TotalParams = new HashMap<>();
         briefTable1TotalParams.put("task_type_name", "合计");
         briefTable1TotalParams.put("task_count", taskList.size());
-        briefTable1TotalParams.put("task_sum", taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+        briefTable1TotalParams.put("task_sum", taskList.stream().mapToLong(WmTask::getScore).sum());
         briefTable1List.add(briefTable1TotalParams);
 
         // task通过taskTypeId分组
@@ -345,13 +345,13 @@ public class ExcelReportReviewExportServiceImpl implements ExcelReportExportServ
             Map<String, Object> briefTable1Params = new HashMap<>();
             briefTable1Params.put("task_type_name", taskTypeIdMap.get(taskTypeId).getTaskTypeName());
             briefTable1Params.put("task_count", wmTasks.size());
-            briefTable1Params.put("task_sum", wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+            briefTable1Params.put("task_sum", wmTasks.stream().mapToLong(WmTask::getScore).sum());
             briefTable1bList.add(briefTable1Params);
         });
         Map<String, Object> briefTable11TotalParams = new HashMap<>();
         briefTable11TotalParams.put("task_type_name", "合计");
         briefTable11TotalParams.put("task_count", taskList.size());
-        briefTable11TotalParams.put("task_sum", taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+        briefTable11TotalParams.put("task_sum", taskList.stream().mapToLong(WmTask::getScore).sum());
         briefTable1bList.add(briefTable11TotalParams);
 
         // 封装brief table2数据（统计每个人任务积分、任务数）
@@ -362,13 +362,13 @@ public class ExcelReportReviewExportServiceImpl implements ExcelReportExportServ
             Map<String, Object> briefTable2Map = new HashMap<>();
             briefTable2Map.put("user_name", sysUser.getRealname());
             briefTable2Map.put("user_task_count", wmTasks.size());
-            briefTable2Map.put("user_task_sum", wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+            briefTable2Map.put("user_task_sum", wmTasks.stream().mapToLong(WmTask::getScore).sum());
             briefTable2List.add(briefTable2Map);
         });
         Map<String, Object> briefTable2TotalParams = new HashMap<>();
         briefTable2TotalParams.put("user_name", "合计");
         briefTable2TotalParams.put("user_task_count", taskList.size());
-        briefTable2TotalParams.put("user_task_sum", taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+        briefTable2TotalParams.put("user_task_sum", taskList.stream().mapToLong(WmTask::getScore).sum());
         briefTable2List.add(briefTable2TotalParams);
 
         // 查询所有涉及到的userId
@@ -390,7 +390,7 @@ public class ExcelReportReviewExportServiceImpl implements ExcelReportExportServ
                 Map<String, Object> detailTableMap = new HashMap<>();
                 detailTableMap.put("user_name", userMap.get(Integer.valueOf(k)));
                 detailTableMap.put("task_type", scoreTaskTypeDictMap.get(x));
-                detailTableMap.put("score", y.stream().mapToInt(WmTask::getScore).sum());
+                detailTableMap.put("score", y.stream().mapToLong(WmTask::getScore).sum());
                 detailTableMap.put("finish_time", DateUtil.format(y.stream().max(Comparator.comparing(WmTask::getCreateTime)).get().getCreateTime(), DatePattern.NORM_DATE_PATTERN));
                 detailTableMap.put("ent_name", (wmDaDrugEnt == null) ? ((sysDept == null) ? "无" : sysDept.getName()) : wmDaDrugEnt.getEntname());
                 detailTableList.add(detailTableMap);

hnqz-visual/hnqz-report-biz/src/main/java/com/qunzhixinxi/hnqz/report/service/impl/NewAbstractExcelReportService.java

@@ -142,13 +142,13 @@ public abstract class NewAbstractExcelReportService implements NewReportService
             Map<String, Object> briefTable1Params = new HashMap<>();
             briefTable1Params.put("task_type_name", scoreTaskTypeDictMap.get(parentId));
             briefTable1Params.put("task_count", wmTasks.size());
-            briefTable1Params.put("task_sum", wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+            briefTable1Params.put("task_sum", wmTasks.stream().mapToLong(WmTask::getScore).sum());
             briefTable1List.add(briefTable1Params);
         });
         Map<String, Object> briefTable1TotalParams = new HashMap<>();
         briefTable1TotalParams.put("task_type_name", "合计");
         briefTable1TotalParams.put("task_count", taskList.size());
-        briefTable1TotalParams.put("task_sum", taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+        briefTable1TotalParams.put("task_sum", taskList.stream().mapToLong(WmTask::getScore).sum());
         briefTable1List.add(briefTable1TotalParams);
 
         // task通过taskTypeId分组
@@ -160,13 +160,13 @@ public abstract class NewAbstractExcelReportService implements NewReportService
             Map<String, Object> briefTable1Params = new HashMap<>();
             briefTable1Params.put("task_type_name", taskTypeIdMap.get(taskTypeId).getTaskTypeName());
             briefTable1Params.put("task_count", wmTasks.size());
-            briefTable1Params.put("task_sum", wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+            briefTable1Params.put("task_sum", wmTasks.stream().mapToLong(WmTask::getScore).sum());
             briefTable1bList.add(briefTable1Params);
         });
         Map<String, Object> briefTable11TotalParams = new HashMap<>();
         briefTable11TotalParams.put("task_type_name", "合计");
         briefTable11TotalParams.put("task_count", taskList.size());
-        briefTable11TotalParams.put("task_sum", taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+        briefTable11TotalParams.put("task_sum", taskList.stream().mapToLong(WmTask::getScore).sum());
         briefTable1bList.add(briefTable11TotalParams);
 
         // 封装brief table2数据（统计每个人任务积分、任务数）
@@ -177,13 +177,13 @@ public abstract class NewAbstractExcelReportService implements NewReportService
             Map<String, Object> briefTable2Map = new HashMap<>();
             briefTable2Map.put("user_name", sysUser.getRealname());
             briefTable2Map.put("user_task_count", wmTasks.size());
-            briefTable2Map.put("user_task_sum", wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+            briefTable2Map.put("user_task_sum", wmTasks.stream().mapToLong(WmTask::getScore).sum());
             briefTable2List.add(briefTable2Map);
         });
         Map<String, Object> briefTable2TotalParams = new HashMap<>();
         briefTable2TotalParams.put("user_name", "合计");
         briefTable2TotalParams.put("user_task_count", taskList.size());
-        briefTable2TotalParams.put("user_task_sum", taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+        briefTable2TotalParams.put("user_task_sum", taskList.stream().mapToLong(WmTask::getScore).sum());
         briefTable2List.add(briefTable2TotalParams);
 
         // 查询所有涉及到的userId
@@ -205,7 +205,7 @@ public abstract class NewAbstractExcelReportService implements NewReportService
                 Map<String, Object> detailTableMap = new HashMap<>();
                 detailTableMap.put("user_name", userMap.get(Integer.valueOf(k)));
                 detailTableMap.put("task_type", scoreTaskTypeDictMap.get(x));
-                detailTableMap.put("score", y.stream().mapToInt(WmTask::getScore).sum());
+                detailTableMap.put("score", y.stream().mapToLong(WmTask::getScore).sum());
                 detailTableMap.put("finish_time", DateUtil.format(y.stream().max(Comparator.comparing(WmTask::getCreateTime)).get().getCreateTime(), DatePattern.NORM_DATE_PATTERN));
                 detailTableMap.put("ent_name", (wmDaDrugEnt == null) ? ((sysDept == null) ? "无" : sysDept.getName()) : wmDaDrugEnt.getEntname());
                 detailTableList.add(detailTableMap);

hnqz-visual/hnqz-report-biz/src/main/java/com/qunzhixinxi/hnqz/report/service/impl/NewAbstractReportService.java

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
@@ -214,10 +213,10 @@ public abstract class NewAbstractReportService implements NewReportService {
         Optional<LocalDateTime> taskMaxTime = superApprovedTaskList.stream().map(WmTask::getLookintoDate).max(LocalDateTime::compareTo);
         data.put("task_finish_time", DateUtil.format(taskMaxTime.get(), DatePattern.CHINESE_DATE_PATTERN));
         // 积分包值
-        int totalPackageScore = scorePackageList.stream().mapToInt(WmScorePackage::getScore).sum();
+        long totalPackageScore = scorePackageList.stream().mapToLong(WmScorePackage::getScore).sum();
         data.put("total_package_score", totalPackageScore);
         // 审核通过总值
-        int totalApprovedScore = superApprovedTaskList.stream().mapToInt(WmTask::getScore).sum();
+        long totalApprovedScore = superApprovedTaskList.stream().mapToLong(WmTask::getScore).sum();
         data.put("total_approved_score", String.valueOf(totalApprovedScore));
         // 积分包名称
         String scorePackageNames = scorePackageList.stream().map(WmScorePackage::getScorePackageName).collect(Collectors.joining("，"));
@@ -239,18 +238,18 @@ public abstract class NewAbstractReportService implements NewReportService {
 
         // 所有提交的任务积分
         if (CollUtil.isNotEmpty(allTaskList)) {
-            int allTaskScore = allTaskList.stream().mapToInt(WmTask::getScore).sum();
+            long allTaskScore = allTaskList.stream().mapToLong(WmTask::getScore).sum();
             data.put("all_task_score", allTaskScore);
         }
         // 总提交的积分值(所有下级审核过的任务积分)
-        int submitedTaskScore = personalApprovedTaskList.stream().mapToInt(WmTask::getScore).sum();
+        long submitedTaskScore = personalApprovedTaskList.stream().mapToLong(WmTask::getScore).sum();
         data.put("submited_task_score", submitedTaskScore);
         // 审核不通过的积分值
         data.put("rejected_task_score", submitedTaskScore - totalApprovedScore);
         // 结算成功的金额
-        int settleAmount = scorePackageList.stream()
+        long settleAmount = scorePackageList.stream()
                 .filter(scorePackage -> scorePackage.getSettleStatus() != null && 1 == scorePackage.getSettleStatus())
-                .mapToInt(WmScorePackage::getScore).sum();
+                .mapToLong(WmScorePackage::getScore).sum();
         data.put("settle_amount", settleAmount);
         //// 结算成功的税源地
         //Optional<WmScorePackage> settledPackage = scorePackageList.stream()
@@ -508,7 +507,7 @@ public abstract class NewAbstractReportService implements NewReportService {
             // 活动次数
             int taskCount = wmTasks.size();
             // 合计积分
-            Integer taskSum = wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum);
+            long taskSum = wmTasks.stream().mapToLong(WmTask::getScore).sum();
             RowRenderData build = RowRenderData.build(taskTypeName, String.valueOf(taskCount), String.valueOf(taskSum));
             build.setRowStyle(tableStyle);
             briefTb1List.add(build);
@@ -516,7 +515,7 @@ public abstract class NewAbstractReportService implements NewReportService {
         // 表合计
         RowRenderData tb1Bottom = RowRenderData.build(new TextRenderData("合计"),
                 new TextRenderData(String.valueOf(taskList.size())),
-                new TextRenderData(String.valueOf(taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum))));
+                new TextRenderData(String.valueOf(taskList.stream().mapToLong(WmTask::getScore).sum())));
         tb1Bottom.setRowStyle(tableStyle);
         briefTb1List.add(tb1Bottom);
         data.put("briefTb1", new MiniTableRenderData(tb1Header, briefTb1List));
@@ -538,7 +537,7 @@ public abstract class NewAbstractReportService implements NewReportService {
             // 活动次数
             int taskCount = wmTasks.size();
             // 合计积分
-            Integer taskSum = wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum);
+            long taskSum = wmTasks.stream().mapToLong(WmTask::getScore).sum();
             RowRenderData build = RowRenderData.build(taskTypeName, String.valueOf(taskCount), String.valueOf(taskSum));
             build.setRowStyle(tableStyle);
             briefTb2List.add(build);
@@ -546,7 +545,7 @@ public abstract class NewAbstractReportService implements NewReportService {
         // 表合计
         RowRenderData tb2Bottom = RowRenderData.build(new TextRenderData("合计"),
                 new TextRenderData(String.valueOf(taskList.size())),
-                new TextRenderData(String.valueOf(taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum))));
+                new TextRenderData(String.valueOf(taskList.stream().mapToLong(WmTask::getScore).sum())));
         tb2Bottom.setRowStyle(tableStyle);
         briefTb2List.add(tb2Bottom);
         data.put("briefTb2", new MiniTableRenderData(tb2Header, briefTb2List));
@@ -571,7 +570,7 @@ public abstract class NewAbstractReportService implements NewReportService {
             // 任务计数
             int taskCount = wmTasks.size();
             // 累计积分
-            Integer taskSum = wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum);
+            long taskSum = wmTasks.stream().mapToLong(WmTask::getScore).sum();
             RowRenderData build = RowRenderData.build(realName, String.valueOf(taskCount), String.valueOf(taskSum));
             build.setRowStyle(tableStyle);
             briefTb3List.add(build);
@@ -579,7 +578,7 @@ public abstract class NewAbstractReportService implements NewReportService {
         // 表合计
         RowRenderData tb3Bottom = RowRenderData.build(new TextRenderData("合计"),
                 new TextRenderData(String.valueOf(taskList.size())),
-                new TextRenderData(String.valueOf(taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum))));
+                new TextRenderData(String.valueOf(taskList.stream().mapToLong(WmTask::getScore).sum())));
         tb3Bottom.setRowStyle(tableStyle);
         briefTb3List.add(tb3Bottom);
         data.put("briefTb3", new MiniTableRenderData(tb3Header, briefTb3List));
@@ -604,7 +603,7 @@ public abstract class NewAbstractReportService implements NewReportService {
                 // 完成时间
                 String finishTime = DateUtil.format(tasks.stream().map(WmTask::getCreateTime).max(LocalDateTime::compareTo).get(), DatePattern.NORM_DATE_PATTERN);
                 // 合计积分
-                Integer taskSum = tasks.stream().map(WmTask::getScore).reduce(0, Integer::sum);
+                long taskSum = tasks.stream().mapToLong(WmTask::getScore).sum();
                 // 姓名
                 String realName = userMap.get(Integer.parseInt(userId));
                 // 所属组织

hnqz-visual/hnqz-report-biz/src/main/java/com/qunzhixinxi/hnqz/report/service/impl/ReportExportServiceImpl.java

@@ -189,7 +189,7 @@ public class ReportExportServiceImpl implements ReportExportService {
 
 
         List<XlsTask> xlsTaskList = new ArrayList<>();// mxTable
-        Integer totalMoney = 0;
+        long totalMoney = 0;
 //		wmTask.setScorePackageId(null);
 //		wmTask.setScorePackageDrugId(null);
 
@@ -340,13 +340,13 @@ public class ReportExportServiceImpl implements ReportExportService {
             Map<String, Object> briefTable1Params = new HashMap<>();
             briefTable1Params.put("taskTypeName", taskTypeIdMap.get(taskTypeId));
             briefTable1Params.put("taskCount", wmTasks.size());
-            briefTable1Params.put("taskSum", wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+            briefTable1Params.put("taskSum", wmTasks.stream().mapToLong(WmTask::getScore).sum());
             briefTable1List.add(briefTable1Params);
         });
         Map<String, Object> briefTable1TotalParams = new HashMap<>();
         briefTable1TotalParams.put("taskTypeName", "合计");
         briefTable1TotalParams.put("taskCount", taskList.size());
-        briefTable1TotalParams.put("taskSum", taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+        briefTable1TotalParams.put("taskSum", taskList.stream().mapToLong(WmTask::getScore).sum());
         briefTable1List.add(briefTable1TotalParams);
         excelMap.put("briefTable", briefTable1List);
 
@@ -567,7 +567,7 @@ public class ReportExportServiceImpl implements ReportExportService {
 
         // mxTable
         List<XlsTask> xlsTaskList = new ArrayList<>();
-        int totalMoney = 0;
+        long totalMoney = 0;
 
         // 当前登陆人的机构
         SysDept sysDept = sysDeptService.getById(deptId);
@@ -706,14 +706,14 @@ public class ReportExportServiceImpl implements ReportExportService {
             Map<String, Object> briefTable1Params = new HashMap<>(3);
             briefTable1Params.put("taskTypeName", taskTypeIdMap.get(taskTypeId));
             briefTable1Params.put("taskCount", wmTasks.size());
-            briefTable1Params.put("taskSum", wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+            briefTable1Params.put("taskSum", wmTasks.stream().mapToLong(WmTask::getScore).sum());
             briefTable1List.add(briefTable1Params);
         });
 
         Map<String, Object> briefTable1TotalParams = new HashMap<>(3);
         briefTable1TotalParams.put("taskTypeName", "合计");
         briefTable1TotalParams.put("taskCount", taskList.size());
-        briefTable1TotalParams.put("taskSum", taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+        briefTable1TotalParams.put("taskSum", taskList.stream().mapToLong(WmTask::getScore).sum());
         briefTable1List.add(briefTable1TotalParams);
         excelMap.put("briefTable", briefTable1List);
 
@@ -988,7 +988,7 @@ public class ReportExportServiceImpl implements ReportExportService {
 
             if (listPackageIds.size() > 0) {
                 List<WmScorePackage> wmScorePackageList = wmScorePackageService.listByIds(listPackageIds);
-                Integer totalScorePackage = 0;
+                long totalScorePackage = 0;
                 BigDecimal settleAmount = new BigDecimal("0");
                 if (wmScorePackageList.size() > 0) {
                     for (WmScorePackage wmScorePackage : wmScorePackageList) {
@@ -1010,10 +1010,10 @@ public class ReportExportServiceImpl implements ReportExportService {
                         .in(WmTask::getScorePackageId, listPackageIds));
 
                 if (CollUtil.isNotEmpty(tasks)) {
-                    int sum = tasks.stream()
+                    long sum = tasks.stream()
 //                            .filter(t -> "3".equals( t.getTaskStatus()) && WmTask.TaskSettleStatusEnum.SETTLED.getCode().equals(t.getTaskSettleStatus()))
                             .filter(t -> "3".equals(t.getTaskStatus()))
-                            .mapToInt(WmTask::getScore).sum();
+                            .mapToLong(WmTask::getScore).sum();
                     excelMap.put("submitAmount", sum);
                 }
             }
@@ -1044,7 +1044,7 @@ public class ReportExportServiceImpl implements ReportExportService {
         List<Map<String, Object>> wmTaskCount = wmTaskService.getTaskListByIdsCount(wmTask);
         if (wmTaskCount.size() > 0) {
             Integer total = 0;
-            Integer sum = 0;
+            long sum = 0;
             for (Map<String, Object> map :
                     wmTaskCount) {
                 if (null != map.get("taskCount")) {
@@ -1090,13 +1090,13 @@ public class ReportExportServiceImpl implements ReportExportService {
             Map<String, Object> briefTable1Params = new HashMap<>();
             briefTable1Params.put("taskTypeName", taskTypeIdMap.get(taskTypeId));
             briefTable1Params.put("taskCount", wmTasks.size());
-            briefTable1Params.put("taskSum", wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+            briefTable1Params.put("taskSum", wmTasks.stream().mapToLong(WmTask::getScore).sum());
             briefTable1List.add(briefTable1Params);
         });
         Map<String, Object> briefTable1TotalParams = new HashMap<>();
         briefTable1TotalParams.put("taskTypeName", "合计");
         briefTable1TotalParams.put("taskCount", taskList.size());
-        briefTable1TotalParams.put("taskSum", taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+        briefTable1TotalParams.put("taskSum", taskList.stream().mapToLong(WmTask::getScore).sum());
         briefTable1List.add(briefTable1TotalParams);
         excelMap.put("briefTable", briefTable1List);
 

hnqz-visual/hnqz-report-biz/src/main/java/com/qunzhixinxi/hnqz/report/service/impl/ReportReviewExportServiceImpl.java

@@ -168,7 +168,7 @@ public class ReportReviewExportServiceImpl implements ReportExportService {
 
 
         List<XlsTask> xlsTaskList = new ArrayList<>();//mxTable
-        Integer totalMoney = 0;
+        long totalMoney = 0;
 //		wmTask.setScorePackageId(null);
 //		wmTask.setScorePackageDrugId(null);
 
@@ -249,8 +249,8 @@ public class ReportReviewExportServiceImpl implements ReportExportService {
              }
 
             // 待审核积分值
-            int toApproveSum = wmTaskDetialList.stream()
-                    .mapToInt(WmTask::getScore).sum();
+            long toApproveSum = wmTaskDetialList.stream()
+                    .mapToLong(WmTask::getScore).sum();
             excelMap.put("toApproveScore", toApproveSum);
         }
 
@@ -321,13 +321,13 @@ public class ReportReviewExportServiceImpl implements ReportExportService {
             Map<String, Object> briefTable1Params = new HashMap<>();
             briefTable1Params.put("taskTypeName", taskTypeIdMap.get(taskTypeId));
             briefTable1Params.put("taskCount", wmTasks.size());
-            briefTable1Params.put("taskSum", wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+            briefTable1Params.put("taskSum", wmTasks.stream().mapToLong(WmTask::getScore).sum());
             briefTable1List.add(briefTable1Params);
         });
         Map<String, Object> briefTable1TotalParams = new HashMap<>();
         briefTable1TotalParams.put("taskTypeName", "合计");
         briefTable1TotalParams.put("taskCount", taskList.size());
-        briefTable1TotalParams.put("taskSum", taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+        briefTable1TotalParams.put("taskSum", taskList.stream().mapToLong(WmTask::getScore).sum());
         briefTable1List.add(briefTable1TotalParams);
         excelMap.put("briefTable", briefTable1List);
 
@@ -607,14 +607,14 @@ public class ReportReviewExportServiceImpl implements ReportExportService {
                 }
 
                 // 待审核积分值
-                int toApproveSum = wmTaskDetialList.stream()
-                        .mapToInt(WmTask::getScore).sum();
+                long toApproveSum = wmTaskDetialList.stream()
+                        .mapToLong(WmTask::getScore).sum();
                 excelMap.put("toApproveScore", toApproveSum);
             }
 
             if (listPackageIds.size() > 0) {
                 List<WmScorePackage> wmScorePackageList = wmScorePackageService.listByIds(listPackageIds);
-                Integer totalScorePackage = 0;
+                long totalScorePackage = 0;
                 BigDecimal settleAmount = new BigDecimal("0");
                 if (wmScorePackageList.size() > 0) {
                     for (WmScorePackage wmScorePackage : wmScorePackageList) {
@@ -703,13 +703,13 @@ public class ReportReviewExportServiceImpl implements ReportExportService {
             Map<String, Object> briefTable1Params = new HashMap<>();
             briefTable1Params.put("taskTypeName", taskTypeIdMap.get(taskTypeId));
             briefTable1Params.put("taskCount", wmTasks.size());
-            briefTable1Params.put("taskSum", wmTasks.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+            briefTable1Params.put("taskSum", wmTasks.stream().mapToLong(WmTask::getScore).sum());
             briefTable1List.add(briefTable1Params);
         });
         Map<String, Object> briefTable1TotalParams = new HashMap<>();
         briefTable1TotalParams.put("taskTypeName", "合计");
         briefTable1TotalParams.put("taskCount", taskList.size());
-        briefTable1TotalParams.put("taskSum", taskList.stream().map(WmTask::getScore).reduce(0, Integer::sum));
+        briefTable1TotalParams.put("taskSum", taskList.stream().mapToLong(WmTask::getScore).sum());
         briefTable1List.add(briefTable1TotalParams);
         excelMap.put("briefTable", briefTable1List);