Merge branch 'feat-20220829-jinpaitasktype' into temp-pre

db/v2.0/220830.sql

@@ -38,4 +38,14 @@ 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 ('3', '39', 'temp8', '回款总额', 6, 'money', 1, 200, null, '', '', '0', null, '0', '0', 1, '2022-08-30 11:49:02', null, '2022-08-30 11:49:02', 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 ('3', '39', 'temp23', '回款类别', 7, 'select', 1, 2, '', '', 'payment_type', '1', null, '0', '0', 1, '2021-06-11 16:29:17', null, '2021-06-11 16:29:16', null);
 
--- 4.字典值新增task_filed_type = sign 签名，datatimerange 时间范围
+-- 4.字典项task_filed_type 值新增 sign 签名，datatimerange 时间范围
+-- 5.字典项score_task_type 值新增 p-17 专项服务
+
+-- 6.新增任务类型 库存盘点-中药颗粒剂/调剂服务/应收账款回款-A类/应收账款回款-B类/应收账款回款-C类
+INSERT INTO hnqzx.wm_task_type (task_type_name, task_type_level, task_score_start, task_score_end, score, task_ent_id, durgent_id, level1_id, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user, status, base_id, real_flag, rule_id, parent_id) VALUES ('库存盘点-中药颗粒剂', '1', 0, 5000, 5000, null, null, null, null, 0, '0', 1, '2022-08-29 16:10:00', null, '2022-08-29 16:08:01', 0, 0, '库存调查', null, '1', 'p-3');
+INSERT INTO hnqzx.wm_task_type (task_type_name, task_type_level, task_score_start, task_score_end, score, task_ent_id, durgent_id, level1_id, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user, status, base_id, real_flag, rule_id, parent_id) VALUES ('调剂服务', '1', 0, 400, 200, null, null, null, null, 0, '0', 1, '2022-09-02 15:15:47', null, '2022-08-29 16:08:01', 0, 0, '专项服务', null, '1', 'p-17');
+INSERT INTO hnqzx.wm_task_type (task_type_name, task_type_level, task_score_start, task_score_end, score, task_ent_id, durgent_id, level1_id, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user, status, base_id, real_flag, rule_id, parent_id) VALUES ('应收账款回款-A类', '1', 0, 25, 25, null, null, null, null, 0, '0', 1, '2022-09-02 15:15:46', null, '2022-08-29 16:08:01', 0, 0, '专项服务', null, '1', 'p-17');
+INSERT INTO hnqzx.wm_task_type (task_type_name, task_type_level, task_score_start, task_score_end, score, task_ent_id, durgent_id, level1_id, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user, status, base_id, real_flag, rule_id, parent_id) VALUES ('应收账款回款-B类', '1', 0, 50, 50, null, null, null, null, 0, '0', 1, '2022-09-02 15:15:47', null, '2022-08-29 16:08:01', 0, 0, '专项服务', null, '1', 'p-17');
+INSERT INTO hnqzx.wm_task_type (task_type_name, task_type_level, task_score_start, task_score_end, score, task_ent_id, durgent_id, level1_id, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user, status, base_id, real_flag, rule_id, parent_id) VALUES ('应收账款回款-C类', '1', 0, 75, 75, null, null, null, null, 0, '0', 1, '2022-09-02 15:15:47', null, '2022-08-29 16:08:01', 0, 0, '专项服务', null, '1', 'p-17');
+
+-- 7.记得把上面新增的任务类型 同步给所有企业!!!

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

@@ -147,12 +147,16 @@ public class WmTaskTypeController {
 		voPage.setTotal(pageResult.getTotal());
 		List<WmTaskTypeVO> voList = new ArrayList<>();
 		pageResult.getRecords().forEach(taskType -> {
-			WmTaskTypeVO typeVO = BeanUtil.copyProperties(taskType, WmTaskTypeVO.class, "score");
+			WmTaskTypeVO typeVO = BeanUtil.copyProperties(taskType, WmTaskTypeVO.class, "score", "taskScoreStart", "taskScoreEnd");
 			if (StrUtil.isNotBlank(taskType.getTaskTypeName()) && taskType.getTaskTypeName().startsWith("应收账款回款")) {
 				// 应收账款回款 任务类 保存的是1000倍数，需要转换回来
 				typeVO.setScore(String.valueOf(taskType.getScore() / 1000.0D));
+				typeVO.setTaskScoreStart(String.valueOf(taskType.getTaskScoreStart() / 1000.0D));
+				typeVO.setTaskScoreEnd(String.valueOf(taskType.getTaskScoreEnd() / 1000.0D));
 			} else {
 				typeVO.setScore(String.valueOf(taskType.getScore()));
+				typeVO.setTaskScoreStart(String.valueOf(taskType.getTaskScoreStart()));
+				typeVO.setTaskScoreEnd(String.valueOf(taskType.getTaskScoreEnd()));
 			}
 			voList.add(typeVO);
 		});
@@ -213,7 +217,26 @@ public class WmTaskTypeController {
 				"统计分析", "临床监察", "通用", "患者教育");
 		queryWrapper.notIn(WmTaskType::getTaskTypeName,noDisplayTaskTypeNameList);
 
-		return R.ok(wmTaskTypeService.page(page, queryWrapper));
+		Page<WmTaskType> pageResult = wmTaskTypeService.page(page, queryWrapper);
+
+		Page<WmTaskTypeVO> voPage = new Page<>();
+		voPage.setSize(pageResult.getSize());
+		voPage.setCurrent(pageResult.getCurrent());
+		voPage.setTotal(pageResult.getTotal());
+		List<WmTaskTypeVO> voList = new ArrayList<>();
+		pageResult.getRecords().forEach(taskType -> {
+			WmTaskTypeVO typeVO = BeanUtil.copyProperties(taskType, WmTaskTypeVO.class, "score");
+			if (StrUtil.isNotBlank(taskType.getTaskTypeName()) && taskType.getTaskTypeName().startsWith("应收账款回款")) {
+				// 应收账款回款 任务类 保存的是1000倍数，需要转换回来
+				typeVO.setScore(String.valueOf(taskType.getScore() / 1000.0D));
+			} else {
+				typeVO.setScore(String.valueOf(taskType.getScore()));
+			}
+			voList.add(typeVO);
+		});
+		voPage.setRecords(voList);
+
+		return R.ok(voPage);
 	}
 
 
@@ -251,7 +274,7 @@ public class WmTaskTypeController {
 	/**
 	 * 修改任务类型打分表
 	 *
-	 * @param wmTaskType 任务类型打分表
+	 * @param wmTaskTypeVO 任务类型打分表
 	 * @return R
 	 */
 	@ApiOperation(value = "修改任务类型打分表", notes = "修改任务类型打分表")
@@ -263,6 +286,8 @@ public class WmTaskTypeController {
 		// 应收账款回款-A类/应收账款回款-B类/应收账款回款-C类 积分值乘1000保存
 		if (StrUtil.isNotBlank(wmTaskType.getTaskTypeName()) && wmTaskType.getTaskTypeName().startsWith("应收账款回款")) {
 			wmTaskType.setScore((int) (Double.parseDouble(wmTaskTypeVO.getScore()) * 1000));
+			wmTaskType.setTaskScoreStart((int) (Double.parseDouble(wmTaskTypeVO.getTaskScoreStart()) * 1000));
+			wmTaskType.setTaskScoreEnd((int) (Double.parseDouble(wmTaskTypeVO.getTaskScoreEnd()) * 1000));
 		}
 
 		String baseId = wmTaskType.getId();

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/vo/WmTaskTypeVO.java

@@ -69,11 +69,11 @@ public class WmTaskTypeVO {
 	/**
 	 * 积分范围开始
 	 */
-	private Integer taskScoreStart;
+	private String taskScoreStart;
 	/**
 	 * 积分范围结束
 	 */
-	private Integer taskScoreEnd;
+	private String taskScoreEnd;
 	/**
 	 * 组织机构ID
 	 */

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

@@ -15,6 +15,7 @@ package com.qunzhixinxi.hnqz.admin.service.impl;/*
  * Author: hnqz
  */
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
@@ -84,6 +85,13 @@ public class WmScoreTaskTypeServiceImpl extends ServiceImpl<WmScoreTaskTypeMappe
 			if(StringUtils.isEmpty(type.getParentId())){
 				continue;
 			}
+			if (StrUtil.equals("39", type.getId())) {
+				type.setTaskTypeName("应收账款回款");
+			}
+			if (StrUtil.equals("40", type.getId()) || StrUtil.equals("41", type.getId())) {
+				// 应收账款回款-A类/应收账款回款-B类/应收账款回款-C类 统一回显为一个‘应收账款回款’
+				continue;
+			}
 			if(resultMap.containsKey(type.getParentId())){
 				String typeName = resultMap.get(type.getParentId());
 				typeName = typeName +"；"+ type.getTaskTypeName();