init: init project step4: biz code support

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

@@ -232,7 +232,7 @@ public class WmScorePackageController {
         } else if (SecurityUtils.getRoles().contains(4)) {
             wmScorePackage.setDrugEntId(SecurityUtils.getUser().getDrugEntId());
             if ("1".equals(wmScorePackage.getAgentTypeId())) {
-                wmScorePackage.setDeptId(SecurityUtils.getUser().getDeptId() + "");
+                wmScorePackage.setDeptId(SecurityUtils.getUser().getDeptId().toString());
             }
         }
         wmScorePackage.setTaskRuleId(null);
@@ -1083,12 +1083,12 @@ public class WmScorePackageController {
         }
 
 
-        if (null != wmScorePackage.getScoreId() && !"".equals(wmScorePackage.getScoreId())) {
+        if (StrUtil.isNotBlank(wmScorePackage.getScoreId())) {
             WmScorePackage wmScorePackage1 = new WmScorePackage();
             wmScorePackage1.setDelFlag("0");
             wmScorePackage1.setScoreId(wmScorePackage.getScoreId());
             List<WmScorePackage> wmScorePackageList = wmScorePackageService.list(Wrappers.query(wmScorePackage1));
-            if (wmScorePackageList.size() > 0) {
+            if (CollUtil.isNotEmpty(wmScorePackageList)) {
                 return R.failed("积分包ID已存在");
             }
         }
@@ -1145,13 +1145,13 @@ public class WmScorePackageController {
             wmScorePackage.setLevel2Id(sysDept.getLevel3Id() == null || sysDept.getLevel3Id() == 0 ? null : sysDept.getLevel3Id());
         }
 
-        if (null != wmScorePackage.getScoreName() && !"".equals(wmScorePackage.getScoreName())) {
+        if (StrUtil.isNotBlank(wmScorePackage.getScoreName())) {
             WmScorePackage wmScorePackage1 = new WmScorePackage();
             wmScorePackage1.setDelFlag("0");
             wmScorePackage1.setScoreName(wmScorePackage.getScoreName());
             wmScorePackage1.setDeptId(wmScorePackage.getDeptId());
             List<WmScorePackage> wmScorePackageList = wmScorePackageService.list(Wrappers.query(wmScorePackage1));
-            if (wmScorePackageList.size() > 0) {
+            if (CollUtil.isNotEmpty(wmScorePackageList)) {
                 return R.failed("积分包名称已存在");
             }
         }
@@ -1159,7 +1159,7 @@ public class WmScorePackageController {
         wmScorePackage.setCreateTime(LocalDateTime.now());
         wmScorePackage.setPackageFinishStatus("0");
         wmScorePackage.setPackageAuditStatus("0");
-        wmScorePackage.setSendPackageDeptId(SecurityUtils.getUser().getDeptId() + "");
+        wmScorePackage.setSendPackageDeptId(SecurityUtils.getUser().getDeptId().toString());
         boolean isAnswer = wmScorePackageService.save(wmScorePackage);
         if (isAnswer) {
             if (SecurityUtils.getRoles().contains(4)) {
@@ -1173,7 +1173,7 @@ public class WmScorePackageController {
                     queryWm.setDrugEntId(SecurityUtils.getUser().getDrugEntId());
                     queryWm.setLevel1Id(sysDept.getLevel2Id());
                     queryWm.setTaskRuleId(wmScorePackage.getTaskRuleId());
-                    queryWm.setDeptId(SecurityUtils.getUser().getDeptId() + "");
+                    queryWm.setDeptId(SecurityUtils.getUser().getDeptId().toString());
                 } else if (sysDept.getLevel() == 4) {
                     queryWm.setAgentTypeId("2");
                     queryWm.setTypeid("2");
@@ -1185,7 +1185,7 @@ public class WmScorePackageController {
                 }
 
                 List<WmScorePackage> wmScorePackageList = wmScorePackageService.list(Wrappers.query(queryWm));
-                if (wmScorePackageList.size() > 0) {
+                if (CollUtil.isNotEmpty(wmScorePackageList)) {
                     for (WmScorePackage wms : wmScorePackageList) {
                         wms.setIsConduct("1");
                     }
@@ -1219,13 +1219,13 @@ 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("积分包名称已存在");
             }
 
         }
 
-        if (null != wmScorePackage.getScoreId() && !"".equals(wmScorePackage.getScoreId())) {
+        if (StrUtil.isNotBlank(wmScorePackage.getScoreId())) {
             WmScorePackage wmScorePackage1 = new WmScorePackage();
             wmScorePackage1.setDelFlag("0");
             wmScorePackage1.setScoreId(wmScorePackage.getScoreId());
@@ -2131,7 +2131,7 @@ public class WmScorePackageController {
                 for (WmScorePackage wms : wmScorePackageList) {
                     if (wmId.getId().equals(wms.getRelationScoreId())) {
                         return R.failed("积分包已被分派，请联系下属CSO终止关联积分包");
-                    } else if (null != wms.getRelationScoreId() && "".equals(wms.getRelationScoreId())) {
+                    } else if (StrUtil.isNotBlank(wms.getRelationScoreId())) {
                         wmScorePackage.setEnableFlag("1");
                         wmScorePackage.setPackageFinishStatus("2");
                         List<WmScorePackage> wmScorePackages = wmScorePackageService.selectRelationScoreId(wmId.getId());
@@ -3600,7 +3600,7 @@ public class WmScorePackageController {
 
     @SysLog("修改积分包--删除、结算")
     @PostMapping("/updateEasy")
-    public R updateEasy(@RequestBody WmScorePackage wmScorePackage) {
+    public R<?> updateEasy(@RequestBody WmScorePackage wmScorePackage) {
 
         return wmScorePackageService.updateEasy(wmScorePackage);
     }

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

@@ -108,7 +108,7 @@ public interface WmScorePackageService extends IService<WmScorePackage> {
 
     R getScorePackagePageById(WmScorePackage wmScorePackage);
 
-    R updateEasy(WmScorePackage wmScorePackage);
+    R<?> updateEasy(WmScorePackage wmScorePackage);
 
     R<?> updateWmScorePackage(WmScorePackage wmScorePackage);
 

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

@@ -1545,7 +1545,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public R updateEasy(WmScorePackage wmScorePackage) {
+    public R<?> updateEasy(WmScorePackage wmScorePackage) {
         if (null != wmScorePackage.getDelFlag() && wmScorePackage.getDelFlag().equals("1")) {
             WmScorePackage relationScorePackage = new WmScorePackage();//关联积分包
             wmScorePackage = wmScorePackageMapper.selectById(wmScorePackage.getId());