elink-star
/
esua-epdc-cloud
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改bug

master
qushutong 8 months ago
parent
1e40cdfbbb
commit
124599b86a
3 changed files with 55 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
  2. 65
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  3. 9
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

7
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
View File

@ -942,6 +942,13 @@ public class ItemController {
return new Result(); 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 * @param
* @return com.elink.esua.epdc.commons.tools.utils.Result * @return com.elink.esua.epdc.commons.tools.utils.Result

65
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
View File

@ -6442,27 +6442,27 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
// //
// } // }
if ("1".equals(itemHotlineEntity.getCbFlag())) { // if ("1".equals(itemHotlineEntity.getCbFlag())) {
if (StringUtils.isNotBlank(itemHotlineEntity.getCbid())) { // if (StringUtils.isNotBlank(itemHotlineEntity.getCbid())) {
LambdaQueryWrapper<ItemEntity> itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<ItemEntity> itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getCbid()) // itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getCbid())
.eq(ItemEntity::getAppealSource, NumConstant.THREE_STR) // .eq(ItemEntity::getAppealSource, NumConstant.THREE_STR)
.eq(ItemEntity::getDelFlag, "0"); // .eq(ItemEntity::getDelFlag, "0");
if (baseDao.selectList(itemEntityLambdaQueryWrapper).size() > 0) { // if (baseDao.selectList(itemEntityLambdaQueryWrapper).size() > 0) {
return true; // return true;
} // }
} // }
} else { // } else {
if (StringUtils.isNotBlank(itemHotlineEntity.getSqid())) { // if (StringUtils.isNotBlank(itemHotlineEntity.getSqid())) {
LambdaQueryWrapper<ItemEntity> itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<ItemEntity> itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getSqid()) // itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getSqid())
.eq(ItemEntity::getAppealSource, NumConstant.THREE_STR) // .eq(ItemEntity::getAppealSource, NumConstant.THREE_STR)
.eq(ItemEntity::getDelFlag, "0"); // .eq(ItemEntity::getDelFlag, "0");
if (baseDao.selectList(itemEntityLambdaQueryWrapper).size() > 0) { // if (baseDao.selectList(itemEntityLambdaQueryWrapper).size() > 0) {
return true; // return true;
} // }
} // }
} // }
ItemEntity itemEntity = new ItemEntity(); ItemEntity itemEntity = new ItemEntity();
@ -7349,7 +7349,24 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Override @Override
public void backAudit(AppealResultDTO resultDTO) { 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<ItemEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(ItemEntity::getSqid,resultDTO.getSqid());
ItemEntity item = new ItemEntity();
item.setShjg(resultDTO.getShjg()); item.setShjg(resultDTO.getShjg());
item.setClsj(resultDTO.getClsj()); item.setClsj(resultDTO.getClsj());
item.setShyj(resultDTO.getShyj()); item.setShyj(resultDTO.getShyj());
@ -7360,7 +7377,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
item.setAppealFlag(0); item.setAppealFlag(0);
item.setStreetAppealFlag("0"); item.setStreetAppealFlag("0");
} }
baseDao.updateById(item); baseDao.update(item,lambdaQueryWrapper);
} }
@Override @Override
@ -7405,6 +7423,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Override @Override
public void rebackreback() { public void rebackreback() {
List<ReBackResultDTO> list = baseDao.rebackreback(); List<ReBackResultDTO> list = baseDao.rebackreback();
log.info(list.size()+"3333333333333333333");
list.forEach(e->{ list.forEach(e->{
LambdaQueryWrapper<ItemReportInterfaceLogEntity> reportqw = new LambdaQueryWrapper<ItemReportInterfaceLogEntity>() LambdaQueryWrapper<ItemReportInterfaceLogEntity> reportqw = new LambdaQueryWrapper<ItemReportInterfaceLogEntity>()
.eq(ItemReportInterfaceLogEntity::getItemId, e.getId()); .eq(ItemReportInterfaceLogEntity::getItemId, e.getId());

9
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
View File

@ -4364,10 +4364,13 @@
i.UPDATED_TIME DESC i.UPDATED_TIME DESC
</select> </select>
<select id="rebackreback" resultType="com.elink.esua.epdc.dto.item.ReBackResultDTO"> <select id="rebackreback" resultType="com.elink.esua.epdc.dto.item.ReBackResultDTO">
SELECT i.ID,h.SQID,h.cbid FROM epdc_item i LEFT JOIN epdc_item_hotline h ON h.cbid = i.SQID -- SELECT i.ID,h.SQID,h.cbid FROM epdc_item i LEFT JOIN epdc_item_hotline h ON h.cbid = i.SQID
WHERE h.ID IS NOT NULL AND h.back_flag IS NULL -- WHERE h.ID IS NOT NULL AND h.back_flag IS NULL
AND i.CREATED_TIME &lt;= '2024-12-16 16:40:00' -- AND i.CREATED_TIME &gt;= '2024-12-16 16:40:00'
-- AND i.SERIAL_NUM IN (SELECT SERIAL_NUM FROM temp_item)
SELECT i.ID,h.SQID,h.cbid FROM temp_item t LEFT JOIN epdc_item i ON i.SERIAL_NUM = t.SERIAL_NUM LEFT JOIN epdc_item_hotline h ON h.cbid = i.SQID
GROUP BY t.SERIAL_NUM
</select> </select>
</mapper> </mapper>

Write Preview
Loading…
Cancel
Save