FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into 'FOTON'

Browse Source 
Develop master

See merge request LiuChao/foton-slrs-system-rest!334
This commit is contained in:
王夏晖
2021-12-29 13:46:58 +08:00
parent d5cb35f5f5 36ff1dd510
commit 4b72908b9e
5 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
+4
View File
@@ -111,5 +111,9 @@ public class EsRevisePlan extends BasePage {
@TableField("technologic")
private String technologic;
@ApiModelProperty(value = "企标类别")
@TableField("buss_sort")
private String bussSort;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java
+2
View File
@@ -49,6 +49,8 @@ public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
int deleteByStandIdAndFileType(@Param("standId") String standId, @Param("fileType") String fileType);
int deleteByStandIdAndFileTypes(@Param("standId") String standId, @Param("fileType") String fileType,@Param("items")List<String> strings);
Set<String> selectClaimTypesByStandId(@Param("standId") String standId, @Param("fileType") String fileType, @Param("idList") String[] idList);
Set<String> selectSvppsByStandId(@Param("standId") String standId, @Param("fileType") String fileType, @Param("idList") String[] idList);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+5 -1
View File
@@ -169,7 +169,11 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
@Override
public String sarStandItemsaveBatch(List<SarStandItems> sarStandItems) {
if (null!=sarStandItems && sarStandItems.size()>0) {
sarStandItemsDao.deleteByStandIdAndFileType(sarStandItems.get(0).getStandId(), sarStandItems.get(0).getFileType());
List<String> strings=new ArrayList<>();
sarStandItems.forEach(sarStandItems1 -> {
strings.add(sarStandItems1.getItemsNum());
});
sarStandItemsDao.deleteByStandIdAndFileTypes(sarStandItems.get(0).getStandId(), sarStandItems.get(0).getFileType(),strings);
}
boolean flag=this.saveBatch(sarStandItems);
if (flag){