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

feat: 标准入库流程

Browse Source
This commit is contained in:
super_liu
2021-06-23 18:11:55 +08:00
parent fa985d2d58
commit 006fb9a1f4
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+3 -6
View File
@@ -122,7 +122,7 @@ public class ActSarItemsEOService {
Object breakVal = null; Object breakVal = null;
Object itemList = null; Object itemList = null;
for (Map.Entry<String,Object> entry : standMap.entrySet()) { for (Map.Entry<String,Object> entry : standMap.entrySet()) {
String field = entry.getKey(); String field = entry.getKey().toUpperCase();
Object value = entry.getValue(); Object value = entry.getValue();
if (InitStandAttrUtil.queryFieldList.contains(field)) { if (InitStandAttrUtil.queryFieldList.contains(field)) {
if (value != null && value instanceof JSONArray) { if (value != null && value instanceof JSONArray) {
@@ -139,10 +139,7 @@ public class ActSarItemsEOService {
} }
attInfoMap.put(field,value); attInfoMap.put(field,value);
} else { } else {
createStandBaseField(sarStandardsInfoEO,field,value); createStandBaseField(sarStandardsInfoEO,entry.getKey(),value);
}
if ("taskBreak".equals(field)) {
breakVal = value;
} }
} }
String standFoUser = ""; String standFoUser = "";
@@ -156,7 +153,7 @@ public class ActSarItemsEOService {
} }
//处理文件 //处理文件
//此处需要处理之前的文件信息，防止文件丢失 //此处需要处理之前的文件信息，防止文件丢失
attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus()); // attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus());
String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarStandardsInfoEO.setSarStandAttrEOStr(resData); sarStandardsInfoEO.setSarStandAttrEOStr(resData);
// 根据标准号判断数据是否已存在 // 根据标准号判断数据是否已存在
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+6 -1
View File
@@ -21,6 +21,7 @@ import com.adc.da.slrs.sarSarAccessInfo.dao.SarSarAccessInfoDao;
import com.adc.da.slrs.sarStandAttrDetails.dao.SarStandAttrDetailsDao; import com.adc.da.slrs.sarStandAttrDetails.dao.SarStandAttrDetailsDao;
import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails; import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails;
import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo;
import com.adc.da.slrs.sarStandFile.dao.SarStandFileDao; import com.adc.da.slrs.sarStandFile.dao.SarStandFileDao;
import com.adc.da.slrs.sarStandFile.entity.SarStandFile; import com.adc.da.slrs.sarStandFile.entity.SarStandFile;
import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao;
@@ -48,6 +49,7 @@ import com.adc.da.util.UUIDUtils;
import com.adc.da.utils.util.*; import com.adc.da.utils.util.*;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -349,7 +351,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
int insertResult = dao.insertSelective(sarStandardsInfoEO); int insertResult = dao.insertSelective(sarStandardsInfoEO);
if (insertResult > 0) { if (insertResult > 0) {
// 修改属性表数据 // 修改属性表数据
sarStandAttrInfoEODao.deleteStandAttrByStandId(sarStandardsInfoEO.getId()); List<SarStandAttrInfo> standAttrInfos = sarStandAttrInfoEODao.selectList(new QueryWrapper<SarStandAttrInfo>().eq("STAND_ID",sarStandardsInfoEO.getId()));
if(!standAttrInfos.isEmpty()){
sarStandAttrInfoEODao.deleteStandAttrByStandId(standAttrInfos.get(0).getStandId());
}
//编写预警信息 //编写预警信息
// writeWarnings(sarStandardsInfoEO); // writeWarnings(sarStandardsInfoEO);
// updateCiteStand(sarStandardsInfoEO,null,"DTBJH","BDTBZBH"); // updateCiteStand(sarStandardsInfoEO,null,"DTBJH","BDTBZBH");