收到打分修改（未测试）

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java

@@ -9,17 +9,20 @@ package com.elink.esua.epdc.commons.tools.constant;
  */
 public interface NumConstant {
 
+    int TWO_NEG = -2;
+    int ONE_NEG = -1;
     int ZERO = 0;
     int ONE = 1;
     int TWO = 2;
     int THREE = 3;
     int FOUR = 4;
     int SIX = 6;
-
+    int SEVEN = 7;
-    int ONE_NEG = -1;
+    int EIGHT = 8;
-    int TWO_NEG = -2;
+    int NINE = 9;
-
     int TEN = 10;
+    int ELEVEN = 11;
+
     int FIFTEEN = 15;
     int TWENTY = 20;
     int THIRTY = 30;

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/StrConstant.java

@@ -0,0 +1,39 @@
+package com.elink.esua.epdc.commons.tools.constant;
+
+import org.apache.commons.codec.CharEncoding;
+import org.springframework.http.MediaType;
+
+
+/**
+ * 字符串常量
+ *
+ * @author work@yujt.net.cn
+ * @date 2019/12/13 11:19
+ */
+public interface StrConstant {
+
+    String UTF_8 = CharEncoding.UTF_8;
+
+    String ISO_8859_1 = CharEncoding.ISO_8859_1;
+
+    String APPLICATION_JSON_UTF8_VALUE = MediaType.APPLICATION_JSON_UTF8_VALUE;
+
+    String EXCEL_SUFFIX_2003 = ".xls";
+
+    String EXCEL_SUFFIX_2007 = ".xlsx";
+
+    /**
+     * 连字符号、短杠
+     */
+    String HYPHEN = "-";
+
+    /**
+     * 英文逗号
+     */
+    String COMMA = ",";
+
+    /**
+     * 冒号
+     */
+    String COLON = ":";
+}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java

@@ -25,11 +25,16 @@ import java.util.Date;
  * @since 1.0.0
  */
 public class DateUtils {
+
 	/** 时间格式(yyyy-MM-dd) */
 	public final static String DATE_PATTERN = "yyyy-MM-dd";
+
 	/** 时间格式(yyyy-MM-dd HH:mm:ss) */
 	public final static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
 
+    /** 时间格式(yyyyMMddHHmmss) */
+	public final static String DATE_TIME_NO_SPLIT  = "yyyyMMddHHmmss";
+
     /**
      * 日期格式化 日期格式为：yyyy-MM-dd
      * @param date  日期

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/LocalDateUtils.java

@@ -0,0 +1,46 @@
+package com.elink.esua.epdc.commons.tools.utils;
+
+
+import java.time.*;
+import java.util.Date;
+
+/**
+ * @author work@yujt.net.cn
+ * @date 2019/12/13 15:05
+ */
+public class LocalDateUtils {
+
+
+    public static LocalDateTime DateToLocalDateTime(Date date) {
+        Instant instant = date.toInstant();
+        ZoneId zone = ZoneId.systemDefault();
+        return LocalDateTime.ofInstant(instant, zone);
+    }
+
+    public static LocalDate DateToLocalDate(Date date) {
+        Instant instant = date.toInstant();
+        ZoneId zone = ZoneId.systemDefault();
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone);
+        return localDateTime.toLocalDate();
+    }
+
+    public static LocalTime DateToLocalTime(Date date) {
+        Instant instant = date.toInstant();
+        ZoneId zone = ZoneId.systemDefault();
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone);
+        return localDateTime.toLocalTime();
+    }
+
+    public static Date LocalDateTimeToDate(LocalDateTime localDateTime) {
+        ZoneId zone = ZoneId.systemDefault();
+        Instant instant = localDateTime.atZone(zone).toInstant();
+        return Date.from(instant);
+    }
+
+    public static Date LocalDateToDate(LocalDate localDate) {
+        ZoneId zone = ZoneId.systemDefault();
+        Instant instant = localDate.atStartOfDay().atZone(zone).toInstant();
+        return Date.from(instant);
+    }
+
+}

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiManualScoreTemplateResultDTO.java

