From 3a93dfe7b4d47b9cf59ea188828dfb7c7aa0de7a Mon Sep 17 00:00:00 2001
From: jiangchao <jiangchao@feewee.cn>
Date: Mon, 6 Mar 2023 11:45:31 +0800
Subject: [PATCH] feature(*): 考评指标修改、数据导入修改

---
 fw-morax-domain/src/main/java/cn/fw/morax/domain/dto/EvalIndicatorDTO.java                   | 22 +++++++++++-----------
 fw-morax-server/src/main/java/cn/fw/morax/server/controller/erp/EvalIndicatorController.java |  5 ++---
 fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalIndicatorBizService.java     | 14 ++++++++------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/fw-morax-domain/src/main/java/cn/fw/morax/domain/dto/EvalIndicatorDTO.java b/fw-morax-domain/src/main/java/cn/fw/morax/domain/dto/EvalIndicatorDTO.java
index 227ce5a..aac8ed6 100644
--- a/fw-morax-domain/src/main/java/cn/fw/morax/domain/dto/EvalIndicatorDTO.java
+++ b/fw-morax-domain/src/main/java/cn/fw/morax/domain/dto/EvalIndicatorDTO.java
@@ -27,17 +27,17 @@ public class EvalIndicatorDTO {
     @Length(max = 255, message = "指标名称超出最大长度限制")
     private String name;
 
-    /**
-     * 归属系统id
-     */
-    @NotNull(message = "归属系统不能为空")
-    private Long sysId;
-
-    /**
-     * 归属系统名称
-     */
-    @NotNull(message = "归属系统名称不能为空")
-    private String sysName;
+//    /**
+//     * 归属系统id
+//     */
+//    @NotNull(message = "归属系统不能为空")
+//    private Long sysId;
+//
+//    /**
+//     * 归属系统名称
+//     */
+//    @NotNull(message = "归属系统名称不能为空")
+//    private String sysName;
 
     /**
      * 数据类型；1:数量 2:百分比 3:金额
diff --git a/fw-morax-server/src/main/java/cn/fw/morax/server/controller/erp/EvalIndicatorController.java b/fw-morax-server/src/main/java/cn/fw/morax/server/controller/erp/EvalIndicatorController.java
index a96fbc1..882a05f 100644
--- a/fw-morax-server/src/main/java/cn/fw/morax/server/controller/erp/EvalIndicatorController.java
+++ b/fw-morax-server/src/main/java/cn/fw/morax/server/controller/erp/EvalIndicatorController.java
@@ -133,12 +133,11 @@ public class EvalIndicatorController {
     @IgnoreAuth
     @PostMapping("/analysis-shop")
     @ControllerMethod("上传门店指标")
-    public Message<Void> uploadShopIndicator(@RequestParam("file") MultipartFile file, @CurrentUser LoginAuthBean user) {
+    public Message<EvalIndicatorImportRecordVO> uploadShopIndicator(@RequestParam("file") MultipartFile file, @CurrentUser LoginAuthBean user) {
         if (file.isEmpty()) {
             throw new BusinessException("请上传文件");
         }
-        evalIndicatorReportService.uploadShopIndicator(file, user);
-        return success();
+        return success(evalIndicatorReportService.uploadShopIndicator(file, user));
     }
 
     /**
diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalIndicatorBizService.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalIndicatorBizService.java
index d822542..bd40e55 100644
--- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalIndicatorBizService.java
+++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalIndicatorBizService.java
@@ -246,12 +246,12 @@ public class EvalIndicatorBizService {
     public EvalIndicator convertToDB(EvalIndicatorDTO dto){
         EvalIndicator indicators = EvalIndicator.builder()
                 .name(dto.getName())
-                .enable(Boolean.FALSE)
+                .enable(Boolean.TRUE)
                 .ruleType(dto.getRuleType())
                 .dataType(dto.getDataType())
                 .targetType(dto.getTargetType())
-                .sysId(dto.getSysId())
-                .sysName(dto.getSysName())
+//                .sysId(dto.getSysId())
+//                .sysName(dto.getSysName())
                 .roleCode(dto.getRoleCode())
                 .roleName(dto.getRoleName())
                 .build();
@@ -359,9 +359,11 @@ public class EvalIndicatorBizService {
         compositeIndicator.setCodeType(IndicatorCodeTypeEnum.EVAL_INDICATOR);
         compositeIndicator.setCode(evalIndicator.getCode());
         compositeIndicator.setName(evalIndicator.getName());
-        compositeIndicator.setSysId(evalIndicator.getSysId());
-        compositeIndicator.setSysPrefix(evalIndicator.getSysPrefix());
-        compositeIndicator.setSysName(evalIndicator.getSysName());
+        if (PublicUtil.isNotEmpty(evalIndicator.getSysId())) {
+            compositeIndicator.setSysId(evalIndicator.getSysId());
+            compositeIndicator.setSysPrefix(evalIndicator.getSysPrefix());
+            compositeIndicator.setSysName(evalIndicator.getSysName());
+        }
         compositeIndicator.setRoleCode(evalIndicator.getRoleCode());
         compositeIndicator.setRoleName(evalIndicator.getRoleName());
         compositeIndicator.setDataType(evalIndicator.getDataType());
--
libgit2 0.22.2