init: init project step4: biz code support

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

@@ -1138,7 +1138,7 @@ public class WmTaskController {
      */
     @SysLog("任务中心-是否有可生成报告的任务")
     @GetMapping("/selectReport")
-    public R select(WmTask wmTask) {
+    public R<?> select(WmTask wmTask) {
         return wmTaskService.selectByWmTask(wmTask);
     }
 

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

@@ -154,21 +154,17 @@ public class SysImplementPlanManager {
         List<TreeNode<Integer>> toPages = getToPages(records, consigneeMap, skuMap);
 
         List<Tree<Integer>> builds = new ArrayList<>();
-        if (entLevel == 0){
+        // 药企 || 一级
+        if (entLevel == 0 || entLevel == 1){
             List<Tree<Integer>> build = TreeUtil.build(toPages, 0);
             builds.addAll(build);
-        } else {
-            Map<Integer, List<TreeNode<Integer>>> collect = toPages.stream().collect(Collectors.groupingBy(TreeNode::getParentId));
-            for (TreeNode<Integer> node : toPages) {
-
-                Integer parentId = entLevel == 1 ? node.getId() : node.getParentId();
+        }
+        // 二级
+        else {
 
-                List<TreeNode<Integer>> treeNodes = collect.get(parentId);
-                if (CollUtil.isNotEmpty(treeNodes)) {
-                    treeNodes.add(node);
-                    List<Tree<Integer>> build = TreeUtil.build(treeNodes, node.getParentId());
+            for (TreeNode<Integer> node : toPages) {
+                    List<Tree<Integer>> build = TreeUtil.build(Collections.singletonList(node), node.getParentId());
                     builds.addAll(build);
-                }
             }
         }
 

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

@@ -58,27 +58,27 @@ public interface WmTaskService extends IService<WmTask> {
      */
     List<WmTask> listTaskPrescription(String scorePackageId, String prescriptionNo);
 
-     List<Map<String, Object>> getTaskListByPackageIds(WmTask wmTask);
+    List<Map<String, Object>> getTaskListByPackageIds(WmTask wmTask);
 
-     List<Map<String, Object>> getTaskListByPackageIdsForJs(WmTask wmTask);
+    List<Map<String, Object>> getTaskListByPackageIdsForJs(WmTask wmTask);
 
-     R selectZbCount(WmTask wmTask);
+    R selectZbCount(WmTask wmTask);
 
-     List<Map<String, Object>> getTaskListByPackageIdsForJsUser(WmTask wmTask);
+    List<Map<String, Object>> getTaskListByPackageIdsForJsUser(WmTask wmTask);
 
-     List<Map<String, Object>> getTaskListByPackageIdsCount(WmTask wmTask);
+    List<Map<String, Object>> getTaskListByPackageIdsCount(WmTask wmTask);
 
-     List<Map<String, Object>> getTaskListByPackageIdsAndUser(WmTask wmTask);
+    List<Map<String, Object>> getTaskListByPackageIdsAndUser(WmTask wmTask);
 
-     List<Map<String, Object>> getTaskListByPackageIdsZd(WmTask wmTask);
+    List<Map<String, Object>> getTaskListByPackageIdsZd(WmTask wmTask);
 
-     List<WmTask> getTaskListByPackageIdsReturnWmtaskInfo(WmTask wmTask);
+    List<WmTask> getTaskListByPackageIdsReturnWmtaskInfo(WmTask wmTask);
 
-     IPage<Map<String, Object>> getH5PackageList(Page page, WmTask wmTask);
+    IPage<Map<String, Object>> getH5PackageList(Page page, WmTask wmTask);
 
-     IPage<Map<String, Object>> getH5TaskList(Page page, WmTask wmTask);
+    IPage<Map<String, Object>> getH5TaskList(Page page, WmTask wmTask);
 
-    R selectByWmTask(WmTask wmTask);
+    R<?> selectByWmTask(WmTask wmTask);
 
     R selectByWmTaskId(WmTask wmTask);
 
@@ -86,9 +86,9 @@ public interface WmTaskService extends IService<WmTask> {
 
     R saveAndUpdateWmReport(WmTask wmTask, WmReport wmReport);
 
-    public R selectList(Page page, WmScorePackage wmScorePackage);
+    R selectList(Page page, WmScorePackage wmScorePackage);
 
-    public List<Map<String, Object>> getTaskListByIdsCount(WmTask wmTask);
+    List<Map<String, Object>> getTaskListByIdsCount(WmTask wmTask);
 
     List<Map<String, Object>> getTaskListByIds(WmTask wmTask);
 
@@ -96,11 +96,11 @@ public interface WmTaskService extends IService<WmTask> {
 
     List<Map<String, Object>> getTaskListByIdsJs(WmTask wmTask);
 
-    public List<WmTask> getTaskListByIdsReturnWmtaskInfo(WmTask wmTask);
+    List<WmTask> getTaskListByIdsReturnWmtaskInfo(WmTask wmTask);
 
-    public List<Map<String, Object>> getTaskListByIdsZd(WmTask wmTask);
+    List<Map<String, Object>> getTaskListByIdsZd(WmTask wmTask);
 
-     List<Map<String, Object>> getTaskListByIdsZdJs(WmTask wmTask);
+    List<Map<String, Object>> getTaskListByIdsZdJs(WmTask wmTask);
 
 
     R getWmTaskList(Page page, WmTask wmTask);