feat: temp stat

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

@@ -0,0 +1,40 @@
+package com.qunzhixinxi.hnqz.admin.api.dto;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 统计dto
+ *
+ * @author jimmy
+ * @date 17/07/2024 22:28
+ */
+@NoArgsConstructor(access = AccessLevel.NONE)
+public final class SysStatisticDto {
+
+    @Data
+    public static class OnPlanTree {
+
+    }
+
+    @Data
+    public static class OnPkgTree {
+
+    }
+
+    @Data
+    public static class OnProviderQccData {
+
+    }
+
+    @Data
+    public static class OnProviderTree {
+
+    }
+
+    @Data
+    public static class OnSupData {
+
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qunzhixinxi.hnqz.admin.api.dto.SysStatisticDto;
 import com.qunzhixinxi.hnqz.admin.manager.SysStatisticManager;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
@@ -9,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -42,5 +45,35 @@ public class SysStatisticController {
         return R.ok(res);
     }
 
+    // todo
+    @GetMapping(value = "/stat/plan/tree")
+    public R<Page<Map<String, Object>>> statPlanTree(SysStatisticDto.OnPlanTree query) {
+        return R.ok(statisticManager.statPlanTree(query, SecurityUtils.getUser()));
+    }
+
+    // todo
+    @GetMapping(value = "/stat/pkg/tree")
+    public R<Page<Map<String, Object>>> statPkgTree(SysStatisticDto.OnPkgTree query) {
+        return R.ok(statisticManager.statPkgTree(query, SecurityUtils.getUser()));
+    }
+
+    // todo
+    @GetMapping(value = "/stat/provider/data")
+    public R<Page<Map<String, Object>>> statProviderData(SysStatisticDto.OnProviderQccData query) {
+        return R.ok(statisticManager.statProviderData(query, SecurityUtils.getUser()));
+    }
+
+    // todo
+    @GetMapping(value = "/stat/provider/data/tree")
+    public R<Page<Map<String, Object>>> statProviderDataTree(SysStatisticDto.OnProviderTree query) {
+        return R.ok(statisticManager.statProviderDataTree(query, SecurityUtils.getUser()));
+    }
+
+    // todo
+    @GetMapping(value = "/stat/supervision/data")
+    public R<Page<Map<String, Object>>> statSupData(SysStatisticDto.OnSupData query) {
+        return R.ok(statisticManager.statSupData(query, SecurityUtils.getUser()));
+    }
+
 
 }

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

@@ -104,7 +104,6 @@ import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -4126,4 +4125,11 @@ public class WmScorePackageController {
         return R.ok(list);
     }
 
+
+    // todo
+    @GetMapping(value = "/ind/stat")
+    public R<Map<String, Object>> indPkgStat() {
+        return R.ok(wmScorePackageService.indPkgStat( SecurityUtils.getUser()));
+    }
+
 }

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

@@ -1,11 +1,14 @@
 package com.qunzhixinxi.hnqz.admin.manager;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNode;
 import cn.hutool.core.lang.tree.TreeUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qunzhixinxi.hnqz.admin.api.dto.SysStatisticDto;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysImplementPlan;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
@@ -21,6 +24,7 @@ import org.springframework.stereotype.Service;
 
 import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -181,35 +185,35 @@ public class SysStatisticManager {
         return res;
     }
 
-    /**
-     * 获取服务目标统计
-     *
-     * @param user 操作人
-     * @return 统计结果
-     */
-    public List<Tree<Integer>> getImplPlanStat(HnqzUser user) {
-
-
-        List<SysImplementPlan> list = new ArrayList<>(6);
-
-
-
-
-        // List<TreeNode<Long>> collect = list.stream().map(getNodeFunction()).collect(Collectors.toList());
-
-
-        // List<TreeNode<Long>> collect = baseMapper
-        //         .selectList(Wrappers.<SysMenu>lambdaQuery()
-        //                 .like(StrUtil.isNotBlank(menuName), SysMenu::getName, menuName)
-        //                 .in(SysMenu::getMenuId, menuIds)
-        //                 .eq(Objects.nonNull(type), SysMenu::getMenuType, type).orderByAsc(SysMenu::getSortOrder))
-        //         .stream().map(getNodeFunction()).collect(Collectors.toList());
-        //
-        //
-        //
-        // return TreeUtil.build(collect, 1);
-        return null;
-    }
+    // /**
+    //  * 获取服务目标统计
+    //  *
+    //  * @param user 操作人
+    //  * @return 统计结果
+    //  */
+    // public List<Tree<Integer>> getImplPlanStat(HnqzUser user) {
+    //
+    //
+    //     List<SysImplementPlan> list = new ArrayList<>(6);
+    //
+    //
+    //
+    //
+    //     // List<TreeNode<Long>> collect = list.stream().map(getNodeFunction()).collect(Collectors.toList());
+    //
+    //
+    //     // List<TreeNode<Long>> collect = baseMapper
+    //     //         .selectList(Wrappers.<SysMenu>lambdaQuery()
+    //     //                 .like(StrUtil.isNotBlank(menuName), SysMenu::getName, menuName)
+    //     //                 .in(SysMenu::getMenuId, menuIds)
+    //     //                 .eq(Objects.nonNull(type), SysMenu::getMenuType, type).orderByAsc(SysMenu::getSortOrder))
+    //     //         .stream().map(getNodeFunction()).collect(Collectors.toList());
+    //     //
+    //     //
+    //     //
+    //     // return TreeUtil.build(collect, 1);
+    //     return null;
+    // }
 
 
     // @NotNull
