feat 合并分支

This commit is contained in:
yinglong zhang
2021-06-24 17:39:01 +08:00
41 changed files with 3312 additions and 31 deletions
@@ -61,7 +61,6 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.io.File;
import java.io.FileInputStream;
import java.sql.Clob;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -152,12 +151,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
@Autowired
private SysInfoEOService sysInfoEOService;
// @Autowired
// private StandLawsSearchService standLawsSearchService;
@Value("${file.path}")
private String filePath;//文件存储路径
/***
@@ -1860,7 +1853,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
}
return standList;
}
@Override
public void insertIntoIndexForMap(Map<String, Object> attrInfoMap) {
@@ -1992,6 +1984,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
// standLawsSearchService.updateStandLawsSearchForMap(attrInfoMap);
// }
public void getStandDetailsForAct (SarStandardsInfoEOPage page,String[] idArr,String standState,List<ActSarItemsEO> standList) throws Exception{
page.setPageSize(100);
page.setIdlist(idArr);