修改发起

This commit is contained in:
liujiaji 2018-06-22 16:29:46 +08:00
parent 38dcb16789
commit b66ee17151
8 changed files with 99 additions and 2 deletions

View File

@ -66,4 +66,6 @@ push.message.package.name=com.tenwa.test
#base.filter.user.role.id='800090001R00000004','800090001R00000005','099','299','399','800090001R00000010','800090002R00000001','800090002R00000003','800090002R00000045','800090001R00000006','800090001R00000007','800090001R00000008','800090001R00000009','800090001R00000013','800090001R00000014','800090001R00000022','800090001R00000019','800090001R00000020','800090001R00000015','800090001R00000025'
base.filter.user.role.id=none
base.filter.user.role.id=none
base.business.type=\u6C7D\u8F66\u4E1A\u52A1

View File

@ -410,6 +410,8 @@
<attribute name="CUSTOMER_TYPE" lable="客户类型" type="STRING" length="1000" />
<attribute name="CERTTYPE" lable="证件类型" type="STRING" length="1000" />
<attribute name="CERTID" lable="证件号" type="STRING" length="1000" />
<attribute name="versionId" lable="产品版本" type="STRING" length="1000" />
<attribute name="modelId" lable="汽车类型" type="STRING" length="1000" />
</attributes>
</class>
<!-- app流程页签配置 -->

View File

