diff --git a/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java b/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java index 69c86817f..d0f5db935 100644 --- a/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java +++ b/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java @@ -44,6 +44,10 @@ public class SelectCatalogWin { this.param.put(sKey, sValue); } + public Map getParam() { + return param; + } + private String sGlobalText; @SuppressWarnings("unchecked") diff --git a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java index 80424425f..57224a634 100644 --- a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java @@ -1,14 +1,7 @@ package apx.com.amarsoft.als.currency.select.apzl.car.service.impl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - import apx.com.amarsoft.als.base.awe.select.SelectCatalogWin; import apx.com.amarsoft.als.currency.select.apzl.car.service.SelectCarAttributeService; - import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.awe.util.Transaction; import com.amarsoft.context.ASUser; @@ -17,11 +10,16 @@ import com.base.util.MultipartDataUtil; import com.base.util.ReturnMapUtil; import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class SelectCarAttributeServiceImpl implements SelectCarAttributeService{ public Map selectProductModel(HttpServletRequest request, Transaction sqlca, JBOTransaction tx, ReturnMapUtil ReturnMapUtil) throws Exception { - String sSelName = "SelectCardataBrand"; + String sSelName = "SelectCardataBrandNew"; SelectCatalogWin select = new SelectCatalogWin(sSelName, tx, sqlca, request); ASUser curUser = new ASUser((String) request.getSession().getAttribute( @@ -39,6 +37,11 @@ public class SelectCarAttributeServiceImpl implements SelectCarAttributeService{ String sSelName = "SelectCardataSeries"; SelectCatalogWin select = new SelectCatalogWin(sSelName, tx, sqlca, request); + if (select.getParam().size() > 0 && select.getParam().get("cartype") != null) { + String cartypea = String.valueOf(select.getParam().get("cartype")).trim(); + sSelName = cartypea != null && cartypea.equals("商用车") ? "SelectCardataSeriesSYC" : "SelectCardataSeriesCYC"; + select.setsSelName(sSelName); + } ASUser curUser = new ASUser((String) request.getSession().getAttribute( "userid"), sqlca); select.setParam("orgId", curUser.getOrgID()); @@ -54,6 +57,11 @@ public class SelectCarAttributeServiceImpl implements SelectCarAttributeService{ String sSelName = "SelectCardataModel"; SelectCatalogWin select = new SelectCatalogWin(sSelName, tx, sqlca, request); + if (select.getParam().size() > 0 && select.getParam().get("cartype") != null) { + String cartypea = String.valueOf(select.getParam().get("cartype")).trim(); + sSelName = cartypea != null && cartypea.equals("商用车") ? "SelectCardataModelSYC" : "SelectCardataModelCYC"; + select.setsSelName(sSelName); + } ASUser curUser = new ASUser((String) request.getSession().getAttribute( "userid"), sqlca); select.setParam("orgId", curUser.getOrgID());