From 051f87a01e8b14c32846d2ba3f97205b4c05e42d Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 9 Dec 2020 10:58:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E5=8C=96=E8=BF=90=E4=BD=9C=E3=80=91-=E3=80=90=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=BB=A1=E5=88=86=E8=AE=B0=E5=BD=95=E3=80=91-?= =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/12/9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dao/KpiGridEntityDao.java | 11 ++++ .../esua/epdc/dao/SubInfoGridRelationDao.java | 13 ++++- .../esua/epdc/feign/AdminFeignClient.java | 13 ++++- .../fallback/AdminFeignClientFallback.java | 6 +++ .../epdc/service/KpiGridEntityService.java | 10 ++++ .../service/SubInfoGridRelationService.java | 9 ++++ .../impl/KpiGridEntityServiceImpl.java | 54 +++++++++++++++++++ .../impl/SubInfoGridRelationServiceImpl.java | 5 ++ .../impl/SubPositionCheckInfoServiceImpl.java | 14 +++++ .../resources/mapper/KpiGridEntityDao.xml | 6 +++ .../mapper/SubInfoGridRelationDao.xml | 3 ++ 11 files changed, 142 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java index 5a38b7b04..09b8db840 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiGridEntityDao.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.dto.KpiGridEntityDTO; import com.elink.esua.epdc.dto.form.CheckIsScoredFormDTO; import com.elink.esua.epdc.entity.KpiGridEntityEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -47,4 +48,14 @@ public interface KpiGridEntityDao extends BaseDao { * @return */ List getDuplicateData(CheckIsScoredFormDTO checkIsScoredFormDTO); + + /** + * @describe: 删除记录 + * @author wangtong + * @date 2020/12/9 10:28 + * @params [gridId, monthYear] + * @return void + */ + void updateByDeptAndMonth(@Param("gridId") String gridId,@Param("monthYear") String monthYear); + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubInfoGridRelationDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubInfoGridRelationDao.java index 8aa4e0d1b..15b6a9481 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubInfoGridRelationDao.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubInfoGridRelationDao.java @@ -20,6 +20,9 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.entity.SubInfoGridRelationEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 网格关系表 @@ -29,5 +32,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface SubInfoGridRelationDao extends BaseDao { - + + /** + * @describe: 查询记录 + * @author wangtong + * @date 2020/12/9 10:14 + * @params [infoId] + * @return java.util.List + */ + List selectListByInfoId(@Param("infoId") String infoId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index d58dfbca5..f0e8a8cf5 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO; +import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO; import com.elink.esua.epdc.dto.epdc.form.KpiGridIdsFormDTO; @@ -10,7 +11,6 @@ import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback; -import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; @@ -118,4 +118,15 @@ public interface AdminFeignClient { */ @PostMapping("/sys/dept/getKpiGridIds") Result> getKpiGridIds(KpiGridIdsFormDTO dto); + + /** + * 根据部门ID获取所有上级机构名称和ID拼接 + * + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author lipengfei + * @date 2019/11/27 09:31 + */ + @GetMapping("sys/dept/getParentAndAllDept/{deptId}") + Result getParentAndAllDept(@PathVariable("deptId") Long deptId); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index 6c681cb0a..f17315aab 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO; +import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO; import com.elink.esua.epdc.dto.epdc.form.KpiGridIdsFormDTO; @@ -69,4 +70,9 @@ public class AdminFeignClientFallback implements AdminFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getKpiGridIds", dto); } + @Override + public Result getParentAndAllDept(Long deptId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId); + } + } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiGridEntityService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiGridEntityService.java index e64e9efc5..7fdf5d0ff 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiGridEntityService.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiGridEntityService.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.KpiGridEntityDTO; import com.elink.esua.epdc.entity.KpiGridEntityEntity; +import com.elink.esua.epdc.entity.SubInfoGridRelationEntity; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -121,4 +122,13 @@ public interface KpiGridEntityService extends BaseService { * @date 2020-06-16 */ Result importManualScoreExcel(MultipartFile file); + + /** + * @describe: 插入满分记录 + * @author wangtong + * @date 2020/12/9 10:19 + * @params [sir] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result insertFullMarks(SubInfoGridRelationEntity sir); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubInfoGridRelationService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubInfoGridRelationService.java index 1896119fc..e9282f865 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubInfoGridRelationService.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubInfoGridRelationService.java @@ -92,4 +92,13 @@ public interface SubInfoGridRelationService extends BaseService + */ + List selectListByInfoId(String infoId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java index 84bc32147..1723172ed 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiGridEntityServiceImpl.java @@ -37,11 +37,13 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.KpiGridEntityDao; import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO; import com.elink.esua.epdc.dto.KpiGridEntityDTO; +import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO; import com.elink.esua.epdc.dto.form.CheckIsScoredFormDTO; import com.elink.esua.epdc.entity.KpiGridEntityEntity; +import com.elink.esua.epdc.entity.SubInfoGridRelationEntity; import com.elink.esua.epdc.excel.KpiGridEntityExcel; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.redis.KpiGridEntityRedis; @@ -459,4 +461,56 @@ public class KpiGridEntityServiceImpl extends BaseServiceImpl result = adminFeignClient.get(Long.valueOf(deptId)); + SysDeptDTO sysDeptDTO = result.getData(); + // 设置部门类别 + entity.setDeptTypeKey(sysDeptDTO.getTypeKey()); + + entity.setDeptId(sir.getGridId()); + entity.setDeptName(sysDeptDTO.getName()); + entity.setMonthYear(sir.getMonthYear()); + + Result dtoResult = adminFeignClient.getParentAndAllDept(Long.parseLong(sir.getGridId())); + ParentAndAllDeptDTO deptDTO = dtoResult.getData(); + // 父所有部门 + entity.setParentDeptIds(deptDTO.getParentDeptIds()); + entity.setParentDeptNames(deptDTO.getParentDeptNames()); + // 所有部门 + entity.setAllDeptIds(deptDTO.getAllDeptIds()); + entity.setAllDeptNames(deptDTO.getAllDeptNames()); + // 计算总分 + DecimalFormat df = new DecimalFormat("#.##"); + entity.setStationEstablishmentBorder("1"); + entity.setStationEstablishmentLayout("2"); + entity.setStationEstablishmentStandard("1"); + Double stationEstablishmentBorderDouble = Double.parseDouble(entity.getStationEstablishmentBorder()); + Double stationEstablishmentLayoutDouble = Double.parseDouble(entity.getStationEstablishmentLayout()); + Double stationEstablishmentStandardDouble = Double.parseDouble(entity.getStationEstablishmentStandard()); + entity.setStationEstablishment(df.format(stationEstablishmentBorderDouble + stationEstablishmentLayoutDouble + stationEstablishmentStandardDouble)); + entity.setStaffingPlacementInformation("1"); + entity.setStaffingPlacementOfficer("1"); + entity.setStaffingPlacementPersonnel("1"); + Double staffingPlacementInformationDouble = Double.parseDouble(entity.getStaffingPlacementInformation()); + Double staffingPlacementOfficerDouble = Double.parseDouble(entity.getStaffingPlacementOfficer()); + Double staffingPlacementPersonnelDouble = Double.parseDouble(entity.getStaffingPlacementPersonnel()); + entity.setStaffingPlacement(df.format(staffingPlacementInformationDouble + staffingPlacementOfficerDouble + staffingPlacementPersonnelDouble)); + entity.setGridOperationOperational("2"); + entity.setGridOperationWorkplan("1"); + Double gridOperationOperationalDouble = Double.parseDouble(entity.getGridOperationOperational()); + Double gridOperationWorkplanDouble = Double.parseDouble(entity.getGridOperationWorkplan()); + entity.setGridOperation(df.format(gridOperationOperationalDouble + gridOperationWorkplanDouble)); + + insert(entity); + return new Result(); + } + + + } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubInfoGridRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubInfoGridRelationServiceImpl.java index 19f951ae1..388f07fd9 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubInfoGridRelationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubInfoGridRelationServiceImpl.java @@ -101,4 +101,9 @@ public class SubInfoGridRelationServiceImpl extends BaseServiceImpl selectListByInfoId(String infoId) { + return baseDao.selectListByInfoId(infoId); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java index 859b1ee93..0acfd9264 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java @@ -29,9 +29,12 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.SubPositionCheckInfoDao; import com.elink.esua.epdc.dto.SubPositionCheckInfoDTO; import com.elink.esua.epdc.dto.form.FirstTrialFormDTO; +import com.elink.esua.epdc.entity.SubInfoGridRelationEntity; import com.elink.esua.epdc.entity.SubPositionCheckInfoEntity; import com.elink.esua.epdc.redis.SubPositionCheckInfoRedis; +import com.elink.esua.epdc.service.KpiGridEntityService; import com.elink.esua.epdc.service.SubAuditRecordsLogService; +import com.elink.esua.epdc.service.SubInfoGridRelationService; import com.elink.esua.epdc.service.SubPositionCheckInfoService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -61,6 +64,12 @@ public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl page(Map params) { log.info("1:"+SecurityUser.getUser().getId()); @@ -164,6 +173,11 @@ public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl relationList = subInfoGridRelationService.selectListByInfoId(dto.getInfoId()); + for(SubInfoGridRelationEntity sir : relationList){ + kpiGridEntityService.insertFullMarks(sir); + } return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml index 23549d729..c21962c66 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiGridEntityDao.xml @@ -90,6 +90,12 @@ and MONTH_YEAR = #{monthYear} + + update epdc_kpi_grid_entity + set DEL_FLAG=1 ,UPDATED_TIME = now() + where DEPT_ID=#{gridId} + AND MONTH_YEAR=#{monthYear} + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubInfoGridRelationDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubInfoGridRelationDao.xml index 86290daf0..6b74e7b67 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubInfoGridRelationDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubInfoGridRelationDao.xml @@ -15,6 +15,9 @@ + \ No newline at end of file