Tenlion/btyjj-inspection
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wenc000 2020-04-01 09:51:41 +08:00
parent c828375cbf
commit bccda8c4c7
3 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/cm/inspection/service/check/impl/CheckServiceImpl.java
View File

@ -16,10 +16,6 @@ import com.cm.inspection.pojo.vos.check.CheckVO;
import com.cm.inspection.pojo.vos.hiddendangerreport.HiddenDangerReportVO; import com.cm.inspection.pojo.vos.hiddendangerreport.HiddenDangerReportVO;
import com.cm.inspection.service.BaseService; import com.cm.inspection.service.BaseService;
import com.cm.inspection.service.check.ICheckService; 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.gridpersonnel.IGridPersonnelService;
import com.cm.inspection.service.hiddendangerreport.IHiddenDangerReportService; import com.cm.inspection.service.hiddendangerreport.IHiddenDangerReportService;
import com.cm.inspection.service.process.IProcessService; import com.cm.inspection.service.process.IProcessService;
@ -101,7 +97,6 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
LOG.debug("2.isAllPass: {}", isAllPass); LOG.debug("2.isAllPass: {}", isAllPass);
params.put("isAllPass", isAllPass); params.put("isAllPass", isAllPass);
if (isAllPass == 0) { if (isAllPass == 0) {
<<<<<<< HEAD
LOG.debug("3.检查项没有完全通过，需要复查"); LOG.debug("3.检查项没有完全通过，需要复查");
params.put("reReporter", userId); params.put("reReporter", userId);
processService.setTaskVariableByTaskId(task.getId(), "isReport", 1); processService.setTaskVariableByTaskId(task.getId(), "isReport", 1);
@ -125,13 +120,6 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
processService.setTaskVariableByTaskId(task.getId(), "isLeader", 1); processService.setTaskVariableByTaskId(task.getId(), "isLeader", 1);
LOG.debug("2.标记上一次的检查项"); LOG.debug("2.标记上一次的检查项");
processService.setTaskVariableByTaskId(task.getId(), "lastCheckId", checkId); 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); processService.saveTaskCompleteByTaskId(task.getId(), params);
} }

11
src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java
View File

@ -109,7 +109,6 @@ public interface IGridPersonnelService {
SuccessResultList<List<GridPersonnelDTO>> listPageGridPersonnel(ListPage page) throws SearchException; SuccessResultList<List<GridPersonnelDTO>> listPageGridPersonnel(ListPage page) throws SearchException;
/** /**
<<<<<<< HEAD
* 网格人员列表（通过用户名和是否是网格员） * 网格人员列表（通过用户名和是否是网格员）
* *
* @param userId * @param userId
@ -118,13 +117,5 @@ public interface IGridPersonnelService {
* @throws SearchException * @throws SearchException
*/ */
List<GridPersonnelDTO> listGridPersonnelByUserIdAndIsGridOperator(String userId, int isGridOperator) 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
} }

5
src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java
View File

@ -143,16 +143,11 @@ public class GridPersonnelServiceImpl extends BaseService implements IGridPerson
} }
@Override @Override
<<<<<<< HEAD
public List<GridPersonnelDTO> listGridPersonnelByUserIdAndIsGridOperator(String userId, int isGridOperator) throws SearchException { public List<GridPersonnelDTO> listGridPersonnelByUserIdAndIsGridOperator(String userId, int isGridOperator) throws SearchException {
Map<String, Object> params = getHashMap(2); Map<String, Object> params = getHashMap(2);
params.put("userId", userId); params.put("userId", userId);
params.put("isGridOperator", isGridOperator); params.put("isGridOperator", isGridOperator);
return listGridPersonnel(params); return listGridPersonnel(params);
=======
public List<GridPersonnelDTO> listGridPersonnelByUserId(String userId) throws SearchException {
return null;
>>>>>>> 68f1a72fb99bfded0696f942c5fb73af22e89872
} }
} }