feat: 1.多人积分包-业务结算提交；2.积分包列表

db/v2.0/230330.sql

@@ -4,3 +4,8 @@ INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key,
 INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('47', '47', 'temp4', '时间', 5, 'datetime', 1, 200, null, '', '', '1', null, '0', '0', 1, '2023-03-16 15:59:15', null, null, null);
 INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('47', '47', 'temp7', '现场照片', 6, 'img', 1, 5, null, '', '', '1', null, '0', '0', 1, '2023-03-16 15:59:15', null, null, null);
 INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('47', '47', 'temp23', '推广类型', 3, 'select', 1, 2, '', '', 'drugstore_promotion_type', '1', null, '0', '0', 1, '2021-06-11 16:29:17', null, '2021-06-11 16:29:16', null);
+
+
+
+alter table wm_team
+    modify member varchar(2048) null comment '团队成员';

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

@@ -402,7 +402,6 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		updateEntity.setId(input.getId());
 		updateEntity.setSettleStatus(DingEnum.SETTLE_STATUS_WAIT.getType());
 		updateEntity.setScorePackageStatus("5");
-		updateEntity.setSettleFlag("1");
 		updateEntity.setDescription(input.getDescription());
 		updateEntity.setSubType(String.valueOf(location.getGigType().getCode()));
 		updateEntity.setLocation(input.getSubjectLocation());
@@ -414,6 +413,13 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 			updateEntity.setTaskAddFlag("0");
 		}
 
+		if (StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), wmScorePackage.getPackageType1())) {
+			// 多人承接积分包可以一直结算
+			updateEntity.setSettleFlag("0");
+		} else {
+			updateEntity.setSettleFlag("1");
+		}
+
 		wmScorePackageService.updateById(updateEntity);
 		noteService.saveOrUpdateBatch(notes);
 

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

@@ -1990,7 +1990,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		long shtgtt = 0;
 		// 审核不通过百分比
 		long shbtgtt = 0;
-		if (StrUtil.equals(scorePackage.getPackageType1(), "1")) {
+		if (StrUtil.equals(scorePackage.getPackageType1(), PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val())
+				|| StrUtil.equals(scorePackage.getPackageType1(), PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val())) {
 			int score = scorePackage.getScore();
 			if (score != 0) {
 				yshtt = ysh * 100L / score;