@@ -242,4 +246,244 @@ public class SysStatisticManager {
     //         return node;
     //     };
     // }
+
+
+    /**
+     * 执行计划统计
+     *
+     * @param query 查询条件
+     * @param user  查询人
+     * @return 统计信息
+     */
+    public Page<Map<String, Object>> statPlanTree(SysStatisticDto.OnPlanTree query, HnqzUser user) {
+
+        Map<String, Object> records = new HashMap<>();
+        records.put("id", 123);
+        records.put("parentId", -1);
+        records.put("planName", "测试计划");
+        records.put("planScore", 123456);
+        records.put("planPeriod", "2024-01-01~2025-01-01");
+        records.put("providerName", "测试服务提供方");
+        records.put("createTime", LocalDateTime.now());
+        records.put("distScore", 12345);
+        records.put("distRate", "30%");
+        records.put("serCompleteRate", "10%");
+
+        Map<String, Object> child1 = new HashMap<>();
+        child1.put("id", 1234);
+        child1.put("parentId", 123);
+        child1.put("planName", "测试计划1");
+        child1.put("planScore", 123456);
+        child1.put("planPeriod", "2024-01-01~2025-01-01");
+        child1.put("providerName", "测试服务提供方1");
+        child1.put("createTime", LocalDateTime.now());
+        child1.put("distScore", 12345);
+        child1.put("distRate", "30%");
+        child1.put("serCompleteRate", "10%");
+
+
+        Map<String, Object> child2 = new HashMap<>();
+        child2.put("id", 1234);
+        child2.put("parentId", 123);
+        child2.put("planName", "测试计划1");
+        child2.put("planScore", 123456);
+        child2.put("planPeriod", "2024-01-01~2025-01-01");
+        child2.put("providerName", "测试服务提供方1");
+        child2.put("createTime", LocalDateTime.now());
+        child2.put("distScore", 12345);
+        child2.put("distRate", "30%");
+        child2.put("serCompleteRate", "10%");
+        child2.put("children", Collections.emptyList());
+
+        child1.put("children", Collections.singletonList(child2));
+
+
+        records.put("children", Collections.singletonList(child1));
+
+
+        Page<Map<String, Object>> page = new Page<>();
+        page.setRecords(Collections.singletonList(records));
+        page.setCurrent(1);
+        page.setSize(20);
+        page.setTotal(1);
+
+        return page;
+
+
+    }
+
+    /**
+     * 所有执行包数据汇总树状展示
+     *
+     * @param query 查询条件
+     * @param user  操作人
+     * @return 统计信息
+     */
+    public Page<Map<String, Object>> statPkgTree(SysStatisticDto.OnPkgTree query, HnqzUser user) {
+
+        Map<String, Object> records = new HashMap<>();
+        records.put("id", 123);
+        records.put("parentId", -1);
+        records.put("pkgName", "测试计划");
+        records.put("pkgScore", 123456);
+        records.put("pickerName", "测试服务提供方1");
+        records.put("createTime", LocalDateTime.now());
+        records.put("completeScore", 12345);
+        records.put("completeRate", "30%");
+
+        Map<String, Object> child1 = new HashMap<>();
+        child1.put("id", 1234);
+        child1.put("parentId", 123);
+        child1.put("pkgName", "测试计划");
+        child1.put("pkgScore", 123456);
+        child1.put("pickerName", "测试服务提供方1");
+        child1.put("createTime", LocalDateTime.now());
+        child1.put("completeScore", 12345);
+        child1.put("completeRate", "30%");
+
+
+        Map<String, Object> child2 = new HashMap<>();
+        child2.put("id", 1234);
+        child2.put("parentId", 123);
+        child2.put("pkgName", "测试计划");
+        child2.put("pkgScore", 123456);
+        child2.put("pickerName", "测试服务提供方1");
+        child2.put("createTime", LocalDateTime.now());
+        child2.put("completeScore", 12345);
+        child2.put("completeRate", "30%");
+        child2.put("children", Collections.emptyList());
+
+        child1.put("children", Collections.singletonList(child2));
+
+
+        records.put("children", Collections.singletonList(child1));
+
+
+        Page<Map<String, Object>> page = new Page<>();
+        page.setRecords(Collections.singletonList(records));
+        page.setCurrent(1);
+        page.setSize(20);
+        page.setTotal(1);
+
+        return page;
+    }
+
+    /**
+     * 统计服务商数据
+     *
+     * @param query 查询条件
+     * @param user  操作人
+     * @return 统计信息
+     */
+    public Page<Map<String, Object>> statProviderData(SysStatisticDto.OnProviderQccData query, HnqzUser user) {
+        Map<String, Object> records = new HashMap<>();
+        records.put("id", 123);
+        records.put("providerName", "测试服务提供方1");
+        records.put("areaCodes", ListUtil.of(0));
+        records.put("products", "123456");
+        records.put("qccScore", "90");
+        records.put("serviceMark", "120");
+        records.put("average", 123);
+
+
+        Page<Map<String, Object>> page = new Page<>();
+        page.setRecords(Collections.singletonList(records));
+        page.setCurrent(1);
+        page.setSize(20);
+        page.setTotal(1);
+
+        return page;
+
+    }
+
+    /**
+     * 服务提供商数据
+     *
+     * @param query 查询条件
+     * @param user  操作人
+     * @return 统计信息
+     */
+    public Page<Map<String, Object>> statProviderDataTree(SysStatisticDto.OnProviderTree query, HnqzUser user) {
+        Map<String, Object> records = new HashMap<>();
+        records.put("id", 123);
+        records.put("parentId", -1);
+        records.put("pkgName", "测试计划");
+        records.put("pkgScore", 123456);
+        records.put("pickerName", "测试服务提供方1");
+        records.put("createTime", LocalDateTime.now());
+        records.put("completeScore", 12345);
+        records.put("completeRate", "30%");
+        records.put("taskPassedPercentage", "30%");
+        records.put("taskPassedScore", 234);
+        records.put("taskPassRate", "30%");
+
+        Map<String, Object> child1 = new HashMap<>();
+        child1.put("id", 1234);
+        child1.put("parentId", 123);
+        child1.put("pkgName", "测试计划");
+        child1.put("pkgScore", 123456);
+        child1.put("pickerName", "测试服务提供方1");
+        child1.put("createTime", LocalDateTime.now());
+        child1.put("completeScore", 12345);
+        child1.put("completeRate", "30%");
+        child1.put("taskPassedPercentage", "30%");
+        child1.put("taskPassedScore", 234);
+        child1.put("taskPassRate", "30%");
+
+
+        Map<String, Object> child2 = new HashMap<>();
+        child2.put("id", 12345);
+        child2.put("parentId", 12345);
+        child2.put("pkgName", "测试计划");
+        child2.put("pkgScore", 123456);
+        child2.put("pickerName", "测试服务提供方1");
+        child2.put("createTime", LocalDateTime.now());
+        child2.put("completeScore", 12345);
+        child2.put("completeRate", "30%");
+        child2.put("taskPassedPercentage", "30%");
+        child2.put("taskPassedScore", 234);
+        child2.put("taskPassRate", "30%");
+        child2.put("children", Collections.emptyList());
+
+        child1.put("children", Collections.singletonList(child2));
+
+
+        records.put("children", Collections.singletonList(child1));
+
+
+        Page<Map<String, Object>> page = new Page<>();
+        page.setRecords(Collections.singletonList(records));
+        page.setCurrent(1);
+        page.setSize(20);
+        page.setTotal(1);
+
+        return page;
+    }
+
+    /**
+     * 监察信息
+     *
+     * @param query 查询条件
+     * @param user  查询人
+     * @return 统计结果
+     */
+    public Page<Map<String, Object>> statSupData(SysStatisticDto.OnSupData query, HnqzUser user) {
+        Map<String, Object> records = new HashMap<>();
+        records.put("id", 123);
+        records.put("providerName", "测试服务提供方1");
+        records.put("supervisionTime", 5);
+        records.put("supervisionScore", 123456);
+        records.put("supervisionPassedRate", "30%");
+        records.put("supervisionWarnRate", "30%");
+        records.put("supervisionRate", "30%");
+
+
+        Page<Map<String, Object>> page = new Page<>();
+        page.setRecords(Collections.singletonList(records));
+        page.setCurrent(1);
+        page.setSize(20);
+        page.setTotal(1);
+
+        return page;
+    }
 }

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

