From 513f9fda248ddac20a72c47ad8a8490926484a7b Mon Sep 17 00:00:00 2001
From: wenc000 <450292408@qq.com>
Date: Tue, 31 Mar 2020 22:47:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/check/impl/CheckServiceImpl.java         | 12 ------------
 .../service/gridpersonnel/IGridPersonnelService.java | 11 +----------
 .../gridpersonnel/impl/GridPersonnelServiceImpl.java |  5 -----
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/main/java/com/cm/inspection/service/check/impl/CheckServiceImpl.java b/src/main/java/com/cm/inspection/service/check/impl/CheckServiceImpl.java
index f142da1..f9a423d 100644
--- a/src/main/java/com/cm/inspection/service/check/impl/CheckServiceImpl.java
+++ b/src/main/java/com/cm/inspection/service/check/impl/CheckServiceImpl.java
@@ -16,10 +16,6 @@ import com.cm.inspection.pojo.vos.check.CheckVO;
 import com.cm.inspection.pojo.vos.hiddendangerreport.HiddenDangerReportVO;
 import com.cm.inspection.service.BaseService;
 import com.cm.inspection.service.check.ICheckService;
-<<<<<<< HEAD
-=======
-import com.cm.inspection.service.enterpriseofgridoperator.IEnterpriseOfGridOperatorService;
->>>>>>> 68f1a72fb99bfded0696f942c5fb73af22e89872
 import com.cm.inspection.service.gridpersonnel.IGridPersonnelService;
 import com.cm.inspection.service.hiddendangerreport.IHiddenDangerReportService;
 import com.cm.inspection.service.process.IProcessService;
@@ -101,7 +97,6 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
             LOG.debug("2.isAllPass: {}", isAllPass);
             params.put("isAllPass", isAllPass);
             if (isAllPass == 0) {
-<<<<<<< HEAD
                 LOG.debug("3.检查项没有完全通过，需要复查");
                 params.put("reReporter", userId);
                 processService.setTaskVariableByTaskId(task.getId(), "isReport", 1);
@@ -125,13 +120,6 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
             processService.setTaskVariableByTaskId(task.getId(), "isLeader", 1);
             LOG.debug("2.标记上一次的检查项");
             processService.setTaskVariableByTaskId(task.getId(), "lastCheckId", checkId);
-=======
-                LOG.debug("检查项没有完全通过，需要复查");
-                params.put("reReporter", userId);
-            }
-        } else {
-            List<GridPersonnelDTO> gridPersonnelDTOs = gridPersonnelService.listGridPersonnelByUserId(userId);
->>>>>>> 68f1a72fb99bfded0696f942c5fb73af22e89872
         }
         processService.saveTaskCompleteByTaskId(task.getId(), params);
     }
diff --git a/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java b/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java
index 994369f..df21789 100644
--- a/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java
+++ b/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java
@@ -109,7 +109,6 @@ public interface IGridPersonnelService {
     SuccessResultList<List<GridPersonnelDTO>> listPageGridPersonnel(ListPage page) throws SearchException;
 
     /**
-<<<<<<< HEAD
      * 网格人员列表（通过用户名和是否是网格员）
      *
      * @param userId
@@ -118,13 +117,5 @@ public interface IGridPersonnelService {
      * @throws SearchException
      */
     List<GridPersonnelDTO> listGridPersonnelByUserIdAndIsGridOperator(String userId, int isGridOperator) throws SearchException;
-=======
-     * 通过UserId
-     *
-     * @param userId
-     * @return
-     * @throws SearchException
-     */
-    List<GridPersonnelDTO> listGridPersonnelByUserId(String userId) throws SearchException;
->>>>>>> 68f1a72fb99bfded0696f942c5fb73af22e89872
+
 }
diff --git a/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java b/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java
index 5f0a336..bdf97eb 100644
--- a/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java
+++ b/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java
@@ -143,16 +143,11 @@ public class GridPersonnelServiceImpl extends BaseService implements IGridPerson
     }
 
     @Override
-<<<<<<< HEAD
     public List<GridPersonnelDTO> listGridPersonnelByUserIdAndIsGridOperator(String userId, int isGridOperator) throws SearchException {
         Map<String, Object> params = getHashMap(2);
         params.put("userId", userId);
         params.put("isGridOperator", isGridOperator);
         return listGridPersonnel(params);
-=======
-    public List<GridPersonnelDTO> listGridPersonnelByUserId(String userId) throws SearchException {
-        return null;
->>>>>>> 68f1a72fb99bfded0696f942c5fb73af22e89872
     }
 
 }