fix: 创建企业初始化任务类型配置3

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

@@ -24,6 +24,15 @@ public interface WmTaskSubmissionPercentRuleService extends IService<WmTaskSubmi
 	 */
 	Boolean initTaskTypeConfigRule(Collection<Integer> deptIds);
 
+	/**
+	 * 初始化企业的任务类型配置的信息
+	 *
+	 * @param deptIds 企业id集合
+	 * @param sourceDeptId 源数据企业id
+	 * @return 初始化结果
+	 */
+	Boolean initTaskTypeConfigRule(Collection<Integer> deptIds, Integer sourceDeptId);
+
 	/**
 	 * 校验任务百分比限制规则（达到要求的积分包，【任务配置】-【百分比限制】所选的任务总完成积分值不得大于积分包值*百分比）
 	 *

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

@@ -143,7 +143,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 				// 初始化企业限制信息
 				taskSubmissionRuleService.initDeptTaskSubmissionRule(Collections.singleton(Integer.valueOf(wmDaAgent.getDeptId())), deptId);
 				// 初始化企业的任务类型配置的信息
-				taskSubmissionPercentRuleService.initTaskTypeConfigRule(Collections.singleton(Integer.valueOf(wmDaAgent.getDeptId())));
+				taskSubmissionPercentRuleService.initTaskTypeConfigRule(Collections.singleton(Integer.valueOf(wmDaAgent.getDeptId())), deptId);
 
 				List<SysDeptRelation> newList = new ArrayList<>();
 				SysDeptRelation sysDeptRelation = new SysDeptRelation();
@@ -172,6 +172,8 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 
 				// 初始化企业限制信息
 				taskSubmissionRuleService.initDeptTaskSubmissionRule(Collections.singleton(Integer.valueOf(wmDaAgent.getDeptId())), deptId);
+				// 初始化企业的任务类型配置的信息
+				taskSubmissionPercentRuleService.initTaskTypeConfigRule(Collections.singleton(Integer.valueOf(wmDaAgent.getDeptId())), deptId);
 
 				List<SysDeptRelation> newList = new ArrayList<>();
 				SysDeptRelation sysDeptRelation = new SysDeptRelation();

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

@@ -61,11 +61,23 @@ public class WmTaskSubmissionPercentRuleServiceImpl
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Boolean initTaskTypeConfigRule(Collection<Integer> deptIds) {
+		return this.initTaskTypeConfigRule(deptIds, CommonConstants.TENANT_ID_1);
+	}
+
+	/**
+	 * 初始化企业的任务类型配置的信息
+	 *
+	 * @param deptIds 企业id集合
+	 * @param sourceDeptId 源数据企业id
+	 * @return 初始化结果
+	 */
+	@Override
+	public Boolean initTaskTypeConfigRule(Collection<Integer> deptIds, Integer sourceDeptId) {
 		log.info("初始化企业的任务类型配置的信息deptIds={}", deptIds);
 
 		// 查询平台配置的任务类型配置的规则
 		List<WmTaskSubmissionPercentRule> percentRules = this.list(Wrappers.<WmTaskSubmissionPercentRule>lambdaQuery()
-				.eq(WmTaskSubmissionPercentRule::getDeptId, CommonConstants.TENANT_ID_1)
+				.eq(WmTaskSubmissionPercentRule::getDeptId, sourceDeptId)
 				.eq(WmTaskSubmissionPercentRule::getSubCategory, UpmsType.TaskSubCategory2.TASK_TYPE_CONFIG)
 				.eq(WmTaskSubmissionPercentRule::getOptFlag, CommonFlag.OptFlag.OK));
 		if (CollUtil.isNotEmpty(percentRules)) {