feat: 新增/修改积分包 去掉转换信用管理A/B/C

db/v2.0/230829.sql

@@ -2,4 +2,7 @@ alter table wm_task_type_sub_cate2
     modify sub_cate varchar(50) not null comment '次级分类';
 
 alter table wm_task_sub_percent_rule
-    modify sub_cate varchar(50) not null comment '次级分类';
+    modify sub_cate varchar(50) not null comment '次级分类';
+
+alter table wm_task_type_sub_cate2
+    add parent_id int null comment '对应wm_task_type的parent_id' after sub_cate;

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

@@ -2615,14 +2615,14 @@ public class WmScorePackageController {
 						wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree50);
 					}
 					// 如果存在taskTypeId=51 51,信用管理A  52,信用管理B 53,信用管理C
-					if (wmScorePackage.getWmScoreTaskTypeList().stream().anyMatch(wmTaskTypeTree -> "51".equals(wmTaskTypeTree.getTaskTypeId()))) {
-						WmScoreTaskType addTaskTypeTree51 = new WmScoreTaskType();
-						addTaskTypeTree51.setTaskTypeId("52");
-						WmScoreTaskType addTaskTypeTree52 = new WmScoreTaskType();
-						addTaskTypeTree52.setTaskTypeId("53");
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree51);
-						wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree52);
-					}
+//					if (wmScorePackage.getWmScoreTaskTypeList().stream().anyMatch(wmTaskTypeTree -> "51".equals(wmTaskTypeTree.getTaskTypeId()))) {
+//						WmScoreTaskType addTaskTypeTree51 = new WmScoreTaskType();
+//						addTaskTypeTree51.setTaskTypeId("52");
+//						WmScoreTaskType addTaskTypeTree52 = new WmScoreTaskType();
+//						addTaskTypeTree52.setTaskTypeId("53");
+//						wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree51);
+//						wmScorePackage.getWmScoreTaskTypeList().add(addTaskTypeTree52);
+//					}
 
 					List<WmScoreTaskType> wmScoreTaskTypess = new ArrayList<>();
 					for (WmScoreTaskType wmScoreTaskTypes : wmScorePackage.getWmScoreTaskTypeList()) {

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

@@ -839,14 +839,14 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					tasktypeList.add(addTaskTypeTree50);
 				}
 				// 如果存在taskTypeId=51 51,信用管理A  52,信用管理B 53,信用管理C
-				if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "51".equals(wmTaskTypeTree.getTaskTypeId()))) {
-					WmTaskTypeTree addTaskTypeTree51 = new WmTaskTypeTree();
-					addTaskTypeTree51.setTaskTypeId("52");
-					WmTaskTypeTree addTaskTypeTree52 = new WmTaskTypeTree();
-					addTaskTypeTree52.setTaskTypeId("53");
-					tasktypeList.add(addTaskTypeTree51);
-					tasktypeList.add(addTaskTypeTree52);
-				}
+//				if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "51".equals(wmTaskTypeTree.getTaskTypeId()))) {
+//					WmTaskTypeTree addTaskTypeTree51 = new WmTaskTypeTree();
+//					addTaskTypeTree51.setTaskTypeId("52");
+//					WmTaskTypeTree addTaskTypeTree52 = new WmTaskTypeTree();
+//					addTaskTypeTree52.setTaskTypeId("53");
+//					tasktypeList.add(addTaskTypeTree51);
+//					tasktypeList.add(addTaskTypeTree52);
+//				}
 
 				for (WmTaskTypeTree type : tasktypeList) {
 					WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();
@@ -1595,14 +1595,14 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					tasktypeList.add(addTaskTypeTree50);
 				}
 				// 如果存在taskTypeId=51 51,信用管理A  52,信用管理B 53,信用管理C
-				if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "51".equals(wmTaskTypeTree.getTaskTypeId()))) {
-					WmTaskTypeTree addTaskTypeTree51 = new WmTaskTypeTree();
-					addTaskTypeTree51.setTaskTypeId("52");
-					WmTaskTypeTree addTaskTypeTree52 = new WmTaskTypeTree();
-					addTaskTypeTree52.setTaskTypeId("53");
-					tasktypeList.add(addTaskTypeTree51);
-					tasktypeList.add(addTaskTypeTree52);
-				}
+//				if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "51".equals(wmTaskTypeTree.getTaskTypeId()))) {
+//					WmTaskTypeTree addTaskTypeTree51 = new WmTaskTypeTree();
+//					addTaskTypeTree51.setTaskTypeId("52");
+//					WmTaskTypeTree addTaskTypeTree52 = new WmTaskTypeTree();
+//					addTaskTypeTree52.setTaskTypeId("53");
+//					tasktypeList.add(addTaskTypeTree51);
+//					tasktypeList.add(addTaskTypeTree52);
+//				}
 
 				for (WmTaskTypeTree type : tasktypeList) {
 					WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();