add: 政策入库流程
This commit is contained in:
wxyclub
+48
-44
@@ -89,7 +89,7 @@ public class ActSarItemsLawsEOService {
|
|||||||
private boolean elasflag;
|
private boolean elasflag;
|
||||||
|
|
||||||
/***
|
/***
|
||||||
* @Description: 国内外标准流程入库"
|
* @Description: 政策流程入库"
|
||||||
* @Author: yangxuenan
|
* @Author: yangxuenan
|
||||||
* @Date: 2020/12/7 13:48
|
* @Date: 2020/12/7 13:48
|
||||||
* @Param: [standJson]
|
* @Param: [standJson]
|
||||||
@@ -100,8 +100,8 @@ public class ActSarItemsLawsEOService {
|
|||||||
standMap = JSONObject.parseObject(standJson);
|
standMap = JSONObject.parseObject(standJson);
|
||||||
if (standMap != null && !standMap.isEmpty()) {
|
if (standMap != null && !standMap.isEmpty()) {
|
||||||
String prcNum = String.valueOf(standMap.get("prcNum"));
|
String prcNum = String.valueOf(standMap.get("prcNum"));
|
||||||
String prcName = String.valueOf(standMap.get("prcName"));
|
String lawsName = String.valueOf(standMap.get("lawsName"));
|
||||||
String standType = String.valueOf(standMap.get("standType"));
|
// String standType = String.valueOf(standMap.get("standType"));
|
||||||
// String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估
|
// String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估
|
||||||
SarLawsStandInfo sarLawsStandInfo = new SarLawsStandInfo();
|
SarLawsStandInfo sarLawsStandInfo = new SarLawsStandInfo();
|
||||||
// if(standMap.containsKey("standId")) {
|
// if(standMap.containsKey("standId")) {
|
||||||
@@ -140,11 +140,11 @@ public class ActSarItemsLawsEOService {
|
|||||||
String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
|
String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
|
||||||
sarLawsStandInfo.setSarStandAttrEOStr(resData);
|
sarLawsStandInfo.setSarStandAttrEOStr(resData);
|
||||||
// 根据标准号判断数据是否已存在
|
// 根据标准号判断数据是否已存在
|
||||||
String lawsNumber = "";
|
// String lawsNumber = "";
|
||||||
if(StringUtils.isNotBlank(sarLawsStandInfo.getLawsNumber()) && !"null".equals(sarLawsStandInfo.getLawsNumber())){
|
// if(StringUtils.isNotBlank(sarLawsStandInfo.getLawsNumber()) && !"null".equals(sarLawsStandInfo.getLawsNumber())){
|
||||||
lawsNumber = sarLawsStandInfo.getLawsNumber();
|
// lawsNumber = sarLawsStandInfo.getLawsNumber();
|
||||||
}
|
// }
|
||||||
List<SarLawsStandInfo> lawsList = sarLawsStandInfoService.selectStandardsByStandNumber(lawsNumber);
|
// List<SarLawsStandInfo> lawsList = sarLawsStandInfoService.selectStandardsByStandNumber(lawsNumber);
|
||||||
//此处判断是否是带入的标准
|
//此处判断是否是带入的标准
|
||||||
if(StringUtils.isNotBlank(sarLawsStandInfo.getId())) {
|
if(StringUtils.isNotBlank(sarLawsStandInfo.getId())) {
|
||||||
SarLawsStandInfo query = new SarLawsStandInfo();
|
SarLawsStandInfo query = new SarLawsStandInfo();
|
||||||
@@ -161,9 +161,7 @@ public class ActSarItemsLawsEOService {
|
|||||||
if (StringUtils.isNotBlank(relatePro)) {
|
if (StringUtils.isNotBlank(relatePro)) {
|
||||||
String[] processSplit = relatePro.split(",");
|
String[] processSplit = relatePro.split(",");
|
||||||
Set<String> processSet = new HashSet<>();
|
Set<String> processSet = new HashSet<>();
|
||||||
for(String sData:processSplit){
|
Collections.addAll(processSet, processSplit);
|
||||||
processSet.add(sData);
|
|
||||||
}
|
|
||||||
processSet.add(prcNum);
|
processSet.add(prcNum);
|
||||||
relatePro = StringUtils.join(processSet.toArray(), ",");
|
relatePro = StringUtils.join(processSet.toArray(), ",");
|
||||||
} else {
|
} else {
|
||||||
@@ -173,40 +171,42 @@ public class ActSarItemsLawsEOService {
|
|||||||
sarLawsStandInfoService.updateSarLawsStandInfo(sarLawsStandInfo);
|
sarLawsStandInfoService.updateSarLawsStandInfo(sarLawsStandInfo);
|
||||||
// 编辑相关流程
|
// 编辑相关流程
|
||||||
iSarLawsAttrInfoService.updateLawsInfo(sarLawsStandInfo.getId(),"XGLC",relatePro);
|
iSarLawsAttrInfoService.updateLawsInfo(sarLawsStandInfo.getId(),"XGLC",relatePro);
|
||||||
String content = "新增一条相关流程:" +prcName+" "+prcNum;
|
String content = "新增一条相关流程:" +lawsName+" "+prcNum;
|
||||||
sarUpdLogEOService.createBaseLog(sarLawsStandInfo.getId(),standType+"_STAND",content);
|
sarUpdLogEOService.createBaseLog(sarLawsStandInfo.getId(),lawsName+"_LAWS",content);
|
||||||
}else if (lawsList != null && !lawsList.isEmpty()) {//Id不存在，但是标准号存在的情况
|
|
||||||
String standId = lawsList.get(0).getId();
|
|
||||||
SarLawsStandInfo query = new SarLawsStandInfo();
|
|
||||||
query.setId(standId);
|
|
||||||
sarLawsStandInfoService.attrInfoDetails(query);
|
|
||||||
Map<String, Object> attrInfoMap = query.getAttrInfoMap();
|
|
||||||
if(attInfoMap!=null && !attInfoMap.isEmpty()){
|
|
||||||
updateStandFileFieldData(attInfoMap,attrInfoMap);
|
|
||||||
resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
|
|
||||||
sarLawsStandInfo.setSarStandAttrEOStr(resData);
|
|
||||||
}
|
}
|
||||||
// 查询原相关流程
|
// else if (lawsList != null && !lawsList.isEmpty()) {//Id不存在，但是标准号存在的情况
|
||||||
String relatePro = iSarLawsAttrInfoService.selectFieldValByLawsId("XGLC",standId);
|
// String standId = lawsList.get(0).getId();
|
||||||
if (StringUtils.isNotBlank(relatePro)) {
|
// SarLawsStandInfo query = new SarLawsStandInfo();
|
||||||
String[] processSplit = relatePro.split(",");
|
// query.setId(standId);
|
||||||
Set<String> processSet = new HashSet<>();
|
// sarLawsStandInfoService.attrInfoDetails(query);
|
||||||
for(String sData:processSplit){
|
// Map<String, Object> attrInfoMap = query.getAttrInfoMap();
|
||||||
processSet.add(sData);
|
// if(attInfoMap!=null && !attInfoMap.isEmpty()){
|
||||||
}
|
// updateStandFileFieldData(attInfoMap,attrInfoMap);
|
||||||
processSet.add(prcNum);
|
// resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
|
||||||
relatePro = StringUtils.join(processSet.toArray(), ",");
|
// sarLawsStandInfo.setSarStandAttrEOStr(resData);
|
||||||
} else {
|
// }
|
||||||
relatePro = prcNum;
|
// // 查询原相关流程
|
||||||
}
|
// String relatePro = iSarLawsAttrInfoService.selectFieldValByLawsId("XGLC",standId);
|
||||||
// 编辑标准
|
// if (StringUtils.isNotBlank(relatePro)) {
|
||||||
sarLawsStandInfo.setId(standId);
|
// String[] processSplit = relatePro.split(",");
|
||||||
sarLawsStandInfoService.updateSarLawsStandInfo(sarLawsStandInfo);
|
// Set<String> processSet = new HashSet<>();
|
||||||
// 编辑相关流程
|
// for(String sData:processSplit){
|
||||||
iSarLawsAttrInfoService.updateLawsInfo(standId,"XGLC",relatePro);
|
// processSet.add(sData);
|
||||||
String content = "新增一条相关流程:" +prcName+" "+prcNum;
|
// }
|
||||||
sarUpdLogEOService.createBaseLog(standId,standType+"_STAND",content);
|
// processSet.add(prcNum);
|
||||||
} else {//标准号、ID都不存在的情况
|
// relatePro = StringUtils.join(processSet.toArray(), ",");
|
||||||
|
// } else {
|
||||||
|
// relatePro = prcNum;
|
||||||
|
// }
|
||||||
|
// // 编辑标准
|
||||||
|
// sarLawsStandInfo.setId(standId);
|
||||||
|
// sarLawsStandInfoService.updateSarLawsStandInfo(sarLawsStandInfo);
|
||||||
|
// // 编辑相关流程
|
||||||
|
// iSarLawsAttrInfoService.updateLawsInfo(standId,"XGLC",relatePro);
|
||||||
|
// String content = "新增一条相关流程:" +prcName+" "+prcNum;
|
||||||
|
// sarUpdLogEOService.createBaseLog(standId,standType+"_STAND",content);
|
||||||
|
// }
|
||||||
|
else {//标准号、ID都不存在的情况
|
||||||
// 新增方法
|
// 新增方法
|
||||||
sarLawsStandInfoService.createSarStandardsInfo(sarLawsStandInfo);
|
sarLawsStandInfoService.createSarStandardsInfo(sarLawsStandInfo);
|
||||||
// 编辑相关流程
|
// 编辑相关流程
|
||||||
@@ -836,6 +836,10 @@ public class ActSarItemsLawsEOService {
|
|||||||
case "country": sarLawsStandInfo.setCountry(valueStr); break;
|
case "country": sarLawsStandInfo.setCountry(valueStr); break;
|
||||||
case "id": sarLawsStandInfo.setId(valueStr); break;
|
case "id": sarLawsStandInfo.setId(valueStr); break;
|
||||||
case "lawsType": sarLawsStandInfo.setLawsType(valueStr); break;
|
case "lawsType": sarLawsStandInfo.setLawsType(valueStr); break;
|
||||||
|
case "lawsTypeFirstLevel": sarLawsStandInfo.setLawsTypeFirstLevel(valueStr); break;
|
||||||
|
case "lawsTypeSecondLevel": sarLawsStandInfo.setLawsTypeSecondLevel(valueStr); break;
|
||||||
|
case "lawsTypeThirdLevel": sarLawsStandInfo.setLawsTypeThirdLevel(valueStr); break;
|
||||||
|
case "lawsTypeFourthLevel": sarLawsStandInfo.setLawsTypeFourthLevel(valueStr); break;
|
||||||
case "lawsNumber": sarLawsStandInfo.setLawsNumber(valueStr); break;
|
case "lawsNumber": sarLawsStandInfo.setLawsNumber(valueStr); break;
|
||||||
case "lawsName": sarLawsStandInfo.setLawsName(valueStr); break;
|
case "lawsName": sarLawsStandInfo.setLawsName(valueStr); break;
|
||||||
case "lawsEnName": sarLawsStandInfo.setLawsEnName(valueStr); break;
|
case "lawsEnName": sarLawsStandInfo.setLawsEnName(valueStr); break;
|
||||||
|
|||||||
Reference in New Issue
Block a user