@@ -21,6 +21,7 @@ import com.qunzhixinxi.hnqz.admin.api.model.input.WmScorePackageSettleInput;
 import com.qunzhixinxi.hnqz.admin.api.model.input.WmScorePackageSettleOutput;
 import com.qunzhixinxi.hnqz.admin.api.vo.SettleFinancialReviewVO;
 import com.qunzhixinxi.hnqz.common.core.util.R;
+import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -266,4 +267,6 @@ public interface WmScorePackageService extends IService<WmScorePackage> {
      * @param finalEntIds 所属服务商ID
      */
     void pageForSupervision(Page<Map<String, Object>> page, String pkgName, Boolean supervision, Set<Integer> finalEntIds);
+
+    Map<String, Object> indPkgStat(HnqzUser user);
 }

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

@@ -80,6 +80,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmPkgQuizRelationService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageStatusService;
 import com.qunzhixinxi.hnqz.admin.service.WmTeamService;
+import com.qunzhixinxi.hnqz.admin.util.MapUtil;
 import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
@@ -257,7 +258,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
                 List<String> taskStatus = new ArrayList<>();
                 taskStatus.add("5");
-                //TODO 需要确认已审核的逻辑
+                // TODO 需要确认已审核的逻辑
                 List<WmTask> wmTaskList = wmTaskMapper.selectList(Wrappers.query(wmTask)
                         .lambda()
                         .notIn(WmTask::getTaskStatus, taskStatus));
@@ -298,7 +299,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
                 List<String> taskStatus = new ArrayList<>();
                 taskStatus.add("5");
-                //TODO 需要确认已审核的逻辑
+                // TODO 需要确认已审核的逻辑
                 List<WmTask> wmTaskList = wmTaskMapper.selectList(Wrappers.query(wmTask).lambda()
                         .notIn(WmTask::getTaskStatus, taskStatus)
                         .orderByAsc(WmTask::getCreateTime)
@@ -631,7 +632,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
         if (null != wmScorePackage.getRelatedService()) {
             relatedService = sysDeptMapper.selectById(wmScorePackage.getRelatedService());
         }
-        //查询分配给当前用户机构的积分包，deptid为当前用户，而且typeid=1或2
+        // 查询分配给当前用户机构的积分包，deptid为当前用户，而且typeid=1或2
         Integer deptId = SecurityUtils.getUser().getDeptId();
         Integer superDeptId = StrUtil.isNotBlank(wmScorePackage.getRelatedService()) ? Integer.valueOf(wmScorePackage.getRelatedService()) : null;
         List<WmScorePackage> pkgList =
@@ -669,9 +670,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
             }
         }
 
