diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java index d6caa9b0f..3c75b2837 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java +++ b/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) { diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateUpdateDeptOfficerCountDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateUpdateDeptOfficerCountDTO.java new file mode 100644 index 000000000..bc237a07b --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java index fed3f2b48..746c4febc 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java +++ b/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 { List getEvaluateOfficerCount(Map params); List getDeptOfficer(Map 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); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java index ccefeb684..352dd730a 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java +++ b/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 = "单位职务") diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java index 8cdeb3eed..0178f4f71 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java +++ b/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 list(Map params) { List 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 + + update epdc_evaluate_dept set OFFICER_COUNT = OFFICER_COUNT+1 where DEPT_ID = #{deptId} + + + + 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 epdc_evaluate_dept set OFFICER_COUNT = #{officerCount} where DEPT_ID = #{deptId} + + + + delete from epdc_evaluate_info where OFFICER_ID in + + #{id} + + + + + delete from epdc_evaluate_detail where INFO_ID in ( + select ID from epdc_evaluate_info where OFFICER_ID in + + #{id} + + ) + + + + delete from epdc_evaluate_info where OFFICER_ID in ( + select ID from epdc_evaluate_officer where DEPT_ID = #{deptId} + ) + + + + 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} + ) + ) + + diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java index 5dc823228..190060322 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java +++ b/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 { * @since 2020/2/6 21:24 */ void updateBannerByActId(String actId); + + /** + * @Description: 手机端banner查询，根据创建时间 正序排列 + * @Param: [params] + * @return: java.util.List + * @Author: zy + * @Date: 2020-02-08 + */ + List getAppActBannerlist(Map params); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java index e5d5ebe52..4a16fe7bd 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java +++ b/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 list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, ActBannerDTO.class); + List entityList = baseDao.getAppActBannerlist(params); + return entityList; } private QueryWrapper getWrapper(Map params) { diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java index 38dde64aa..60eccac5d 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java +++ b/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 + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml index 17593ca5a..028e2b916 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml @@ -185,17 +185,19 @@ #{timestamp} + + AND ID = #{actId} + = ]]> #{timestamp} + ORDER BY + actInfo.PUBLISH_TIME DESC #{timestamp} + ORDER BY + actInfo.ACT_START_TIME - - AND ID = #{actId} - - ORDER BY - actInfo.CREATED_TIME DESC LIMIT #{pageIndex},#{pageSize} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/KpiFeignClient.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/KpiFeignClient.java index 61b783185..b4c17cbbb 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/KpiFeignClient.java +++ b/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") - Result manualScoreToMetaData(); + @GetMapping("kpi/manualScore/initMetaData/{params}") + Result manualScoreToMetaData(@PathVariable("params") String params); } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/KpiFeignClientFallBack.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/KpiFeignClientFallBack.java index 7dd9ef2ad..8c3d024a3 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/KpiFeignClientFallBack.java +++ b/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() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_KPI_SERVER, "manualScoreToMetaData", ""); + public Result manualScoreToMetaData(String params) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_KPI_SERVER, "manualScoreToMetaData", params); } } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobKpiService.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobKpiService.java index dc6ba6803..0899e7aff 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobKpiService.java +++ b/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); } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobKpiServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobKpiServiceImpl.java index eb0d5231f..fd6e2defe 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobKpiServiceImpl.java +++ b/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) { - kpiFeignClient.startTaskByRuleCode(ModuleUtils.encodeByBase64(ruleCode)); + public void startTaskByRuleCode(String params) { + kpiFeignClient.startTaskByRuleCode(ModuleUtils.encodeByBase64(params)); } @Override - public void manualScoreToMetaData() { - kpiFeignClient.manualScoreToMetaData(); + public void manualScoreToMetaData(String params) { + kpiFeignClient.manualScoreToMetaData(ModuleUtils.encodeByBase64(params)); } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiManualScoreTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiManualScoreTask.java index acdc82955..613b2e967 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiManualScoreTask.java +++ b/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) { - kpiService.manualScoreToMetaData(); + public void run(String jobParams) { + kpiService.manualScoreToMetaData(jobParams); } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java index 83c454ae4..82b0a2b41 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java @@ -34,11 +34,11 @@ public class ScheduleJobParamDTO { ScheduleJobParamDTO scheduleJobParam; try { scheduleJobParam = JSONObject.parseObject(params, ScheduleJobParamDTO.class); - String dateStr = scheduleJobParam.getDateStr(); - if (StringUtils.isBlank(dateStr)) { - scheduleJobParam.setDateStr(null); - } else if (!ModuleUtils.isValidDate(dateStr, DateUtils.DATE_PATTERN)) { - scheduleJobParam.setDateStr(null); + if (null != scheduleJobParam) { + String dateStr = scheduleJobParam.getDateStr(); + if (StringUtils.isBlank(dateStr) || !ModuleUtils.isValidDate(dateStr, DateUtils.DATE_PATTERN)) { + scheduleJobParam.setDateStr(null); + } } } catch (Exception e) { log.error("定时任务参数格式错误，错误参数：{}", params); diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java index b89448a82..81976c768 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java +++ b/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") - public Result initManualScoreToMetaData() { - kpiManualScoreService.initManualScoreToMetaData(); + @GetMapping("initMetaData/{params}") + public Result initManualScoreToMetaData(@PathVariable("params") String params) { + kpiManualScoreService.initManualScoreToMetaData(params); return new Result(); } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreService.java index 2b2fb45d2..4a73c7804 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreService.java +++ b/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 * @author work@yujt.net.cn * @date 2019/12/25 14:11 */ - void initManualScoreToMetaData(); + void initManualScoreToMetaData(String params); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java index 141be68a9..e92d04823 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java +++ b/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