Merge remote-tracking branch 'origin/master'
This commit is contained in:
+22
-2
@@ -53,6 +53,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
|||||||
@Override
|
@Override
|
||||||
public IPage<DummyInventoryInfoEO> getPageInfo(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
|
public IPage<DummyInventoryInfoEO> getPageInfo(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
|
||||||
QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO, req.getParameterMap());
|
QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO, req.getParameterMap());
|
||||||
|
queryWrapper.orderByDesc("create_time");
|
||||||
Page<DummyInventoryInfoEO> page = new Page<DummyInventoryInfoEO>(dummyInventoryInfoEO.getPageNo(), dummyInventoryInfoEO.getPageSize());
|
Page<DummyInventoryInfoEO> page = new Page<DummyInventoryInfoEO>(dummyInventoryInfoEO.getPageNo(), dummyInventoryInfoEO.getPageSize());
|
||||||
IPage<DummyInventoryInfoEO> pageInfo = this.page(page, queryWrapper);
|
IPage<DummyInventoryInfoEO> pageInfo = this.page(page, queryWrapper);
|
||||||
//技术领域处理
|
//技术领域处理
|
||||||
@@ -122,8 +123,25 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void deleteByIds(List<String> ids) {
|
public void deleteByIds(List<String> ids) {
|
||||||
removeByIds(ids);
|
//文件同步删除
|
||||||
}
|
LambdaQueryWrapper<DummyInventoryInfoEO> wrapper = new LambdaQueryWrapper<>();
|
||||||
|
wrapper.in(DummyInventoryInfoEO::getId,ids);
|
||||||
|
List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(wrapper);
|
||||||
|
List<String> fileIdList = new ArrayList<>();
|
||||||
|
for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOList) {
|
||||||
|
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){
|
||||||
|
fileIdList.addAll(Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableTemplate().split(",")));
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){
|
||||||
|
fileIdList.addAll(Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableTemplate().split(",")));
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){
|
||||||
|
fileIdList.addAll(Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableTemplate().split(",")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
iOSSFileService.removeByIds(fileIdList);
|
||||||
|
removeByIds(ids);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过id查询
|
* 通过id查询
|
||||||
@@ -144,6 +162,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
|||||||
@Override
|
@Override
|
||||||
public List<DummyInventoryInfoEO> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
|
public List<DummyInventoryInfoEO> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
|
||||||
QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap());
|
QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap());
|
||||||
|
queryWrapper.orderByDesc("create_time");
|
||||||
List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(queryWrapper);
|
List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(queryWrapper);
|
||||||
//技术领域处理
|
//技术领域处理
|
||||||
treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList);
|
treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList);
|
||||||
@@ -175,6 +194,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void setBatch(List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
|
public void setBatch(List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
|
||||||
|
this.updateBatchById(dummyInventoryInfoEOList);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user