init: init project step4: biz code support

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

@@ -2,10 +2,9 @@ package com.qunzhixinxi.hnqz.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -16,9 +15,8 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("wm_task_type")
-@EqualsAndHashCode(callSuper = true)
-public class WmTaskType extends Model<WmTaskType> {
-private static final long serialVersionUID = 1L;
+public class WmTaskType implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @TableId
     private String id;
@@ -31,30 +29,30 @@ private static final long serialVersionUID = 1L;
      */
     private String taskTypeLevel;
 
-	/**
-	 * 规则类型，1药企 2一级代理商
-	 */
-	private String status;
+    /**
+     * 规则类型，1药企 2一级代理商 3二级代理商
+     */
+    private String status;
 
-	/**
-	 * 药企ID
-	 */
-	private Integer durgentId;
+    /**
+     * 药企ID
+     */
+    private Integer durgentId;
 
-	/**
-	 * 药企ID
-	 */
-	private Integer level1Id;
+    /**
+     * 药企ID
+     */
+    private Integer level1Id;
 
-	/**
-	 * 药企ID
-	 */
-	private Integer taskEntId;
+    /**
+     * 药企ID
+     */
+    private Integer taskEntId;
 
-	/**
-	 * 完成后可获得分
-	 */
-	private Integer score;
+    /**
+     * 完成后可获得分
+     */
+    private Integer score;
     /**
      * 积分范围开始
      */
@@ -96,29 +94,29 @@ private static final long serialVersionUID = 1L;
      */
     private Integer updateUser;
 
-	/**
-	 * 基础id
-	 */
-	private String baseId;
+    /**
+     * 基础id
+     */
+    private String baseId;
 
-	private String realFlag;
-	/**
-	 * 规则id
-	 */
-	private String ruleId;
+    private String realFlag;
+    /**
+     * 规则id
+     */
+    private String ruleId;
 
-	/**
-	 * 父级id
-	 */
-	private String parentId;
+    /**
+     * 父级id
+     */
+    private String parentId;
 
-	/**
-	 * 承接对象(1-个人,2-企业)
-	 */
-	private String taskReceiverType;
+    /**
+     * 承接对象(1-个人,2-企业)
+     */
+    private String taskReceiverType;
 
-	/**
-	 * 任务备注
-	 */
-	private String taskRemark;
+    /**
+     * 任务备注
+     */
+    private String taskRemark;
 }

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

