【网格实体化运作】-【添加满分记录】-（王童）-2020/12/9

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<KpiGridEntityEntity> {
      * @return
      */
     List<KpiGridEntityDTO> 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);
+
 }

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<SubInfoGridRelationEntity> {
-	
+
+    /**
+    * @describe: 查询记录
+    * @author wangtong
+    * @date 2020/12/9 10:14
+    * @params [infoId]
+    * @return java.util.List<com.elink.esua.epdc.entity.SubInfoGridRelationEntity>
+    */
+    List<SubInfoGridRelationEntity> selectListByInfoId(@Param("infoId") String infoId);
 }

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<List<SysDeptDTO>> getKpiGridIds(KpiGridIdsFormDTO dto);
+
+    /**
+     * 根据部门ID获取所有上级机构名称和ID拼接
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CompleteDeptDTO>
+     * @author lipengfei
+     * @date 2019/11/27 09:31
+     */
+    @GetMapping("sys/dept/getParentAndAllDept/{deptId}")
+    Result<ParentAndAllDeptDTO> getParentAndAllDept(@PathVariable("deptId") Long deptId);
 }

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<ParentAndAllDeptDTO> getParentAndAllDept(Long deptId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId);
+    }
+
 }

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<KpiGridEntityEntity> {
      * @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);
 }

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<SubInfoGridRelat
      * @date 2020-12-07
      */
     void delete(String[] ids);
+
+    /**
+    * @describe: 查询记录
+    * @author wangtong
+    * @date 2020/12/9 10:14
+    * @params [infoId]
+    * @return java.util.List<com.elink.esua.epdc.entity.SubInfoGridRelationEntity>
+    */
+    List<SubInfoGridRelationEntity> selectListByInfoId(String infoId);
 }

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<KpiGridEntityDao,
         return entity;
     }
 
+    @Override
+    public Result insertFullMarks(SubInfoGridRelationEntity sir) {
+        //删除数据库里已经存在的数据
+        baseDao.updateByDeptAndMonth(sir.getGridId(),sir.getMonthYear());
+        KpiGridEntityEntity entity = new KpiGridEntityEntity();
+        String deptId = sir.getGridId();
+        // 查询机构类型键值
+        Result<SysDeptDTO> 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<ParentAndAllDeptDTO> 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();
+    }
+
+
+
 }

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<SubInfoGridR
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<SubInfoGridRelationEntity> selectListByInfoId(String infoId) {
+        return baseDao.selectListByInfoId(infoId);
+    }
+
 }

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<SubPosition
     @Autowired
     private SubAuditRecordsLogService subAuditRecordsLogService;
 
+    @Autowired
+    private SubInfoGridRelationService subInfoGridRelationService;
+
+    @Autowired
+    private KpiGridEntityService kpiGridEntityService;
+
     @Override
     public PageData<SubPositionCheckInfoDTO> page(Map<String, Object> params) {
         log.info("1:"+SecurityUser.getUser().getId());
@@ -164,6 +173,11 @@ public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl<SubPosition
         //添加验收记录信息
         dto.setFlag(2);
         subAuditRecordsLogService.addFirstTrialRecords(dto);
+        //添加满分记录
+        List<SubInfoGridRelationEntity> relationList = subInfoGridRelationService.selectListByInfoId(dto.getInfoId());
+        for(SubInfoGridRelationEntity  sir : relationList){
+            kpiGridEntityService.insertFullMarks(sir);
+        }
         return new Result();
     }
 

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

@@ -90,6 +90,12 @@
             and MONTH_YEAR = #{monthYear}
         </if>
     </select>
+    <update id="updateByDeptAndMonth">
+        update epdc_kpi_grid_entity
+            set DEL_FLAG=1 ,UPDATED_TIME = now()
+        where DEPT_ID=#{gridId}
+                    AND MONTH_YEAR=#{monthYear}
+    </update>
 
 
 </mapper>

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

@@ -15,6 +15,9 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="selectListByInfoId" resultMap="subInfoGridRelationMap">
+        SELECT * FROM `epdc_sub_info_grid_relation` where DEL_FLAG=0 and INFO_ID=#{infoId}
+    </select>
 
 
 </mapper>