Merge branch 'develop_3' into 'develop_master'

hh Develop 3

See merge request !15

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<String,Object> 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);
             // 根据标准号判断数据是否已存在