Merge remote-tracking branch 'origin/cnbg-master' into cnbg-master

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

@@ -165,16 +165,16 @@ public class WmTaskTypeController {
         List<WmTaskTypeVO> voList = new ArrayList<>();
         pageResult.getRecords().forEach(taskType -> {
             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 {
+//            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);
         });
         voPage.setRecords(voList);