@ -4,6 +4,8 @@ import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import com.base.constant.RestfullConstant;
import net.sf.json.JSONObject;
@ -24,6 +26,10 @@ public class BusinessBO implements Serializable {
private String certtype; // 证件类型
private String certid; // 证件号码
private String businessType;
private String versionId;
private String modelId;
private String curUserId;
private String fixedFlowParam;
@ -61,6 +67,16 @@ public class BusinessBO implements Serializable {
this.curUserId = fieldMap.get("userid".toLowerCase()) == null ? ""
: fieldMap.get("userid".toLowerCase()).toString(); // 证件号
this.businessType = RestfullConstant.baseProperty
.get("BUSINESS_TYPE") == null ? ""
: RestfullConstant.baseProperty.get("BUSINESS_TYPE").toString(); // 业务类型
this.modelId = fieldMap.get("modelId".toLowerCase()) == null ? ""
: fieldMap.get("modelId".toLowerCase()).toString(); // 汽车类型
this.versionId = fieldMap.get("versionId".toLowerCase()) == null ? ""
: fieldMap.get("versionId".toLowerCase()).toString(); // 产品版本
Map<String, Object> map = new HashMap<String, Object>();
map.put("ProductId", productId);
@ -80,6 +96,10 @@ public class BusinessBO implements Serializable {
map.put("certtype", certtype);
map.put("custname", CUSTOMERNAME);
map.put("modelid", modelId);
map.put("versionid", versionId);
map.put("businessType", businessType);
JSONObject jsonObject = JSONObject.fromObject(map);
this.fixedFlowParam = jsonObject.toString();
}
@ -195,4 +215,28 @@ public class BusinessBO implements Serializable {
public void setCurUserId(String curUserId) {
this.curUserId = curUserId;
}
public String getBusinessType() {
return businessType;
}
public void setBusinessType(String businessType) {
this.businessType = businessType;
}
public String getVersionId() {
return versionId;
}
public void setVersionId(String versionId) {
this.versionId = versionId;
}
public String getModelId() {
return modelId;
}
public void setModelId(String modelId) {
this.modelId = modelId;
}
}

View File

@ -40,11 +40,14 @@ public class BusinessApplyStartServiceImpl implements BusinessApplyStartService
BusinessApprovalStartAction.setFixedFlowParam(bo.getFixedFlowParam());
// 产品租赁信息
BusinessApprovalStartAction.setBusinessType(bo.getBusinessType());
BusinessApprovalStartAction.setVersionid(bo.getVersionId());
BusinessApprovalStartAction.setProductID(bo.getProductId());
BusinessApprovalStartAction.setProductId(bo.getProductId());
BusinessApprovalStartAction.setLeasehold(bo.getLeasehold());
// 车辆信息
BusinessApprovalStartAction.setModelid(bo.getModelId());
BusinessApprovalStartAction.setCarAttributes(bo.getCarAttributes());
BusinessApprovalStartAction.setProductModel(bo.getProductModel());
BusinessApprovalStartAction.setCarSystem(bo.getCarSystem());

View File

@ -30,7 +30,24 @@ public class SelectProductAttributeController {
ARE.getLog().info("[Path] /select/business/type run .................");
try {
return service
.selectBusinessType(request, sqlca, tx, ReturnMapUtil);
.selectBusinessTypeVersion(request, sqlca, tx, ReturnMapUtil);
} catch (Exception e) {
return ReturnMapUtil.rollback(e);
}
}
@Path("/business/type/version")
@POST
public Map<String, Object> selectBusinessTypeVersion(
@Context HttpServletRequest request, @Context Transaction sqlca,
@Context JBOTransaction tx) throws Exception {
ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
ARE.getLog()
.info("[CONTROLLER] SelectProductAttributeController run .................");
ARE.getLog().info("[Path] /select/business/type/version run .................");
try {
return service
.selectBusinessTypeVersion(request, sqlca, tx, ReturnMapUtil);
} catch (Exception e) {
return ReturnMapUtil.rollback(e);
}

View File

@ -13,4 +13,9 @@ public interface SelectProductAttributeService {
Map<String, Object> selectBusinessType(@Context HttpServletRequest request,
@Context Transaction sqlca, @Context JBOTransaction tx,
ReturnMapUtil ReturnMapUtil) throws Exception;
Map<String, Object> selectBusinessTypeVersion(
@Context HttpServletRequest request, @Context Transaction sqlca,
@Context JBOTransaction tx, ReturnMapUtil ReturnMapUtil)
throws Exception;
}

View File

@ -8,6 +8,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import jbo.app.BUSINESS_TYPE;
import apx.com.amarsoft.als.base.awe.select.SelectCatalogWin;
import apx.com.amarsoft.als.currency.select.apzl.product.service.SelectProductAttributeService;
import com.amarsoft.are.jbo.BizObject;
@ -15,6 +16,7 @@ import com.amarsoft.are.jbo.BizObjectManager;
import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.are.jbo.JBOTransaction;
import com.amarsoft.awe.util.Transaction;
import com.amarsoft.context.ASUser;
import com.base.constant.RestfullConstant;
import com.base.util.MultipartDataUtil;
import com.base.util.ReturnMapUtil;
@ -207,4 +209,20 @@ public class SelectProductAttributeServiceImpl implements
RestfullConstant.baseProperty.get("SUCCESS").toString(), "");
return ReturnMapUtil.getReturnMap();
}
@Override
public Map<String, Object> selectBusinessTypeVersion(
HttpServletRequest request, Transaction sqlca, JBOTransaction tx,
ReturnMapUtil ReturnMapUtil) throws Exception {
String sSelName = "selectProductVersionInfo";
SelectCatalogWin select = new SelectCatalogWin(sSelName, tx, sqlca,
request);
ASUser curUser = new ASUser((String) request.getSession().getAttribute(
"userid"), sqlca);
select.setParam("orgId", curUser.getOrgID());
Map<String, Object> body = select.execute(tx, sqlca, request);
ReturnMapUtil.setReturnMap(body,
(String) RestfullConstant.baseProperty.get("SUCCESS"), "");
return ReturnMapUtil.getReturnMap();
}
}

View File

@ -64,6 +64,8 @@ public class RestfullConstant {
public final static String PROPERTY_KEY_MSG_406 = "base.return.msg.406";
public final static String PROPERTY_KEY_RESULT_SUCCESS_CODE = "base.return.result.success.code";
public final static String PROPERTY_KEY_RESULT_FAIL_CODE = "base.return.result.fail.code";
public final static String BUSINESS_TYPE = "base.business.type";
public final static String PROPERTY_KEY_PUSH_ENABLE = "push.message.switch";
public final static String PROPERTY_KEY_PUSH_SECRET_IOS = "push.message.secret.key.ios";
@ -187,6 +189,10 @@ public class RestfullConstant {
// CUSTOMER TYPE 03
setMap(baseProperty, "CUSTOMER_TYPE_PERSON",
pro.getProperty(CUSTOMER_TYPE_PERSON));
// BUSINESS_TYPE
setMap(baseProperty, "BUSINESS_TYPE",
pro.getProperty(BUSINESS_TYPE));
}
private static void loadSessionKey(Properties pro) {