diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java index 1e11c6c8a..06ab21e54 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java @@ -11,8 +11,8 @@ public interface PushToCityGridConstant { /** * 市平台地址(60测试/120正式) */ -// String URL_PREFIX = "http://60.166.25.58:6140/sjgl/a/case"; - String URL_PREFIX = "http://120.221.72.162:6140/sjgl/a/case"; + String URL_PREFIX = "http://60.166.25.58:6140/sjgl/a/case"; +// String URL_PREFIX = "http://120.221.72.162:6140/sjgl/a/case"; /** * 民生诉求上报 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 c445fa072..c848114ca 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 @@ -4400,7 +4400,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //走到这程序不管往下是去结案还是推初验申请都要先推评价 //诉求评价 pushToCityGridService.evaluation(itemId); - //2.判断是发展、执法诉求的(这两个诉求项目必须走诉求初验终验逻辑)或者是评价了不满意的民生诉求的需要走市里的初验申请 + //2.只有首次评价的判断是发展、执法诉求的(这两个诉求项目必须走诉求初验终验逻辑)或者是评价了不满意的民生诉求的需要走市里的初验申请 QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("item_id", itemId); wrapper.eq("del_flag", "0"); @@ -4417,7 +4417,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem long id = 0; String name = "街道"; if (StringUtils.isNotBlank(entity.getAllDeptIds()) && StringUtils.isNotBlank(entity.getAllDeptNames())) { - String[] idList = entity.getAllDeptIds().split("-"); + String[] idList = entity.getAllDeptIds().split(","); String[] nameList = entity.getAllDeptNames().split("-"); id = idList.length > 1 ? Long.parseLong(idList[1]) : 0; name = nameList.length > 1 ? nameList[1] : "街道"; @@ -4432,8 +4432,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem return; } - //3.判断评价结果,未评价的赋值为满意并且结案给市平台推送;已评价的结果为满意直接结案给市平台推送 - //有过反馈的或者是民生诉求没有苹果或者评论满意的直接结案 + //3.判断有过反馈的直接结案,是首次评论的则是民生诉求的没有评价的或者评论满意的直接结案 if (CollUtil.isNotEmpty(feedbackEntityList) || ("0".equals(entity.getPeopleFlag()) && (null == entity.getEvaluationScore() || 0 != entity.getEvaluationScore()))) { QueryWrapper hWrapper = new QueryWrapper<>(); @@ -4781,18 +4780,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem } } - itemHandleProcessDto.setGridPartyname("结案"); - itemHandleProcessDto.setGridTaskcnname("区中心"); + itemHandleProcessDto.setGridTaskcnname("结案"); item.setEvaluationState(NumConstant.ZERO_STR); item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue()); //未评价的赋值默认评价结果为满意 if (null == item.getEvaluationScore()) { item.setEvaluationScore(2); //item.setEvaluationContent(); - Calendar calendar = new GregorianCalendar(); - calendar.setTime(formDto.getCreatedTime()); - calendar.add(Calendar.DATE, 1); - item.setEvaluationTime(calendar.getTime()); + item.setEvaluationTime(new Date()); } updateById(item); }