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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!37
This commit is contained in:
高嵩
2023-04-05 23:43:21 +08:00
parent acb9175db3 a14d158480
commit be51af2bbb
6 changed files with 75 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
+7 -1
View File
@@ -54,6 +54,13 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
return esRevisePlans; return esRevisePlans;
} }
@ApiOperation(value = "获取所有企标计划给流程（还未填写企业技术标准）")
@GetMapping("getAllPlansByWkInfo")
public List<EsRevisePlan> getAllPlansByWkInfo(){
List<EsRevisePlan> esRevisePlans = iEsRevisePlanService.getAllPlansByWkInfo();
return esRevisePlans;
}
@ApiOperation(value = "多条件查询企标计划") @ApiOperation(value = "多条件查询企标计划")
@PostMapping("queryAllPlans") @PostMapping("queryAllPlans")
public ResponseMessage<Object> queryAllPlans(EsRevisePlan esRevisePlan){ public ResponseMessage<Object> queryAllPlans(EsRevisePlan esRevisePlan){
@@ -96,7 +103,6 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
case "标准法规部高级经理审核": case "标准法规部高级经理审核":
score=Double.valueOf(evaluationScore) * 0.15; score=Double.valueOf(evaluationScore) * 0.15;
break; break;
default: score=Double.valueOf(evaluationScore); default: score=Double.valueOf(evaluationScore);
} }
last.add(score); last.add(score);
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java
+3
View File
@@ -31,4 +31,7 @@ public interface IEsRevisePlanService extends IService<EsRevisePlan> {
List<EsRevisePlan> getAllPlansByWk(String esName); List<EsRevisePlan> getAllPlansByWk(String esName);
Object oaUpdatePlans(String esId, Date date, String s);//Ao时间 发送次数 修改 Object oaUpdatePlans(String esId, Date date, String s);//Ao时间 发送次数 修改
List<EsRevisePlan> getAllPlansByWkInfo();
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+9
View File
@@ -239,4 +239,13 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
esRevisePlanDao.updateById(esRevisePlan); esRevisePlanDao.updateById(esRevisePlan);
return null; return null;
} }
@Override
public List<EsRevisePlan> getAllPlansByWkInfo() {
QueryWrapper<EsRevisePlan> queryWrapper = new QueryWrapper<>();
List<String> planStatus = new ArrayList<>();
planStatus.add("6");
queryWrapper.lambda().in(EsRevisePlan::getPlanStatus, planStatus);
return esRevisePlanDao.selectList(queryWrapper);
}
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+36 -14
View File
@@ -319,7 +319,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}else { }else {
// 2 获取企标库中 当前类别 最新 顺序号 （前提必须顺序号为正规数据） // 2 获取企标库中 当前类别 最新 顺序号 （前提必须顺序号为正规数据）
bussionessStand = sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus,standSort); bussionessStand = sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus,standSort);
saveBussStandSn(reviseStatus, standSort, bussionessStand.getNewStandSn(),taskId); String sn = "1";
if(ObjectUtils.isNotEmpty(bussionessStand)){
sn = bussionessStand.getNewStandSn();
}
saveBussStandSn(reviseStatus, standSort, sn, taskId);
bussionessStand.setStandSn(sn);
} }
return bussionessStand; return bussionessStand;
@@ -2775,6 +2780,22 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
} }
} }
} }
//校验Excel中企标编号和企标名称同时存在重复
Map<String,SarBussStandAttrInfoExecl> map = new HashMap<>();
int count = 2;
for (String str : jsonList) {
count++;
SarBussStandAttrInfoExecl se = com.alibaba.fastjson.JSONObject.parseObject(str,SarBussStandAttrInfoExecl.class);
if(ObjectUtils.isNotEmpty(se)){
String key = se.getStandCode()+se.getStandName();
if(map.containsKey(key)){
logger.info("导入失败,第" + count +" 行需要导入的企标标号或企标名称重复");
return Result.error("导入失败,第" + count + " 行需要导入的企标标号或企标名称重复");
}else{
map.put(key,se);
}
}
}
//入库 //入库
try { try {
for (String infoJson : jsonList) { for (String infoJson : jsonList) {
@@ -2818,6 +2839,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
valIdFlag = stand.getValidFlag(); valIdFlag = stand.getValidFlag();
if (valIdFlag == 0){ if (valIdFlag == 0){
logger.info("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在"); throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
} }
} }
@@ -2887,19 +2909,19 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
// sarBussionessStand.setStandCode(standCode); // sarBussionessStand.setStandCode(standCode);
// // 根据标准号判断数据是否已存在 // // 根据标准号判断数据是否已存在
// //2021年4月9日 此处检查当前是否存在standId // //2021年4月9日 此处检查当前是否存在standId
QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>(); // QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) // queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
.eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName()); // .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
List<SarBussionessStand> list = iSarBussionessStandService.list(queryWrapper); // List<SarBussionessStand> list = iSarBussionessStandService.list(queryWrapper);
Integer valIdFlag = 0; // Integer valIdFlag = 0;
for (SarBussionessStand stand :list){ // for (SarBussionessStand stand :list){
if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ // if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
valIdFlag = stand.getValidFlag(); // valIdFlag = stand.getValidFlag();
if (valIdFlag == 0){ // if (valIdFlag == 0){
throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在"); // throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
} // }
} // }
} // }
//此处判断是否是带入的标准 //此处判断是否是带入的标准
if(StringUtils.isNotBlank(sarBussionessStand.getId())) { if(StringUtils.isNotBlank(sarBussionessStand.getId())) {
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java
+2 -2
View File
@@ -683,9 +683,9 @@ public class SarFileSplitItemsEOController extends BaseController<SarFileSplitIt
StringBuilder descBuilder = new StringBuilder() StringBuilder descBuilder = new StringBuilder()
.append("模板说明：") .append("模板说明：")
.append("\n") .append("\n")
.append("1：条款号，条款名称，条款内容不能为空") .append("1:条款号，条款名称，条款内容不能为空")
.append("\n") .append("\n")
.append("2：将附件存放在zip格式的文件夹中，名称与后缀输入于附件中即可") .append("2:仅支持zip格式文件夹")
.append("\n"); .append("\n");
//生成模板 //生成模板
CommonExportUtil.exportTemplate(fileName,headers,descBuilder.toString(), response,request); CommonExportUtil.exportTemplate(fileName,headers,descBuilder.toString(), response,request);
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
+18 -18
View File
@@ -746,32 +746,32 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
} }
} }
List<DicTypeEO> arrayList = new ArrayList<>(); List<DicTypeEO> dicTypeEOArrayList = new ArrayList<>();
List<DictionaryEO> dictionaryEOS = dicEODao.selectbyInfo("lawsTextState"); List<DictionaryEO> dictionaryEOOne = dicEODao.selectbyInfo("lawsTextState");
List<DictionaryEO> dictionaryEOInfo = dicEODao.selectbyInfo("WBZTCLASS"); List<DictionaryEO> dictionaryEOTwo = dicEODao.selectbyInfo("WBZTCLASS");
List<DictionaryEO> dictionaryEOSByInfo = dicEODao.selectbyInfo("TEXTSTATUSBUSS"); List<DictionaryEO> dictionaryEOThree = dicEODao.selectbyInfo("TEXTSTATUSBUSS");
if(!dictionaryEOS.isEmpty() && !dictionaryEOInfo.isEmpty() && !dictionaryEOSByInfo.isEmpty()){ if(!dictionaryEOOne.isEmpty() && !dictionaryEOTwo.isEmpty() && !dictionaryEOThree.isEmpty()){
DictionaryEO dictionaryEO = dictionaryEOS.get(0); DictionaryEO dictionaryEOInfoOne = dictionaryEOOne.get(0);
DictionaryEO dictionaryEOYInfo = dictionaryEOInfo.get(0); DictionaryEO dictionaryEOInfoTwo = dictionaryEOTwo.get(0);
DictionaryEO dictionaryEOByInfo = dictionaryEOSByInfo.get(0); DictionaryEO dictionaryEOInfoThree = dictionaryEOThree.get(0);
List<DicTypeEO> dicTypeEOSi = dicTypeEODao.selectDic(dictionaryEO.getId()); List<DicTypeEO> dicTypeEOSOne = dicTypeEODao.selectDic(dictionaryEOInfoOne.getId());
List<DicTypeEO> dicTypeEOSt = dicTypeEODao.selectDic(dictionaryEOYInfo.getId()); List<DicTypeEO> dicTypeEOSTwo = dicTypeEODao.selectDic(dictionaryEOInfoTwo.getId());
List<DicTypeEO> dicTypeEOSy = dicTypeEODao.selectDic(dictionaryEOByInfo.getId()); List<DicTypeEO> dicTypeEOSThree = dicTypeEODao.selectDic(dictionaryEOInfoThree.getId());
for (DicTypeEO data: dicTypeEOSi){ for (DicTypeEO data: dicTypeEOSOne){
arrayList.add(data); dicTypeEOArrayList.add(data);
} }
for (DicTypeEO data: dicTypeEOSt){ for (DicTypeEO data: dicTypeEOSTwo){
arrayList.add(data); dicTypeEOArrayList.add(data);
} }
for (DicTypeEO data: dicTypeEOSy){ for (DicTypeEO data: dicTypeEOSThree){
arrayList.add(data); dicTypeEOArrayList.add(data);
} }
} }
for (SarFileSplitInfoEO data : rows){ for (SarFileSplitInfoEO data : rows){
for (DicTypeEO dic : arrayList){ for (DicTypeEO dic : dicTypeEOArrayList){
if(StringUtils.isNotBlank(data.getFileType())){ if(StringUtils.isNotBlank(data.getFileType())){
if(data.getFileType().equals(dic.getDicTypeCode())){ if(data.getFileType().equals(dic.getDicTypeCode())){
data.setFileTypeShow(dic.getDicTypeName()); data.setFileTypeShow(dic.getDicTypeName());