init: init project step4: biz code support

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

@@ -151,7 +151,7 @@ public class InitController {
                     newOne.setLevel1Id(wmDaAgent.getId());
                     newOne.setDurgentId(wmDaDrugEnt.getId());
                     newOne.setTaskTypeLevel("2");
-                    newOne.setRuleId(wmDaDrugEnt.getId() + wmDaAgent.getId() + "");
+                    newOne.setRuleId("" + wmDaDrugEnt.getId() + wmDaAgent.getId());
                     newOne.setTaskEntId(wmDaAgent.getId());
                     newOne.setDeptId(wmDaAgent.getDeptId());
                     newOne.setStatus("0");

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

@@ -25,10 +25,19 @@ import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmDaAgent;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEntDrugtable;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmPkgQuizRelation;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.TargetType;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackageStatus;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmScoreTaskType;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskRule;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmTeam;
 import com.qunzhixinxi.hnqz.admin.api.vo.WmScorePackageVO;
-import com.qunzhixinxi.hnqz.admin.api.entity.*;
 import com.qunzhixinxi.hnqz.admin.api.dto.UnpackDTO;
 import com.qunzhixinxi.hnqz.admin.api.model.input.WmScorePackageSettleOutput;
 import com.qunzhixinxi.hnqz.admin.api.model.excel.BatchPackageExcelModel;
@@ -37,14 +46,32 @@ import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.EnableEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.PackageTypeEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.ScorePackageStatusEnum;
-import com.qunzhixinxi.hnqz.admin.mapper.*;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRecharge;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRechargeRecord;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordPackageType;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.RechargeRecordType;
 import com.qunzhixinxi.hnqz.admin.mapper.SysDeptRechargeMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.SysDeptRechargeRecordMapper;
-import com.qunzhixinxi.hnqz.admin.service.*;
+import com.qunzhixinxi.hnqz.admin.mapper.WmDaAgentMapper;
+import com.qunzhixinxi.hnqz.admin.mapper.WmDaDrugEntMapper;
+import com.qunzhixinxi.hnqz.admin.mapper.WmScorePackageMapper;
+import com.qunzhixinxi.hnqz.admin.mapper.WmScoreTaskTypeMapper;
+import com.qunzhixinxi.hnqz.admin.mapper.WmTaskMapper;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
+import com.qunzhixinxi.hnqz.admin.service.SysDictItemService;
+import com.qunzhixinxi.hnqz.admin.service.SysUserService;
+import com.qunzhixinxi.hnqz.admin.service.WmBizReminderService;
+import com.qunzhixinxi.hnqz.admin.service.WmDaAgentService;
+import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntDrugtableService;
+import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
+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.WmScoreTaskTypeService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskRuleService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeService;
+import com.qunzhixinxi.hnqz.admin.service.WmTeamService;
 import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.core.util.R;
@@ -60,7 +87,16 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
@@ -69,7 +105,15 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -211,7 +255,7 @@ public class WmScorePackageController {
 
                 List<WmTaskRule> wmTaskRuleList = wmTaskRuleService.list(Wrappers.query(wmTaskRule));
                 List<String> stringList = new ArrayList<>();
-                if (wmTaskRuleList.size() > 0) {
+                if (CollUtil.isNotEmpty(wmTaskRuleList)) {
                     for (WmTaskRule wmt : wmTaskRuleList) {
                         stringList.add(wmt.getId());
                     }
@@ -1239,31 +1283,25 @@ public class WmScorePackageController {
      */
     @GetMapping("/list")
     public R<?> listWmScorePackage(WmScorePackage wmScorePackage) {
-        wmScorePackage.setDelFlag("0");
-        wmScorePackage.setEnableFlag("0");
+        wmScorePackage.setDelFlag(CommonConstants.STATUS_NORMAL);
+        wmScorePackage.setEnableFlag(CommonConstants.STATUS_NORMAL);
 
         List<WmScorePackage> list = wmScorePackageService.list(Wrappers.query(wmScorePackage));
 
 
-        List<Map<String, String>> answerList = new ArrayList<>();
-        if (list.size() > 0) {
+        List<Map<String, String>> answerList;
+        if (CollUtil.isNotEmpty(list)) {
+            answerList = new ArrayList<>(list.size());
             for (WmScorePackage sysUser : list) {
-                Map<String, String> map = new HashMap<>();
-                map.put("id", sysUser.getId() + "");
-                if (null == sysUser.getScoreId() || "".equals(sysUser.getScoreId().trim())) {
-                    map.put("scoreId", "-");
-                } else {
-                    map.put("scoreId", sysUser.getScoreId());
-
-                }
-                if (null == sysUser.getScoreName() || "".equals(sysUser.getScoreName().trim())) {
-                    map.put("scoreName", "-");
-                } else {
-                    map.put("scoreName", sysUser.getScoreName() + "");
-                }
+                Map<String, String> map = new HashMap<>(3);
+                map.put("id", sysUser.getId());
+                map.put("scoreId", StrUtil.isBlank(sysUser.getScoreId().trim()) ? "-" : sysUser.getScoreId());
+                map.put("scoreName", StrUtil.isBlank(sysUser.getScoreName().trim()) ? "-" : sysUser.getScoreName());
                 answerList.add(map);
             }
 
+        } else {
+            answerList = Collections.emptyList();
         }
         return R.ok(answerList);
     }
@@ -1276,11 +1314,10 @@ public class WmScorePackageController {
      */
     @GetMapping("/listWmScorePackageAndTask")
     public R<?> listWmScorePackageAndTask(WmScorePackage wmScorePackage) {
-        wmScorePackage.setDelFlag("0");
-        wmScorePackage.setEnableFlag("0");
-        if (SecurityUtils.getRoles().contains(3)) {
-            wmScorePackage.setDrugEntId(SecurityUtils.getUser().getDrugEntId());
-        } else if (SecurityUtils.getRoles().contains(4)) {
+        wmScorePackage.setDelFlag(CommonConstants.STATUS_NORMAL);
+        wmScorePackage.setEnableFlag(CommonConstants.STATUS_NORMAL);
+        // 3: 药企管理员 || 4: cso 管理员
+        if (SecurityUtils.getRoles().contains(3) || SecurityUtils.getRoles().contains(4)) {
             wmScorePackage.setDrugEntId(SecurityUtils.getUser().getDrugEntId());
         }
         return R.ok(wmScorePackageService.listWmScorePackageAndTask(wmScorePackage));
@@ -1293,8 +1330,8 @@ public class WmScorePackageController {
      */
     @GetMapping("/packageIsZZ")
     public R<?> packageIsZZ(WmScorePackage wmScorePackage) {
-        wmScorePackage.setDelFlag("0");
-        wmScorePackage.setEnableFlag("0");
+        wmScorePackage.setDelFlag(CommonConstants.STATUS_NORMAL);
+        wmScorePackage.setEnableFlag(CommonConstants.STATUS_NORMAL);
 
         return R.ok(wmScorePackageService.listWmScorePackageAndTask(wmScorePackage));
     }
@@ -1310,7 +1347,7 @@ public class WmScorePackageController {
     @GetMapping("/getPlatTotalData")
     public R<?> getPlatTotalData(Page<?> page, WmScorePackage wmScorePackage, String[] dates) {
 
-        if (null != dates && dates.length > 0) {
+        if (ArrayUtil.isNotEmpty(dates)) {
             // 将时间戳转为当前时间
 
             wmScorePackage.setDelFlag(dates[0].substring(0, 10));
@@ -1337,19 +1374,10 @@ public class WmScorePackageController {
         List<Map<String, String>> answerList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(list)) {
             for (WmScorePackage scorePackage : list) {
-                Map<String, String> map = new HashMap<>();
-                map.put("id", scorePackage.getId() + "");
-                if (StringUtils.isEmpty(scorePackage.getScoreId())) {
-                    map.put("scoreId", "-");
-                } else {
-                    map.put("scoreId", scorePackage.getScoreId());
-
-                }
-                if (StringUtils.isEmpty(scorePackage.getScorePackageName())) {
-                    map.put("scoreName", "-");
-                } else {
-                    map.put("scoreName", scorePackage.getScorePackageName());
-                }
+                Map<String, String> map = new HashMap<>(3);
+                map.put("id", scorePackage.getId());
+                map.put("scoreId", StringUtils.isEmpty(scorePackage.getScoreId()) ? "-" : scorePackage.getScoreId());
+                map.put("scoreName", StringUtils.isEmpty(scorePackage.getScorePackageName()) ? "-" : scorePackage.getScorePackageName());
                 answerList.add(map);
             }
 
@@ -1365,7 +1393,6 @@ public class WmScorePackageController {
      */
     @GetMapping("/selectLists")
     public R<?> selectLists(WmScorePackage wmScorePackage) {
-        wmScorePackage.getRelationScoreId();
         return R.ok(wmScorePackageService.selectLists(wmScorePackage));
     }
 
@@ -1377,7 +1404,7 @@ public class WmScorePackageController {
         try {
             return R.ok(wmScorePackageService.selectWmScorePackage(wmScorePackage));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("查看分配积分信息失败：{}", e.getMessage(), e);
             return R.failed();
         }
     }
@@ -1564,8 +1591,8 @@ public class WmScorePackageController {
             deptId = String.valueOf(SecurityUtils.getUser().getDeptId());
         }
 
-        wmScorePackage.setDelFlag("0");
-        wmScorePackage.setEnableFlag("0");
+        wmScorePackage.setDelFlag(CommonConstants.STATUS_NORMAL);
+        wmScorePackage.setEnableFlag(CommonConstants.STATUS_NORMAL);
         wmScorePackage.setDeptId(deptId);
         List<WmScorePackage> list = wmScorePackageService.list(Wrappers.query(wmScorePackage));
 
@@ -1604,13 +1631,13 @@ public class WmScorePackageController {
             wmScorePackage.setSendPackageDeptId(wmScorePackage.getRelatedService());
             wmScorePackage.setDeptId(String.valueOf(SecurityUtils.getUser().getDeptId()));
             List<WmScorePackage> list = wmScorePackageService.selectByReRelatedService(wmScorePackage);
-            if (list.size() > 0) {
+            if (CollUtil.isNotEmpty(list)) {
                 for (WmScorePackage wmScorePackage1 : list) {
                     if (wmScorePackage1.getKfpjf() == null || wmScorePackage1.getKfpjf() <= 0) {
                         // 过滤掉可分配积分值为0的积分包
                         continue;
                     }
-                    Map<String, Object> map1 = new HashMap<>();
+                    Map<String, Object> map1 = new HashMap<>(4);
                     map1.put("relationScoreName", wmScorePackage1.getScorePackageName());
                     map1.put("drugProducerList", wmScorePackage1.getDrugProducerList());
                     map1.put("drugtable", wmScorePackage1.getDrugtable());
@@ -1618,7 +1645,7 @@ public class WmScorePackageController {
                     answerList.add(map1);
                 }
             } else if (SecurityUtils.getRoles().contains(3)) {
-                Map<String, Object> map2 = new HashMap<>();
+                Map<String, Object> map2 = new HashMap<>(2);
                 map2.put("id", "-1");
                 map2.put("relationScoreName", "无");
                 answerList.add(map2);
@@ -1632,19 +1659,19 @@ public class WmScorePackageController {
                     // 过滤掉可分配积分值为0的积分包
                     continue;
                 }
-                Map<String, Object> map3 = new HashMap<>();
+                Map<String, Object> map3 = new HashMap<>(4);
                 map3.put("id", wmScorePackage1.getId());
                 map3.put("drugProducerList", wmScorePackage1.getDrugProducerList());
                 map3.put("drugtable", wmScorePackage1.getDrugtable());
                 map3.put("relationScoreName", wmScorePackage1.getScorePackageName());
                 answerList.add(map3);
             }
-            Map<String, Object> map4 = new HashMap<>();
+            Map<String, Object> map4 = new HashMap<>(2);
             map4.put("id", "-1");
             map4.put("relationScoreName", "无");
             answerList.add(map4);
         } else if (selfId.getLevel() == 2) {
-            Map<String, Object> map5 = new HashMap<>();
+            Map<String, Object> map5 = new HashMap<>(2);
             map5.put("id", "-1");
             map5.put("relationScoreName", "无");
             answerList.add(map5);
@@ -1667,35 +1694,34 @@ public class WmScorePackageController {
         Map<String, Object> map2 = new HashMap<>();
 
         //获取接包对象和可分配积分
-        List wmDaDrugEnts = new ArrayList();
+        List<WmDaAgent> wmDaDrugEnts = new ArrayList();
         if ("-1".equals(wmScorePackage.getId()) && wmId.getLevel() == 3) {
             map2.put("kfpjf", "");
             List<WmDaAgent> list = wmDaAgentService.listAgentByDeptRelation(anId.getDeptId());
-            for (int i = 0; i < list.size(); i++) {
-                if (Integer.parseInt(list.get(i).getEnableFlag()) == 0) {
-                    wmDaDrugEnts.add(list.get(i));
+            for (WmDaAgent wmDaAgent : list) {
+                if (Integer.parseInt(wmDaAgent.getEnableFlag()) == 0) {
+                    wmDaDrugEnts.add(wmDaAgent);
                 }
             }
-        } else if ("-1".equals(wmScorePackage.getId()) && wmId.getDeptId()
-                .equals(SecurityUtils.getUser().getDeptId())) {
+        } else if ("-1".equals(wmScorePackage.getId()) && wmId.getDeptId().equals(SecurityUtils.getUser().getDeptId())) {
             WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntService.selectByDeptId(wmId.getDeptId());
             List<WmDaAgent> list = wmDaAgentService.selectWmDaAgentByDeptId(wmDaDrugEnt.getDeptId().toString());
-            for (int i = 0; i < list.size(); i++) {
-                if (Integer.parseInt(list.get(i).getEnableFlag()) == 0) {
-                    wmDaDrugEnts.add(list.get(i));
+            for (WmDaAgent wmDaAgent : list) {
+                if (Integer.parseInt(wmDaAgent.getEnableFlag()) == 0) {
+                    wmDaDrugEnts.add(wmDaAgent);
                 }
             }
         } else {
             List<WmDaAgent> list = wmDaAgentService.selectWmDaAgentByRelationIds(wmId.getDeptId());
-            for (int i = 0; i < list.size(); i++) {
-                if (Integer.parseInt(list.get(i).getEnableFlag()) == 0) {
-                    wmDaDrugEnts.add(list.get(i));
+            for (WmDaAgent wmDaAgent : list) {
+                if (Integer.parseInt(wmDaAgent.getEnableFlag()) == 0) {
+                    wmDaDrugEnts.add(wmDaAgent);
                 }
             }
         }
 
-        wmScorePackage.setDelFlag("0");
-        wmScorePackage.setEnableFlag("0");
+        wmScorePackage.setDelFlag(CommonConstants.STATUS_NORMAL);
+        wmScorePackage.setEnableFlag(CommonConstants.STATUS_NORMAL);
         List<WmScorePackage> list = wmScorePackageService.list(Wrappers.query(wmScorePackage));
         map2.put("acceptSug", wmDaDrugEnts);
         for (WmScorePackage wmScorePackage1 : list) {
@@ -1710,7 +1736,7 @@ public class WmScorePackageController {
         //获取数据
         if (wmId.getLevel() == 3) {
             for (WmScorePackage wmScorePackage1 : list) {
-                Map<String, Object> map1 = new HashMap<>();
+                Map<String, Object> map1 = new HashMap<>(7);
                 List<String> stringList = new ArrayList<>();
                 if (SecurityUtils.getUser().getDeptId().equals(Integer.valueOf(wmScorePackage1.getDeptId()))) {
                     WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();
@@ -1846,9 +1872,9 @@ public class WmScorePackageController {
         if (StrUtil.isBlank(wmScorePackage.getTypeid())) {
             WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntService.selectByDeptId(deptId);
             if (wmDaDrugEnt != null) {
-                if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug().equals(wmDaDrugEnt.getId())) {
+                if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug().equals(wmDaDrugEnt.getId().toString())) {
                     WmDaAgent wmDaAgent = wmDaAgentService.getById(wmScorePackage.getAcceptSug());
-                    SysDept sysDepts = sysDeptService.getById(Integer.valueOf(wmDaAgent.getDeptId()));
+                    SysDept sysDepts = sysDeptService.getById(wmDaAgent.getDeptId());
                     if (sysDepts.getLevel() == 3) {
                         wmScorePackage.setLevel1Id(wmDaAgent.getId());
                     } else if (sysDepts.getLevel() == 4) {
@@ -1856,16 +1882,16 @@ public class WmScorePackageController {
                     }
                     wmScorePackage.setDeptId(wmDaAgent.getDeptId().toString());
                     wmScorePackage.setKfpjf(wmScorePackage.getScore());
-                } else if (wmDaDrugEnt.getId().equals(wmScorePackage.getAcceptSug())) {
+                } else if (wmDaDrugEnt.getId().toString().equals(wmScorePackage.getAcceptSug())) {
                     wmScorePackage.setDeptId(deptId.toString());
                     wmScorePackage.setKfpjf(wmScorePackage.getScore());
                 }
             } else {
                 if (sysDeptRelatedService.getLevel() == 2) {
                     WmDaDrugEnt wmDaDrugEnts = wmDaDrugEntService.selectByDeptId(Integer.valueOf(wmScorePackage.getRelatedService()));
-                    if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug().equals(wmDaDrugEnts.getId())) {
+                    if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug().equals(wmDaDrugEnts.getId().toString())) {
                         WmDaAgent wmDaAgent = wmDaAgentService.getById(wmScorePackage.getAcceptSug());
-                        SysDept sysDepts = sysDeptService.getById(Integer.valueOf(wmDaAgent.getDeptId()));
+                        SysDept sysDepts = sysDeptService.getById(wmDaAgent.getDeptId());
 
                         if (sysDepts.getLevel() == 3) {
                             wmScorePackage.setLevel1Id(wmDaAgent.getId());
@@ -1874,15 +1900,15 @@ public class WmScorePackageController {
                         }
                         wmScorePackage.setDeptId(wmDaAgent.getDeptId().toString());
                         wmScorePackage.setKfpjf(wmScorePackage.getScore());
-                    } else if (wmScorePackage.getAcceptSug().equals(wmDaDrugEnt.getId())) {
+                    } else if (wmScorePackage.getAcceptSug().equals(wmDaDrugEnt.getId().toString())) {
                         wmScorePackage.setDeptId(String.valueOf(SecurityUtils.getUser().getDeptId()));
                         wmScorePackage.setKfpjf(wmScorePackage.getScore());
                     }
                 } else if (sysDeptRelatedService.getLevel() == 3) {
                     WmDaAgent wmDaAgent1 = wmDaAgentService.selectByDeptId(Integer.valueOf(wmScorePackage.getRelatedService()));
-                    if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug().equals(wmDaAgent1.getId())) {
+                    if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug().equals(wmDaAgent1.getId().toString())) {
                         WmDaAgent wmDaAgent = wmDaAgentService.getById(wmScorePackage.getAcceptSug());
-                        SysDept sysDepts = sysDeptService.getById(Integer.valueOf(wmDaAgent.getDeptId()));
+                        SysDept sysDepts = sysDeptService.getById(wmDaAgent.getDeptId());
                         if (sysDepts.getLevel() == 3) {
                             wmScorePackage.setLevel1Id(wmDaAgent.getId());
                         } else if (sysDepts.getLevel() == 4) {
@@ -1890,7 +1916,7 @@ public class WmScorePackageController {
                         }
                         wmScorePackage.setDeptId(wmDaAgent.getDeptId().toString());
                         wmScorePackage.setKfpjf(wmScorePackage.getScore());
-                    } else if (wmDaAgent1.getId().equals(wmScorePackage.getAcceptSug())) {
+                    } else if (wmDaAgent1.getId().toString().equals(wmScorePackage.getAcceptSug())) {
                         wmScorePackage.setDeptId(deptId.toString());
                         wmScorePackage.setKfpjf(wmScorePackage.getScore());
                     }
@@ -2088,7 +2114,7 @@ public class WmScorePackageController {
 
         wmScorePackage.setUpdateUser(SecurityUtils.getUser().getId());
         wmScorePackage.setUpdateTime(LocalDateTime.now());
-        if (null != wmScorePackage.getRelationScoreId() && !"".equals(wmScorePackage.getRelationScoreId())) {
+        if (StrUtil.isNotBlank(wmScorePackage.getRelationScoreId())) {
             WmScorePackage wmScorePackage1 = new WmScorePackage();
             wmScorePackage1.setDelFlag("0");
             wmScorePackage1.setRelationScoreId(wmScorePackage.getRelationScoreId());
@@ -2099,7 +2125,7 @@ public class WmScorePackageController {
             wmScorePackage1.setEnableFlag("0");
             List<WmScorePackage> wmScorePackageList = wmScorePackageService.list(Wrappers.query(wmScorePackage1));
             WmScorePackage wmId = wmScorePackageService.getById(wmScorePackage.getId());
-            if (wmScorePackageList.size() > 0) {
+            if (CollUtil.isNotEmpty(wmScorePackageList)) {
                 for (WmScorePackage wms : wmScorePackageList) {
                     if (wmId.getId().equals(wms.getRelationScoreId())) {
                         return R.failed("积分包已被分派，请联系下属CSO终止关联积分包");
@@ -2107,7 +2133,7 @@ public class WmScorePackageController {
                         wmScorePackage.setEnableFlag("1");
                         wmScorePackage.setPackageFinishStatus("2");
                         List<WmScorePackage> wmScorePackages = wmScorePackageService.selectRelationScoreId(wmId.getId());
-                        if (wmScorePackages.size() > 0) {
+                        if (CollUtil.isNotEmpty(wmScorePackages)) {
                             for (WmScorePackage wmScorePackage3 : wmScorePackages) {
                                 if (wmId.getRelationScoreId().equals(wmScorePackage3.getRelationScoreId())) {
                                     wms.setPackageIsConduct("1");
@@ -2137,13 +2163,13 @@ public class WmScorePackageController {
 
             List<WmScorePackage> wmScorePackageList = wmScorePackageService.list(Wrappers.query(queryWm));
             WmScorePackage wmId = wmScorePackageService.getById(wmScorePackage.getId());
-            if (wmScorePackageList.size() > 0) {
+            if (CollUtil.isNotEmpty(wmScorePackageList)) {
                 for (WmScorePackage wmScorePackage2 : wmScorePackageList) {
                     if (wmId.getId().equals(wmScorePackage2.getRelationScoreId())) {
                         return R.failed("积分包已被分派，请联系下属CSO终止关联积分包");
                     } else if (wmScorePackage2.getId().equals(wmId.getRelationScoreId())) {
                         List<WmScorePackage> wmScorePackages = wmScorePackageService.selectRelationScoreId(wmId.getId());
-                        if (wmScorePackages.size() > 0) {
+                        if (CollUtil.isNotEmpty(wmScorePackages)) {
                             for (WmScorePackage wmScorePackage1 : wmScorePackages) {
                                 if (wmId.getRelationScoreId().equals(wmScorePackage1.getRelationScoreId())) {
                                     wmScorePackage2.setPackageIsConduct("1");
@@ -2164,7 +2190,7 @@ public class WmScorePackageController {
                         wmScorePackage.setEnableFlag("1");
                         wmScorePackage.setPackageFinishStatus("2");
                         List<WmScorePackage> wmScorePackages = wmScorePackageService.selectRelationScoreId(wmId.getId());
-                        if (wmScorePackages.size() > 0) {
+                        if (CollUtil.isNotEmpty(wmScorePackages)) {
                             for (WmScorePackage wmScorePackage1 : wmScorePackages) {
                                 if (wmId.getRelationScoreId().equals(wmScorePackage1.getRelationScoreId())) {
                                     wmScorePackage2.setPackageIsConduct("1");
@@ -2227,7 +2253,7 @@ public class WmScorePackageController {
             wmScorePackage1.setScorePackageName(wmScorePackage.getScorePackageName());
             wmScorePackage1.setDeptId(wmScorePackage.getDeptId());
             List<WmScorePackage> wmScorePackageList = wmScorePackageService.listWmScorePackages(wmScorePackage1);
-            if (wmScorePackageList.size() > 0) {
+            if (CollUtil.isNotEmpty(wmScorePackageList)) {
                 return R.failed("积分包名称已存在");
             }
 
@@ -2238,10 +2264,10 @@ public class WmScorePackageController {
         WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntService.selectByDeptId(sysDeptDrugEntId.getDeptId());
 
         if (null != wmDaDrugEnt) {
-            if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug().equals(wmDaDrugEnt.getId())) {
+            if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug().equals(wmDaDrugEnt.getId().toString())) {
                 WmDaAgent wmDaAgent = wmDaAgentService.getById(wmScorePackage.getAcceptSug());
 
-                SysDept sysDepts = sysDeptService.getById(Integer.valueOf(wmDaAgent.getDeptId()));
+                SysDept sysDepts = sysDeptService.getById(wmDaAgent.getDeptId());
 
                 if (sysDepts.getLevel() == 3) {
                     wmScorePackage.setLevel2Id(null);
@@ -2258,9 +2284,9 @@ public class WmScorePackageController {
         } else {
             WmDaAgent wmDaAgent = wmDaAgentService.getById(wmScorePackage.getAcceptSug());
 
-            if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug().equals(wmDaAgent.getId())) {
+            if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug().equals(wmDaAgent.getId().toString())) {
 
-                SysDept sysDepts = sysDeptService.getById(Integer.valueOf(wmDaAgent.getDeptId()));
+                SysDept sysDepts = sysDeptService.getById(wmDaAgent.getDeptId());
                 if (sysDepts.getLevel() == 3) {
                     wmScorePackage.setLevel2Id(null);
                     wmScorePackage.setLevel1Id(Integer.parseInt(wmScorePackage.getAcceptSug()));
@@ -2282,10 +2308,10 @@ public class WmScorePackageController {
 
             if (sysDeptRuleId.getLevel() == 2) {
                 WmDaDrugEnt wmDaDrugEntRuleId = wmDaDrugEntService.selectByDeptId(sysDeptRuleId.getDeptId());
-                if (wmScorePackage.getAcceptSug().equals(wmDaDrugEntRuleId.getId())) {
+                if (wmScorePackage.getAcceptSug().equals(wmDaDrugEntRuleId.getId().toString())) {
                     wmScorePackage.setRuleId(wmScorePackage.getAcceptSug());
                     wmScorePackage.setDrugEntId(wmDaDrugEntRuleId.getId());
-                } else if (!wmScorePackage.getAcceptSug().equals(wmDaDrugEntRuleId.getId())) {
+                } else {
                     wmScorePackage.setRuleId(wmDaDrugEntRuleId.getId() + wmScorePackage.getAcceptSug());
                     wmScorePackage.setDrugEntId(wmDaDrugEntRuleId.getId());
                 }
@@ -2332,21 +2358,20 @@ public class WmScorePackageController {
 
             WmScorePackage wmIds = wmScorePackageService.getById(wmScorePackage.getId());
             if (wmDaDrugEnt != null) {
-                if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug()
-                        .equals(wmDaDrugEnt.getId())) {
+                if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug().equals(wmDaDrugEnt.getId().toString())) {
                     WmDaAgent wmDaAgent = wmDaAgentService.getById(wmScorePackage.getAcceptSug());
-                    wmScorePackage.setDeptId(wmDaAgent.getDeptId() + "");
+                    wmScorePackage.setDeptId(wmDaAgent.getDeptId().toString());
                     wmScorePackage.setKfpjf(wmScorePackage.getScore() - wmIds.getScore() + wmIds.getKfpjf());
-                } else if (wmScorePackage.getAcceptSug().equals(wmDaDrugEnt.getId())) {
+                } else if (wmScorePackage.getAcceptSug().equals(wmDaDrugEnt.getId().toString())) {
                     wmScorePackage.setDeptId(String.valueOf(SecurityUtils.getUser().getDeptId()));
                     wmScorePackage.setKfpjf(wmScorePackage.getScore());
                 }
             } else {
                 WmDaAgent wmDaAgent = wmDaAgentService.getById(wmScorePackage.getAcceptSug());
-                if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug().equals(wmDaAgent.getId())) {
-                    wmScorePackage.setDeptId(wmDaAgent.getDeptId() + "");
+                if (null != wmScorePackage.getAcceptSug() && !wmScorePackage.getAcceptSug().equals(wmDaAgent.getId().toString())) {
+                    wmScorePackage.setDeptId(wmDaAgent.getDeptId().toString());
                     wmScorePackage.setKfpjf(wmScorePackage.getScore() - wmIds.getScore() + wmIds.getKfpjf());
-                } else if (wmScorePackage.getAcceptSug().equals(wmDaAgent.getId())) {
+                } else if (wmScorePackage.getAcceptSug().equals(wmDaAgent.getId().toString())) {
                     wmScorePackage.setDeptId(String.valueOf(wmDaAgent.getDeptId()));
                     wmScorePackage.setKfpjf(wmScorePackage.getScore());
                 }
@@ -2368,12 +2393,12 @@ public class WmScorePackageController {
             }
             List<WmScorePackage> wmScorePackageList = wmScorePackageService.list(Wrappers.query(queryWm));
             WmScorePackage wmId = wmScorePackageService.getById(wmScorePackage.getId());
-            if (wmScorePackageList.size() > 0) {
+            if (CollUtil.isNotEmpty(wmScorePackageList)) {
                 for (WmScorePackage wms : wmScorePackageList) {
-                    if (wmScorePackageList.size() > 0) {
+                    if (CollUtil.isNotEmpty(wmScorePackageList)) {
                         if (wms.getId().equals(wmScorePackage.getRelationScoreId())) {//判断是否有scoreId与当前关联积分包匹配
                             List<WmScorePackage> wmScorePackagess = wmScorePackageService.selectRelationScoreId(wmId.getId());
-                            if (wmScorePackagess.size() > 0) {
+                            if (CollUtil.isNotEmpty(wmScorePackagess)) {
                                 for (WmScorePackage wmScorePackage13 : wmScorePackagess) {
                                     if (wmScorePackage.getRelationScoreId().equals(wmScorePackage13.getId())) {
                                         wms.setPackageIsConduct("1");
@@ -2400,17 +2425,15 @@ public class WmScorePackageController {
                                         .intValue());
                                 wmId.setScore(wmScorePackage.getScore());
                             }
-                        } else if (wms.getKfpjf() != null && !wmScorePackage.getRelationScoreId()
-                                .equals("") && wmScorePackage.getScore() > wms.getKfpjf() + wmId.getScore()) {
+                        } else if (wms.getKfpjf() != null && StrUtil.isNotBlank(wmScorePackage.getRelationScoreId()) && wmScorePackage.getScore() > wms.getKfpjf() + wmId.getScore()) {
                             return R.failed("可分配积分不足");
-                        } else if ("".equals(wmScorePackage.getRelationScoreId()) && wms.getId()
-                                .equals(wmId.getRelationScoreId())) {//判断关联积分包是否为无
+                        } else if ("".equals(wmScorePackage.getRelationScoreId()) && wms.getId().equals(wmId.getRelationScoreId())) {//判断关联积分包是否为无
                             wms.setKfpjf(wmId.getScore() + wms.getKfpjf());
                         } else if (wms.getId().equals(wmId.getRelationScoreId())) {
                             wms.setKfpjf(new Double(Math.ceil(wms.getKfpjf() + wmId.getScore())).intValue());
                             //判断是否进行中
                             List<WmScorePackage> wmScorePackages = wmScorePackageService.selectRelationScoreId(wmId.getId());
-                            if (wmScorePackages.size() > 0) {
+                            if (CollUtil.isNotEmpty(wmScorePackages)) {
                                 for (WmScorePackage wmScorePackage1 : wmScorePackages) {
                                     if (null != wmScorePackage1.getRelationScoreId() && wmScorePackage1.getRelationScoreId()
                                             .equals(wmId.getRelationScoreId())) {
@@ -2679,7 +2702,7 @@ public class WmScorePackageController {
                 .eq("p.package_type2", packageType2)
                 .eq(scorePackageStatus != null, "p.score_package_status", scorePackageStatus)
                 .eq("p.send_package_dept_id", deptId)
-                .between(start != null && end != null, "p.create_time", start, end);
+                .between(start != null, "p.create_time", start, end);
 
         if (StrUtil.isNotBlank(scorePackageName)) {
             queryWrapper.and(wrapper -> wrapper.like("p.score_package_name", scorePackageName).or().like("p.pkg_sn", scorePackageName));
@@ -2856,7 +2879,7 @@ public class WmScorePackageController {
                 .eq(scorePackageStatus != null, "p.score_package_status", scorePackageStatus)
                 .eq("p.mah_settle_dept_id", deptId)
                 .in("p.mah_settle_step", UpmsType.MahSettleStep.BUSINESS.getType(), UpmsType.MahSettleStep.FINANCE.getType())
-                .between(start != null && end != null, "p.create_time", start, end);
+                .between(start != null, "p.create_time", start, end);
 
         if (StrUtil.isNotBlank(scorePackageName)) {
             queryWrapper.and(wrapper -> wrapper.like("p.score_package_name", scorePackageName).or().like("p.pkg_sn", scorePackageName));
@@ -3004,7 +3027,7 @@ public class WmScorePackageController {
                 .eq("p.package_type2", packageType2)
                 .eq(scorePackageStatus != null, "p.score_package_status", scorePackageStatus)
                 .eq("p.send_package_dept_id", deptId)
-                .between(start != null && end != null, "p.create_time", start, end);
+                .between(start != null, "p.create_time", start, end);
 
         if (StrUtil.isNotBlank(scorePackageName)) {
             queryWrapper.and(wrapper -> wrapper.like("p.score_package_name", scorePackageName).or().like("p.pkg_sn", scorePackageName));
@@ -3210,7 +3233,7 @@ public class WmScorePackageController {
                 .eq(scorePackageStatus != null, "p.score_package_status", scorePackageStatus)
                 .eq("p.mah_settle_dept_id", deptId)
                 .in("p.mah_settle_step", UpmsType.MahSettleStep.BUSINESS.getType(), UpmsType.MahSettleStep.FINANCE.getType())
-                .between(start != null && end != null, "p.create_time", start, end);
+                .between(start != null, "p.create_time", start, end);
 
         if (StrUtil.isNotBlank(scorePackageName)) {
             queryWrapper.and(wrapper -> wrapper.like("p.score_package_name", scorePackageName).or().like("p.pkg_sn", scorePackageName));
@@ -3387,7 +3410,7 @@ public class WmScorePackageController {
                 .like(StrUtil.isNotEmpty(scorePackageName), WmScorePackage::getScorePackageName, scorePackageName)
                 .eq(scorePackageStatus != null, WmScorePackage::getScorePackageStatus, scorePackageStatus)
                 .eq(WmScorePackage::getSendPackageDeptId, sendDeptId)
-                .between(start != null && end != null, WmScorePackage::getCreateTime, start, end);
+                .between(start != null, WmScorePackage::getCreateTime, start, end);
 
         List<String> packageType1List = StrUtil.split(packageType1, StrUtil.COMMA);
         if (StrUtil.contains(packageType1, StrUtil.COMMA)) {
@@ -3431,7 +3454,6 @@ public class WmScorePackageController {
 
                 if (PackageTypeEnum.TYPE1_HCP_PACKAGE.getName().equals(scorePackage.getPackageType1())) {
                     // 如果是患者教育，则转换积分值 '分'-> '元'
-                    Integer score = scorePackage.getScore();
                     String userScore = scorePackage.getUserScore();
                     if (org.apache.commons.lang3.StringUtils.isNumeric(userScore)) {
                         scorePackage.setUserScore(String.format("%.2f", Integer.parseInt(userScore) / 100.0));
@@ -3485,7 +3507,7 @@ public class WmScorePackageController {
                 .eq(scorePackageStatus != null, WmScorePackage::getScorePackageStatus, scorePackageStatus)
                 .eq(WmScorePackage::getMahSettleDeptId, sendDeptId)
                 .eq(WmScorePackage::getMahSettleStep, UpmsType.MahSettleStep.FINANCE.getType())
-                .between(start != null && end != null, WmScorePackage::getCreateTime, start, end);
+                .between(start != null, WmScorePackage::getCreateTime, start, end);
 
         List<String> packageType1List = StrUtil.split(packageType1, StrUtil.COMMA);
         if (StrUtil.contains(packageType1, StrUtil.COMMA)) {
@@ -3578,12 +3600,6 @@ public class WmScorePackageController {
             return R.failed("积分包序列号必填");
         }
 
-        //if (StrUtil.isNotBlank(wmScorePackage.getSubjectLocation())) {
-        //	SubjectLocation location = Enum.valueOf(SubjectLocation.class, wmScorePackage.getSubjectLocation());
-        //	wmScorePackage.setLocation(location);
-        //	wmScorePackage.setSubType(String.valueOf(location.getGigType().getCode()));
-        //}
-
         return wmScorePackageService.addWmScorePackage(wmScorePackage);
     }
 
@@ -3676,7 +3692,7 @@ public class WmScorePackageController {
      * 查询已完成积分值
      *
      * @param wmScorePackage 积分包
-     * @return
+     * @return 结果
      */
     @GetMapping("/selectSettleStatus")
     public Map<String, Object> selectSettleStatus(WmScorePackage wmScorePackage) {
@@ -3687,7 +3703,7 @@ public class WmScorePackageController {
      * 查询发包对象
      *
      * @param wmScorePackage 积分包
-     * @return
+     * @return 结果
      */
     @GetMapping("/selectSendPackageDeptId")
     public List<SysDept> selectSendPackageDeptId(WmScorePackage wmScorePackage) {
@@ -3698,7 +3714,7 @@ public class WmScorePackageController {
      * 查询发包对象
      *
      * @param wmScorePackage 积分包
-     * @return
+     * @return 结果
      */
     @GetMapping("/selectRelationScoreIdList")
     public WmScorePackage selectRelationScoreIdList(WmScorePackage wmScorePackage) {
@@ -3776,7 +3792,7 @@ public class WmScorePackageController {
 
         String lock = "lock:package:batch:" + user.getDeptId();
 
-        if (!redisTemplate.opsForValue().setIfAbsent(lock, IdUtil.fastUUID())) {
+        if (Boolean.FALSE.equals(redisTemplate.opsForValue().setIfAbsent(lock, IdUtil.fastUUID()))) {
             return R.failed("有在途的操作,请稍后");
         }
 

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

@@ -1,7 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.service;
 
 import cn.hutool.core.lang.tree.Tree;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserDTO;
@@ -103,7 +102,6 @@ public interface SysUserService extends IService<SysUser> {
 
     SysUser getByIdIgnore(String taskUserId);
 
-    //R batchChannelCert(UserCertificationInput input);
 
     R getAuthInfo(UserCertificationInput input);
 

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

@@ -9,27 +9,38 @@ import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.nacos.common.utils.Md5Utils;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserDTO;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserInfo;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserPwd;
-import com.qunzhixinxi.hnqz.admin.api.entity.*;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysRole;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysUserRole;
 import com.qunzhixinxi.hnqz.admin.api.vo.MenuVO;
 import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysCsmUserRelation;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptSub;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysUserSub;
 import com.qunzhixinxi.hnqz.admin.api.dto.CommonUserDTO;
 import com.qunzhixinxi.hnqz.admin.api.model.input.UserCertificationInput;
 import com.qunzhixinxi.hnqz.admin.api.model.output.UserCertificationOutput;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.LockEnum;
-import com.qunzhixinxi.hnqz.admin.mapper.*;
-import com.qunzhixinxi.hnqz.admin.service.*;
+import com.qunzhixinxi.hnqz.admin.mapper.SysDeptRelationMapper;
+import com.qunzhixinxi.hnqz.admin.mapper.SysDeptSubMapper;
+import com.qunzhixinxi.hnqz.admin.mapper.SysUserMapper;
+import com.qunzhixinxi.hnqz.admin.mapper.SysUserRoleMapper;
+import com.qunzhixinxi.hnqz.admin.service.SysAreaEntityService;
+import com.qunzhixinxi.hnqz.admin.service.SysCsmUserRelationService;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
+import com.qunzhixinxi.hnqz.admin.service.SysMenuService;
+import com.qunzhixinxi.hnqz.admin.service.SysRoleService;
+import com.qunzhixinxi.hnqz.admin.service.SysUserAreaService;
+import com.qunzhixinxi.hnqz.admin.service.SysUserRoleService;
+import com.qunzhixinxi.hnqz.admin.service.SysUserService;
 import com.qunzhixinxi.hnqz.common.core.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import com.qunzhixinxi.hnqz.common.core.util.R;
@@ -50,7 +61,15 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -72,7 +91,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private final SysUserRoleService sysUserRoleService;
     private final SysUserRoleMapper sysUserRoleMapper;
     private final SysUserMapper sysUserMapper;
-    private final SysDeptRelationService sysDeptRelationService;
     private final SysDeptRelationMapper sysDeptRelationMapper;
     private final RedisTemplate<String, Object> redisTemplate;
     private final SysDeptSubMapper sysDeptSubMapper;
@@ -80,21 +98,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private final SysUserAreaService userAreaService;
     private final SysAreaEntityService areaEntityService;
 
-    /**
-     * @Modify: start
-     * @Version: v2021.4.16
-     * @Author: ryz
-     * @Date: 2021/5/6
-     */
     @Override
-    public R getAuthInfo(UserCertificationInput input) {
+    public R<UserCertificationOutput> getAuthInfo(UserCertificationInput input) {
 
         SysUser sysUser = sysUserMapper.selectById(input.getUserId());
-
         SysDeptSub sysDeptSub = new SysDeptSub();
-//		sysDeptSub.setDeptId(SecurityUtils.getUser().getDeptId());
         sysDeptSub.setDeptId(sysUser.getDeptId());
-        //sysDeptSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
+        sysDeptSub.setEnableFlag("1");
         List<SysDeptSub> subList = sysDeptSubMapper.selectList(Wrappers.query(sysDeptSub));
         UserCertificationOutput output = new UserCertificationOutput();
         output.setSubList(subList);
@@ -247,7 +257,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     tmp.setUsername(userDTO.getUsername());
                     tmp.setDelFlag("0");
                     List<UserVO> userVoList = sysUserMapper.selectByPhone(tmp);
-                    if (userVoList.size() > 0) {
+                    if (CollUtil.isNotEmpty(userVoList)) {
                         for (UserVO userVO : userVoList) {
                             if (null != userVO.getRoleList()) {
                                 for (SysRole r : userVO.getRoleList()) {
@@ -269,7 +279,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                                     }
                                     if (r.getRoleId() == 7) {
                                         errorInfo = errorInfo + "用户已存在平台管理员角色,不能同时为财务管理员！";
-                                        continue;
                                     }
                                 }
                             }
@@ -281,7 +290,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     tmp.setUsername(userDTO.getUsername());
                     tmp.setDelFlag("0");
                     List<UserVO> userVoList = sysUserMapper.selectByPhone(tmp);
-                    if (userVoList.size() > 0) {
+                    if (CollUtil.isNotEmpty(userVoList)) {
                         for (UserVO userVO : userVoList) {
                             if (null != userVO.getRoleList()) {
                                 for (SysRole r : userVO.getRoleList()) {
@@ -296,7 +305,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                                     if (dept.getLevel() == 3 || dept.getLevel() == 4) {
                                         if (r.getRoleId() == 5) {
                                             errorInfo = errorInfo + "用户已存在CSO关系角色,不能同时为药企管理员！";
-                                            continue;
                                         }
                                     }
                                 }
@@ -309,7 +317,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     tmp.setUsername(userDTO.getUsername());
                     tmp.setDelFlag("0");
                     List<UserVO> userVoList = sysUserMapper.selectByPhone(tmp);
-                    if (userVoList.size() > 0) {
+                    if (CollUtil.isNotEmpty(userVoList)) {
                         for (UserVO userVO : userVoList) {
                             if (null != userVO.getRoleList()) {
                                 for (SysRole r : userVO.getRoleList()) {
@@ -343,7 +351,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     tmp.setUsername(userDTO.getUsername());
                     tmp.setDelFlag("0");
                     List<UserVO> userVoList = sysUserMapper.selectByPhone(tmp);
-                    if (userVoList.size() > 0) {
+                    if (CollUtil.isNotEmpty(userVoList)) {
                         for (UserVO userVO : userVoList) {
                             if (null != userVO.getRoleList()) {
                                 for (SysRole r : userVO.getRoleList()) {
@@ -354,7 +362,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                                     if (dept.getLevel() == 3 || dept.getLevel() == 4) {
                                         if (r.getRoleId() == 3) {
                                             errorInfo = errorInfo + "用户已存在药企管理员,不能同时为CSO机构财务管理员！";
-                                            continue;
                                         }
                                     }
                                 }
@@ -367,7 +374,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     tmp.setUsername(userDTO.getUsername());
                     tmp.setDelFlag("0");
                     List<UserVO> userVoList = sysUserMapper.selectByPhone(tmp);
-                    if (userVoList.size() > 0) {
+                    if (CollUtil.isNotEmpty(userVoList)) {
                         for (UserVO userVO : userVoList) {
                             if (null != userVO.getRoleList()) {
                                 for (SysRole r : userVO.getRoleList()) {
@@ -384,7 +391,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                                     if (r.getRoleId() == 4) {
                                         if (dept.getLevel() == 3 || dept.getLevel() == 4) {
                                             errorInfo = errorInfo + "用户已存在CSO管理员,不能为其他CSO的全职学术推广员！";
-                                            continue;
                                         }
                                     }
 
@@ -398,7 +404,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     tmp.setUsername(userDTO.getUsername());
                     tmp.setDelFlag("0");
                     List<UserVO> userVoList = sysUserMapper.selectByPhone(tmp);
-                    if (userVoList.size() > 0) {
+                    if (CollUtil.isNotEmpty(userVoList)) {
                         for (UserVO userVO : userVoList) {
                             if (null != userVO.getRoleList()) {
                                 for (SysRole r : userVO.getRoleList()) {
@@ -409,12 +415,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                                     SysUserRole sysUserRole = new SysUserRole();
                                     sysUserRole.setUserId(userVO.getUserId());
                                     List<SysUserRole> sysUserRoleList = sysUserRoleMapper.selectById(sysUserRole);
-                                    for (int k = 0; k < sysUserRoleList.size(); k++) {
-                                        if (sysUserRoleList.get(k).getRoleId().equals(7)) {
-                                            SysUser sysUser = getById(sysUserRoleList.get(k).getUserId());
+                                    for (SysUserRole userRole : sysUserRoleList) {
+                                        if (userRole.getRoleId().equals(7)) {
+                                            SysUser sysUser = getById(userRole.getUserId());
                                             if (sysUser.getDeptId().equals(userDTO.getDeptId())) {
                                                 errorInfo = errorInfo + "用户已存在财务管理员角色，不能同时为兼职学术推广员！";
-                                                continue;
                                             }
                                         }
                                     }
@@ -428,7 +433,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     tmp.setUsername(userDTO.getUsername());
                     tmp.setDelFlag("0");
                     List<UserVO> userVoList = sysUserMapper.selectByPhone(tmp);
-                    if (userVoList.size() > 0) {
+                    if (CollUtil.isNotEmpty(userVoList)) {
                         for (UserVO userVO : userVoList) {
                             if (null != userVO.getRoleList()) {
                                 for (SysRole r : userVO.getRoleList()) {
@@ -472,7 +477,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         if (commonUserDTOList.size() != 1) {
             log.error("表中手机号重复");
-            Set<String> idSet = commonUserDTOList.stream().map(dto -> dto.getId()).collect(Collectors.toSet());
+            Set<String> idSet = commonUserDTOList.stream().map(CommonUserDTO::getId).collect(Collectors.toSet());
             errorMap(errorMap, "表中手机号重复", JSONUtil.toJsonStr(idSet));
         }
 
@@ -526,14 +531,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
 
         // 校验用户状态
-        String lockflag = StrUtil.cleanBlank(commonUserDTO.getLockFlag());
-        if (StringUtils.isEmpty(lockflag)) {
+        String lockFlag = StrUtil.cleanBlank(commonUserDTO.getLockFlag());
+        if (StringUtils.isEmpty(lockFlag)) {
             log.error("用户状态为空");
             errorMap(errorMap, "用户状态为空", commonUserDTO.getId());
         } else {
-            if (StringUtils.equals(lockflag, "活跃")) {
+            if (StringUtils.equals(lockFlag, "活跃")) {
                 userDTO.setLockFlag("0");
-            } else if (StringUtils.equals(lockflag, "休眠")) {
+            } else if (StringUtils.equals(lockFlag, "休眠")) {
                 userDTO.setLockFlag("9");
             } else {
                 log.error("用户状态为值不是\"活跃\"或者\"休眠\"");
@@ -620,7 +625,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         Set<String> permissions = new HashSet<>();
         roleIds.forEach(roleId -> {
             List<String> permissionList = sysMenuService.findMenuByRoleId(roleId).stream()
-                    .filter(menuVo -> StringUtils.isNotEmpty(menuVo.getPermission())).map(MenuVO::getPermission)
+                    .map(MenuVO::getPermission).filter(StringUtils::isNotEmpty)
                     .collect(Collectors.toList());
             permissions.addAll(permissionList);
         });
@@ -633,7 +638,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      *
      * @param page    分页对象
      * @param userDTO 参数列表
-     * @return
+     * @return 分页结果
      */
     @Override
     public Page<UserVO> getUsersWithRolePage(Page<UserVO> page, UserDTO userDTO) {
@@ -654,8 +659,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public Page<UserVO> selectUserList(Page<UserVO> page, UserDTO userDTO, HnqzUser user) {
-
-        List<Long> areas = userAreaService.listUserAreas(Long.valueOf(user.getId()));
+        List<Long> areas;
+        if (CollUtil.isNotEmpty(userDTO.getAreaCodes())) {
+            areas = userDTO.getAreaCodes();
+        } else {
+            areas = userAreaService.listUserAreas(Long.valueOf(user.getId()));
+        }
 
         List<Integer> userid = userAreaService.listAreaUser(areas).stream().map(Long::intValue).collect(Collectors.toList());
 
@@ -670,21 +679,20 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             Set<Integer> allUserIds = sysCsmUserRelationService.recurseCsmLowerUserId(Collections.singleton(userId), new AtomicInteger(10));
             userDTO.setCsmUserIdList(allUserIds);
             return baseMapper.getUserVosPage(page, userDTO, new DataScope());
+        } else if (SecurityUtils.getRoles().contains(35)) {
+            // BC总负责人数据权限
+            List<Integer> bcRoles = Stream.of(3, 4, 5, 6, 7, 9, 10, 11, 13, 19, 31, 35, 37).collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(userDTO.getRole())) {
+                Collection<Integer> intersection = CollUtil.intersectionDistinct(bcRoles, userDTO.getRole());
+                if (CollUtil.isEmpty(intersection)) {
+                    return page;
+                }
+                userDTO.setRole(new ArrayList<>(intersection));
+            } else {
+                userDTO.setRole(bcRoles);
+            }
+            return baseMapper.getUserVosPage(page, userDTO, new DataScope());
         }
-		else if (SecurityUtils.getRoles().contains(35)) {
-			// BC总负责人数据权限
-			List<Integer> bcRoles = Stream.of(3, 4, 5, 6, 7, 9, 10, 11, 13, 19, 31, 35, 37).collect(Collectors.toList());
-			if (CollUtil.isNotEmpty(userDTO.getRole())) {
-				Collection<Integer> intersection = CollUtil.intersectionDistinct(bcRoles, userDTO.getRole());
-				if (CollUtil.isEmpty(intersection)) {
-					return page;
-				}
-				userDTO.setRole(new ArrayList<>(intersection));
-			} else {
-				userDTO.setRole(bcRoles);
-			}
-			return baseMapper.getUserVosPage(page, userDTO, new DataScope());
-		}
         Integer deptId = userDTO.getDeptId();
 //		if (null != userDTO.getDeptId()) {
 //			deptId = userDTO.getDeptId();
@@ -707,9 +715,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             List<UserVO> userList3 = sysUserMapper.selectByDeptId(userDTO);
             userList1.addAll(userList3);
         }
-        List<Integer> ids2 = userList1.stream().map(p -> p.getUserId()).collect(Collectors.toList());
+        List<Integer> ids2 = userList1.stream().map(UserVO::getUserId).collect(Collectors.toList());
         for (int i = 0; i < userList1.size(); i++) {
-            if (userList1.get(i).getRoleList().size() != 0) {
+            if (CollUtil.isNotEmpty(userList1.get(i).getRoleList())) {
                 if (userList1.get(i).getRoleList().get(0).getRoleId().equals(4)) {
                     userDTO.setUserId(ids2.get(i));
                     UserVO userVO = sysUserMapper.selectByUserId(userDTO);
@@ -718,7 +726,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }
         }
         userList.addAll(userList2);
-        List<Integer> ids = userList.stream().map(p -> p.getUserId()).collect(Collectors.toList());
+        List<Integer> ids = userList.stream().map(UserVO::getUserId).collect(Collectors.toList());
         for (int i = 0; i < userList.size(); i++) {
             List<SysRole> sysRoleList1 = sysRoleService.findRolesByUserId(ids.get(i));
             userList.get(i).setRoleList(sysRoleList1);
@@ -879,19 +887,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return this.list(Wrappers.<SysUser>query().lambda().eq(SysUser::getDeptId, parentId));
     }
 
-    /**
-     * 获取当前用户的子部门信息
-     *
-     * @return 子部门列表
-     */
-    private List<Integer> getChildDepts() {
-        Integer deptId = SecurityUtils.getUser().getDeptId();
-        // 获取当前部门的子部门
-        return sysDeptRelationService
-                .list(Wrappers.<SysDeptRelation>query().lambda().eq(SysDeptRelation::getAncestor, deptId)).stream()
-                .map(SysDeptRelation::getDescendant).collect(Collectors.toList());
-    }
-
 
     public List<SysUser> getUserByPlatId(String platId) {
         SysUser sysUser = new SysUser();
@@ -916,37 +911,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public R updatePwd(UserPwd userPwd) {
+    public R<?> updatePwd(UserPwd userPwd) {
         String p1 = userPwd.getP1();
         String p2 = userPwd.getP2();
         String userName = userPwd.getUserName();
-        String code = userPwd.getCode();
-
-//		String key = CacheConstants.DEFAULT_CODE_KEY + LoginTypeEnum.SMS.getType() + StringPool.AT + userName;
-//
-//		redisTemplate.setKeySerializer(new StringRedisSerializer());
-//
-//		if (!redisTemplate.hasKey(key)) {
-//			throw new ValidateCodeException("请输入正确验证码");
-//		}
-//
-//		Object codeObj = redisTemplate.opsForValue().get(key);
-//
-//		if (codeObj == null) {
-//			throw new ValidateCodeException("请输入正确验证码");
-//		}
-//
-//		String saveCode = codeObj.toString();
-//		if (StrUtil.isBlank(saveCode)) {
-//			redisTemplate.delete(key);
-//			throw new ValidateCodeException("请输入正确验证码");
-//		}
-//
-//		if (!StrUtil.equals(saveCode, code)) {
-//			redisTemplate.delete(key);
-//			throw new ValidateCodeException("请输入正确验证码");
-//		}
-//
         List<SysUser> userList = baseMapper.selectList(Wrappers.<SysUser>lambdaQuery().
                 eq(SysUser::getUsername, userName));
         if (CollectionUtils.isEmpty(userList)) {
@@ -963,7 +931,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             baseMapper.updateById(sysUser);
         }
 
-//		redisTemplate.delete(key);
         return R.ok();
     }
 

hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/WmTaskTypeServiceTest.java

@@ -214,7 +214,7 @@ public class WmTaskTypeServiceTest {
 					newOne.setLevel1Id(wmDaAgent.getId());
 					newOne.setDurgentId(wmDaDrugEnt.getId());
 					newOne.setTaskTypeLevel("2");
-					newOne.setRuleId(wmDaDrugEnt.getId() + wmDaAgent.getId() + "");
+					newOne.setRuleId("" +wmDaDrugEnt.getId() + wmDaAgent.getId());
 					newOne.setTaskEntId(wmDaAgent.getId());
 					newOne.setDeptId(wmDaAgent.getDeptId());
 					newOne.setStatus("0");