init: init project step4: biz code support

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

@@ -1,10 +1,7 @@
-
 package com.qunzhixinxi.hnqz.admin.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
@@ -23,7 +20,6 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmReportOpt;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmDaPharmacy;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDeptTaskTypeConfig;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmReport;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
@@ -62,9 +58,6 @@ import com.qunzhixinxi.hnqz.admin.mapper.WmWkArticleMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmWkArticleShareMapper;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
-import com.qunzhixinxi.hnqz.admin.service.WmDaDistributionService;
-import com.qunzhixinxi.hnqz.admin.service.WmDaHospitalService;
-import com.qunzhixinxi.hnqz.admin.service.WmDaPharmacyService;
 import com.qunzhixinxi.hnqz.admin.service.WmDeptTaskTypeConfigService;
 import com.qunzhixinxi.hnqz.admin.service.WmReportService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
@@ -81,8 +74,6 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -229,11 +220,11 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
             Integer drugEntId = report.getDrugEntId();
             Integer applyDrugEntId = report.getApplyDrugEntId();
 
-            if (drugEntId != null){
+            if (drugEntId != null) {
                 SysDept byId = sysDeptService.getById(drugEntId);
                 report.setEntName(byId.getName());
 
-            } else if(applyDrugEntId != null){
+            } else if (applyDrugEntId != null) {
                 SysDept byId = sysDeptService.getById(applyDrugEntId);
                 report.setEntName(byId.getName());
             }
@@ -755,7 +746,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public R approvalReport(WmReport wmReport, List<String> taskIds, String approvalOpinion, String approvalInfo, Integer nodeId) {
+    public R<?> approvalReport(WmReport wmReport, List<String> taskIds, String approvalOpinion, String approvalInfo, Integer nodeId) {
 
         WmScorePackage scorePackage = wmScorePackageService.getById(wmReport.getScoreId());
         //// 如果是源头积分包，则判断是否审核入库调查信息
@@ -850,8 +841,6 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
         }
 
 
-
-
         updateTaskWrapper.set(WmTask::getRealFlag, "0");
         updateTaskWrapper.set(WmTask::getDeptApprovalUserId, userId);
         updateTaskWrapper.set(WmTask::getDeptApprovalTime, now);
@@ -945,7 +934,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
                         .eq(WmTask::getRealFlag, "0")
                         .eq(WmTask::getReportDrugApprovalOpinion, "1")
                         .eq(WmTask::getReportOneApprovalOpinion, "1");
-                        //.and(wrapper -> wrapper.eq(WmTask::getReportDrugApprovalOpinion, "1").or().eq(WmTask::getReportOneApprovalOpinion, "1"));
+                //.and(wrapper -> wrapper.eq(WmTask::getReportDrugApprovalOpinion, "1").or().eq(WmTask::getReportOneApprovalOpinion, "1"));
                 List<WmTask> approvalTaskList = wmTaskService.list(apporvalWrapper);
                 int totalScore = approvalTaskList.stream().mapToInt(WmTask::getScore).sum();
                 WmScorePackage taskScorePackage = wmScorePackageService.getById(task.getScorePackageId());
@@ -966,10 +955,10 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
     /**
      * 企业根据任务类型审核任务
      *
-     * @param taskIds
-     * @param approvalOpinion
-     * @param approvalInfo
-     * @return
+     * @param taskIds         任务ID
+     * @param approvalOpinion 审核意见
+     * @param approvalInfo    意见描述
+     * @return 审核结果
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -1025,7 +1014,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
                 .or().eq(WmTask::getReportOneId, wmReport.getId())
                 .or().eq(WmTask::getReportSecondId, wmReport.getId()));
         // 如果是审批页面，则过滤掉通过和不通过的数据（reportDrugApprovalOpinion或reportOneApprovalOpinion：1通过，2不通过）
-         if (isApprovalPage != null && isApprovalPage.equals(1)) {
+        if (isApprovalPage != null && isApprovalPage.equals(1)) {
             if ("0".equals(scorePackage.getTypeid())) {//药企
                 lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportDrugApprovalOpinion));
             } else if ("1".equals(scorePackage.getTypeid())) {//一级代理商类型
@@ -1089,8 +1078,8 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 
             // 查询审核人用户信息
             Set<Integer> approvalUserIds = taskList.stream()
-                    .filter(r -> r.getDeptApprovalUserId() != null)
-                    .map(WmTask::getDeptApprovalUserId).collect(Collectors.toSet());
+                    .map(WmTask::getDeptApprovalUserId)
+                    .filter(Objects::nonNull).collect(Collectors.toSet());
             Map<Integer, String> userMap = new HashMap<>();
             if (CollUtil.isNotEmpty(approvalUserIds)) {
                 List<SysUser> users = sysUserService.listByIds(approvalUserIds);