Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/edgeLibrary/service/impl/StockInfoServiceImpl.java

@@ -28,6 +28,7 @@ import com.github.zuihou.business.productionResourceCenter.entity.Productionreso
 import com.github.zuihou.business.util.CommonUtil;
 import com.github.zuihou.common.constant.BizConstant;
 import com.github.zuihou.common.constant.CodeRuleModule;
+import com.github.zuihou.common.constant.DictionaryKey;
 import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
@@ -577,8 +578,13 @@ public class StockInfoServiceImpl extends SuperServiceImpl<StockInfoMapper, Stoc
     @Override
     public LinkedHashMap demoLineAllStock() {
         LinkedHashMap<String,Map <String,List<Map>>> returnMap = new LinkedHashMap();
-
-        String codes = "'"+DemoLineConstant.NODE_RESOURCE_ZLZX_XBK+"','"+DemoLineConstant.NODE_RESOURCE_ZNSCDY_XBK+"','"+DemoLineConstant.NODE_RESOURCE_RXSC_XBK+"'";
+        Map<String, String>xbkMap = DictionaryKey.YJ_ZONE_XBK;
+        String xbk ="";
+        for(String value:xbkMap.values()){
+            xbk+=value+",";
+        }
+        String codes = StringUtil.changeIdsArrToSubQueryStr(xbk);
+//        String codes = "'"+DemoLineConstant.NODE_RESOURCE_ZLZX_XBK+"','"+DemoLineConstant.NODE_RESOURCE_ZNSCDY_XBK+"','"+DemoLineConstant.NODE_RESOURCE_RXSC_XBK+"'";
         Map queryMap = new HashMap();
         queryMap.put("codes",codes);
         List<Map>list = storgeMapper.getDemoLineStockList(queryMap);

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/AutoNodeMapper.xml

@@ -42,7 +42,7 @@
     </select>
 
     <select id="taskAutoNodeList" parameterType="com.github.zuihou.business.productionReadyCenter.entity.AutoNode" resultType="com.github.zuihou.business.productionReadyCenter.entity.AutoNode">
-        select a.*,c.name as resourceName,'' code,'' as instructionName,'' remark,b.exe_result as exeResult,b.start_time as startTime,
+        select a.*,c.name as resourceName,'' code,'' as instructionName,'' remark,a.exe_result as exeResult,b.start_time as startTime,
         b.end_time as endTime,b.feedback,b.feedback_file as feedbackFile,b.exe_status as exeStatus
         from imcs_t_task_node a
         left join imcs_a_auto_node_log b on a.id = b.task_node_id