|
@ -6387,9 +6387,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
// 新增筛选 是否是市里驳回重办件
|
|
|
// 新增筛选 是否是市里驳回重办件
|
|
|
String cbFlag = (String) params.get("cbFlag"); |
|
|
String cbFlag = (String) params.get("cbFlag"); |
|
|
if(StringUtils.isNotBlank(cbFlag)){ |
|
|
if(StringUtils.isNotBlank(cbFlag)){ |
|
|
lambdaQueryWrapper.eq(ItemHotlineEntity::getCbFlag,params.get("cbFlag")); |
|
|
lambdaQueryWrapper.and(wrap ->wrap.eq(ItemHotlineEntity::getCbFlag,params.get("cbFlag"))); |
|
|
}else { |
|
|
}else { |
|
|
lambdaQueryWrapper.isNull(ItemHotlineEntity::getCbFlag); |
|
|
lambdaQueryWrapper.and(wrap ->wrap.isNull(ItemHotlineEntity::getCbFlag)); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// lambdaQueryWrapper
|
|
|
// lambdaQueryWrapper
|
|
@ -6419,24 +6419,41 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
// if("2".equals(itemHotlineEntity.getType())){
|
|
|
// if("2".equals(itemHotlineEntity.getType())){
|
|
|
//
|
|
|
//
|
|
|
// }
|
|
|
// }
|
|
|
if (StringUtils.isNotBlank(itemHotlineEntity.getSqid())){ |
|
|
|
|
|
LambdaQueryWrapper<ItemEntity> itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
if("1".equals(itemHotlineEntity.getCbFlag())){ |
|
|
itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid,itemHotlineEntity.getSqid()) |
|
|
if (StringUtils.isNotBlank(itemHotlineEntity.getCbid())){ |
|
|
.eq(ItemEntity::getAppealSource,NumConstant.THREE_STR) |
|
|
LambdaQueryWrapper<ItemEntity> itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
.eq(ItemEntity::getDelFlag,"0"); |
|
|
itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid,itemHotlineEntity.getCbid()) |
|
|
if (baseDao.selectList(itemEntityLambdaQueryWrapper).size()>0){ |
|
|
.eq(ItemEntity::getAppealSource,NumConstant.THREE_STR) |
|
|
return true; |
|
|
.eq(ItemEntity::getDelFlag,"0"); |
|
|
|
|
|
if (baseDao.selectList(itemEntityLambdaQueryWrapper).size()>0){ |
|
|
|
|
|
return true; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
}else { |
|
|
|
|
|
if (StringUtils.isNotBlank(itemHotlineEntity.getSqid())){ |
|
|
|
|
|
LambdaQueryWrapper<ItemEntity> 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(); |
|
|
ItemEntity itemEntity = new ItemEntity(); |
|
|
|
|
|
|
|
|
itemEntity.setSerialNum(itemHotlineEntity.getCode()); |
|
|
itemEntity.setSerialNum(itemHotlineEntity.getCode()); |
|
|
|
|
|
|
|
|
// 青诉即办诉求唯一标识
|
|
|
// 青诉即办诉求唯一标识
|
|
|
itemEntity.setSqid(itemHotlineEntity.getSqid()); |
|
|
itemEntity.setSqid(itemHotlineEntity.getSqid()); |
|
|
|
|
|
if("1".equals(itemHotlineEntity.getCbFlag())){ |
|
|
|
|
|
itemEntity.setSqid(itemHotlineEntity.getCbid()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// sjly String 诉求来源 01:12345热线
|
|
|
// sjly String 诉求来源 01:12345热线
|
|
|
|
|
|
|
|
|
// orgId String 所属机构编码
|
|
|
// orgId String 所属机构编码
|
|
@ -6561,16 +6578,27 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
itemHotlineEntity.setStreetId("1"); |
|
|
itemHotlineEntity.setStreetId("1"); |
|
|
itemHotlineDao.updateById(itemHotlineEntity); |
|
|
itemHotlineDao.updateById(itemHotlineEntity); |
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(itemHotlineEntity.getSqid())){ |
|
|
if("1".equals(itemHotlineEntity.getCbFlag())){ |
|
|
LambdaQueryWrapper<ItemEntity> itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
if (StringUtils.isNotBlank(itemHotlineEntity.getCbid())){ |
|
|
itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid,itemHotlineEntity.getSqid()) |
|
|
LambdaQueryWrapper<ItemEntity> itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
.eq(ItemEntity::getAppealSource,NumConstant.THREE_STR); |
|
|
itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid,itemHotlineEntity.getCbid()) |
|
|
if (baseDao.selectList(itemEntityLambdaQueryWrapper).size()>0){ |
|
|
.eq(ItemEntity::getAppealSource,NumConstant.THREE_STR) |
|
|
return true; |
|
|
.eq(ItemEntity::getDelFlag,"0"); |
|
|
|
|
|
if (baseDao.selectList(itemEntityLambdaQueryWrapper).size()>0){ |
|
|
|
|
|
return true; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
}else { |
|
|
|
|
|
if (StringUtils.isNotBlank(itemHotlineEntity.getSqid())) { |
|
|
|
|
|
LambdaQueryWrapper<ItemEntity> itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
|
itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getSqid()) |
|
|
|
|
|
.eq(ItemEntity::getAppealSource, NumConstant.THREE_STR); |
|
|
|
|
|
if (baseDao.selectList(itemEntityLambdaQueryWrapper).size() > 0) { |
|
|
|
|
|
return true; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
MetaSysDeptEntity metaSysDeptEntity = new MetaSysDeptEntity(); |
|
|
MetaSysDeptEntity metaSysDeptEntity = new MetaSysDeptEntity(); |
|
|
|
|
|
|
|
|
List<MetaSysDeptEntity> deptEntityList = metaSysDeptDao.selectList( |
|
|
List<MetaSysDeptEntity> deptEntityList = metaSysDeptDao.selectList( |
|
@ -6585,6 +6613,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
ItemEntity entity = new ItemEntity(); |
|
|
ItemEntity entity = new ItemEntity(); |
|
|
entity.setSerialNum(itemHotlineEntity.getCode()); |
|
|
entity.setSerialNum(itemHotlineEntity.getCode()); |
|
|
entity.setSqid(itemHotlineEntity.getSqid()); |
|
|
entity.setSqid(itemHotlineEntity.getSqid()); |
|
|
|
|
|
if("1".equals(itemHotlineEntity.getCbFlag())){ |
|
|
|
|
|
entity.setSqid(itemHotlineEntity.getCbid()); |
|
|
|
|
|
} |
|
|
entity.setGridId(metaSysDeptEntity.getId()); |
|
|
entity.setGridId(metaSysDeptEntity.getId()); |
|
|
entity.setGrid(metaSysDeptEntity.getName()); |
|
|
entity.setGrid(metaSysDeptEntity.getName()); |
|
|
entity.setItemContent(itemHotlineEntity.getSjnr()); |
|
|
entity.setItemContent(itemHotlineEntity.getSjnr()); |
|
@ -6677,13 +6708,24 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
|
|
|
|
|
itemHotlineEntity.setStreetId("1"); |
|
|
itemHotlineEntity.setStreetId("1"); |
|
|
itemHotlineDao.updateById(itemHotlineEntity); |
|
|
itemHotlineDao.updateById(itemHotlineEntity); |
|
|
|
|
|
if("1".equals(itemHotlineEntity.getCbFlag())){ |
|
|
if (StringUtils.isNotBlank(itemHotlineEntity.getSqid())){ |
|
|
if (StringUtils.isNotBlank(itemHotlineEntity.getCbid())){ |
|
|
LambdaQueryWrapper<ItemEntity> itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
LambdaQueryWrapper<ItemEntity> itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid,itemHotlineEntity.getSqid()) |
|
|
itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid,itemHotlineEntity.getCbid()) |
|
|
.eq(ItemEntity::getAppealSource,NumConstant.THREE_STR); |
|
|
.eq(ItemEntity::getAppealSource,NumConstant.THREE_STR) |
|
|
if (baseDao.selectList(itemEntityLambdaQueryWrapper).size()>0){ |
|
|
.eq(ItemEntity::getDelFlag,"0"); |
|
|
return true; |
|
|
if (baseDao.selectList(itemEntityLambdaQueryWrapper).size()>0){ |
|
|
|
|
|
return true; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
}else { |
|
|
|
|
|
if (StringUtils.isNotBlank(itemHotlineEntity.getSqid())) { |
|
|
|
|
|
LambdaQueryWrapper<ItemEntity> itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
|
itemEntityLambdaQueryWrapper.eq(ItemEntity::getSqid, itemHotlineEntity.getSqid()) |
|
|
|
|
|
.eq(ItemEntity::getAppealSource, NumConstant.THREE_STR); |
|
|
|
|
|
if (baseDao.selectList(itemEntityLambdaQueryWrapper).size() > 0) { |
|
|
|
|
|
return true; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -6715,7 +6757,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
itemEntity.setSerialNum(itemHotlineEntity.getCode()); |
|
|
itemEntity.setSerialNum(itemHotlineEntity.getCode()); |
|
|
itemEntity.setSqid(itemHotlineEntity.getSqid()); |
|
|
itemEntity.setSqid(itemHotlineEntity.getSqid()); |
|
|
|
|
|
if("1".equals(itemHotlineEntity.getCbFlag())){ |
|
|
|
|
|
itemEntity.setSqid(itemHotlineEntity.getCbid()); |
|
|
|
|
|
} |
|
|
itemEntity.setItemState(0); |
|
|
itemEntity.setItemState(0); |
|
|
itemEntity.setItemContent(itemHotlineEntity.getSjnr()); |
|
|
itemEntity.setItemContent(itemHotlineEntity.getSjnr()); |
|
|
itemEntity.setPeopleFlag("2");// 转换
|
|
|
itemEntity.setPeopleFlag("2");// 转换
|
|
|