-        //一个机构同时是一级cso和二级cso时，可以自己给自己发包
+        // 一个机构同时是一级cso和二级cso时，可以自己给自己发包
         if (null != relatedService.getLevel() && relatedService.getLevel() == 4) {
-            List<SysDept> deptList = sysDeptMapper.getAllParentDept(relatedService);//所有的上级机构
+            List<SysDept> deptList = sysDeptMapper.getAllParentDept(relatedService);// 所有的上级机构
             List<Integer> levels = deptList.stream().map(SysDept::getLevel).collect(Collectors.toList());
             if (levels.contains(2)) {
                 relatedService.setLevel(3);
@@ -682,7 +683,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
             if (null != relatedService.getLevel() && relatedService.getLevel() != 4) {
                 SysDept sysDept = sysDeptMapper.selectById(deptId);
                 if (wmScorePackage.getRelatedService().equals(sysDept.getDeptId() + "")) {
-                    //if(sysDept.getDeptId().equals(wmScorePackage.getRelatedService())){
+                    // if(sysDept.getDeptId().equals(wmScorePackage.getRelatedService())){
                     WmScorePackage wmScorePackage1 = new WmScorePackage();
                     wmScorePackage1.setId("-1");
                     wmScorePackage1.setScorePackageName("无");
@@ -750,7 +751,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
     @Transactional(rollbackFor = Exception.class)
     public R addWmScorePackage(WmScorePackage wmScorePackage) {
         HnqzUser currentUser = SecurityUtils.getUser();
-        //判断名字不能重复和积分包序列号不能重复
+        // 判断名字不能重复和积分包序列号不能重复
         if (StrUtil.isNotBlank(wmScorePackage.getScorePackageName())) {
 
             long existed = this.count(Wrappers.<WmScorePackage>lambdaQuery().eq(WmScorePackage::getDelFlag, "0").eq(WmScorePackage::getDeptId, currentUser.getDeptId().toString()).and(
@@ -773,7 +774,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
         // 		return R.failed("积分包名称或积分包序列号已存在");
         // 	}
         // }
-        if (wmScorePackage.getPackageType1().equals("1")) {//定额
+        if (wmScorePackage.getPackageType1().equals("1")) {// 定额
             if (!StringUtil.isEmpty(wmScorePackage.getUserScore()) && wmScorePackage.getUserNum() > 0) {
                 wmScorePackage.setScore(Integer.valueOf(wmScorePackage.getUserScore()) * wmScorePackage.getUserNum());
             }
@@ -812,8 +813,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
             }
         }
 
-        WmScorePackage relationScorePackage = new WmScorePackage();//关联积分包
-        //判断预积分包值不能大于可分配积分值
+        WmScorePackage relationScorePackage = new WmScorePackage();// 关联积分包
+        // 判断预积分包值不能大于可分配积分值
         if (!StringUtil.isEmpty(wmScorePackage.getRelationScoreId()) && !wmScorePackage.getRelationScoreId()
                 .equals("-1")) {
 //			WmScorePackage wmScorePackage1 = new WmScorePackage();
@@ -830,7 +831,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 if (kfpjf > 0 && wmScorePackage.getScore() > kfpjf) {
                     return R.failed("预积分包值不能大于可分配积分值");
                 }
-                //更新可分配积分包值
+                // 更新可分配积分包值
                 if (kfpjf >= wmScorePackage.getScore()) {
                     relationScorePackage.setId(wmScorePackage.getRelationScoreId());
                     relationScorePackage.setKfpjf(kfpjf - wmScorePackage.getScore());
@@ -844,14 +845,14 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
         }
 
-        //关联积分包为空时
+        // 关联积分包为空时
         if (wmScorePackage.getRelationScoreId() == null || (wmScorePackage.getRelationScoreId() != null && wmScorePackage
                 .getRelationScoreId()
                 .equals("-1"))) {
 
             wmScorePackage.setRelationScoreId(null);
             SysDept dept = new SysDept();
-            //关联积分包为空，需要判断是不是是不是药企
+            // 关联积分包为空，需要判断是不是是不是药企
             if (wmScorePackage.getRelatedService() == null) {
                 dept = sysDeptMapper.selectById(currentUser.getDeptId());
             } else {
@@ -862,12 +863,12 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
             if (dept == null) {
                 return R.failed("未查询到当前登陆人的");
             } else {
-                if (dept.getLevel() == 2) {//药企
+                if (dept.getLevel() == 2) {// 药企
                     WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntService.getOne(Wrappers.<WmDaDrugEnt>lambdaQuery()
                             .eq(WmDaDrugEnt::getDeptId, dept.getDeptId()));
                     wmScorePackage.setDrugEntId(wmDaDrugEnt.getId());
                     wmScorePackage.setRuleId(this.queryRuleID(wmDaDrugEnt, null));
-                } else if (dept.getLevel() == 3 || dept.getLevel() == 4) {//一级cso
+                } else if (dept.getLevel() == 3 || dept.getLevel() == 4) {// 一级cso
                     WmDaAgent wmDaAgent = wmDaAgentService.getOne(Wrappers.<WmDaAgent>lambdaQuery()
                             .eq(WmDaAgent::getDeptId, dept.getDeptId()));
                     wmScorePackage.setRuleId(this.queryRuleID(null, wmDaAgent));
@@ -916,7 +917,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
             // 允许接单
             wmScorePackage.setIsReceive("0");
             // 已分派待申领
-            wmScorePackage.setScorePackageStatus("1");//已分派待申领
+            wmScorePackage.setScorePackageStatus("1");// 已分派待申领
         }
         if (PackageTypeEnum.TYPE1_HCP_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
             // 患者教育，固定只能一人领取
@@ -934,7 +935,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
         boolean isAnswer = this.save(wmScorePackage);
         if (isAnswer) {
 
-            //保存接单对象，全职学术推广员，允许选多个
+            // 保存接单对象，全职学术推广员，允许选多个
             List<String> userList = wmScorePackage.getUserList();
             if (null != userList && userList.size() > 0) {
                 List<WmScorePackageStatus> stuList = new ArrayList<>();
@@ -945,9 +946,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                     wmScorePackageStatus.setPackageId(wmScorePackage.getId());
                     UserVO user = sysUserMapper.getUserVoById(Integer.valueOf(userId));
                     wmScorePackageStatus.setDeptId(user.getDeptId() + "");
-                    if (wmScorePackage.getPackageType1().equals("1")) {//定额包
+                    if (wmScorePackage.getPackageType1().equals("1")) {// 定额包
                         wmScorePackageStatus.setUserScore(wmScorePackage.getScore() + "");
-                    } else {//定量包
+                    } else {// 定量包
                         wmScorePackageStatus.setTaskNum(wmScorePackage.getTaskNum());
                     }
                     wmScorePackageStatus.setEnableFlag("0");
@@ -960,7 +961,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 wmScorePackage.setUserNum(userList.size());
                 this.updateById(wmScorePackage);
             }
-            //保存有效任务类型
+            // 保存有效任务类型
             List<WmTaskTypeTree> tasktypeList = wmScorePackage.getTaskTypeList();
 
             if (null != tasktypeList && tasktypeList.size() > 0) {
@@ -1032,7 +1033,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                         || wmScorePackage.getPackageType1().equals(PackageTypeEnum.TYPE1_HCP_PACKAGE.val())
                         || wmScorePackage.getPackageType1().equals(PackageTypeEnum.TYPE1_SETTLE_PACKAGE.val())
                         || wmScorePackage.getPackageType2().equals(PackageTypeEnum.TYPE2_SETTLE_PACKAGE.val())) {
-                    //结算包
+                    // 结算包
                     WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();
                     wmScoreTaskType.setScoreId(wmScorePackage.getId());
                     wmScoreTaskType.setTaskTypeId(wmScorePackage.getTaskTypeId());
@@ -1041,7 +1042,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 }
             }
 
-            //更新关联积分包可分配积分值
+            // 更新关联积分包可分配积分值
             if (!StringUtil.isEmpty(relationScorePackage.getId())) {
                 this.updateById(relationScorePackage);
             }
@@ -1114,23 +1115,23 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
         for (WmScorePackage wmScorePackage1 : records) {
 
             // todo
-            //List<WmScorePackageSettleNote> list = settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+            // List<WmScorePackageSettleNote> list = settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
             //		.eq(WmScorePackageSettleNote::getPackageId, wmScorePackage1.getId()));
-            //if (CollectionUtil.isNotEmpty(list)) {
+            // if (CollectionUtil.isNotEmpty(list)) {
             //	wmScorePackage1.setNotifyDate(list.get(0).getNotifyTime());
             //}
 
             if ("2".equals(wmScorePackage.getPackageType2())) {
                 WmScorePackageSettleNote wsquery = new WmScorePackageSettleNote();
                 wsquery.setPackageId(wmScorePackage1.getId());
-                //int wsNum = settleNoteMapper.selectCount(Wrappers.query(wsquery)
+                // int wsNum = settleNoteMapper.selectCount(Wrappers.query(wsquery)
                 //		.lambda().in(WmScorePackageSettleNote::getSettleNoteStatus, 2, 9));
                 WmScorePackageSettleNote asquery = new WmScorePackageSettleNote();
                 asquery.setPackageId(wmScorePackage1.getId());
                 asquery.setSettleNoteStatus(1);
-                //int asNum = settleNoteMapper.selectCount(Wrappers.query(asquery));
-                //wmScorePackage1.setWsTaskNum(wsNum);
-                //wmScorePackage1.setAsTaskNum(asNum);
+                // int asNum = settleNoteMapper.selectCount(Wrappers.query(asquery));
+                // wmScorePackage1.setWsTaskNum(wsNum);
+                // wmScorePackage1.setAsTaskNum(asNum);
             }
             if (PackageTypeEnum.TYPE1_HCP_PACKAGE.getName().equals(wmScorePackage1.getPackageType1())) {
                 // 如果是患者教育，则转换积分值 '分'-> '元'
@@ -1184,7 +1185,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 List<WmTask> tasks = wmTaskMapper.selectList(Wrappers.<WmTask>lambdaQuery()
                         .eq(WmTask::getScorePackageId, String.valueOf(wmScorePackage1.getId())));
 
-                //统计发包方还未审核的
+                // 统计发包方还未审核的
                 long drugNeedToCheckCount = tasks.stream()
                         .filter(t -> "3".equals(t.getTaskStatus()) && "2".equals(t.getReportOneApprovalStatus()))
                         .count();
@@ -1231,9 +1232,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
         wmScorePackage.setPackageStatus(wmScorePackage.getPackageStatus());
         WmTask wmTask = new WmTask();
         wmTask.setScorePackageId(wmScorePackage.getId());
-        //wmTask.setRealFlag("0");
+        // wmTask.setRealFlag("0");
         List<WmTask> taskList = wmTaskMapper.selectList(Wrappers.query(wmTask));
-        //将所有未接单审核的，改成审核不通过
+        // 将所有未接单审核的，改成审核不通过
         wmScorePackageStatusService.update(new WmScorePackageStatus(),
                 Wrappers.<WmScorePackageStatus>lambdaUpdate()
                         .eq(WmScorePackageStatus::getPackageId, wmScorePackage.getId())
@@ -1241,17 +1242,17 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                         .set(WmScorePackageStatus::getStatus, "3")
                         .set(WmScorePackageStatus::getTaskAddFlag, "0")
         );
-        //查询所有接单审核通过的
+        // 查询所有接单审核通过的
         LambdaQueryWrapper<WmScorePackageStatus> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.eq(WmScorePackageStatus::getPackageId, wmScorePackage.getId());
         queryWrapper.eq(WmScorePackageStatus::getDelFlag, "0");
         queryWrapper.in(WmScorePackageStatus::getStatus, "2");
         List<WmScorePackageStatus> scorestatusList = wmScorePackageStatusService.list(queryWrapper);
-        //全部终止，终止任务和积分包
+        // 全部终止，终止任务和积分包
         int recoveryScore = 0;
         if ("1".equals(enableType)) {
-            wmScorePackage.setScorePackageStatus("6");//已终止
-            //更新结单
+            wmScorePackage.setScorePackageStatus("6");// 已终止
+            // 更新结单
             if (null != scorestatusList && scorestatusList.size() > 0) {
                 wmScorePackageStatusService.update(new WmScorePackageStatus(),
                         Wrappers.<WmScorePackageStatus>lambdaUpdate()
@@ -1274,10 +1275,10 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
             }
 
         } else if ("2".equals(enableType)) {
-            wmScorePackage.setScorePackageStatus("4");//已完成待结算
-            //部分终止，收回剩余积分值，没有审核的任务继续审核
-            //先更新任务状态为已审核
-            int resSum = 0;//收回值
+            wmScorePackage.setScorePackageStatus("4");// 已完成待结算
+            // 部分终止，收回剩余积分值，没有审核的任务继续审核
+            // 先更新任务状态为已审核
+            int resSum = 0;// 收回值
             boolean pickedButNotSubmitted = false;
             if (CollUtil.isNotEmpty(scorestatusList)) {
                 wmScorePackage.setUserNum(scorestatusList.size());
@@ -1292,8 +1293,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                     boolean all = false;
                     if (CollUtil.isEmpty(taskList1)) {
                         if (wmScorePackage.getPackageType1().equals("1") || wmScorePackage.getPackageType1()
-                                .equals("5")) {//定额
-                            //这个用户还没有做任务时，积分值设为0
+                                .equals("5")) {// 定额
+                            // 这个用户还没有做任务时，积分值设为0
                             int userScore = Integer.parseInt(wmScorePackageStatus.getUserScore());
                             wmScorePackageStatus.setUserScore("0");
                             // wmScorePackage.setScore(wmScorePackage.getScore() - Integer.parseInt(wmScorePackageStatus.getUserScore()));
@@ -1301,16 +1302,16 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                             // 已终止
                             wmScorePackage.setScorePackageStatus("6");
                             pickedButNotSubmitted = true;
-                        } else {//2，3 定量
-                            //定量收回任务个数
-                            //定量收回任务个数
+                        } else {// 2，3 定量
+                            // 定量收回任务个数
+                            // 定量收回任务个数
                             wmScorePackageStatus.setTaskNum(0);
                         }
-                        wmScorePackage.setPackageFinishStatus("1");//已完成
+                        wmScorePackage.setPackageFinishStatus("1");// 已完成
 
                     } else {
                         if (wmScorePackage.getPackageType1().equals("1") || wmScorePackage.getPackageType1()
-                                .equals("5")) {//定额
+                                .equals("5")) {// 定额
                             int sum;
                             if (wmScorePackage.getRelationScoreId() == null) {
                                 // 审核不通过的不计入
@@ -1319,7 +1320,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                                         .mapToInt(WmTask::getScore)
                                         .sum();
                                 res = Integer.parseInt(wmScorePackageStatus.getUserScore()) - sum;
-                                if (res > 0) {//个人积分包值大于任务积分值
+                                if (res > 0) {// 个人积分包值大于任务积分值
                                     wmScorePackageStatus.setUserScore(sum + "");
                                     resSum += res;
                                 }
@@ -1330,7 +1331,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                                         .mapToInt(WmTask::getScore)
                                         .sum();
                                 if (passed == 0) {
-                                    wmScorePackage.setScorePackageStatus("6");//已终止
+                                    wmScorePackage.setScorePackageStatus("6");// 已终止
                                     wmScorePackage.setEnableFlag("1");
                                     taskList1.forEach(task -> {
                                         task.setEnableFlag("1");
@@ -1338,7 +1339,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                                             task.setTaskStatus("4");
                                         }
 
-                                        //task.setReportDrugApprovalStatus(REPORT_STATUS_END.getType());
+                                        // task.setReportDrugApprovalStatus(REPORT_STATUS_END.getType());
                                         task.setReportDrugApprovalOpinion(ReportEnum.APPROVAL_OPINION_NO.getType());
                                         wmTaskMapper.updateById(task);
                                     });
@@ -1355,7 +1356,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                                 }
 
                                 res = sum = passed;
-                                if (res > 0) {//个人积分包值大于任务积分值
+                                if (res > 0) {// 个人积分包值大于任务积分值
                                     wmScorePackageStatus.setUserScore(sum + "");
                                     resSum += (wmScorePackage.getScore() - res);
                                 } else {
@@ -1364,18 +1365,18 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                             }
 
 
-                        } else {//2，3 定量
-                            //定量收回任务个数
+                        } else {// 2，3 定量
+                            // 定量收回任务个数
                             wmScorePackageStatus.setTaskNum(taskList1.size());
                         }
 
                         List<String> statusList = taskList1.stream()
                                 .map(WmTask::getTaskStatus)
                                 .collect(Collectors.toList());
-                        if (statusList.contains("2")) {//有未审核通过的任务，积分包状态还是进行中
-                            wmScorePackage.setScorePackageStatus("3");//进行中
-                        } else {//没有未审核通过的任务，已完成
-                            wmScorePackage.setPackageFinishStatus("1");//已完成
+                        if (statusList.contains("2")) {// 有未审核通过的任务，积分包状态还是进行中
+                            wmScorePackage.setScorePackageStatus("3");// 进行中
+                        } else {// 没有未审核通过的任务，已完成
+                            wmScorePackage.setPackageFinishStatus("1");// 已完成
                         }
 
                     }
@@ -1384,13 +1385,13 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                     if (all) {
                         wmScorePackageStatus.setEnableType("1");
                     } else {
-                        //更新接单数据
+                        // 更新接单数据
                         wmScorePackageStatus.setEnableType("2");
                     }
                     wmScorePackageStatusService.updateById(wmScorePackageStatus);
 
                 }
-                //更新积分包的积分总值
+                // 更新积分包的积分总值
                 if (resSum > 0) {
                     if (!pickedButNotSubmitted) {
                         wmScorePackage.setScore(wmScorePackage.getScore() - resSum);
@@ -1400,20 +1401,20 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                         wmScorePackage.setUserScore(String.valueOf(Integer.parseInt(wmScorePackage.getUserScore()) - resSum));
                     }
                 }
-            } else {//没有人接单审核通过
-                //积分包
+            } else {// 没有人接单审核通过
+                // 积分包
                 wmScorePackage.setUserNum(0);
                 wmScorePackage.setTaskNum(0);
-                wmScorePackage.setPackageFinishStatus("1");//已完成
-                wmScorePackage.setScorePackageStatus("4");//已完成待结算
-                //积分包承接对象为0的时候，返回积分包积分且积分包状态改为已终止
+                wmScorePackage.setPackageFinishStatus("1");// 已完成
+                wmScorePackage.setScorePackageStatus("4");// 已完成待结算
+                // 积分包承接对象为0的时候，返回积分包积分且积分包状态改为已终止
                 if (StringUtil.isNotEmpty(wmScorePackage.getRelationScoreId())) {
                     resSum = wmScorePackage.getScore();
-                    wmScorePackage.setScorePackageStatus("6");//积分包已终止
+                    wmScorePackage.setScorePackageStatus("6");// 积分包已终止
                 }
             }
-            wmScorePackage.setIsReceive("1");//不允许接单
-            wmScorePackage.setTaskAddFlag("0");//不允许新增任务
+            wmScorePackage.setIsReceive("1");// 不允许接单
+            wmScorePackage.setTaskAddFlag("0");// 不允许新增任务
             this.updateById(wmScorePackage);
             if (resSum > 0 && wmScorePackage.getPackageType1().equals("1")) {
                 updateRelationScore(wmScorePackage.getId(), resSum);
@@ -1540,14 +1541,14 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
         if (StringUtil.isEmpty(wmScorePackage.getRelationScoreId())) {
             wmScorePackage.setRelationScoreId("-1");
         }
-        //查询有效任务类型
+        // 查询有效任务类型
         List<WmScoreTaskType> taskTypelist = wmScoreTaskTypeMapper.getScoreTaskTypeByScoreId(wmScorePackage.getId());
         wmScorePackage.setTaskTypeList1(taskTypelist);
         Set taskTypeSet = taskTypelist.stream().map(WmScoreTaskType::getTaskTypeId).collect(Collectors.toSet());
         wmScorePackage.setTaskTypeSet(taskTypeSet);
         wmScorePackage.setTaskTypeId(taskTypelist.get(0).getTaskTypeId());
         if (wmScorePackage.getTypeid().equals("3") || wmScorePackage.getTypeid().equals("5")) {
-            //查询接单对象(3-全职,5-招商经理)
+            // 查询接单对象(3-全职,5-招商经理)
             List<WmScorePackageStatus> staList = wmScorePackageStatusService.list(Wrappers.<WmScorePackageStatus>lambdaQuery()
                     .eq(WmScorePackageStatus::getPackageId, wmScorePackage.getId())
                     .eq(WmScorePackageStatus::getDelFlag, "0"));
@@ -1599,11 +1600,11 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
     @Transactional(rollbackFor = Exception.class)
     public R<?> updateEasy(WmScorePackage wmScorePackage) {
         if (null != wmScorePackage.getDelFlag() && wmScorePackage.getDelFlag().equals("1")) {
-            WmScorePackage relationScorePackage = new WmScorePackage();//关联积分包
+            WmScorePackage relationScorePackage = new WmScorePackage();// 关联积分包
             wmScorePackage = wmScorePackageMapper.selectById(wmScorePackage.getId());
             wmScorePackage.setDelFlag("1");
 
-            if (wmScorePackage.getPackageType1().equals("1")) {//定额
+            if (wmScorePackage.getPackageType1().equals("1")) {// 定额
                 if (!StringUtil.isEmpty(wmScorePackage.getRelationScoreId())) {
                     relationScorePackage = this.getById(wmScorePackage.getRelationScoreId());
                     relationScorePackage.setKfpjf(relationScorePackage.getKfpjf() + wmScorePackage.getScore());
@@ -1623,7 +1624,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
     @Transactional(rollbackFor = Exception.class)
     public R updateWmScorePackage(WmScorePackage wmScorePackage) {
 
-        if (wmScorePackage.getPackageType1().equals("1")) {//定额
+        if (wmScorePackage.getPackageType1().equals("1")) {// 定额
             if (!StringUtil.isEmpty(wmScorePackage.getUserScore()) && wmScorePackage.getUserNum() > 0) {
                 wmScorePackage.setScore(Integer.valueOf(wmScorePackage.getUserScore()) * wmScorePackage.getUserNum());
             }
@@ -1646,8 +1647,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
         // 积分值相比修改前的变动（相对于积分余额，增加则为负-消耗，减少则为正-回收）
         int changeScore = oldScorePackage.getScore() - wmScorePackage.getScore();
 
-        WmScorePackage relationScorePackage = new WmScorePackage();//关联积分包
-        //判断预积分包值不能大于可分配积分值
+        WmScorePackage relationScorePackage = new WmScorePackage();// 关联积分包
+        // 判断预积分包值不能大于可分配积分值
         if (!StringUtil.isEmpty(wmScorePackage.getRelationScoreId()) && !wmScorePackage.getRelationScoreId()
                 .equals("-1")) {
             WmScorePackage wmScorePackage1 = new WmScorePackage();
@@ -1663,7 +1664,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 if (changeScore < 0 && Math.abs(changeScore) > kfpjf) {
                     return R.failed("修改后增加的积分值不能大于可分配积分值");
                 }
-                //更新可分配积分包值
+                // 更新可分配积分包值
                 if (changeScore > 0 || (changeScore < 0 && Math.abs(changeScore) <= kfpjf)) {
                     relationScorePackage.setId(wmScorePackage.getRelationScoreId());
                     relationScorePackage.setKfpjf(kfpjf - changeScore);
@@ -1678,7 +1679,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
             wmScorePackage.setRelationScoreId(null);
             SysDept dept = new SysDept();
-            //关联积分包为空，需要判断是不是是不是药企
+            // 关联积分包为空，需要判断是不是是不是药企
             if (wmScorePackage.getRelatedService() == null) {
                 dept = sysDeptMapper.selectById(currentUser.getDeptId());
             } else {
@@ -1689,12 +1690,12 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
             if (dept.getDeptId() == null) {
                 return R.failed("未查询到当前登陆人的");
             } else {
-                if (dept.getLevel() == 2) {//药企
+                if (dept.getLevel() == 2) {// 药企
                     WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntService.getOne(Wrappers.<WmDaDrugEnt>lambdaQuery()
                             .eq(WmDaDrugEnt::getDeptId, dept.getDeptId()));
                     wmScorePackage.setDrugEntId(wmDaDrugEnt.getId());
                     wmScorePackage.setRuleId(this.queryRuleID(wmDaDrugEnt, null));
-                } else if (dept.getLevel() == 3 || dept.getLevel() == 4) {//一级cso
+                } else if (dept.getLevel() == 3 || dept.getLevel() == 4) {// 一级cso
                     WmDaAgent wmDaAgent = wmDaAgentService.getOne(Wrappers.<WmDaAgent>lambdaQuery()
                             .eq(WmDaAgent::getDeptId, dept.getDeptId()));
                     wmScorePackage.setRuleId(this.queryRuleID(null, wmDaAgent));
@@ -1715,7 +1716,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
             wmScorePackage.setBelongDate(relationScore.getBelongDate());
         }
 
-        //保存接单对象，全职学术推广员，允许选多个
+        // 保存接单对象，全职学术推广员，允许选多个
         wmScorePackageStatusService.delStatusByPackageId(wmScorePackage.getId());
         if (wmScorePackage.getTypeid().equals("3") || wmScorePackage.getTypeid().equals("5")) {
             List<String> userList = wmScorePackage.getUserList();
@@ -1728,9 +1729,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                     wmScorePackageStatus.setPackageId(wmScorePackage.getId());
                     UserVO user = sysUserMapper.getUserVoById(Integer.valueOf(userId));
                     wmScorePackageStatus.setDeptId(user.getDeptId() + "");
-                    if (wmScorePackage.getPackageType1().equals("1")) {//定额包
+                    if (wmScorePackage.getPackageType1().equals("1")) {// 定额包
                         wmScorePackageStatus.setUserScore(wmScorePackage.getScore() + "");
-                    } else {//定量包
+                    } else {// 定量包
                         wmScorePackageStatus.setTaskNum(wmScorePackage.getTaskNum());
                     }
                     wmScorePackageStatus.setEnableFlag("0");
@@ -1753,14 +1754,14 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 || wmScorePackage.getPackageType2().equals("2")) {
             wmScoreTaskTypeMapper.delete(Wrappers.<WmScoreTaskType>lambdaQuery()
                     .eq(WmScoreTaskType::getScoreId, wmScorePackage.getId()));
-            //结算包
+            // 结算包
             WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();
             wmScoreTaskType.setScoreId(wmScorePackage.getId());
             wmScoreTaskType.setTaskTypeId(wmScorePackage.getTaskTypeId());
             wmScoreTaskType.setType("2");
             wmScoreTaskTypeMapper.insert(wmScoreTaskType);
         } else {
-            //保存有效任务类型
+            // 保存有效任务类型
             List<WmTaskTypeTree> tasktypeList = wmScorePackage.getTaskTypeList();
             if (tasktypeList != null && tasktypeList.size() > 0) {
                 wmScoreTaskTypeMapper.delete(Wrappers.<WmScoreTaskType>lambdaQuery()
@@ -1821,16 +1822,16 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 }
             }
         }
-        if (wmScorePackage.getTypeid() != null && wmScorePackage.getTypeid().equals("4")) {//兼职学术推广员
+        if (wmScorePackage.getTypeid() != null && wmScorePackage.getTypeid().equals("4")) {// 兼职学术推广员
             wmScorePackage.setXxdbId(null);
         }
-        if ("3".equals(wmScorePackage.getTypeid()) || "5".equals(wmScorePackage.getTypeid())) {//全职学术推广员
-            wmScorePackage.setIsReceive("1");//不允许接单
-            wmScorePackage.setScorePackageStatus("3");//全职学术推广员不需要审核，所有状态直接是进行中
+        if ("3".equals(wmScorePackage.getTypeid()) || "5".equals(wmScorePackage.getTypeid())) {// 全职学术推广员
+            wmScorePackage.setIsReceive("1");// 不允许接单
+            wmScorePackage.setScorePackageStatus("3");// 全职学术推广员不需要审核，所有状态直接是进行中
 
         } else if ("4".equals(wmScorePackage.getTypeid())) {
-            wmScorePackage.setIsReceive("0");//允许接单
-            wmScorePackage.setScorePackageStatus("1");//已分派待申领
+            wmScorePackage.setIsReceive("0");// 允许接单
+            wmScorePackage.setScorePackageStatus("1");// 已分派待申领
         }
         if (PackageTypeEnum.TYPE1_HCP_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
             // 患者教育，固定只能一人领取
@@ -1854,7 +1855,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                     .set(WmScorePackage::getRelationScoreId, null));
         }
 
-        //更新关联积分包可分配积分值
+        // 更新关联积分包可分配积分值
         if (!StringUtil.isEmpty(relationScorePackage.getId())) {
             this.updateById(relationScorePackage);
         }
@@ -1968,9 +1969,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
         // todo
         //// 查询结算信息
-        //List<WmScorePackageSettleNote> packageSettleNoteList = settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+        // List<WmScorePackageSettleNote> packageSettleNoteList = settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
         //		.in(WmScorePackageSettleNote::getPackageId, packageIds));
-        //Map<String, List<WmScorePackageSettleNote>> settleNoteMap = packageSettleNoteList.stream()
+        // Map<String, List<WmScorePackageSettleNote>> settleNoteMap = packageSettleNoteList.stream()
         //		.collect(Collectors.groupingBy(WmScorePackageSettleNote::getPackageId));
 
         Map<String, String> relationPackageMap = new HashMap<>();
@@ -2008,7 +2009,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 .collect(Collectors.toMap(item -> Integer.parseInt(item.getValue()), SysDictItem::getLabel)));
 
         // todo
-        //this.settleDetail(settleList, statusMap, users, settleNoteMap, relationPackageMap, deptMap, packageUserScopeMap);
+        // this.settleDetail(settleList, statusMap, users, settleNoteMap, relationPackageMap, deptMap, packageUserScopeMap);
 
         return settleListPage;
     }
@@ -2038,9 +2039,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
             ouPut.setUserNames(userNames);
             // todo
             // 查询结算成功时间
-            //List<WmScorePackageSettleNote> packageSettleNoteList = settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+            // List<WmScorePackageSettleNote> packageSettleNoteList = settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
             //		.eq(WmScorePackageSettleNote::getPackageId, ouPut.getId()));
-            //if (CollectionUtil.isNotEmpty(packageSettleNoteList)) {
+            // if (CollectionUtil.isNotEmpty(packageSettleNoteList)) {
             //	WmScorePackageSettleNote settleNote = packageSettleNoteList.get(0);
             //	LocalDateTime notifyTime = settleNote.getNotifyTime();
             //	if (notifyTime != null) {
@@ -2112,12 +2113,12 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                     .boxed()
                     .collect(Collectors.toList());
             // todo
-            //List<WmScorePackageSettleNote> noteList = settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+            // List<WmScorePackageSettleNote> noteList = settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
             //		.in(WmScorePackageSettleNote::getPackageId, idList)
             //		.eq(WmScorePackageSettleNote::getSettleNoteStatus, "1"));
 
             BigDecimal totalSettledScore = new BigDecimal("0");
-            //if (CollectionUtil.isNotEmpty(noteList)) {
+            // if (CollectionUtil.isNotEmpty(noteList)) {
             //	for (WmScorePackageSettleNote note : noteList) {
             //		totalSettledScore = totalSettledScore.add(note.getSettleAmount());
             //	}
@@ -2313,7 +2314,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                     .count();
 
 
-            //获取上级包
+            // 获取上级包
             WmScorePackage relationScorePackage = wmScorePackageMapper.selectOne(Wrappers.<WmScorePackage>lambdaQuery()
                     .eq(WmScorePackage::getId, scorePackage.getRelationScoreId()).last("limit 1"));
 
@@ -2353,10 +2354,10 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
             // todo
             // 结算记录
-            //WmScorePackageSettleNote note = settleNoteMapper.selectOne(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+            // WmScorePackageSettleNote note = settleNoteMapper.selectOne(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
             //		.eq(WmScorePackageSettleNote::getPackageId, scorePackage.getId()).last("limit 1"));
 
-            //if (note != null) {
+            // if (note != null) {
             //	scorePackage.setNotifyDate(note.getNotifyTime());
             //}
 
@@ -2366,10 +2367,10 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                         .eq(WmScorePackageSettleNote::getPackageId, scorePackage.getId());
 
                 // todo
-                //int wsNum = settleNoteMapper.selectCount(wrapper.in(WmScorePackageSettleNote::getSettleNoteStatus, 2, 9));
-                //int asNum = settleNoteMapper.selectCount(wrapper.eq(WmScorePackageSettleNote::getSettleNoteStatus, 1));
-                //scorePackage.setWsTaskNum(wsNum);
-                //scorePackage.setAsTaskNum(asNum);
+                // int wsNum = settleNoteMapper.selectCount(wrapper.in(WmScorePackageSettleNote::getSettleNoteStatus, 2, 9));
+                // int asNum = settleNoteMapper.selectCount(wrapper.eq(WmScorePackageSettleNote::getSettleNoteStatus, 1));
+                // scorePackage.setWsTaskNum(wsNum);
+                // scorePackage.setAsTaskNum(asNum);
 
             }
 
@@ -2544,7 +2545,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 .count();
 
 
-        //获取上级包
+        // 获取上级包
         WmScorePackage relationScorePackage = wmScorePackageMapper.selectOne(Wrappers.<WmScorePackage>lambdaQuery()
                 .eq(WmScorePackage::getId, scorePackage.getRelationScoreId()).last("limit 1"));
 
@@ -2590,11 +2591,11 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
         // todo
         // 结算记录
-        //WmScorePackageSettleNote note = settleNoteMapper.selectOne(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+        // WmScorePackageSettleNote note = settleNoteMapper.selectOne(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
         //		.eq(WmScorePackageSettleNote::getPackageId, scorePackage.getId()).last("limit 1"));
 
         scorePackage.setSettleAmount(null);
-        //if (note != null) {
+        // if (note != null) {
         //	scorePackage.setNotifyDate(note.getNotifyTime());
         //	scorePackage.setSubToGigTime(note.getSubToGigTime());
         //	scorePackage.setSettleStatus(note.getSettleNoteStatus());
@@ -2606,14 +2607,14 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
         if (packageType2 == 2) {
 
             // todo
-            //int wsNum = settleNoteMapper.selectCount(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+            // int wsNum = settleNoteMapper.selectCount(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
             //		.eq(WmScorePackageSettleNote::getPackageId, scorePackage.getId())
             //		.in(WmScorePackageSettleNote::getSettleNoteStatus, 2, 9));
-            //int asNum = settleNoteMapper.selectCount(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+            // int asNum = settleNoteMapper.selectCount(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
             //		.eq(WmScorePackageSettleNote::getPackageId, scorePackage.getId())
             //		.eq(WmScorePackageSettleNote::getSettleNoteStatus, 1));
-            //scorePackage.setWsTaskNum(wsNum);
-            //scorePackage.setAsTaskNum(asNum);
+            // scorePackage.setWsTaskNum(wsNum);
+            // scorePackage.setAsTaskNum(asNum);
 
         }
 
@@ -2814,7 +2815,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 .count();
 
 
-        //获取上级包
+        // 获取上级包
         WmScorePackage relationScorePackage = parentPackageNameMap.get(scorePackage.getRelationScoreId());
 
         // 类型标签
@@ -3875,9 +3876,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
         // todo
         // 查询结算信息
-        //List<WmScorePackageSettleNote> packageSettleNoteList = settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+        // List<WmScorePackageSettleNote> packageSettleNoteList = settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
         //		.in(WmScorePackageSettleNote::getPackageId, packageIds));
-        //Map<String, List<WmScorePackageSettleNote>> settleNoteMap = packageSettleNoteList.stream()
+        // Map<String, List<WmScorePackageSettleNote>> settleNoteMap = packageSettleNoteList.stream()
         //		.collect(Collectors.groupingBy(WmScorePackageSettleNote::getPackageId));
 
         Map<String, String> relationPackageMap = new HashMap<>();
@@ -3914,6 +3915,23 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
         this.baseMapper.pageForSupervision(page, pkgName, supervision, finalEntIds);
     }
 
+    @Override
+    public Map<String, Object> indPkgStat(HnqzUser user) {
+        Map<String, Object> records = new HashMap<>();
+        records.put("id", 123);
+        records.put("pkgName", "测试计划");
+        records.put("pkgScore", 123456);
+        records.put("pickerName", "测试服务提供方1");
+        records.put("createTime", LocalDateTime.now());
+        records.put("taskPassedPercentage", "30%");
+        records.put("taskPassedScore", 234);
+        Map<String, String> task = new HashMap<>(1);
+        task.put("分享文章", "10%");
+        records.put("eachTaskTypeRate", task);
+
+        return records;
+    }
+
     /**
      * 结算数据字段拼接转换
      *
@@ -3976,8 +3994,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 if (StringUtils.isBlank(ouPut.getSettleStatus())) {
                     ouPut.setSettleStatus(String.valueOf(settleNote.getSettleNoteStatus()));
                 }
-                //ouPut.setSubjectLocation(settleNote.getSubjectLocation());
-                //if (settleNote.getSubjectLocation() != null) {
+                // ouPut.setSubjectLocation(settleNote.getSubjectLocation());
+                // if (settleNote.getSubjectLocation() != null) {
                 //	ouPut.setSubjectLocationName(settleNote.getSubjectLocation().getDescription());
                 //}
                 ouPut.setSubToGigTime(settleNote.getSubToGigTime());