init: init project step4: biz code support

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

@@ -187,24 +187,21 @@ public class WmTaskTypeController {
      *
      * @param page       分页对象
      * @param wmTaskType 任务类型打分表
-     * @return
+     * @return 分页结果
      */
     @GetMapping("/pages")
-    public R getWmTaskTypePages(Page<WmTaskType> page, WmTaskType wmTaskType) {
+    public R<Page<WmTaskTypeVO>> getWmTaskTypePages(Page<WmTaskType> page, WmTaskType wmTaskType) {
 
         List<WmTaskTypeEntRef> wmTaskTypeEntRefList = wmTaskTypeEntRefService.selectByAgentId(wmTaskType.getLevel1Id());
-        if (wmTaskTypeEntRefList.size() > 0) {
+        if (CollUtil.isNotEmpty(wmTaskTypeEntRefList)) {
             for (WmTaskTypeEntRef wmTaskTypeEntRef1 : wmTaskTypeEntRefList) {
                 //cso新增   药企id空   AgentId 有
-                if (null != wmTaskTypeEntRef1.getAgentId() && null != wmTaskTypeEntRef1.getDrugentId() && !"".equals(wmTaskTypeEntRef1.getAgentId())
-                        && !"".equals(wmTaskTypeEntRef1.getDrugentId())
-                ) {
+                if (null != wmTaskTypeEntRef1.getAgentId() && null != wmTaskTypeEntRef1.getDrugentId()) {
                     wmTaskType.setLevel1Id(wmTaskTypeEntRef1.getAgentId());
                     List<WmTaskType> wmTaskTypeList = wmTaskTypeService.selectByRuleId(wmTaskType);
                     for (WmTaskType wmTaskType1 : wmTaskTypeList) {
 
-                        if (wmTaskType1.getDurgentId() == null && "".equals(wmTaskType1.getDurgentId()) &&
-                                null != wmTaskType1.getLevel1Id() && "".equals(wmTaskType1.getLevel1Id())) {
+                        if (wmTaskType1.getDurgentId() == null && null != wmTaskType1.getLevel1Id()) {
                             wmTaskType.setRuleId(wmTaskType1.getRuleId());
                         }
                     }
@@ -212,14 +209,11 @@ public class WmTaskTypeController {
                 } else if (wmTaskTypeEntRef1.getAgentId().equals(wmTaskTypeEntRef1.getDrugentId())) {
                     wmTaskType.setRuleId(wmTaskTypeEntRef1.getAgentId().toString());
                     //药企给cso新增   两个都有值  药企和cso
-                } else if (null != wmTaskTypeEntRef1.getAgentId() && null != wmTaskTypeEntRef1.getDrugentId()
-                        && !"".equals(wmTaskTypeEntRef1.getAgentId()) && !"".equals(wmTaskTypeEntRef1.getDrugentId())
-                ) {
+                } else if (null != wmTaskTypeEntRef1.getAgentId() && null != wmTaskTypeEntRef1.getDrugentId()) {
                     wmTaskType.setRuleId("" + wmTaskTypeEntRef1.getDrugentId() + wmTaskTypeEntRef1.getAgentId());
                     List<WmTaskType> wmTaskTypeList = wmTaskTypeService.selectByRuleId(wmTaskType);
                     for (WmTaskType wmTaskType1 : wmTaskTypeList) {
-                        if (null != wmTaskType1.getDurgentId() && null != wmTaskType1.getLevel1Id()
-                                && !"".equals(wmTaskType1.getDurgentId()) && !"".equals(wmTaskType1.getLevel1Id())) {
+                        if (null != wmTaskType1.getDurgentId() && null != wmTaskType1.getLevel1Id()) {
                             wmTaskType.setRuleId(wmTaskType1.getRuleId());
 
                         }
@@ -309,11 +303,10 @@ public class WmTaskTypeController {
             if (null != wmTaskType.getId() && "1".equals(wmTaskType.getStatus())) {
                 wmTaskTypeService.updateById(wmTaskType);
             } else {
-                WmTaskType wmTaskRule1 = wmTaskType;
-                wmTaskRule1.setId(null);
-                wmTaskRule1.setStatus("1");
-                wmTaskRule1.setBaseId(baseId);
-                wmTaskTypeService.save(wmTaskRule1);
+                wmTaskType.setId(null);
+                wmTaskType.setStatus("1");
+                wmTaskType.setBaseId(baseId);
+                wmTaskTypeService.save(wmTaskType);
             }
 
         } else {