diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 64b63253..bbf82554 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -122,7 +122,7 @@ public class ActSarItemsEOService { Object breakVal = null; Object itemList = null; for (Map.Entry entry : standMap.entrySet()) { - String field = entry.getKey(); + String field = entry.getKey().toUpperCase(); Object value = entry.getValue(); if (InitStandAttrUtil.queryFieldList.contains(field)) { if (value != null && value instanceof JSONArray) { @@ -139,10 +139,7 @@ public class ActSarItemsEOService { } attInfoMap.put(field,value); } else { - createStandBaseField(sarStandardsInfoEO,field,value); - } - if ("taskBreak".equals(field)) { - breakVal = value; + createStandBaseField(sarStandardsInfoEO,entry.getKey(),value); } } 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); sarStandardsInfoEO.setSarStandAttrEOStr(resData); // 根据标准号判断数据是否已存在 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 58ac6b8f..23aa1785 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -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.entity.SarStandAttrDetails; 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.entity.SarStandFile; 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.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.json.JSONObject; import org.apache.commons.lang3.StringUtils; @@ -349,7 +351,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl 0) { // 修改属性表数据 - sarStandAttrInfoEODao.deleteStandAttrByStandId(sarStandardsInfoEO.getId()); + List standAttrInfos = sarStandAttrInfoEODao.selectList(new QueryWrapper().eq("STAND_ID",sarStandardsInfoEO.getId())); + if(!standAttrInfos.isEmpty()){ + sarStandAttrInfoEODao.deleteStandAttrByStandId(standAttrInfos.get(0).getStandId()); + } //编写预警信息 // writeWarnings(sarStandardsInfoEO); // updateCiteStand(sarStandardsInfoEO,null,"DTBJH","BDTBZBH");