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

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

@@ -2561,11 +2561,6 @@ public class ApiController {
 				if (null != wmScorePackage) {
 					wmTaskContent.setTemp32(wmScorePackage.getScorePackageName());
 				}
-
-				// 库存信息收集下的 库存盘点-中药颗粒剂、库存信息收集-首次 需要回显对应的详情字段
-				if ("31".equals(wmTaskContent.getTemp30()) || "37".equals(wmTaskContent.getTemp30())) {
-					map.put("taskType", wmTaskContent.getTemp30());
-				}
 			}
 			map.put("wmTaskContent", wmTaskContent);
 

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

@@ -257,7 +257,14 @@ public class WmTaskTypeController {
 	@ApiOperation(value = "修改任务类型打分表", notes = "修改任务类型打分表")
 	@SysLog("修改任务类型打分表")
 	@PutMapping
-	public R updateById(@RequestBody WmTaskType wmTaskType) {
+	public R updateById(@RequestBody WmTaskTypeVO wmTaskTypeVO) {
+
+		WmTaskType wmTaskType = BeanUtil.copyProperties(wmTaskTypeVO, WmTaskType.class);
+		// 应收账款回款-A类/应收账款回款-B类/应收账款回款-C类 积分值乘1000保存
+		if (StrUtil.isNotBlank(wmTaskType.getTaskTypeName()) && wmTaskType.getTaskTypeName().startsWith("应收账款回款")) {
+			wmTaskType.setScore((int) (Double.parseDouble(wmTaskTypeVO.getScore()) * 1000));
+		}
+
 		String baseId = wmTaskType.getId();
 		if (SecurityUtils.getRoles().contains(2)) {
 			if (null != wmTaskType.getId() && "1".equals(wmTaskType.getStatus())) {

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

@@ -1045,12 +1045,6 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 				}
 				// 2021-06-11 库存调查分成，首次调查和常规调查，常规调查走之前的逻辑 end
 
-				// 库存信息收集-首次、库存盘点-中药颗粒剂  归类到库存调查的任务中
-				if ("31".equals(wmTaskContent.getTemp30()) || "37".equals(wmTaskContent.getTemp30())) {
-					// 转换为统一的任务类型 库存调查
-					wmTask.setTaskTypeId("14");
-				}
-
 				// 调剂服务 任务积分值 = 每一味积分值 * 调剂味数
 				if ("38".equals(wmTaskContent.getTemp30())) {
 					WmTaskType wmTaskType2 = new WmTaskType();
@@ -1062,7 +1056,7 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 				}
 
 				// 应收账款回款-A类/应收账款回款-B类/应收账款回款-C类 积分值按照“回款总额”乘“回款类别”对应的百分比，四舍五入
-				if ("39".equals(wmTaskContent.getTemp30()) || "40".equals(wmTaskContent.getTemp30()) || "41".equals(wmTaskContent.getTemp30())) {
+				if ("39".equals(wmTaskContent.getTemp30())) {
 					WmTaskType wmTaskType2 = new WmTaskType();
 					// 根据选择的回款类别 查任务类型模板
 					WmTaskType baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp23());
@@ -1074,8 +1068,6 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 					score = wmTaskTypeService.getWmTaskTypeByEnt(wmTaskType2);
 					// 计算实际任务积分（任务积分值 = 每一味积分值 * 调剂味数），这里应收账款回款积分值存的是1000的倍数，所以需要除以1000
 					score = (int) Math.round(score * Double.parseDouble(wmTaskContent.getTemp8()) / 1000.0D);
-					// 实际任务类型 A类/B类/C类
-					wmTask.setTaskTypeId(wmTaskContent.getTemp23());
 				}
 
 				log.info("获取任务得分：{}", score);