diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp index 03a678e05..3e1ce88b8 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp @@ -177,19 +177,25 @@ setItemValue(0,0,"sign_status",""); } } + if("BContractApproveApply"=="<%=ApplyType%>"||"BContractApproveApply"=="<%=ApplyType%>"){//只有合同制作和合同变更 + var project_id = getItemValue(0,0,"project_id"); + var result = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "checkAccountSignStatus", "projectid="+project_id); + } iV_all("0"); setItemValue(0,0,"ACC_NUMBER",allTrim(getItemValue(0,0,"ACC_NUMBER"))); var flowName="<%=flowName%>"; - if("业务变更流程"==flowName){ + if("业务变更流程"==flowName||"合同制作流程"==flowName){ // 判断是否变更, 如果变更了, 将变更内容插入中间表 var account = getItemValue(0,0,"account"); // 账户名称 var acc_number = getItemValue(0,0,"acc_number"); // 银行账号 var bank_name = getItemValue(0,0,"bank_name"); // 开户银行 var MOBILE = getItemValue(0,0,"MOBILE"); // 预留手机号 - var project_id = getItemValue(0,0,"project_id"); // 预留手机号 + var project_id = getItemValue(0,0,"project_id"); // 项目id var contract_id = getItemValue(0,0,"contract_id");// 预留手机号 var sign_status = getItemValue(0,0,"sign_status");// 签约信息 - var sparams ="account="+account+",acc_number="+acc_number+",bank_name="+bank_name+",mobile="+MOBILE+",projectid="+project_id+",contractid="+contract_id+",sign_status="+sign_status+""; + var flowunid = "<%=FlowUnid%>" ; + + var sparams ="FlowUnid="+flowunid+",account="+account+",acc_number="+acc_number+",bank_name="+bank_name+",mobile="+MOBILE+",projectid="+project_id+",contractid="+contract_id+",sign_status="+sign_status+""; var result = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "savaCustomerAccountTomiddle", sparams); if("true"==result){ as_save("0","re"); diff --git a/src/com/amarsoft/dict/als/manage/NameManager.java b/src/com/amarsoft/dict/als/manage/NameManager.java index 60329dc69..574b798c0 100644 --- a/src/com/amarsoft/dict/als/manage/NameManager.java +++ b/src/com/amarsoft/dict/als/manage/NameManager.java @@ -251,7 +251,7 @@ public class NameManager while (rs.next()) { rs.getString("insurer_end_date"); } -// List> ds = DataOperatorUtil.getDataBySql(JBOFactory.createJBOTransaction(), sql, null); +// List> ds = DataOperatorUtil.getDataBySql(sql, null); return "";//ds.get(0).get("INSURER_END_DATE"); // BizObject bo=JBOFactory.createBizObjectQuery(LB_INSURANCE_INFO.CLASS_NAME, "select * from (SELECT @rownum := @rownum + 1 AS rownum,insurer_end_date FROM O,(SELECT @rownum := 0) t WHERE contract_id ='"+ContractId+"' ORDER BY insurer_start_date ) t WHERE t.rownum= '"+i+"'").getSingleResult(false); // return bo.getAttribute(LB_INSURANCE_INFO.INSURER_END_DATE).getString(); diff --git a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java index 35aa993dd..bcec06c80 100644 --- a/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java +++ b/src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java @@ -302,12 +302,22 @@ public class DebitCardAction { selectSql="SELECT PROJECT_ID FROM CUSTOMER_ACCOUNT_MIDDLE WHERE PROJECT_ID='"+projectid+"'"; List> dataList2=DataOperatorUtil.getDataBySql(Sqlca, selectSql, null); + //检查历史表 + String selectHis = "SELECT SIGN_STATUS FROM CUSTOMER_ACCOUNT_HIS WHERE PROJECT_ID='"+projectid+"' AND ACC_NUMBER='"+acc_number+"' AND BANK_NAME='"+bank_name+"' AND ACCOUNT='"+account+"' AND MOBILE='"+mobile+"'"; + List> HisList=DataOperatorUtil.getDataBySql(Sqlca, selectHis, null); + for (Map his : HisList) { + if("Y".equals(his.get("SIGN_STATUS"))){ + sign_status = "Y"; + break; + } + } + //如果存在将内容update为最新数据, 如果不存在则新增 if(dataList2 ==null || dataList2.size()==0){ insertSql="INSERT INTO CUSTOMER_ACCOUNT_MIDDLE(ID,ACC_NUMBER,BANK_NAME,ACCOUNT,PROJECT_ID,CONTRACT_ID,MOBILE,SIGN_STATUS,INSERTTIME,flowunid) VALUES(REPLACE(UUID(),'-',''),'"+acc_number+"','"+bank_name+"','"+account+"','"+projectid+"','"+contractid+"','"+mobile+"','"+sign_status+"','"+date+"','"+FlowUnid+"')"; Sqlca.executeSQL(insertSql); }else{ - updateSql="UPDATE CUSTOMER_ACCOUNT_MIDDLE SET ACC_NUMBER='"+acc_number+"',BANK_NAME='"+bank_name+"',ACCOUNT='"+account+"',MOBILE='"+mobile+"',UPDATETIME='"+date+"',flowunid='"+FlowUnid+"' WHERE PROJECT_ID='"+projectid+"' "; + updateSql="UPDATE CUSTOMER_ACCOUNT_MIDDLE SET ACC_NUMBER='"+acc_number+"',BANK_NAME='"+bank_name+"',ACCOUNT='"+account+"',MOBILE='"+mobile+"',UPDATETIME='"+date+"',flowunid='"+FlowUnid+"',SIGN_STATUS='"+sign_status+"' WHERE PROJECT_ID='"+projectid+"' "; Sqlca.executeSQL(updateSql); } // 如果匹配, 说明没有变更, 将中间表相关数据删除 @@ -337,6 +347,19 @@ public class DebitCardAction { return trueOrfalse; } + //合同制作检查是否有签约的 + public String checkAccountSignStatus(JBOTransaction tx) throws Exception{ + BizObjectManager CcaManager = JBOFactory.getBizObjectManager(CUSTOMER_ACCOUNT.CLASS_NAME,tx); + BizObject cca = CcaManager.createQuery(" project_id=:project_id ").setParameter("project_id", projectid).getSingleResult(true); + String singStatus = cca==null?"":cca.getAttribute("SIGN_STATUS").getString(); + if("Y".equals(singStatus)){ + Map signFromCondtion=new HashMap(); + signFromCondtion.put("PROJECT_ID",projectid); + DataOperatorUtil.copyJBOSet(CUSTOMER_ACCOUNT.CLASS_NAME, signFromCondtion,CUSTOMER_ACCOUNT_HIS.CLASS_NAME, null, null,null, tx); + } + return "success"; + } + public String getMobile() { return mobile; } diff --git a/src_core/com/tenwa/comm/message/controller/FileMailingMessage.java b/src_core/com/tenwa/comm/message/controller/FileMailingMessage.java new file mode 100644 index 000000000..cc6653391 --- /dev/null +++ b/src_core/com/tenwa/comm/message/controller/FileMailingMessage.java @@ -0,0 +1,49 @@ +package com.tenwa.comm.message.controller; + + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; + +public class FileMailingMessage extends BaseBussinessMessage { + + @Override + public void loadMessageInfo() throws Exception { + BizObjectManager lciManage = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME); + /*List lciList = lciManage.createQuery("select O.PROJECT_MANAGE from O left join jbo.app.tenwa.doc.LB_FILE_MAILARCHIVING_INFO lfi on lfi.contract_id = O.id left join jbo.sys.ORG_INFO oi on oi.orgid = O.PROJECT_DEPT left join jbo.app.tenwa.calc.LC_CALC_CONDITION lcc on lcc.contract_id = O.id" + + " where (lfi.ALLHANDOVERSTATUS is null or lfi.ALLHANDOVERSTATUS = 'part' or lfi.ALLHANDOVERSTATUS = 'none') and not exists (select 1 from jbo.app.tenwa.doc.LB_FILE_MAILARCHIVING_INFO_TEMP lfmit where lfmit.contract_id = O.id and lfmit.is_flowing = '0') and exists (select 1 from jbo.com.tenwa.lease.comm.LB_FILE_ARCHIVING_INFO lfai where lfai.contract_id = O.id) group by O.PROJECT_MANAGE").getResultList(false);*/ + String sql = "SELECT COUNT(O.PROJECT_MANAGE) number,O.PROJECT_MANAGE PROJECT_MANAGE FROM " + + "LB_CONTRACT_INFO O LEFT JOIN LB_FILE_MAILARCHIVING_INFO lfi ON lfi.contract_id = O.id LEFT JOIN ORG_INFO oi ON oi.orgid = O.PROJECT_DEPT LEFT JOIN LC_CALC_CONDITION lcc ON lcc.contract_id = O.id" + + " WHERE (lfi.ALLHANDOVERSTATUS IS NULL OR lfi.ALLHANDOVERSTATUS = 'part' OR lfi.ALLHANDOVERSTATUS = 'none') AND NOT EXISTS (SELECT 1 FROM LB_FILE_MAILARCHIVING_INFO_TEMP lfmit WHERE lfmit.contract_id = O.id AND lfmit.is_flowing = '0') AND EXISTS (SELECT 1 FROM LB_FILE_ARCHIVING_INFO lfai WHERE lfai.contract_id = O.id) GROUP BY O.PROJECT_MANAGE"; + + List> lciList=DataOperatorUtil.getDataBySql(sql, null); + + for(Map lci : lciList){ + Mapmessage=new HashMap(); +// message.put("MessageTitle", "您有:"+lci.getAttribute("PROJECT_DEPT").getString()+"个合同未档案邮寄,请处理!"); + message.put("MessageTitle", "您有:"+lci.get("number")+"个合同未档案邮寄,请处理!"); + message.put("MessageContent", ""); + message.put("Cparam", "ComponentName=邮寄资料归档&ComponentType=MainWindow&ApplyType=MortgageFileMailApply&isCache=false"); + + message.put("UserId", lci.get("PROJECT_MANAGE")); + this.saveBaseMessage(message); + + /*MapuserIds=this.getMessageUsers(); + for(String key:userIds.keySet()){ + message.put("UserId", key); + this.saveBaseMessage(message); + }*/ + + } + + + } + +} diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountTempToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountTempToFormalBusiness.java index 61e426b8e..cfd8bd015 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountTempToFormalBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountTempToFormalBusiness.java @@ -49,6 +49,16 @@ public class LBCustomerAccountTempToFormalBusiness extends BaseBussiness{ ca.setAttributeValue("contract_id", this.getAttribute("ContractId").toString()); caManager.saveObject(ca); } + }else if ("业务变更流程".equals(flowname)){ + BizObjectManager CcaManager = JBOFactory.getBizObjectManager(CUSTOMER_ACCOUNT.CLASS_NAME,Sqlca); + BizObject cca = CcaManager.createQuery(" project_id=:project_id ").setParameter("project_id", this.getAttribute("ProjectId").toString()).getSingleResult(true); + String singStatus = cca==null?"":cca.getAttribute("SIGN_STATUS").getString(); + if("Y".equals(singStatus)){ + Map signFromCondtion=new HashMap(); + signFromCondtion.put("PROJECT_ID",this.getAttribute("ProjectId").toString()); + DataOperatorUtil.copyJBOSet(CUSTOMER_ACCOUNT.CLASS_NAME, signFromCondtion,CUSTOMER_ACCOUNT_HIS.CLASS_NAME, null, null,null, Sqlca); + } + DataOperatorUtil.copyJBOSet(CUSTOMER_ACCOUNT_TEMP.CLASS_NAME, fromCondtion,CUSTOMER_ACCOUNT.CLASS_NAME, toCondtion, other,null, Sqlca); }else if(!"合同变更流程".equals(flowname)){ DataOperatorUtil.copyJBOSet(CUSTOMER_ACCOUNT_TEMP.CLASS_NAME, fromCondtion,CUSTOMER_ACCOUNT.CLASS_NAME, toCondtion, other,null, Sqlca); }