Commit b9b56e7093329360738215fdf100cd3a9c97922b

Authored by 颜惠青
2 parents a0da87a8 f6df60d2

Merge branch 'dev'

urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/constant/BpmCommonConstant.java
... ... @@ -181,8 +181,6 @@ public class BpmCommonConstant {
181 181 public static final String AI_DISPATCHER = "AI_dispatcher";
182 182 /*养护级别-字典key*/
183 183 public static final String CONSERVE_LEVEL = "conserve_level";
184   -
185   - public static final String SANHAI_COMPANY = "sanhai_compamys";
186 184 //---------------------------------------------------------------------------------
187 185  
188 186 /**
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/enums/ErrorCodeConstants.java
... ... @@ -57,7 +57,5 @@ public interface ErrorCodeConstants {
57 57 ErrorCode APP_AI_USER_ROLE_ERROR = new ErrorCode(1-900-004-004, "该登录人不是 AI工单派发人员,无法发起流程!");
58 58  
59 59 ErrorCode APP_WORK_AI_ROLE_ILLEGLE = new ErrorCode(1-900-004-005, "该登录人即是 大区经理 角色,又是 AI工单派发人员,无法发起流程!");
60   -
61   - ErrorCode SANHAI_COMPANY_NOT_EXISTS = new ErrorCode(1-900-004-006, "三海道路归属部门的id,字典项不存在!");
62 60 }
63 61  
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java
... ... @@ -305,19 +305,8 @@ public class BpmAIServiceImpl implements BpmAIService{
305 305  
306 306 @Override
307 307 public boolean isSanhai(Long companyId) {
308   - List<DictDataRespDTO> dictData = dictDataCommonApi.getDictDataList(SANHAI_COMPANY);
309   - if(null == dictData || dictData.size()==0){
310   - throw exception(SANHAI_COMPANY_NOT_EXISTS);
311   - }
312 308 List<Long> sanHaiRoadId = new ArrayList<>();
313   - for(DictDataRespDTO dto:dictData){
314   - try {
315   - sanHaiRoadId.add(Long.parseLong(dto.getValue()));
316   - }catch (Exception e){
317   - throw exception(SANHAI_COMPANY_NOT_EXISTS);
318   - }
319   - }
320   - //sanHaiRoadId.add(115L); // 目前写死 ,上面改为从字典值获取258
  309 + sanHaiRoadId.add(115L); // TODO 目前写死
321 310 //是否三海路段
322 311 boolean isSanhai = sanHaiRoadId.contains(companyId);
323 312 return isSanhai;
... ...