feat: save task content 1

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/dto/WmTaskDTO.java

@@ -24,12 +24,16 @@ public final class WmTaskDTO {
 		@NotBlank(message = "任务类型ID必填")
 		private String taskTypeId;
 
-		@NotBlank(message = "积分包名称必填")
 		private String pkgName;
 
+		private String pkgId;
+
 		@NotBlank(message = "代表用户名必填")
 		private String username;
 
+		@NotEmpty(message = "三方结构必填")
+		private Map<String, Object> struct;
+
 		@NotEmpty(message = "三方结果必填")
 		private Map<String, Object> result;
 

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

@@ -1233,8 +1233,8 @@ public class ApiController {
 			return R.failed("任务类型不能为空");
 		}
 
-		if (StrUtil.isBlank(resource.getPkgName())) {
-			return R.failed("关联积分包不能为空");
+		if (StrUtil.isBlank(resource.getPkgName()) && StrUtil.isBlank(resource.getPkgId())) {
+			return R.failed("关联积分包不能为空, 必须指定ID或者名称");
 		}
 
 		if (StrUtil.isBlank(resource.getUsername())) {

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

@@ -92,9 +92,6 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 	private final WmTaskSubmissionRuleService taskSubmissionRuleService;
 	private final WmTaskSubmissionPercentRuleService wmTaskSubmissionPercentRuleService;
 	private final Sequence taskSequence;
-	private final UpmsConfig upmsConfig;
-	private final String active = "pre";
-
 
 	private static final DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
 
@@ -887,23 +884,21 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 	@Transactional(rollbackFor = Exception.class)
 	public boolean saveTaskContent1(WmTaskDTO.OnOutPartyCreate resource) {
 
-		final String pkgName = resource.getPkgName();
+		final String pkgId = resource.getPkgId();
 		final String username = resource.getUsername();
 		final String taskTypeId = resource.getTaskTypeId();
 
-		Integer deptId = "pro".equals(active) ? 1611890636 : 1611890564;
-
-		log.info("根据环境获取企业ID，active: [{}], deptId: [{}]", active, deptId);
-
 
 		// 获取积分包
-		WmScorePackage tWmScorePackage = wmScorePackageService.getOne(Wrappers.<WmScorePackage>lambdaQuery().eq(WmScorePackage::getDeptId, deptId).eq(WmScorePackage::getScorePackageName, pkgName));
-
+		WmScorePackage tWmScorePackage = wmScorePackageService.getById(pkgId);
 		if (tWmScorePackage == null) {
-			log.error("当前企业不存在，名为[{}]的积分包", pkgName);
+			log.error("当前企业不存在，ID为[{}]的积分包", pkgId);
 			throw new BizException("积分包不存在");
 		}
 
+		Integer deptId = Integer.parseInt(tWmScorePackage.getDeptId());
+		log.info("获取企业ID: [{}]", deptId);
+
 		// 校验
 		SysUser user = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getDeptId, deptId).eq(SysUser::getUsername, username)
 				.eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL)
@@ -947,9 +942,10 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 
 		// 保存详情
 		WmTaskContent taskContent = new WmTaskContent();
+		taskContent.setTemp28(JSONUtil.toJsonStr(resource.getResult()));
 		taskContent.setTemp29(JSONUtil.toJsonStr(resource.getResult()));
 		taskContent.setTemp30(taskTypeId);
-		taskContent.setTemp32(tWmScorePackage.getId());
+		taskContent.setTemp32(pkgId);
 		boolean save = this.save(taskContent);
 
 		WmScorePackageStatus scorePackageStatus = statusList.get(0);