Merge branch 'jc-custom-indicator-2024-3-22' into 'main'

考评指标导入考评指标导入 See merge request !607

Merge branch 'jc-custom-indicator-2024-3-22' into 'main'
考评指标导入考评指标导入 See merge request !607
姜超
2 parents 98d05b03 964c28a5
Showing 57 changed files with 2661 additions and 22 deletions
doc/2023-05-18_update.sql
fw-morax-common/src/main/java/cn/fw/morax/common/config/EvalIndicatorVal.java
fw-morax-common/src/main/java/cn/fw/morax/common/pojo/event/ImportEvalIndicatorScoreEvent.java
fw-morax-common/src/main/java/cn/fw/morax/common/utils/ExcelDataUtil.java
fw-morax-dao/src/main/java/cn/fw/morax/dao/TemplateFileDao.java
fw-morax-dao/src/main/java/cn/fw/morax/dao/eval/EvalIndicatorImportDetailScoreDao.java
fw-morax-dao/src/main/java/cn/fw/morax/dao/eval/EvalIndicatorImportKeyValueDao.java
fw-morax-dao/src/main/java/cn/fw/morax/dao/eval/EvalIndicatorImportMenuDao.java
fw-morax-dao/src/main/java/cn/fw/morax/dao/eval/EvalIndicatorValueDao.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/bo/eval/EvalIndicatorScoreBO.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/TemplateFile.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalIndicator.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalIndicatorImportDetail.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalIndicatorImportDetailScore.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalIndicatorImportKeyValue.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalIndicatorImportMenu.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalIndicatorImportRecord.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalIndicatorScoreStageValue.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalIndicatorScoreValue.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalIndicatorValue.java
@@ -3,6 +3,27 @@ ALTER TABLE `fw_morax`.`eval_pool_indicator_detail`
     ADD INDEX `query_index`(`pool_id`, `scope_type`, `stage_dim`, `eval_group_id`, `data_date`, `yn`) USING BTREE;
  
  
