From 3c6bc150127d205651f0f2650d753453345827fe Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 25 Nov 2020 09:35:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9APP=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=88=B6=E4=BD=9C=E7=AD=BE=E7=BA=A6=E6=A0=A1=E9=AA=8C=E5=92=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=93=B6=E8=A1=8C=E6=A8=A1=E7=B3=8A=E6=90=9C?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ContractMakeServiceImpl.java | 32 ++++++++++++++----- .../service/Impl/FlowDataServiceImpl.java | 10 +++++- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java index 4c2f1326a..f5c47f5a5 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import jbo.app.tenwa.calc.LC_CARD_TLSIGN; import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT; import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST; import jbo.com.tenwa.entity.comm.officetempalte.BF_TEMPLATE; @@ -146,9 +147,9 @@ public class ContractMakeServiceImpl implements ContractMakeService{ }else if(!"success".equals(message)){ body.put("status", "01"); body.put("message", message); - }else if("error".equals(projectSignStatus)){ + }else if(!"success".equals(projectSignStatus)){ body.put("status", "01"); - body.put("message", "请提醒客户查看手机短信，首先完成扣款卡的签约验证！"); + body.put("message", projectSignStatus); }else{ flowParms.put("templateId", templateId); flowParms.put("wordPath", wordPath); @@ -227,15 +228,30 @@ public class ContractMakeServiceImpl implements ContractMakeService{ //检查该项目是否进行过签约验证 public String ProjectSignStatus(String projectid) throws Exception{ + boolean gzSingStatus = false; BizObjectManager caManage = JBOFactory.getBizObjectManager(CUSTOMER_ACCOUNT.CLASS_NAME); BizObject ca = caManage.createQuery("PROJECT_ID=:projectid").setParameter("projectid", projectid).getSingleResult(false); - String falg = "error"; - String string = ca.getAttribute("SIGN_STATUS").getString(); - System.out.println(string); - if("Y".equals(ca.getAttribute("SIGN_STATUS").getString())){ - return "success"; + if (ca != null) { + if("Y".equals(ca.getAttribute("SIGN_STATUS").getString())){ + gzSingStatus = true; + } } - return falg; + BizObjectManager lctManage = JBOFactory.getBizObjectManager(LC_CARD_TLSIGN.CLASS_NAME); + BizObject lct = lctManage.createQuery(" project_id=:project_id ").setParameter("project_id", projectid).getSingleResult(false); + boolean tlSingStatus = false; + if( lct!=null && "sign_status2".equals(lct.getAttribute("sign_status").getString())){ + tlSingStatus = true; + } + if(tlSingStatus && gzSingStatus){ + return "success"; + }else if (tlSingStatus==false && gzSingStatus==false){ + return "请提醒客户查看手机短信，首先完成扣款卡的签约验证！"; + }else if (tlSingStatus==false ){ + return "请提醒客户查看手机短信，完成通联银联扣款卡的签约验证！"; + }else if(gzSingStatus==false){ + return "请提醒客户查看手机短信，完成广州银联扣款卡的签约验证！"; + } + return "未查询到扣款信息，请联系管理员！" ; } @Override public Map initiateSign(HttpServletRequest request, diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java index 366b041d7..c98445717 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java @@ -886,8 +886,16 @@ public class FlowDataServiceImpl implements FlowDataService{ public Map getBankInfo(HttpServletRequest request, HttpServletResponse response, JBOTransaction tx, Transaction sqlca, ReturnMapUtil ReturnMapUtil) throws Exception { + + Map testMap = (Map) MultipartDataUtil + .readRequestParam(request, "UTF-8"); + fieldMap = (Map) testMap.get("fieldMap"); // 参数 + String globalText = fieldMap.get("globalText") == null ? "" : fieldMap.get("globalText").toString(); Map body = new HashMap(); - String sql = "SELECT bank_code,bank_name from bank_code"; + String sql = "SELECT bank_code,bank_name from bank_code "; + if(globalText!=null&&globalText.length()>0){ + sql=sql+" where bank_name like '%"+globalText+"%'"; + } List> dataList = DataOperatorUtil.getDataBySql(sql); body.put("datas", dataList); ReturnMapUtil.setReturnMap(body,