@@ -27,6 +27,7 @@ import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType;
+import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -130,7 +131,7 @@ public class WmTaskTypeController {
 
 
     /**
-     * 分页查询
+     * 分页查询（一级cso）
      *
      * @param page       分页对象
      * @param wmTaskType 任务类型打分表
@@ -138,8 +139,27 @@ public class WmTaskTypeController {
      */
     @GetMapping("/page")
     public R<IPage<WmTaskTypeVO>> getWmTaskTypePage(Page<WmTaskType> page, WmTaskType wmTaskType) {
-        List<String> noDisplayTaskTypeNameList = Arrays.asList("专家咨询", "受试者管理", "医学撰写", "受试者招募", "数据管理",
-                "统计分析", "临床监察", "通用", "患者教育");
+        List<String> noDisplayTaskTypeNameList =
+                Arrays.asList("专家咨询", "受试者管理",
+                        "医学撰写", "受试者招募",
+                        "数据管理", "统计分析",
+                        "临床监察", "通用", "患者教育");
+
+
+        if ("3".equals(wmTaskType.getStatus())){
+            HnqzUser user = SecurityUtils.getUser();
+            WmDaAgent one = wmDaAgentService.getOne(Wrappers.<WmDaAgent>lambdaQuery().eq(WmDaAgent::getDeptId, user.getDeptId()));
+
+            if (one != null){
+                String ruleId = one.getExtDrugEnt();
+                if (StrUtil.isNotBlank(ruleId)){
+                    wmTaskType.setRuleId(ruleId);
+                }
+            }
+
+        }
+
+
         LambdaQueryWrapper<WmTaskType> queryWrapper = Wrappers.<WmTaskType>lambdaQuery()
                 .notIn(WmTaskType::getTaskTypeName, noDisplayTaskTypeNameList);
 
@@ -158,32 +178,21 @@ public class WmTaskTypeController {
         queryWrapper.eq(WmTaskType::getDelFlag, DelEnum.NOT_DEL.getVal());
 
         Page<WmTaskType> pageResult = wmTaskTypeService.page(page, queryWrapper);
-        Page<WmTaskTypeVO> voPage = new Page<>();
-        voPage.setSize(pageResult.getSize());
-        voPage.setCurrent(pageResult.getCurrent());
-        voPage.setTotal(pageResult.getTotal());
-        List<WmTaskTypeVO> voList = new ArrayList<>();
-        pageResult.getRecords().forEach(taskType -> {
+        Page<WmTaskTypeVO> voPage = new Page<>(pageResult.getCurrent(), pageResult.getSize(), pageResult.getTotal());
+        List<WmTaskTypeVO> voList = pageResult.getRecords().stream().map(taskType -> {
             WmTaskTypeVO typeVO = BeanUtil.copyProperties(taskType, WmTaskTypeVO.class, "score", "taskScoreStart", "taskScoreEnd");
-//            if (StrUtil.isNotBlank(taskType.getTaskTypeName()) && taskType.getTaskTypeName().startsWith("应收账款回款")) {
-//                // 应收账款回款 任务类 保存的是1000倍数，需要转换回来
-//                typeVO.setScore(String.valueOf(taskType.getScore() / 1000.0D));
-//                typeVO.setTaskScoreStart(String.valueOf(taskType.getTaskScoreStart() / 1000.0D));
-//                typeVO.setTaskScoreEnd(String.valueOf(taskType.getTaskScoreEnd() / 1000.0D));
-//            } else {
-                typeVO.setScore(String.valueOf(taskType.getScore()));
-                typeVO.setTaskScoreStart(String.valueOf(taskType.getTaskScoreStart()));
-                typeVO.setTaskScoreEnd(String.valueOf(taskType.getTaskScoreEnd()));
-//            }
-            voList.add(typeVO);
-        });
+            typeVO.setScore(String.valueOf(taskType.getScore()));
+            typeVO.setTaskScoreStart(String.valueOf(taskType.getTaskScoreStart()));
+            typeVO.setTaskScoreEnd(String.valueOf(taskType.getTaskScoreEnd()));
+            return typeVO;
+        }).collect(Collectors.toList());
         voPage.setRecords(voList);
 
         return R.ok(voPage);
     }
 
     /**
-     * 分页查询
+     * 分页查询（药企用）
      *
      * @param page       分页对象
      * @param wmTaskType 任务类型打分表

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

@@ -145,7 +145,9 @@ public class SysImplementPlanManager {
         Map<Integer, SysDept> consigneeMap = deptService.mapConsignee(consigneeIds);
 
         // 获取商品信息
-        List<Map<String, String>> skuList = drugEntDrugtableService.listDrugByDeptId(consigneeIds);
+
+        Set<Integer> skuIds = records.stream().map(SysImplementPlan::getSkuId).collect(Collectors.toSet());
+        List<Map<String, String>> skuList = drugEntDrugtableService.listDrugs(skuIds);
         Map<Integer, Map<String, String>> skuMap = skuList.stream().collect(Collectors.toMap(sku -> Integer.valueOf(sku.get("drug_id")), Function.identity()));
 
 

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

@@ -59,4 +59,6 @@ public interface WmDaDrugEntDrugtableService extends IService<WmDaDrugEntDrugtab
 	 * @return {@link List}<{@link Map}<{@link String}, {@link String}>>
 	 */
 	List<Map<String, String>> listDrugByDeptId(Collection<Integer> deptId);
+
+	List<Map<String, String>> listDrugs(Collection<Integer> drugIds);
 }

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

@@ -189,6 +189,12 @@ public class WmDaDrugEntDrugtableServiceImpl extends ServiceImpl<WmDaDrugEntDrug
             return Collections.emptyList();
         }
 
+        return listDrugs(drugIds);
+    }
+
+    @Override
+    public List<Map<String, String>> listDrugs(Collection<Integer> drugIds) {
+
         List<WmDaDrugEntDrugtable> list = this.list(Wrappers.<WmDaDrugEntDrugtable>lambdaQuery()
                 .eq(WmDaDrugEntDrugtable::getDelFlag, CommonConstants.STATUS_NORMAL)
                 .eq(WmDaDrugEntDrugtable::getEnableFlag, CommonConstants.STATUS_NORMAL)
@@ -204,4 +210,6 @@ public class WmDaDrugEntDrugtableServiceImpl extends ServiceImpl<WmDaDrugEntDrug
                     return map;
                 }).collect(Collectors.toList());
     }
+
+
 }