修改通联起租后扣款卡信息变更和测试问题
This commit is contained in:
tangfutang
parent
dc8307ba5a
commit
159dcf3437
@ -101,7 +101,7 @@
|
||||
}
|
||||
setErrorTips("acc_number","");
|
||||
setItemValue(0,0,"acc_type","Debit");
|
||||
var sparams = "account="+getItemValue(0,getRow(),"ACCOUNT")+",acc_number="+getItemValue(0,getRow(),"ACC_NUMBER")+",bank_name="+getItemValue(0,getRow(),"BANK_NAME")+",mobile="+getItemValue(0,getRow(),"MOBILE")+",projectid=<%=projectId%>,FlowUnid=<%=FlowUnid%>,contractid=<%=contractId%>,applyType=<%=ApplyType%>";
|
||||
var sparams = "account="+getItemValue(0,getRow(),"ACCOUNT")+",acc_number="+getItemValue(0,getRow(),"ACC_NUMBER")+",bank_name="+getItemValue(0,getRow(),"BANK_NAME")+",mobile="+getItemValue(0,getRow(),"MOBILE")+",projectid=<%=projectId%>,FlowUnid=<%=FlowUnid%>,contractid=<%=contractId%>,certId="+getItemValue(0,getRow(),"CERTID")+",applyType=<%=ApplyType%>";
|
||||
var meassge = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "checkSign", sparams);
|
||||
if("Y"==meassge){
|
||||
setItemValue(0,0,"sign_status","Y");
|
||||
|
||||
@ -35,10 +35,16 @@
|
||||
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
|
||||
<script type="text/javascript">
|
||||
function generatepdf(){
|
||||
var signMessage = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","isSign","ProjectId="+"<%=projectId%>");
|
||||
<%-- var signMessage = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","isSign","ProjectId="+"<%=projectId%>");
|
||||
if("success"!=signMessage){
|
||||
alert(signMessage);
|
||||
return ;
|
||||
} --%>
|
||||
//检查扣款卡信息是否签约
|
||||
var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.contract.check.ContractInfoCheck","ProjectSignStatus","projectid=<%=projectId%>");
|
||||
if("success"!=sReturnInfo){
|
||||
alert(sReturnInfo);
|
||||
return;
|
||||
}
|
||||
var results = RunJavaMethodTrans("com.tenwa.action.channelportal.businesshanding.contractaward.ContractAward","selectStatus","FlowUnid="+"<%=flowunid%>"+",contract_id="+"<%=contractid%>");
|
||||
if("3"==results||"4"==results){
|
||||
|
||||
@ -167,6 +167,7 @@
|
||||
<script type="text/javascript">
|
||||
|
||||
$(function(){
|
||||
var carAttribute = getItemValue(0,0,"car_attribute");
|
||||
if("new_car"=="<%=carAttributes%>"){
|
||||
$("#A_div_1262").attr("style","display:none;");
|
||||
$("#A_div_1339").attr("style","display:none;");
|
||||
@ -198,8 +199,12 @@
|
||||
if(falg){
|
||||
$("#FRAME_NUMBER").css("color","red");
|
||||
} */
|
||||
if("head" != carAttribute){
|
||||
setItemRequired(0,"car_series",false);
|
||||
setItemRequired(0,"MODEL",false);
|
||||
}
|
||||
}
|
||||
var carAttribute = getItemValue(0,0,"car_attribute");
|
||||
|
||||
if("head" != carAttribute){
|
||||
//setItemRequired(0,"FRAME_NUMBER",false);
|
||||
setItemRequired(0,"CAR_COLOUR",false);
|
||||
|
||||
@ -1,79 +1,83 @@
|
||||
package apx.com.amarsoft.als.user.sys.service.impl;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import apx.com.amarsoft.als.user.sys.service.VersionService;
|
||||
|
||||
import com.base.constant.RestfullConstant;
|
||||
import com.base.helper.AppHelper;
|
||||
import com.base.util.ReturnMapUtil;
|
||||
|
||||
public class VersionServiceImpl implements VersionService {
|
||||
// ReturnMapUtil ReturnMapUtil = new ReturnMapUtil();
|
||||
public Map<String, Object> detectionVersion(HttpServletRequest request,
|
||||
ReturnMapUtil ReturnMapUtil) {
|
||||
|
||||
String sDevOs = request.getParameter("devos");
|
||||
|
||||
// String userAgent = request.getHeader("user-agent");
|
||||
// if (null != userAgent) {
|
||||
// if (userAgent.toLowerCase().indexOf("ios") >= 0) {
|
||||
// sDevOs = "ios";
|
||||
// } else {
|
||||
// sDevOs = "android";
|
||||
// }
|
||||
// }
|
||||
|
||||
String sVersionCode = request.getParameter("versioncode");
|
||||
if (null == sDevOs)
|
||||
sDevOs = "";
|
||||
if (null == sVersionCode)
|
||||
sVersionCode = "";
|
||||
Map<String, Object> versionMap = AppHelper
|
||||
.getNewVersionByPhoneType(sDevOs);
|
||||
Map<String, Object> body = new HashMap<String, Object>();
|
||||
Map<String, Object> constant = new HashMap<String, Object>();
|
||||
if (null == versionMap) {
|
||||
// 没有数据 当前最新版本
|
||||
body.put("upgradecode", "0");
|
||||
body.put("upgradedesc", "未找到升级版本或当前用户APP已是最新版本!");
|
||||
} else {
|
||||
if (sVersionCode
|
||||
.equals(versionMap.get("VERSION_CODE".toLowerCase()))) {
|
||||
// 当前意见最新版本
|
||||
// 没有数据 当前最新版本
|
||||
body.put("upgradecode", "0");
|
||||
body.put("upgradedesc", "未找到升级版本或当前用户APP已是最新版本!");
|
||||
} else {
|
||||
// 有新版本发布
|
||||
if ("Y".equals(versionMap.get("MUST_UPDATE".toLowerCase()))) {
|
||||
// 强制更新
|
||||
body.put("upgradecode", "1");
|
||||
body.put("upgradedesc", "当前有更新版本，需要用户强制更新!");
|
||||
} else {
|
||||
// 选择更新
|
||||
body.put("upgradecode", "2");
|
||||
body.put("upgradedesc", "当前有更新的版本!");
|
||||
}
|
||||
constant.put("versioncode",
|
||||
versionMap.get("VERSION_CODE".toLowerCase()));
|
||||
constant.put("versionname",
|
||||
versionMap.get("VERSION_NAME".toLowerCase()));
|
||||
constant.put("mustupdate",
|
||||
versionMap.get("MUST_UPDATE".toLowerCase()));
|
||||
constant.put("path", "api/files/downloadFile?path=/wordFiles/"
|
||||
+ versionMap.get("IMAGE_PATH".toLowerCase()));
|
||||
constant.put("filename",
|
||||
versionMap.get("FILE_NAME".toLowerCase()));
|
||||
}
|
||||
}
|
||||
body.put("versionconstant", constant);
|
||||
ReturnMapUtil.setReturnMap(body, (String) RestfullConstant.baseProperty
|
||||
.get("SUCCESS".toLowerCase()), "");
|
||||
return ReturnMapUtil.getReturnMap();
|
||||
}
|
||||
|
||||
}
|
||||
package apx.com.amarsoft.als.user.sys.service.impl;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import apx.com.amarsoft.als.user.sys.service.VersionService;
|
||||
|
||||
import com.base.constant.RestfullConstant;
|
||||
import com.base.helper.AppHelper;
|
||||
import com.base.util.ReturnMapUtil;
|
||||
|
||||
public class VersionServiceImpl implements VersionService {
|
||||
// ReturnMapUtil ReturnMapUtil = new ReturnMapUtil();
|
||||
public Map<String, Object> detectionVersion(HttpServletRequest request,
|
||||
ReturnMapUtil ReturnMapUtil) {
|
||||
|
||||
String sDevOs = request.getParameter("devos");
|
||||
|
||||
// String userAgent = request.getHeader("user-agent");
|
||||
// if (null != userAgent) {
|
||||
// if (userAgent.toLowerCase().indexOf("ios") >= 0) {
|
||||
// sDevOs = "ios";
|
||||
// } else {
|
||||
// sDevOs = "android";
|
||||
// }
|
||||
// }
|
||||
|
||||
String sVersionCode = request.getParameter("versioncode");
|
||||
if (null == sDevOs)
|
||||
sDevOs = "";
|
||||
if (null == sVersionCode)
|
||||
sVersionCode = "";
|
||||
Map<String, Object> versionMap = AppHelper
|
||||
.getNewVersionByPhoneType(sDevOs);
|
||||
Map<String, Object> body = new HashMap<String, Object>();
|
||||
Map<String, Object> constant = new HashMap<String, Object>();
|
||||
if (null == versionMap) {
|
||||
// 没有数据 当前最新版本
|
||||
body.put("upgradecode", "0");
|
||||
body.put("upgradedesc", "未找到升级版本或当前用户APP已是最新版本!");
|
||||
} else {
|
||||
|
||||
//String oVersionCode = (String) ((Map<String,Object>) versionMap.get("VERSION_CODE".toLowerCase())).replace(".","");
|
||||
String oVersionCode = versionMap.get("VERSION_CODE".toLowerCase()).toString();
|
||||
|
||||
oVersionCode = oVersionCode.replace(".","");
|
||||
if (Integer.valueOf(sVersionCode)>=Integer.valueOf(oVersionCode)) {
|
||||
// 当前意见最新版本
|
||||
// 没有数据 当前最新版本
|
||||
body.put("upgradecode", "0");
|
||||
body.put("upgradedesc", "未找到升级版本或当前用户APP已是最新版本!");
|
||||
} else {
|
||||
// 有新版本发布
|
||||
if ("Y".equals(versionMap.get("MUST_UPDATE".toLowerCase()))) {
|
||||
// 强制更新
|
||||
body.put("upgradecode", "1");
|
||||
body.put("upgradedesc", "当前有更新版本，需要用户强制更新!");
|
||||
} else {
|
||||
// 选择更新
|
||||
body.put("upgradecode", "2");
|
||||
body.put("upgradedesc", "当前有更新的版本!");
|
||||
}
|
||||
constant.put("versioncode",
|
||||
versionMap.get("VERSION_CODE".toLowerCase()));
|
||||
constant.put("versionname",
|
||||
versionMap.get("VERSION_NAME".toLowerCase()));
|
||||
constant.put("mustupdate",
|
||||
versionMap.get("MUST_UPDATE".toLowerCase()));
|
||||
constant.put("path", "api/files/downloadFile?path=/wordFiles/"
|
||||
+ versionMap.get("IMAGE_PATH".toLowerCase()));
|
||||
constant.put("filename",
|
||||
versionMap.get("FILE_NAME".toLowerCase()));
|
||||
}
|
||||
}
|
||||
body.put("versionconstant", constant);
|
||||
ReturnMapUtil.setReturnMap(body, (String) RestfullConstant.baseProperty
|
||||
.get("SUCCESS".toLowerCase()), "");
|
||||
return ReturnMapUtil.getReturnMap();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -291,10 +291,13 @@ public class DebitCardAction {
|
||||
}
|
||||
}
|
||||
}
|
||||
BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME);
|
||||
List<BizObject> ldcls = ldclManager.createQuery("select * from O where file_flag='yes' and ( flow_unid=:flowunid or contract_id=:contractid ) ").setParameter("flowunid", FlowUnid).setParameter("contractid", contractid).getResultList(false);
|
||||
if(ldcls.size()>0){
|
||||
return "false";
|
||||
//校验合同文件是否生成的，扣款卡不需要校验是否生成合同文件
|
||||
if(!"AccountChangeApply".equals(applyType)){
|
||||
BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME);
|
||||
List<BizObject> ldcls = ldclManager.createQuery("select * from O where file_flag='yes' and ( flow_unid=:flowunid or contract_id=:contractid ) ").setParameter("flowunid", FlowUnid).setParameter("contractid", contractid).getResultList(false);
|
||||
if(ldcls.size()>0){
|
||||
return "false";
|
||||
}
|
||||
}
|
||||
BizObjectManager cahManage = JBOFactory.getFactory().getManager(CUSTOMER_ACCOUNT_HIS.CLASS_NAME);
|
||||
List<BizObject> cahs = cahManage.createQuery(" sign_status='Y' and account=:account and acc_number=:acc_number and certid=:certid ")
|
||||
|
||||
@ -44,12 +44,12 @@ public class ContractInfoCheck {
|
||||
public String ProjectSignStatus(JBOTransaction tx) throws Exception{
|
||||
boolean gzSingStatus = false;
|
||||
BizObjectManager caManage = JBOFactory.getBizObjectManager(CUSTOMER_ACCOUNT.CLASS_NAME, tx);
|
||||
String acc_number = caManage.createQuery("PROJECT_ID=:projectid").setParameter("projectid", projectid).getSingleResult(false).getAttribute("acc_number").getString();
|
||||
List<BizObject> cas = caManage.createQuery("acc_number=:accnumber").setParameter("accnumber", acc_number).getResultList(false);
|
||||
for (BizObject ca : cas) {
|
||||
BizObject ca = caManage.createQuery("PROJECT_ID=:projectid").setParameter("projectid", projectid).getSingleResult(false);
|
||||
//List<BizObject> cas = caManage.createQuery("acc_number=:accnumber").setParameter("accnumber", acc_number).getResultList(false);
|
||||
if (ca != null) {
|
||||
if("Y".equals(ca.getAttribute("SIGN_STATUS").getString())){
|
||||
gzSingStatus = true;
|
||||
break;
|
||||
//break;
|
||||
}
|
||||
}
|
||||
BizObjectManager lctManage = JBOFactory.getBizObjectManager(LC_CARD_TLSIGN.CLASS_NAME, tx);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user