From 5875f4215ddb98da14bfb584238318bc2eefc1ff Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 22 Nov 2022 14:27:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E5=90=8C=E6=AD=A5=EF=BC=8C?= =?UTF-8?q?=E5=AF=B9=E4=BD=9C=E8=80=85=E5=8F=AA=E6=9C=89=E5=B7=A5=E5=8F=B7?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E7=9A=84=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/casetask/CaseDataSyncRunner.java | 16 +++++++++++++--- .../xboe/casetask/service/ICaseSyncService.java | 8 ++++++++ .../service/impl/CaseSyncServiceImpl.java | 7 +++++++ 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/servers/boe-server-case/src/main/java/com/xboe/casetask/CaseDataSyncRunner.java b/servers/boe-server-case/src/main/java/com/xboe/casetask/CaseDataSyncRunner.java index 1f88d5ff..a87aaeba 100644 --- a/servers/boe-server-case/src/main/java/com/xboe/casetask/CaseDataSyncRunner.java +++ b/servers/boe-server-case/src/main/java/com/xboe/casetask/CaseDataSyncRunner.java @@ -27,6 +27,7 @@ import com.xboe.casetask.entity.CaseSyncCustomize; import com.xboe.casetask.entity.CaseSyncLog; import com.xboe.casetask.entity.CaseSyncRecord; import com.xboe.casetask.entity.DictItem; +import com.xboe.casetask.entity.User; import com.xboe.casetask.service.ICaseSyncLogService; import com.xboe.casetask.service.ICaseSyncService; import com.xboe.common.utils.StringUtil; @@ -317,7 +318,7 @@ public class CaseDataSyncRunner { } - //用户的转化处理,各处异常处理 + //用户的转化处理,各种异常处理 String owner =csr.getCaseOwner(); if(StringUtils.isNotBlank(owner)) { int leftIdx=owner.indexOf("<"); @@ -336,8 +337,17 @@ public class CaseDataSyncRunner { } }else { - csr.setStatus(1); - csr.setErrorInfo(csr.getErrorInfo()+",caseOwner数据格式错误【"+owner+"】"); + //这种情况把它当成单独的工号处理 + User u= syncService.getByUserNo(owner); + if(u==null) { + csr.setStatus(1); + csr.setErrorInfo(csr.getErrorInfo()+",关联用户失败【"+csr.getCaseOwner()+"】"); + }else { + csr.setAuthorId(u.getId()); + csr.setAuthorName(u.getName()); + } +// csr.setStatus(1); +// csr.setErrorInfo(csr.getErrorInfo()+",caseOwner数据格式错误【"+owner+"】"); } }else { csr.setStatus(1); diff --git a/servers/boe-server-case/src/main/java/com/xboe/casetask/service/ICaseSyncService.java b/servers/boe-server-case/src/main/java/com/xboe/casetask/service/ICaseSyncService.java index 05b43b93..8bf05c5c 100644 --- a/servers/boe-server-case/src/main/java/com/xboe/casetask/service/ICaseSyncService.java +++ b/servers/boe-server-case/src/main/java/com/xboe/casetask/service/ICaseSyncService.java @@ -7,6 +7,7 @@ import com.xboe.casetask.entity.CaseSyncCustomize; import com.xboe.casetask.entity.CaseSyncRecord; import com.xboe.casetask.entity.Cases; import com.xboe.casetask.entity.DictItem; +import com.xboe.casetask.entity.User; import com.xboe.common.PageList; public interface ICaseSyncService { @@ -18,6 +19,13 @@ public interface ICaseSyncService { */ String getIdByUserNo(String userNo); + /** + * 根据工号，查询用户信息 + * @param userNo + * @return + */ + User getByUserNo(String userNo); + /** * 获得所有的组织领域 * @return diff --git a/servers/boe-server-case/src/main/java/com/xboe/casetask/service/impl/CaseSyncServiceImpl.java b/servers/boe-server-case/src/main/java/com/xboe/casetask/service/impl/CaseSyncServiceImpl.java index e5e122d1..0d403c93 100644 --- a/servers/boe-server-case/src/main/java/com/xboe/casetask/service/impl/CaseSyncServiceImpl.java +++ b/servers/boe-server-case/src/main/java/com/xboe/casetask/service/impl/CaseSyncServiceImpl.java @@ -21,6 +21,7 @@ import com.xboe.casetask.entity.CaseSyncRecord; import com.xboe.casetask.entity.Cases; import com.xboe.casetask.entity.CasesMajorType; import com.xboe.casetask.entity.DictItem; +import com.xboe.casetask.entity.User; import com.xboe.casetask.service.ICaseSyncService; import com.xboe.common.OrderCondition; import com.xboe.common.PageList; @@ -351,4 +352,10 @@ public class CaseSyncServiceImpl implements ICaseSyncService{ return recordDao.findDictItemByName(name1, name2); } + @Override + public User getByUserNo(String userNo) { + User user=userDao.findOne(FieldFilters.eq("userNo", userNo)); + return user; + } + }