@@ -12,6 +12,7 @@ import java.util.Date;
  */
 @Data
 public class KpiManualScoreTemplateResultDTO implements Serializable {
+
 	private static final long serialVersionUID = 3228442740296126765L;
 	/**
 	 * 规则名称
@@ -43,16 +44,6 @@ public class KpiManualScoreTemplateResultDTO implements Serializable {
 	 */
 	private String kpiCycleName;
 
-	/**
-	 * 考核起止日期
-	 */
-	private String scoreStartTime;
-
-	/**
-	 * 考核终止日期
-	 */
-	private String scoreEndTime;
-
 	/**
 	 * 得分
 	 */

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiCycleEnum.java

@@ -1,7 +1,7 @@
 package com.elink.esua.epdc.enums;
 
 /**
- * @Auther: yinzuomei
+ * @author: yinzuomei
  * @Date: 2019/12/5 12:41
  * @Description: 考核周期枚举
  */
@@ -18,7 +18,9 @@ public enum KpiCycleEnum {
      * 年
      */
     KPI_CYCLE_YEAR("year", "年");
+
     private String value;
+
     private String name;
 
     KpiCycleEnum(String value, String name) {
@@ -30,15 +32,9 @@ public enum KpiCycleEnum {
         return value;
     }
 
-	public void setValue(String value) {
-		this.value = value;
-	}
 
     public String getName() {
         return name;
     }
 
-	public void setName(String name) {
-		this.name = name;
-	}
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
@@ -36,7 +37,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -54,10 +54,9 @@ public class KpiManualScoreController {
 
     @Autowired
     private KpiManualScoreService kpiManualScoreService;
-    private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");//设置日期格式
+
     @GetMapping("page")
     public Result<PageData<KpiManualScoreResultDTO>> page(@RequestParam Map<String, Object> params) {
-//        PageData<KpiManualScoreDTO> page = kpiManualScoreService.page(params);
         PageData<KpiManualScoreResultDTO> page = kpiManualScoreService.listKpiManualScoreResultDTO(params);
         return new Result<PageData<KpiManualScoreResultDTO>>().ok(page);
     }
@@ -106,7 +105,8 @@ public class KpiManualScoreController {
     @GetMapping("exportTemplate")
     public void exportTemplate(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<KpiManualScoreTemplateResultDTO> list = kpiManualScoreService.listKpiManualScoreTemplateResultDTO(params);
-        ExcelUtils.exportExcelToTarget(response, simpleDateFormat.format(new Date()), list, KpiManualScoreTemplateExcel.class);
+        ExcelUtils.exportExcelToTarget(response,
+                DateUtils.format(new Date(), DateUtils.DATE_TIME_NO_SPLIT), list, KpiManualScoreTemplateExcel.class);
 
     }
 

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreTempController.java

@@ -1,94 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.elink.esua.epdc.controller;
-
-import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
-import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.KpiManualScoreTempDTO;
-import com.elink.esua.epdc.excel.KpiManualScoreTempExcel;
-import com.elink.esua.epdc.service.KpiManualScoreTempService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 绩效考核手动打分记录
- *
- * @author qu qu@elink-cn.com
- * @since v1.0.0 2019-12-06
- */
-@RestController
-@RequestMapping("kpimanualscoretemp")
-public class KpiManualScoreTempController {
-    
-    @Autowired
-    private KpiManualScoreTempService kpiManualScoreTempService;
-
-    @GetMapping("page")
-    public Result<PageData<KpiManualScoreTempDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<KpiManualScoreTempDTO> page = kpiManualScoreTempService.page(params);
-        return new Result<PageData<KpiManualScoreTempDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<KpiManualScoreTempDTO> get(@PathVariable("id") String id){
-        KpiManualScoreTempDTO data = kpiManualScoreTempService.get(id);
-        return new Result<KpiManualScoreTempDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody KpiManualScoreTempDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        kpiManualScoreTempService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody KpiManualScoreTempDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        kpiManualScoreTempService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        kpiManualScoreTempService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<KpiManualScoreTempDTO> list = kpiManualScoreTempService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, KpiManualScoreTempExcel.class);
-    }
-
-}

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiManualScoreDao.java

@@ -20,7 +20,10 @@ package com.elink.esua.epdc.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.result.KpiManualScoreResultDTO;
 import com.elink.esua.epdc.entity.KpiManualScoreEntity;
+import com.elink.esua.epdc.entity.KpiManualScoreTempEntity;
+import com.elink.esua.epdc.excel.KpiManualScoreTemplateExcel;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -35,4 +38,29 @@ import java.util.Map;
 public interface KpiManualScoreDao extends BaseDao<KpiManualScoreEntity> {
 
     List<KpiManualScoreResultDTO> selectListKpiManualScoreResultDTO(Map<String, Object> params);
+
+    /**
+     * 删除打分临时记录
+     *
+     * @param userId         用户id，操作人
+     * @param ruleId         规则id
+     * @param scoreStartDate 考核周期起始日
+     * @return int
+     * @author yinzuomei | modify by work@yujt.net.cn
+     * @date 2019/12/13 15:35
+     */
+    int deleteManualScoreTemp(@Param("userId") String userId, @Param("ruleId") String ruleId, @Param("scoreStartDate") String scoreStartDate);
+
+    List<KpiManualScoreTempEntity> selectListKpiManualScoreTemp(@Param("userId") String userId,
+                                                                @Param("recordList") List<KpiManualScoreTemplateExcel> recordList);
+
+    /**
+     * 批量插入打分临时表
+     *
+     * @param scoreTempList
+     * @return int
+     * @author yinzuomei | modify by work@yujt.net.cn
+     * @date 2019/12/13 14:12
+     */
+    int insertScoreTempBatch(@Param("scoreTempList") List<KpiManualScoreTempEntity> scoreTempList);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiManualScoreTempDao.java

@@ -1,44 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.elink.esua.epdc.dao;
-
-import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.entity.KpiManualScoreTempEntity;
-import com.elink.esua.epdc.excel.KpiManualScoreTemplateExcel;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 绩效考核手动打分记录
- *
- * @author qu qu@elink-cn.com
- * @since v1.0.0 2019-12-06
- */
-@Mapper
-public interface KpiManualScoreTempDao extends BaseDao<KpiManualScoreTempEntity> {
-
-	int deleteManualScoreTemp(@Param("userId") String toString,
-	                          @Param("ruleId")String id,
-	                          @Param("scoreStartTime")String scoreStartTime);
-
-	List<KpiManualScoreTempEntity> selectListKpiManualScoreTemp(@Param("userId") String userId,
-	                                                            @Param("recordList")List<KpiManualScoreTemplateExcel> recordList);
-}

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreEntity.java

@@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -36,7 +37,7 @@ import java.util.Date;
 @TableName("epdc_kpi_manual_score")
 public class KpiManualScoreEntity extends BaseEpdcEntity {
 
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = -8994029691874794620L;
 
     /**
      * epdc_kpi_rule表主键
@@ -51,7 +52,7 @@ public class KpiManualScoreEntity extends BaseEpdcEntity {
     /**
      * 得分
      */
-	private Integer score;
+	private BigDecimal score;
 
 	/**
 	 * 考核起止日期

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreTempEntity.java

@@ -17,12 +17,11 @@
 
 package com.elink.esua.epdc.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -33,10 +32,9 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("epdc_kpi_manual_score_temp")
 public class KpiManualScoreTempEntity extends BaseEpdcEntity {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = -207911504856288902L;
 
     /**
      * epdc_kpi_rule表主键
@@ -51,7 +49,7 @@ public class KpiManualScoreTempEntity extends BaseEpdcEntity {
     /**
      * 得分
      */
-	private Integer score;
+    private BigDecimal score;
 
     /**
      * 考核起止日期yyyy-MM-dd
@@ -113,14 +111,5 @@ public class KpiManualScoreTempEntity extends BaseEpdcEntity {
      */
     private String kpiCycleName;
 
-    /**
-     * 考核起止日期
-     */
-	private String scoreStartTime;
-
-    /**
-     * 考核终止日期
-     */
-	private String scoreEndTime;
 
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreTempService.java

@@ -1,95 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.elink.esua.epdc.service;
-
-import com.elink.esua.epdc.commons.mybatis.service.BaseService;
-import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.dto.KpiManualScoreTempDTO;
-import com.elink.esua.epdc.entity.KpiManualScoreTempEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绩效考核手动打分记录
- *
- * @author qu qu@elink-cn.com
- * @since v1.0.0 2019-12-06
- */
-public interface KpiManualScoreTempService extends BaseService<KpiManualScoreTempEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<KpiManualScoreTempDTO>
-     * @author generator
-     * @date 2019-12-06
-     */
-    PageData<KpiManualScoreTempDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<KpiManualScoreTempDTO>
-     * @author generator
-     * @date 2019-12-06
-     */
-    List<KpiManualScoreTempDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return KpiManualScoreTempDTO
-     * @author generator
-     * @date 2019-12-06
-     */
-    KpiManualScoreTempDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2019-12-06
-     */
-    void save(KpiManualScoreTempDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2019-12-06
-     */
-    void update(KpiManualScoreTempDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2019-12-06
-     */
-    void delete(String[] ids);
-}

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java

@@ -24,16 +24,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.constant.StrConstant;
 import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
-import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.DateUtils;
+import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.KpiManualScoreDao;
 import com.elink.esua.epdc.dao.KpiManualScoreRuleDao;
-import com.elink.esua.epdc.dao.KpiManualScoreTempDao;
 import com.elink.esua.epdc.dao.KpiRuleDao;
 import com.elink.esua.epdc.dto.KpiManualScoreDTO;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
@@ -52,8 +55,8 @@ import com.elink.esua.epdc.excel.KpiManualScoreTemplateExcel;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.KpiManualScoreRedis;
 import com.elink.esua.epdc.service.KpiManualScoreService;
-import com.elink.esua.epdc.service.KpiManualScoreTempService;
 import com.elink.esua.epdc.utils.StreamUtils;
+import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -65,6 +68,8 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.YearMonth;
 import java.util.*;
 
 /**
@@ -87,10 +92,6 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
     private UserDetailRedis userDetailRedis;
     @Autowired
     private AdminFeignClient adminFeignClient;
-	@Autowired
-	private KpiManualScoreTempDao kpiManualScoreTempDao;
-	@Autowired
-	private KpiManualScoreTempService kpiManualScoreTempService;
     //设置日期格式
     private SimpleDateFormat monthFormat = new SimpleDateFormat("yyyy-MM");
     private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -140,45 +141,52 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
      **/
     @Override
     public List<KpiManualScoreTemplateResultDTO> listKpiManualScoreTemplateResultDTO(Map<String, Object> params) {
-		List<KpiManualScoreTemplateResultDTO> list = new ArrayList<>();
+
         //用户所选规则
         String ruleId = params.get("ruleId").toString();
-		String scoreStartTime = params.get("scoreStartTime").toString();
+        // yyyy-MM
-		Date scoreStartDateMonth = new Date();
+        String scoreStartMonth = params.get("scoreStartTime").toString();
-		try {
+        // 考核周期开始月
-			scoreStartDateMonth = monthFormat.parse(scoreStartTime);
+        YearMonth scoreStartDateMonth = YearMonth.parse(scoreStartMonth);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-		Date scoreEndDateMonth = new Date();
 
+        // 考核规则
         KpiRuleEntity kpiRuleEntity = kpiRuleDao.selectById(ruleId);
 
+        // 考核周期结束日
+        LocalDate scoreEndDate;
         //考核周期赋值
-		String kpiCycleName = "";
+        String kpiCycleName;
         if (kpiRuleEntity.getKpiCycle().equals(KpiCycleEnum.KPI_CYCLE_MONTH.getValue())) {
             kpiCycleName = KpiCycleEnum.KPI_CYCLE_MONTH.getName();
-			scoreEndDateMonth = scoreStartDateMonth;
+            scoreEndDate = scoreStartDateMonth.atEndOfMonth();
         } else if (kpiRuleEntity.getKpiCycle().equals(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue())) {
+            int monthValue = scoreStartDateMonth.getMonthValue();
+            // 只有1,4,7,10 月份可以进行季度打分
+            if (monthValue != NumConstant.ONE && monthValue != NumConstant.FOUR
+                    && monthValue != NumConstant.SEVEN && monthValue != NumConstant.TEN) {
+                throw new RenException("当前选择的月份无法进行季度考核打分");
+            }
             kpiCycleName = KpiCycleEnum.KPI_CYCLE_QUARTER.getName();
-			scoreEndDateMonth = stepMonth(scoreStartDateMonth, 2);
+            scoreEndDate = scoreStartDateMonth.plusMonths(NumConstant.TWO).atEndOfMonth();
-		} else if (kpiRuleEntity.getKpiCycle().equals(KpiCycleEnum.KPI_CYCLE_YEAR.getValue())) {
+        } else {
+            int monthValue = scoreStartDateMonth.getMonthValue();
+            // 只有1月份可以进行年度打分
+            if (monthValue != NumConstant.ONE) {
+                throw new RenException("当前选择的月份无法进行年度考核打分");
+            }
             kpiCycleName = KpiCycleEnum.KPI_CYCLE_YEAR.getName();
-			scoreEndDateMonth = stepMonth(scoreStartDateMonth, 11);
+            scoreEndDate = scoreStartDateMonth.plusMonths(NumConstant.ELEVEN).atEndOfMonth();
         }
 
         // 用户拥有的所有部门权限
-		List<Long> dataScopeDeptList = getDataScopeDeptList();
+        List<Long> dataScopeDeptList = SecurityUser.getUser().getDeptIdList();
+        Result<List<UserSysDeptInfoResultDTO>> result = queryUserSysDeptInfo(dataScopeDeptList, kpiRuleEntity.getDeptTypeKey());
 
-		//调用admin模块查询部门信息详情
+        if (!result.success() || CollUtil.isEmpty(result.getData())) {
-		UserSysDeptInfoFormDTO userSysDeptInfoFormDTO = new UserSysDeptInfoFormDTO();
+            return Lists.newArrayList();
-		userSysDeptInfoFormDTO.setDeptIdList(dataScopeDeptList);
+        }
-		List<String> typeKeyList = new ArrayList<>();
+        List<KpiManualScoreTemplateResultDTO> list = Lists.newArrayList();
-		typeKeyList.add(kpiRuleEntity.getDeptTypeKey());
-		userSysDeptInfoFormDTO.setTypeKeyList(typeKeyList);
-		Result<List<UserSysDeptInfoResultDTO>> result = this.queryUserSysDeptInfo(userSysDeptInfoFormDTO);
 
-		if (result.getCode() == 0 && result.getData().size() > 0) {
         List<UserSysDeptInfoResultDTO> userSysDeptInfoResultDTOList = result.getData();
         for (UserSysDeptInfoResultDTO userSysDeptInfoResultDTO : userSysDeptInfoResultDTOList) {
 
@@ -190,32 +198,49 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
             kpiManualScoreTemplateResultDTO.setGrid(userSysDeptInfoResultDTO.getGrid());
             kpiManualScoreTemplateResultDTO.setDeptName(userSysDeptInfoResultDTO.getName());
             kpiManualScoreTemplateResultDTO.setKpiCycleName(kpiCycleName);
-				kpiManualScoreTemplateResultDTO.setScoreStartTime(dateFormat.format(getFirstDayDateOfMonth(scoreStartDateMonth)));
-				kpiManualScoreTemplateResultDTO.setScoreEndTime(dateFormat.format(getLastDayOfMonth(scoreEndDateMonth)));
             kpiManualScoreTemplateResultDTO.setScore(null);
 
             kpiManualScoreTemplateResultDTO.setRuleId(kpiRuleEntity.getId());
             kpiManualScoreTemplateResultDTO.setDeptId(userSysDeptInfoResultDTO.getId().toString());
-				kpiManualScoreTemplateResultDTO.setScoreStartDate(getFirstDayDateOfMonth(scoreStartDateMonth));
+            kpiManualScoreTemplateResultDTO.setScoreStartDate(LocalDateUtils.LocalDateToDate(scoreStartDateMonth.atDay(NumConstant.ONE)));
-				kpiManualScoreTemplateResultDTO.setScoreEndDate(getLastDayOfMonth(scoreEndDateMonth));
+            kpiManualScoreTemplateResultDTO.setScoreEndDate(LocalDateUtils.LocalDateToDate(scoreEndDate));
             kpiManualScoreTemplateResultDTO.setParentDeptIds(userSysDeptInfoResultDTO.getPids());
             kpiManualScoreTemplateResultDTO.setParentDeptNames(userSysDeptInfoResultDTO.getParentNames());
-				kpiManualScoreTemplateResultDTO.setAllDeptIds(userSysDeptInfoResultDTO.getPids() + "," + userSysDeptInfoResultDTO.getId());
+            kpiManualScoreTemplateResultDTO.setAllDeptIds(userSysDeptInfoResultDTO.getPids() + StrConstant.COMMA + userSysDeptInfoResultDTO.getId());
-				kpiManualScoreTemplateResultDTO.setAllDeptNames(userSysDeptInfoResultDTO.getParentNames() + "-" + userSysDeptInfoResultDTO.getName());
+            kpiManualScoreTemplateResultDTO.setAllDeptNames(userSysDeptInfoResultDTO.getParentNames() + StrConstant.HYPHEN + userSysDeptInfoResultDTO.getName());
             kpiManualScoreTemplateResultDTO.setUserId(SecurityUser.getUserId().toString());
             list.add(kpiManualScoreTemplateResultDTO);
         }
         //删除临时表数据
-			kpiManualScoreTempDao.deleteManualScoreTemp(SecurityUser.getUserId().toString(),
+        baseDao.deleteManualScoreTemp(SecurityUser.getUserId().toString(), kpiRuleEntity.getId(), scoreStartDateMonth.atDay(NumConstant.ONE).toString());
-				kpiRuleEntity.getId(),
-				dateFormat.format(getFirstDayDateOfMonth(scoreStartDateMonth)));
         //插入临时表
         List<KpiManualScoreTempEntity> tempEntityList = ConvertUtils.sourceToTarget(list, KpiManualScoreTempEntity.class);
-			kpiManualScoreTempService.insertBatch(tempEntityList, 200);
+        baseDao.insertScoreTempBatch(tempEntityList);
-		}
         return list;
     }
 
+    /**
+     * 调用admin模块查询部门信息详情
+     *
+     * @param dataScopeDeptList 用户数据权限
+     * @param deptTypeKey       部门类别
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2019/12/13 14:38
+     */
+    private Result<List<UserSysDeptInfoResultDTO>> queryUserSysDeptInfo(List<Long> dataScopeDeptList, String deptTypeKey) {
+
+        UserSysDeptInfoFormDTO userSysDeptInfoFormDTO = new UserSysDeptInfoFormDTO();
+
+        List<String> typeKeyList = new ArrayList<>();
+        typeKeyList.add(deptTypeKey);
+        userSysDeptInfoFormDTO.setTypeKeyList(typeKeyList);
+
+        userSysDeptInfoFormDTO.setDeptIdList(dataScopeDeptList);
+
+        return adminFeignClient.queryUserSysDeptInfo(userSysDeptInfoFormDTO);
+    }
+
     /**
      * @param file
      * @return com.elink.esua.epdc.commons.tools.utils.Result
@@ -230,7 +255,7 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
         try {
             //判断上传文件类型
             String originalFilename = file.getOriginalFilename();
-			if (!originalFilename.contains(".xlsx") && !originalFilename.contains(".xls")) {
+            if (!originalFilename.endsWith(StrConstant.EXCEL_SUFFIX_2003) && !originalFilename.endsWith(StrConstant.EXCEL_SUFFIX_2007)) {
                 return new Result().error("请选择.xls或者.xlsx格式文件");
             }
             ImportParams importParams = new ImportParams();
@@ -240,7 +265,7 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
             }
             //校验记录数是否一致
             List<ImportExcelErrorResultDTO> errorRecordList = new ArrayList<>();
-			List<KpiManualScoreTempEntity> tempEntityList = kpiManualScoreTempDao.selectListKpiManualScoreTemp(SecurityUser.getUserId().toString(), recordList);
+            List<KpiManualScoreTempEntity> tempEntityList = baseDao.selectListKpiManualScoreTemp(SecurityUser.getUserId().toString(), recordList);
             if (CollUtil.isEmpty(tempEntityList) || tempEntityList.size() != recordList.size()) {
                 ImportExcelErrorResultDTO excelErrorResultDTO = new ImportExcelErrorResultDTO();
                 excelErrorResultDTO.setErrorLine("0");
@@ -259,9 +284,9 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
                 baseDao.insert(kpiManualScoreEntity);
             }
             //删除临时表数据
-			kpiManualScoreTempDao.deleteManualScoreTemp(SecurityUser.getUserId().toString(),
+            baseDao.deleteManualScoreTemp(SecurityUser.getUserId().toString(),
                     tempEntityList.get(0).getRuleId(),
-				tempEntityList.get(0).getScoreStartTime());
+                    DateUtils.format(tempEntityList.get(0).getScoreStartDate()));
         } finally {
 //			logger.info("记得删除文件哦");
             this.deleteAllFilesOfDir(f);
@@ -276,8 +301,9 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
      */
     public void deleteAllFilesOfDir(File path) {
         if (null != path) {
-			if (!path.exists())
+            if (!path.exists()) {
                 return;
+            }
             if (path.isFile()) {
                 boolean result = path.delete();
                 int tryCount = 0;
@@ -392,31 +418,6 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
         return wrapper;
     }
 
-	/**
-	 * @param userSysDeptInfoFormDTO
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>
-	 * @Author yinzuomei
-	 * @Description
-	 * @Date 2019/12/6 13:58
-	 **/
-	public Result<List<UserSysDeptInfoResultDTO>> queryUserSysDeptInfo(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO) {
-		return adminFeignClient.queryUserSysDeptInfo(userSysDeptInfoFormDTO);
-	}
-
-	/**
-	 * @param
-	 * @return java.util.List<java.lang.Long>
-	 * @Author yinzuomei
-	 * @Description 用户拥有的所有部门权限
-	 * @Date 2019/12/5 16:29
-	 **/
-	public List<Long> getDataScopeDeptList() {
-		Long userId = SecurityUser.getUserId();
-		// 查询当前用户所具有的的数据权限
-		UserDetail userDetail = userDetailRedis.get(userId);
-		// 用户拥有的所有部门权限
-		return userDetail.getDeptIdList();
-	}
 
     /**
      * @param sourceDate

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreTempServiceImpl.java

@@ -1,104 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.elink.esua.epdc.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
-import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
-import com.elink.esua.epdc.dao.KpiManualScoreTempDao;
-import com.elink.esua.epdc.dto.KpiManualScoreTempDTO;
-import com.elink.esua.epdc.entity.KpiManualScoreTempEntity;
-import com.elink.esua.epdc.redis.KpiManualScoreTempRedis;
-import com.elink.esua.epdc.service.KpiManualScoreTempService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绩效考核手动打分记录
- *
- * @author qu qu@elink-cn.com
- * @since v1.0.0 2019-12-06
- */
-@Service
-public class KpiManualScoreTempServiceImpl extends BaseServiceImpl<KpiManualScoreTempDao, KpiManualScoreTempEntity> implements KpiManualScoreTempService {
-
-    @Autowired
-    private KpiManualScoreTempRedis kpiManualScoreTempRedis;
-
-    @Override
-    public PageData<KpiManualScoreTempDTO> page(Map<String, Object> params) {
-        IPage<KpiManualScoreTempEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, KpiManualScoreTempDTO.class);
-    }
-
-    @Override
-    public List<KpiManualScoreTempDTO> list(Map<String, Object> params) {
-        List<KpiManualScoreTempEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, KpiManualScoreTempDTO.class);
-    }
-
-    private QueryWrapper<KpiManualScoreTempEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<KpiManualScoreTempEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public KpiManualScoreTempDTO get(String id) {
-        KpiManualScoreTempEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, KpiManualScoreTempDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(KpiManualScoreTempDTO dto) {
-        KpiManualScoreTempEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreTempEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(KpiManualScoreTempDTO dto) {
-        KpiManualScoreTempEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreTempEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
-
-}

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreDao.xml

@@ -3,47 +3,33 @@
 
 <mapper namespace="com.elink.esua.epdc.dao.KpiManualScoreDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.KpiManualScoreEntity" id="kpiManualScoreMap">
+    <insert id="insertScoreTempBatch">
-        <result property="id" column="ID"/>
+        insert into epdc_kpi_manual_score_temp(rule_name, street, community ,grid ,DEPT_NAME, KPI_CYCLE_NAME, Rule_Id,
-        <result property="ruleId" column="RULE_ID"/>
+        dept_id,score_start_date,score_end_date,parent_dept_ids,parent_dept_names,all_dept_ids,all_dept_names,user_id)
-        <result property="deptId" column="DEPT_ID"/>
+        values
-        <result property="score" column="SCORE"/>
+        <foreach collection="scoreTempList" item="item" separator=",">
-        <result property="revision" column="REVISION"/>
+            (
-        <result property="createdBy" column="CREATED_BY"/>
+            #{item.ruleName,jdbcType=VARCHAR},
-        <result property="createdTime" column="CREATED_TIME"/>
+            #{item.street,jdbcType=VARCHAR},
-        <result property="updatedBy" column="UPDATED_BY"/>
+            #{item.community,jdbcType=VARCHAR},
-        <result property="updatedTime" column="UPDATED_TIME"/>
+            #{item.grid,jdbcType=VARCHAR},
-        <result property="delFlag" column="DEL_FLAG"/>
+            #{item.deptName,jdbcType=VARCHAR},
-        <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
+            #{item.kpiCycleName,jdbcType=VARCHAR},
-        <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
+            #{item.ruleId,jdbcType=VARCHAR},
-        <result property="allDeptIds" column="ALL_DEPT_IDS"/>
+            #{item.deptId,jdbcType=VARCHAR},
-        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+            #{item.scoreStartDate,jdbcType=DATE},
-        <result property="scoreStartDate" column="score_start_date"/>
+            #{item.scoreEndDate,jdbcType=DATE},
-        <result property="scoreEndDate" column="score_end_date"/>
+            #{item.parentDeptIds,jdbcType=VARCHAR},
-    </resultMap>
+            #{item.parentDeptNames,jdbcType=VARCHAR},
+            #{item.allDeptIds,jdbcType=VARCHAR},
+            #{item.allDeptNames,jdbcType=VARCHAR},
+            #{item.userId,jdbcType=VARCHAR}
+            )
+        </foreach>
+    </insert>
 
-    <resultMap type="com.elink.esua.epdc.dto.result.KpiManualScoreResultDTO" id="KpiManualScoreResultDTOMap">
+    <select id="selectListKpiManualScoreResultDTO" parameterType="map"
-        <result property="id" column="ID"/>
+            resultType="com.elink.esua.epdc.dto.result.KpiManualScoreResultDTO">
-        <result property="ruleId" column="RULE_ID"/>
-        <result property="deptId" column="DEPT_ID"/>
-        <result property="score" column="SCORE"/>
-        <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
-        <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
-        <result property="allDeptIds" column="ALL_DEPT_IDS"/>
-        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="ruleName" column="rule_name"/>
-        <result property="kpiCycle" column="kpi_cycle"/>
-        <result property="scoreStartDate" column="score_start_date"/>
-        <result property="scoreEndDate" column="score_end_date"/>
-    </resultMap>
-
-    <select id="selectListKpiManualScoreResultDTO" parameterType="map" resultMap="KpiManualScoreResultDTOMap">
         SELECT
         kmc.id,
         kmc.rule_id,
@@ -77,4 +63,59 @@
         </if>
         ORDER BY kmc.CREATED_TIME DESC
     </select>
+
+    <delete id="deleteManualScoreTemp" parameterType="map">
+        DELETE
+        FROM
+            epdc_kpi_manual_score_temp
+        WHERE
+            RULE_ID =#{ruleId}
+            AND user_id = #{userId}
+            AND score_start_time =  STR_TO_DATE( #{scoreStartDate}, '%Y-%m-%d' )
+    </delete>
+
+    <select id="selectListKpiManualScoreTemp" parameterType="map"
+            resultType="com.elink.esua.epdc.entity.KpiManualScoreTempEntity">
+        <foreach collection="recordList" item="record" index="index" open="" close="" separator="union">
+            select temp.ID,
+            temp.RULE_ID,
+            temp.DEPT_ID,
+            #{record.score} as SCORE,
+            temp.score_start_date,
+            temp.score_end_date,
+            temp.PARENT_DEPT_IDS,
+            temp.PARENT_DEPT_NAMES,
+            temp.ALL_DEPT_NAMES,
+            temp.ALL_DEPT_IDS,
+            temp.REVISION,
+            temp.CREATED_BY,
+            temp.CREATED_TIME,
+            temp.UPDATED_BY,
+            temp.UPDATED_TIME,
+            temp.DEL_FLAG,
+            temp.street,
+            temp.community,
+            temp.grid,
+            temp.rule_name,
+            temp.kpi_cycle_name,
+            temp.score_start_time,
+            temp.score_end_time
+            from epdc_kpi_manual_score_temp temp,epdc_kpi_rule kr,epdc_kpi_manual_score_rule sr
+            where temp.DEL_FLAG='0'
+            and kr.DEL_FLAG='0'
+            and temp.RULE_ID=kr.id
+            and temp.USER_ID=#{userId}
+            and kr.reference_id=sr.id
+            and temp.rule_name=#{record.ruleName}
+            and temp.street=#{record.street}
+            and temp.community=#{record.community}
+            and temp.grid=#{record.grid}
+            and temp.kpi_cycle_name=#{record.kpiCycleName}
+            and temp.score_start_time=#{record.scoreStartTime}
+            and temp.score_end_time=#{record.scoreEndTime}
+            and #{record.score} &gt;=0
+            and #{record.score} &lt;=sr.full_marks
+            and #{record.score} is not null
+        </foreach>
+    </select>
 </mapper>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreTempDao.xml

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.elink.esua.epdc.dao.KpiManualScoreTempDao">
-
-    <resultMap type="com.elink.esua.epdc.entity.KpiManualScoreTempEntity" id="kpiManualScoreTempMap">
-        <result property="id" column="ID"/>
-        <result property="ruleId" column="RULE_ID"/>
-        <result property="deptId" column="DEPT_ID"/>
-        <result property="score" column="SCORE"/>
-        <result property="scoreStartDate" column="score_start_date"/>
-        <result property="scoreEndDate" column="score_end_date"/>
-        <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
-        <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
-        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
-        <result property="allDeptIds" column="ALL_DEPT_IDS"/>
-        <result property="userId" column="USER_ID"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="street" column="street"/>
-        <result property="community" column="community"/>
-        <result property="grid" column="grid"/>
-        <result property="ruleName" column="rule_name"/>
-        <result property="kpiCycleName" column="kpi_cycle_name"/>
-        <result property="scoreStartTime" column="score_start_time"/>
-        <result property="scoreEndTime" column="score_end_time"/>
-    </resultMap>
-
-    <delete id="deleteManualScoreTemp" parameterType="map">
-        DELETE
-        FROM
-            epdc_kpi_manual_score_temp
-        WHERE
-            RULE_ID =#{ruleId}
-            AND user_id = #{userId}
-            AND score_start_time =#{scoreStartTime}
-    </delete>
-
-    <select id="selectListKpiManualScoreTemp" parameterType="map" resultMap="kpiManualScoreTempMap">
-        <foreach collection="recordList" item="record" index="index" open="" close="" separator="union">
-            select temp.ID,
-            temp.RULE_ID,
-            temp.DEPT_ID,
-            #{record.score} as SCORE,
-            temp.score_start_date,
-            temp.score_end_date,
-            temp.PARENT_DEPT_IDS,
-            temp.PARENT_DEPT_NAMES,
-            temp.ALL_DEPT_NAMES,
-            temp.ALL_DEPT_IDS,
-            temp.REVISION,
-            temp.CREATED_BY,
-            temp.CREATED_TIME,
-            temp.UPDATED_BY,
-            temp.UPDATED_TIME,
-            temp.DEL_FLAG,
-            temp.street,
-            temp.community,
-            temp.grid,
-            temp.rule_name,
-            temp.kpi_cycle_name,
-            temp.score_start_time,
-            temp.score_end_time
-            from epdc_kpi_manual_score_temp temp,epdc_kpi_rule kr,epdc_kpi_manual_score_rule sr
-            where temp.DEL_FLAG='0'
-            and kr.DEL_FLAG='0'
-            and temp.RULE_ID=kr.id
-            and temp.USER_ID=#{userId}
-            and kr.reference_id=sr.id
-            and temp.rule_name=#{record.ruleName}
-            and temp.street=#{record.street}
-            and temp.community=#{record.community}
-            and temp.grid=#{record.grid}
-            and temp.kpi_cycle_name=#{record.kpiCycleName}
-            and temp.score_start_time=#{record.scoreStartTime}
-            and temp.score_end_time=#{record.scoreEndTime}
-            and #{record.score} &gt;=0
-            and #{record.score} &lt;=sr.full_marks
-            and #{record.score} is not null
-        </foreach>
-    </select>
-</mapper>