Merge branch 'feat-220815-taskcheck' into temp-pre

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmTaskTypeSubCategory.java

@@ -1,11 +1,60 @@
 package com.qunzhixinxi.hnqz.admin.api.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
- * TODO
+ * 任务类型子类分表
  *
  * @author jimmy
  * @version 1.0.0
  * @date 2022-08-17 17:16
  */
-public class WmTaskTypeSubCategory {
+@Data
+@ToString
+@TableName(value = "wm_task_type_sub_cate")
+public class WmTaskTypeSubCategory implements Serializable {
+	private static final long serialVersionUID = 651823588693958084L;
+
+	/**
+	 * id
+	 */
+	@TableId(value = "ttsc_id", type = IdType.AUTO)
+	private Integer taskTypeSubCateId;
+
+	/**
+	 * 任务类型id
+	 */
+	private Integer taskTypeId;
+
+	/**
+	 * 类型名称
+	 */
+	private String typeName;
+
+	/**
+	 * 二级分类
+	 */
+	@TableField(value = "sub_cate")
+	private UpmsType.TaskSubCategory subCategory;
+
+
+	/**
+	 * 创建时间
+	 */
+	private LocalDateTime createTime;
+
+	/**
+	 * 创建时间
+	 */
+	private LocalDateTime updateTime;
+
 }

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

@@ -991,7 +991,7 @@ public class ApiController {
 	@ApiOperation(value = "任务-新增任务内容表", notes = "新增任务内容表")
 	@SysLog("新增任务内容表")
 	@PostMapping("/saveTaskContent")
-	public R saveTaskContent(@RequestBody WmTaskContent wmTaskContent) {
+	public R<?> saveTaskContent(@RequestBody WmTaskContent wmTaskContent) {
 		Set<String> errorHash = new HashSet<>();
 		List<String> ducImgUrl = new ArrayList<>();
 		List<String> all = new ArrayList<>();
@@ -1027,24 +1027,36 @@ public class ApiController {
 			return R.failed(ducImgUrl, "提交重复的图片");
 		}
 
+		if (org.apache.commons.lang.StringUtils.isEmpty(wmTaskContent.getTemp30())) {
+			return R.failed("任务类型不能为空");
+		}
 
-		R r = wmTaskContentService.saveTaskContent(wmTaskContent);
-
-		log.info("结果:{}, 草稿key:{}", r, draftKey);
-		if (r.getCode() == CommonConstants.SUCCESS && StrUtil.isNotEmpty(draftKey)) {
-			String key = String.format(CacheConstants.TASK_CONTENT_DRAFT, taskTypeId, id);
-			log.info("删除草稿:{}", key);
-			redisTemplate.delete(key);
+		if (org.apache.commons.lang.StringUtils.isEmpty(wmTaskContent.getTemp32())) {
+			return R.failed("关联积分包不能为空");
 		}
 
-		if (r.getCode() == CommonConstants.FAIL && CollUtil.isNotEmpty(all)) {
-			// 保存图片
-			log.info("all size:{}", all.size());
-			all.forEach(hash -> {
-				String key = String.format("%s:%s", id, hash);
-				log.info("key: {}", key);
+		R<?> r = null;
+		try {
+			r = wmTaskContentService.saveTaskContent(wmTaskContent);
+		} catch (Exception e){
+			return R.failed(e.getMessage());
+		} finally {
+			log.info("结果:{}, 草稿key:{}", r, draftKey);
+			if (r != null && r.getCode() == CommonConstants.SUCCESS && StrUtil.isNotEmpty(draftKey)) {
+				String key = String.format(CacheConstants.TASK_CONTENT_DRAFT, taskTypeId, id);
+				log.info("删除草稿:{}", key);
 				redisTemplate.delete(key);
-			});
+			}
+
+			if (r == null || (r.getCode() == CommonConstants.FAIL && CollUtil.isNotEmpty(all))) {
+				// 保存图片
+				log.info("all size:{}", all.size());
+				all.forEach(hash -> {
+					String key = String.format("%s:%s", id, hash);
+					log.info("key: {}", key);
+					redisTemplate.delete(key);
+				});
+			}
 		}
 
 		return r;
@@ -3324,6 +3336,8 @@ public class ApiController {
 					map.put("value", wmScorePackage.getId());
 					String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, wmScorePackage.getDrugProducerList());
 					map.put("drugProducer", drugProducer);
+					map.put("deptId", wmScorePackage.getDeptId());
+					map.put("relDeptId", wmScorePackage.getRelatedService());
 					listMap.add(map);
 				}
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmTaskTypeSubCategoryMapper.java

@@ -0,0 +1,16 @@
+package com.qunzhixinxi.hnqz.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeSubCategory;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 任务类型二级分类mapper
+ *
+ * @author jimmy
+ * @version 1.0.0
+ * @date 2022-08-17 17:30
+ */
+@Mapper
+public interface WmTaskTypeSubCategoryMapper extends BaseMapper<WmTaskTypeSubCategory> {
+}

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

@@ -30,9 +30,10 @@ import com.qunzhixinxi.hnqz.common.core.util.R;
 public interface WmTaskContentService extends IService<WmTaskContent> {
 
 	/**
-	 * 保存任务内容
+	 * 提交任务
+	 *
 	 * @param wmTaskContent 任务内容
-	 * @return
+	 * @return 保存结果
 	 */
-	R saveTaskContent(WmTaskContent wmTaskContent);
+	R<?> saveTaskContent(WmTaskContent wmTaskContent);
 }

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

@@ -0,0 +1,14 @@
+package com.qunzhixinxi.hnqz.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeSubCategory;
+
+/**
+ * 任务类型二级分类服务
+ *
+ * @author jimmy
+ * @version 1.0.0
+ * @date 2022-08-17 17:31
+ */
+public interface WmTaskTypeSubCategoryService extends IService<WmTaskTypeSubCategory> {
+}

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

@@ -0,0 +1,22 @@
+package com.qunzhixinxi.hnqz.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeSubCategory;
+import com.qunzhixinxi.hnqz.admin.mapper.WmTaskTypeSubCategoryMapper;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeSubCategoryService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 任务类型二级分类服务实现
+ *
+ * @author jimmy
+ * @version 1.0.0
+ * @date 2022-08-17 17:32
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class WmTaskTypeSubCategoryServiceImpl extends ServiceImpl<WmTaskTypeSubCategoryMapper, WmTaskTypeSubCategory> implements WmTaskTypeSubCategoryService {
+}