feat: 数据统计 update1

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/UpmsType.java

@@ -323,4 +323,18 @@ public final class UpmsType {
         private final String type;
         private final String desc;
     }
+
+    @Getter
+    @AllArgsConstructor
+    public enum PackageType {
+        TYPE_0("0", "MAH"),
+        TYPE_1("1", "一级代理商"),
+        TYPE_2("2", "二级代理商"),
+        TYPE_3("3", "全职");
+
+        @EnumValue
+        private final String type;
+        private final String desc;
+
+    }
 }

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

@@ -547,14 +547,16 @@ public class SysStatisticManager {
 
             Map<String, Object> extra = new HashMap<>(9);
 
+            int availScore = (UpmsType.PackageType.TYPE_3.getType().equals(pkg.getTypeid())) ? pkg.getScore() : pkg.getKfpjf();
+
             // 执行包分值
             extra.put("pkgScore", pkg.getScore());
             // 可用分值
-            extra.put("availScore", pkg.getKfpjf());
+            extra.put("availScore", availScore);
             // 下发分值
-            extra.put("distScore", pkg.getScore() - pkg.getKfpjf());
+            extra.put("distScore", pkg.getScore() - availScore);
             // 下发百分比
-            extra.put("distRate", String.format("%.2f", 100.0 * (pkg.getScore() - pkg.getKfpjf()) / pkg.getScore()));
+            extra.put("distRate", String.format("%.2f", 100.0 * (pkg.getScore() - availScore) / pkg.getScore()));
             // 承接对象
             extra.put("pickerName", dId2NameMap.get(Integer.valueOf(pkg.getDeptId())) == null ? "" : dId2NameMap.get(Integer.valueOf(pkg.getDeptId())));
             // 周期

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

@@ -7,7 +7,6 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import com.qunzhixinxi.hnqz.admin.api.dto.WmPkgDTO;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysAreaEntity;
@@ -51,7 +50,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;