fix: 应收账款回款任务类型的修改积分规则报错

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
 	 */