+-- 2024年3月27日
+ALTER TABLE `fw_morax`.`eval_indicator_import_record`
+    ADD COLUMN `import_type` tinyint(4) NULL DEFAULT 1 COMMENT '考评指标导入类型；1:结果数据 2:分值原始数据' AFTER `status`;
+
+ALTER TABLE `fw_morax`.`eval_indicator_import_record`
+    ADD COLUMN `shop_ids` varchar(2048) NULL COMMENT '门店id' AFTER `approval_no`;
+
+ALTER TABLE `fw_morax`.`eval_indicator`
+    ADD COLUMN `role_codes` varchar(2048) NULL COMMENT '授权角色' AFTER `role_name`,
+ADD COLUMN `role_names` varchar(2048) NULL COMMENT '授权角色名称' AFTER `role_codes`;
+
+ALTER TABLE `fw_morax`.`eval_indicator_value`
+    MODIFY COLUMN `shop_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '门店名称' AFTER `shop_id`;
+
+ALTER TABLE `fw_morax`.`eval_indicator_value`
+    ADD COLUMN `indicator_name` varchar(255) NULL COMMENT '指标名称' AFTER `indicator_code`;
+
+-- eval_indicator_import_menu
+-- eval_indicator_import_detail_score
+-- eval_indicator_import_key_value
+
 -- 2024年4月3日
 ALTER TABLE `fw_morax`.`eval_group_user`
     ADD COLUMN `staff_status` tinyint(8) NULL COMMENT '当前员工状态:1->试用,2->正式,8->待离职,9->离职' AFTER `data_date`;
@@ -25,6 +25,20 @@ public class EvalIndicatorVal {
     @Getter
     private String checkTodoLockKey;
  
+    @Value("${spring.cache.custom.global-prefix}:eval-import:")
+    @Getter
+    private String evalImport;
+    @Value("${spring.cache.custom.global-prefix}:eval-import-detail:")
+    @Getter
+    private String evalImportDetail;
+
+    @Value("${spring.cache.custom.global-prefix}:eval-import-showroom-beautification:")
+    @Getter
+    private String evalShowroomBeautificationImport;
+    @Value("${spring.cache.custom.global-prefix}:eval-import-showroom-beautification-detail:")
+    @Getter
+    private String evalShowroomBeautificationImportDetail;
+
     /**
      * 最大重试次数
      */
+package cn.fw.morax.common.pojo.event;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ImportEvalIndicatorScoreEvent {
+
+    /**
+     * 考评指标导入记录id
+     */
+    private Long evalIndicatorImportRecordId;
+
+    /**
+     * 集团id
+     */
+    private Long groupId;
+
+    /**
+     * 数据日期
+     */
+//    private LocalDate dataDate;
+
+
+    public ImportEvalIndicatorScoreEvent() {
+    }
+
+    public ImportEvalIndicatorScoreEvent(Long evalIndicatorImportRecordId, Long groupId) {
+        this.evalIndicatorImportRecordId = evalIndicatorImportRecordId;
+        this.groupId = groupId;
+    }
+}
@@ -345,7 +345,7 @@ public class ExcelDataUtil {
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("解析excel出错 ", e);
         }
         return beans;
     }
+package cn.fw.morax.dao;
+
+import cn.fw.morax.domain.db.TemplateFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 绩效校验离职记录
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : UserResignExamineDao
+ * @description : 绩效校验离职记录
+ * @date : 2022-12-29 16:58
+ */
+@Repository
+public interface TemplateFileDao extends BaseMapper<TemplateFile> {
+}
+package cn.fw.morax.dao.eval;
+
+
+import cn.fw.morax.dao.orm.LocalMapper;
+import cn.fw.morax.domain.db.eval.EvalIndicatorImportDetailScore;
+
+/**
+ * <p>
+ * 考评指标导入记录 Mapper 接口
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2023-01-30
+ */
+public interface EvalIndicatorImportDetailScoreDao extends LocalMapper<EvalIndicatorImportDetailScore> {
+
+}
+package cn.fw.morax.dao.eval;
+
+
+import cn.fw.morax.dao.orm.LocalMapper;
+import cn.fw.morax.domain.db.eval.EvalIndicatorImportKeyValue;
+
+/**
+ * <p>
+ * 考评指标导入记录 Mapper 接口
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2023-01-30
+ */
+public interface EvalIndicatorImportKeyValueDao extends LocalMapper<EvalIndicatorImportKeyValue> {
+
+}
+package cn.fw.morax.dao.eval;
+
+
+import cn.fw.morax.dao.orm.LocalMapper;
+import cn.fw.morax.domain.db.eval.EvalIndicatorImportMenu;
+
+/**
+ * <p>
+ * 考评指标导入记录 Mapper 接口
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2023-01-30
+ */
+public interface EvalIndicatorImportMenuDao extends LocalMapper<EvalIndicatorImportMenu> {
+
+}
 package cn.fw.morax.dao.eval;
  
  
+import cn.fw.morax.dao.orm.LocalMapper;
 import cn.fw.morax.domain.db.eval.EvalIndicatorValue;
 import cn.fw.morax.domain.enums.DimensionTypeEnum;
 import cn.fw.morax.domain.vo.kpi.IndicatorUserValueVO;
@@ -20,7 +21,7 @@ import java.util.Set;
  * @author jiangchao
  * @since 2023-01-30
  */
-public interface EvalIndicatorValueDao extends BaseMapper<EvalIndicatorValue> {
+public interface EvalIndicatorValueDao extends LocalMapper<EvalIndicatorValue> {
  
     /**
      * 查询最新上报数据
+package cn.fw.morax.domain.bo.eval;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 自定义指标导入数据
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2024-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class EvalIndicatorScoreBO {
+
+    /**
+     * 门店id
+     */
+    private Long shopId;
+
+    /**
+     * 门店名称
+     */
+    private String shopName;
+
+    /**
+     * 得分
+     */
+    private BigDecimal score;
+
+    /**
+     * 总分
+     */
+    private BigDecimal totalScore;
+
+    /**
+     * 数据结束日期
+     */
+    private LocalDate dataDate;
+
+
+}
+package cn.fw.morax.domain.db;
+
+import cn.fw.common.data.entity.BaseAuditableTimeEntity;
+import cn.fw.morax.domain.enums.TemplateFileTypeEnum;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 自定义指标导入菜单
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2024-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName(autoResultMap = true)
+public class TemplateFile extends BaseAuditableTimeEntity<TemplateFile, Long> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 模板类型
+     */
+    private TemplateFileTypeEnum type;
+
+    /**
+     * tag
+     */
+    private String tag;
+
+    /**
+     * 文件地址
+     */
+    private String fid;
+
+    /**
+     * 集团id
+     */
+    private Long groupId;
+
+    /**
+     * 逻辑删除
+     */
+    @TableLogic
+    private Boolean yn;
+
+
+}
@@ -3,6 +3,7 @@ package cn.fw.morax.domain.db.eval;
 import cn.fw.common.data.entity.BaseAuditableTimeEntity;
 import cn.fw.common.data.mybatis.handler.IntegerListTypeHandler;
 import cn.fw.common.data.mybatis.handler.LongListTypeHandler;
+import cn.fw.common.data.mybatis.handler.StringListTypeHandler;
 import cn.fw.morax.domain.enums.*;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -142,6 +143,18 @@ public class EvalIndicator extends BaseAuditableTimeEntity&lt;EvalIndicator, Long&gt; 
     private Integer importEndDate;
  
     /**
+     * 适用角色编码
+     */
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> roleCodes;
+
+    /**
+     * 适用角色名称
+     */
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> roleNames;
+
+    /**
      * 逻辑删除
      */
     @TableLogic
@@ -12,6 +12,8 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
  
 /**
  * <p>
@@ -81,6 +83,11 @@ public class EvalIndicatorImportDetail extends BaseAuditableTimeEntity&lt;EvalIndic
     private String indicatorCode;
  
     /**
+     * 指标值
+     */
+    private String jsonValue;
+
+    /**
      * 月度指标业务值
      */
     private BigDecimal indicatorValue;
@@ -136,6 +143,12 @@ public class EvalIndicatorImportDetail extends BaseAuditableTimeEntity&lt;EvalIndic
     @TableField(exist = false)
     private String unit;
  
+    /**
+     * 键值对
+     */
+    @TableField(exist = false)
+    private List<EvalIndicatorImportKeyValue> keyValues;
+
  
     public EvalIndicatorImportDetail() {
     }
+package cn.fw.morax.domain.db.eval;
+
+import cn.fw.common.data.entity.BaseAuditableTimeEntity;
+import cn.fw.morax.domain.enums.ImportErrorReasonEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 自定义指标导入数据
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2024-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName(autoResultMap = true)
+public class EvalIndicatorImportDetailScore extends BaseAuditableTimeEntity<EvalIndicatorImportDetailScore, Long> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 导入记录id
+     */
+    private Long recordId;
+
+    /**
+     * 指标名称
+     */
+    private String indicatorName;
+
+    /**
+     * 指标编码
+     */
+    private String indicatorCode;
+
+    /**
+     * 门店id
+     */
+    private Long shopId;
+
+    /**
+     * 门店名称
+     */
+    private String shopName;
+
+
+    /**
+     * 得分
+     */
+    private BigDecimal score;
+
+    /**
+     * 总分
+     */
+    private BigDecimal totalScore;
+
+    /**
+     * 打分人员名称
+     */
+    private String graderStaffName;
+
+    /**
+     * 打分人员id
+     */
+    private Long graderStaffId;
+
+    /**
+     * 阶段数据开始日期
+     */
+    private LocalDate stageStartDataDate;
+
+    /**
+     * 阶段数据结束日期
+     */
+    private LocalDate stageEndDataDate;
+
+    /**
+     * 数据结束日期
+     */
+    private LocalDate dataDate;
+
+    /**
+     * 错误提示: 1:未匹配到人员 2:未匹配到门店 3:未匹配到指标 4:重复 5:时间错误
+     */
+    private ImportErrorReasonEnum errorType;
+
+    /**
+     * 有效
+     */
+    private Boolean valid;
+
+    /**
+     * 集团id
+     */
+    private Long groupId;
+
+    /**
+     * 逻辑删除
+     */
+    private Boolean yn;
+
+    public EvalIndicatorImportDetailScore() {
+    }
+
+}
+package cn.fw.morax.domain.db.eval;
+
+import cn.fw.common.data.entity.BaseAuditableTimeEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 自定义指标导入数据
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2024-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName(autoResultMap = true)
+public class EvalIndicatorImportKeyValue extends BaseAuditableTimeEntity<EvalIndicatorImportKeyValue, Long> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 导入记录id
+     */
+    private Long recordId;
+
+    /**
+     * 导入记录id
+     */
+    private Long evalIndicatorImportDetailId;
+
+    /**
+     * key
+     */
+    private String key;
+
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * 指标业务值
+     */
+    private String value;
+
+    /**
+     * 逻辑删除
+     */
+    private Boolean yn;
+
+    public EvalIndicatorImportKeyValue() {
+    }
+
+    public EvalIndicatorImportKeyValue(Long recordId, Long evalIndicatorImportDetailId) {
+        this.recordId = recordId;
+        this.evalIndicatorImportDetailId = evalIndicatorImportDetailId;
+        this.yn = Boolean.TRUE;
+    }
+
+    public EvalIndicatorImportKeyValue(String key, String desc, String value) {
+        this.key = key;
+        this.desc = desc;
+        this.value = value;
+        this.yn = Boolean.TRUE;
+    }
+}
+package cn.fw.morax.domain.db.eval;
+
+import cn.fw.common.data.entity.BaseAuditableTimeEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 自定义指标导入菜单
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2024-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName(autoResultMap = true)
+public class EvalIndicatorImportMenu extends BaseAuditableTimeEntity<EvalIndicatorImportMenu, Long> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 指标编码
+     */
+    private String indicatorCode;
+
+    /**
+     * 指标名称
+     */
+    private String indicatorName;
+
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+
+    /**
+     * 集团id
+     */
+    private Long groupId;
+
+    /**
+     * 逻辑删除
+     */
+    @TableLogic
+    private Boolean yn;
+
+
+}
 package cn.fw.morax.domain.db.eval;
  
 import cn.fw.common.data.entity.BaseAuditableTimeEntity;
+import cn.fw.common.data.mybatis.handler.LongListTypeHandler;
 import cn.fw.morax.domain.enums.*;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -11,6 +13,7 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
  
 /**
  * <p>
@@ -114,6 +117,17 @@ public class EvalIndicatorImportRecord extends BaseAuditableTimeEntity&lt;EvalIndic
     private DataTimeTypeEnum dataTimeType;
  
     /**
+     * 考评指标导入类型；1:结果数据 2:分值原始数据
+     */
+    private EvalIndicatorImportTypeEnum importType;
+
+    /**
+     * 适用门店ids
+     */
+    @TableField(typeHandler = LongListTypeHandler.class)
+    private List<Long> shopIds;
+
+    /**
      * 逻辑删除
      */
     @TableLogic
+package cn.fw.morax.domain.db.eval;
+
+import cn.fw.common.data.entity.BaseAuditableTimeEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 自定义指标阶段得分值
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2024-03-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName(autoResultMap = true)
+public class EvalIndicatorScoreStageValue extends BaseAuditableTimeEntity<EvalIndicatorScoreStageValue, Long> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 维度类型 1：人员 2：门店
+     */
+    private Integer dimensionType;
+
+    /**
+     * 编码
+     */
+    private String evalIndicatorCode;
+
+    /**
+     * 编码名称
+     */
+    private String evalIndicatorName;
+
+    /**
+     * 得分
+     */
+    private BigDecimal socre;
+
+    /**
+     * 总分
+     */
+    private BigDecimal baseSocre;
+
+    /**
+     * 人员id
+     */
+    private Long userId;
+
+    /**
+     * 人员名称
+     */
+    private String userName;
+
+    /**
+     * 门店id
+     */
+    private Long shopId;
+
+    /**
+     * 门店名称
+     */
+    private String shopName;
+
+    /**
+     * 阶段数据时间类型；1:阶段数据 2:阶段累计数据
+     */
+    private Integer stageDataTimeType;
+
+    /**
+     * 数据开始日期
+     */
+    private LocalDate beginDate;
+
+    /**
+     * 数据结束日期
+     */
+    private LocalDate endDate;
+
+    /**
+     * 集团id
+     */
+    private Long groupId;
+
+    /**
+     * 逻辑删除
+     */
+    private Boolean yn;
+
+}
+package cn.fw.morax.domain.db.eval;
+
+import cn.fw.common.data.entity.BaseAuditableTimeEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 自定义指标得分值
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2024-03-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName(autoResultMap = true)
+public class EvalIndicatorScoreValue extends BaseAuditableTimeEntity<EvalIndicatorScoreValue, Long> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 维度类型 1：人员 2：门店
+     */
+    private Integer dimensionType;
+
+    /**
+     * 编码
+     */
+    private String evalIndicatorCode;
+
+    /**
+     * 编码名称
+     */
+    private String evalIndicatorName;
+
+    /**
+     * 得分
+     */
+    private BigDecimal socre;
+
+    /**
+     * 总分
+     */
+    private BigDecimal baseSocre;
+
+    /**
+     * 人员id
+     */
+    private Long userId;
+
+    /**
+     * 人员名称
+     */
+    private String userName;
+
+    /**
+     * 门店id
+     */
+    private Long shopId;
+
+    /**
+     * 门店名称
+     */
+    private String shopName;
+
+    /**
+     * 数据类型；1:数量 2:百分比 3:金额
+     */
+    private Integer dataType;
+
+    /**
+     * 数据日期
+     */
+    private LocalDate dataDate;
+
+    /**
+     * 集团id
+     */
+    private Long groupId;
+
+    /**
+     * 逻辑删除
+     */
+    private Boolean yn;
+
+
+}
@@ -61,10 +61,10 @@ public class EvalIndicatorValue extends BaseAuditableTimeEntity&lt;EvalIndicatorVal
      */
     private String indicatorCode;
  
-//    /**
-//     * 指标库名称
-//     */
-//    private String indicatorName;
+    /**
+     * 指标库名称
+     */
+    private String indicatorName;
  
     /**
      * 指标业务值
 package cn.fw.morax.domain.dto;
  
+import cn.fw.common.data.mybatis.handler.StringListTypeHandler;
 import cn.fw.common.web.annotation.LoginContextField;
 import cn.fw.morax.domain.enums.*;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
  
@@ -137,6 +139,16 @@ public class EvalIndicatorDTO {
      */
     private Integer importEndDate;
  
+    /**
+     * 适用角色编码
+     */
+    private List<String> roleCodes;
+
+    /**
+     * 适用角色名称
+     */
+    private List<String> roleNames;
+
 //    /**
 //     * 月天数
 //     */
@@ -16,6 +16,11 @@ public class EvalIndicatorImportDetailQueryDTO extends BasePageQuery {
     private String indicatorName;
  
     /**
+     * 指标名称
+     */
+    private String indicatorCode;
+
+    /**
      * 人员名称
      */
     private String userName;
+package cn.fw.morax.domain.dto.query;
+
+import cn.fw.common.page.BasePageQuery;
+import cn.fw.common.web.annotation.LoginContextField;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.YearMonth;
+
+@Data
+public class EvalIndicatorImportScoreQueryDTO extends BasePageQuery {
+
+    /**
+     * 指标编码
+     */
+    private String indicatorCode;
+
+    /**
+     * 导入人员
+     */
+    private Long userId;
+
+    /**
+     * 门店id
+     */
+    private Long shopId;
+
+    /**
+     * 开始导入时间
+     */
+    private YearMonth monthly;
+
+    /**
+     * 集团id
+     */
+    @LoginContextField(LoginContextField.Name.GROUP_ID)
+    private Long groupId;
+
+}
+package cn.fw.morax.domain.enums;
+
+import com.baomidou.mybatisplus.core.enums.IEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.Getter;
+
+/**
+ * 考评指标导入类型
+ *
+ * @author kurisu
+ */
+public enum EvalIndicatorImportTypeEnum implements IEnum<Integer> {
+    /**
+     * 考评指标导入类型；1:结果数据 2:分值原始数据
+     */
+    VALUE(1, "结果数据"),
+    SCORE_ORIGIN_VALUE(2, "分值原始数据"),
+    ;
+
+    /**
+     * 值
+     */
+    private final Integer value;
+    /**
+     * 名称
+     */
+    @Getter
+    private final String name;
+
+    EvalIndicatorImportTypeEnum(final Integer value, final String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    /**
+     * 根据枚举值获取枚举对象
+     */
+    @JsonCreator
+    public static EvalIndicatorImportTypeEnum ofValue(final Integer value) {
+        for (final EvalIndicatorImportTypeEnum _enum : EvalIndicatorImportTypeEnum.values()) {
+            if (_enum.value.equals(value)) {
+                return _enum;
+            }
+        }
+        return null;
+    }
+
+    public static EvalIndicatorImportTypeEnum nameOfValue(final String name) {
+        for (final EvalIndicatorImportTypeEnum _enum : EvalIndicatorImportTypeEnum.values()) {
+            if (_enum.name.equals(name)) {
+                return _enum;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取值
+     *
+     * @return 值
+     */
+    @JsonValue
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+    /**
+     * 获取描述
+     *
+     * @return 值
+     */
+    @JsonCreator
+    public static String getNameByVale(final Integer value) {
+        for (final EvalIndicatorImportTypeEnum _enum : EvalIndicatorImportTypeEnum.values()) {
+            if (_enum.value.equals(value)) {
+                return _enum.getName();
+            }
+        }
+        return "";
+    }
+}
@@ -13,12 +13,13 @@ import lombok.Getter;
 public enum ImportErrorReasonEnum implements IEnum<Integer> {
  
     /**
-     * 错误类型: 1:未匹配到人员 2:未匹配到门店 3:未匹配到指标
+     * 错误类型: 1:未匹配到人员 2:未匹配到门店 3:未匹配到指标 4:重复 5:时间错误
      */
     NO_MATCH_STAFF(1, "未匹配到人员"),
     NO_MATCH_SHOP(2, "未匹配到门店"),
     NO_MATCH_INDICATOR(3, "未匹配到指标"),
     REPETITION(4, "重复"),
+    TIME_ERROR(5, "时间错误"),
     ;
  
     /**
+package cn.fw.morax.domain.enums;
+
+import com.baomidou.mybatisplus.core.enums.IEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.Getter;
+
+/**
+ * 模板类型
+ *
+ * @author : kurisu
+ * @version : 1.0
+ * @className : TemplateFileTypeEnum
+ * @description : 模板类型
+ * @date : 2022-05-06 18:24
+ */
+public enum TemplateFileTypeEnum implements IEnum<Integer> {
+    /**
+     * 模板类型;1:考评指标库
+     */
+    EVAL_INDICATOR(1, "考评指标库"),
+    ;
+
+    /**
+     * 值
+     */
+    private final Integer value;
+    /**
+     * 名称
+     */
+    @Getter
+    private final String name;
+
+    TemplateFileTypeEnum(final Integer value, final String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    /**
+     * 根据枚举值获取枚举对象
+     */
+    @JsonCreator
+    public static TemplateFileTypeEnum ofValue(final Integer value) {
+        for (final TemplateFileTypeEnum _enum : TemplateFileTypeEnum.values()) {
+            if (_enum.value.equals(value)) {
+                return _enum;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取描述
+     *
+     * @return 值
+     */
+    @JsonCreator
+    public static String getNameByVale(final Integer value) {
+        for (final TemplateFileTypeEnum _enum : TemplateFileTypeEnum.values()) {
+            if (_enum.value.equals(value)) {
+                return _enum.getName();
+            }
+        }
+        return "";
+    }
+
+    /**
+     * 获取值
+     *
+     * @return 值
+     */
+    @JsonValue
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+}
@@ -177,6 +177,16 @@ public class CombineAndEvalIndicatorVO {
      */
     private Integer importEndDate;
  
+    /**
+     * 适用角色编码
+     */
+    private List<String> roleCodes;
+
+    /**
+     * 适用角色名称
+     */
+    private List<String> roleNames;
+
  
     public void setHasTarget() {
         this.setHasTarget((! TargetTypeEnum.NO.equals(this.getTargetType())));
+package cn.fw.morax.domain.vo.eval;
+
+import cn.fw.common.data.entity.BaseAuditableTimeEntity;
+import cn.fw.morax.domain.enums.ImportErrorReasonEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 自定义指标导入数据
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2024-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class EvalIndicatorImportDetailScoreVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 导入记录id
+     */
+    private Long id;
+
+
+    /**
+     * 导入记录id
+     */
+    private Long recordId;
+
+    /**
+     * 指标名称
+     */
+    private String indicatorName;
+
+    /**
+     * 指标编码
+     */
+    private String indicatorCode;
+
+    /**
+     * 门店id
+     */
+    private Long shopId;
+
+    /**
+     * 门店名称
+     */
+    private String shopName;
+
+
+    /**
+     * 得分
+     */
+    private BigDecimal score;
+
+    /**
+     * 总分
+     */
+    private BigDecimal totalScore;
+
+    /**
+     * 打分人员名称
+     */
+    private String graderStaffName;
+
+    /**
+     * 打分人员id
+     */
+    private Long graderStaffId;
+
+    /**
+     * 阶段数据开始日期
+     */
+    private LocalDate stageStartDataDate;
+
+    /**
+     * 阶段数据结束日期
+     */
+    private LocalDate stageEndDataDate;
+
+    /**
+     * 数据结束日期
+     */
+    private LocalDate dataDate;
+
+    /**
+     * 错误类型: 1:未匹配到人员 2:未匹配到门店 3:未匹配到指标 4:重复 5:时间错误
+     */
+    private ImportErrorReasonEnum errorType;
+
+    /**
+     * 有效
+     */
+    private Boolean valid;
+
+    /**
+     * 逻辑删除
+     */
+    private Boolean yn;
+
+    public EvalIndicatorImportDetailScoreVO() {
+    }
+
+}
@@ -13,6 +13,7 @@ import lombok.experimental.Accessors;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.Date;
+import java.util.List;
  
 /**
  * <p>
@@ -33,6 +34,12 @@ public class EvalIndicatorImportDetailVO {
      */
 //    private Integer dimensionType;
  
+
+    /**
+     * id
+     */
+    private Long id;
+
     /**
      * 导入id
      */
@@ -144,6 +151,11 @@ public class EvalIndicatorImportDetailVO {
     private BigDecimal stageIndicatorValue;
  
     /**
+     * 指标值
+     */
+    private List<EvalIndicatorImportKeyValueVO> keyValues;
+
+    /**
      * 转换为百分数展示
      */
     public void convertToPercent(){
+package cn.fw.morax.domain.vo.eval;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 自定义指标导入数据
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2024-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class EvalIndicatorImportKeyValueVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 导入记录id
+     */
+    private Long recordId;
+
+    /**
+     * 导入记录id
+     */
+    private Long evalIndicatorImportDetailId;
+
+    /**
+     * key
+     */
+    private String key;
+
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * 指标业务值
+     */
+    private String value;
+
+    /**
+     * 逻辑删除
+     */
+    private Boolean yn;
+
+    public EvalIndicatorImportKeyValueVO() {
+    }
+
+    public EvalIndicatorImportKeyValueVO(Long recordId, Long evalIndicatorImportDetailId) {
+        this.recordId = recordId;
+        this.evalIndicatorImportDetailId = evalIndicatorImportDetailId;
+        this.yn = Boolean.TRUE;
+    }
+}
 package cn.fw.morax.domain.vo.eval;
  
 import cn.fw.common.data.entity.BaseAuditableTimeEntity;
+import cn.fw.common.data.mybatis.handler.LongListTypeHandler;
 import cn.fw.morax.domain.enums.DataTimeTypeEnum;
 import cn.fw.morax.domain.enums.DimensionTypeEnum;
+import cn.fw.morax.domain.enums.EvalIndicatorImportTypeEnum;
 import cn.fw.morax.domain.enums.SettingDraftStatusEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -109,9 +112,8 @@ public class EvalIndicatorImportRecordVO{
      */
     private String key;
  
-
     /**
-     * 状态;1:审批中 2:待生效 3:生效中 4:已失效
+     * 草稿状态 1:未发布 2:发布待审批 3:审批拒绝 4:审批同意 5:撤销审批
      */
     private SettingDraftStatusEnum status;
  
@@ -126,6 +128,17 @@ public class EvalIndicatorImportRecordVO{
     private DataTimeTypeEnum dataTimeType;
  
     /**
+     * 考评指标导入类型；1:结果数据 2:分值原始数据
+     */
+    private EvalIndicatorImportTypeEnum importType;
+
+    /**
+     * 适用门店ids
+     */
+    @TableField(typeHandler = LongListTypeHandler.class)
+    private List<Long> shopIds;
+
+    /**
      * 导入详情
      */
     private List<EvalIndicatorImportDetailVO> details;
+package cn.fw.morax.domain.vo.eval;
+
+import cn.fw.morax.domain.enums.DataTimeTypeEnum;
+import cn.fw.morax.domain.enums.DimensionTypeEnum;
+import cn.fw.morax.domain.enums.SettingDraftStatusEnum;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 考评指标导入记录
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2023-01-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class EvalIndicatorImportVO<T> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 导入人员id
+     */
+    private Long id;
+
+    /**
+     * 导入人员id
+     */
+    private Long importUserId;
+
+    /**
+     * 导入人员名称
+     */
+    private String importUserName;
+
+    /**
+     * 门店id
+     */
+    private Long shopId;
+
+    /**
+     * 门店名称
+     */
+    private String shopName;
+
+    /**
+     * 维度类型 1：人员 2：门店
+     */
+    private DimensionTypeEnum dimensionType;
+
+    /**
+     * 指标编码
+     */
+    private String indicatorCode;
+
+    /**
+     * 指标库名称
+     */
+    private String indicatorName;
+
+    /**
+     * 类型：1: 百分比 2:数量 3:条件值 4:金额 
+     */
+    private Integer valueType;
+
+    /**
+     * 数据日期
+     */
+    private LocalDate dataDate;
+
+    /**
+     * 导入条数
+     */
+    private Integer num;
+
+    /**
+     * 成功导入条数
+     */
+    private Integer successNum;
+
+    /**
+     * 失败导入条数
+     */
+    private Integer errorNum;
+
+    /**
+     * 集团id
+     */
+    private Long groupId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 保存的key
+     */
+    private String key;
+
+
+    /**
+     * 状态;1:审批中 2:待生效 3:生效中 4:已失效
+     */
+    private SettingDraftStatusEnum status;
+
+    /**
+     * 审批单号
+     */
+    private String approvalNo;
+
+    /**
+     * 数据时间类型；1:月数据 2:阶段数据
+     */
+    private DataTimeTypeEnum dataTimeType;
+
+    /**
+     * 导入详情
+     */
+    private List<T> details;
+
+}
+package cn.fw.morax.domain.vo.eval;
+
+import cn.fw.morax.common.annotation.ExcelField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Data
+public class ShowroomScoreImportValueVO {
+
+    /**
+     * 门店
+     */
+    @ExcelField(title = "门店", sort = 0, charSize = 16)
+    private String shopName;
+
+    /**
+     * 得分
+     */
+    @ExcelField(title = "得分", sort = 2, charSize = 16)
+    private BigDecimal score;
+
+    /**
+     * 总分
+     */
+    @ExcelField(title = "总分", sort = 3, charSize = 16)
+    private BigDecimal totalScore;
+
+    /**
+     * 打分人员
+     */
+    @ExcelField(title = "打分人员", sort = 5, charSize = 16)
+    private String graderStaffName;
+
+//    /**
+//     * 考核开始周期（如果是月数据 就是考核周期结束时间）
+//     */
+//    @ExcelField(title = "考核开始周期", sort = 5, charSize = 16)
+//    private LocalDate startDataDate;
+
+//    /**
+//     * 考核结束周期
+//     */
+//    private LocalDate endDataDate;
+//
+    /**
+     * 月度日期
+     */
+    private LocalDate monthlyDate;
+
+
+}
@@ -475,7 +475,13 @@ public class ErpRpcService {
         }
         try {
             final Date startTime = DateUtil.localDateTime2Date(dataDate.with(TemporalAdjusters.firstDayOfMonth()).atTime(0, 0, 1));
-            final Date endTime = DateUtil.localDateTime2Date(dataDate.atTime(23, 59, 59));
+            Date endTime;
+            //结束时间与当前时间比较，结束时间必须是过去时间
+            if (dataDate.compareTo(LocalDate.now()) >= 0) {
+                endTime = DateUtil.localDateTime2Date(LocalDateTime.now().minusMinutes(1));
+            } else {
+                endTime = DateUtil.localDateTime2Date(dataDate.atTime(23, 59, 59));
+            }
             HRBatchRangeReq roleRangeDto = new HRBatchRangeReq();
             roleRangeDto.setGroupId(groupId);
             roleRangeDto.setRoleCode(roleCode);
+package cn.fw.morax.rpc.erp.dto;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * @author jiangchao
+ * @des: 历史角色授权范围
+ * @date 2024/3/19 15:32
+ */
+@Data
+public class HRoleAuthRangeDayVO {
+
+    /**
+     * 集团
+     */
+    private Long groupId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 角色id
+     */
+    private Long roleId;
+
+    /**
+     * 角色码
+     */
+    private String roleCode;
+
+    /**
+     * 数据范围值
+     */
+    private Long rangeValue;
+
+    /**
+     * 数据范围名称
+     */
+    private String rangeName;
+
+    /**
+     * 时间线开始时间
+     */
+    private LocalDate startTime;
+
+    /**
+     * 时间线结束时间
+     */
+    private LocalDate endTime;
+
+    /**
+     * 授权天数
+     */
+    private Long authDays;
+}
@@ -26,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
  
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -73,6 +74,10 @@ public class FinanceRpCallbackConsumer implements RocketMQListener&lt;RpCallbackMqD
             cost.setAmount(payrollRecord.getAmount());
             cost.setCostDate(DateUtil.localDateTime2Date(payrollRecord.getMonthly().atEndOfMonth().atTime(23,59,59)));
             cost.setShopId(payrollRecord.getFundShopId());
+            //3月之后推在职门店
+            if (PublicUtil.isNotEmpty(payrollRecord.getMonthly()) && payrollRecord.getMonthly().compareTo(YearMonth.of(2024,3)) >= 0) {
+                cost.setShopId(payrollRecord.getShopId());
+            }
             cost.setBusinessType(payrollRecord.getBusinessType());
             cost.setBusinessNo(payrollRecord.getBusinessNo());
             cost.setType(Constant.SALARY_FINANCE_BUSINESS_PAYMENT);
@@ -53,6 +53,7 @@ public class EvalController {
     private final SettingDraftBizService settingDraftBizService;
     private final EvalGroupRankBizService evalGroupRankBizService;
     private final EvalIndicatorValueBizService evalIndicatorValueBizService;
+    private final EvalIndicatorImportBizService evalIndicatorImportBizService;
     private final EvalIndicatorReportService evalIndicatorReportService;
  
     /**
@@ -81,6 +82,18 @@ public class EvalController {
     }
  
     /**
+     * 自定义指标得分数据导入详情
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/score-import-detail")
+    @ControllerMethod("自定义指标得分数据导入详情")
+    public Message<List<EvalIndicatorImportDetailScoreVO>> scoreImportDetails(@NotNull(message = "录入详情id不能为空") Long id) {
+        return success(evalIndicatorImportBizService.scoreImportDetails(id));
+    }
+
+    /**
      * 导入记录详情审批查询
      *
      * @return
+package cn.fw.morax.server.controller.erp;
+
+import cn.fw.common.exception.BusinessException;
+import cn.fw.common.page.AppPage;
+import cn.fw.common.web.annotation.ControllerMethod;
+import cn.fw.common.web.auth.LoginAuthBean;
+import cn.fw.common.web.auth.annotation.CurrentUser;
+import cn.fw.data.base.domain.common.Message;
+import cn.fw.morax.common.utils.PublicUtil;
+import cn.fw.morax.domain.dto.query.EvalIndicatorImportScoreQueryDTO;
+import cn.fw.morax.domain.dto.query.EvalIndicatorImportSituationQueryDTO;
+import cn.fw.morax.domain.vo.eval.*;
+import cn.fw.morax.sdk.dto.eval.EvalIndicatorResult;
+import cn.fw.morax.service.biz.eval.EvalIndicatorBizService;
+import cn.fw.morax.service.biz.eval.EvalIndicatorImportBizService;
+import cn.fw.morax.service.biz.eval.EvalIndicatorReportService;
+import cn.fw.morax.service.biz.eval.EvalIndicatorValueBizService;
+import cn.fw.security.auth.client.annotation.Authorization;
+import cn.fw.security.auth.client.annotation.IgnoreAuth;
+import cn.fw.security.auth.client.enums.AuthType;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+import static cn.fw.common.web.util.ResultBuilder.success;
+
+/**
+ * @author jiangchao
+ * @des: 导入考评指标控制器
+ * @date 2023/2/8 16:57
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Authorization(AuthType.ERP)
+@Validated
+@IgnoreAuth
+@RestController
+@RequestMapping("/erp/eval-indicator-import")
+public class EvalIndicatorImportController {
+
+    private final EvalIndicatorImportBizService evalIndicatorImportBizService;
+    private final EvalIndicatorValueBizService evalIndicatorValueBizService;
+    private final EvalIndicatorReportService evalIndicatorReportService;
+    private final EvalIndicatorBizService evalIndicatorBizService;
+
+    /**
+     * 数据导入指标列表
+     *
+     * @return
+     */
+    @IgnoreAuth
+    @GetMapping("/indicators")
+    @ControllerMethod("数据导入指标列表")
+    public Message<List<EvalIndicatorVO>> evalIndicators(@CurrentUser LoginAuthBean user) {
+        return success(evalIndicatorImportBizService.evalIndicators(user));
+    }
+
+    /**
+     * 指标导入模板文件
+     *
+     * @return
+     */
+    @IgnoreAuth
+    @GetMapping("/template-file")
+    @ControllerMethod("指标导入模板文件")
+    public Message<String> evalIndicatorTemplateFile(@CurrentUser LoginAuthBean user,
+                                                     @NotNull(message = "指标编码不能为空") @RequestParam("indicatorCode") String indicatorCode) {
+        return success(evalIndicatorImportBizService.evalIndicatorTemplateFile(user, indicatorCode));
+    }
+
+
+    /**
+     * 展厅美化导入记录分页查询
+     *
+     * @return
+     */
+    @IgnoreAuth
+    @GetMapping("/showroom-page")
+    @ControllerMethod("展厅美化导入记录分页查询")
+    public Message<AppPage<EvalIndicatorImportRecordVO>> showroomImportPage(EvalIndicatorImportScoreQueryDTO dto) {
+        return success(evalIndicatorImportBizService.importPage(dto));
+    }
+
+    /**
+     * 展厅美化导入记录详情查询
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/showroom-import-detail")
+    @ControllerMethod("展厅美化导入记录详情查询")
+    public Message<EvalIndicatorImportVO> scoreImportDetail(@NotNull(message = "录入详情id不能为空") Long id) {
+        return success(evalIndicatorImportBizService.scoreImportDetail(id));
+    }
+
+    /**
+     * 展厅美化导入清单查询
+     *
+     * @return
+     */
+    @IgnoreAuth
+    @GetMapping("/showroom-detail")
+    @ControllerMethod("展厅美化导入清单查询")
+    public Message<AppPage<EvalIndicatorImportDetailScoreVO>> showroomImportDetailPage(@Validated EvalIndicatorImportScoreQueryDTO dto) {
+        return success(evalIndicatorImportBizService.showroomImportDetailPage(dto));
+    }
+
+    /**
+     * 上传展厅美化数据
+     */
+    @IgnoreAuth
+    @PostMapping("/analysis-file/showroom-shop")
+    @ControllerMethod("上传展厅美化数据")
+    public Message<EvalIndicatorImportVO> analysisStaffExcel(@RequestParam("file") MultipartFile file,
+                                                             @RequestParam("indicatorCode") String indicatorCode,
+                                                             @CurrentUser LoginAuthBean user) {
+        if (file.isEmpty()) {
+            throw new BusinessException("请上传文件");
+        }
+        return success(evalIndicatorImportBizService.uploadShowroomMonthlyData(null,  file, indicatorCode, user));
+    }
+
+    /**
+     * 上传展厅美化数据——fid
+     */
+    @IgnoreAuth
+    @GetMapping("/analysis/showroom-shop")
+    @ControllerMethod("上传展厅美化数据")
+    public Message<EvalIndicatorImportVO> uploadShowroomMonthlyData(@RequestParam("fid") String fid,
+                                                                    @RequestParam("indicatorCode") String indicatorCode,
+                                                                    @CurrentUser LoginAuthBean user) {
+        if (PublicUtil.isEmpty(fid)) {
+            throw new BusinessException("请上传文件");
+        }
+        return success(evalIndicatorImportBizService.uploadShowroomMonthlyData(fid, null, indicatorCode, user));
+    }
+
+
+    /**
+     * 保存展厅美化数据
+     *
+     * @return
+     */
+    @GetMapping("/save-showroom-import")
+    @ControllerMethod("保存上传人员数据")
+    public Message<Void> saveShowroomImportData(String key, @CurrentUser LoginAuthBean user) {
+        if (PublicUtil.isEmpty(key)) {
+            throw new BusinessException("参数错误");
+        }
+        evalIndicatorImportBizService.saveShowroomImportData(key, user);
+        return success();
+    }
+
+    /**
+     * 删除导入审批
+     *
+     * @return
+     */
+    @GetMapping("/del-import")
+    @ControllerMethod("删除导入审批")
+    public Message<Void> del(@NotNull(message = "草稿id不能为空") Long id,
+                                     @CurrentUser LoginAuthBean currentUser) {
+        evalIndicatorReportService.delImport(id, currentUser);
+        return success();
+    }
+
+    /**
+     * 撤销审批
+     *
+     * @return
+     */
+    @GetMapping("/cancel")
+    @ControllerMethod("撤销审批")
+    public Message<Void> cancelDraft(@NotNull(message = "草稿id不能为空") Long id,
+                                     @CurrentUser LoginAuthBean currentUser) {
+        evalIndicatorReportService.cancelDraft(id, currentUser);
+        return success();
+    }
+
+    /**
+     * 月度导入情况
+     *
+     * @return
+     */
+    @GetMapping("/month-import-data")
+    @ControllerMethod("月度导入情况")
+    public Message<List<IndicatorImportSituationVO>> monthImportData(@Validated EvalIndicatorImportSituationQueryDTO dto,
+                                                                     @CurrentUser LoginAuthBean currentUser) {
+        if (PublicUtil.isEmpty(currentUser) || PublicUtil.isEmpty(currentUser.getUserId())) {
+            return success();
+        }
+
+        return success(evalIndicatorValueBizService.getIndicatorImportSituation(dto.getMonthly(), Boolean.FALSE, currentUser));
+    }
+
+    /**
+     * 阶段导入情况
+     *
+     * @return
+     */
+    @GetMapping("/stage-import-data")
+    @ControllerMethod("阶段导入情况")
+    public Message<List<IndicatorImportSituationVO>> stageImportData(@Validated EvalIndicatorImportSituationQueryDTO dto,
+                                                                     @CurrentUser LoginAuthBean currentUser) {
+        if (PublicUtil.isEmpty(currentUser) || PublicUtil.isEmpty(currentUser.getUserId())) {
+            return success();
+        }
+        return success(evalIndicatorValueBizService.getIndicatorImportSituation(dto.getMonthly(), Boolean.TRUE, currentUser));
+    }
+
+    /**
+     * 自定义指标列表
+     */
+    @GetMapping("/custom-indicators")
+    @ControllerMethod("自定义指标列表")
+    public Message<List<EvalIndicatorResult>> customIndicators(String indicatorName, @CurrentUser LoginAuthBean currentUser) {
+        return success(evalIndicatorBizService.customIndicators(indicatorName, currentUser.getGroupId()));
+    }
+
+}
@@ -5,6 +5,7 @@ import cn.fw.data.base.domain.common.Message;
 import cn.fw.ehr.sdk.api.mq.StaffLeaveEvent;
 import cn.fw.morax.common.config.SpecialIndicatorCodeVal;
 import cn.fw.morax.common.pojo.event.ImportEvalIndicatorEvent;
+import cn.fw.morax.common.pojo.event.ImportEvalIndicatorScoreEvent;
 import cn.fw.morax.common.utils.DateUtil;
 import cn.fw.morax.common.utils.PublicUtil;
 import cn.fw.morax.domain.db.eval.EvalIndicatorImportRecord;
@@ -27,6 +28,7 @@ import cn.fw.morax.service.biz.BusinessSysReportBizService;
 import cn.fw.morax.service.biz.CommonService;
 import cn.fw.morax.service.biz.kpi.*;
 import cn.fw.morax.service.component.EvalIndicatorSaveObserver;
+import cn.fw.morax.service.component.EvalIndicatorScoreSaveObserver;
 import cn.fw.morax.service.data.eval.EvalIndicatorImportRecordService;
 import cn.fw.morax.service.data.kpi.*;
 import cn.fw.oop.sdk.dto.InvalidShopEvent;
@@ -74,6 +76,7 @@ public class KpiDebugController {
     private final CommonService commonService;
     private final GenericTask genericTask;
     private final EvalIndicatorSaveObserver evalIndicatorSaveObserver;
+    private final EvalIndicatorScoreSaveObserver evalIndicatorScoreSaveObserver;
     private final EvalIndicatorImportRecordService evalIndicatorImportRecordService;
     private final KpiGroupUserService kpiGroupUserService;
     private final KpiGroupService kpiGroupService;
@@ -124,6 +127,20 @@ public class KpiDebugController {
         return success();
     }
  
+    @GetMapping("/save-eval-import-score")
+    @ControllerMethod("保存导入的展厅美化得分指标")
+    public Message<Void> saveEvalIndicatorScore(Long evalIndicatorImportRecordId) {
+        EvalIndicatorImportRecord record = evalIndicatorImportRecordService.getById(evalIndicatorImportRecordId);
+        if (PublicUtil.isEmpty(record)) {
+            return success();
+        }
+        ImportEvalIndicatorScoreEvent event = new ImportEvalIndicatorScoreEvent();
+        event.setEvalIndicatorImportRecordId(record.getId());
+        event.setGroupId(record.getGroupId());
+        evalIndicatorScoreSaveObserver.saveEvalIndicator(event);
+        return success();
+    }
+
     @GetMapping("/dealHistoryDataKpiGroupUser")
     @ControllerMethod("历史数据KpiGroupUser状态处理")
     public Message<Void> dealHistoryDataKpiGroupUser(@RequestParam(required = false) Long groupId,
@@ -9,7 +9,6 @@ import cn.fw.morax.service.data.salary.SalaryGeneralSettinService;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -29,6 +28,7 @@ import java.util.List;
 @Slf4j
 @RequiredArgsConstructor
 public class CheckCommandLineRunner implements CommandLineRunner {
+    private final EvalIndicatorScoreSaveObserver evalIndicatorScoreSaveObserver;
     private final SalaryGeneralSettinService salaryGeneralSettinService;
     private final EvalIndicatorSaveObserver evalIndicatorSaveObserver;
     private final KpiStarAdjustmentObserver kpiStarAdjustmentObserver;
@@ -51,6 +51,7 @@ public class CheckCommandLineRunner implements CommandLineRunner {
      * 注册监听器
      */
     public void registerObserver() {
+        EventBusUtil.asyncRegister(evalIndicatorScoreSaveObserver);
         EventBusUtil.asyncRegister(kpiStarAdjustmentObserver);
         EventBusUtil.asyncRegister(paySalaryObserver);
         EventBusUtil.asyncRegister(kpiGroupChangeObserver);
@@ -95,4 +95,4 @@ menu-resource:
   report-kpi-assess: "cIQsM93169"
  
 trade-company:
-  tax-type: 121
 \ No newline at end of file
+  tax-type: 121
@@ -460,6 +460,7 @@ public class ApprovalBizService {
         conditions.add(commonService.createShopTypes(shopIds));
         Map extDataMap = new HashMap<String, Object>() {{
             put("evalIndicatorImportRecordId", record.getId());
+            put("importType", record.getImportType().getValue());
         }};
         FlowDto flowDto = FlowDto.builder()
                 .groupId(user.getGroupId())
@@ -3,10 +3,13 @@ package cn.fw.morax.service.biz;
 import cn.fw.common.exception.BusinessException;
 import cn.fw.morax.common.config.DicKeyCofigProperties;
 import cn.fw.morax.common.config.SpecialIndicatorCodeVal;
+import cn.fw.morax.common.utils.DateUtil;
 import cn.fw.morax.common.utils.PublicUtil;
 import cn.fw.morax.rpc.ehr.EhrRpcService;
 import cn.fw.morax.rpc.ehr.dto.PostInfoDTO;
 import cn.fw.morax.rpc.erp.ErpRpcService;
+import cn.fw.morax.rpc.erp.dto.HRoleAuthRangeDayVO;
+import cn.fw.morax.rpc.erp.dto.HRoleAuthRangeVO;
 import cn.fw.morax.rpc.file.FileRpcService;
 import cn.fw.morax.rpc.oop.OopRpcService;
 import cn.fw.morax.service.biz.kpi.KpiDictBizService;
@@ -21,6 +24,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
  
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -90,4 +96,32 @@ public class RpcCommonService {
         return matchPostInfos.get(0);
     }
  
+    /**
+     * 角色月度授权情况
+     */
+    public List<HRoleAuthRangeDayVO> roleMonthlyAuthDay(final Long groupId, final LocalDate calcDate, final String roleCode, final List<Long> shopIds) {
+        final LocalDate monthlyFirstDate = calcDate.with(TemporalAdjusters.firstDayOfMonth());
+        List<HRoleAuthRangeDayVO> rangeDayVos = new ArrayList<>();
+        List<HRoleAuthRangeVO> hRoleAuthRangeVos = erpRpcService.queryRoleHistoryAuthRange(groupId, shopIds, roleCode, calcDate);
+        for (HRoleAuthRangeVO hRoleAuthRangeVO : hRoleAuthRangeVos) {
+            HRoleAuthRangeDayVO rangeDayVo = PublicUtil.copy(hRoleAuthRangeVO, HRoleAuthRangeDayVO.class);
+            LocalDate authStartTime = DateUtil.date2LocalDate(hRoleAuthRangeVO.getStartTime());
+            rangeDayVo.setStartTime(authStartTime);
+            //角色授权开始时间 在 月度开始时间之前
+            if (monthlyFirstDate.compareTo(authStartTime) > 0) {
+                rangeDayVo.setStartTime(monthlyFirstDate);
+            }
+            //角色授权结束时间 在 计算日期之后
+            LocalDate authEndTime = DateUtil.date2LocalDate(hRoleAuthRangeVO.getEndTime());
+            rangeDayVo.setEndTime(authEndTime);
+            if (authEndTime.compareTo(calcDate) > 0) {
+                rangeDayVo.setEndTime(calcDate);
+            }
+            Long authDays = rangeDayVo.getStartTime().until(rangeDayVo.getEndTime(), ChronoUnit.DAYS);
+            rangeDayVo.setAuthDays(authDays);
+            rangeDayVos.add(rangeDayVo);
+        }
+        return rangeDayVos;
+    }
+
 }
@@ -358,6 +358,12 @@ public class EvalIndicatorBizService {
                 break;
             }
         }
+        if (PublicUtil.isNotEmpty(dto.getRoleCodes())) {
+            indicators.setRoleCodes(dto.getRoleCodes());
+        }
+        if (PublicUtil.isNotEmpty(dto.getRoleNames())) {
+            indicators.setRoleNames(dto.getRoleNames());
+        }
         return indicators;
     }
  
+package cn.fw.morax.service.biz.eval;
+
+import cn.fw.common.exception.BusinessException;
+import cn.fw.common.web.auth.LoginAuthBean;
+import cn.fw.morax.common.constant.ExcelConstant;
+import cn.fw.morax.common.utils.DateUtil;
+import cn.fw.morax.common.utils.ExcelDataUtil;
+import cn.fw.morax.common.utils.PublicUtil;
+import cn.fw.morax.domain.db.eval.EvalIndicator;
+import cn.fw.morax.domain.db.eval.EvalIndicatorValue;
+import cn.fw.morax.domain.db.salary.SalaryGeneralSettin;
+import cn.fw.morax.domain.enums.DataTimeTypeEnum;
+import cn.fw.morax.domain.enums.DimensionTypeEnum;
+import cn.fw.morax.domain.vo.eval.ShowroomScoreImportValueVO;
+import cn.fw.morax.rpc.file.FileRpcService;
+import cn.fw.morax.rpc.file.dto.DfsFileDTO;
+import cn.fw.morax.rpc.oop.OopRpcService;
+import cn.fw.morax.rpc.oop.dto.ShopDTO;
+import cn.fw.morax.service.data.eval.EvalIndicatorService;
+import cn.fw.morax.service.data.eval.EvalIndicatorValueService;
+import cn.fw.morax.service.data.salary.SalaryGeneralSettinService;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.time.temporal.TemporalAdjusters;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author jiangchao
+ * @des:
+ * @date 2024/3/25 17:58
+ */
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class EvalIndicatorCommonService {
+
+    private final SalaryGeneralSettinService salaryGeneralSettinService;
+    private final EvalIndicatorValueService evalIndicatorValueService;
+    private final EvalIndicatorService evalIndicatorService;
+    private final FileRpcService fileRpcService;
+    private final OopRpcService oopRpcService;
+
+    /**
+     * 解析excel Fid
+     */
+    public <T> List<T> analysisExcelFid(String fid, Integer startRowIndex, Map<Integer, String> headerAlias, Class<T> tClass) {
+        List<T> indicatorValues = new ArrayList<>();
+        DfsFileDTO dfsFile = fileRpcService.download(fid);
+        if (PublicUtil.isEmpty(dfsFile)) {
+            throw new BusinessException("文件下载失败");
+        }
+        try {
+            XSSFWorkbook wb = new XSSFWorkbook(new ByteArrayInputStream(dfsFile.getData()));
+            indicatorValues = ExcelDataUtil.analysisExcel(wb, tClass, headerAlias, startRowIndex);
+        } catch (IOException e) {
+            log.error("", e);
+        }
+        return indicatorValues;
+    }
+
+    /**
+     * 解析excel Fid
+     */
+    public <T> List<T> analysisExcelFid(MultipartFile file, Integer startRowIndex, Map<Integer, String> headerAlias, Class<T> tClass) {
+        List<T> indicatorValues = new ArrayList<>();
+        try {
+            XSSFWorkbook wb = new XSSFWorkbook(file.getInputStream());
+            indicatorValues = ExcelDataUtil.analysisExcel(wb, tClass, headerAlias, startRowIndex);
+        } catch (IOException e) {
+            log.error("", e);
+        }
+        return indicatorValues;
+    }
+
+    public Map<String, ShopDTO> getShopNameMap(LoginAuthBean user) {
+        List<ShopDTO> shops = oopRpcService.queryGroupShops(user.getGroupId());
+        Map<String, ShopDTO> evalShopPoolMap = shops.stream()
+                .collect(Collectors.toMap(ShopDTO::getShortName, Function.identity(), (v1, v2) -> v1));
+        return evalShopPoolMap;
+    }
+
+    public Map<String, EvalIndicator> getNameIndicatorMap(Long groupId) {
+        List<EvalIndicator> evalIndicators = evalIndicatorService.list(Wrappers.<EvalIndicator>lambdaQuery()
+                .eq(EvalIndicator::getYn, Boolean.TRUE)
+                .eq(EvalIndicator::getGroupId, groupId)
+                .eq(EvalIndicator::getEnable, Boolean.TRUE)
+        );
+        Map<String, EvalIndicator> evalIndicatorMap = evalIndicators.stream()
+                .collect(Collectors.toMap(EvalIndicator::getName, Function.identity(), (v1, v2) -> v1));
+        return evalIndicatorMap;
+    }
+
+    public DataTimeTypeEnum getExcelType(XSSFSheet sheet) {
+        XSSFRow firstRow = sheet.getRow(0);
+        for (int j = 0, cellSize = firstRow.getLastCellNum(); j < cellSize; j++) {
+            XSSFCell xssfCell = firstRow.getCell(j);
+            if (CellType.STRING.equals(xssfCell.getCellType()) &&
+                    ExcelConstant.STAGE_INDICATOR_EXCEL_IDENTITY_HEADER_NAMES.contains(xssfCell.getStringCellValue())) {
+                return DataTimeTypeEnum.STAGE;
+            }
+        }
+        return DataTimeTypeEnum.MONTHLY;
+    }
+
+    public LocalDate convertMonthlyDate(LocalDate importDate) {
+        //当前月，为今天的数据
+        if (YearMonth.now().equals(YearMonth.from(importDate))) {
+            //不是一号
+            if (importDate.getDayOfMonth() == 1) {
+                return LocalDate.now();
+            }
+            return LocalDate.now().minusDays(1);
+        } else {
+            //之前月，取最后一天
+            return importDate.with(TemporalAdjusters.lastDayOfMonth());
+        }
+    }
+
+    public Date importApprovalExpTime(Long groupId) {
+        SalaryGeneralSettin settin = salaryGeneralSettinService.getByGroup(groupId);
+        if (PublicUtil.isNotEmpty(settin) && PublicUtil.isNotEmpty(settin.getPaymentDate())) {
+            LocalDate expTime = PublicUtil.getDayOfMonth(YearMonth.now().plusMonths(1), settin.getPaymentDate());
+//            LocalDate expTime = LocalDate.now().withDayOfMonth(settin.getPaymentDate()).plusMonths(1);
+            return DateUtil.localDateTime2Date(expTime.atTime(23, 59, 59));
+        }
+        return DateUtil.localDateTime2Date(LocalDate.now().atTime(23, 59, 59));
+    }
+
+    /**
+     * 保存数据
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void saveIndicatorValue(List<EvalIndicatorValue> evalIndicatorValues) {
+        //删除当天重复数据
+        for (EvalIndicatorValue evalIndicatorValue : evalIndicatorValues) {
+            List<EvalIndicatorValue> repeatIndicatorValues = evalIndicatorValueService.list(Wrappers.<EvalIndicatorValue>lambdaQuery()
+                    .eq(EvalIndicatorValue::getUserId, evalIndicatorValue.getUserId())
+                    .eq(EvalIndicatorValue::getShopId, evalIndicatorValue.getShopId())
+                    .eq(EvalIndicatorValue::getIndicatorCode, evalIndicatorValue.getIndicatorCode())
+                    .eq(EvalIndicatorValue::getDataDate, evalIndicatorValue.getDataDate())
+                    .eq(EvalIndicatorValue::getDimensionType, evalIndicatorValue.getDimensionType())
+                    .eq(EvalIndicatorValue::getYn, Boolean.TRUE)
+                    .select(EvalIndicatorValue::getId)
+            );
+            if (PublicUtil.isNotEmpty(repeatIndicatorValues)) {
+                evalIndicatorValueService.removeByIds(repeatIndicatorValues.stream().map(EvalIndicatorValue::getId).collect(Collectors.toList()));
+            }
+        }
+        evalIndicatorValueService.insertBatchSomeColumn(evalIndicatorValues);
+    }
+
+}
+package cn.fw.morax.service.biz.eval;
+
+import cn.fw.common.data.mybatis.pagination.PageData;
+import cn.fw.common.exception.BusinessException;
+import cn.fw.common.page.AppPage;
+import cn.fw.common.web.auth.LoginAuthBean;
+import cn.fw.common.web.auth.annotation.CurrentUser;
+import cn.fw.morax.common.config.EvalIndicatorVal;
+import cn.fw.morax.common.utils.MessageFormatUtil;
+import cn.fw.morax.common.utils.PublicUtil;
+import cn.fw.morax.domain.db.TemplateFile;
+import cn.fw.morax.domain.db.eval.*;
+import cn.fw.morax.domain.dto.query.EvalIndicatorImportScoreQueryDTO;
+import cn.fw.morax.domain.enums.*;
+import cn.fw.morax.domain.vo.eval.*;
+import cn.fw.morax.rpc.oop.dto.ShopDTO;
+import cn.fw.morax.service.biz.ApprovalBizService;
+import cn.fw.morax.service.data.TemplateFileService;
+import cn.fw.morax.service.data.eval.*;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.map.MultiKeyMap;
+import org.springframework.data.redis.core.BoundValueOperations;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import static cn.fw.common.businessvalidator.Validator.BV;
+
+/**
+ * @author jiangchao
+ * @des:
+ * @date 2024/3/22 17:19
+ */
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class EvalIndicatorImportBizService {
+
+    private final EvalIndicatorImportDetailScoreService evalIndicatorImportDetailScoreService;
+    private final EvalIndicatorImportRecordService evalIndicatorImportRecordService;
+    private final EvalIndicatorImportMenuService evalIndicatorImportMenuService;
+    private final EvalIndicatorCommonService evalIndicatorCommonService;
+    private final EvalIndicatorService evalIndicatorService;
+    private final StringRedisTemplate stringRedisTemplate;
+    private final TemplateFileService templateFileService;
+    private final ApprovalBizService approvalBizService;
+    private final EvalIndicatorVal evalIndicatorVal;
+
+    /**
+     * 数据导入指标列表
+     */
+    public List<EvalIndicatorVO> evalIndicators(LoginAuthBean user) {
+        final Long groupId = user.getGroupId();
+        List<EvalIndicatorImportMenu> evalIndicatorMenus = evalIndicatorImportMenuService.list(Wrappers.<EvalIndicatorImportMenu>lambdaQuery()
+                .eq(EvalIndicatorImportMenu::getGroupId, groupId)
+                .eq(EvalIndicatorImportMenu::getYn, Boolean.TRUE)
+        );
+        if (PublicUtil.isEmpty(evalIndicatorMenus)) {
+            return new ArrayList<>();
+        }
+        List<String> evalIndicatorCodes = evalIndicatorMenus.stream().map(EvalIndicatorImportMenu::getIndicatorCode).collect(Collectors.toList());
+        List<EvalIndicator> evalIndicators = evalIndicatorService.list(Wrappers.<EvalIndicator>lambdaQuery()
+                .in(EvalIndicator::getCode, evalIndicatorCodes)
+                .eq(EvalIndicator::getYn, Boolean.TRUE)
+        );
+        if (PublicUtil.isEmpty(evalIndicators)) {
+            return new ArrayList<>();
+        }
+        List<EvalIndicatorVO> evalIndicatorVos = PublicUtil.copyList(evalIndicators, EvalIndicatorVO.class);
+        return evalIndicatorVos;
+    }
+
+    /**
+     * 数据导入指标列表
+     */
+    public String evalIndicatorTemplateFile(LoginAuthBean user, String indicatorCode)  {
+        final Long groupId = user.getGroupId();
+        TemplateFile templateFile = templateFileService.getOne(Wrappers.<TemplateFile>lambdaQuery()
+                .eq(TemplateFile::getTag, indicatorCode)
+                .eq(TemplateFile::getType, TemplateFileTypeEnum.EVAL_INDICATOR)
+                .eq(TemplateFile::getGroupId, groupId)
+                .eq(TemplateFile::getYn, Boolean.TRUE)
+                , Boolean.FALSE
+        );
+        if (PublicUtil.isEmpty(templateFile)) {
+            return null;
+        }
+        return templateFile.getFid();
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param dto
+     * @return
+     */
+    public AppPage<EvalIndicatorImportRecordVO> importPage(EvalIndicatorImportScoreQueryDTO dto) {
+        final YearMonth monthly = dto.getMonthly();
+        LocalDate startTime = (PublicUtil.isNotEmpty(monthly)) ? monthly.atDay(1) : null;
+        LocalDate endTime = (PublicUtil.isNotEmpty(monthly)) ? monthly.atEndOfMonth() : null;
+        PageData<EvalIndicatorImportRecord> pageData = evalIndicatorImportRecordService.page(new PageData<>(dto.getCurrent(), dto.getPageSize()),
+                Wrappers.<EvalIndicatorImportRecord>lambdaQuery()
+                        .eq(PublicUtil.isNotEmpty(dto.getUserId()), EvalIndicatorImportRecord::getImportUserId, dto.getUserId())
+                        .apply(PublicUtil.isNotEmpty(dto.getShopId()), MessageFormatUtil.transferWithQuotationMarks("FIND_IN_SET({0}, shop_ids)", dto.getShopId()))
+                        .eq(PublicUtil.isNotEmpty(dto.getIndicatorCode()), EvalIndicatorImportRecord::getIndicatorCode, dto.getIndicatorCode())
+                        .ge(PublicUtil.isNotEmpty(startTime), EvalIndicatorImportRecord::getDataDate, startTime)
+                        .le(PublicUtil.isNotEmpty(endTime), EvalIndicatorImportRecord::getDataDate, endTime)
+                        .eq(EvalIndicatorImportRecord::getImportType, EvalIndicatorImportTypeEnum.SCORE_ORIGIN_VALUE)
+                        .eq(EvalIndicatorImportRecord::getYn, Boolean.TRUE)
+                        .eq(EvalIndicatorImportRecord::getGroupId, dto.getGroupId())
+                        .orderByDesc(EvalIndicatorImportRecord::getCreateTime)
+        );
+        return PublicUtil.toPage(pageData, importRecord -> {
+            EvalIndicatorImportRecordVO importRecordVO = PublicUtil.copy(importRecord, EvalIndicatorImportRecordVO.class);
+            return importRecordVO;
+        });
+    }
+
+    /**
+     * 展厅梅花导入数据分页查询
+     *
+     * @param dto
+     * @return
+     */
+    public AppPage<EvalIndicatorImportDetailScoreVO> showroomImportDetailPage(EvalIndicatorImportScoreQueryDTO dto) {
+        final YearMonth monthly = dto.getMonthly();
+        LocalDate startTime = (PublicUtil.isNotEmpty(monthly)) ? monthly.atDay(1) : null;
+        LocalDate endTime = (PublicUtil.isNotEmpty(monthly)) ? monthly.atEndOfMonth() : null;
+        PageData<EvalIndicatorImportDetailScore> pageData = evalIndicatorImportDetailScoreService.page(new PageData<>(dto.getCurrent(), dto.getPageSize()),
+                Wrappers.<EvalIndicatorImportDetailScore>lambdaQuery()
+                        .eq(PublicUtil.isNotEmpty(dto.getIndicatorCode()), EvalIndicatorImportDetailScore::getIndicatorCode, dto.getIndicatorCode())
+                        .eq(PublicUtil.isNotEmpty(dto.getShopId()), EvalIndicatorImportDetailScore::getShopId, dto.getShopId())
+                        .ge(PublicUtil.isNotEmpty(startTime), EvalIndicatorImportDetailScore::getDataDate, startTime)
+                        .le(PublicUtil.isNotEmpty(endTime), EvalIndicatorImportDetailScore::getDataDate, endTime)
+                        .isNull(EvalIndicatorImportDetailScore::getErrorType)
+                        .eq(EvalIndicatorImportDetailScore::getValid, Boolean.TRUE)
+                        .eq(EvalIndicatorImportDetailScore::getYn, Boolean.TRUE)
+        );
+
+        return PublicUtil.toPage(pageData, importDetailScore -> {
+            EvalIndicatorImportDetailScoreVO importDetailScoreVO = PublicUtil.copy(importDetailScore, EvalIndicatorImportDetailScoreVO.class);
+            return importDetailScoreVO;
+        });
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public EvalIndicatorImportVO uploadShowroomMonthlyData(String fid, MultipartFile file, String indicatorCode, LoginAuthBean user) {
+        final DataTimeTypeEnum dataTimeType = DataTimeTypeEnum.MONTHLY;
+        final Long groupId = user.getGroupId();
+        EvalIndicator evalIndicator = evalIndicatorService.queryByCode(indicatorCode, Boolean.FALSE);
+        BV.notNull(evalIndicator, "展厅美化指标不存在，请重试");
+        List<YearMonth> importValidMonthlies = new ArrayList<YearMonth>() {{
+            add(YearMonth.now());
+            add(YearMonth.now().minusMonths(1));
+        }};
+
+        final Map<String, ShopDTO> shopMap = evalIndicatorCommonService.getShopNameMap(user);
+        Map<Integer, String> headerAlias = this.getShopHeaderNameMap(dataTimeType);
+        List<ShowroomScoreImportValueVO> indicatorValues = null;
+        if (PublicUtil.isNotEmpty(fid)) {
+            indicatorValues = evalIndicatorCommonService.analysisExcelFid(fid, 1, headerAlias, ShowroomScoreImportValueVO.class);
+        } else {
+            indicatorValues = evalIndicatorCommonService.analysisExcelFid(file, 1, headerAlias, ShowroomScoreImportValueVO.class);
+        }
+        MultiKeyMap<String, String> repeatMap = new MultiKeyMap<>();
+        Set<Long> shopIds = new HashSet<>();
+        List<EvalIndicatorImportDetailScore> details = new ArrayList<>();
+        Integer errorNum = 0;
+        for (ShowroomScoreImportValueVO shop : indicatorValues) {
+            EvalIndicatorImportDetailScore importDetailScore = this.convertShopPo(shop, evalIndicator, groupId);
+            details.add(importDetailScore);
+            if (PublicUtil.isEmpty(shop.getMonthlyDate())) {
+                importDetailScore.setErrorType(ImportErrorReasonEnum.TIME_ERROR);
+                errorNum += 1;
+                continue;
+            }
+            String monthly = DateTimeFormatter.ofPattern("yyyy-MM").format(shop.getMonthlyDate());
+            //1. 校验是否重复
+            if (repeatMap.containsKey(shop.getShopName(), shop.getGraderStaffName(), monthly)) {
+                importDetailScore.setErrorType(ImportErrorReasonEnum.REPETITION);
+                errorNum += 1;
+                continue;
+            }
+            repeatMap.put(shop.getShopName(), shop.getGraderStaffName(), monthly, "");
+            if (! shopMap.containsKey(shop.getShopName())) {
+                importDetailScore.setErrorType(ImportErrorReasonEnum.NO_MATCH_SHOP);
+                errorNum += 1;
+                continue;
+            }
+            //只能导入近两月的指标数据
+            if (PublicUtil.isEmpty(importDetailScore.getDataDate()) || (! importValidMonthlies.contains(YearMonth.from(importDetailScore.getDataDate())))) {
+                importDetailScore.setErrorType(ImportErrorReasonEnum.TIME_ERROR);
+                errorNum += 1;
+                continue;
+            }
+            ShopDTO shopDTO = shopMap.get(shop.getShopName());
+            shopIds.add(shopDTO.getId());
+            importDetailScore.setShopId(shopDTO.getId());
+        }
+        EvalIndicatorImportRecord importRecord = this.createRecord(details, evalIndicator, user, DimensionTypeEnum.SHOP);
+        importRecord.setErrorNum(errorNum);
+        importRecord.setNum(indicatorValues.size());
+        importRecord.setSuccessNum(indicatorValues.size() - errorNum);
+        importRecord.setDataTimeType(dataTimeType);
+        importRecord.setShopIds(new ArrayList<>(shopIds));
+
+        String key = PublicUtil.getUUID() + user.getUserId();
+        stringRedisTemplate.opsForValue().set(evalIndicatorVal.getEvalShowroomBeautificationImport() + key, JSON.toJSONString(importRecord), 1 , TimeUnit.DAYS);
+        stringRedisTemplate.opsForValue().set(evalIndicatorVal.getEvalShowroomBeautificationImportDetail() + key, JSON.toJSONString(details), 1 , TimeUnit.DAYS);
+
+        EvalIndicatorImportVO<EvalIndicatorImportDetailScore> recordVO = PublicUtil.copy(importRecord, EvalIndicatorImportVO.class);
+        recordVO.setDetails(details);
+        recordVO.setKey(key);
+        return recordVO;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void saveShowroomImportData(String key, LoginAuthBean user) {
+        BoundValueOperations<String, String> importOperation = stringRedisTemplate.boundValueOps(evalIndicatorVal.getEvalShowroomBeautificationImport() + key);
+        BoundValueOperations<String, String> importDetailOperation = stringRedisTemplate.boundValueOps(evalIndicatorVal.getEvalShowroomBeautificationImportDetail() + key);
+        String json = importOperation.get();
+        String detailJson = importDetailOperation.get();
+        if (PublicUtil.isEmpty(json) || PublicUtil.isEmpty(detailJson)) {
+            log.error("考评指标导入，redis数据为空,key {},", evalIndicatorVal.getEvalImport() + key);
+            throw new BusinessException("请求超时，请重新上传");
+        }
+        EvalIndicatorImportRecord record = JSON.parseObject(json, EvalIndicatorImportRecord.class);
+        final Set<String> uploadIndicatorCodes = new HashSet<String>(){{add(record.getIndicatorCode());}};
+        record.setStatus(SettingDraftStatusEnum.RELEASE_APPROVAL);
+        List<EvalIndicatorImportDetailScore> details = JSON.parseArray(detailJson, EvalIndicatorImportDetailScore.class);
+
+        evalIndicatorImportRecordService.save(record);
+        final Long recordId = record.getId();
+        for (EvalIndicatorImportDetailScore detail : details) {
+            detail.setRecordId(recordId);
+            evalIndicatorImportDetailScoreService.save(detail);
+        }
+
+        List<Long> shopIds = details.stream()
+                .filter(detail -> PublicUtil.isNotEmpty(detail.getShopId()) && PublicUtil.isEmpty(detail.getErrorType()))
+                .map(EvalIndicatorImportDetailScore::getShopId)
+                .collect(Collectors.toList());
+        //提交审批
+        Date expTime = evalIndicatorCommonService.importApprovalExpTime(user.getGroupId());
+        String approvalNo = approvalBizService.applyEvalIndicatorImport(record, shopIds, uploadIndicatorCodes, user, expTime);
+        record.setApprovalNo(approvalNo);
+        evalIndicatorImportRecordService.updateById(record);
+
+        //保存到数据库，删除缓存
+        stringRedisTemplate.delete(evalIndicatorVal.getEvalShowroomBeautificationImport() + key);
+        stringRedisTemplate.delete(evalIndicatorVal.getEvalShowroomBeautificationImportDetail() + key);
+    }
+
+    public EvalIndicatorImportVO scoreImportDetail(Long id) {
+        EvalIndicatorImportRecord record = evalIndicatorImportRecordService.getById(id);
+        BV.notNull(record, "考评导入数据记录不能为空");
+
+        List<EvalIndicatorImportDetailScore> importDetailScores = evalIndicatorImportDetailScoreService.list(Wrappers.<EvalIndicatorImportDetailScore>lambdaQuery()
+                .eq(EvalIndicatorImportDetailScore::getRecordId, id)
+                .eq(EvalIndicatorImportDetailScore::getYn, Boolean.TRUE)
+        );
+        List<EvalIndicatorImportDetailScoreVO> detailScoreVos = PublicUtil.copyList(importDetailScores, EvalIndicatorImportDetailScoreVO.class);
+
+        EvalIndicatorImportVO<EvalIndicatorImportDetailScoreVO> recordVO = PublicUtil.copy(record, EvalIndicatorImportVO.class);
+        recordVO.setDetails(detailScoreVos);
+
+        return recordVO;
+    }
+
+    public List<EvalIndicatorImportDetailScoreVO> scoreImportDetails(Long id) {
+        EvalIndicatorImportRecord record = evalIndicatorImportRecordService.getById(id);
+        BV.notNull(record, "考评导入数据记录不能为空");
+
+        List<EvalIndicatorImportDetailScore> importDetailScores = evalIndicatorImportDetailScoreService.list(Wrappers.<EvalIndicatorImportDetailScore>lambdaQuery()
+                .eq(EvalIndicatorImportDetailScore::getRecordId, id)
+                .eq(EvalIndicatorImportDetailScore::getYn, Boolean.TRUE)
+        );
+        List<EvalIndicatorImportDetailScoreVO> detailScoreVos = PublicUtil.copyList(importDetailScores, EvalIndicatorImportDetailScoreVO.class);
+        return detailScoreVos;
+    }
+
+    public EvalIndicatorImportRecord createRecord(List<EvalIndicatorImportDetailScore> details, EvalIndicator evalIndicator, LoginAuthBean user, DimensionTypeEnum dimensionType) {
+        EvalIndicatorImportRecord importRecord = new EvalIndicatorImportRecord();
+        importRecord.setImportType(EvalIndicatorImportTypeEnum.SCORE_ORIGIN_VALUE);
+        importRecord.setImportUserId(user.getUserId());
+        importRecord.setImportUserName(user.getUserName());
+        importRecord.setDimensionType(dimensionType);
+        importRecord.setUploadTime(LocalDate.now());
+        importRecord.setGroupId(user.getGroupId());
+        importRecord.setYn(Boolean.TRUE);
+        LocalDate dataDate = details.stream()
+                .filter(detail -> PublicUtil.isEmpty(detail.getErrorType()) && PublicUtil.isNotEmpty(detail.getDataDate()))
+                .map(EvalIndicatorImportDetailScore::getDataDate)
+                .findFirst().orElse(LocalDate.now());
+        importRecord.setDataDate(dataDate);
+
+        importRecord.setIndicatorName(evalIndicator.getName());
+        importRecord.setIndicatorCode(evalIndicator.getCode());
+        return importRecord;
+    }
+
+    public Map<Integer, String> getShopHeaderNameMap(DataTimeTypeEnum dataTimeType) {
+        if (DataTimeTypeEnum.MONTHLY.equals(dataTimeType)) {
+            Map<Integer, String> headerMap = new HashMap<Integer, String>(){{
+                put(0, "monthlyDate");
+                put(1, "shopName");
+                put(2, "score");
+                put(3, "totalScore");
+                put(4, "graderStaffName");
+            }};
+            return headerMap;
+        }
+        Map<Integer, String> headerMap = new HashMap<Integer, String>(){{
+            put(0, "shopName");
+            put(1, "indicatorName");
+            put(2, "stageIndicatorValue");
+            put(3, "startDataDate");
+            put(4, "endDataDate");
+            put(5, "monthlyIndicatorValue");
+            put(6, "monthlyDate");
+        }};
+        return headerMap;
+    }
+
+    public EvalIndicatorImportDetailScore convertShopPo(ShowroomScoreImportValueVO shopValue, EvalIndicator evalIndicator, Long groupId) {
+        Optional<ShowroomScoreImportValueVO> valueOptional = Optional.ofNullable(shopValue);
+        EvalIndicatorImportDetailScore detail = new EvalIndicatorImportDetailScore();
+        detail.setShopName(valueOptional.map(ShowroomScoreImportValueVO::getShopName).orElse(""));
+        if (PublicUtil.isNotEmpty(shopValue.getMonthlyDate())) {
+            detail.setDataDate(evalIndicatorCommonService.convertMonthlyDate(shopValue.getMonthlyDate()));
+        }
+        detail.setIndicatorCode(evalIndicator.getCode());
+        detail.setIndicatorName(evalIndicator.getName());
+        detail.setValid(Boolean.FALSE);
+        detail.setGroupId(groupId);
+        detail.setScore(shopValue.getScore());
+        detail.setTotalScore(shopValue.getTotalScore());
+        detail.setGraderStaffName(shopValue.getGraderStaffName());
+        return detail;
+    }
+
+
+}
@@ -8,6 +8,7 @@ import cn.fw.morax.common.config.FileVal;
 import cn.fw.morax.common.constant.ExcelConstant;
 import cn.fw.morax.common.pojo.event.ApprovalResultEvent;
 import cn.fw.morax.common.pojo.event.ImportEvalIndicatorEvent;
+import cn.fw.morax.common.pojo.event.ImportEvalIndicatorScoreEvent;
 import cn.fw.morax.common.utils.DateUtil;
 import cn.fw.morax.common.utils.EventBusUtil;
 import cn.fw.morax.common.utils.ExcelDataUtil;
@@ -38,7 +39,6 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.map.MultiKeyMap;
-import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -53,7 +53,6 @@ import org.springframework.web.multipart.MultipartFile;
  
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -79,11 +78,12 @@ public class EvalIndicatorReportService {
  
     private final EvalIndicatorImportRecordService evalIndicatorImportRecordService;
     private final EvalIndicatorImportDetailService evalIndicatorImportDetailService;
-    private final ApprovalRecordService approvalRecordService;
-    private final ApprovalBizService approvalBizService;
+    private final EvalIndicatorImportKeyValueService evalIndicatorImportKeyValueService;
     private final SalaryGeneralSettinService salaryGeneralSettinService;
+    private final ApprovalRecordService approvalRecordService;
     private final EvalIndicatorService evalIndicatorService;
     private final StringRedisTemplate stringRedisTemplate;
+    private final ApprovalBizService approvalBizService;
     private final FlowApproveRpc flowApproveRpc;
     private final EhrRpcService ehrRpcService;
     private final OopRpcService oopRpcService;
@@ -126,6 +126,7 @@ public class EvalIndicatorReportService {
                         .eq(PublicUtil.isNotEmpty(dto.getIndicatorCode()), EvalIndicatorImportRecord::getIndicatorCode, dto.getIndicatorCode())
                         .ge(PublicUtil.isNotEmpty(startTime), EvalIndicatorImportRecord::getCreateTime, startTime)
                         .le(PublicUtil.isNotEmpty(endTime), EvalIndicatorImportRecord::getCreateTime, endTime)
+                        .eq(EvalIndicatorImportRecord::getImportType, EvalIndicatorImportTypeEnum.VALUE)
                         .eq(EvalIndicatorImportRecord::getYn, Boolean.TRUE)
                         .eq(EvalIndicatorImportRecord::getGroupId, dto.getGroupId())
                         .orderByDesc(EvalIndicatorImportRecord::getCreateTime)
@@ -181,7 +182,15 @@ public class EvalIndicatorReportService {
                 if (indicatorUnitMap.containsKey(detailVO.getIndicatorCode())) {
                     detailVO.setUnit(indicatorUnitMap.get(detailVO.getIndicatorCode()));
                 }
-//                detailVO.convertToPercent();
+                //key value
+                List<EvalIndicatorImportKeyValue> keyValues = evalIndicatorImportKeyValueService.list(Wrappers.<EvalIndicatorImportKeyValue>lambdaQuery()
+                        .eq(EvalIndicatorImportKeyValue::getEvalIndicatorImportDetailId, detailVO.getId())
+                        .eq(EvalIndicatorImportKeyValue::getYn, Boolean.TRUE)
+                );
+                if (PublicUtil.isNotEmpty(keyValues)) {
+                    List<EvalIndicatorImportKeyValueVO> keyValueVos = PublicUtil.copyList(keyValues, EvalIndicatorImportKeyValueVO.class);
+                    detailVO.setKeyValues(keyValueVos);
+                }
                 detailVOS.add(detailVO);
             }
         }
@@ -272,7 +281,7 @@ public class EvalIndicatorReportService {
     public EvalIndicatorImportRecordVO uploadStaffIndicator(MultipartFile file, LoginAuthBean user) {
         final Long groupId = user.getGroupId();
         Map<String, EvalIndicator> evalIndicatorMap = this.getNameIndicatorMap(groupId);
-        EvalIndicatorImportRecord importRecord = createRecord(user, DimensionTypeEnum.STAFF);
+        EvalIndicatorImportRecord importRecord = this.createRecord(user, DimensionTypeEnum.STAFF);
         List<EvalIndicatorImportDetail> details = new ArrayList<>();
         DataTimeTypeEnum dataTimeType = DataTimeTypeEnum.MONTHLY;
         List<StaffIndicatorValueVO> indicatorValues = null;
@@ -477,9 +486,17 @@ public class EvalIndicatorReportService {
  
         if (result.getAgree()) {
             //保存指标数据事件
-            ImportEvalIndicatorEvent importEvalIndicatorEvent = new ImportEvalIndicatorEvent(record.getId()
-                    , record.getGroupId());
-            EventBusUtil.asyncPost(importEvalIndicatorEvent);
+            if (PublicUtil.isEmpty(record.getImportType()) || EvalIndicatorImportTypeEnum.VALUE.equals(record.getImportType())) {
+                ImportEvalIndicatorEvent importEvalIndicatorEvent = new ImportEvalIndicatorEvent(record.getId()
+                        , record.getGroupId());
+                EventBusUtil.asyncPost(importEvalIndicatorEvent);
+            }
+            //分数原始数据
+            if (EvalIndicatorImportTypeEnum.SCORE_ORIGIN_VALUE.equals(record.getImportType())) {
+                ImportEvalIndicatorScoreEvent event = new ImportEvalIndicatorScoreEvent(record.getId()
+                        , record.getGroupId());
+                EventBusUtil.asyncPost(event);
+            }
         }
         record.setStatus(draftStatus);
         evalIndicatorImportRecordService.updateById(record);
@@ -607,6 +624,7 @@ public class EvalIndicatorReportService {
     public EvalIndicatorImportRecord createRecord(LoginAuthBean user, DimensionTypeEnum dimensionType) {
         EvalIndicatorImportRecord importRecord = new EvalIndicatorImportRecord();
         importRecord.setImportUserId(user.getUserId());
+        importRecord.setImportType(EvalIndicatorImportTypeEnum.VALUE);
         importRecord.setImportUserName(user.getUserName());
         importRecord.setDimensionType(dimensionType);
         importRecord.setUploadTime(LocalDate.now());
+package cn.fw.morax.service.component;
+
+import cn.fw.morax.common.pojo.event.ImportEvalIndicatorScoreEvent;
+import cn.fw.morax.common.utils.PublicUtil;
+import cn.fw.morax.domain.bo.eval.EvalIndicatorScoreBO;
+import cn.fw.morax.domain.db.eval.*;
+import cn.fw.morax.domain.enums.DataTypeEnum;
+import cn.fw.morax.domain.enums.DimensionTypeEnum;
+import cn.fw.morax.rpc.erp.dto.HRoleAuthRangeDayVO;
+import cn.fw.morax.service.biz.RpcCommonService;
+import cn.fw.morax.service.biz.eval.EvalIndicatorCommonService;
+import cn.fw.morax.service.data.eval.*;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.eventbus.Subscribe;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.time.temporal.TemporalAdjusters;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class EvalIndicatorScoreSaveObserver {
+
+    private final RpcCommonService rpcCommonService;
+    private final EvalIndicatorService evalIndicatorService;
+    private final EvalIndicatorCommonService evalIndicatorCommonService;
+    private final EvalIndicatorImportRecordService evalIndicatorImportRecordService;
+    private final EvalIndicatorImportDetailScoreService evalIndicatorImportDetailScoreService;
+
+    /**
+     * 保存导入的考评指标
+     *
+     * @param event
+     */
+    @Subscribe
+    @Transactional(rollbackFor = Exception.class)
+    public void saveEvalIndicator(ImportEvalIndicatorScoreEvent event) {
+        //睡10秒保证数据落库
+        try {
+            Thread.sleep(10 * 1000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        final Long recordId = event.getEvalIndicatorImportRecordId();
+        EvalIndicatorImportRecord importRecord = evalIndicatorImportRecordService.getById(recordId);
+        final String indicatorCode = importRecord.getIndicatorCode();
+        EvalIndicator evalIndicator = evalIndicatorService.queryByCode(importRecord.getIndicatorCode(), Boolean.FALSE);
+        final Long groupId = importRecord.getGroupId();
+        List<EvalIndicatorImportDetailScore> detailScores = evalIndicatorImportDetailScoreService.list(Wrappers.<EvalIndicatorImportDetailScore>lambdaQuery()
+                .eq(EvalIndicatorImportDetailScore::getRecordId, recordId)
+                .isNull(EvalIndicatorImportDetailScore::getErrorType)
+                .eq(EvalIndicatorImportDetailScore::getYn, Boolean.TRUE)
+        );
+
+        Set<YearMonth> monthlies = new HashSet<>();
+        for (EvalIndicatorImportDetailScore showroomBeautifyScore : detailScores) {
+            //月度重复数据删除（打分人员一个月 只能打分一次）
+            final LocalDate monthlyFirstDate = showroomBeautifyScore.getDataDate().with(TemporalAdjusters.firstDayOfMonth());
+            List<EvalIndicatorImportDetailScore> repeatScores = evalIndicatorImportDetailScoreService.list(Wrappers.<EvalIndicatorImportDetailScore>lambdaQuery()
+                    .eq(EvalIndicatorImportDetailScore::getIndicatorCode, showroomBeautifyScore.getIndicatorCode())
+                    .le(EvalIndicatorImportDetailScore::getDataDate, showroomBeautifyScore.getDataDate())
+                    .ge(EvalIndicatorImportDetailScore::getDataDate, monthlyFirstDate)
+                    .isNull(EvalIndicatorImportDetailScore::getErrorType)
+                    .eq(EvalIndicatorImportDetailScore::getGraderStaffName, showroomBeautifyScore.getGraderStaffName())
+                    .eq(EvalIndicatorImportDetailScore::getValid, Boolean.TRUE)
+                    .eq(EvalIndicatorImportDetailScore::getGroupId, groupId)
+                    .ne(EvalIndicatorImportDetailScore::getId, showroomBeautifyScore.getId())
+                    .eq(EvalIndicatorImportDetailScore::getYn, Boolean.TRUE)
+            );
+            for (EvalIndicatorImportDetailScore repeatScore : repeatScores) {
+                repeatScore.setValid(Boolean.FALSE);
+                evalIndicatorImportDetailScoreService.updateById(repeatScore);
+            }
+            monthlies.add(YearMonth.from(showroomBeautifyScore.getDataDate()));
+            showroomBeautifyScore.setValid(Boolean.TRUE);
+            evalIndicatorImportDetailScoreService.updateById(showroomBeautifyScore);
+        }
+        //抽取数据
+        for (YearMonth monthly : monthlies) {
+            LocalDate dataDate = YearMonth.now().compareTo(monthly) == 0 ? LocalDate.now() : monthly.atEndOfMonth();
+            List<EvalIndicatorScoreBO> monthlyScoreBos = this.getShopScoreBO(monthly, indicatorCode, dataDate, groupId);
+
+            List<EvalIndicatorValue> shopValues = this.extractShopValue(evalIndicator, dataDate, groupId, monthlyScoreBos);
+            List<EvalIndicatorValue> staffValues = this.extractUserValue(evalIndicator, dataDate, groupId, monthlyScoreBos);
+            evalIndicatorCommonService.saveIndicatorValue(shopValues);
+            evalIndicatorCommonService.saveIndicatorValue(staffValues);
+        }
+    }
+
+    public List<EvalIndicatorScoreBO> getShopScoreBO(YearMonth monthly, String indicatorCode, LocalDate dataDate, Long groupId) {
+        final LocalDate startTime = monthly.atDay(1);
+        final LocalDate endTime = monthly.atEndOfMonth();
+        List<EvalIndicatorImportDetailScore> showroomScores = evalIndicatorImportDetailScoreService.list(Wrappers.<EvalIndicatorImportDetailScore>lambdaQuery()
+                .eq(EvalIndicatorImportDetailScore::getIndicatorCode, indicatorCode)
+                .ge(EvalIndicatorImportDetailScore::getDataDate, startTime)
+                .le(EvalIndicatorImportDetailScore::getDataDate, endTime)
+                .isNull(EvalIndicatorImportDetailScore::getErrorType)
+                .eq(EvalIndicatorImportDetailScore::getValid, Boolean.TRUE)
+                .eq(EvalIndicatorImportDetailScore::getGroupId, groupId)
+                .eq(EvalIndicatorImportDetailScore::getYn, Boolean.TRUE)
+        );
+        //一个门店 多次打分
+        Map<Long, List<EvalIndicatorImportDetailScore>> shopMonthlyShowroomScoreMap = showroomScores.stream().
+                collect(Collectors.groupingBy(EvalIndicatorImportDetailScore::getShopId));
+        List<EvalIndicatorScoreBO> scoreBOS = new ArrayList<>();
+        for (Map.Entry<Long, List<EvalIndicatorImportDetailScore>> entry : shopMonthlyShowroomScoreMap.entrySet()) {
+            final Long shopId = entry.getKey();
+            final List<EvalIndicatorImportDetailScore> shopShowroomScores = entry.getValue();
+            BigDecimal score = shopShowroomScores.stream().map(EvalIndicatorImportDetailScore::getScore).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal totalScore = shopShowroomScores.stream().map(EvalIndicatorImportDetailScore::getTotalScore).reduce(BigDecimal.ZERO, BigDecimal::add);
+            EvalIndicatorScoreBO value = new EvalIndicatorScoreBO();
+            value.setShopId(shopId);
+            value.setScore(score);
+            value.setTotalScore(totalScore);
+            value.setDataDate(dataDate);
+            scoreBOS.add(value);
+        }
+        return scoreBOS;
+    }
+
+    public List<EvalIndicatorValue> extractShopValue(EvalIndicator evalIndicator, LocalDate dataDate, Long groupId, List<EvalIndicatorScoreBO> scoreBos) {
+        List<EvalIndicatorValue> evalIndicatorValues = new ArrayList<>();
+        for (EvalIndicatorScoreBO scoreBO : scoreBos) {
+            final BigDecimal score = scoreBO.getScore();
+            final BigDecimal totalScore = scoreBO.getTotalScore();
+
+            EvalIndicatorValue indicatorValue = new EvalIndicatorValue();
+            indicatorValue.setUserId(-1L);
+            indicatorValue.setShopId(scoreBO.getShopId());
+            indicatorValue.setShopName(scoreBO.getShopName());
+            indicatorValue.setIndicatorValue(BigDecimal.ZERO);
+            indicatorValue.setIndicatorCode(evalIndicator.getCode());
+            indicatorValue.setIndicatorName(evalIndicator.getName());
+            indicatorValue.setDimensionType(DimensionTypeEnum.SHOP);
+            if (PublicUtil.isNotEmpty(score) && PublicUtil.isNotEmpty(totalScore) && (totalScore.compareTo(BigDecimal.ZERO) > 0)) {
+                indicatorValue.setIndicatorValue(score.divide(totalScore, 4, RoundingMode.HALF_UP));
+            }
+            indicatorValue.setDataType(DataTypeEnum.RATIO);
+            indicatorValue.setDataDate(dataDate);
+            indicatorValue.setGroupId(groupId);
+            indicatorValue.setYn(Boolean.TRUE);
+            evalIndicatorValues.add(indicatorValue);
+        }
+        return evalIndicatorValues;
+
+    }
+
+    public List<EvalIndicatorValue> extractUserValue(EvalIndicator evalIndicator, LocalDate dataDate, Long groupId, List<EvalIndicatorScoreBO> scoreBos) {
+        List<String> roleCodes = evalIndicator.getRoleCodes();
+
+        List<Long> shopIds = scoreBos.stream().map(EvalIndicatorScoreBO::getShopId).distinct().collect(Collectors.toList());
+        Map<Long, Set<Long>> userAuthShopIds = new HashMap<>();
+        Map<Long, String> userNameMap = new HashMap<>();
+        //角色维度
+        for (String roleCode : roleCodes) {
+            //角色授权天数
+            List<HRoleAuthRangeDayVO> authRangeDayVos = rpcCommonService.roleMonthlyAuthDay(groupId, dataDate, roleCode, new ArrayList<>(shopIds));
+            //门店角色授权天数
+            Map<Long, List<HRoleAuthRangeDayVO>> shopAuths = authRangeDayVos.stream().collect(Collectors.groupingBy(HRoleAuthRangeDayVO::getRangeValue));
+            for (Map.Entry<Long, List<HRoleAuthRangeDayVO>> entry : shopAuths.entrySet()) {
+                //获取最大 角色授权
+                log.info("门店角色：{}，授权记录：{}", roleCode, JSON.toJSONString(entry.getValue()));
+                Long maxAuthRangeDay = entry.getValue().stream()
+                        .max(Comparator.comparing(HRoleAuthRangeDayVO::getAuthDays)).map(HRoleAuthRangeDayVO::getAuthDays).get();
+                List<HRoleAuthRangeDayVO> maxAuthVos = entry.getValue().stream()
+                        .filter(auth -> maxAuthRangeDay.compareTo(auth.getAuthDays()) == 0).collect(Collectors.toList());
+                log.info("门店角色：{}，最长天数授权：{}", roleCode, JSON.toJSONString(maxAuthVos));
+                for (HRoleAuthRangeDayVO rangeDayVO : maxAuthVos) {
+                    //初始化
+                    if (! userAuthShopIds.containsKey(rangeDayVO.getUserId())) {
+                        userAuthShopIds.put(rangeDayVO.getUserId(), new HashSet<>());
+                    }
+                    userNameMap.put(rangeDayVO.getUserId(), rangeDayVO.getUserName());
+                    userAuthShopIds.get(rangeDayVO.getUserId()).add(rangeDayVO.getRangeValue());
+                }
+            }
+        }
+        log.info("角色授权门店：{}", JSON.toJSONString(userAuthShopIds));
+        //抽取人员数据
+        List<EvalIndicatorValue> evalIndicatorValues = new ArrayList<>();
+        for (Map.Entry<Long, Set<Long>> entry : userAuthShopIds.entrySet()) {
+            final Long userId = entry.getKey();
+            final Set<Long> authShopIds = entry.getValue();
+
+            BigDecimal score = scoreBos.stream().filter(scoreBo -> authShopIds.contains(scoreBo.getShopId()))
+                    .map(EvalIndicatorScoreBO::getScore).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal totalScore = scoreBos.stream().filter(scoreBo -> authShopIds.contains(scoreBo.getShopId()))
+                    .map(EvalIndicatorScoreBO::getTotalScore).reduce(BigDecimal.ZERO, BigDecimal::add);
+            EvalIndicatorValue value = new EvalIndicatorValue();
+            value.setUserId(userId);
+            value.setUserName(userNameMap.getOrDefault(userId, ""));
+            value.setShopId(-1L);
+            value.setShopName("");
+            value.setIndicatorValue(BigDecimal.ZERO);
+            value.setIndicatorCode(evalIndicator.getCode());
+            value.setIndicatorName(evalIndicator.getName());
+            value.setDimensionType(DimensionTypeEnum.STAFF);
+            if (PublicUtil.isNotEmpty(score) && PublicUtil.isNotEmpty(totalScore) && (totalScore.compareTo(BigDecimal.ZERO) > 0)) {
+                value.setIndicatorValue(score.divide(totalScore, 4, RoundingMode.HALF_UP));
+            }
+            value.setDataType(DataTypeEnum.RATIO);
+            value.setDataDate(dataDate);
+            value.setGroupId(groupId);
+            value.setYn(Boolean.TRUE);
+            evalIndicatorValues.add(value);
+        }
+        return evalIndicatorValues;
+    }
+
+}
 \ No newline at end of file
+package cn.fw.morax.service.data;
+
+import cn.fw.morax.domain.db.TemplateFile;
+import cn.fw.morax.domain.db.UserResignExamine;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 绩效考核离职记录
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : UserResignExamineService
+ * @description : 绩效考核离职记录
+ * @date : 2022-12-29 17:05
+ */
+public interface TemplateFileService extends IService<TemplateFile> {
+}
+package cn.fw.morax.service.data.eval;
+
+
+import cn.fw.morax.dao.orm.ILocalService;
+import cn.fw.morax.domain.db.eval.EvalIndicatorImportDetailScore;
+
+/**
+ * <p>
+ * 考评指标导入记录 服务类
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2023-01-30
+ */
+public interface EvalIndicatorImportDetailScoreService extends ILocalService<EvalIndicatorImportDetailScore> {
+
+
+}
+package cn.fw.morax.service.data.eval;
+
+
+import cn.fw.morax.dao.orm.ILocalService;
+import cn.fw.morax.domain.db.eval.EvalIndicatorImportKeyValue;
+import cn.fw.morax.domain.db.eval.EvalIndicatorScoreStageValue;
+
+/**
+ * <p>
+ * 考评指标导入记录 服务类
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2023-01-30
+ */
+public interface EvalIndicatorImportKeyValueService extends ILocalService<EvalIndicatorImportKeyValue> {
+
+
+}
+package cn.fw.morax.service.data.eval;
+
+
+import cn.fw.morax.dao.orm.ILocalService;
+import cn.fw.morax.domain.db.eval.EvalIndicatorImportMenu;
+
+/**
+ * <p>
+ * 考评指标导入记录 服务类
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2023-01-30
+ */
+public interface EvalIndicatorImportMenuService extends ILocalService<EvalIndicatorImportMenu> {
+
+
+}
 package cn.fw.morax.service.data.eval;
  
  
+import cn.fw.morax.dao.orm.ILocalService;
 import cn.fw.morax.domain.db.eval.EvalIndicatorValue;
 import cn.fw.morax.domain.enums.DimensionTypeEnum;
 import cn.fw.morax.domain.vo.kpi.IndicatorUserValueVO;
@@ -19,7 +20,7 @@ import java.util.Set;
  * @author jiangchao
  * @since 2022-12-09
  */
-public interface EvalIndicatorValueService extends IService<EvalIndicatorValue> {
+public interface EvalIndicatorValueService extends ILocalService<EvalIndicatorValue> {
  
     /**
      * 查最新上报数据（一个月内）
+package cn.fw.morax.service.data.eval.impl;
+
+import cn.fw.morax.dao.eval.EvalIndicatorImportDetailScoreDao;
+import cn.fw.morax.domain.db.eval.EvalIndicatorImportDetailScore;
+import cn.fw.morax.service.data.eval.EvalIndicatorImportDetailScoreService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 考评指标导入记录 服务实现类
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2023-02-06
+ */
+@Service
+public class EvalIndicatorImportDetailScoreServiceImpl extends ServiceImpl<EvalIndicatorImportDetailScoreDao, EvalIndicatorImportDetailScore>
+        implements EvalIndicatorImportDetailScoreService {
+
+
+}
+package cn.fw.morax.service.data.eval.impl;
+
+import cn.fw.morax.dao.eval.EvalIndicatorImportKeyValueDao;
+import cn.fw.morax.domain.db.eval.EvalIndicatorImportKeyValue;
+import cn.fw.morax.service.data.eval.EvalIndicatorImportKeyValueService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 考评指标导入记录 服务实现类
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2023-02-06
+ */
+@Service
+public class EvalIndicatorImportKeyValueServiceImpl extends ServiceImpl<EvalIndicatorImportKeyValueDao, EvalIndicatorImportKeyValue>
+        implements EvalIndicatorImportKeyValueService {
+
+
+}
+package cn.fw.morax.service.data.eval.impl;
+
+import cn.fw.morax.dao.eval.EvalIndicatorImportMenuDao;
+import cn.fw.morax.domain.db.eval.EvalIndicatorImportMenu;
+import cn.fw.morax.service.data.eval.EvalIndicatorImportMenuService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 考评指标导入记录 服务实现类
+ * </p>
+ *
+ * @author jiangchao
+ * @since 2023-02-06
+ */
+@Service
+public class EvalIndicatorImportMenuServiceImpl extends ServiceImpl<EvalIndicatorImportMenuDao, EvalIndicatorImportMenu>
+        implements EvalIndicatorImportMenuService {
+
+
+}
+package cn.fw.morax.service.data.impl;
+
+import cn.fw.morax.dao.TemplateFileDao;
+import cn.fw.morax.domain.db.TemplateFile;
+import cn.fw.morax.service.data.TemplateFileService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 薪资发放记录
+ *
+ * @author : kurisu
+ * @version : 1.0
+ * @className : PayrollRecordServiceImpl
+ * @description : 薪资发放记录
+ * @date : 2022-05-07 10:55
+ */
+@Service
+public class TemplateFileServiceImpl extends ServiceImpl<TemplateFileDao, TemplateFile> implements TemplateFileService {
+
+}