|
@@ -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);
|