diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index ba9f7dde8..3a2e00628 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -942,6 +942,13 @@ public class ItemController { return new Result(); } +// public static void main(String[] args) { +// AppealFormDTO appealFormDTO = new AppealFormDTO(); +// appealFormDTO.setSsyy("111"); +// String s = JSONObject.toJSONString(appealFormDTO); +// System.out.println(s); +// } + /** * @param * @return com.elink.esua.epdc.commons.tools.utils.Result 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 f94f7480b..69d20bba7 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 @@ -6442,27 +6442,27 @@ public class ItemServiceImpl extends BaseServiceImpl implem // // } - if ("1".equals(itemHotlineEntity.getCbFlag())) { - if (StringUtils.isNotBlank(itemHotlineEntity.getCbid())) { - LambdaQueryWrapper itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); - itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getCbid()) - .eq(ItemEntity::getAppealSource, NumConstant.THREE_STR) - .eq(ItemEntity::getDelFlag, "0"); - if (baseDao.selectList(itemEntityLambdaQueryWrapper).size() > 0) { - return true; - } - } - } else { - if (StringUtils.isNotBlank(itemHotlineEntity.getSqid())) { - LambdaQueryWrapper itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); - itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getSqid()) - .eq(ItemEntity::getAppealSource, NumConstant.THREE_STR) - .eq(ItemEntity::getDelFlag, "0"); - if (baseDao.selectList(itemEntityLambdaQueryWrapper).size() > 0) { - return true; - } - } - } +// if ("1".equals(itemHotlineEntity.getCbFlag())) { +// if (StringUtils.isNotBlank(itemHotlineEntity.getCbid())) { +// LambdaQueryWrapper itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); +// itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getCbid()) +// .eq(ItemEntity::getAppealSource, NumConstant.THREE_STR) +// .eq(ItemEntity::getDelFlag, "0"); +// if (baseDao.selectList(itemEntityLambdaQueryWrapper).size() > 0) { +// return true; +// } +// } +// } else { +// if (StringUtils.isNotBlank(itemHotlineEntity.getSqid())) { +// LambdaQueryWrapper itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); +// itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getSqid()) +// .eq(ItemEntity::getAppealSource, NumConstant.THREE_STR) +// .eq(ItemEntity::getDelFlag, "0"); +// if (baseDao.selectList(itemEntityLambdaQueryWrapper).size() > 0) { +// return true; +// } +// } +// } ItemEntity itemEntity = new ItemEntity(); @@ -7349,7 +7349,24 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public void backAudit(AppealResultDTO resultDTO) { - ItemEntity item = baseDao.getItemBySqid(resultDTO.getSqid()); +// ItemEntity item = baseDao.getItemBySqid(resultDTO.getSqid()); +// item.setShjg(resultDTO.getShjg()); +// item.setClsj(resultDTO.getClsj()); +// item.setShyj(resultDTO.getShyj()); +// if ("01".equals(resultDTO.getShjg())) { +// item.setSolutionInfo(item.getJjqk()); +// item.setEvaluationScore(item.getPjjg()); +// }else { +// item.setAppealFlag(0); +// item.setStreetAppealFlag("0"); +// } +// baseDao.updateById(item); + + + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(ItemEntity::getSqid,resultDTO.getSqid()); + ItemEntity item = new ItemEntity(); item.setShjg(resultDTO.getShjg()); item.setClsj(resultDTO.getClsj()); item.setShyj(resultDTO.getShyj()); @@ -7360,7 +7377,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem item.setAppealFlag(0); item.setStreetAppealFlag("0"); } - baseDao.updateById(item); + baseDao.update(item,lambdaQueryWrapper); + } @Override @@ -7405,6 +7423,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public void rebackreback() { List list = baseDao.rebackreback(); + log.info(list.size()+"3333333333333333333"); list.forEach(e->{ LambdaQueryWrapper reportqw = new LambdaQueryWrapper() .eq(ItemReportInterfaceLogEntity::getItemId, e.getId()); 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 cebe0f032..dd52c78e3 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 @@ -4364,10 +4364,13 @@ i.UPDATED_TIME DESC