init: init project step4: biz code support

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/enums/PackageTypeEnum.java

@@ -44,11 +44,11 @@ public enum PackageTypeEnum {
 	TYPE_NULL("", "", "")
 	;
 
-	private String val;
+	private final String val;
 
-	private String name;
+	private final String name;
 
-	private String name2;
+	private final String name2;
 
 	PackageTypeEnum(String val, String name, String name2) {
 		this.val = val;

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

@@ -2784,29 +2784,21 @@ public class WmScorePackageController {
             List<SysDictItem> packageType1List = dictItemMap.get("package_type1");
             List<SysDictItem> packageType2List = dictItemMap.get("package_type2");
 
-            // todo
-            //// 结算记录
-            //List<WmScorePackageSettleNote> noteList = settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
-            //		.in(WmScorePackageSettleNote::getPackageId, packageIds));
-            //Map<String, List<WmScorePackageSettleNote>> noteMap = noteList.stream()
-            //		.collect(Collectors.groupingBy(WmScorePackageSettleNote::getPackageId));
-
             // 有效任务类型
             List<WmScoreTaskType> taskTypeList = wmScoreTaskTypeMapper.getScoreTaskTypeByScoreId(String.join(",", packageIds));
             Map<String, List<WmScoreTaskType>> taskTypeMap = taskTypeList.stream().collect(Collectors.groupingBy(WmScoreTaskType::getScoreId));
 
-            //for (int i = 0; i < pageRecords.size(); i++) {
-            //	WmScorePackage wmScorePackage = pageRecords.get(i);
-            //
-            //	List<WmTask> tasks = taskGoupMap.getOrDefault(wmScorePackage.getId(), new ArrayList<>());
-            //	List<WmScorePackageStatus> statuses = packageStatusGroupMap.getOrDefault(wmScorePackage.getId(), new ArrayList<>());
-            //	List<WmScorePackageSettleNote> notes = noteMap.getOrDefault(wmScorePackage.getId(), new ArrayList<>());
-            //	List<WmScoreTaskType> scoreTaskTypes = taskTypeMap.getOrDefault(wmScorePackage.getId(), new ArrayList<>());
-            //
-            //	wmScorePackageService.buildScorePackageSync(wmScorePackage, packageType1, packageType2, tasks, statuses,
-            //			packageType1List, packageType2List, parentPackageNameMap, notes, scoreTaskTypes);
-            //
-            //}
+            for (int i = 0; i < pageRecords.size(); i++) {
+            	WmScorePackage wmScorePackage = pageRecords.get(i);
+
+            	List<WmTask> tasks = taskGoupMap.getOrDefault(wmScorePackage.getId(), new ArrayList<>());
+            	List<WmScorePackageStatus> statuses = packageStatusGroupMap.getOrDefault(wmScorePackage.getId(), new ArrayList<>());
+            	List<WmScoreTaskType> scoreTaskTypes = taskTypeMap.getOrDefault(wmScorePackage.getId(), new ArrayList<>());
+
+            	wmScorePackageService.buildScorePackageSync(wmScorePackage, packageType1, packageType2, tasks, statuses,
+            			packageType1List, packageType2List, parentPackageNameMap, scoreTaskTypes);
+
+            }
 
         }
 

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

@@ -176,13 +176,17 @@ public interface WmScorePackageService extends IService<WmScorePackage> {
 	 * @param packageType1List
 	 * @param packageType2List
 	 * @param parentPackageNameMap
-	 * @param notes
 	 * @param scoreTaskTypes
 	 */
-	void buildScorePackageSync(WmScorePackage wmScorePackage, Integer packageType1, Integer packageType2,
-							   List<WmTask> tasks, List<WmScorePackageStatus> statuses, List<SysDictItem> packageType1List,
-							   List<SysDictItem> packageType2List, Map<String, WmScorePackage> parentPackageNameMap,
-							   List<WmScorePackageSettleNote> notes, List<WmScoreTaskType> scoreTaskTypes);
+	void buildScorePackageSync(WmScorePackage wmScorePackage,
+							   Integer packageType1,
+							   Integer packageType2,
+							   List<WmTask> tasks,
+							   List<WmScorePackageStatus> statuses,
+							   List<SysDictItem> packageType1List,
+							   List<SysDictItem> packageType2List,
+							   Map<String, WmScorePackage> parentPackageNameMap,
+							   List<WmScoreTaskType> scoreTaskTypes);
 
 	void getReportOpt(WmScorePackage wmScorePackage);