修复了车型项目库标准删除不是关联标准id和项目id删除而是直接按照标准id删除标准的bug
This commit is contained in:
+21
-1
@@ -125,8 +125,28 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
|
|||||||
@PostMapping("/deleteByIds")
|
@PostMapping("/deleteByIds")
|
||||||
@ApiOperation("批量删除标准")
|
@ApiOperation("批量删除标准")
|
||||||
public ResponseMessage deleteByIds(String id){
|
public ResponseMessage deleteByIds(String id){
|
||||||
|
//从 项目id-标准id,项目id-标准id 拆分成 一个个 项目id-标准id
|
||||||
String[] ids = id.split(",");
|
String[] ids = id.split(",");
|
||||||
List<String> list = Arrays.asList(ids);
|
String proId = null;
|
||||||
|
String standId = null;
|
||||||
|
//声明List
|
||||||
|
List<StandProjectRelationDto> list = new ArrayList<>();
|
||||||
|
for (int i=0;i< ids.length;i++){
|
||||||
|
StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto();
|
||||||
|
//引入一个变量来记录"-"的位置
|
||||||
|
int breakPosition = ids[i].indexOf("-");
|
||||||
|
//proId 项目id 是从头开始到分隔符为止的字符串
|
||||||
|
proId = ids[i].substring(0,breakPosition);
|
||||||
|
//standId 标准id 是从分隔符+1位开始到结束为止的字符串
|
||||||
|
standId = ids[i].substring(breakPosition+1);
|
||||||
|
//把项目id赋值
|
||||||
|
standProjectRelationDto.setProjectId(proId);
|
||||||
|
//把标准id赋值
|
||||||
|
standProjectRelationDto.setStandId(standId);
|
||||||
|
//把值放到list里
|
||||||
|
list.add(standProjectRelationDto);
|
||||||
|
}
|
||||||
|
|
||||||
sarStandProjectLibraryService.deleteByIds(list);
|
sarStandProjectLibraryService.deleteByIds(list);
|
||||||
return Result.success("200","删除成功");
|
return Result.success("200","删除成功");
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-3
@@ -3,7 +3,6 @@ package com.adc.da.slrs.sarStandProjectLibrary.dao;
|
|||||||
import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary;
|
import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary;
|
||||||
import com.adc.da.slrs.sarStandProjectLibrary.entity.StandProjectRelationDto;
|
import com.adc.da.slrs.sarStandProjectLibrary.entity.StandProjectRelationDto;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -17,7 +16,7 @@ import java.util.List;
|
|||||||
* @since 2021-06-15
|
* @since 2021-06-15
|
||||||
*/
|
*/
|
||||||
public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLibrary> {
|
public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLibrary> {
|
||||||
// List<SarStandProjectLibrary> queryProjectManagerPage(@Param("current") int current, @Param("pageSize") int pageSize);
|
List<SarStandProjectLibrary> queryProjectManagerPage(@Param("current") int current, @Param("pageSize") int pageSize);
|
||||||
void deleteByIds(@Param("ids") List<String> ids);
|
void deleteByIds(@Param("ids") List<StandProjectRelationDto> ids);
|
||||||
void batchInsert(@Param("list") List<StandProjectRelationDto> list);
|
void batchInsert(@Param("list") List<StandProjectRelationDto> list);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -14,7 +14,7 @@ public interface SarStandProjectLibraryService {
|
|||||||
List<SarStandProjectLibrary> queryByProductLine(String productLine);
|
List<SarStandProjectLibrary> queryByProductLine(String productLine);
|
||||||
List<SarStandProjectLibrary> queryStandId(String standId);
|
List<SarStandProjectLibrary> queryStandId(String standId);
|
||||||
IPage<StandAttrInfoDto> queryStandInfo(int current, int pageSize, String standId);
|
IPage<StandAttrInfoDto> queryStandInfo(int current, int pageSize, String standId);
|
||||||
void deleteByIds(List<String> ids);
|
void deleteByIds(List<StandProjectRelationDto> ids);
|
||||||
void batchInsert(@Param("ids") List<StandProjectRelationDto> list);
|
void batchInsert(@Param("ids") List<StandProjectRelationDto> list);
|
||||||
List<StandAttrInfoDto> exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId);
|
List<StandAttrInfoDto> exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId);
|
||||||
|
|
||||||
|
|||||||
+7
-3
@@ -39,7 +39,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
|
|||||||
@Resource
|
@Resource
|
||||||
private IDicTypeEOService iDicTypeEOService;
|
private IDicTypeEOService iDicTypeEOService;
|
||||||
@Override
|
@Override
|
||||||
public IPage<SarStandProjectLibrary> queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) {
|
public IPage<SarStandProjectLibrary> queryMaintenanceProject(int current, int pageSize,
|
||||||
|
SarStandProjectLibraryDto sarDto) {
|
||||||
SarStandProjectLibrary sar = new SarStandProjectLibrary();
|
SarStandProjectLibrary sar = new SarStandProjectLibrary();
|
||||||
sar.setProjectPlatfor(sarDto.getProjectPlatfor());
|
sar.setProjectPlatfor(sarDto.getProjectPlatfor());
|
||||||
sar.setProjectNumber(sarDto.getProjectNumber());
|
sar.setProjectNumber(sarDto.getProjectNumber());
|
||||||
@@ -80,7 +81,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
|
|||||||
return getSarStandProjectLibraryIPage(current, pageSize, wrapper);
|
return getSarStandProjectLibraryIPage(current, pageSize, wrapper);
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public IPage<SarStandProjectLibrary> queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) {
|
public IPage<SarStandProjectLibrary> queryNotMaintenanceProject(int current, int pageSize,
|
||||||
|
SarStandProjectLibraryDto sarDto) {
|
||||||
SarStandProjectLibrary sar = new SarStandProjectLibrary();
|
SarStandProjectLibrary sar = new SarStandProjectLibrary();
|
||||||
sar.setProjectPlatfor(sarDto.getProjectPlatfor());
|
sar.setProjectPlatfor(sarDto.getProjectPlatfor());
|
||||||
sar.setProjectNumber(sarDto.getProjectNumber());
|
sar.setProjectNumber(sarDto.getProjectNumber());
|
||||||
@@ -202,13 +204,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
|
|||||||
return userIPage;
|
return userIPage;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void deleteByIds(List<String> ids) {
|
public void deleteByIds(List<StandProjectRelationDto> ids) {
|
||||||
sarStandProjectLibraryDao.deleteByIds(ids);
|
sarStandProjectLibraryDao.deleteByIds(ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void batchInsert(List<StandProjectRelationDto> list) {
|
public void batchInsert(List<StandProjectRelationDto> list) {
|
||||||
sarStandProjectLibraryDao.batchInsert(list);
|
sarStandProjectLibraryDao.batchInsert(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<StandAttrInfoDto> exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto ,String id) {
|
public List<StandAttrInfoDto> exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto ,String id) {
|
||||||
List<String> ids = standAttrInfoExcelDto.getIds();
|
List<String> ids = standAttrInfoExcelDto.getIds();
|
||||||
|
|||||||
+4
-4
@@ -19,10 +19,10 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<delete id="deleteByIds">
|
<delete id="deleteByIds">
|
||||||
delete from sar_stand_project_relation where stand_id in (
|
delete from sar_stand_project_relation where
|
||||||
<foreach collection="ids" item="list" separator=",">
|
<foreach collection="ids" item="list" separator="or">
|
||||||
#{list}
|
( project_id= #{list.projectId} and stand_id = #{list.standId} )
|
||||||
</foreach>
|
</foreach>
|
||||||
)
|
|
||||||
</delete>
|
</delete>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
Reference in New Issue
Block a user