Merge branch 'uat-temp-wj-2501090000-44517' into dev

dev-temp-nht-202502180000-customprint
王杰 4 months ago
commit 20944bc9e6

@ -170,7 +170,8 @@ public class MesPackageNoGenerateStepService extends BaseStepService {
stepResult.setDataCollection(new ArrayList()); stepResult.setDataCollection(new ArrayList());
packageDataContextList = doHandlePackagePrint(reqBean, stepResult, packageRuleContext, packageDataContextList, entry.getValue()); packageDataContextList = doHandlePackagePrint(reqBean, stepResult, packageRuleContext, packageDataContextList, entry.getValue());
//更新实时的打包数据 if (CollectionUtils.isEmpty(packageDataContextMap)) packageDataContextMap = new HashMap<>(); //更新实时的打包数据
if (CollectionUtils.isEmpty(packageDataContextMap)) packageDataContextMap = new HashMap<>();
if (CollectionUtils.isEmpty(packageDataContextList)) packageDataContextMap.remove(entry.getKey()); if (CollectionUtils.isEmpty(packageDataContextList)) packageDataContextMap.remove(entry.getKey());
else packageDataContextMap.put(entry.getKey(), JSONObject.toJSONString(packageDataContextList)); else packageDataContextMap.put(entry.getKey(), JSONObject.toJSONString(packageDataContextList));

Loading…
Cancel
Save