Merge remote-tracking branch 'origin/dev_1118' into dev_1118

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

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.exception.RenException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.CharEncoding;
 import org.springframework.util.Base64Utils;
+import org.springframework.util.StringUtils;
 
 import java.io.UnsupportedEncodingException;
 import java.text.ParseException;
@@ -59,6 +60,9 @@ public class ModuleUtils {
      * @date 2020/2/6 16:39
      */
     public static String encodeByBase64(String params) {
+        if (StringUtils.isEmpty(params)) {
+            return null;
+        }
         try {
             return Base64Utils.encodeToUrlSafeString(params.getBytes(CharEncoding.UTF_8));
         } catch (UnsupportedEncodingException e) {
@@ -75,6 +79,9 @@ public class ModuleUtils {
      * @date 2020/2/6 16:48
      */
     public static String decodeFromBase64(String base64Str) {
+        if (StringUtils.isEmpty(base64Str)) {
+            return null;
+        }
         try {
             return new String(Base64Utils.decodeFromUrlSafeString(base64Str), CharEncoding.UTF_8);
         } catch (UnsupportedEncodingException e) {

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateUpdateDeptOfficerCountDTO.java

@@ -0,0 +1,51 @@
+/**
+ * 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.dto.evaluate;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 评价部门表 评价部门表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-02-05
+ */
+@Data
+public class EvaluateUpdateDeptOfficerCountDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 部门ID
+     */
+	private String deptId;
+
+    /**
+     * 干部人数
+     */
+	private Integer officerCount;
+
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.evaluate.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO;
+import com.elink.esua.epdc.dto.evaluate.EvaluateUpdateDeptOfficerCountDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerCountResultDTO;
 import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOfficerEntity;
@@ -66,4 +67,31 @@ public interface EvaluateOfficerDao extends BaseDao<EvaluateOfficerEntity> {
     List<EvaluateOfficerCountResultDTO> getEvaluateOfficerCount(Map<String, Object> params);
 
     List<EvaluateOfficerAppResultDTO> getDeptOfficer(Map<String, Object> params);
+
+    /**
+     * 街道干部管理表干部人数加1
+     * @param deptId
+     */
+    void officerCountAddOne(@Param("deptId")String deptId);
+
+    /**
+     * 街道干部管理表干部人数减少对应数量
+     * @param evaluateUpdateDeptOfficerCountDTO
+     */
+    void updateOfficerCount(EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO);
+
+    /**
+     * 导入操作时更新街道干部管理表干部人数
+     * @param evaluateUpdateDeptOfficerCountDTO
+     */
+    void updateOfficerCountByDeptId(EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO);
+
+    // 清空该人员相关评价数据
+    void deleteEvaluateInfoById(@Param("ids")String[] ids);
+
+    void deleteEvaluateDetailById(@Param("ids")String[] ids);
+
+    void deleteEvaluateDetailByDeptId(@Param("deptId")String deptId);
+
+    void deleteEvaluateInfoByDeptId(@Param("deptId")String deptId);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java

@@ -38,7 +38,7 @@ public class EvaluateOfficerExcel {
     @Excel(name = "干部姓名")
     private String fullName;
 
-    @Excel(name = "性别")
+    @Excel(name = "性别", replace = {"女_0","男_1"})
     private String sex;
 
     @Excel(name = "单位职务")

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java

@@ -26,10 +26,10 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO;
 import com.elink.esua.epdc.dto.evaluate.EvaluateRoleDTO;
+import com.elink.esua.epdc.dto.evaluate.EvaluateUpdateDeptOfficerCountDTO;
 import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
 import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerCountResultDTO;
@@ -52,10 +52,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -134,16 +130,6 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
     @Override
     public List<EvaluateOfficerDTO> list(Map<String, Object> params) {
         List<EvaluateOfficerEntity> entityList = baseDao.selectList(getWrapper(params));
-        for(int i = 0 ; i < entityList.size() ; i++){
-            EvaluateOfficerEntity entity = entityList.get(i);
-            //转型性别
-            String sex = entity.getSex();
-            if("0".equals(sex)){
-                entity.setSex("女");
-            }else{
-                entity.setSex("男");
-            }
-        }
         return ConvertUtils.sourceToTarget(entityList, EvaluateOfficerDTO.class);
     }
 
@@ -166,7 +152,11 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
     @Transactional(rollbackFor = Exception.class)
     public void save(EvaluateOfficerDTO dto) {
         EvaluateOfficerEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateOfficerEntity.class);
+        // 街道干部管理表干部人数加1
+        String deptId = entity.getDeptId();
         insert(entity);
+        baseDao.officerCountAddOne(deptId);
+
     }
 
     @Override
@@ -186,6 +176,19 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
     public void delete(String[] ids) {
         // 逻辑删除（@TableLogic 注解）
         baseDao.deleteBatchIds(Arrays.asList(ids));
+
+        // 街道干部管理表干部人数减少对应数量
+        String id = ids[0];
+        int num = ids.length;
+        EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO = new EvaluateUpdateDeptOfficerCountDTO();
+        evaluateUpdateDeptOfficerCountDTO.setId(id);
+        evaluateUpdateDeptOfficerCountDTO.setOfficerCount(num);
+        baseDao.updateOfficerCount(evaluateUpdateDeptOfficerCountDTO);
+
+        // 清空该人员相关评价数据
+        baseDao.deleteEvaluateDetailById(ids);
+        baseDao.deleteEvaluateInfoById(ids);
+
     }
 
     @Override
@@ -194,6 +197,9 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
         if(deptId != null && !"".equals(deptId)){
             baseDao.deleteByDeptId(deptId);
         }
+        // 清空该人员相关评价数据
+        baseDao.deleteEvaluateDetailByDeptId(deptId);
+        baseDao.deleteEvaluateInfoByDeptId(deptId);
 
         //获取excle版本
         String isExcel2003 = getExcelInfo(file);
@@ -292,6 +298,13 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
                     evaluateOfficerEntities[k] = list.get(k);
                 }
                 baseDao.insertList(evaluateOfficerEntities);
+
+                // 导入操作时更新街道干部管理表干部人数
+                int num = list.size();
+                EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO = new EvaluateUpdateDeptOfficerCountDTO();
+                evaluateUpdateDeptOfficerCountDTO.setDeptId(deptId);
+                evaluateUpdateDeptOfficerCountDTO.setOfficerCount(num);
+                baseDao.updateOfficerCountByDeptId(evaluateUpdateDeptOfficerCountDTO);
             }
             result.setMsg("success");
             result.setCode(0);

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml

@@ -102,6 +102,48 @@
         where  ID = #{id}  and  DEL_FLAG = '0'
     </update>
 
+    <update id="officerCountAddOne" parameterType="String">
+        update epdc_evaluate_dept set OFFICER_COUNT = OFFICER_COUNT+1 where DEPT_ID = #{deptId}
+    </update>
+
+    <update id="updateOfficerCount" parameterType="com.elink.esua.epdc.dto.evaluate.EvaluateUpdateDeptOfficerCountDTO">
+        update epdc_evaluate_dept set OFFICER_COUNT = OFFICER_COUNT- #{officerCount} where DEPT_ID = (select eeo.DEPT_ID from epdc_evaluate_officer eeo where eeo.id = #{id})
+    </update>
+
+    <update id="updateOfficerCountByDeptId" parameterType="com.elink.esua.epdc.dto.evaluate.EvaluateUpdateDeptOfficerCountDTO">
+        update epdc_evaluate_dept set OFFICER_COUNT = #{officerCount} where DEPT_ID = #{deptId}
+    </update>
+
+    <delete id="deleteEvaluateInfoById">
+        delete from epdc_evaluate_info where OFFICER_ID in
+        <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteEvaluateDetailById">
+        delete from epdc_evaluate_detail where INFO_ID in (
+            select ID from epdc_evaluate_info where OFFICER_ID in
+            <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        )
+    </delete>
+
+    <delete id="deleteEvaluateInfoByDeptId">
+        delete from epdc_evaluate_info where OFFICER_ID in (
+            select ID from epdc_evaluate_officer where DEPT_ID = #{deptId}
+        )
+    </delete>
+
+    <delete id="deleteEvaluateDetailByDeptId">
+        delete from epdc_evaluate_detail where INFO_ID in (
+            select ID from epdc_evaluate_info where OFFICER_ID in (
+                select ID from epdc_evaluate_officer where DEPT_ID = #{deptId}
+            )
+        )
+    </delete>
+
 
     <resultMap type="com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerCountResultDTO" id="evaluateOfficerCountMap">
         <result property="id" column="ID"/>

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java

@@ -66,4 +66,13 @@ public interface ActBannerDao extends BaseDao<ActBannerEntity> {
      * @since 2020/2/6 21:24
      */
     void updateBannerByActId(String actId);
+
+    /** 
+     * @Description: 手机端banner查询，根据创建时间 正序排列 
+     * @Param: [params] 
+     * @return: java.util.List<com.elink.esua.epdc.modules.activity.entity.ActBannerEntity> 
+     * @Author: zy 
+     * @Date: 2020-02-08 
+     */ 
+    List<ActBannerDTO> getAppActBannerlist(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java

@@ -69,9 +69,8 @@ public class ActBannerServiceImpl extends BaseServiceImpl<ActBannerDao, ActBanne
 
     @Override
     public List<ActBannerDTO> list(Map<String, Object> params) {
-        List<ActBannerEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<ActBannerDTO> entityList = baseDao.getAppActBannerlist(params);
-
+        return entityList;
-        return ConvertUtils.sourceToTarget(entityList, ActBannerDTO.class);
     }
 
     private QueryWrapper<ActBannerEntity> getWrapper(Map<String, Object> params) {

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java

@@ -55,6 +55,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.*;
 
@@ -340,7 +341,8 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
                 String kindnessTime = df.format((float) actInfoDTO.getActEndTime().getTime() / actInfoDTO.getActStartTime().getTime());
 
                 EpdcVolunteerKindnessTimeFormDTO formDto = new EpdcVolunteerKindnessTimeFormDTO();
-                formDto.setKindnessTime(Float.valueOf(kindnessTime));
+                BigDecimal b = new BigDecimal(kindnessTime);
+                formDto.setKindnessTime(b);
                 formDto.setUserId(actUserRelationDto.getUserId());
                 return userInfoFeignClient.addKindnessTime(formDto);
             } catch (Exception e) {

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml

@@ -80,4 +80,33 @@
         UPDATE epdc_act_banner SET `STATUS` = '0' WHERE	ACT_ID = #{actId}
     </update>
 
+    <select id="getAppActBannerlist" resultType="com.elink.esua.epdc.activity.ActBannerDTO">
+        SELECT
+        banner.ID,
+        banner.ACT_ID,
+        banner.TITLE,
+        banner.BANNER_IMG,
+        banner.BANNER_TYPE,
+        banner.URL,
+        banner.STATUS,
+        banner.STATUS_TIME,
+        banner.BANNER_POSITION,
+        banner.BROWSE_NUM,
+        banner.DEPT_ID,
+        banner.REVISION,
+        banner.DEL_FLAG,
+        banner.CREATED_BY,
+        banner.CREATED_TIME,
+        banner.UPDATED_BY,
+        banner.UPDATED_TIME
+        FROM
+        epdc_act_banner banner
+        WHERE
+        banner.DEL_FLAG = '0'
+        <if test="status != null and status != ''">
+            AND banner.STATUS = #{status}
+        </if>
+        ORDER BY
+        banner.CREATED_TIME
+    </select>
 </mapper>

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml

@@ -185,17 +185,19 @@
         <if test="timestamp != null">
             <![CDATA[ AND DATE_FORMAT(actInfo.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
+        <if test='actId != null and actId != "" '>
+            AND ID = #{actId}
+        </if>
         <if test='actType != null and actType != "" and actType == "0"'>
             <![CDATA[ AND DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{timestamp}
+            ORDER BY
+            actInfo.PUBLISH_TIME DESC
         </if>
         <if test='actType != null and actType != "" and actType == "1"'>
             <![CDATA[ AND DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
-        </if>
-        <if test='actId != null and actId != "" '>
-            AND ID = #{actId}
-        </if>
             ORDER BY
-        actInfo.CREATED_TIME DESC
+            actInfo.ACT_START_TIME
+        </if>
         LIMIT #{pageIndex},#{pageSize}
     </select>
     <select id="signupListItemsByApp" resultMap="actAppResultMap">
@@ -252,7 +254,7 @@
             and actInfo.ACT_STATUS = '1'
         </if>
         ORDER BY
-        actInfo.CREATED_TIME DESC
+        relation.SIGNUP_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>
     <resultMap type="com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO" id="actDetailAppResultMap">

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/KpiFeignClient.java

@@ -39,10 +39,11 @@ public interface KpiFeignClient {
     /**
      * 将手动打分存入元数据表
      *
+     * @param params
      * @return void
      * @author work@yujt.net.cn
      * @date 2019/12/25 14:06
      */
-    @GetMapping("kpi/manualScore/initMetaData")
+    @GetMapping("kpi/manualScore/initMetaData/{params}")
-    Result manualScoreToMetaData();
+    Result manualScoreToMetaData(@PathVariable("params") String params);
 }

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/KpiFeignClientFallBack.java

@@ -21,7 +21,7 @@ public class KpiFeignClientFallBack implements KpiFeignClient {
     }
 
     @Override
-    public Result manualScoreToMetaData() {
+    public Result manualScoreToMetaData(String params) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_KPI_SERVER, "manualScoreToMetaData", "");
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_KPI_SERVER, "manualScoreToMetaData", params);
     }
 }

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobKpiService.java

@@ -24,14 +24,15 @@ public interface ScheduleJobKpiService {
      * @author work@yujt.net.cn
      * @date 2019/12/17 14:43
      */
-    void startTaskByRuleCode(String ruleCode);
+    void startTaskByRuleCode(String params);
 
     /**
      * 将手动打分存入元数据表
      *
+     * @param jobParams
      * @return void
      * @author work@yujt.net.cn
      * @date 2019/12/25 14:05
      */
-    void manualScoreToMetaData();
+    void manualScoreToMetaData(String jobParams);
 }

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobKpiServiceImpl.java

@@ -23,13 +23,13 @@ public class ScheduleJobKpiServiceImpl implements ScheduleJobKpiService {
     }
 
     @Override
-    public void startTaskByRuleCode(String ruleCode) {
+    public void startTaskByRuleCode(String params) {
-        kpiFeignClient.startTaskByRuleCode(ModuleUtils.encodeByBase64(ruleCode));
+        kpiFeignClient.startTaskByRuleCode(ModuleUtils.encodeByBase64(params));
     }
 
     @Override
-    public void manualScoreToMetaData() {
+    public void manualScoreToMetaData(String params) {
-        kpiFeignClient.manualScoreToMetaData();
+        kpiFeignClient.manualScoreToMetaData(ModuleUtils.encodeByBase64(params));
     }
 
 

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiManualScoreTask.java

@@ -1,7 +1,6 @@
 package com.elink.esua.epdc.task;
 
 import com.elink.esua.epdc.service.ScheduleJobKpiService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -19,13 +18,13 @@ public class KpiManualScoreTask implements ITask {
 
     /**
      * 将手动打分存入元数据表
-     * @param ruleCode 
+     * @param jobParams
      * @return void
      * @author work@yujt.net.cn
      * @date 2019/12/25 14:02
      */
     @Override
-    public void run(String ruleCode) {
+    public void run(String jobParams) {
-        kpiService.manualScoreToMetaData();
+        kpiService.manualScoreToMetaData(jobParams);
     }
 }

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

@@ -34,12 +34,12 @@ public class ScheduleJobParamDTO {
         ScheduleJobParamDTO scheduleJobParam;
         try {
             scheduleJobParam = JSONObject.parseObject(params, ScheduleJobParamDTO.class);
+            if (null != scheduleJobParam) {
                 String dateStr = scheduleJobParam.getDateStr();
-            if (StringUtils.isBlank(dateStr)) {
+                if (StringUtils.isBlank(dateStr) || !ModuleUtils.isValidDate(dateStr, DateUtils.DATE_PATTERN)) {
-                scheduleJobParam.setDateStr(null);
-            } else if (!ModuleUtils.isValidDate(dateStr, DateUtils.DATE_PATTERN)) {
                     scheduleJobParam.setDateStr(null);
                 }
+            }
         } catch (Exception e) {
             log.error("定时任务参数格式错误，错误参数：{}", params);
             throw new RenException("定时任务参数格式错误");

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

@@ -143,9 +143,9 @@ public class KpiManualScoreController {
      * @author work@yujt.net.cn
      * @date 2019/12/25 14:10
      */
-    @GetMapping("initMetaData")
+    @GetMapping("initMetaData/{params}")
-    public Result initManualScoreToMetaData() {
+    public Result initManualScoreToMetaData(@PathVariable("params") String params) {
-        kpiManualScoreService.initManualScoreToMetaData();
+        kpiManualScoreService.initManualScoreToMetaData(params);
         return new Result();
     }
 }

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

@@ -141,5 +141,5 @@ public interface KpiManualScoreService extends BaseService<KpiManualScoreEntity>
      * @author work@yujt.net.cn
      * @date 2019/12/25 14:11
      */
-    void initManualScoreToMetaData();
+    void initManualScoreToMetaData(String params);
 }

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

@@ -18,6 +18,7 @@ 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.LocalDateUtils;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.KpiFieldConstant;
 import com.elink.esua.epdc.dao.*;
@@ -723,10 +724,11 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
     }
 
     @Override
-    public void initManualScoreToMetaData() {
+    public void initManualScoreToMetaData(String params) {
-        initManualScoreToMetaDataByCycle(KpiCycleEnum.KPI_CYCLE_MONTH.getValue());
+        ScheduleJobParamDTO byJobParams = new ScheduleJobParamDTO().getByJobParams(ModuleUtils.decodeFromBase64(params));
-        initManualScoreToMetaDataByCycle(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue());
+        initManualScoreToMetaDataByCycle(byJobParams, KpiCycleEnum.KPI_CYCLE_MONTH.getValue());
-        initManualScoreToMetaDataByCycle(KpiCycleEnum.KPI_CYCLE_YEAR.getValue());
+        initManualScoreToMetaDataByCycle(byJobParams, KpiCycleEnum.KPI_CYCLE_QUARTER.getValue());
+        initManualScoreToMetaDataByCycle(byJobParams, KpiCycleEnum.KPI_CYCLE_YEAR.getValue());
     }
 
     /**
@@ -757,13 +759,16 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
     /**
      * 根据考核周期，将手动打分初始化为元数据
      *
-     * @param kpiCycle
+     * @param jobParams 定时任务传入的参数
+     * @param kpiCycle  考核周期
      * @return void
      * @author work@yujt.net.cn
      * @date 2019/12/25 14:28
      */
-    private void initManualScoreToMetaDataByCycle(String kpiCycle) {
+    private void initManualScoreToMetaDataByCycle(ScheduleJobParamDTO jobParams, String kpiCycle) {
-        KpiMetaDataOfEventsFormDTO metaDataOfEventsForm = KpiLocalDateUtils.packKpiStartAndEndDate(kpiCycle, null);
+        // 获取考核周期开始日期和结束日期
+        KpiMetaDataOfEventsFormDTO metaDataOfEventsForm =
+                KpiLocalDateUtils.packKpiStartAndEndDate(kpiCycle, null != jobParams ? jobParams.getDateStr() : null);
         if (null == metaDataOfEventsForm) {
             return;
         }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/KpiLocalDateUtils.java

@@ -1,7 +1,6 @@
 package com.elink.esua.epdc.utils;
 
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
-import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils;
 import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
 import com.elink.esua.epdc.enums.KpiCycleEnum;
@@ -9,7 +8,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.time.LocalDate;
 import java.time.YearMonth;
-import java.util.Date;
 
 /**
  * 绩效考核相关日期工具

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -72,7 +73,7 @@ public class VolunteerInfoDTO implements Serializable {
     /**
      * 爱心时长(单位：分钟)
      */
-    private Integer kindnessTime;
+    private BigDecimal kindnessTime;
 
     /**
      * 参加活动次数

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcVolunteerKindnessTimeFormDTO.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.epdc.form;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  *
@@ -18,7 +19,7 @@ public class EpdcVolunteerKindnessTimeFormDTO implements Serializable {
     /**
      * 爱心时长
      */
-    private Float kindnessTime;
+    private BigDecimal kindnessTime;
 
     /**
      * 用户ID

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.epdc.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
@@ -47,7 +48,7 @@ public class EpdcVolunteerInfoResultDTO implements Serializable {
     /**
      * 爱心时长(单位：分钟)
      */
-    private Integer kindnessTime;
+    private BigDecimal kindnessTime;
 
     /**
      * 参加活动次数

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.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;
 
 /**
@@ -71,7 +72,7 @@ public class VolunteerInfoEntity extends BaseEpdcEntity {
     /**
      * 爱心时长(单位：分钟)
      */
-	private Integer kindnessTime;
+	private BigDecimal kindnessTime;
 
     /**
      * 参加活动次数

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.excel;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -53,7 +54,7 @@ public class VolunteerInfoExcel {
     private String identityNo;
 
     @Excel(name = "爱心时长(单位：分钟)")
-    private Integer kindnessTime;
+    private BigDecimal kindnessTime;
 
     @Excel(name = "参加活动次数")
     private Integer participationNum;

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java

@@ -217,8 +217,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         volunteerEntity.setRegistTime(new Date());// 注册时间
         volunteerEntity.setAuditStatus("1");      // 审核状态 默认审核通过
         volunteerEntity.setAuditTime(new Date()); // 审核时间
-        volunteerEntity.setKindnessTime(0);       // 爱心时长(单位：分钟)
-        volunteerEntity.setParticipationNum(0);   // 参加活动次数
         String address = volunteerEntity.getRoad()
                 .concat(StringUtils.isNotBlank(volunteerEntity.getVillageName()) ? volunteerEntity.getVillageName() : "")
                 .concat(StringUtils.isNotBlank(volunteerEntity.getDwellingPlace()) ? volunteerEntity.getDwellingPlace() : "");