init: init project step4: biz code support

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

@@ -1,5 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.api.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -24,8 +25,10 @@ import java.util.Map;
 public class WmTask implements Serializable {
     private static final long serialVersionUID = 1L;
 
-
-    @TableId
+    /**
+     * 任务ID
+     */
+    @TableId(type = IdType.AUTO)
     private String id;
 
     /**
@@ -44,6 +47,9 @@ public class WmTask implements Serializable {
     @TableField(exist = false)
     private String taskTypeName;
 
+    /**
+     * 任务积分
+     */
     Integer score;
 
     String scorePackageDrugId;
@@ -328,7 +334,6 @@ public class WmTask implements Serializable {
     private Integer nodeId;
 
 
-
     @Getter
     @AllArgsConstructor
     public enum TaskSettleStatusEnum {

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

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysCheckChainNodeCheckHistoryDTO;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysCheckChainNodeCheckHistory;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
@@ -56,6 +57,7 @@ import com.qunzhixinxi.hnqz.admin.mapper.WmUserSignMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmWkAlbumMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmWkArticleMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmWkArticleShareMapper;
+import com.qunzhixinxi.hnqz.admin.service.SysCheckChainNodeCheckHistoryService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
 import com.qunzhixinxi.hnqz.admin.service.WmDeptTaskTypeConfigService;
@@ -123,6 +125,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
     private final WmWkArticleMapper wmWkArticleMapper;
     private final RedisTemplate<String, String> redisTemplate;
     private final SysCheckChainManager checkChainManager;
+    private final SysCheckChainNodeCheckHistoryService checkChainNodeCheckHistoryService;
 
     @Override
     public IPage<WmReport> getReportListPage(Page page, WmReport wmReport, String scoreId, String name) {
@@ -1057,17 +1060,25 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
         if (StrUtil.isNotBlank(taskStatus)) {
             lambdaQueryWrapper.eq(WmTask::getTaskStatus, taskStatus);
         }
+
+        // 过滤审批流信息
+        Integer nodeId = null;
+        if (SecurityUtils.getRoles().contains(43)){
+            nodeId = 2;
+        } else if (SecurityUtils.getRoles().contains(4)){
+            nodeId = 3;
+        }
+
+        List<SysCheckChainNodeCheckHistory> his = checkChainNodeCheckHistoryService.list(
+                Wrappers.<SysCheckChainNodeCheckHistory>lambdaQuery()
+                        .eq(SysCheckChainNodeCheckHistory::getNodeId, nodeId));
+        Set<Integer> collect = his.stream().mapToInt(SysCheckChainNodeCheckHistory::getTargetId).boxed().collect(Collectors.toSet());
+        if (CollUtil.isNotEmpty(collect)){
+            lambdaQueryWrapper.notIn(WmTask::getId, collect);
+        }
+
         pages = wmTaskService.page(page, lambdaQueryWrapper);
-//		if("0".equals(scorePackage.getTypeid())){//药企
-//			wmTask.setReportDrugId(wmReport.getId());
-//			pages=wmTaskService.page(page, Wrappers.query(wmTask));
-//		}else if("1".equals(scorePackage.getTypeid())){//一级代理商类型
-//			wmTask.setReportOneId(wmReport.getId());
-//			pages=wmTaskService.page(page, Wrappers.query(wmTask));
-//		}else if("2".equals(scorePackage.getTypeid())){//二级代理商类型
-//			wmTask.setReportSecondId(wmReport.getId());
-//			pages=wmTaskService.page(page, Wrappers.query(wmTask));
-//		}
+
         if (pages == null) {
             return R.ok();
         }