diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 642f38081..dca044ff4 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -1314,7 +1314,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem List list = baseDao.selectListOfItemHandleProgressByMobile(itemId); // 处理多次拼接处理人信息问题 for (ItemHandleProgressResultDTO dto : list) { - String advice = dto.getAdvice(); + String advice = dto.getAdvice() == null ? "" : dto.getAdvice(); // 对包含【h_s】的数据进行重新组装 if (advice.contains("h_s") && advice.contains(" 办理人:")) { String hsStr = advice.substring(advice.indexOf("h_s")); @@ -3997,17 +3997,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem List updateList = new ArrayList(); String returnMsgBody = ""; List itemList = formDto.getItemList(); - for(int i = 0 ; i < itemList.size() ; i++){ + for (int i = 0; i < itemList.size(); i++) { AcceptItemDifficultyFormDTO acceptItemDifficultyFormDTO = itemList.get(i); - if("1".equals(acceptItemDifficultyFormDTO.getIsDifficulty())){ + if ("1".equals(acceptItemDifficultyFormDTO.getIsDifficulty())) { updateList.add(acceptItemDifficultyFormDTO.getSerialNum()); } } - if(updateList.size() > 0){ + if (updateList.size() > 0) { try { baseDao.updateBatchBySerialNum(updateList); - }catch (Exception e){ + } catch (Exception e) { logger.info(e); // 保存接口调用日志 this.saveInterfaceLog("", InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(), @@ -4025,6 +4025,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem /** * 根据经纬度查询部门下附近项目数据 + * * @param params * @return */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 106173756..f1ec1d7f6 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -1276,7 +1276,8 @@ AND img.DEL_FLAG = '0' WHERE hp.DEL_FLAG = '0' - AND hp.ITEM_ID = #{itemId} UNION ALL + AND hp.ITEM_ID = #{itemId} + UNION ALL SELECT item.ID, item.EVALUATION_TIME AS createdTime,