From 8dbfe02c7b0bd04ed110ef994801ad58f0a967e5 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 10 Dec 2020 15:06:55 +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=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8=E3=80=91-?=
 =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/12/10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SubPositionCheckInfoServiceImpl.java  | 10 ++++++----
 .../main/resources/mapper/SubPositionCheckInfoDao.xml  |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

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 23b228d83..01182225c 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
@@ -173,10 +173,12 @@ 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);
+        if(!"4".equals(dto.getCheckResult())){
+            //添加满分记录
+            List<SubInfoGridRelationEntity> 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/SubPositionCheckInfoDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml
index af54cf19e..8f15b5f53 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml
@@ -23,6 +23,7 @@
     </resultMap>
     <select id="getSubPositionList" resultType="com.elink.esua.epdc.dto.SubPositionCheckInfoDTO">
         select id,
+             DEPT_NAME,
              COMMUNITY_NAME,
 			 GRID_NAMES,
 			 SUBMIT_TIME,