From 84932ccc39a3bce39c128333bc6f1b039a650979 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 11 Mar 2020 08:53:15 +0800 Subject: [PATCH 01/89] =?UTF-8?q?1.=E7=BD=91=E9=93=B6=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E5=90=8E=E7=BB=8F=E9=94=80=E5=95=86=E4=BF=9D=E8=AF=81=E9=87=91?= =?UTF-8?q?=E4=BB=A3=E5=81=BF=E7=BA=A2=E5=86=B2=E5=87=BA=E7=8E=B0=E4=B8=A4?= =?UTF-8?q?=E6=AC=A1=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/rent/copyrent/InsertRentPlanStatus.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java b/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java index 53fe0b8ad..313b8574c 100644 --- a/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java +++ b/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java @@ -1,6 +1,8 @@ package com.tenwa.flow.rent.copyrent; +import java.math.BigDecimal; import java.util.List; +import jbo.app.tenwa.calc.LC_RENT_INCOME; import jbo.app.tenwa.calc.LC_RENT_INCOME_TEMP; import jbo.app.tenwa.calc.LC_RENT_PLAN; import jbo.com.tenwa.entity.comm.flow.D_DEPOSITRETURN_INFO; @@ -20,7 +22,7 @@ public class InsertRentPlanStatus extends BaseBussiness{ List boLRITs=JBOFactory.createBizObjectQuery(LC_RENT_INCOME_TEMP.CLASS_NAME,"flowunid=:flowunid").setParameter("flowunid", flowunid).getResultList(false); BizObjectManager bomLRP = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME, Sqlca.getTransaction()); - + CollectAuditInfoCache calc = new CollectAuditInfoCache(); for(int i=0;i-1){ calc.writeBackDistributor(rentPlanId, Sqlca); } } From a4d7ef8022069a8c1e1f448a4dcd15945a691809 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 11 Mar 2020 14:12:06 +0800 Subject: [PATCH 02/89] =?UTF-8?q?1.=E6=9C=AC=E6=96=B9=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OwnConfig/BOwnAccount/BOwnAccount.jsp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp index 7f03fa21c..83d463772 100644 --- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp +++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp @@ -99,13 +99,19 @@ alert("收款暂不支持银企直连！"); return; } - var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk+",ownId="+ownId; - var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams ); - if(sReturn=="null"||sReturn==id||state!="0010"){ - as_save("myiframe0","parent.AsDialog.ClosePage()"); + if(state_="0010"){ + var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk+",ownId="+ownId; + var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams ); + if(sReturn=="null"||sReturn==id){ + as_save("myiframe0","parent.AsDialog.ClosePage()"); + }else{ + alert("相同类型的账户只能存在一个，请检查（银行账号类型 ，是否为企银直连，银行账户用途，状态等字段）！"); + } }else{ - alert("相同类型的账户只能存在一个，请检查（银行账号类型 ，是否为企银直连，银行账户用途，状态等字段）！"); - } + as_save("myiframe0","parent.AsDialog.ClosePage()"); + } + + } //请选择出租人 From 7222bf5e32b26f431d87a9d93c9cd3ff7337ee23 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 11 Mar 2020 16:30:16 +0800 Subject: [PATCH 03/89] =?UTF-8?q?1.=E6=9C=AC=E6=96=B9=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E4=BF=A1=E6=81=AF=E6=89=93=E6=A1=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reckon/copydata/CalcRentCompare.java | 328 +++++++++--------- 1 file changed, 165 insertions(+), 163 deletions(-) diff --git a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java index ed082b6f2..221321125 100644 --- a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java +++ b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java @@ -1,163 +1,165 @@ -package com.tenwa.reckon.copydata; - -import jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT; -import jbo.com.tenwa.entity.comm.own.OWN_INFO; -import jbo.voucher.LV_STACTS_CONFIG; - -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.JBOException; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.are.jbo.JBOTransaction; -import com.tenwa.comm.util.jboutil.BizObjectCompare; - -public class CalcRentCompare implements BizObjectCompare{ - private String accountType; - private String accType; - private String state; - private String FbSdk; - private String id; - private String ownName; - private String ownNumber; - private String accNumber; - private String ownId; - - @Override - public boolean ObjectCompare(BizObject cObject, BizObject toObject) - throws Exception { - if(cObject.getAttribute("plan_list").getString().equals(toObject.getAttribute("plan_list").getString())){ - return true; - } - return false; - } - - public String getAccountType() { - return accountType; - } - public void setAccountType(String accountType) { - this.accountType = accountType; - } - public String getAccType() { - return accType; - } - public void setAccType(String accType) { - this.accType = accType; - } - - public String getState() { - return state; - } - public void setState(String state) { - this.state = state; - } - public String getFbSdk() { - return FbSdk; - } - public void setFbSdk(String fbSdk) { - FbSdk = fbSdk; - } - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - public String getOwnName() { - return ownName; - } - - public void setOwnName(String ownName) { - this.ownName = ownName; - } - - public String getOwnNumber() { - return ownNumber; - } - - public void setOwnNumber(String ownNumber) { - this.ownNumber = ownNumber; - } - public String getAccNumber() { - return accNumber; - } - - public void setAccNumber(String accNumber) { - this.accNumber = accNumber; - } - - public String getOwnId() { - return ownId; - } - - public void setOwnId(String ownId) { - this.ownId = ownId; - } - - public String compare(JBOTransaction tx) throws JBOException{ - String sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and O.FbSdk='Y' and (O.account_type='out_account' or O.account_type='inAndOut_account')"; - if("in_account".equals(accountType)){ - sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and (O.account_type='in_account' or O.account_type='inAndOut_account') and account_purpose='default'"; - }else if("inAndOut_account".equals(accountType)){ - sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and (account_purpose='default' or O.FbSdk='Y')"; - } - BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql).getSingleResult(false); - if(bo==null||"".equals(bo)){ - return "null"; - } - return bo.getAttribute("id").toString(); - } - - public String changAcc_title(JBOTransaction tx) throws JBOException{ - String sql ="select * from O where id=:id"; - BizObject bo = JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME,sql).setParameter("id", id).getSingleResult(false); - if(bo==null||"".equals(bo)){ - return "null"; - } - return bo.getAttribute("SUBJECTS_CODE").toString(); - } - public String check_OWN_NAME(JBOTransaction tx) throws JBOException{ - String sql = "select id,OWN_NAME from O where OWN_NAME=:ownName"; - BizObject bo = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,sql).setParameter("ownName", ownName).getSingleResult(false); - String sql2 = "select id,OWN_NUMBER from O where OWN_NUMBER=:ownNumber"; - BizObject bo2 = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,sql2).setParameter("ownNumber", ownNumber).getSingleResult(false); - if(bo==null&&bo2==null){ - return "null"; - } - if(bo!=null&&bo2==null){ - String id1 = bo.getAttribute("id").toString(); - if(id!="null"&&id1.equals(id)){ - return "null"; - } - return "出租人："+bo.getAttribute("OWN_NAME").toString()+"已存在，请检查！"; - } - if(bo==null&&bo2!=null){ - String id2 = bo2.getAttribute("id").toString(); - if(id!="null"&&id2.equals(id)){ - return "null"; - } - return "出租人编号："+bo2.getAttribute("OWN_NUMBER").toString()+"已存在，请检查！"; - } - if(id!="null"){ - String id1 = bo.getAttribute("id").toString(); - String id2 = bo2.getAttribute("id").toString(); - if(id1.equals(id)&&id2.equals(id)){ - return "null"; - } - } - return "出租人和出租编号均已存在！"; - } - public String checkAccNumber(JBOTransaction tx) throws JBOException{ - String sql = "select id,acc_number from O where acc_number=:accNumber"; - BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql).setParameter("accNumber", accNumber).getSingleResult(false); - if(bo==null){ - return "null"; - } - String id1 = bo.getAttribute("id").toString(); - if(id!="null"&&id1.equals(id)){ - return "null"; - } - return "银行账号"+ bo.getAttribute("acc_number").toString()+"已存在，请检查！"; - } - - - -} +package com.tenwa.reckon.copydata; + +import jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT; +import jbo.com.tenwa.entity.comm.own.OWN_INFO; +import jbo.voucher.LV_STACTS_CONFIG; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; +import com.tenwa.comm.util.jboutil.BizObjectCompare; + +public class CalcRentCompare implements BizObjectCompare{ + private String accountType; + private String accType; + private String state; + private String FbSdk; + private String id; + private String ownName; + private String ownNumber; + private String accNumber; + private String ownId; + + @Override + public boolean ObjectCompare(BizObject cObject, BizObject toObject) + throws Exception { + if(cObject.getAttribute("plan_list").getString().equals(toObject.getAttribute("plan_list").getString())){ + return true; + } + return false; + } + + public String getAccountType() { + return accountType; + } + public void setAccountType(String accountType) { + this.accountType = accountType; + } + public String getAccType() { + return accType; + } + public void setAccType(String accType) { + this.accType = accType; + } + + public String getState() { + return state; + } + public void setState(String state) { + this.state = state; + } + public String getFbSdk() { + return FbSdk; + } + public void setFbSdk(String fbSdk) { + FbSdk = fbSdk; + } + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getOwnName() { + return ownName; + } + + public void setOwnName(String ownName) { + this.ownName = ownName; + } + + public String getOwnNumber() { + return ownNumber; + } + + public void setOwnNumber(String ownNumber) { + this.ownNumber = ownNumber; + } + public String getAccNumber() { + return accNumber; + } + + public void setAccNumber(String accNumber) { + this.accNumber = accNumber; + } + + public String getOwnId() { + return ownId; + } + + public void setOwnId(String ownId) { + this.ownId = ownId; + } + + public String compare(JBOTransaction tx) throws JBOException{ + String sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and O.FbSdk='Y' and (O.account_type='out_account' or O.account_type='inAndOut_account')"; + if("in_account".equals(accountType)){ + sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and (O.account_type='in_account' or O.account_type='inAndOut_account') and account_purpose='default'"; + }else if("inAndOut_account".equals(accountType)){ + sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and (account_purpose='default' or O.FbSdk='Y')"; + } + BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql).getSingleResult(false); + if(bo==null||"".equals(bo)){ + System.out.println("本方账户没有查到信息"); + return "null"; + } + System.out.println("查到的本方账户id"+bo.getAttribute("id").toString()); + return bo.getAttribute("id").toString(); + } + + public String changAcc_title(JBOTransaction tx) throws JBOException{ + String sql ="select * from O where id=:id"; + BizObject bo = JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME,sql).setParameter("id", id).getSingleResult(false); + if(bo==null||"".equals(bo)){ + return "null"; + } + return bo.getAttribute("SUBJECTS_CODE").toString(); + } + public String check_OWN_NAME(JBOTransaction tx) throws JBOException{ + String sql = "select id,OWN_NAME from O where OWN_NAME=:ownName"; + BizObject bo = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,sql).setParameter("ownName", ownName).getSingleResult(false); + String sql2 = "select id,OWN_NUMBER from O where OWN_NUMBER=:ownNumber"; + BizObject bo2 = JBOFactory.createBizObjectQuery(OWN_INFO.CLASS_NAME,sql2).setParameter("ownNumber", ownNumber).getSingleResult(false); + if(bo==null&&bo2==null){ + return "null"; + } + if(bo!=null&&bo2==null){ + String id1 = bo.getAttribute("id").toString(); + if(id!="null"&&id1.equals(id)){ + return "null"; + } + return "出租人："+bo.getAttribute("OWN_NAME").toString()+"已存在，请检查！"; + } + if(bo==null&&bo2!=null){ + String id2 = bo2.getAttribute("id").toString(); + if(id!="null"&&id2.equals(id)){ + return "null"; + } + return "出租人编号："+bo2.getAttribute("OWN_NUMBER").toString()+"已存在，请检查！"; + } + if(id!="null"){ + String id1 = bo.getAttribute("id").toString(); + String id2 = bo2.getAttribute("id").toString(); + if(id1.equals(id)&&id2.equals(id)){ + return "null"; + } + } + return "出租人和出租编号均已存在！"; + } + public String checkAccNumber(JBOTransaction tx) throws JBOException{ + String sql = "select id,acc_number from O where acc_number=:accNumber"; + BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql).setParameter("accNumber", accNumber).getSingleResult(false); + if(bo==null){ + return "null"; + } + String id1 = bo.getAttribute("id").toString(); + if(id!="null"&&id1.equals(id)){ + return "null"; + } + return "银行账号"+ bo.getAttribute("acc_number").toString()+"已存在，请检查！"; + } + + + +} From cf8d6ab31c97094eb257ec8617c465817717ae6f Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 11 Mar 2020 18:11:33 +0800 Subject: [PATCH 04/89] =?UTF-8?q?1.=E6=9C=AC=E6=96=B9=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp index 83d463772..19d1558e2 100644 --- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp +++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp @@ -102,7 +102,8 @@ if(state_="0010"){ var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk+",ownId="+ownId; var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams ); - if(sReturn=="null"||sReturn==id){ + + if(((id==null||id=="")&&account_purpose!="default")||sReturn=="null"||sReturn==id){ as_save("myiframe0","parent.AsDialog.ClosePage()"); }else{ alert("相同类型的账户只能存在一个，请检查（银行账号类型 ，是否为企银直连，银行账户用途，状态等字段）！"); From 7ae161e409d0d949ee04fc7fb2550efe2330d9ae Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 11 Mar 2020 18:17:15 +0800 Subject: [PATCH 05/89] =?UTF-8?q?=E4=B8=8A=E4=B8=80=E6=AC=A1=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp index 19d1558e2..9be772b2a 100644 --- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp +++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp @@ -92,6 +92,7 @@ var state = getItemValue(0, 0, "state_"); var FbSdk = getItemValue(0,0,"FbSdk"); var id= getItemValue(0, 0, "id"); + var accountPurpose= getItemValue(0, 0, "account_purpose"); if(accountType=="in_account" && getItemValue(0, 0, "FbSdk")=="Y"){ setItemValue(0,0,"FbSdk", "N"); hideItemRequired(0,"branch_code"); @@ -103,7 +104,7 @@ var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk+",ownId="+ownId; var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams ); - if(((id==null||id=="")&&account_purpose!="default")||sReturn=="null"||sReturn==id){ + if(((id==null||id=="")&&accountPurpose!="default")||sReturn=="null"||sReturn==id){ as_save("myiframe0","parent.AsDialog.ClosePage()"); }else{ alert("相同类型的账户只能存在一个，请检查（银行账号类型 ，是否为企银直连，银行账户用途，状态等字段）！"); From 470a87602e0057d743d89f9ef24710daee222936 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 12 Mar 2020 11:56:03 +0800 Subject: [PATCH 06/89] =?UTF-8?q?=E5=88=9B=E5=BB=BAsql=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_sql/鎶曚骇SQL/V20200404/tft_20200404sql | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src_sql/鎶曚骇SQL/V20200404/tft_20200404sql diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404sql new file mode 100644 index 000000000..e69de29bb From 2e755433959555b4a99140fc9782cb7f40e935f8 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 12 Mar 2020 20:26:41 +0800 Subject: [PATCH 07/89] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=9A=E8=BD=A6?= =?UTF-8?q?=E6=9E=B6=E5=8F=B7=E5=92=8C=E4=B8=9A=E5=8A=A1=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=88=9D=E5=AE=A1=E6=8F=90=E4=BA=A4=E7=BB=99=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=88=9D=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/LBEquipment_Car/LBEquipmentInfo.jsp | 118 +++++++++++++++++- WebContent/WEB-INF/etc/jbo/jbo_app.xml | 6 + WebContent/WEB-INF/etc/jbo/jbo_comm.xml | 27 +++- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 9 ++ .../com/tenwa/flow/BusinessApplyUserinfo.java | 57 +++++++++ src_jbo/jbo/app/LB_EQUIPMENT_CAR.java | 12 ++ src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java | 12 ++ .../comm/flow/BUSINESS_APPLY_USERINFO.java | 76 +++++++++++ .../tenwa/lease/comm/LB_EQUIPMENT_CAR.java | 12 ++ .../lease/comm/LB_EQUIPMENT_CAR_HIS.java | 12 ++ .../lease/comm/LB_EQUIPMENT_CAR_TEMP.java | 12 ++ src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql | 39 ++++++ src_sql/鎶曚骇SQL/V20200404/tft_20200404sql | 0 .../businessapply/BusinessApproveManager.java | 4 +- 14 files changed, 391 insertions(+), 5 deletions(-) create mode 100644 calc/com/tenwa/flow/BusinessApplyUserinfo.java create mode 100644 src_jbo/jbo/com/tenwa/entity/comm/flow/BUSINESS_APPLY_USERINFO.java create mode 100644 src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql delete mode 100644 src_sql/鎶曚骇SQL/V20200404/tft_20200404sql diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp index 9c79f7c4d..c8a3b291b 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp @@ -82,6 +82,10 @@ doTemp.setDefaultValue("equip_type", sEquipType); CurPage.getCurComp().setAttribute("RightType", null); doTemp.setHtmlEvent("FRAME_NUMBER", "onChange", "checkFrameNumber");//校验车架号格式 + doTemp.setHtmlEvent("FRAME_NUMBER2", "onChange", "checkFrameNumber2");//校验车架号格式 + doTemp.setHtmlEvent("FRAME_NUMBER3", "onChange", "checkFrameNumber3");//校验车架号格式 + doTemp.setHtmlEvent("FRAME_NUMBER4", "onChange", "checkFrameNumber4");//校验车架号格式 + /* doTemp.setHtmlEvent("BRAND", "onChange", "selectCarType"); if((null!=RightType&& !RightType.equals("ReadOnly"))||(null!=ishistory&& !ishistory.equals("true"))){ doTemp.setColumnAttribute(doTemp.getColumnIndex("BRAND"), "COLUNIT", ""); @@ -214,7 +218,6 @@ setItemValue(0,getRow(),"zone",""); }else{ if(typeof(sAreaCodeInfo) != "undefined" && sAreaCodeInfo != ""){ - debugger; sAreaCodeInfo = sAreaCodeInfo.split('@'); sAreaCodeValue = sAreaCodeInfo[0].substring(0,4);//-- 行政区划代码 sAreaCodeName = sAreaCodeInfo[1];//--行政区划名称 @@ -231,6 +234,18 @@ if(checkCarNumber()){ return; } + if(!checkFrameNumber2()){ + return; + } + if(!checkFrameNumber3()){ + return; + } + if(!checkFrameNumber4()){ + return; + } + if(!checkRepeat()){ + return; + } var sFlowUnid = "<%=sFlowUnid%>"; setItemValue(0,getRow(),"FlowUnid",sFlowUnid);//初始化流程编号 var framNum = getItemValue(0,getRow(0),"FRAME_NUMBER").length; @@ -468,7 +483,106 @@ } } - + + function checkFrameNumber2(){ + var vin = getItemValue(0,getRow(0),"FRAME_NUMBER2"); + if((typeof(vin) == "undefined" || vin == "")){ + setErrorTips("FRAME_NUMBER2",""); + return true; + } + var projectId = "<%=projectId%>"; + var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","checkCarNumber","projectId="+projectId+",plate_number="+vin); + if("EROOR"==sResult){ + setErrorTips("FRAME_NUMBER2","车架号已存在!"); + return false; + } + if (!getCheckCode(vin)){ + setErrorTips("FRAME_NUMBER2","车架号格式有误！"); + return false; + }else{ + setErrorTips("FRAME_NUMBER2",""); + return true; + } + + } + function checkFrameNumber3(){ + var vin = getItemValue(0,getRow(0),"FRAME_NUMBER3"); + if((typeof(vin) == "undefined" || vin == "")){ + setErrorTips("FRAME_NUMBER3",""); + return true; + } + var projectId = "<%=projectId%>"; + var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","checkCarNumber","projectId="+projectId+",plate_number="+vin); + if("EROOR"==sResult){ + setErrorTips("FRAME_NUMBER3","车架号已存在!"); + return false; + } + if (!getCheckCode(vin)){ + setErrorTips("FRAME_NUMBER3","车架号格式有误！"); + return false; + }else{ + setErrorTips("FRAME_NUMBER3",""); + return true; + } + + } + function checkFrameNumber4(){ + var vin = getItemValue(0,getRow(0),"FRAME_NUMBER4"); + if((typeof(vin) == "undefined" || vin == "")){ + setErrorTips("FRAME_NUMBER4",""); + return true; + } + var projectId = "<%=projectId%>"; + var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","checkCarNumber","projectId="+projectId+",plate_number="+vin); + if("EROOR"==sResult){ + setErrorTips("FRAME_NUMBER4","车架号已存在!"); + return false; + } + if (!getCheckCode(vin)){ + setErrorTips("FRAME_NUMBER4","车架号格式有误！"); + return false; + }else{ + setErrorTips("FRAME_NUMBER4",""); + return true; + } + + } + //校验重复 + function checkRepeat(){ + var vin = getItemValue(0,getRow(0),"FRAME_NUMBER"); + var vin2 = getItemValue(0,getRow(0),"FRAME_NUMBER2"); + var vin3 = getItemValue(0,getRow(0),"FRAME_NUMBER3"); + var vin4 = getItemValue(0,getRow(0),"FRAME_NUMBER4"); + if((typeof(vin) != "undefined" && vin != "")){ + if( vin==vin2 ){ + alert("车架号1和车架号2重复"); + return false; + }else if( vin==vin3 ){ + alert("车架号1和车架号3重复"); + return false; + }else if( vin==vin4 ){ + alert("车架号1和车架号4重复"); + return false; + } + } + if((typeof(vin2) != "undefined" && vin2 != "")){ + if( vin2==vin3 ){ + alert("车架号2和车架号3重复"); + return false; + }else if( vin2==vin4 ){ + alert("车架号2和车架号4重复"); + return false; + } + } + if((typeof(vin3) != "undefined" && vin3 != "")){ + if( vin3==vin4 ){ + alert("车架号3和车架号4重复"); + return false; + } + } + return true; + + } <%/*~END~*/%> diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app.xml b/WebContent/WEB-INF/etc/jbo/jbo_app.xml index cde657581..d359a8b24 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_app.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_app.xml @@ -4437,6 +4437,9 @@ + + + @@ -4546,6 +4549,9 @@ + + + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml index 3a0ba8c08..212d1d122 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml @@ -812,7 +812,32 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 19f31bc42..091aa8e90 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -1445,6 +1445,9 @@ + + + @@ -2012,6 +2015,9 @@ + + + @@ -3519,6 +3525,9 @@ + + + diff --git a/calc/com/tenwa/flow/BusinessApplyUserinfo.java b/calc/com/tenwa/flow/BusinessApplyUserinfo.java new file mode 100644 index 000000000..65b1d3c26 --- /dev/null +++ b/calc/com/tenwa/flow/BusinessApplyUserinfo.java @@ -0,0 +1,57 @@ +package com.tenwa.flow; + + +import java.text.SimpleDateFormat; +import java.util.Date; + +import jbo.com.tenwa.entity.comm.flow.BUSINESS_APPLY_USERINFO; +import jbo.sys.FLOW_TASK; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.flow.baseBussion.BaseBussiness; + +/* + * 业务申请初审信息记录 + */ +public class BusinessApplyUserinfo extends BaseBussiness{ + + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String flowunid = this.getAttribute("ObjectNo").toString(); + String ProjectId = this.getAttribute("ProjectId").toString(); + String FlowName = this.getAttribute("FlowName").toString(); + String FlowNo = this.getAttribute("ApplyType").toString(); + BizObjectManager ftMange = JBOFactory.getBizObjectManager(FLOW_TASK.CLASS_NAME,Sqlca); + BizObject ft = ftMange.createQuery(" O.objectno=:flowunid AND begintime = (SELECT MAX(ft.begintime) FROM jbo.sys.FLOW_TASK ft WHERE O.objectno=ft.objectno AND ft.phaseno='0030') ").setParameter("flowunid", flowunid).getSingleResult(false); + String userId = ft==null?"":ft.getAttribute("userid").toString(); + String userName = ft==null?"":ft.getAttribute("username").toString(); + String begintime = ft==null?"":ft.getAttribute("begintime").toString(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); //日期格式 + String date = sdf.format(new Date()); //将系统时间转换成上方指定类型 + + BizObjectManager bauMange = JBOFactory.getBizObjectManager(BUSINESS_APPLY_USERINFO.CLASS_NAME,Sqlca); + BizObject bau = bauMange.createQuery(" flow_unid=:flow_unid and flow_phase_no='0030' ").setParameter("flow_unid", flowunid).getSingleResult(true); + if(bau == null){ + bau = bauMange.newObject(); + bau.setAttributeValue("userid", userId); + bau.setAttributeValue("username", userName); + bau.setAttributeValue("lb_project_id", ProjectId); + bau.setAttributeValue("flow_unid", flowunid); + bau.setAttributeValue("flow_name", FlowName); + bau.setAttributeValue("flow_phase_no", "0030"); + bau.setAttributeValue("flow_no", FlowNo); + bau.setAttributeValue("inputtime", date); + }else{ + bau.setAttributeValue("userid", userId); + bau.setAttributeValue("username", userName); + bau.setAttributeValue("updatetime", date); + } + bauMange.saveObject(bau); + return "true"; + } +} diff --git a/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java b/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java index f75918030..2906f35af 100644 --- a/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java +++ b/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java @@ -146,6 +146,18 @@ public interface LB_EQUIPMENT_CAR{ */ public static final String FRAME_NUMBER = "FRAME_NUMBER"; /** + * 车架号2 STRING(100)
+ */ + public static final String FRAME_NUMBER2 = "FRAME_NUMBER2"; + /** + * 车架号3 STRING(100)
+ */ + public static final String FRAME_NUMBER3 = "FRAME_NUMBER3"; + /** + * 车架号4 STRING(100)
+ */ + public static final String FRAME_NUMBER4 = "FRAME_NUMBER4"; + /** * 发动机号 STRING(100)
*/ public static final String ENGINE_NUMBER = "ENGINE_NUMBER"; diff --git a/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java b/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java index fc85cf345..d195a1e29 100644 --- a/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java +++ b/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java @@ -146,6 +146,18 @@ public interface LB_EQUIPMENT_CAR_TEMP{ */ public static final String FRAME_NUMBER = "FRAME_NUMBER"; /** + * 车架号2 STRING(100)
+ */ + public static final String FRAME_NUMBER2 = "FRAME_NUMBER2"; + /** + * 车架号3 STRING(100)
+ */ + public static final String FRAME_NUMBER3 = "FRAME_NUMBER3"; + /** + * 车架号4 STRING(100)
+ */ + public static final String FRAME_NUMBER4 = "FRAME_NUMBER4"; + /** * 发动机号 STRING(100)
*/ public static final String ENGINE_NUMBER = "ENGINE_NUMBER"; diff --git a/src_jbo/jbo/com/tenwa/entity/comm/flow/BUSINESS_APPLY_USERINFO.java b/src_jbo/jbo/com/tenwa/entity/comm/flow/BUSINESS_APPLY_USERINFO.java new file mode 100644 index 000000000..d5d46b68a --- /dev/null +++ b/src_jbo/jbo/com/tenwa/entity/comm/flow/BUSINESS_APPLY_USERINFO.java @@ -0,0 +1,76 @@ +package jbo.com.tenwa.entity.comm.flow; + +import java.lang.String; + +/** +* 业务审批记录表 - JBO命名常量类

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface BUSINESS_APPLY_USERINFO{ + /** + * 业务审批记录表

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.com.tenwa.entity.comm.flow.BUSINESS_APPLY_USERINFO"; + /** + * 唯一标识 STRING(32)
+ */ + public static final String id = "id"; + /** + * 用户id STRING(32)
+ */ + public static final String userid = "userid"; + /** + * 用户名称 STRING(50)
+ */ + public static final String username = "username"; + /** + * 项目id STRING(32)
+ */ + public static final String lb_project_id = "lb_project_id"; + /** + * 合同id STRING(32)
+ */ + public static final String lb_contract_id = "lb_contract_id"; + /** + * 流程id STRING(32)
+ */ + public static final String flow_unid = "flow_unid"; + /** + * 流程名称 STRING(100)
+ */ + public static final String flow_name = "flow_name"; + /** + * 流程节点 STRING(20)
+ */ + public static final String flow_phase_no = "flow_phase_no"; + /** + * 流程节点 STRING(20)
+ */ + public static final String flow_no = "flow_no"; + /** + * 备注 STRING(100)
+ */ + public static final String remarks = "remarks"; + /** + * 备用 STRING(100)
+ */ + public static final String standby = "standby"; + /** + * 登记时间 STRING(100)
+ */ + public static final String inputtime = "inputtime"; + /** + * 更新人 STRING(100)
+ */ + public static final String updateuserid = "updateuserid"; + /** + * 更新部门 STRING(100)
+ */ + public static final String updateorgid = "updateorgid"; + /** + * 更新时间 STRING(100)
+ */ + public static final String updatetime = "updatetime"; +} \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java index 5f81ac464..098b2cf26 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java @@ -142,6 +142,18 @@ public interface LB_EQUIPMENT_CAR{ */ public static final String FRAME_NUMBER = "FRAME_NUMBER"; /** + * 车架号2 STRING(100)
+ */ + public static final String FRAME_NUMBER2 = "FRAME_NUMBER2"; + /** + * 车架号3 STRING(100)
+ */ + public static final String FRAME_NUMBER3 = "FRAME_NUMBER3"; + /** + * 车架号4 STRING(100)
+ */ + public static final String FRAME_NUMBER4 = "FRAME_NUMBER4"; + /** * 发动机号 STRING(100)
*/ public static final String ENGINE_NUMBER = "ENGINE_NUMBER"; diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java index 361c63c89..d6ec4a4b0 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java @@ -146,6 +146,18 @@ public interface LB_EQUIPMENT_CAR_HIS{ */ public static final String FRAME_NUMBER = "FRAME_NUMBER"; /** + * 车架号2 STRING(100)
+ */ + public static final String FRAME_NUMBER2 = "FRAME_NUMBER2"; + /** + * 车架号3 STRING(100)
+ */ + public static final String FRAME_NUMBER3 = "FRAME_NUMBER3"; + /** + * 车架号4 STRING(100)
+ */ + public static final String FRAME_NUMBER4 = "FRAME_NUMBER4"; + /** * 发动机号 STRING(100)
*/ public static final String ENGINE_NUMBER = "ENGINE_NUMBER"; diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java index 19378a5ca..e05f7aa5a 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java @@ -146,6 +146,18 @@ public interface LB_EQUIPMENT_CAR_TEMP{ */ public static final String FRAME_NUMBER = "FRAME_NUMBER"; /** + * 车架号2 STRING(100)
+ */ + public static final String FRAME_NUMBER2 = "FRAME_NUMBER2"; + /** + * 车架号3 STRING(100)
+ */ + public static final String FRAME_NUMBER3 = "FRAME_NUMBER3"; + /** + * 车架号4 STRING(100)
+ */ + public static final String FRAME_NUMBER4 = "FRAME_NUMBER4"; + /** * 发动机号 STRING(100)
*/ public static final String ENGINE_NUMBER = "ENGINE_NUMBER"; diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql new file mode 100644 index 000000000..de372cf4b --- /dev/null +++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql @@ -0,0 +1,39 @@ +-- 在租赁物表中添加车架号字段 +ALTER TABLE lb_equipment_car ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3; +ALTER TABLE lb_equipment_car_temp ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3; +ALTER TABLE lb_equipment_car_his ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3; + +-- 创建业务申请初审记录表 +CREATE TABLE Business_Apply_userinfo ( + id VARCHAR(32) NOT NULL COMMENT '唯一标识', + userid VARCHAR(32) DEFAULT NULL COMMENT '用户id', + username VARCHAR(50) DEFAULT NULL COMMENT '用户名称', + lb_project_id VARCHAR(32) DEFAULT NULL COMMENT '项目id', + flow_unid VARCHAR(32) DEFAULT NULL COMMENT '流程id', + flow_name VARCHAR(100) DEFAULT NULL COMMENT '流程名称', + flow_phase_no VARCHAR(20) DEFAULT NULL COMMENT '流程节点', + remarks VARCHAR(100) DEFAULT NULL COMMENT '备注', + standby VARCHAR(100) DEFAULT NULL COMMENT '备用', + inputtime VARCHAR(100) DEFAULT NULL COMMENT '登记时间', + updateuserid VARCHAR(100) DEFAULT NULL COMMENT '更新人', + updateorgid VARCHAR(100) DEFAULT NULL COMMENT '更新部门', + updatetime VARCHAR(100) DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=INNODB DEFAULT CHARSET=gbk; + +-- 添加方法 +insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('审批流程','记录业务申请初审信息','Bizlet','记录业务申请初审信息','String','String ObjectNo','com.tenwa.flow.BusinessApplyUserinfo','','','','','',''); + +-- 在业务申请添加处理人信息 +delete from FLOW_MODEL where FlowNo='BusinessApplyFlow' AND PhaseNo='0040'; +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('BusinessApplyFlow','0040','1020','信审复审',NULL,NULL,'!审批流程.记录业务申请初审信息(#ObjectNo)','toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'selectroute',NULL,'[{usertype:\"根据SQL语句\",userinfo:\"SELECT O.userid, O.username FROM USER_INFO O WHERE O.UserID IN (SELECT CASE WHEN ft.userid = \'8009011U00000003\' OR ft.userid = \'8009011U00000004\' OR ft.userid = \'800901U00000003\' THEN \'800U00090004\' WHEN ft.userid = \'8009011U00000005\' OR ft.userid = \'8009011U00000006\' OR ft.userid = \'8009011U00000007\' THEN \'8009011U00000002\' ELSE \'800U00090004\' END FROM flow_task ft WHERE ft.phaseno = \'0030\' AND ft.taskstate=0 AND ft.OBJECTNO =:{ObjectNo})\"}]','#PhaseOpinion1','closePage,doSubmit,backStep,signOpinion,circulate',NULL,'all_except','BusinessApplyFlow',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'262','556','100','50','1',NULL,'TASK',NULL,'Y','N',NULL,'TreeView.moveTreeItem(\"租赁车辆基本信息\", \"商务条件\");\r\nTreeView.moveTreeItemToLast(\"资料清单\");\r\nTreeView.addFirstNodeByCode(\"11541\");\r\nMap paramMap=new HashMap();\r\nparamMap.put(\"calType\", \"proj_process\");\r\nTreeView.AddNodeUrlParamByNode(\"11060\", paramMap);\r\nTreeView.addBeforeNodeByCode(\"租赁车辆基本信息\", \"11042\");\r\nif(!\"401\".equals(fixedParam.get(\"RoleId\"))){\r\nif(\"used_car\".equals(fixedParam.get(\"carAttributes\"))){\r\nTreeView.addLastNodeByCode(\"11620\");\r\n}\r\nTreeView.addLastNodeByCode(\"11640\");\r\nTreeView.addLastNodeByCode(\"900001\");\r\nTreeView.addLastNodeByCode(\"900002\");\r\nTreeView.addLastNodeByCode(\"11630\");\r\nTreeView.addLastNodeByCode(\"11645\");\r\nTreeView.addLastNodeByCode(\"01301\");\r\n}\r\nTreeView.updateNodeSetReadOnly(\"商务条件\", \"ReadOnly\");\r\nTreeView.updateNodeSetReadOnly(\"租赁车辆基本信息\", \"ReadOnly\");\r\nif(\"BAIC_MOTOR\".equals(fixedParam.get(\"operationType\"))){\r\nTreeView.addFirstNodeByCode(\"21000\");\r\nTreeView.addChildrenNodeByCode(\"北汽财务意见\", \"21100\");\r\n}\r\nTreeView.updateNodeSetReadOnly(\"北汽财务意见\", \"ReadOnly\");\r\nTreeView.addBeforeNodeByCode(\"经销商信息\", \"00160\");','TreeView.deleteCheckItemByCode(\"0039\");\r\nTreeView.deleteCheckItemByCode(\"0034\");\r\nTreeView.deleteCheckItemByCode(\"0031\");\r\nTreeView.deleteCheckItemByCode(\"0032\");\rTreeView.deleteCheckItemByCode(\"0283\");','backnextstep',NULL,NULL,NULL,NULL,'Y','[{stepno:\"否决(8000)\",stepcondition:\"提交给否决\"},{stepno:\"结束(1000)\",stepcondition:\"提交给结束\"}]',NULL,NULL,NULL,NULL,NULL); +delete from FLOW_MODEL where FlowNo='BusinessApplyFlow' AND PhaseNo='0050'; +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('BusinessApplyFlow','0050','1020','信审复审',NULL,NULL,'!审批流程.记录业务申请初审信息(#ObjectNo)','toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'commroute',NULL,'[{usertype:\"根据SQL语句\",userinfo:\"SELECT O.userid, O.username FROM USER_INFO O WHERE O.UserID IN (SELECT CASE WHEN ft.userid = \'8009011U00000003\' OR ft.userid = \'8009011U00000004\' OR ft.userid = \'800901U00000003\' THEN \'800U00090004\' WHEN ft.userid = \'8009011U00000005\' OR ft.userid = \'8009011U00000006\' OR ft.userid = \'8009011U00000007\' THEN \'8009011U00000002\' ELSE \'800U00090004\' END FROM flow_task ft WHERE ft.phaseno = \'0030\' AND ft.taskstate=0 AND ft.OBJECTNO =:{ObjectNo})\"}]','#PhaseOpinion1','closePage,doSubmit,backStep,signOpinion',NULL,'all_except','BusinessApplyFlow',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'597','550','100','50','1',NULL,'TASK',NULL,'Y','N',NULL,'TreeView.moveTreeItem(\"租赁车辆基本信息\", \"商务条件\");\r\nTreeView.moveTreeItemToLast(\"资料清单\");\r\nTreeView.addFirstNodeByCode(\"11541\");\r\nMap paramMap=new HashMap();\r\nparamMap.put(\"calType\", \"proj_process\");\r\nTreeView.AddNodeUrlParamByNode(\"11060\", paramMap);\r\nTreeView.addBeforeNodeByCode(\"租赁车辆基本信息\", \"11042\");\r\nif(!\"401\".equals(fixedParam.get(\"RoleId\"))){\r\nif(\"used_car\".equals(fixedParam.get(\"carAttributes\"))){\r\nTreeView.addLastNodeByCode(\"11620\");\r\n}\r\nTreeView.addLastNodeByCode(\"11640\");\r\nTreeView.addLastNodeByCode(\"900001\");\r\nTreeView.addLastNodeByCode(\"900002\");\r\nTreeView.addLastNodeByCode(\"11630\");\r\nTreeView.addLastNodeByCode(\"11645\");\r\nTreeView.addLastNodeByCode(\"01301\");\r\n}\r\nTreeView.updateNodeSetReadOnly(\"商务条件\", \"ReadOnly\");\r\nTreeView.updateNodeSetReadOnly(\"租赁车辆基本信息\", \"ReadOnly\");\r\nif(\"BAIC_MOTOR\".equals(fixedParam.get(\"operationType\"))){\r\nTreeView.addFirstNodeByCode(\"21000\");\r\nTreeView.addChildrenNodeByCode(\"北汽财务意见\", \"21100\");\r\n}\r\nTreeView.updateNodeSetReadOnly(\"北汽财务意见\", \"ReadOnly\");\r\nTreeView.addBeforeNodeByCode(\"经销商信息\", \"00160\");','TreeView.deleteCheckItemByCode(\"0039\");\r\nTreeView.deleteCheckItemByCode(\"0034\");\r\nTreeView.deleteCheckItemByCode(\"0031\");\r\nTreeView.deleteCheckItemByCode(\"0032\");\rTreeView.deleteCheckItemByCode(\"0283\");','backnextstep',NULL,NULL,NULL,NULL,'Y','信审负责人(0060)',NULL,NULL,NULL,NULL,NULL); +-- 修改业务变更处理人 +delete from FLOW_MODEL where FlowNo='BusinessChangeFlow' AND PhaseNo='0030'; +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('BusinessChangeFlow','0030','1020','信审专员初审',NULL,NULL,'!基础操作.接口平台业务变更流程租金测算(#ObjectNo)','toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'conditionroute',NULL,'[{usertype:\"根据SQL语句\",userinfo:\"SELECT userid,username FROM business_apply_userinfo O WHERE O.lb_project_id =(SELECT fbo.proj_id FROM flow_bussiness_object fbo WHERE fbo.flow_unid=:{ObjectNo}) \"}]','#PhaseOpinion1','closePage,doSubmit,backStep,signOpinion',NULL,'all_except','BusinessChangeFlow',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'406','402','100','50','1',NULL,'TASK',NULL,'Y','N',NULL,'TreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.moveTreeItem(\"租赁车辆基本信息\", \"商务条件\");\r\nTreeView.moveTreeItemToLast(\"资料清单\");\r\nMap paramMap=new HashMap();\r\nparamMap.put(\"calType\", \"proj_process\");\r\nTreeView.AddNodeUrlParamByNode(\"11060\", paramMap);\r\nTreeView.addBeforeNodeByCode(\"租赁车辆基本信息\", \"11042\");\r\nif(!\"401\".equals(fixedParam.get(\"RoleId\"))){\r\nif(\"used_car\".equals(fixedParam.get(\"carAttributes\"))){\r\nTreeView.addLastNodeByCode(\"11620\");\r\n}\r\nTreeView.addFirstNodeByCode(\"11541\");\r\nTreeView.addLastNodeByCode(\"900001\");\r\nTreeView.addLastNodeByCode(\"900002\");\r\nTreeView.addLastNodeByCode(\"11640\");\r\nTreeView.addLastNodeByCode(\"11630\");\r\nTreeView.addLastNodeByCode(\"11645\");\r\nTreeView.addLastNodeByCode(\"01301\");\r\nTreeView.addLastNodeByCode(\"11800\");\r\n};\r\nif(\"BAIC_MOTOR\".equals(fixedParam.get(\"operationType\"))){\r\nTreeView.addFirstNodeByCode(\"21000\");\r\nTreeView.addChildrenNodeByCode(\"北汽财务意见\", \"21100\");\r\n}\r\nTreeView.updateNodeSetReadOnly(\"北汽财务意见\", \"ReadOnly\");\r\nTreeView.addBeforeNodeByCode(\"经销商信息\", \"00160\");','TreeView.deleteCheckItemByCode(\"0015\");\r\nTreeView.deleteCheckItemByCode(\"0034\");\r\nTreeView.deleteCheckItemByCode(\"0283\");','backnextstep',NULL,'!基础操作.接口平台业务退回审批意见推送入表(#ObjectNo)',NULL,NULL,'Y','[{stepno:\"信审经理终审(0040)\",stepcondition:\"!基础操作.判断业务申请融资额小于20万(#ObjectNo)\"},{stepno:\"信审经理终审(0050)\",stepcondition:\"!基础操作.判断业务申请融资额大于20万(#ObjectNo)\"}]',NULL,NULL,NULL,NULL,NULL); + + + + + diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404sql deleted file mode 100644 index e69de29bb..000000000 diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java index b1516c422..33c0cafc8 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java @@ -229,8 +229,8 @@ public class BusinessApproveManager { public String checkCarNumber(JBOTransaction tx) throws Exception{ BizObjectManager lecManger = JBOFactory.getBizObjectManager(LB_EQUIPMENT_CAR.CLASS_NAME, tx); BizObject lec = lecManger.createQuery("select O.id from O left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci on O.contract_id=lci.id " - + " where O.FRAME_NUMBER=:prameNumber and project_id<>:projectid and lci.contract_status BETWEEN 21 AND 103") - .setParameter("prameNumber", plate_number).setParameter("projectid", projectId).getSingleResult(false); + + " where ( O.FRAME_NUMBER=:prameNumber or O.FRAME_NUMBER2=:prameNumber2 or O.FRAME_NUMBER3=:prameNumber3 or O.FRAME_NUMBER4=:prameNumber4 ) and project_id<>:projectid and lci.contract_status BETWEEN 21 AND 103") + .setParameter("prameNumber", plate_number).setParameter("prameNumber2", plate_number).setParameter("prameNumber3", plate_number).setParameter("prameNumber4", plate_number).setParameter("projectid", projectId).getSingleResult(false); if(lec !=null){ /*if(lec.getAttribute("ID").getString().equals(phaseNo)){ return "SUCCESS"; From 06859622f924a0f1968377df8ccec0adf204c3a4 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 13 Mar 2020 14:17:07 +0800 Subject: [PATCH 08/89] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=88=9D=E5=AE=A1=E5=AE=A1=E6=89=B9=E4=BA=BA?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessApplyUserinfoInfo.jsp | 45 ++++++++++++++++ .../BusinessApplyUserinfoList.jsp | 37 ++++++++++++++ WebContent/WEB-INF/etc/jbo/jbo_comm.xml | 4 +- .../com/tenwa/flow/BusinessApplyUserinfo.java | 2 +- .../comm/flow/BUSINESS_APPLY_USERINFO.java | 4 +- src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql | 51 +++++++++++++++++-- 6 files changed, 135 insertions(+), 8 deletions(-) create mode 100644 WebContent/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoInfo.jsp create mode 100644 WebContent/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoList.jsp diff --git a/WebContent/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoInfo.jsp b/WebContent/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoInfo.jsp new file mode 100644 index 000000000..a7e7f33bd --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoInfo.jsp @@ -0,0 +1,45 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + /* + Author: undefined 2020-03-13 + Content: 示例详情页面 + History Log: + */ + String id = CurPage.getParameter("id"); + + String sTempletNo = "BusinessApplyUserinfoInfo";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + //dwTemp.ReadOnly = "-2";//只读模式 + dwTemp.genHTMLObjectWindow(id); + + String sButtons[][] = { + {"true","All","Button","保存","保存所有修改","save()","","","",""}, + {"true","All","Button","返回","返回列表","returnList()","","","",""} + }; + //sButtonPosition = "south"; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoList.jsp b/WebContent/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoList.jsp new file mode 100644 index 000000000..787bd1560 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoList.jsp @@ -0,0 +1,37 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2020-03-13 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("BusinessApplyUserinfoList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + {"false","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_detail",""}, + {"false","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + }; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml index 212d1d122..6bb906d81 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml @@ -818,8 +818,8 @@ - - + + diff --git a/calc/com/tenwa/flow/BusinessApplyUserinfo.java b/calc/com/tenwa/flow/BusinessApplyUserinfo.java index 65b1d3c26..876c4244d 100644 --- a/calc/com/tenwa/flow/BusinessApplyUserinfo.java +++ b/calc/com/tenwa/flow/BusinessApplyUserinfo.java @@ -40,7 +40,7 @@ public class BusinessApplyUserinfo extends BaseBussiness{ bau = bauMange.newObject(); bau.setAttributeValue("userid", userId); bau.setAttributeValue("username", userName); - bau.setAttributeValue("lb_project_id", ProjectId); + bau.setAttributeValue("project_id", ProjectId); bau.setAttributeValue("flow_unid", flowunid); bau.setAttributeValue("flow_name", FlowName); bau.setAttributeValue("flow_phase_no", "0030"); diff --git a/src_jbo/jbo/com/tenwa/entity/comm/flow/BUSINESS_APPLY_USERINFO.java b/src_jbo/jbo/com/tenwa/entity/comm/flow/BUSINESS_APPLY_USERINFO.java index d5d46b68a..e4dee0918 100644 --- a/src_jbo/jbo/com/tenwa/entity/comm/flow/BUSINESS_APPLY_USERINFO.java +++ b/src_jbo/jbo/com/tenwa/entity/comm/flow/BUSINESS_APPLY_USERINFO.java @@ -28,11 +28,11 @@ public interface BUSINESS_APPLY_USERINFO{ /** * 项目id STRING(32)
*/ - public static final String lb_project_id = "lb_project_id"; + public static final String project_id = "project_id"; /** * 合同id STRING(32)
*/ - public static final String lb_contract_id = "lb_contract_id"; + public static final String contract_id = "contract_id"; /** * 流程id STRING(32)
*/ diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql index de372cf4b..b3be6dcd2 100644 --- a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql +++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql @@ -4,14 +4,16 @@ ALTER TABLE lb_equipment_car_temp ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COM ALTER TABLE lb_equipment_car_his ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3; -- 创建业务申请初审记录表 -CREATE TABLE Business_Apply_userinfo ( +CREATE TABLE business_apply_userinfo ( id VARCHAR(32) NOT NULL COMMENT '唯一标识', userid VARCHAR(32) DEFAULT NULL COMMENT '用户id', username VARCHAR(50) DEFAULT NULL COMMENT '用户名称', - lb_project_id VARCHAR(32) DEFAULT NULL COMMENT '项目id', + project_id VARCHAR(32) DEFAULT NULL COMMENT '项目id', + contract_id VARCHAR(32) DEFAULT NULL COMMENT '合同id', flow_unid VARCHAR(32) DEFAULT NULL COMMENT '流程id', flow_name VARCHAR(100) DEFAULT NULL COMMENT '流程名称', flow_phase_no VARCHAR(20) DEFAULT NULL COMMENT '流程节点', + flow_no VARCHAR(20) DEFAULT NULL COMMENT '流程节点', remarks VARCHAR(100) DEFAULT NULL COMMENT '备注', standby VARCHAR(100) DEFAULT NULL COMMENT '备用', inputtime VARCHAR(100) DEFAULT NULL COMMENT '登记时间', @@ -31,9 +33,52 @@ delete from FLOW_MODEL where FlowNo='BusinessApplyFlow' AND PhaseNo='0050'; insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('BusinessApplyFlow','0050','1020','信审复审',NULL,NULL,'!审批流程.记录业务申请初审信息(#ObjectNo)','toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'commroute',NULL,'[{usertype:\"根据SQL语句\",userinfo:\"SELECT O.userid, O.username FROM USER_INFO O WHERE O.UserID IN (SELECT CASE WHEN ft.userid = \'8009011U00000003\' OR ft.userid = \'8009011U00000004\' OR ft.userid = \'800901U00000003\' THEN \'800U00090004\' WHEN ft.userid = \'8009011U00000005\' OR ft.userid = \'8009011U00000006\' OR ft.userid = \'8009011U00000007\' THEN \'8009011U00000002\' ELSE \'800U00090004\' END FROM flow_task ft WHERE ft.phaseno = \'0030\' AND ft.taskstate=0 AND ft.OBJECTNO =:{ObjectNo})\"}]','#PhaseOpinion1','closePage,doSubmit,backStep,signOpinion',NULL,'all_except','BusinessApplyFlow',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'597','550','100','50','1',NULL,'TASK',NULL,'Y','N',NULL,'TreeView.moveTreeItem(\"租赁车辆基本信息\", \"商务条件\");\r\nTreeView.moveTreeItemToLast(\"资料清单\");\r\nTreeView.addFirstNodeByCode(\"11541\");\r\nMap paramMap=new HashMap();\r\nparamMap.put(\"calType\", \"proj_process\");\r\nTreeView.AddNodeUrlParamByNode(\"11060\", paramMap);\r\nTreeView.addBeforeNodeByCode(\"租赁车辆基本信息\", \"11042\");\r\nif(!\"401\".equals(fixedParam.get(\"RoleId\"))){\r\nif(\"used_car\".equals(fixedParam.get(\"carAttributes\"))){\r\nTreeView.addLastNodeByCode(\"11620\");\r\n}\r\nTreeView.addLastNodeByCode(\"11640\");\r\nTreeView.addLastNodeByCode(\"900001\");\r\nTreeView.addLastNodeByCode(\"900002\");\r\nTreeView.addLastNodeByCode(\"11630\");\r\nTreeView.addLastNodeByCode(\"11645\");\r\nTreeView.addLastNodeByCode(\"01301\");\r\n}\r\nTreeView.updateNodeSetReadOnly(\"商务条件\", \"ReadOnly\");\r\nTreeView.updateNodeSetReadOnly(\"租赁车辆基本信息\", \"ReadOnly\");\r\nif(\"BAIC_MOTOR\".equals(fixedParam.get(\"operationType\"))){\r\nTreeView.addFirstNodeByCode(\"21000\");\r\nTreeView.addChildrenNodeByCode(\"北汽财务意见\", \"21100\");\r\n}\r\nTreeView.updateNodeSetReadOnly(\"北汽财务意见\", \"ReadOnly\");\r\nTreeView.addBeforeNodeByCode(\"经销商信息\", \"00160\");','TreeView.deleteCheckItemByCode(\"0039\");\r\nTreeView.deleteCheckItemByCode(\"0034\");\r\nTreeView.deleteCheckItemByCode(\"0031\");\r\nTreeView.deleteCheckItemByCode(\"0032\");\rTreeView.deleteCheckItemByCode(\"0283\");','backnextstep',NULL,NULL,NULL,NULL,'Y','信审负责人(0060)',NULL,NULL,NULL,NULL,NULL); -- 修改业务变更处理人 delete from FLOW_MODEL where FlowNo='BusinessChangeFlow' AND PhaseNo='0030'; -insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('BusinessChangeFlow','0030','1020','信审专员初审',NULL,NULL,'!基础操作.接口平台业务变更流程租金测算(#ObjectNo)','toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'conditionroute',NULL,'[{usertype:\"根据SQL语句\",userinfo:\"SELECT userid,username FROM business_apply_userinfo O WHERE O.lb_project_id =(SELECT fbo.proj_id FROM flow_bussiness_object fbo WHERE fbo.flow_unid=:{ObjectNo}) \"}]','#PhaseOpinion1','closePage,doSubmit,backStep,signOpinion',NULL,'all_except','BusinessChangeFlow',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'406','402','100','50','1',NULL,'TASK',NULL,'Y','N',NULL,'TreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.moveTreeItem(\"租赁车辆基本信息\", \"商务条件\");\r\nTreeView.moveTreeItemToLast(\"资料清单\");\r\nMap paramMap=new HashMap();\r\nparamMap.put(\"calType\", \"proj_process\");\r\nTreeView.AddNodeUrlParamByNode(\"11060\", paramMap);\r\nTreeView.addBeforeNodeByCode(\"租赁车辆基本信息\", \"11042\");\r\nif(!\"401\".equals(fixedParam.get(\"RoleId\"))){\r\nif(\"used_car\".equals(fixedParam.get(\"carAttributes\"))){\r\nTreeView.addLastNodeByCode(\"11620\");\r\n}\r\nTreeView.addFirstNodeByCode(\"11541\");\r\nTreeView.addLastNodeByCode(\"900001\");\r\nTreeView.addLastNodeByCode(\"900002\");\r\nTreeView.addLastNodeByCode(\"11640\");\r\nTreeView.addLastNodeByCode(\"11630\");\r\nTreeView.addLastNodeByCode(\"11645\");\r\nTreeView.addLastNodeByCode(\"01301\");\r\nTreeView.addLastNodeByCode(\"11800\");\r\n};\r\nif(\"BAIC_MOTOR\".equals(fixedParam.get(\"operationType\"))){\r\nTreeView.addFirstNodeByCode(\"21000\");\r\nTreeView.addChildrenNodeByCode(\"北汽财务意见\", \"21100\");\r\n}\r\nTreeView.updateNodeSetReadOnly(\"北汽财务意见\", \"ReadOnly\");\r\nTreeView.addBeforeNodeByCode(\"经销商信息\", \"00160\");','TreeView.deleteCheckItemByCode(\"0015\");\r\nTreeView.deleteCheckItemByCode(\"0034\");\r\nTreeView.deleteCheckItemByCode(\"0283\");','backnextstep',NULL,'!基础操作.接口平台业务退回审批意见推送入表(#ObjectNo)',NULL,NULL,'Y','[{stepno:\"信审经理终审(0040)\",stepcondition:\"!基础操作.判断业务申请融资额小于20万(#ObjectNo)\"},{stepno:\"信审经理终审(0050)\",stepcondition:\"!基础操作.判断业务申请融资额大于20万(#ObjectNo)\"}]',NULL,NULL,NULL,NULL,NULL); +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('BusinessChangeFlow','0030','1020','信审专员初审',NULL,NULL,'!基础操作.接口平台业务变更流程租金测算(#ObjectNo)','toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'conditionroute',NULL,'[{usertype:\"根据SQL语句\",userinfo:\"SELECT userid,username FROM business_apply_userinfo O WHERE O.project_id =(SELECT fbo.proj_id FROM flow_bussiness_object fbo WHERE fbo.flow_unid=:{ObjectNo}) \"}]','#PhaseOpinion1','closePage,doSubmit,backStep,signOpinion',NULL,'all_except','BusinessChangeFlow',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'406','402','100','50','1',NULL,'TASK',NULL,'Y','N',NULL,'TreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.moveTreeItem(\"租赁车辆基本信息\", \"商务条件\");\r\nTreeView.moveTreeItemToLast(\"资料清单\");\r\nMap paramMap=new HashMap();\r\nparamMap.put(\"calType\", \"proj_process\");\r\nTreeView.AddNodeUrlParamByNode(\"11060\", paramMap);\r\nTreeView.addBeforeNodeByCode(\"租赁车辆基本信息\", \"11042\");\r\nif(!\"401\".equals(fixedParam.get(\"RoleId\"))){\r\nif(\"used_car\".equals(fixedParam.get(\"carAttributes\"))){\r\nTreeView.addLastNodeByCode(\"11620\");\r\n}\r\nTreeView.addFirstNodeByCode(\"11541\");\r\nTreeView.addLastNodeByCode(\"900001\");\r\nTreeView.addLastNodeByCode(\"900002\");\r\nTreeView.addLastNodeByCode(\"11640\");\r\nTreeView.addLastNodeByCode(\"11630\");\r\nTreeView.addLastNodeByCode(\"11645\");\r\nTreeView.addLastNodeByCode(\"01301\");\r\nTreeView.addLastNodeByCode(\"11800\");\r\n};\r\nif(\"BAIC_MOTOR\".equals(fixedParam.get(\"operationType\"))){\r\nTreeView.addFirstNodeByCode(\"21000\");\r\nTreeView.addChildrenNodeByCode(\"北汽财务意见\", \"21100\");\r\n}\r\nTreeView.updateNodeSetReadOnly(\"北汽财务意见\", \"ReadOnly\");\r\nTreeView.addBeforeNodeByCode(\"经销商信息\", \"00160\");','TreeView.deleteCheckItemByCode(\"0015\");\r\nTreeView.deleteCheckItemByCode(\"0034\");\r\nTreeView.deleteCheckItemByCode(\"0283\");','backnextstep',NULL,'!基础操作.接口平台业务退回审批意见推送入表(#ObjectNo)',NULL,NULL,'Y','[{stepno:\"信审经理终审(0040)\",stepcondition:\"!基础操作.判断业务申请融资额小于20万(#ObjectNo)\"},{stepno:\"信审经理终审(0050)\",stepcondition:\"!基础操作.判断业务申请融资额大于20万(#ObjectNo)\"}]',NULL,NULL,NULL,NULL,NULL); +-- 添加模板 +Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('BusinessApplyUserinfoInfo','业务审批记录表',null,'30',null,'1','2','default','jbo.com.tenwa.entity.comm.flow.BUSINESS_APPLY_USERINFO','O left join jbo.com.tenwa.lease.comm.LB_PROJECT_INFO lpi on O.project_id=lpi.id left join jbo.com.tenwa.lease.comm.LB_UNION_LESSEE lul on lul.project_id=O.project_id','O.id=:id','','','',null,'SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:55:43','','1',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1000','1000','1','O','id','id','String','','唯一标识','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:55:43','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1010','1010','1','O','userid','userid','String','','用户id','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:55:43','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1015','1015','1','lpi','PROJECT_NO','PROJECT_NO','String','','项目编号','','1','Text','1','1','','','','32','1','1','0','1','0',0,'','0010','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:58:54','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1018','1018','1','lul','CUSTOMER_NAME','CUSTOMER_NAME','String','','承租人名称','','1','Text','1','1','','','','200','1','1','0','1','0',0,'','0010','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:58:54','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1030','1030','1','O','project_id','project_id','String','','项目id','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:55:43','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1040','1040','1','O','contract_id','contract_id','String','','合同id','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:55:43','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1050','1050','1','O','flow_unid','flow_unid','String','','流程id','','1','Text','1','1','','','','32','1','1','0','1','1',1,'0','0010','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:57:03','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1055','1055','1','O','username','username','String','','业务初审人','','1','Text','1','1','','','','50','1','1','0','1','1',1,'0','0010','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:59:57','0','','1','','','selectUserinfo()',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1060','1060','1','O','flow_name','flow_name','String','','流程名称','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:55:43','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1070','1070','1','O','flow_phase_no','flow_phase_no','String','','流程节点','','1','Text','1','1','','','','20','0','0','0','1','1',1,'0','','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:55:43','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1080','1080','1','O','flow_no','flow_no','String','','流程节点','','1','Text','1','1','','','','20','0','0','0','1','1',1,'0','','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:55:43','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1090','1090','1','O','remarks','remarks','String','','备注','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:55:43','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1100','1100','1','O','standby','standby','String','','备用','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:55:43','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1110','1110','1','O','inputtime','inputtime','String','','登记时间','','1','Date','3','2','','','','100','0','0','0','1','1',1,'0','','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:55:43','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1120','1120','1','O','updateuserid','updateuserid','String','','更新人','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:55:43','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1130','1130','1','O','updateorgid','updateorgid','String','','更新部门','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:55:43','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoInfo','1140','1140','1','O','updatetime','updatetime','String','','更新时间','','1','Date','3','2','','','','100','0','0','0','1','1',1,'0','','','SYS_Designer','2020/03/13 09:20:46','SYS_Designer','2020/03/13 09:55:43','','','1','','','',''); +Insert Into AWE_DO_Group (dono,dockid,dockname,inputuser,inputtime,updateuser,updatetime,inputorg,sortno,grouphead,groupfoot,groupbody,colcount,styleid,isexpand,groupbody1,groupbody2) Values ('BusinessApplyUserinfoInfo','0010','审批信息','SYS_Designer','2020/03/13 09:55:17','SYS_Designer','2020/03/13 09:58:11','','0010','','','',2,'','','',''); +Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('BusinessApplyUserinfoList','业务审批记录表',null,'30',null,'1','1','default','jbo.com.tenwa.entity.comm.flow.BUSINESS_APPLY_USERINFO','O left join jbo.com.tenwa.lease.comm.LB_PROJECT_INFO lpi on O.project_id=lpi.id left join jbo.com.tenwa.lease.comm.LB_UNION_LESSEE lul on lul.project_id=O.project_id left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci on lci.project_id=O.project_id','lpi.id is not null and lci.id is null','','','','','SYS_Designer','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','1',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1000','1000','1','O','id','id','String','','唯一标识','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1010','1010','1','O','userid','userid','String','','用户id','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1015','1015','1','lpi','PROJECT_NO','PROJECT_NO','String','','项目编号','','1','Text','1','1','','','','32','1','0','0','1','0',0,'','','','SYS_Designer','2020/03/13 09:16:14','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1018','1018','1','lul','CUSTOMER_NAME','CUSTOMER_NAME','String','','承租人名称','','1','Text','1','1','','','','200','1','0','0','1','0',0,'','','','SYS_Designer','2020/03/13 09:16:25','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1030','1030','1','O','project_id','project_id','String','','项目id','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1040','1040','1','O','contract_id','contract_id','String','','合同id','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1050','1050','1','O','flow_unid','flow_unid','String','','流程id','','1','Text','1','1','','','','32','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1055','1055','1','O','username','username','String','','业务初审人','','1','Text','1','1','','','','50','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1060','1060','1','O','flow_name','flow_name','String','','流程名称','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1070','1070','1','O','flow_phase_no','flow_phase_no','String','','流程节点','','1','Text','1','1','','','','20','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1080','1080','1','O','flow_no','flow_no','String','','流程节点','','1','Text','1','1','','','','20','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1090','1090','1','O','remarks','remarks','String','','备注','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1100','1100','1','O','standby','standby','String','','备用','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1110','1110','1','O','inputtime','inputtime','String','','登记时间','','1','Date','3','2','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1120','1120','1','O','updateuserid','updateuserid','String','','更新人','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1130','1130','1','O','updateorgid','updateorgid','String','','更新部门','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1140','1140','1','O','updatetime','updatetime','String','','更新时间','','1','Date','3','2','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); +-- 添加选择对话框 +Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('selectUserInfo','Sql','用户信息查询','user_info','userid','Grid','','userid','SELECT userid,username FROM user_info WHERE LEFT(userid,4)<>''8006'' and LENGTH(TRIM(userid))>0','用户id,用户名','username@style={width:250px;}','userid@username','username','1','Single','','','','','','SYS_Designer','','2020/03/13 10:16:31','SYS_Designer','2020/03/13 10:45:52',''); +-- 添加菜单 +Insert Into AWE_MENU_INFO (menuid,menuname,displayname,sortno,url,urlparam,target,style,isinuse,remark,inputorgid,inputuserid,inputtime,updateorgid,updateuserid,updatetime,accesstype,icon,appicon) Values ('2000100070','业务申请初审','业务申请初审','2000100070','/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoList.jsp','isCache=false','_self','','1','',null,'SYS_Designer','2020/03/13 09:42:40',null,'SYS_Designer','2020/03/13 09:42:40','10','',''); +Insert Into AWE_Role_Menu (roleid,menuid) Values ('099','2000100070'); From f1dc94d8c6ce27e71291e0a1aa03973631df6bb3 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 13 Mar 2020 15:39:15 +0800 Subject: [PATCH 09/89] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=88=B6=E4=BD=9C=E8=BD=A6=E6=9E=B6=E5=8F=B7=E5=8F=AA=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp index c8a3b291b..2de1c494e 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp @@ -105,6 +105,9 @@ doTemp.setReadOnly("FRAME_NUMBER",false); doTemp.setReadOnly("CAR_COLOUR",false); doTemp.setReadOnly("ENGINE_NUMBER",false); + doTemp.setReadOnly("FRAME_NUMBER2",false); + doTemp.setReadOnly("FRAME_NUMBER3",false); + doTemp.setReadOnly("FRAME_NUMBER4",false); //第一车贷产品可以修改其他配置说明 if("DYCD".equals(operationType)){ doTemp.setReadOnly("MEMO",false); From 9ff872d386eef15f9ec59db7f642b2a41c67fc59 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Mon, 16 Mar 2020 10:06:47 +0800 Subject: [PATCH 10/89] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=AA=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=BD=92=E6=A1=A3=E4=BF=A1=E6=81=AF=E7=9A=84=E6=A0=87?= =?UTF-8?q?=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tenwa/apzl/comm/CopyFileArchivingInfoTempToFormat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_tenwa/com/tenwa/apzl/comm/CopyFileArchivingInfoTempToFormat.java b/src_tenwa/com/tenwa/apzl/comm/CopyFileArchivingInfoTempToFormat.java index 4841f18b5..1f25e5cb3 100644 --- a/src_tenwa/com/tenwa/apzl/comm/CopyFileArchivingInfoTempToFormat.java +++ b/src_tenwa/com/tenwa/apzl/comm/CopyFileArchivingInfoTempToFormat.java @@ -23,7 +23,7 @@ public class CopyFileArchivingInfoTempToFormat extends BaseBussiness{ int num = Integer.valueOf(Sqlca.getString("select count(1) from LB_FILE_ARCHIVING_INFO_TEMP where FLOWUNID ='"+flowunid+"'")); if(num==0){ - Sqlca.executeSQL(new SqlObject("insert into LB_FILE_ARCHIVING_INFO(ID,CONTRACT_ID,CONTRACT_NUMBER) values(REPLACE(UUID(),'-',''),'"+contract_id+"','"+flowKey+"')")); + Sqlca.executeSQL(new SqlObject("insert into LB_FILE_ARCHIVING_INFO(ID,CONTRACT_ID,CONTRACT_NUMBER,REMARKS) values(REPLACE(UUID(),'-',''),'"+contract_id+"','"+flowKey+"','未保存归档信息，流程id："+flowunid+"')")); }else{ DataOperatorUtil.copySingleJBO("jbo.app.LB_FILE_ARCHIVING_INFO_TEMP", fromCondtion, "jbo.com.tenwa.lease.comm.LB_FILE_ARCHIVING_INFO", null, null, Sqlca); } From 1390d9df2033df0605450227172fbc3ff7ef5d37 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Mon, 16 Mar 2020 19:32:33 +0800 Subject: [PATCH 11/89] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E7=A5=A8=E4=BF=A1=E6=81=AF=E5=92=8C?= =?UTF-8?q?Gps=E4=BE=9B=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FundPaymentInvoice/LbInvoiceInfoTemp.jsp | 42 ++++++++++ .../Fund/FundPayment/FundPaymentApplyList.jsp | 4 +- .../CautionMoneyDeduction/ContractInfoPay.jsp | 32 ++++++- WebContent/WEB-INF/etc/jbo/jbo_comm.xml | 53 ++++++++++++ .../entity/comm/invoice/LB_INVOICE_INFO.java | 80 ++++++++++++++++++ .../comm/invoice/LB_INVOICE_INFO_TEMP.java | 84 +++++++++++++++++++ src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql | 80 +++++++++++++++++- .../contract/check/ContractInfoCheck.java | 24 ++++++ .../LbInvoiceInfoTempToFormal.java | 26 ++++++ 9 files changed, 419 insertions(+), 6 deletions(-) create mode 100644 WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp create mode 100644 src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO.java create mode 100644 src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO_TEMP.java create mode 100644 src_tenwa/com/tenwa/lease/flow/project/commbusiness/LbInvoiceInfoTempToFormal.java diff --git a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp new file mode 100644 index 000000000..5dc236322 --- /dev/null +++ b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp @@ -0,0 +1,42 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + /* + Author: undefined 2020-03-16 + Content: 示例详情页面 + History Log: + */ + //String sPrevUrl = CurPage.getParameter("PrevUrl"); + String ContractId = CurPage.getParameter("ContractId"); + String flowunid = CurPage.getParameter("flowunid"); + + String sTempletNo = "LB_INVOICE_INFO_TEMP";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + //doTemp.setColTips("", "测试"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + //dwTemp.ReadOnly = "-2";//只读模式 + dwTemp.genHTMLObjectWindow(CurPage.getParameter("ContractId")); + + String sButtons[][] = { + {"false","All","Button","保存","保存所有修改","as_save(0)","","","",""}, + {"false","All","Button","返回","返回列表","returnList()","","","",""} + }; + sButtonPosition = "south"; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp index bf5a966b5..ecbf0cac8 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/FundPaymentApplyList.jsp @@ -18,11 +18,11 @@ return; } sReturn = sReturn.split("@"); - /*var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.contract.check.ContractInfoCheck","ProjectSignStatus","projectid="+sReturn[1]); + var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.contract.check.ContractInfoCheck","ProjectSignStatus","projectid="+sReturn[1]); if("error"==sReturnInfo){ alert("请提醒客户查看手机短信，首先完成扣款卡的签约验证！"); return; - } */ + } var contract_id = sReturn[0]; var proj_id = sReturn[1]; var productId = sReturn[2]; diff --git a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp index 7898856e6..b952ad6e3 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/CautionMoneyDeduction/ContractInfoPay.jsp @@ -5,14 +5,19 @@ Content: 示例详情页面 History Log: */ + String orgId = CurUser.getOrgID(); String ishistory = CurPage.getParameter("IsHistory"); String flowunid = CurPage.getParameter("FlowUnid"); String contractId = CurPage.getParameter("ContractId"); String compClientID = CurPage.getParameter("CompClientID"); String phaseNo = CurPage.getParameter("PhaseNo"); + String ProductId = CurPage.getParameter("ProductId"); String productid = Sqlca.getString("select PRODUCT_ID from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'"); + String gpsVendor = Sqlca.getString("select cl.itemname from PRD_SPECIFIC_LIBRARY psl left join code_library cl on cl.itemno=psl.GPS_VENDOR and cl.codeno='gpsVendor' where productid='"+ProductId+"'"); + String sTempletNo = "LB_CONTRACT_INFO_PAY";//--模板号-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); + /* if(null!=ishistory&&ishistory.equals("true")){ doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据 } */ @@ -22,14 +27,32 @@ dwTemp.genHTMLObjectWindow(contractId); String url="/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitListForContract.jsp?CompClientID="; dwTemp.replaceColumn("GUARANTEE_LIST", "", CurPage.getObjectWindowOutput()); + //dwTemp.replaceColumn("INVOICEINFO", "", CurPage.getObjectWindowOutput()); + dwTemp.replaceColumn("INVOICEINFO", "", CurPage.getObjectWindowOutput()); + String sButtons[][] = { - {"true","","Button","保存","保存所有修改","as_save(0)","","","","btn_icon_save"}, + {"true","","Button","保存","保存所有修改","save()","","","","btn_icon_save"}, }; //sButtonPosition = "south"; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml index 6bb906d81..af3e50dac 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml @@ -1223,6 +1223,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO.java b/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO.java new file mode 100644 index 000000000..1257f425f --- /dev/null +++ b/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO.java @@ -0,0 +1,80 @@ +package jbo.com.tenwa.entity.comm.invoice; + +import java.lang.String; + +/** +* 发票信息正式表 - JBO命名常量类

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface LB_INVOICE_INFO{ + /** + * 发票信息正式表

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.com.tenwa.entity.comm.invoice.LB_INVOICE_INFO"; + /** + * 唯一标识 STRING(32)
+ */ + public static final String id = "id"; + /** + * 项目id STRING(32)
+ */ + public static final String project_id = "project_id"; + /** + * 合同id STRING(32)
+ */ + public static final String contract_id = "contract_id"; + /** + * 发票代码 STRING(32)
+ */ + public static final String Invoice_code = "Invoice_code"; + /** + * 发票号码 STRING(32)
+ */ + public static final String Invoice_number = "Invoice_number"; + /** + * 开票日期 STRING(100)
+ */ + public static final String Invoice_date = "Invoice_date"; + /** + * 开票金额 STRING(20)
+ */ + public static final String Invoice_money = "Invoice_money"; + /** + * 税金 STRING(20)
+ */ + public static final String tax_due = "tax_due"; + /** + * 备注 STRING(100)
+ */ + public static final String remarks = "remarks"; + /** + * 备用 STRING(100)
+ */ + public static final String standby = "standby"; + /** + * 登记人 STRING(100)
+ */ + public static final String inputuserid = "inputuserid"; + /** + * 登记部门 STRING(100)
+ */ + public static final String inputorgid = "inputorgid"; + /** + * 登记时间 STRING(100)
+ */ + public static final String inputtime = "inputtime"; + /** + * 更新人 STRING(100)
+ */ + public static final String updateuserid = "updateuserid"; + /** + * 更新部门 STRING(100)
+ */ + public static final String updateorgid = "updateorgid"; + /** + * 更新时间 STRING(100)
+ */ + public static final String updatetime = "updatetime"; +} \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO_TEMP.java b/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO_TEMP.java new file mode 100644 index 000000000..9ba3483b2 --- /dev/null +++ b/src_jbo/jbo/com/tenwa/entity/comm/invoice/LB_INVOICE_INFO_TEMP.java @@ -0,0 +1,84 @@ +package jbo.com.tenwa.entity.comm.invoice; + +import java.lang.String; + +/** +* 发票信息临时表 - JBO命名常量类

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface LB_INVOICE_INFO_TEMP{ + /** + * 发票信息临时表

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.com.tenwa.entity.comm.invoice.LB_INVOICE_INFO_TEMP"; + /** + * 唯一标识 STRING(32)
+ */ + public static final String id = "id"; + /** + * 项目id STRING(32)
+ */ + public static final String project_id = "project_id"; + /** + * 合同id STRING(32)
+ */ + public static final String contract_id = "contract_id"; + /** + * 发票代码 STRING(32)
+ */ + public static final String Invoice_code = "Invoice_code"; + /** + * 发票号码 STRING(32)
+ */ + public static final String Invoice_number = "Invoice_number"; + /** + * 开票日期 STRING(100)
+ */ + public static final String Invoice_date = "Invoice_date"; + /** + * 开票金额 STRING(20)
+ */ + public static final String Invoice_money = "Invoice_money"; + /** + * 税金 STRING(20)
+ */ + public static final String tax_due = "tax_due"; + /** + * 流程id STRING(32)
+ */ + public static final String flow_unid = "flow_unid"; + /** + * 备注 STRING(100)
+ */ + public static final String remarks = "remarks"; + /** + * 备用 STRING(100)
+ */ + public static final String standby = "standby"; + /** + * 登记人 STRING(100)
+ */ + public static final String inputuserid = "inputuserid"; + /** + * 登记部门 STRING(100)
+ */ + public static final String inputorgid = "inputorgid"; + /** + * 登记时间 STRING(100)
+ */ + public static final String inputtime = "inputtime"; + /** + * 更新人 STRING(100)
+ */ + public static final String updateuserid = "updateuserid"; + /** + * 更新部门 STRING(100)
+ */ + public static final String updateorgid = "updateorgid"; + /** + * 更新时间 STRING(100)
+ */ + public static final String updatetime = "updatetime"; +} \ No newline at end of file diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql index b3be6dcd2..c439bd615 100644 --- a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql +++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql @@ -76,9 +76,85 @@ Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualn Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessApplyUserinfoList','1140','1140','1','O','updatetime','updatetime','String','','更新时间','','1','Date','3','2','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/13 08:58:10','SYS_Designer','2020/03/13 11:40:42','','','1','','','',''); -- 添加选择对话框 -Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('selectUserInfo','Sql','用户信息查询','user_info','userid','Grid','','userid','SELECT userid,username FROM user_info WHERE LEFT(userid,4)<>''8006'' and LENGTH(TRIM(userid))>0','用户id,用户名','username@style={width:250px;}','userid@username','username','1','Single','','','','','','SYS_Designer','','2020/03/13 10:16:31','SYS_Designer','2020/03/13 10:45:52',''); - +DELETE FROM SELECT_CATALOG WHERE selname='selectUserInfo'; +INSERT INTO SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) VALUES ('selectUserInfo','Sql','用户信息查询','user_info','userid','Grid','','userid','SELECT ui.userid,ui.username,ri.rolename FROM user_info ui LEFT JOIN USER_ROLE ur ON ur.USERID =ui.USERID LEFT JOIN ROLE_INFO ri ON ri.roleid=ur.roleid LEFT JOIN USER_TASK_INFO uti ON uti.userid=ui.userid WHERE ur.roleid=''800R00000013'' AND uti.INDUCTION_STATE=''induction_state01''','用户id,用户名,角色名称','username@style={width:250px;}','userid@username','username','1','Single','','','','','','SYS_Designer','','2020/03/13 10:16:31','SYS_Designer','2020/03/13 19:45:55',''); -- 添加菜单 Insert Into AWE_MENU_INFO (menuid,menuname,displayname,sortno,url,urlparam,target,style,isinuse,remark,inputorgid,inputuserid,inputtime,updateorgid,updateuserid,updatetime,accesstype,icon,appicon) Values ('2000100070','业务申请初审','业务申请初审','2000100070','/Tenwa/Lease/Flow/BusinessApplyUserinfo/BusinessApplyUserinfoList.jsp','isCache=false','_self','','1','',null,'SYS_Designer','2020/03/13 09:42:40',null,'SYS_Designer','2020/03/13 09:42:40','10','',''); Insert Into AWE_Role_Menu (roleid,menuid) Values ('099','2000100070'); +-- 创建发票信息表 +-- 临时表 +CREATE TABLE lb_Invoice_info_temp ( + id VARCHAR(32) NOT NULL COMMENT '唯一标识', + project_id VARCHAR(32) DEFAULT NULL COMMENT '项目id', + contract_id VARCHAR(32) DEFAULT NULL COMMENT '合同id', + Invoice_code VARCHAR(32) DEFAULT NULL COMMENT '发票代码', + Invoice_number VARCHAR(32) DEFAULT NULL COMMENT '发票号码', + Invoice_date VARCHAR(100) DEFAULT NULL COMMENT '开票日期', + Invoice_money VARCHAR(20) DEFAULT NULL COMMENT '开票金额', + tax_due VARCHAR(20) DEFAULT NULL COMMENT '税金', + flow_unid VARCHAR(32) DEFAULT NULL COMMENT '流程id', + remarks VARCHAR(100) DEFAULT NULL COMMENT '备注', + standby VARCHAR(100) DEFAULT NULL COMMENT '备用', + inputuserid VARCHAR(100) DEFAULT NULL COMMENT '登记人', + inputorgid VARCHAR(100) DEFAULT NULL COMMENT '登记部门', + inputtime varchar(100) DEFAULT NULL COMMENT '登记时间', + updateuserid varchar(100) DEFAULT NULL COMMENT '更新人', + updateorgid varchar(100) DEFAULT NULL COMMENT '更新部门', + updatetime varchar(100) DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=INNODB DEFAULT CHARSET=gbk; +-- 正式表 +CREATE TABLE lb_Invoice_info ( + id VARCHAR(32) NOT NULL COMMENT '唯一标识', + project_id VARCHAR(32) DEFAULT NULL COMMENT '项目id', + contract_id VARCHAR(32) DEFAULT NULL COMMENT '合同id', + Invoice_code VARCHAR(32) DEFAULT NULL COMMENT '发票代码', + Invoice_number VARCHAR(32) DEFAULT NULL COMMENT '发票号码', + Invoice_date VARCHAR(100) DEFAULT NULL COMMENT '开票日期', + Invoice_money VARCHAR(20) DEFAULT NULL COMMENT '开票金额', + tax_due VARCHAR(20) DEFAULT NULL COMMENT '税金', + remarks VARCHAR(100) DEFAULT NULL COMMENT '备注', + standby VARCHAR(100) DEFAULT NULL COMMENT '备用', + inputuserid VARCHAR(100) DEFAULT NULL COMMENT '登记人', + inputorgid VARCHAR(100) DEFAULT NULL COMMENT '登记部门', + inputtime VARCHAR(100) DEFAULT NULL COMMENT '登记时间', + updateuserid VARCHAR(100) DEFAULT NULL COMMENT '更新人', + updateorgid VARCHAR(100) DEFAULT NULL COMMENT '更新部门', + updatetime VARCHAR(100) DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=INNODB DEFAULT CHARSET=gbk; + +-- 添加发票信息模板 +Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('LB_INVOICE_INFO_TEMP','发票信息临时表',null,'30',null,'1','2','default','jbo.com.tenwa.entity.comm.invoice.LB_INVOICE_INFO_TEMP','O','contract_id=:id ','','','com.amarsoft.awe.dw.handler.impl.CommonHandler','','SYS_Designer','2020/03/16 11:42:16','SYS_Designer','2020/03/16 18:07:11','','1',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1000','1000','1','O','id','id','String','','唯一标识','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1010','1010','1','O','project_id','project_id','String','','项目id','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1020','1020','1','O','contract_id','contract_id','String','','合同id','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1030','1030','1','O','Invoice_code','Invoice_code','String','','发票代码','','1','Text','1','1','','','','32','1','0','1','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1040','1040','1','O','Invoice_number','Invoice_number','String','','发票号码','','1','Text','1','1','','','','32','1','0','1','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1050','1050','1','O','Invoice_date','Invoice_date','String','','开票日期','','1','Date','3','2','','','','100','1','0','1','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1060','1060','1','O','Invoice_money','Invoice_money','String','','开票金额','','1','Text','2','1','','','','20','1','0','1','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1070','1070','1','O','tax_due','tax_due','String','','税金','','1','Text','2','1','','','','20','1','0','1','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1080','1080','1','O','flow_unid','flow_unid','String','','流程id','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1110','1110','1','O','inputuserid','inputuserid','String','','登记人','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1120','1120','1','O','inputorgid','inputorgid','String','','登记部门','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1130','1130','1','O','inputtime','inputtime','String','','登记时间','','1','Date','3','2','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1140','1140','1','O','updateuserid','updateuserid','String','','更新人','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1150','1150','1','O','updateorgid','updateorgid','String','','更新部门','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1160','1160','1','O','updatetime','updatetime','String','','更新时间','','1','Date','3','2','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','',''); +-- 付款申请页面添加发票信息字段 +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_CONTRACT_INFO_PAY','2500','2500','1','','''''','INVOICEINFO','String','','发票信息','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','0070','','SYS_Designer','2020/03/16 14:45:14','SYS_Designer','2020/03/16 14:47:25','','','1','','','',''); +Insert Into AWE_DO_Group (dono,dockid,dockname,inputuser,inputtime,updateuser,updatetime,inputorg,sortno,grouphead,groupfoot,groupbody,colcount,styleid,isexpand,groupbody1,groupbody2) Values ('LB_CONTRACT_INFO_PAY','0070','发票信息','SYS_Designer','2020/03/16 14:47:23','SYS_Designer','2020/03/16 14:47:23','','0070','','','',2,'','','',''); + +-- 付款申请页面添加经销商信息 +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_CONTRACT_INFO_PAY','2600','2600','1','','''''','GPS','String','','GPS供应商','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','0020','','SYS_Designer','2020/03/16 15:53:56','SYS_Designer','2020/03/16 15:54:14','0','','1','','','',''); + +-- 添加发票信息考表方法 +insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('审批流程','发票信息表从临时到正式表','Bizlet','发票信息表从临时到正式表','String','String ObjectNo','com.tenwa.lease.flow.project.commbusiness.LbInvoiceInfoTempToFormal','','','','','',''); + +-- 付款申请结束添加考表操作 +delete from FLOW_MODEL where FlowNo='FundPaymentCarFlow' AND PhaseNo='1000'; +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('FundPaymentCarFlow','1000','1040','通过',NULL,NULL,'!基础操作.投放层资金付款临时到正式表(#ObjectNo)+!基础操作.合同基本信息从临时到正式(#ObjectNo)+!通用流程操作.保存项目进度状态(#ObjectNo,21)+!基础操作.接口平台业务通过审批意见推送入表(#ObjectNo)+!审批流程.发票信息表从临时到正式表(#ObjectNo)','{\"system\"}',NULL,'commroute',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'287','472','50','50','1',NULL,'END',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); + + + diff --git a/src_tenwa/com/tenwa/lease/flow/contract/check/ContractInfoCheck.java b/src_tenwa/com/tenwa/lease/flow/contract/check/ContractInfoCheck.java index 8ec9c451f..7247cfaf9 100644 --- a/src_tenwa/com/tenwa/lease/flow/contract/check/ContractInfoCheck.java +++ b/src_tenwa/com/tenwa/lease/flow/contract/check/ContractInfoCheck.java @@ -3,6 +3,7 @@ package com.tenwa.lease.flow.contract.check; import java.util.List; import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; @@ -14,6 +15,7 @@ public class ContractInfoCheck { private String contractid; private String projectid; + private String hasGps; public String getContractid() { return contractid; @@ -28,6 +30,13 @@ public class ContractInfoCheck { this.projectid = projectid; } + public String getHasGps() { + return hasGps; + } + public void setHasGps(String hasGps) { + this.hasGps = hasGps; + } + //检查该项目是否进行过签约验证 public String ProjectSignStatus(JBOTransaction tx) throws Exception{ BizObjectManager caManage = JBOFactory.getBizObjectManager(CUSTOMER_ACCOUNT.CLASS_NAME, tx); @@ -42,4 +51,19 @@ public class ContractInfoCheck { return falg; } + //保存付款申请GPS是否安装状态 + public void saveGps(JBOTransaction tx){ + try { + BizObjectManager lciManage = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME, tx); + BizObject lci = lciManage.createQuery(" id=:contract_id ").setParameter("contract_id", contractid).getSingleResult(true); + if(lci != null ){ + lci.setAttributeValue("has_gps", hasGps); + lciManage.saveObject(lci); + } + + } catch (JBOException e) { + e.printStackTrace(); + } + + } } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LbInvoiceInfoTempToFormal.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LbInvoiceInfoTempToFormal.java new file mode 100644 index 000000000..d3b229fe1 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LbInvoiceInfoTempToFormal.java @@ -0,0 +1,26 @@ +package com.tenwa.lease.flow.project.commbusiness; + +import java.util.HashMap; +import java.util.Map; + +import jbo.com.tenwa.entity.comm.invoice.LB_INVOICE_INFO; +import jbo.com.tenwa.entity.comm.invoice.LB_INVOICE_INFO_TEMP; + +import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.baseBussion.BaseBussiness; + +public class LbInvoiceInfoTempToFormal extends BaseBussiness{ + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String flowunid = this.getAttribute("ObjectNo").toString(); + + Map fromCondtion = new HashMap(); + fromCondtion.put("flow_unid", flowunid); + + DataOperatorUtil.copySingleJBO(LB_INVOICE_INFO_TEMP.CLASS_NAME, fromCondtion, LB_INVOICE_INFO.CLASS_NAME, null, null, Sqlca); + String sMessage="true"; + return sMessage; + } +} From dfd93e1015aed26e2e80ac41d0e32a18b20c9b54 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 17 Mar 2020 19:28:24 +0800 Subject: [PATCH 12/89] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=B9=8F=E5=85=83?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=8F=8D=E6=AC=BA=E8=AF=88=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=92=8C=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BigDataController.java | 22 +- 鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/鐢ㄦ埛瑙掕壊琛.xml | 964 +++++++++++------- 鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/瑙掕壊鑿滃崟琛.xml | 674 ++++++++---- 3 files changed, 1069 insertions(+), 591 deletions(-) diff --git a/src_tenwa/com/tenwa/httpclient/controller/BigDataController.java b/src_tenwa/com/tenwa/httpclient/controller/BigDataController.java index c387f5381..07db76ceb 100644 --- a/src_tenwa/com/tenwa/httpclient/controller/BigDataController.java +++ b/src_tenwa/com/tenwa/httpclient/controller/BigDataController.java @@ -403,8 +403,8 @@ public class BigDataController { array.add(subTable1); savePengyuanResultData(object, cisReport, "mobileStatusInfo", stat, otherFields, dateFields, stringFields); - //是否命中高风险名单 - object.clear(); + //是否命中高风险名单，不在返回 + /* object.clear(); object.put("type", "table"); object.put("tableName", "bigdata_py_person_risk_assess"); fieldList.clear(); @@ -412,25 +412,25 @@ public class BigDataController { fieldList.add("riskType"); object.put("field", fieldList); savePengyuanResultData(object, cisReport, "personRiskAssess", stat, otherFields, dateFields, stringFields); - - //是否命中羊毛党名单 - object.clear(); + */ + //是否命中羊毛党名单 ,不在返回 + /*object.clear(); object.put("type", "table"); object.put("tableName", "bigdata_py_ec_info"); fieldList.clear(); fieldList.add("state"); object.put("field", fieldList); savePengyuanResultData(object, cisReport, "econnoisserurInfo", stat, otherFields, dateFields, stringFields); - - //是否命中欺诈风险名单 - object.clear(); + */ + //是否命中欺诈风险名单，不在返回 + /*object.clear(); object.put("type", "table"); object.put("tableName", "bigdata_py_fraud_risk_info"); fieldList.clear(); fieldList.add("state"); object.put("field", fieldList); savePengyuanResultData(object, cisReport, "fraudRiskInfo", stat, otherFields, dateFields, stringFields); - + */ //个人被机构查询概要信息 array.clear(); object.clear(); @@ -477,7 +477,7 @@ public class BigDataController { array.add(subTable1); array.add(subTable2); // array.add(subTable3); - savePengyuanResultData(object, cisReport, "historySimpleQueryInfo", stat, otherFields, dateFields, stringFields); + //savePengyuanResultData(object, cisReport, "historySimpleQueryInfo", stat, otherFields, dateFields, stringFields); //近三年信贷逾期信息 @@ -507,7 +507,7 @@ public class BigDataController { array.add(subTable1); array.add(subTable2); - savePengyuanResultData(object, cisReport, "microNearlyThreeYearsOverdueInfo", stat, otherFields, dateFields, stringFields); + //savePengyuanResultData(object, cisReport, "microNearlyThreeYearsOverdueInfo", stat, otherFields, dateFields, stringFields); //险信息风 array.clear(); diff --git a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/鐢ㄦ埛瑙掕壊琛.xml b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/鐢ㄦ埛瑙掕壊琛.xml index 4a137aa8d..2d4e61400 100644 --- a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/鐢ㄦ埛瑙掕壊琛.xml +++ b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/鐢ㄦ埛瑙掕壊琛.xml @@ -19,14 +19,13 @@ 2c9c81b56552c949016557405f23000f 鐢ㄦ埛瑙掕壊琛 user_role - REPORT_CODE_1534767161123 true 11 REPORT 2c9c81b7685efbbc016931c6eff50007 - 2c9c81b56552c94901655746e7a7002b + 2c9c81b9700ecc97017080a7c3060048 @@ -38,65 +37,74 @@ 2c9023815726a036015726a496b00001 COMPLEXSQL SELECT O.userid,MAX(O.loginid) loginid, MAX(O.username) username,MAX(oi.orgname)orgname,MAX(CASE WHEN O.`status`='1' THEN '姝ｅ父' ELSE '鍋滅敤' END) AS `status`, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴甯傚満涓撳憳' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴甯傚満涓撳憳, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴杩愯惀涓撳憳鍒濆' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴杩愯惀涓撳憳鍒濆, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴杩愯惀涓撳憳澶嶅' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴杩愯惀涓撳憳澶嶅, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴杩愯惀鎬荤洃' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴杩愯惀鎬荤洃, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴甯傚満鎬荤洃' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴甯傚満鎬荤洃, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴鍓荤粡鐞' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴鍓荤粡鐞, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴杩愯惀涓撳憳' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴杩愯惀涓撳憳, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴鍒嗙棰嗗' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴鍒嗙棰嗗, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴鎬荤洃' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴鎬荤洃, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴椤圭洰缁忕悊' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴椤圭洰缁忕悊, -MAX(CASE WHEN ri.`rolename` ='涓氬姟涓閮ㄩ」鐩粡鐞' THEN '鈭' ELSE '' END) AS 涓氬姟涓閮ㄩ」鐩粡鐞, -MAX(CASE WHEN ri.`rolename` ='涓氬姟涓閮ㄦ荤洃' THEN '鈭' ELSE '' END) AS 涓氬姟涓閮ㄦ荤洃, -MAX(CASE WHEN ri.`rolename` ='涓氬姟涓閮ㄥ垎绠￠瀵' THEN '鈭' ELSE '' END) AS 涓氬姟涓閮ㄥ垎绠￠瀵, -MAX(CASE WHEN ri.`rolename` ='绉熷悗缁忕悊' THEN '鈭' ELSE '' END) AS 绉熷悗缁忕悊, -MAX(CASE WHEN ri.`rolename` ='璐㈠姟澶嶆牳' THEN '鈭' ELSE '' END) AS 璐㈠姟澶嶆牳, -MAX(CASE WHEN ri.`rolename` ='椋庨櫓缁忓姙' THEN '鈭' ELSE '' END) AS 椋庨櫓缁忓姙, -MAX(CASE WHEN ri.`rolename` ='妗ｆ绠＄悊涓撳憳' THEN '鈭' ELSE '' END) AS 妗ｆ绠＄悊涓撳憳, -MAX(CASE WHEN ri.`rolename` ='璐㈠姟鍑虹撼' THEN '鈭' ELSE '' END) AS 璐㈠姟鍑虹撼, -MAX(CASE WHEN ri.`rolename` ='甯傚満妗ｆ绠＄悊涓撳憳' THEN '鈭' ELSE '' END) AS 甯傚満妗ｆ绠＄悊涓撳憳, -MAX(CASE WHEN ri.`rolename` ='淇″涓撳憳' THEN '鈭' ELSE '' END) AS 淇″涓撳憳, -MAX(CASE WHEN ri.`rolename` ='淇″缁忕悊' THEN '鈭' ELSE '' END) AS 淇″缁忕悊, -MAX(CASE WHEN ri.`rolename` ='淇″璐熻矗浜' THEN '鈭' ELSE '' END) AS 淇″璐熻矗浜, -MAX(CASE WHEN ri.`rolename` ='椤圭洰淇″绉樹功' THEN '鈭' ELSE '' END) AS 椤圭洰淇″绉樹功, -MAX(CASE WHEN ri.`rolename` ='杩愯惀妗ｆ绠＄悊涓撳憳' THEN '鈭' ELSE '' END) AS 杩愯惀妗ｆ绠＄悊涓撳憳, -MAX(CASE WHEN ri.`rolename` ='璧勭涓氬姟鍛' THEN '鈭' ELSE '' END) AS 璧勭涓氬姟鍛, -MAX(CASE WHEN ri.`rolename` ='璧勭璐熻矗浜' THEN '鈭' ELSE '' END) AS 璧勭璐熻矗浜, -MAX(CASE WHEN ri.`rolename` ='璧勪骇绠＄悊缁忕悊' THEN '鈭' ELSE '' END) AS 璧勪骇绠＄悊缁忕悊, -MAX(CASE WHEN ri.`rolename` ='璐㈠姟缁忓姙' THEN '鈭' ELSE '' END) AS 璐㈠姟缁忓姙, -MAX(CASE WHEN ri.`rolename` ='椋庨櫓鎬荤洃' THEN '鈭' ELSE '' END) AS 椋庨櫓鎬荤洃, -MAX(CASE WHEN ri.`rolename` ='瓒呯骇绠＄悊鍛' THEN '鈭' ELSE '' END) AS 瓒呯骇绠＄悊鍛, -MAX(CASE WHEN ri.`rolename` ='骞冲彴绠＄悊鍛' THEN '鈭' ELSE '' END) AS 骞冲彴绠＄悊鍛, -MAX(CASE WHEN ri.`rolename` ='绯荤粺绠＄悊鍛' THEN '鈭' ELSE '' END) AS 绯荤粺绠＄悊鍛, -MAX(CASE WHEN ri.`rolename` ='缁忛攢鍟嗕笟鍔′汉鍛' THEN '鈭' ELSE '' END) AS 缁忛攢鍟嗕笟鍔′汉鍛, -MAX(CASE WHEN ri.`rolename` ='鏅氱敤鎴' THEN '鈭' ELSE '' END) AS 鏅氱敤鎴, -MAX(CASE WHEN ri.`rolename` ='IT绠＄悊鍛' THEN '鈭' ELSE '' END) AS IT绠＄悊鍛, - -MAX(CASE WHEN ri.`rolename` ='娓犻亾鍌敹' THEN '鈭' ELSE '' END) AS 娓犻亾鍌敹, -MAX(CASE WHEN ri.`rolename` ='瀹㈡湇绠＄悊' THEN '鈭' ELSE '' END) AS 瀹㈡湇绠＄悊, -MAX(CASE WHEN ri.`rolename` ='璧勪骇绠＄悊' THEN '鈭' ELSE '' END) AS 璧勪骇绠＄悊, -MAX(CASE WHEN ri.`rolename` ='鍖楄储鍚堜綔鏂' THEN '鈭' ELSE '' END) AS 鍖楄储鍚堜綔鏂, -MAX(CASE WHEN ri.`rolename` ='涓偓缁' THEN '鈭' ELSE '' END) AS 涓偓缁, -MAX(CASE WHEN ri.`rolename` ='閲嶅偓缁' THEN '鈭' ELSE '' END) AS 閲嶅偓缁, -MAX(CASE WHEN ri.`rolename` ='杞诲偓缁' THEN '鈭' ELSE '' END) AS 杞诲偓缁 +MAX(CASE WHEN ri.`rolename` ='瀹夐箯绉熻祦鎬荤粡鐞' THEN '鈭' ELSE '' END) AS 瀹夐箯绉熻祦鎬荤粡鐞, + MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴鎬荤洃' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴鎬荤洃, + MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴椤圭洰缁忕悊' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴椤圭洰缁忕悊, + MAX(CASE WHEN ri.`rolename` ='涓氬姟涓閮ㄩ」鐩粡鐞' THEN '鈭' ELSE '' END) AS 涓氬姟涓閮ㄩ」鐩粡鐞, + MAX(CASE WHEN ri.`rolename` ='涓氬姟涓閮ㄦ荤洃' THEN '鈭' ELSE '' END) AS 涓氬姟涓閮ㄦ荤洃, + MAX(CASE WHEN ri.`rolename` ='涓氬姟涓閮ㄥ垎绠￠瀵' THEN '鈭' ELSE '' END) AS 涓氬姟涓閮ㄥ垎绠￠瀵, + MAX(CASE WHEN ri.`rolename` ='绉熷悗缁忕悊' THEN '鈭' ELSE '' END) AS 绉熷悗缁忕悊, + MAX(CASE WHEN ri.`rolename` ='璐㈠姟澶嶆牳' THEN '鈭' ELSE '' END) AS 璐㈠姟澶嶆牳, + MAX(CASE WHEN ri.`rolename` ='椋庨櫓缁忓姙' THEN '鈭' ELSE '' END) AS 椋庨櫓缁忓姙, + MAX(CASE WHEN ri.`rolename` ='妗ｆ绠＄悊涓撳憳' THEN '鈭' ELSE '' END) AS 妗ｆ绠＄悊涓撳憳, + MAX(CASE WHEN ri.`rolename` ='璐㈠姟鍑虹撼' THEN '鈭' ELSE '' END) AS 璐㈠姟鍑虹撼, + MAX(CASE WHEN ri.`rolename` ='淇″璐熻矗浜' THEN '鈭' ELSE '' END) AS 淇″璐熻矗浜, + MAX(CASE WHEN ri.`rolename` ='椤圭洰淇″绉樹功' THEN '鈭' ELSE '' END) AS 椤圭洰淇″绉樹功, + MAX(CASE WHEN ri.`rolename` ='璧勪骇绠＄悊缁忕悊' THEN '鈭' ELSE '' END) AS 璧勪骇绠＄悊缁忕悊, + MAX(CASE WHEN ri.`rolename` ='瓒呯骇绠＄悊鍛' THEN '鈭' ELSE '' END) AS 瓒呯骇绠＄悊鍛, + MAX(CASE WHEN ri.`rolename` ='骞冲彴绠＄悊鍛' THEN '鈭' ELSE '' END) AS 骞冲彴绠＄悊鍛, + MAX(CASE WHEN ri.`rolename` ='绯荤粺绠＄悊鍛' THEN '鈭' ELSE '' END) AS 绯荤粺绠＄悊鍛, + MAX(CASE WHEN ri.`rolename` ='缁忛攢鍟嗕笟鍔′汉鍛' THEN '鈭' ELSE '' END) AS 缁忛攢鍟嗕笟鍔′汉鍛, + MAX(CASE WHEN ri.`rolename` ='鏅氱敤鎴' THEN '鈭' ELSE '' END) AS 鏅氱敤鎴, + MAX(CASE WHEN ri.`rolename` ='娓犻亾鍌敹' THEN '鈭' ELSE '' END) AS 娓犻亾鍌敹, + MAX(CASE WHEN ri.`rolename` ='鍖楄储鍚堜綔鏂' THEN '鈭' ELSE '' END) AS 鍖楄储鍚堜綔鏂, + MAX(CASE WHEN ri.`rolename` ='涓偓缁' THEN '鈭' ELSE '' END) AS 涓偓缁, + MAX(CASE WHEN ri.`rolename` ='閲嶅偓缁' THEN '鈭' ELSE '' END) AS 閲嶅偓缁, + MAX(CASE WHEN ri.`rolename` ='杞诲偓缁' THEN '鈭' ELSE '' END) AS 杞诲偓缁, +MAX(CASE WHEN ri.`rolename` ='bccuishou' THEN '鈭' ELSE '' END) AS bccuishou, +MAX(CASE WHEN ri.`rolename` ='姹借溅涓氬姟閮ㄦ荤洃' THEN '鈭' ELSE '' END) AS 姹借溅涓氬姟閮ㄦ荤洃, +MAX(CASE WHEN ri.`rolename` ='璁㈠崟澶嶅' THEN '鈭' ELSE '' END) AS 璁㈠崟澶嶅, +MAX(CASE WHEN ri.`rolename` ='娓犻亾缁忕悊' THEN '鈭' ELSE '' END) AS 娓犻亾缁忕悊, +MAX(CASE WHEN ri.`rolename` ='淇″鍒濆' THEN '鈭' ELSE '' END) AS 淇″鍒濆, +MAX(CASE WHEN ri.`rolename` ='淇″澶嶅' THEN '鈭' ELSE '' END) AS 淇″澶嶅, +MAX(CASE WHEN ri.`rolename` ='璁㈠崟鍒濆' THEN '鈭' ELSE '' END) AS 璁㈠崟鍒濆, +MAX(CASE WHEN ri.`rolename` ='璧勪骇绠＄悊璐熻矗浜' THEN '鈭' ELSE '' END) AS 璧勪骇绠＄悊璐熻矗浜, +MAX(CASE WHEN ri.`rolename` ='杩愯惀涓撳憳' THEN '鈭' ELSE '' END) AS 杩愯惀涓撳憳, +MAX(CASE WHEN ri.`rolename` ='C绔储鍔＄粡鍔' THEN '鈭' ELSE '' END) AS C绔储鍔＄粡鍔, +MAX(CASE WHEN ri.`rolename` ='椋庨櫓绠＄悊閮ㄦ荤洃' THEN '鈭' ELSE '' END) AS 椋庨櫓绠＄悊閮ㄦ荤洃, +MAX(CASE WHEN ri.`rolename` ='IT缁' THEN '鈭' ELSE '' END) AS IT缁, +MAX(CASE WHEN ri.`rolename` ='璧勯噾绠＄悊' THEN '鈭' ELSE '' END) AS 璧勯噾绠＄悊, +MAX(CASE WHEN ri.`rolename` ='瀹㈡湇涓撳憳' THEN '鈭' ELSE '' END) AS 瀹㈡湇涓撳憳, +MAX(CASE WHEN ri.`rolename` ='鍑嵎鍌敹' THEN '鈭' ELSE '' END) AS 鍑嵎鍌敹, +MAX(CASE WHEN ri.`rolename` ='涓氬姟涓閮ㄩ」鐩姪鐞' THEN '鈭' ELSE '' END) AS 涓氬姟涓閮ㄩ」鐩姪鐞, +MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴椤圭洰鍔╃悊' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴椤圭洰鍔╃悊, +MAX(CASE WHEN ri.`rolename` ='娓犻亾绠＄悊閮ㄧ粡鐞' THEN '鈭' ELSE '' END) AS 娓犻亾绠＄悊閮ㄧ粡鐞, +MAX(CASE WHEN ri.`rolename` ='浜у搧缁忕悊' THEN '鈭' ELSE '' END) AS 浜у搧缁忕悊, +MAX(CASE WHEN ri.`rolename` ='鍥炴鍒濆' THEN '鈭' ELSE '' END) AS 鍥炴鍒濆, +MAX(CASE WHEN ri.`rolename` ='鍥炴澶嶅' THEN '鈭' ELSE '' END) AS 鍥炴澶嶅, +MAX(CASE WHEN ri.`rolename` ='妗ｆ涓撳憳' THEN '鈭' ELSE '' END) AS 妗ｆ涓撳憳, +MAX(CASE WHEN ri.`rolename` ='娓呮敹澶勭疆鍒濆' THEN '鈭' ELSE '' END) AS 娓呮敹澶勭疆鍒濆, +MAX(CASE WHEN ri.`rolename` ='娓呮敹澶勭疆澶嶅' THEN '鈭' ELSE '' END) AS 娓呮敹澶勭疆澶嶅, +MAX(CASE WHEN ri.`rolename` ='璧勪骇绠＄悊涓撳憳' THEN '鈭' ELSE '' END) AS 璧勪骇绠＄悊涓撳憳, +MAX(CASE WHEN ri.`rolename` ='鎻愬墠缁撴竻绠＄悊涓撳憳' THEN '鈭' ELSE '' END) AS 鎻愬墠缁撴竻绠＄悊涓撳憳, +MAX(CASE WHEN ri.`rolename` ='鍏跺畠鏀粯' THEN '鈭' ELSE '' END) AS 鍏跺畠鏀粯, +MAX(CASE WHEN ri.`rolename` ='鍐呮帶绋芥牳' THEN '鈭' ELSE '' END) AS 鍐呮帶绋芥牳 FROM user_info O LEFT JOIN USER_ROLE ur ON ur.USERID = O.USERID LEFT JOIN role_info ri ON ri.`roleid`=ur.`roleid` LEFT JOIN org_info oi ON oi.`orgid`=O.`belongorg` -WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid +WHERE O.`userid` NOT LIKE '8006%' AND O.`userid`<>'yuejie' AND O.`userid`<>'' GROUP BY O.userid ORDER BY oi.orgname - 2c9c81b56552c9490165574173330014 + 2c9c81b9700ecc97017080a7c3070080 userid STRING userid 100 - 47 + 57 false false @@ -108,203 +116,13 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c9490165574173340027 + 2c9c81b9700ecc97017080a7c3070069 loginid STRING loginid 100 - 48 - true - - false - false - false - false - - - - - - 2c9c81b56552c9490165574173330015 - username - STRING - - - username - 100 - 49 - true - - false - false - false - false - - - - - - 2c9c81b56552c949016557417334001e - status - STRING - - - status - 100 - 50 - true - - false - false - false - false - - - - - - 2c9c81b56552c949016557417334001d - orgname - STRING - - - orgname - 100 - 51 - true - - false - false - false - false - - - - - - 2c9c81b56658994a0165f614b7270016 - 涓氬姟浜岄儴鍒嗙棰嗗 - STRING - - - 涓氬姟浜岄儴鍒嗙棰嗗 - 100 - 52 - true - - false - false - false - false - - - - - - 2c9c81b56658994a0165f614b7270012 - 涓氬姟浜岄儴鎬荤洃 - STRING - - - 涓氬姟浜岄儴鎬荤洃 - 100 - 53 - true - - false - false - false - false - - - - - - 2c9c81b56658994a0165f614b7270017 - 涓氬姟浜岄儴椤圭洰缁忕悊 - STRING - - - 涓氬姟浜岄儴椤圭洰缁忕悊 - 100 - 54 - true - - false - false - false - false - - - - - - 2c9c81b56658994a0165f614b7260010 - 绉熷悗缁忕悊 - STRING - - - 绉熷悗缁忕悊 - 100 - 55 - true - - false - false - false - false - - - - - - 2c9c81b56658994a0165f614b7270014 - 椋庨櫓缁忓姙 - STRING - - - 椋庨櫓缁忓姙 - 100 - 56 - true - - false - false - false - false - - - - - - 2c9c81b56658994a0165f614b7270013 - 椤圭洰淇″绉樹功 - STRING - - - 椤圭洰淇″绉樹功 - 100 - 57 - true - - false - false - false - false - - - - - - 2c9c81b56658994a0165f614b7270015 - 璧勪骇绠＄悊缁忕悊 - STRING - - - 璧勪骇绠＄悊缁忕悊 - 100 58 true @@ -317,12 +135,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56658994a0165f614b7270011 - 椋庨櫓鎬荤洃 + 2c9c81b9700ecc97017080a7c3060056 + username STRING - - 椋庨櫓鎬荤洃 + + username 100 59 true @@ -336,12 +154,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c949016589b32b360082 - 涓氬姟浜岄儴鍓荤粡鐞 + 2c9c81b9700ecc97017080a7c3060055 + status STRING - - 涓氬姟浜岄儴鍓荤粡鐞 + + status 100 60 true @@ -355,12 +173,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c949016589b32b35007d - 涓氬姟浜岄儴杩愯惀涓撳憳 + 2c9c81b9700ecc97017080a7c306004b + orgname STRING - - 涓氬姟浜岄儴杩愯惀涓撳憳 + + orgname 100 61 true @@ -374,12 +192,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c949016589b32b36007f - 涓氬姟涓閮ㄩ」鐩粡鐞 + 2c9c81b9700ecc97017080a7c3060049 + 浜у搧缁忕悊 STRING - - 涓氬姟涓閮ㄩ」鐩粡鐞 + + 浜у搧缁忕悊 100 62 true @@ -393,12 +211,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c949016589b32b36007e - 涓氬姟涓閮ㄦ荤洃 + 2c9c81b9700ecc97017080a7c3070076 + 娓犻亾缁忕悊 STRING - - 涓氬姟涓閮ㄦ荤洃 + + 娓犻亾缁忕悊 100 63 true @@ -412,12 +230,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c949016589b32b34007c - 涓氬姟涓閮ㄥ垎绠￠瀵 + 2c9c81b9700ecc97017080a7c307006a + 淇″鍒濆 STRING - - 涓氬姟涓閮ㄥ垎绠￠瀵 + + 淇″鍒濆 100 64 true @@ -431,12 +249,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c949016589b32b360084 - 璐㈠姟澶嶆牳 + 2c9c81b9700ecc97017080a7c3070062 + 淇″澶嶅 STRING - - 璐㈠姟澶嶆牳 + + 淇″澶嶅 100 65 true @@ -450,12 +268,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c949016589b32b34007b - 妗ｆ绠＄悊涓撳憳 + 2c9c81b9700ecc97017080a7c3070073 + 淇″璐熻矗浜 STRING - - 妗ｆ绠＄悊涓撳憳 + + 淇″璐熻矗浜 100 66 true @@ -469,12 +287,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c949016589b32b360083 - 璐㈠姟鍑虹撼 + 2c9c81b9700ecc97017080a7c307005e + 璁㈠崟鍒濆 STRING - - 璐㈠姟鍑虹撼 + + 璁㈠崟鍒濆 100 67 true @@ -488,12 +306,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c9490165574173330016 - 涓氬姟浜岄儴甯傚満涓撳憳 + 2c9c81b9700ecc97017080a7c306005c + 璁㈠崟澶嶅 STRING - - 涓氬姟浜岄儴甯傚満涓撳憳 + + 璁㈠崟澶嶅 100 68 true @@ -507,12 +325,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c9490165574173340025 - 涓氬姟浜岄儴杩愯惀涓撳憳鍒濆 + 2c9c81b9700ecc97017080a7c3060058 + 杩愯惀涓撳憳 STRING - - 涓氬姟浜岄儴杩愯惀涓撳憳鍒濆 + + 杩愯惀涓撳憳 100 69 true @@ -526,12 +344,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c9490165574173340021 - 涓氬姟浜岄儴杩愯惀涓撳憳澶嶅 + 2c9c81b9700ecc97017080a7c3070070 + 妗ｆ涓撳憳 STRING - - 涓氬姟浜岄儴杩愯惀涓撳憳澶嶅 + + 妗ｆ涓撳憳 100 70 true @@ -545,12 +363,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c9490165574173340028 - 涓氬姟浜岄儴杩愯惀鎬荤洃 + 2c9c81b9700ecc97017080a7c3060052 + 瀹㈡湇涓撳憳 STRING - - 涓氬姟浜岄儴杩愯惀鎬荤洃 + + 瀹㈡湇涓撳憳 100 71 true @@ -564,12 +382,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c9490165574173330017 - 涓氬姟浜岄儴甯傚満鎬荤洃 + 2c9c81b9700ecc97017080a7c3070075 + 鍥炴鍒濆 STRING - - 涓氬姟浜岄儴甯傚満鎬荤洃 + + 鍥炴鍒濆 100 72 true @@ -583,12 +401,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c949016557417334002a - 甯傚満妗ｆ绠＄悊涓撳憳 + 2c9c81b9700ecc97017080a7c3070066 + 鍥炴澶嶅 STRING - - 甯傚満妗ｆ绠＄悊涓撳憳 + + 鍥炴澶嶅 100 73 true @@ -602,12 +420,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c9490165574173330013 - 淇″涓撳憳 + 2c9c81b9700ecc97017080a7c306004c + 娓呮敹澶勭疆鍒濆 STRING - - 淇″涓撳憳 + + 娓呮敹澶勭疆鍒濆 100 74 true @@ -621,12 +439,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c9490165574173340026 - 淇″缁忕悊 + 2c9c81b9700ecc97017080a7c307005f + 娓呮敹澶勭疆澶嶅 STRING - - 淇″缁忕悊 + + 娓呮敹澶勭疆澶嶅 100 75 true @@ -640,12 +458,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c9490165574173340023 - 淇″璐熻矗浜 + 2c9c81b9700ecc97017080a7c306004e + 鎻愬墠缁撴竻绠＄悊涓撳憳 STRING - - 淇″璐熻矗浜 + + 鎻愬墠缁撴竻绠＄悊涓撳憳 100 76 true @@ -659,12 +477,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c949016557417334001a - 杩愯惀妗ｆ绠＄悊涓撳憳 + 2c9c81b9700ecc97017080a7c3060053 + 璧勪骇绠＄悊涓撳憳 STRING - - 杩愯惀妗ｆ绠＄悊涓撳憳 + + 璧勪骇绠＄悊涓撳憳 100 77 true @@ -678,12 +496,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c9490165574173340029 - 璧勭涓氬姟鍛 + 2c9c81b9700ecc97017080a7c3070081 + 璧勪骇绠＄悊璐熻矗浜 STRING - - 璧勭涓氬姟鍛 + + 璧勪骇绠＄悊璐熻矗浜 100 78 true @@ -697,12 +515,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c9490165574173330012 - 璧勭璐熻矗浜 + 2c9c81b9700ecc97017080a7c307006d + 杞诲偓缁 STRING - - 璧勭璐熻矗浜 + + 杞诲偓缁 100 79 true @@ -716,12 +534,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c949016557417334001f - 璐㈠姟缁忓姙 + 2c9c81b9700ecc97017080a7c307007f + 涓偓缁 STRING - - 璐㈠姟缁忓姙 + + 涓偓缁 100 80 true @@ -735,12 +553,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c9490165574173340024 - 瓒呯骇绠＄悊鍛 + 2c9c81b9700ecc97017080a7c306004f + 閲嶅偓缁 STRING - - 瓒呯骇绠＄悊鍛 + + 閲嶅偓缁 100 81 true @@ -754,12 +572,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c9490165574173330018 - 骞冲彴绠＄悊鍛 + 2c9c81b9700ecc97017080a7c3060054 + 姹借溅涓氬姟閮ㄦ荤洃 STRING - - 骞冲彴绠＄悊鍛 + + 姹借溅涓氬姟閮ㄦ荤洃 100 82 true @@ -773,12 +591,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c9490165574173340022 - 绯荤粺绠＄悊鍛 + 2c9c81b9700ecc97017080a7c3070079 + 瀹夐箯绉熻祦鎬荤粡鐞 STRING - - 绯荤粺绠＄悊鍛 + + 瀹夐箯绉熻祦鎬荤粡鐞 100 83 true @@ -792,12 +610,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c949016557417334001c - 缁忛攢鍟嗕笟鍔′汉鍛 + 2c9c81b9700ecc97017080a7c3070071 + C绔储鍔＄粡鍔 STRING - - 缁忛攢鍟嗕笟鍔′汉鍛 + + C绔储鍔＄粡鍔 100 84 true @@ -811,12 +629,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c9490165574173340020 - 鏅氱敤鎴 + 2c9c81b9700ecc97017080a7c3070067 + 璐㈠姟鍑虹撼 STRING - - 鏅氱敤鎴 + + 璐㈠姟鍑虹撼 100 85 true @@ -830,12 +648,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c949016557417334001b - IT绠＄悊鍛 + 2c9c81b9700ecc97017080a7c3070065 + 璧勯噾绠＄悊 STRING - - IT绠＄悊鍛 + + 璧勯噾绠＄悊 100 86 true @@ -849,12 +667,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b969188a33016e157929f300e7 - 娓犻亾鍌敹 + 2c9c81b9700ecc97017080a7c306004a + 璐㈠姟澶嶆牳 STRING - - 娓犻亾鍌敹 + + 璐㈠姟澶嶆牳 100 87 true @@ -868,12 +686,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b969188a33016e157929f300e4 - 瀹㈡湇绠＄悊 + 2c9c81b9700ecc97017080a7c3070061 + 鍏跺畠鏀粯 STRING - - 瀹㈡湇绠＄悊 + + 鍏跺畠鏀粯 100 88 true @@ -887,12 +705,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b969188a33016e157929f300e8 - 璧勪骇绠＄悊 + 2c9c81b9700ecc97017080a7c307007d + 缁忛攢鍟嗕笟鍔′汉鍛 STRING - - 璧勪骇绠＄悊 + + 缁忛攢鍟嗕笟鍔′汉鍛 100 89 true @@ -906,12 +724,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b969188a33016e157929f300e9 - 鍖楄储鍚堜綔鏂 + 2c9c81b9700ecc97017080a7c3070077 + bccuishou STRING - - 鍖楄储鍚堜綔鏂 + + bccuishou 100 90 true @@ -925,12 +743,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b969188a33016e157929f300ea - 杞诲偓缁 + 2c9c81b9700ecc97017080a7c3070068 + 鍑嵎鍌敹 STRING - - 杞诲偓缁 + + 鍑嵎鍌敹 100 91 true @@ -944,12 +762,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b969188a33016e157929f300e6 - 涓偓缁 + 2c9c81b9700ecc97017080a7c306005a + 娓犻亾鍌敹 STRING - - 涓偓缁 + + 娓犻亾鍌敹 100 92 true @@ -963,12 +781,12 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b969188a33016e157929f300e5 - 閲嶅偓缁 + 2c9c81b9700ecc97017080a7c3070072 + 娓犻亾绠＄悊閮ㄧ粡鐞 STRING - - 閲嶅偓缁 + + 娓犻亾绠＄悊閮ㄧ粡鐞 100 93 true @@ -981,13 +799,393 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid + + 2c9c81b9700ecc97017080a7c306005b + 鍖楄储鍚堜綔鏂 + STRING + + + 鍖楄储鍚堜綔鏂 + 100 + 94 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c3070078 + IT缁 + STRING + + + IT缁 + 100 + 95 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c3070064 + 骞冲彴绠＄悊鍛 + STRING + + + 骞冲彴绠＄悊鍛 + 100 + 96 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c3060059 + 瓒呯骇绠＄悊鍛 + STRING + + + 瓒呯骇绠＄悊鍛 + 100 + 97 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c307007e + 绯荤粺绠＄悊鍛 + STRING + + + 绯荤粺绠＄悊鍛 + 100 + 98 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c3070060 + 鏅氱敤鎴 + STRING + + + 鏅氱敤鎴 + 100 + 99 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c3060050 + 鍐呮帶绋芥牳 + STRING + + + 鍐呮帶绋芥牳 + 100 + 100 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c3060057 + 椋庨櫓缁忓姙 + STRING + + + 椋庨櫓缁忓姙 + 100 + 101 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c307007b + 椤圭洰淇″绉樹功 + STRING + + + 椤圭洰淇″绉樹功 + 100 + 102 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c307006c + 椋庨櫓绠＄悊閮ㄦ荤洃 + STRING + + + 椋庨櫓绠＄悊閮ㄦ荤洃 + 100 + 103 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c307006f + 涓氬姟浜岄儴椤圭洰鍔╃悊 + STRING + + + 涓氬姟浜岄儴椤圭洰鍔╃悊 + 100 + 104 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c307007c + 涓氬姟浜岄儴椤圭洰缁忕悊 + STRING + + + 涓氬姟浜岄儴椤圭洰缁忕悊 + 100 + 105 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c3070063 + 涓氬姟浜岄儴鎬荤洃 + STRING + + + 涓氬姟浜岄儴鎬荤洃 + 100 + 106 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c3070074 + 涓氬姟涓閮ㄩ」鐩姪鐞 + STRING + + + 涓氬姟涓閮ㄩ」鐩姪鐞 + 100 + 107 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c307006e + 涓氬姟涓閮ㄩ」鐩粡鐞 + STRING + + + 涓氬姟涓閮ㄩ」鐩粡鐞 + 100 + 108 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c307006b + 涓氬姟涓閮ㄦ荤洃 + STRING + + + 涓氬姟涓閮ㄦ荤洃 + 100 + 109 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c3060051 + 涓氬姟涓閮ㄥ垎绠￠瀵 + STRING + + + 涓氬姟涓閮ㄥ垎绠￠瀵 + 100 + 110 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c306004d + 绉熷悗缁忕悊 + STRING + + + 绉熷悗缁忕悊 + 100 + 111 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c307007a + 璧勪骇绠＄悊缁忕悊 + STRING + + + 璧勪骇绠＄悊缁忕悊 + 100 + 112 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a7c307005d + 妗ｆ绠＄悊涓撳憳 + STRING + + + 妗ｆ绠＄悊涓撳憳 + 100 + 113 + true + + false + false + false + false + + + + - 2c9c81b56552c94901655747ba30002c + 2c9c81b9700ecc97017080a7c3070082 loginid loginid @@ -997,7 +1195,7 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid 0 - 2c9c81b56552c94901655747ba30002d + 2c9c81b9700ecc97017080a7c3080084 username username @@ -1007,7 +1205,7 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid 1 - 2c9c81b56552c94901655747ba31002e + 2c9c81b9700ecc97017080a7c3070083 orgname orgname @@ -1030,7 +1228,7 @@ WHERE O.`userid` NOT LIKE '8006%' GROUP BY O.userid - 2c9c81b56552c94901655746e7a7002b + 2c9c81b9700ecc97017080a7c3060048 0 0 0 diff --git a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/瑙掕壊鑿滃崟琛.xml b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/瑙掕壊鑿滃崟琛.xml index a9ba49896..86cfcaa2a 100644 --- a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/瑙掕壊鑿滃崟琛.xml +++ b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/瑙掕壊鑿滃崟琛.xml @@ -19,14 +19,13 @@ 2c9c81b56552c94901655763fd7d002f 瑙掕壊鑿滃崟琛 role_menu - REPORT_CODE_1534769495421 true 12 REPORT 2c9c81b7685efbbc016931c6eff50007 - 2c9c81b56552c94901655765a0b90047 + 2c9c81b9700ecc97017080a5e0390011 @@ -38,43 +37,58 @@ 2c9023815726a036015726a496b00001 COMPLEXSQL SELECT ri.menuname, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴甯傚満涓撳憳' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴甯傚満涓撳憳, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴杩愯惀涓撳憳鍒濆' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴杩愯惀涓撳憳鍒濆, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴杩愯惀涓撳憳澶嶅' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴杩愯惀涓撳憳澶嶅, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴杩愯惀鎬荤洃' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴杩愯惀鎬荤洃, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴甯傚満鎬荤洃' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴甯傚満鎬荤洃, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴鍓荤粡鐞' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴鍓荤粡鐞, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴杩愯惀涓撳憳' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴杩愯惀涓撳憳, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴鍒嗙棰嗗' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴鍒嗙棰嗗, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴鎬荤洃' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴鎬荤洃, -MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴椤圭洰缁忕悊' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴椤圭洰缁忕悊, -MAX(CASE WHEN ri.`rolename` ='涓氬姟涓閮ㄩ」鐩粡鐞' THEN '鈭' ELSE '' END) AS 涓氬姟涓閮ㄩ」鐩粡鐞, -MAX(CASE WHEN ri.`rolename` ='涓氬姟涓閮ㄦ荤洃' THEN '鈭' ELSE '' END) AS 涓氬姟涓閮ㄦ荤洃, -MAX(CASE WHEN ri.`rolename` ='涓氬姟涓閮ㄥ垎绠￠瀵' THEN '鈭' ELSE '' END) AS 涓氬姟涓閮ㄥ垎绠￠瀵, -MAX(CASE WHEN ri.`rolename` ='绉熷悗缁忕悊' THEN '鈭' ELSE '' END) AS 绉熷悗缁忕悊, -MAX(CASE WHEN ri.`rolename` ='妗ｆ绠＄悊涓撳憳' THEN '鈭' ELSE '' END) AS 妗ｆ绠＄悊涓撳憳, -MAX(CASE WHEN ri.`rolename` ='甯傚満妗ｆ绠＄悊涓撳憳' THEN '鈭' ELSE '' END) AS 甯傚満妗ｆ绠＄悊涓撳憳, -MAX(CASE WHEN ri.`rolename` ='淇″涓撳憳' THEN '鈭' ELSE '' END) AS 淇″涓撳憳, -MAX(CASE WHEN ri.`rolename` ='淇″缁忕悊' THEN '鈭' ELSE '' END) AS 淇″缁忕悊, -MAX(CASE WHEN ri.`rolename` ='淇″璐熻矗浜' THEN '鈭' ELSE '' END) AS 淇″璐熻矗浜, -MAX(CASE WHEN ri.`rolename` ='椤圭洰淇″绉樹功' THEN '鈭' ELSE '' END) AS 椤圭洰淇″绉樹功, -MAX(CASE WHEN ri.`rolename` ='杩愯惀妗ｆ绠＄悊涓撳憳' THEN '鈭' ELSE '' END) AS 杩愯惀妗ｆ绠＄悊涓撳憳, -MAX(CASE WHEN ri.`rolename` ='椋庨櫓缁忓姙' THEN '鈭' ELSE '' END) AS 椋庨櫓缁忓姙, -MAX(CASE WHEN ri.`rolename` ='璧勭涓氬姟鍛' THEN '鈭' ELSE '' END) AS 璧勭涓氬姟鍛, -MAX(CASE WHEN ri.`rolename` ='璧勭璐熻矗浜' THEN '鈭' ELSE '' END) AS 璧勭璐熻矗浜, -MAX(CASE WHEN ri.`rolename` ='璧勪骇绠＄悊缁忕悊' THEN '鈭' ELSE '' END) AS 璧勪骇绠＄悊缁忕悊, -MAX(CASE WHEN ri.`rolename` ='璐㈠姟缁忓姙' THEN '鈭' ELSE '' END) AS 璐㈠姟缁忓姙, -MAX(CASE WHEN ri.`rolename` ='璐㈠姟澶嶆牳' THEN '鈭' ELSE '' END) AS 璐㈠姟澶嶆牳, -MAX(CASE WHEN ri.`rolename` ='璐㈠姟鍑虹撼' THEN '鈭' ELSE '' END) AS 璐㈠姟鍑虹撼, -MAX(CASE WHEN ri.`rolename` ='椋庨櫓鎬荤洃' THEN '鈭' ELSE '' END) AS 椋庨櫓鎬荤洃, -MAX(CASE WHEN ri.`rolename` ='瓒呯骇绠＄悊鍛' THEN '鈭' ELSE '' END) AS 瓒呯骇绠＄悊鍛, -MAX(CASE WHEN ri.`rolename` ='骞冲彴绠＄悊鍛' THEN '鈭' ELSE '' END) AS 骞冲彴绠＄悊鍛, -MAX(CASE WHEN ri.`rolename` ='绯荤粺绠＄悊鍛' THEN '鈭' ELSE '' END) AS 绯荤粺绠＄悊鍛, -MAX(CASE WHEN ri.`rolename` ='缁忛攢鍟嗕笟鍔′汉鍛' THEN '鈭' ELSE '' END) AS 缁忛攢鍟嗕笟鍔′汉鍛, -MAX(CASE WHEN ri.`rolename` ='鏅氱敤鎴' THEN '鈭' ELSE '' END) AS 鏅氱敤鎴, -MAX(CASE WHEN ri.`rolename` ='IT绠＄悊鍛' THEN '鈭' ELSE '' END) AS IT绠＄悊鍛,MAX(CASE WHEN ri.`rolename` ='涓偓缁' THEN '鈭' ELSE '' END) AS 涓偓缁, -MAX(CASE WHEN ri.`rolename` ='閲嶅偓缁' THEN '鈭' ELSE '' END) AS 閲嶅偓缁, -MAX(CASE WHEN ri.`rolename` ='杞诲偓缁' THEN '鈭' ELSE '' END) AS 杞诲偓缁 +MAX(CASE WHEN ri.`rolename` ='瀹夐箯绉熻祦鎬荤粡鐞' THEN '鈭' ELSE '' END) AS 瀹夐箯绉熻祦鎬荤粡鐞, + MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴鎬荤洃' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴鎬荤洃, + MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴椤圭洰缁忕悊' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴椤圭洰缁忕悊, + MAX(CASE WHEN ri.`rolename` ='涓氬姟涓閮ㄩ」鐩粡鐞' THEN '鈭' ELSE '' END) AS 涓氬姟涓閮ㄩ」鐩粡鐞, + MAX(CASE WHEN ri.`rolename` ='涓氬姟涓閮ㄦ荤洃' THEN '鈭' ELSE '' END) AS 涓氬姟涓閮ㄦ荤洃, + MAX(CASE WHEN ri.`rolename` ='涓氬姟涓閮ㄥ垎绠￠瀵' THEN '鈭' ELSE '' END) AS 涓氬姟涓閮ㄥ垎绠￠瀵, + MAX(CASE WHEN ri.`rolename` ='绉熷悗缁忕悊' THEN '鈭' ELSE '' END) AS 绉熷悗缁忕悊, + MAX(CASE WHEN ri.`rolename` ='璐㈠姟澶嶆牳' THEN '鈭' ELSE '' END) AS 璐㈠姟澶嶆牳, + MAX(CASE WHEN ri.`rolename` ='椋庨櫓缁忓姙' THEN '鈭' ELSE '' END) AS 椋庨櫓缁忓姙, + MAX(CASE WHEN ri.`rolename` ='妗ｆ绠＄悊涓撳憳' THEN '鈭' ELSE '' END) AS 妗ｆ绠＄悊涓撳憳, + MAX(CASE WHEN ri.`rolename` ='璐㈠姟鍑虹撼' THEN '鈭' ELSE '' END) AS 璐㈠姟鍑虹撼, + MAX(CASE WHEN ri.`rolename` ='淇″璐熻矗浜' THEN '鈭' ELSE '' END) AS 淇″璐熻矗浜, + MAX(CASE WHEN ri.`rolename` ='椤圭洰淇″绉樹功' THEN '鈭' ELSE '' END) AS 椤圭洰淇″绉樹功, + MAX(CASE WHEN ri.`rolename` ='璧勪骇绠＄悊缁忕悊' THEN '鈭' ELSE '' END) AS 璧勪骇绠＄悊缁忕悊, + MAX(CASE WHEN ri.`rolename` ='瓒呯骇绠＄悊鍛' THEN '鈭' ELSE '' END) AS 瓒呯骇绠＄悊鍛, + MAX(CASE WHEN ri.`rolename` ='骞冲彴绠＄悊鍛' THEN '鈭' ELSE '' END) AS pingtaiguanliyuan, + MAX(CASE WHEN ri.`rolename` ='绯荤粺绠＄悊鍛' THEN '鈭' ELSE '' END) AS xitongguanliyuan, + MAX(CASE WHEN ri.`rolename` ='缁忛攢鍟嗕笟鍔′汉鍛' THEN '鈭' ELSE '' END) AS 缁忛攢鍟嗕笟鍔′汉鍛, + MAX(CASE WHEN ri.`rolename` ='鏅氱敤鎴' THEN '鈭' ELSE '' END) AS putongyonghu, + MAX(CASE WHEN ri.`rolename` ='娓犻亾鍌敹' THEN '鈭' ELSE '' END) AS 娓犻亾鍌敹, + MAX(CASE WHEN ri.`rolename` ='鍖楄储鍚堜綔鏂' THEN '鈭' ELSE '' END) AS 鍖楄储鍚堜綔鏂, + MAX(CASE WHEN ri.`rolename` ='涓偓缁' THEN '鈭' ELSE '' END) AS 涓偓缁, + MAX(CASE WHEN ri.`rolename` ='閲嶅偓缁' THEN '鈭' ELSE '' END) AS 閲嶅偓缁, + MAX(CASE WHEN ri.`rolename` ='杞诲偓缁' THEN '鈭' ELSE '' END) AS 杞诲偓缁, +MAX(CASE WHEN ri.`rolename` ='bccuishou' THEN '鈭' ELSE '' END) AS bccuishou, +MAX(CASE WHEN ri.`rolename` ='姹借溅涓氬姟閮ㄦ荤洃' THEN '鈭' ELSE '' END) AS 姹借溅涓氬姟閮ㄦ荤洃, +MAX(CASE WHEN ri.`rolename` ='璁㈠崟澶嶅' THEN '鈭' ELSE '' END) AS 璁㈠崟澶嶅, +MAX(CASE WHEN ri.`rolename` ='娓犻亾缁忕悊' THEN '鈭' ELSE '' END) AS 娓犻亾缁忕悊, +MAX(CASE WHEN ri.`rolename` ='淇″鍒濆' THEN '鈭' ELSE '' END) AS 淇″鍒濆, +MAX(CASE WHEN ri.`rolename` ='淇″澶嶅' THEN '鈭' ELSE '' END) AS 淇″澶嶅, +MAX(CASE WHEN ri.`rolename` ='璁㈠崟鍒濆' THEN '鈭' ELSE '' END) AS 璁㈠崟鍒濆, +MAX(CASE WHEN ri.`rolename` ='璧勪骇绠＄悊璐熻矗浜' THEN '鈭' ELSE '' END) AS 璧勪骇绠＄悊璐熻矗浜, +MAX(CASE WHEN ri.`rolename` ='杩愯惀涓撳憳' THEN '鈭' ELSE '' END) AS 杩愯惀涓撳憳, +MAX(CASE WHEN ri.`rolename` ='C绔储鍔＄粡鍔' THEN '鈭' ELSE '' END) AS C绔储鍔＄粡鍔, +MAX(CASE WHEN ri.`rolename` ='椋庨櫓绠＄悊閮ㄦ荤洃' THEN '鈭' ELSE '' END) AS 椋庨櫓绠＄悊閮ㄦ荤洃, +MAX(CASE WHEN ri.`rolename` ='IT缁' THEN '鈭' ELSE '' END) AS IT缁, +MAX(CASE WHEN ri.`rolename` ='璧勯噾绠＄悊' THEN '鈭' ELSE '' END) AS 璧勯噾绠＄悊, +MAX(CASE WHEN ri.`rolename` ='瀹㈡湇涓撳憳' THEN '鈭' ELSE '' END) AS 瀹㈡湇涓撳憳, +MAX(CASE WHEN ri.`rolename` ='鍑嵎鍌敹' THEN '鈭' ELSE '' END) AS 鍑嵎鍌敹, +MAX(CASE WHEN ri.`rolename` ='涓氬姟涓閮ㄩ」鐩姪鐞' THEN '鈭' ELSE '' END) AS 涓氬姟涓閮ㄩ」鐩姪鐞, +MAX(CASE WHEN ri.`rolename` ='涓氬姟浜岄儴椤圭洰鍔╃悊' THEN '鈭' ELSE '' END) AS 涓氬姟浜岄儴椤圭洰鍔╃悊, +MAX(CASE WHEN ri.`rolename` ='娓犻亾绠＄悊閮ㄧ粡鐞' THEN '鈭' ELSE '' END) AS 娓犻亾绠＄悊閮ㄧ粡鐞, +MAX(CASE WHEN ri.`rolename` ='浜у搧缁忕悊' THEN '鈭' ELSE '' END) AS 浜у搧缁忕悊, +MAX(CASE WHEN ri.`rolename` ='鍥炴鍒濆' THEN '鈭' ELSE '' END) AS 鍥炴鍒濆, +MAX(CASE WHEN ri.`rolename` ='鍥炴澶嶅' THEN '鈭' ELSE '' END) AS 鍥炴澶嶅, +MAX(CASE WHEN ri.`rolename` ='妗ｆ涓撳憳' THEN '鈭' ELSE '' END) AS 妗ｆ涓撳憳, +MAX(CASE WHEN ri.`rolename` ='娓呮敹澶勭疆鍒濆' THEN '鈭' ELSE '' END) AS 娓呮敹澶勭疆鍒濆, +MAX(CASE WHEN ri.`rolename` ='娓呮敹澶勭疆澶嶅' THEN '鈭' ELSE '' END) AS 娓呮敹澶勭疆澶嶅, +MAX(CASE WHEN ri.`rolename` ='璧勪骇绠＄悊涓撳憳' THEN '鈭' ELSE '' END) AS 璧勪骇绠＄悊涓撳憳, +MAX(CASE WHEN ri.`rolename` ='鎻愬墠缁撴竻绠＄悊涓撳憳' THEN '鈭' ELSE '' END) AS 鎻愬墠缁撴竻绠＄悊涓撳憳, +MAX(CASE WHEN ri.`rolename` ='鍏跺畠鏀粯' THEN '鈭' ELSE '' END) AS 鍏跺畠鏀粯, +MAX(CASE WHEN ri.`rolename` ='鍐呮帶绋芥牳' THEN '鈭' ELSE '' END) AS 鍐呮帶绋芥牳 FROM ( SELECT ami.menuid,ami.menuname,ri.rolename,ami.sortno FROM awe_role_menu arm @@ -84,7 +98,7 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a00039 + 2c9c81b9700ecc97017080a5e03c0034 menuname STRING @@ -103,12 +117,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56658994a0165f6158aa2001f - 涓氬姟浜岄儴鍒嗙棰嗗 + 2c9c81b9700ecc97017080a5e03b002c + 浜у搧缁忕悊 STRING - - 涓氬姟浜岄儴鍒嗙棰嗗 + + 浜у搧缁忕悊 100 1 true @@ -122,12 +136,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56658994a0165f6158aa2001b - 涓氬姟浜岄儴鎬荤洃 + 2c9c81b9700ecc97017080a5e03b0022 + 娓犻亾缁忕悊 STRING - - 涓氬姟浜岄儴鎬荤洃 + + 娓犻亾缁忕悊 100 2 true @@ -141,12 +155,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56658994a0165f6158aa2001c - 涓氬姟浜岄儴椤圭洰缁忕悊 + 2c9c81b9700ecc97017080a5e03c0031 + 淇″鍒濆 STRING - - 涓氬姟浜岄儴椤圭洰缁忕悊 + + 淇″鍒濆 100 3 true @@ -160,12 +174,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56658994a0165f6158aa20019 - 绉熷悗缁忕悊 + 2c9c81b9700ecc97017080a5e03a0012 + 淇″澶嶅 STRING - - 绉熷悗缁忕悊 + + 淇″澶嶅 100 4 true @@ -179,12 +193,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56658994a0165f6158aa2001d - 椤圭洰淇″绉樹功 + 2c9c81b9700ecc97017080a5e03c0037 + 淇″璐熻矗浜 STRING - - 椤圭洰淇″绉樹功 + + 淇″璐熻矗浜 100 5 true @@ -198,12 +212,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56658994a0165f6158aa2001a - 椋庨櫓缁忓姙 + 2c9c81b9700ecc97017080a5e03c0046 + 璁㈠崟鍒濆 STRING - - 椋庨櫓缁忓姙 + + 璁㈠崟鍒濆 100 6 true @@ -217,12 +231,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56658994a0165f6158aa2001e - 璧勪骇绠＄悊缁忕悊 + 2c9c81b9700ecc97017080a5e03c0032 + 璁㈠崟澶嶅 STRING - - 璧勪骇绠＄悊缁忕悊 + + 璁㈠崟澶嶅 100 7 true @@ -236,12 +250,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56658994a0165f6158aa20018 - 椋庨櫓鎬荤洃 + 2c9c81b9700ecc97017080a5e03b001b + 杩愯惀涓撳憳 STRING - - 椋庨櫓鎬荤洃 + + 杩愯惀涓撳憳 100 8 true @@ -255,12 +269,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c949016589afe2d80071 - 涓氬姟浜岄儴鍓荤粡鐞 + 2c9c81b9700ecc97017080a5e03b002d + 妗ｆ涓撳憳 STRING - - 涓氬姟浜岄儴鍓荤粡鐞 + + 妗ｆ涓撳憳 100 9 true @@ -274,12 +288,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c949016589afe2d80076 - 涓氬姟浜岄儴杩愯惀涓撳憳 + 2c9c81b9700ecc97017080a5e03c0030 + 瀹㈡湇涓撳憳 STRING - - 涓氬姟浜岄儴杩愯惀涓撳憳 + + 瀹㈡湇涓撳憳 100 10 true @@ -293,12 +307,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c949016589afe2d80079 - 涓氬姟涓閮ㄩ」鐩粡鐞 + 2c9c81b9700ecc97017080a5e03b001c + 鍥炴鍒濆 STRING - - 涓氬姟涓閮ㄩ」鐩粡鐞 + + 鍥炴鍒濆 100 11 true @@ -312,12 +326,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c949016589afe2d80078 - 涓氬姟涓閮ㄦ荤洃 + 2c9c81b9700ecc97017080a5e03c0040 + 鍥炴澶嶅 STRING - - 涓氬姟涓閮ㄦ荤洃 + + 鍥炴澶嶅 100 12 true @@ -331,12 +345,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c949016589afe2d80075 - 涓氬姟涓閮ㄥ垎绠￠瀵 + 2c9c81b9700ecc97017080a5e03b001d + 娓呮敹澶勭疆鍒濆 STRING - - 涓氬姟涓閮ㄥ垎绠￠瀵 + + 娓呮敹澶勭疆鍒濆 100 13 true @@ -350,12 +364,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c949016589afe2d8007a - 妗ｆ绠＄悊涓撳憳 + 2c9c81b9700ecc97017080a5e03b0029 + 娓呮敹澶勭疆澶嶅 STRING - - 妗ｆ绠＄悊涓撳憳 + + 娓呮敹澶勭疆澶嶅 100 14 true @@ -369,12 +383,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c949016589afe2d80073 - 璐㈠姟澶嶆牳 + 2c9c81b9700ecc97017080a5e03b001a + 鎻愬墠缁撴竻绠＄悊涓撳憳 STRING - - 璐㈠姟澶嶆牳 + + 鎻愬墠缁撴竻绠＄悊涓撳憳 100 15 true @@ -388,12 +402,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c949016589afe2d80077 - 璐㈠姟鍑虹撼 + 2c9c81b9700ecc97017080a5e03b0023 + 璧勪骇绠＄悊涓撳憳 STRING - - 璐㈠姟鍑虹撼 + + 璧勪骇绠＄悊涓撳憳 100 16 true @@ -407,12 +421,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a0003c - 涓氬姟浜岄儴甯傚満涓撳憳 + 2c9c81b9700ecc97017080a5e03b0025 + 璧勪骇绠＄悊璐熻矗浜 STRING - - 涓氬姟浜岄儴甯傚満涓撳憳 + + 璧勪骇绠＄悊璐熻矗浜 100 17 true @@ -426,12 +440,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a00037 - 涓氬姟浜岄儴杩愯惀涓撳憳鍒濆 + 2c9c81b9700ecc97017080a5e03b001e + 杞诲偓缁 STRING - - 涓氬姟浜岄儴杩愯惀涓撳憳鍒濆 + + 杞诲偓缁 100 18 true @@ -445,12 +459,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a0003b - 涓氬姟浜岄儴杩愯惀涓撳憳澶嶅 + 2c9c81b9700ecc97017080a5e03c003a + 涓偓缁 STRING - - 涓氬姟浜岄儴杩愯惀涓撳憳澶嶅 + + 涓偓缁 100 19 true @@ -464,12 +478,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a00038 - 涓氬姟浜岄儴杩愯惀鎬荤洃 + 2c9c81b9700ecc97017080a5e03c003c + 閲嶅偓缁 STRING - - 涓氬姟浜岄儴杩愯惀鎬荤洃 + + 閲嶅偓缁 100 20 true @@ -483,12 +497,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a00033 - 涓氬姟浜岄儴甯傚満鎬荤洃 + 2c9c81b9700ecc97017080a5e03c0041 + 姹借溅涓氬姟閮ㄦ荤洃 STRING - - 涓氬姟浜岄儴甯傚満鎬荤洃 + + 姹借溅涓氬姟閮ㄦ荤洃 100 21 true @@ -502,12 +516,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a00042 - 甯傚満妗ｆ绠＄悊涓撳憳 + 2c9c81b9700ecc97017080a5e03c0035 + 瀹夐箯绉熻祦鎬荤粡鐞 STRING - - 甯傚満妗ｆ绠＄悊涓撳憳 + + 瀹夐箯绉熻祦鎬荤粡鐞 100 22 true @@ -521,12 +535,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a00045 - 淇″涓撳憳 + 2c9c81b9700ecc97017080a5e03c002f + C绔储鍔＄粡鍔 STRING - - 淇″涓撳憳 + + C绔储鍔＄粡鍔 100 23 true @@ -540,12 +554,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a0003d - 淇″缁忕悊 + 2c9c81b9700ecc97017080a5e03b0015 + 璐㈠姟鍑虹撼 STRING - - 淇″缁忕悊 + + 璐㈠姟鍑虹撼 100 24 true @@ -559,12 +573,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a00036 - 淇″璐熻矗浜 + 2c9c81b9700ecc97017080a5e03a0013 + 璧勯噾绠＄悊 STRING - - 淇″璐熻矗浜 + + 璧勯噾绠＄悊 100 25 true @@ -578,12 +592,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a0003a - 杩愯惀妗ｆ绠＄悊涓撳憳 + 2c9c81b9700ecc97017080a5e03c0033 + 璐㈠姟澶嶆牳 STRING - - 杩愯惀妗ｆ绠＄悊涓撳憳 + + 璐㈠姟澶嶆牳 100 26 true @@ -597,12 +611,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a00035 - 璧勭涓氬姟鍛 + 2c9c81b9700ecc97017080a5e03b0026 + 鍏跺畠鏀粯 STRING - - 璧勭涓氬姟鍛 + + 鍏跺畠鏀粯 100 27 true @@ -616,12 +630,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a00043 - 璧勭璐熻矗浜 + 2c9c81b9700ecc97017080a5e03b0020 + 缁忛攢鍟嗕笟鍔′汉鍛 STRING - - 璧勭璐熻矗浜 + + 缁忛攢鍟嗕笟鍔′汉鍛 100 28 true @@ -635,12 +649,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a0003f - 璐㈠姟缁忓姙 + 2c9c81b9700ecc97017080a5e03c0044 + bccuishou STRING - - 璐㈠姟缁忓姙 + + bccuishou 100 29 true @@ -654,12 +668,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a00041 - 瓒呯骇绠＄悊鍛 + 2c9c81b9700ecc97017080a5e03b0018 + 鍑嵎鍌敹 STRING - - 瓒呯骇绠＄悊鍛 + + 鍑嵎鍌敹 100 30 true @@ -673,15 +687,15 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a00032 - 骞冲彴绠＄悊鍛 + 2c9c81b9700ecc97017080a5e03c0045 + 娓犻亾鍌敹 STRING - - 骞冲彴绠＄悊鍛 + + 娓犻亾鍌敹 100 31 - false + true false false @@ -692,15 +706,15 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a0003e - 绯荤粺绠＄悊鍛 + 2c9c81b9700ecc97017080a5e03c0038 + 娓犻亾绠＄悊閮ㄧ粡鐞 STRING - - 绯荤粺绠＄悊鍛 + + 娓犻亾绠＄悊閮ㄧ粡鐞 100 32 - false + true false false @@ -711,12 +725,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a00044 - 缁忛攢鍟嗕笟鍔′汉鍛 + 2c9c81b9700ecc97017080a5e03b0019 + 鍖楄储鍚堜綔鏂 STRING - - 缁忛攢鍟嗕笟鍔′汉鍛 + + 鍖楄储鍚堜綔鏂 100 33 true @@ -730,15 +744,15 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c94901655765489f0031 - 鏅氱敤鎴 + 2c9c81b9700ecc97017080a5e03b0021 + IT缁 STRING - - 鏅氱敤鎴 + + IT缁 100 34 - false + true false false @@ -749,12 +763,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c9490165576548a00034 - IT绠＄悊鍛 + 2c9c81b9700ecc97017080a5e03b002b + pingtaiguanliyuan STRING - - IT绠＄悊鍛 + + pingtaiguanliyuan 100 35 true @@ -768,12 +782,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b969188a33016e15fae5fa00ed - 杞诲偓缁 + 2c9c81b9700ecc97017080a5e03c0036 + 瓒呯骇绠＄悊鍛 STRING - - 杞诲偓缁 + + 瓒呯骇绠＄悊鍛 100 36 true @@ -787,12 +801,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b969188a33016e15fae5fa00eb - 涓偓缁 + 2c9c81b9700ecc97017080a5e03c0039 + xitongguanliyuan STRING - - 涓偓缁 + + xitongguanliyuan 100 37 true @@ -806,12 +820,12 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b969188a33016e15fae5fa00ec - 閲嶅偓缁 + 2c9c81b9700ecc97017080a5e03b001f + putongyonghu STRING - - 閲嶅偓缁 + + putongyonghu 100 38 true @@ -824,13 +838,279 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno + + 2c9c81b9700ecc97017080a5e03a0014 + 鍐呮帶绋芥牳 + STRING + + + 鍐呮帶绋芥牳 + 100 + 39 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a5e03c0042 + 椋庨櫓缁忓姙 + STRING + + + 椋庨櫓缁忓姙 + 100 + 40 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a5e03b0017 + 椤圭洰淇″绉樹功 + STRING + + + 椤圭洰淇″绉樹功 + 100 + 41 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a5e03c003f + 椋庨櫓绠＄悊閮ㄦ荤洃 + STRING + + + 椋庨櫓绠＄悊閮ㄦ荤洃 + 100 + 42 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a5e03c003b + 涓氬姟浜岄儴椤圭洰鍔╃悊 + STRING + + + 涓氬姟浜岄儴椤圭洰鍔╃悊 + 100 + 43 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a5e03c0043 + 涓氬姟浜岄儴椤圭洰缁忕悊 + STRING + + + 涓氬姟浜岄儴椤圭洰缁忕悊 + 100 + 44 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a5e03c003d + 涓氬姟浜岄儴鎬荤洃 + STRING + + + 涓氬姟浜岄儴鎬荤洃 + 100 + 45 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a5e03b0016 + 涓氬姟涓閮ㄩ」鐩姪鐞 + STRING + + + 涓氬姟涓閮ㄩ」鐩姪鐞 + 100 + 46 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a5e03b0027 + 涓氬姟涓閮ㄩ」鐩粡鐞 + STRING + + + 涓氬姟涓閮ㄩ」鐩粡鐞 + 100 + 47 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a5e03b002e + 涓氬姟涓閮ㄦ荤洃 + STRING + + + 涓氬姟涓閮ㄦ荤洃 + 100 + 48 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a5e03b0028 + 涓氬姟涓閮ㄥ垎绠￠瀵 + STRING + + + 涓氬姟涓閮ㄥ垎绠￠瀵 + 100 + 49 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a5e03c003e + 绉熷悗缁忕悊 + STRING + + + 绉熷悗缁忕悊 + 100 + 50 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a5e03b002a + 璧勪骇绠＄悊缁忕悊 + STRING + + + 璧勪骇绠＄悊缁忕悊 + 100 + 51 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017080a5e03b0024 + 妗ｆ绠＄悊涓撳憳 + STRING + + + 妗ｆ绠＄悊涓撳憳 + 100 + 52 + true + + false + false + false + false + + + + - 2c9c81b56552c949016557673f2a0048 + 2c9c81b9700ecc97017080a5e03c0047 menuname menuname @@ -853,7 +1133,7 @@ WHERE ri.menuname IS NOT NULL GROUP BY ri.sortno - 2c9c81b56552c94901655765a0b90047 + 2c9c81b9700ecc97017080a5e0390011 0 0 0 From 0ebe655851692da4beb72e412344638cf271a8ad Mon Sep 17 00:00:00 2001 From: zhangjun Date: Wed, 18 Mar 2020 20:15:55 +0800 Subject: [PATCH 13/89] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/LBImportPage/PayBillImportInfo.jsp | 27 +++ .../Comm/LBImportPage/PayBillImportList.jsp | 115 +++++++++++ WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 99 +++++++--- .../lease/carbrand/WX_PAY_THE_BILLS.java | 180 ++++++++++++++++++ 4 files changed, 398 insertions(+), 23 deletions(-) create mode 100644 WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportInfo.jsp create mode 100644 WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportList.jsp create mode 100644 src_jbo/jbo/com/tenwa/lease/carbrand/WX_PAY_THE_BILLS.java diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportInfo.jsp new file mode 100644 index 000000000..05e0af888 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportInfo.jsp @@ -0,0 +1,27 @@ +<%@page import="com.itextpdf.text.log.SysoCounter"%> +<%@ page contentType="text/html; charset=GBK"%><%@ +include + file="/Frame/resources/include/include_begin_info.jspf"%> +<% + String sPrevUrl = CurPage.getParameter("PrevUrl"); + if(sPrevUrl == null) sPrevUrl = "/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportList.jsp"; + String sTempletNo = "LCPayBillInfo";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + dwTemp.ReadOnly = "0";//只读模式 + dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID")); + + String sButtons[][] = { + {"true", "All", "Button", "保存","保存所有修改", "saveRecord()", "", "", "", ""}, + }; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportList.jsp new file mode 100644 index 000000000..22239cb31 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportList.jsp @@ -0,0 +1,115 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%> +<% + String PG_TITLE = "微信支付账单导入"; // 浏览器窗口标题 PG_TITLE +%> +<% + ASObjectModel doTemp = new ASObjectModel("LCPayBillList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.MultiSelect = true; //多选 + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(30); + dwTemp.genHTMLObjectWindow(""); +%> +<%/*~END~*/%> + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%> +<% + String sButtons[][] = { + //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"}, + {"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""}, + {"true","","Button","excel导入","excel导入","importExcel()","","","","btn_icon_import"}, + {"true","","Button","模版下载","模版下载","DiscountDownload()","","","","btn_icon_down",""}, + /* {"true","All","Button","生成租金计划","生成租金计划","createPlan()","","","","btn_icon_generate"}, + {"true","All","Button","测试拷贝","测试拷贝","copyPath()","","","","btn_icon_generate"}, */ + }; +%> +<%/*~END~*/%> +<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%> +<%@include file="/Frame/resources/include/ui/include_list.jspf"%> +<%/*~END~*/%> + +
+
+ +
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%> + +<%/*~END~*/%> +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%> + +<%/*~END~*/%> +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时，进行初始化;]~*/%> + +<%/*~END~*/%> +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 091aa8e90..10d493065 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -5260,31 +5260,31 @@ - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + @@ -5640,6 +5640,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src_jbo/jbo/com/tenwa/lease/carbrand/WX_PAY_THE_BILLS.java b/src_jbo/jbo/com/tenwa/lease/carbrand/WX_PAY_THE_BILLS.java new file mode 100644 index 000000000..b92f0bb46 --- /dev/null +++ b/src_jbo/jbo/com/tenwa/lease/carbrand/WX_PAY_THE_BILLS.java @@ -0,0 +1,180 @@ +package jbo.com.tenwa.lease.carbrand; + +import java.lang.String; + +/** +* - JBO命名常量类

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface WX_PAY_THE_BILLS{ + /** + *

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.com.tenwa.lease.carbrand.WX_PAY_THE_BILLS"; + /** + * 标识 STRING(32)
+ */ + public static final String id = "id"; + /** + * 交易时间 STRING(32)
+ */ + public static final String Trading_hours = "Trading_hours"; + /** + * 商户号 STRING(32)
+ */ + public static final String merchants_number = "merchants_number"; + /** + * 特约商户号 STRING(32)
+ */ + public static final String Engaged_merchant_number = "Engaged_merchant_number"; + /** + * 设备号 STRING(32)
+ */ + public static final String Device_number = "Device_number"; + /** + * 微信订单号 STRING(32)
+ */ + public static final String WX_order_number = "WX_order_number"; + /** + * 商户订单号 STRING(32)
+ */ + public static final String Merchant_order_no = "Merchant_order_no"; + /** + * 用户标识 STRING(32)
+ */ + public static final String User_identification = "User_identification"; + /** + * 交易类型 STRING(32)
+ */ + public static final String Transaction_type = "Transaction_type"; + /** + * 交易状态 STRING(32)
+ */ + public static final String Transaction_status = "Transaction_status"; + /** + * 付款银行 STRING(32)
+ */ + public static final String payment_bank = "payment_bank"; + /** + * 货币种类 STRING(32)
+ */ + public static final String Currency_type = "Currency_type"; + /** + * 应结订单金额 STRING(32)
+ */ + public static final String order_amount_money = "order_amount_money"; + /** + * 代金券金额 STRING(32)
+ */ + public static final String voucher_money = "voucher_money"; + /** + * 微信退款单号 STRING(32)
+ */ + public static final String WX_refund_number = "WX_refund_number"; + /** + * 商户退款单号 STRING(32)
+ */ + public static final String merchant_refund_number = "merchant_refund_number"; + /** + * 退款金额 STRING(32)
+ */ + public static final String refund_money = "refund_money"; + /** + * 充值券退款金额 STRING(32)
+ */ + public static final String voucher_refund_money = "voucher_refund_money"; + /** + * 退款类型 STRING(32)
+ */ + public static final String refund_type = "refund_type"; + /** + * 退款状态 STRING(32)
+ */ + public static final String refund_state = "refund_state"; + /** + * 商品名称 STRING(32)
+ */ + public static final String goods_name = "goods_name"; + /** + * 商户数据包 STRING(32)
+ */ + public static final String merchant_data = "merchant_data"; + /** + * 手续费 STRING(32)
+ */ + public static final String poundage = "poundage"; + /** + * 费率 STRING(32)
+ */ + public static final String rate = "rate"; + /** + * 订单金额 STRING(32)
+ */ + public static final String order_money = "order_money"; + /** + * 申请退款金额 STRING(32)
+ */ + public static final String Refund_amount = "Refund_amount"; + /** + * 费率备注 STRING(32)
+ */ + public static final String Rate_note = "Rate_note"; + /** + * 总交易单数 STRING(32)
+ */ + public static final String Total_transaction_number = "Total_transaction_number"; + /** + * 应结订单总金额 STRING(32)
+ */ + public static final String Total_order_amount_money = "Total_order_amount_money"; + /** + * 退款总金额 STRING(32)
+ */ + public static final String Total_refund = "Total_refund"; + /** + * 充值券退款总金额 STRING(32)
+ */ + public static final String voucher_Total_refund = "voucher_Total_refund"; + /** + * 手续费总金额 STRING(32)
+ */ + public static final String poundage_total_amount = "poundage_total_amount"; + /** + * 订单总金额 STRING(32)
+ */ + public static final String Total_order_amount = "Total_order_amount"; + /** + * 申请退款总金额 STRING(32)
+ */ + public static final String apply_Total_refund = "apply_Total_refund"; + /** + * 金额 STRING(32)
+ */ + public static final String money = "money"; + /** + * 登记人 STRING(32)
+ */ + public static final String INPUTUSERID = "INPUTUSERID"; + /** + * 登记部门 STRING(32)
+ */ + public static final String INPUTORGID = "INPUTORGID"; + /** + * 登记时间 STRING(32)
+ */ + public static final String INPUTTIME = "INPUTTIME"; + /** + * 更新人 STRING(32)
+ */ + public static final String UPDATEUSERID = "UPDATEUSERID"; + /** + * 更新部门 STRING(32)
+ */ + public static final String UPDATEORGID = "UPDATEORGID"; + /** + * 更新日期 STRING(32)
+ */ + public static final String UPDATETIME = "UPDATETIME"; +} \ No newline at end of file From e311980b67fa2940f16ca893922f589524c8e450 Mon Sep 17 00:00:00 2001 From: zhangjun Date: Thu, 19 Mar 2020 11:24:26 +0800 Subject: [PATCH 14/89] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 104 +++++----- .../tenwa/lease/comm/WX_PAY_THE_BILLS.java | 180 ++++++++++++++++++ 2 files changed, 231 insertions(+), 53 deletions(-) create mode 100644 src_jbo/jbo/com/tenwa/lease/comm/WX_PAY_THE_BILLS.java diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 10d493065..69ee7df72 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -5285,6 +5285,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5640,59 +5691,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src_jbo/jbo/com/tenwa/lease/comm/WX_PAY_THE_BILLS.java b/src_jbo/jbo/com/tenwa/lease/comm/WX_PAY_THE_BILLS.java new file mode 100644 index 000000000..76bdd5beb --- /dev/null +++ b/src_jbo/jbo/com/tenwa/lease/comm/WX_PAY_THE_BILLS.java @@ -0,0 +1,180 @@ +package jbo.com.tenwa.lease.comm; + +import java.lang.String; + +/** +* - JBO命名常量类

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface WX_PAY_THE_BILLS{ + /** + *

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.com.tenwa.lease.comm.WX_PAY_THE_BILLS"; + /** + * 标识 STRING(32)
+ */ + public static final String id = "id"; + /** + * 交易时间 STRING(32)
+ */ + public static final String Trading_hours = "Trading_hours"; + /** + * 商户号 STRING(32)
+ */ + public static final String merchants_number = "merchants_number"; + /** + * 特约商户号 STRING(32)
+ */ + public static final String Engaged_merchant_number = "Engaged_merchant_number"; + /** + * 设备号 STRING(32)
+ */ + public static final String Device_number = "Device_number"; + /** + * 微信订单号 STRING(32)
+ */ + public static final String WX_order_number = "WX_order_number"; + /** + * 商户订单号 STRING(32)
+ */ + public static final String Merchant_order_no = "Merchant_order_no"; + /** + * 用户标识 STRING(32)
+ */ + public static final String User_identification = "User_identification"; + /** + * 交易类型 STRING(32)
+ */ + public static final String Transaction_type = "Transaction_type"; + /** + * 交易状态 STRING(32)
+ */ + public static final String Transaction_status = "Transaction_status"; + /** + * 付款银行 STRING(32)
+ */ + public static final String payment_bank = "payment_bank"; + /** + * 货币种类 STRING(32)
+ */ + public static final String Currency_type = "Currency_type"; + /** + * 应结订单金额 STRING(32)
+ */ + public static final String order_amount_money = "order_amount_money"; + /** + * 代金券金额 STRING(32)
+ */ + public static final String voucher_money = "voucher_money"; + /** + * 微信退款单号 STRING(32)
+ */ + public static final String WX_refund_number = "WX_refund_number"; + /** + * 商户退款单号 STRING(32)
+ */ + public static final String merchant_refund_number = "merchant_refund_number"; + /** + * 退款金额 STRING(32)
+ */ + public static final String refund_money = "refund_money"; + /** + * 充值券退款金额 STRING(32)
+ */ + public static final String voucher_refund_money = "voucher_refund_money"; + /** + * 退款类型 STRING(32)
+ */ + public static final String refund_type = "refund_type"; + /** + * 退款状态 STRING(32)
+ */ + public static final String refund_state = "refund_state"; + /** + * 商品名称 STRING(32)
+ */ + public static final String goods_name = "goods_name"; + /** + * 商户数据包 STRING(32)
+ */ + public static final String merchant_data = "merchant_data"; + /** + * 手续费 STRING(32)
+ */ + public static final String poundage = "poundage"; + /** + * 费率 STRING(32)
+ */ + public static final String rate = "rate"; + /** + * 订单金额 STRING(32)
+ */ + public static final String order_money = "order_money"; + /** + * 申请退款金额 STRING(32)
+ */ + public static final String Refund_amount = "Refund_amount"; + /** + * 费率备注 STRING(32)
+ */ + public static final String Rate_note = "Rate_note"; + /** + * 总交易单数 STRING(32)
+ */ + public static final String Total_transaction_number = "Total_transaction_number"; + /** + * 应结订单总金额 STRING(32)
+ */ + public static final String Total_order_amount_money = "Total_order_amount_money"; + /** + * 退款总金额 STRING(32)
+ */ + public static final String Total_refund = "Total_refund"; + /** + * 充值券退款总金额 STRING(32)
+ */ + public static final String voucher_Total_refund = "voucher_Total_refund"; + /** + * 手续费总金额 STRING(32)
+ */ + public static final String poundage_total_amount = "poundage_total_amount"; + /** + * 订单总金额 STRING(32)
+ */ + public static final String Total_order_amount = "Total_order_amount"; + /** + * 申请退款总金额 STRING(32)
+ */ + public static final String apply_Total_refund = "apply_Total_refund"; + /** + * 金额 STRING(32)
+ */ + public static final String money = "money"; + /** + * 登记人 STRING(32)
+ */ + public static final String INPUTUSERID = "INPUTUSERID"; + /** + * 登记部门 STRING(32)
+ */ + public static final String INPUTORGID = "INPUTORGID"; + /** + * 登记时间 STRING(32)
+ */ + public static final String INPUTTIME = "INPUTTIME"; + /** + * 更新人 STRING(32)
+ */ + public static final String UPDATEUSERID = "UPDATEUSERID"; + /** + * 更新部门 STRING(32)
+ */ + public static final String UPDATEORGID = "UPDATEORGID"; + /** + * 更新日期 STRING(32)
+ */ + public static final String UPDATETIME = "UPDATETIME"; +} \ No newline at end of file From e0b339fd66e799d335d8213b8e20460c0f4e8daa Mon Sep 17 00:00:00 2001 From: zhangjun Date: Thu, 19 Mar 2020 15:35:39 +0800 Subject: [PATCH 15/89] =?UTF-8?q?=E4=B8=BA=E5=BE=AE=E4=BF=A1=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E6=94=AF=E4=BB=98=E5=AF=BC=E5=85=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8E=BB=E9=87=8D=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tenwa/apzl/comm/BillstopayImport.java | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java diff --git a/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java b/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java new file mode 100644 index 000000000..c96d834fa --- /dev/null +++ b/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java @@ -0,0 +1,60 @@ +package com.tenwa.apzl.comm; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.context.ASUser; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import com.tenwa.comm.exception.BusinessException; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.officetempalte.importcallback.impl.BaseImportExcelCallBack; + +public class BillstopayImport extends BaseImportExcelCallBack{ + + @Override + public void run(ASUser CurUser, BizObject importObject,Map model, Integer rowIndex, JBOTransaction tx,Transaction Sqlca) throws Exception { + } + + @Override + public void runBefore(ASUser CurUser, Map model, List importObjects, JBOTransaction tx,Transaction Sqlca) throws Exception { + Transaction Sqlca1 = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + /** + * 定义全局变量 + */ + String error=""; // 错误描述 + boolean flag=false; // 错误描述 + String WX_order_number=null; // 导入的微信订单号 + String sql1=""; // 原有的数据 + /** + * 校验本次Excel是否有重复的 + */ + + /** + * 校验本次导入数据在导入表是否已有 + */ + List> list = new ArrayList>(); + Map map = new HashMap(); + for(BizObject bo:importObjects){ + WX_order_number=bo.getAttribute("WX_order_number").getString(); + + // 通过本次excel中的数据查询导入的表, 判断是否重复 + sql1="SELECT WX_order_number FROM wx_pay_the_bills WHERE WX_order_number='"+WX_order_number+"'"; + List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); + // 有结果集, 说明重复 + if(dataList.size()>0){ + error=",【微信订单号: "+WX_order_number+"】"; + flag=true; + } + } + if(flag) { + error = error.substring(1); + throw new BusinessException(error+"已存在 ！"); + } + } +} From 2e30d31175b11802b0853bce5ab67a25e8edcb5e Mon Sep 17 00:00:00 2001 From: XZW Date: Fri, 20 Mar 2020 12:21:18 +0800 Subject: [PATCH 16/89] =?UTF-8?q?=E5=8D=A1=E6=89=A3=E5=87=AD=E8=AF=81?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=AC=E5=88=86=E6=94=B6=E6=AC=BE=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InsertVoucherRentIncome.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java index db6c658d6..b72e0c678 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java @@ -39,16 +39,16 @@ public class InsertVoucherRentIncome { * 查询数据, 判断是否需要执行插入中间表 */ // 查询是否有当月的, 未生成凭证的数据(卡扣) - String sqls1="SELECT lri.RENT FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID) LV2 ON LV2.INCOME_ID = LRI.PLAN_ID AND LV2.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqls1="SELECT lri.RENT FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID) LV2 ON LV2.INCOME_ID = LRI.PLAN_ID AND LV2.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') "; // 查询跨月的, 未生成凭证的数据(卡扣) - String sqls2="SELECT lri.RENT FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID) LV2 ON LV2.INCOME_ID = LRI.PLAN_ID AND LV2.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqls2="SELECT lri.RENT FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID) LV2 ON LV2.INCOME_ID = LRI.PLAN_ID AND LV2.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m') "; // 查询当前数据是否有逾期利息(卡扣) - String sqls3="SELECT lri.PENALTY FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_penalty_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_PENALTY_PLAN GROUP BY INCOME_ID) LV2 ON LV2.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.penalty > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') "; + String sqls3="SELECT lri.PENALTY FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_penalty_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_PENALTY_PLAN GROUP BY INCOME_ID) LV2 ON LV2.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.penalty > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') "; // 代偿反冲租金 - String sqls4="SELECT lri.RENT,LRP.ID AS F58 FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT F58 FROM VOUCHER_V8 WHERE F59 = 1 AND MODULE_NAME LIKE '%代偿反冲-收到代偿的租金%' GROUP BY F58)V8 ON V8.F58=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NOT NULL OR LV2.INCOME_ID IS NOT NULL) AND V8.F58 IS NULL AND lul.is_main = 'Y' "; + String sqls4="SELECT lri.RENT,LRP.ID AS F58 FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT F58 FROM VOUCHER_V8 WHERE F59 = 1 AND MODULE_NAME LIKE '%代偿反冲-收到代偿的租金%' GROUP BY F58)V8 ON V8.F58=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NOT NULL OR LV2.INCOME_ID IS NOT NULL) AND V8.F58 IS NULL AND lul.is_main = 'Y' "; // 代偿反冲逾期利息 - String slqs5="SELECT lri.PENALTY,LRP.ID AS F58 FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT F58 FROM VOUCHER_V8 WHERE F59 = 1 AND MODULE_NAME LIKE '%代偿反冲-代偿逾期利息%' GROUP BY F58)V8 ON V8.F58=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.PENALTY > 0 AND (LV1.INCOME_ID IS NOT NULL OR LV2.INCOME_ID IS NOT NULL) AND V8.F58 IS NULL AND lul.is_main = 'Y' "; + String slqs5="SELECT lri.PENALTY,LRP.ID AS F58 FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT F58 FROM VOUCHER_V8 WHERE F59 = 1 AND MODULE_NAME LIKE '%代偿反冲-代偿逾期利息%' GROUP BY F58)V8 ON V8.F58=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.PENALTY > 0 AND (LV1.INCOME_ID IS NOT NULL OR LV2.INCOME_ID IS NOT NULL) AND V8.F58 IS NULL AND lul.is_main = 'Y' "; List> dataList1=DataOperatorUtil.getDataBySql(Sqlca, sqls1, null); List> dataList2=DataOperatorUtil.getDataBySql(Sqlca, sqls2, null); @@ -60,11 +60,11 @@ public class InsertVoucherRentIncome { * 将数据插入中间表的SQL */ // 未逾期及逾期未过月(卡扣) - String sql1="INSERT INTO lv_rent_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,CASE WHEN lrp.collect_msg IN ('WXPay', 'WXUnionPay') THEN lrp.collect_msg ELSE lrp.COLLECT_STATUS END AS COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM,LRI.ID FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID)LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID)LV2 ON LV2.INCOME_ID=LRI.PLAN_ID AND LV2.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV3 ON LV3.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV4 ON LV4.INCOME_ID=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m'))"; + String sql1="INSERT INTO lv_rent_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,CASE WHEN lrp.collect_msg IN ('WXPay', 'WXUnionPay') THEN lrp.collect_msg ELSE lrp.COLLECT_STATUS END AS COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM,LRI.ID FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID)LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID)LV2 ON LV2.INCOME_ID=LRI.PLAN_ID AND LV2.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV3 ON LV3.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV4 ON LV4.INCOME_ID=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m'))"; // 逾期过月(卡扣) - String sql2="INSERT INTO lv_rent_income2 (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,CASE WHEN lrp.collect_msg IN ('WXPay', 'WXUnionPay') THEN lrp.collect_msg ELSE lrp.COLLECT_STATUS END AS COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM,LRI.ID FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID)LV1 ON LV1.INCOME_ID=LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID)LV2 ON LV2.INCOME_ID=LRI.PLAN_ID AND LV2.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV3 ON LV3.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV4 ON LV4.INCOME_ID=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m')) "; + String sql2="INSERT INTO lv_rent_income2 (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,CASE WHEN lrp.collect_msg IN ('WXPay', 'WXUnionPay') THEN lrp.collect_msg ELSE lrp.COLLECT_STATUS END AS COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM,LRI.ID FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID)LV1 ON LV1.INCOME_ID=LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID)LV2 ON LV2.INCOME_ID=LRI.PLAN_ID AND LV2.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV3 ON LV3.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV4 ON LV4.INCOME_ID=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m')) "; // 逾期利息(卡扣) - String sql3="INSERT INTO lv_penalty_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,0.00,0.00,0.00,lri.PENALTY,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,CASE WHEN lrp.collect_msg IN ('WXPay', 'WXUnionPay') THEN lrp.collect_msg ELSE lrp.COLLECT_STATUS END AS COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM,LRI.ID FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_penalty_income GROUP BY INCOME_ID,LRI_ID)LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_PENALTY_PLAN GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV4 ON LV4.INCOME_ID=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.penalty > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d')) "; + String sql3="INSERT INTO lv_penalty_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,0.00,0.00,0.00,lri.PENALTY,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,CASE WHEN lrp.collect_msg IN ('WXPay', 'WXUnionPay') THEN lrp.collect_msg ELSE lrp.COLLECT_STATUS END AS COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM,LRI.ID FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_penalty_income GROUP BY INCOME_ID,LRI_ID)LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_PENALTY_PLAN GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV4 ON LV4.INCOME_ID=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.penalty > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d')) "; /** * 根据查询语句判断, 有值才执行插入SQL */ @@ -130,20 +130,20 @@ public class InsertVoucherRentIncome { * 汽车回租-卡扣 */ // 当月的租金(卡扣)-(汽车回租) - String sqlqh1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT F58,F56 FROM VOUCHER_V8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND F58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqlqh1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT F58,F56 FROM VOUCHER_V8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND F58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') "; // 本月以前的租金(卡扣)-(汽车回租) - String sqlqh2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqlqh2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m') "; // 逾期利息(卡扣)-(汽车回租) - String sqlqh3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d')"; + String sqlqh3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d')"; /** * 汽车直租-卡扣 */ // 当月的租金(卡扣)-(汽车直租) - String sqlqz1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '01' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqlqz1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '01' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') "; // 本月以前的租金(卡扣)-(汽车直租) - String sqlqz2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '01' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m')"; + String sqlqz2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '01' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m')"; // 逾期利息(卡扣)-(汽车直租) - String sqlqz3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款') AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '01' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d')"; + String sqlqz3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '01' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d')"; /** * 汽车回租-微信 */ @@ -193,20 +193,20 @@ public class InsertVoucherRentIncome { * 汽车类-回租-卡扣 */ // 收到的租金--卡扣-当月的-(汽车回租) - String sql_whereqh1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent WHEN LV.sort_number = '2' THEN LVRI.INTEREST ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus WHEN lv.sort_number = '4' THEN lvri.interest WHEN lv.sort_number = '5' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '6' THEN (lvri.interest - ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2)) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '6' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018082100000142')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereqh1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent WHEN LV.sort_number = '2' THEN LVRI.INTEREST ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus WHEN lv.sort_number = '4' THEN lvri.interest WHEN lv.sort_number = '5' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '6' THEN (lvri.interest - ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2)) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '6' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018082100000142')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; // 收到的租金--卡扣-跨月的-(汽车回租) - String sql_whereqh2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018082100000143')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereqh2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018082100000143')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; //收到的逾期利息--卡扣-(汽车回租) - String sql_whereqh3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52,F56, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-卡扣-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty /getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2018082100000144')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status IN ('手工收款', '批量收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereqh3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52,F56, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-卡扣-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty /getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2018082100000144')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; /** * 汽车类-直租-卡扣 */ // 收到的租金--卡扣-当月的-(汽车直租) - String sql_whereqz1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN LV.sort_number = '1' THEN LVRI.RENT WHEN LV.sort_number = '2' THEN LVRI.INTEREST WHEN LV.sort_number = '3' THEN (LVRI.CORPUS-ROUND(LVRI.CORPUS / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) ELSE 0.00 END f7,CASE WHEN lv.sort_number = '4' THEN lvri.corpus WHEN lv.sort_number = '5' THEN lvri.interest WHEN lv.sort_number = '6' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '7' THEN ((LVRI.CORPUS - ROUND(LVRI.CORPUS /getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2))+(lvri.interest - ROUND(lvri.interest /getTax(LCI.LEAS_FORM,'利息',LCCT.START_DATE),2))) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '7' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '7' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '7' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '6' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '7' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019070100000008')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereqz1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN LV.sort_number = '1' THEN LVRI.RENT WHEN LV.sort_number = '2' THEN LVRI.INTEREST WHEN LV.sort_number = '3' THEN (LVRI.CORPUS-ROUND(LVRI.CORPUS / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) ELSE 0.00 END f7,CASE WHEN lv.sort_number = '4' THEN lvri.corpus WHEN lv.sort_number = '5' THEN lvri.interest WHEN lv.sort_number = '6' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '7' THEN ((LVRI.CORPUS - ROUND(LVRI.CORPUS /getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2))+(lvri.interest - ROUND(lvri.interest /getTax(LCI.LEAS_FORM,'利息',LCCT.START_DATE),2))) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '7' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '7' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '7' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '6' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '7' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019070100000008')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; // 收到的租金--卡扣-跨月的-(汽车直租) - String sql_whereqz2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019070100000009')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereqz2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019070100000009')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; //收到的逾期利息--卡扣-(汽车直租) - String sql_whereqz3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52,F56, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67,F47,F48)SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-卡扣-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2019070100000007')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status IN ('手工收款', '批量收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereqz3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52,F56, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67,F47,F48)SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-卡扣-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2019070100000007')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; /** * 汽车类-回租-微信 */ From 62c2d908906d8882ff84bc00cc8401bf341d68c9 Mon Sep 17 00:00:00 2001 From: XZW Date: Fri, 20 Mar 2020 12:23:12 +0800 Subject: [PATCH 17/89] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E4=BC=A0?= =?UTF-8?q?=E8=BE=93=E6=8E=A5=E5=8F=A3=E4=BB=A5=E5=90=8E=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E4=BC=A0=E8=BE=93=E6=89=80=E5=B1=9E=E8=A1=8C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tenwa/voucher/serviceImp/VoucherToNCforDistributor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforDistributor.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforDistributor.java index 84a4ed0d5..867d442c0 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforDistributor.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToNCforDistributor.java @@ -216,7 +216,7 @@ public class VoucherToNCforDistributor implements Job{ Element mnecode = billhead.addElement("mnecode"); // 助记码,最大长度为50,类型为:String mnecode.setText(""); Element trade = billhead.addElement("trade"); // 所属行业,最大长度为20,类型为:String - trade.setText((BUSINESS_SCOPE==null)?"":BUSINESS_SCOPE); + trade.setText(""); Element pk_supplier_main = billhead.addElement("pk_supplier_main"); // 上级供应商,最大长度为20,类型为:String // pk_supplier_main.setText((SUBSIDIARY_COMPANY==null)?"":SUBSIDIARY_COMPANY); pk_supplier_main.setText(""); From 54fda510847a7bb8549fdf8c7ac883ece943c502 Mon Sep 17 00:00:00 2001 From: XZW Date: Fri, 20 Mar 2020 12:24:21 +0800 Subject: [PATCH 18/89] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4=E4=B8=BA?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BA=86=E5=B9=B6=E4=B8=94=E5=9C=A8=E5=85=B3?= =?UTF-8?q?=E6=B3=A8=E6=89=8D=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tenwa/lease/app/quartzmession/WechatMessagePush.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java b/src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java index fddc0ec23..71295b508 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java @@ -92,7 +92,7 @@ public class WechatMessagePush implements Job{ int con=0; // 查询所有需要发送还款提醒的数据 - String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT('第', LRP.PLAN_LIST, '期') KEYWORD2,CONCAT(IFNULL(LRP.RENT,0)-IFNULL(LRI.RENT,0), '元') KEYWORD3 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST)LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST WHERE WUI.BINDING_STATUS = 'Y' AND (TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(), '%Y-%m-%d'),DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m-%d')) <= 3 AND TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(), '%Y-%m-%d'),DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m-%d')) >= 0) AND IFNULL(LRP.RENT,0)-IFNULL(LRI.RENT,0)>0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '1' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') LIMIT 0, 50000 "; + String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT('第', LRP.PLAN_LIST, '期') KEYWORD2,CONCAT(IFNULL(LRP.RENT,0)-IFNULL(LRI.RENT,0), '元') KEYWORD3 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST)LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST WHERE WUI.BINDING_STATUS = 'Y' AND WUI.ATTENTION_STATUS<>'N' AND (TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(), '%Y-%m-%d'),DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m-%d')) <= 3 AND TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(), '%Y-%m-%d'),DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m-%d')) >= 0) AND IFNULL(LRP.RENT,0)-IFNULL(LRI.RENT,0)>0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '1' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') LIMIT 0, 50000 "; ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); while(rs.next()) { @@ -172,7 +172,7 @@ public class WechatMessagePush implements Job{ int con=0; // 查询所有需要发送还款提醒的数据 - String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT(ROUND((LRP.RENT + ROUND(IFNULL(getRentPenalty3(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2)) - (IFNULL(LRI.RENT, 0) + IFNULL(LRI.PENALTY, 0)),2),'元') AS KEYWORD2,CONCAT((LRP.RENT - IFNULL(LRI.RENT, 0)),'元') AS KEYWORD3,CONCAT(ROUND(IFNULL(getRentPenalty(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2),'元') AS KEYWORD4 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE,MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY FROM LC_RENT_PLAN WHERE TIMESTAMPDIFF(DAY,DATE_FORMAT(PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 3 GROUP BY CONTRACT_ID,PLAN_LIST) LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST WHERE WUI.BINDING_STATUS = 'Y' AND (IFNULL(LRP.RENT, 0)+ ROUND(IFNULL(getRentPenalty3(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2)- IFNULL(LRI.RENT, 0) - IFNULL(LRI.PENALTY, 0)) > 0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '2' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') ORDER BY LRP.PLAN_LIST LIMIT 0, 50000 "; + String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT(ROUND((LRP.RENT + ROUND(IFNULL(getRentPenalty3(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2)) - (IFNULL(LRI.RENT, 0) + IFNULL(LRI.PENALTY, 0)),2),'元') AS KEYWORD2,CONCAT((LRP.RENT - IFNULL(LRI.RENT, 0)),'元') AS KEYWORD3,CONCAT(ROUND(IFNULL(getRentPenalty(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2),'元') AS KEYWORD4 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE,MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY FROM LC_RENT_PLAN WHERE TIMESTAMPDIFF(DAY,DATE_FORMAT(PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 3 GROUP BY CONTRACT_ID,PLAN_LIST) LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST WHERE WUI.BINDING_STATUS = 'Y' AND WUI.ATTENTION_STATUS<>'N' AND (IFNULL(LRP.RENT, 0)+ ROUND(IFNULL(getRentPenalty3(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2)- IFNULL(LRI.RENT, 0) - IFNULL(LRI.PENALTY, 0)) > 0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '2' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') ORDER BY LRP.PLAN_LIST LIMIT 0, 50000 "; ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); // 循环, 逐条发送 while(rs.next()) { From 7b3bc43b5d3fb7cbceaba86b3400ddb596a2452e Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 20 Mar 2020 14:44:33 +0800 Subject: [PATCH 19/89] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E6=92=A4=E9=94=80=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tenwa/comm/message/controller/BusinessCancelJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java b/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java index b3146f98d..159f04f6f 100644 --- a/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java +++ b/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java @@ -77,7 +77,7 @@ public class BusinessCancelJob implements Job { String sql="select ID from lb_project_info O where O.project_status='13'"+ " and not EXISTS (select 1 from flow_bussiness_object fbo where fbo.proj_id=O.id and fbo.flow_name='合同制作流程')"+ " and not EXISTS (select 1 from lb_contract_info_temp lci where lci.project_id=O.id)"+ - " and CURDATE()-end_date>"+overDate; + " and DATEDIFF(CURDATE(),end_date) >"+overDate; ds = DataOperatorUtil.getDataBySql(tx, sql, null); if(ds.size()>0){ return ds; From 6d3ad4ac15ca72be11cb66262f2d361b3513ff8c Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 20 Mar 2020 20:57:10 +0800 Subject: [PATCH 20/89] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=9A=E6=81=AF?= =?UTF-8?q?=E5=87=8F=E5=85=8D=E6=B5=81=E7=A8=8B=E5=88=A4=E6=96=AD=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql | 8 + .../com/tenwa/apzl/comm/BillstopayImport.java | 19 +- .../JudgmentPenaltyAdjustMoneyGreater.java | 33 +++ .../JudgmentPenaltyAdjustMoneyLess.java | 32 +++ 鎶ヨ〃/璧勪骇澶勭疆鎶ヨ〃/鍏ユ睜璧勪骇鎶ヨ〃.xml | 212 +++++++++++++----- 5 files changed, 246 insertions(+), 58 deletions(-) create mode 100644 src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyGreater.java create mode 100644 src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyLess.java diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql index c439bd615..a745d127a 100644 --- a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql +++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql @@ -156,5 +156,13 @@ insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddesc delete from FLOW_MODEL where FlowNo='FundPaymentCarFlow' AND PhaseNo='1000'; insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('FundPaymentCarFlow','1000','1040','通过',NULL,NULL,'!基础操作.投放层资金付款临时到正式表(#ObjectNo)+!基础操作.合同基本信息从临时到正式(#ObjectNo)+!通用流程操作.保存项目进度状态(#ObjectNo,21)+!基础操作.接口平台业务通过审批意见推送入表(#ObjectNo)+!审批流程.发票信息表从临时到正式表(#ObjectNo)','{\"system\"}',NULL,'commroute',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'287','472','50','50','1',NULL,'END',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +-- 添加发票信息的风险预警 +INSERT INTO SCENARIO_MODEL (scenarioid,modelid,sortno,modelname,modeldescribe,modeltype,subtypeno,runcondition,STATUS,nopassdeal,passdeal,passmessage,nopassmessage,executescript,remark,inputuser,inputorg,inputtime,updateuser,updatetime,groupid,modelkind,bizviewer) VALUES ('付款申请(汽车)','0040','0040','发票信息是否填写','','20','','','1','10',NULL,'发票信息已填写','请先填写发票信息','SELECT CASE WHEN id IS NOT NULL THEN ''true'' ELSE ''false'' END FROM lb_Invoice_info_temp WHERE flow_unid=''#{ObjectNo}''','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +INSERT INTO SCENARIO_RELATIVE (scenarioid,groupid,modelid) VALUES ('付款申请(汽车)','0020','0040'); + +-- 添加罚息减免判断条件方法 +insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('审批流程','罚息减免流程判断大于100元','Bizlet','罚息减免流程判断大于100元','String','String ObjectNo','com.tenwa.lease.flow.project.businessapply.JudgmentPenaltyAdjustMoneyGreater','','','','','',''); +insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('审批流程','罚息减免流程判断小于等于100元','Bizlet','罚息减免流程判断小于等于100元','String','String ObjectNo','com.tenwa.lease.flow.project.businessapply.JudgmentPenaltyAdjustMoneyLess','','','','','',''); + diff --git a/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java b/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java index c96d834fa..9ea733061 100644 --- a/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java +++ b/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java @@ -2,8 +2,10 @@ package com.tenwa.apzl.comm; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.JBOTransaction; @@ -40,9 +42,10 @@ public class BillstopayImport extends BaseImportExcelCallBack{ */ List> list = new ArrayList>(); Map map = new HashMap(); + List arrayList = new ArrayList(); for(BizObject bo:importObjects){ WX_order_number=bo.getAttribute("WX_order_number").getString(); - + arrayList.add(WX_order_number); // 通过本次excel中的数据查询导入的表, 判断是否重复 sql1="SELECT WX_order_number FROM wx_pay_the_bills WHERE WX_order_number='"+WX_order_number+"'"; List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); @@ -56,5 +59,19 @@ public class BillstopayImport extends BaseImportExcelCallBack{ error = error.substring(1); throw new BusinessException(error+"已存在 ！"); } + long count = arrayList.stream().distinct().count(); + boolean isRepeat = count < arrayList.size(); + if(isRepeat){ + Set set = new HashSet<>(); + Set exist = new HashSet<>(); + for (String s : arrayList) { + if (set.contains(s)) { + exist.add(s); + } else { + set.add(s); + } + } + throw new BusinessException("，excl中的微信订单号:"+String.join(", ", exist)+"重复。"); + } } } diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyGreater.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyGreater.java new file mode 100644 index 000000000..d444e3451 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyGreater.java @@ -0,0 +1,33 @@ +package com.tenwa.lease.flow.project.businessapply; + + +import java.util.List; +import java.util.Map; + +import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.baseBussion.BaseBussiness; + + +public class JudgmentPenaltyAdjustMoneyGreater extends BaseBussiness { + + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String flowUnid=this.getAttribute("ObjectNo").toString(); + String sql = "SELECT SUM(PENALTY_ADJUST) penaltyAdjustMoney FROM LC_RENT_INCOME_TEMP WHERE FLOWUNID='"+flowUnid+"'"; + List> penaltyAdjustMoney = DataOperatorUtil.getDataBySql(Sqlca, sql , null ); + + String sMessage=""; + Double money = 0.0; + if(penaltyAdjustMoney.size() > 0){ + money=Double.parseDouble(penaltyAdjustMoney.get(0).get("penaltyAdjustMoney")); + } + if(money > 100){//大于100 + sMessage="true"; + }else { + sMessage="false"; + } + return sMessage; + } +} \ No newline at end of file diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyLess.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyLess.java new file mode 100644 index 000000000..f6dfdef1d --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/JudgmentPenaltyAdjustMoneyLess.java @@ -0,0 +1,32 @@ +package com.tenwa.lease.flow.project.businessapply; + + +import java.util.List; +import java.util.Map; + +import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.baseBussion.BaseBussiness; + +public class JudgmentPenaltyAdjustMoneyLess extends BaseBussiness { + + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String flowUnid=this.getAttribute("ObjectNo").toString(); + String sql = "SELECT SUM(PENALTY_ADJUST) penaltyAdjustMoney FROM LC_RENT_INCOME_TEMP WHERE FLOWUNID='"+flowUnid+"'"; + List> penaltyAdjustMoney = DataOperatorUtil.getDataBySql(Sqlca, sql , null ); + + String sMessage=""; + Double money = 0.0; + if(penaltyAdjustMoney.size() > 0){ + money=Double.parseDouble(penaltyAdjustMoney.get(0).get("penaltyAdjustMoney")); + } + if(money <= 100){//小于100 + sMessage="true"; + }else { + sMessage="false"; + } + return sMessage; + } +} \ No newline at end of file diff --git a/鎶ヨ〃/璧勪骇澶勭疆鎶ヨ〃/鍏ユ睜璧勪骇鎶ヨ〃.xml b/鎶ヨ〃/璧勪骇澶勭疆鎶ヨ〃/鍏ユ睜璧勪骇鎶ヨ〃.xml index 1f2498aa4..8a7c4d6a4 100644 --- a/鎶ヨ〃/璧勪骇澶勭疆鎶ヨ〃/鍏ユ睜璧勪骇鎶ヨ〃.xml +++ b/鎶ヨ〃/璧勪骇澶勭疆鎶ヨ〃/鍏ユ睜璧勪骇鎶ヨ〃.xml @@ -36,6 +36,7 @@ 2c9023815726a036015726a496b00001 COMPLEXSQL SELECT +lpi.subjectname, LPI.PROJECT_NO, LCI.CONTRACT_NUMBER, DI.DISTRIBUTOR_NAME, @@ -90,7 +91,8 @@ LEC.MODEL AS MODEL2, '' AS '鏄惁鏈変繚闄', '' AS '淇濋櫓鍏徃鍚嶇О', - '' AS '淇濋櫓鍒版湡鏃' + '' AS '淇濋櫓鍒版湡鏃' , + LEC.LICENSE_PLATE_NUMBER AS LICENSE_PLATE_NUMBER,lii.Invoice_number AS Invoice_number,lii.Invoice_money AS Invoice_money,lii.Invoice_date AS Invoice_date FROM (SELECT ID,DISTRIBUTOR_ID,CONTRACT_NUMBER FROM LB_CONTRACT_INFO WHERE BUSINESSTYPE='1' AND CONTRACT_STATUS='31')LCI LEFT JOIN @@ -132,9 +134,29 @@ LEFT JOIN LEFT JOIN VI_OVERDUE_CONTRACT2 VVC ON VVC.CONTRACT_ID=LFI.CONTRACT_ID LEFT JOIN - LB_CAR_LICENSE_PLATE_INFO LCLPI ON LCLPI.CONTRACT_ID=LCI.ID + LB_CAR_LICENSE_PLATE_INFO LCLPI ON LCLPI.CONTRACT_ID=LCI.ID +LEFT JOIN lb_Invoice_info lii ON lii.contract_id=LUL.CONTRACT_ID + + 2c9c81b670f702ed0170f7fd7b910004 + subjectname + STRING + + + subjectname + 100 + 0 + true + + false + false + false + false + + + + 2c9c81b969188a33016f12e544190119 PROJECT_NO @@ -143,7 +165,7 @@ LEFT JOIN PROJECT_NO 100 - 55 + 1 true false @@ -162,7 +184,7 @@ LEFT JOIN CONTRACT_NUMBER 100 - 56 + 2 true false @@ -181,7 +203,7 @@ LEFT JOIN DISTRIBUTOR_NAME 100 - 57 + 3 true false @@ -200,7 +222,7 @@ LEFT JOIN JXS_PROVINCE 100 - 58 + 4 true false @@ -219,7 +241,7 @@ LEFT JOIN CUSTOMERNAME 100 - 59 + 5 true false @@ -238,7 +260,7 @@ LEFT JOIN SEX 100 - 60 + 6 true false @@ -257,7 +279,7 @@ LEFT JOIN CERTTYPE 100 - 61 + 7 true false @@ -276,7 +298,7 @@ LEFT JOIN CERTID 100 - 62 + 8 true false @@ -295,7 +317,7 @@ LEFT JOIN AGE 100 - 63 + 9 true false @@ -314,7 +336,7 @@ LEFT JOIN MARITAL_STATUS 100 - 64 + 10 true false @@ -333,7 +355,7 @@ LEFT JOIN YEAR_MONEY 100 - 65 + 11 true false @@ -352,7 +374,7 @@ LEFT JOIN JZ_PROVINCE 100 - 66 + 12 true false @@ -371,7 +393,7 @@ LEFT JOIN JZ_CITY 100 - 67 + 13 true false @@ -390,7 +412,7 @@ LEFT JOIN HJ_PROVINCE 100 - 68 + 14 true false @@ -409,7 +431,7 @@ LEFT JOIN HJ_CITY 100 - 69 + 15 true false @@ -428,7 +450,7 @@ LEFT JOIN FK_MONEY 100 - 70 + 16 true false @@ -447,7 +469,7 @@ LEFT JOIN FK_DATE 100 - 71 + 17 true false @@ -466,7 +488,7 @@ LEFT JOIN PRODUCT_NAME 100 - 72 + 18 true false @@ -485,7 +507,7 @@ LEFT JOIN YEAR_RATE 100 - 73 + 19 true false @@ -504,7 +526,7 @@ LEFT JOIN LEASE_TERM 100 - 74 + 20 true false @@ -523,7 +545,7 @@ LEFT JOIN FIRST_PAYMENT_RATIO 100 - 75 + 21 true false @@ -542,7 +564,7 @@ LEFT JOIN CAUTION_MONEY_RATIO 100 - 76 + 22 true false @@ -561,7 +583,7 @@ LEFT JOIN REFUND_BANK 100 - 77 + 23 true false @@ -580,7 +602,7 @@ LEFT JOIN REFUND_ACC_NUMBER 100 - 78 + 24 true false @@ -599,7 +621,7 @@ LEFT JOIN REFUND_FREQUENCY 100 - 79 + 25 true false @@ -618,7 +640,7 @@ LEFT JOIN REFUND_WAY 100 - 80 + 26 true false @@ -637,7 +659,7 @@ LEFT JOIN BRAND 100 - 81 + 27 true false @@ -656,7 +678,7 @@ LEFT JOIN CAR_TYPE 100 - 82 + 28 true false @@ -675,7 +697,7 @@ LEFT JOIN MODEL 100 - 83 + 29 true false @@ -694,7 +716,7 @@ LEFT JOIN USED_CAR_DEADLINE 100 - 84 + 30 true false @@ -713,7 +735,7 @@ LEFT JOIN EXPIRE_DATE 100 - 85 + 31 true false @@ -732,7 +754,7 @@ LEFT JOIN REFUND_DATE 100 - 86 + 32 true false @@ -751,7 +773,7 @@ LEFT JOIN SPOUSE_NAME 100 - 87 + 33 true false @@ -770,7 +792,7 @@ LEFT JOIN IS_NO_ASSURE 100 - 88 + 34 true false @@ -789,7 +811,7 @@ LEFT JOIN ASSURE_NAME 100 - 89 + 35 true false @@ -808,7 +830,7 @@ LEFT JOIN USED_ASSESS_MONEY 100 - 90 + 36 true false @@ -827,7 +849,7 @@ LEFT JOIN WC_CORPUS 100 - 91 + 37 true false @@ -846,7 +868,7 @@ LEFT JOIN OVERDUE_DAYS 100 - 92 + 38 true false @@ -865,7 +887,7 @@ LEFT JOIN YQ_CORPUS 100 - 93 + 39 true false @@ -884,7 +906,7 @@ LEFT JOIN YQ_INTEREST 100 - 94 + 40 true false @@ -903,7 +925,7 @@ LEFT JOIN YQ_HANDLING_CHARGE 100 - 95 + 41 true false @@ -922,7 +944,7 @@ LEFT JOIN YQ_PENALTY 100 - 96 + 42 true false @@ -941,7 +963,7 @@ LEFT JOIN OVERDUE_CON 100 - 97 + 43 true false @@ -960,7 +982,7 @@ LEFT JOIN MAX_OVERDUE_DAYS 100 - 98 + 44 true false @@ -979,7 +1001,7 @@ LEFT JOIN APPLY_MONEY 100 - 99 + 45 true false @@ -998,7 +1020,7 @@ LEFT JOIN IS_NO_PLEDGE 100 - 100 + 46 true false @@ -1017,7 +1039,7 @@ LEFT JOIN RENT 100 - 101 + 47 true false @@ -1036,7 +1058,7 @@ LEFT JOIN WC_RENT 100 - 102 + 48 true false @@ -1055,7 +1077,7 @@ LEFT JOIN WC_INTEREST 100 - 103 + 49 true false @@ -1074,7 +1096,7 @@ LEFT JOIN FRAME_NUMBER 100 - 104 + 50 true false @@ -1093,7 +1115,7 @@ LEFT JOIN ENGINE_NUMBER 100 - 105 + 51 true false @@ -1112,7 +1134,7 @@ LEFT JOIN MODEL2 100 - 106 + 52 true false @@ -1131,7 +1153,7 @@ LEFT JOIN 鏄惁鏈変繚闄 100 - 107 + 53 true false @@ -1150,7 +1172,7 @@ LEFT JOIN 淇濋櫓鍏徃鍚嶇О 100 - 108 + 54 true false @@ -1169,7 +1191,83 @@ LEFT JOIN 淇濋櫓鍒版湡鏃 100 - 109 + 55 + true + + false + false + false + false + + + + + + 2c9c81b670f702ed0170f7fd7b910003 + LICENSE_PLATE_NUMBER + STRING + + + LICENSE_PLATE_NUMBER + 100 + 56 + true + + false + false + false + false + + + + + + 2c9c81b670f702ed0170f7fd7b920005 + Invoice_number + STRING + + + Invoice_number + 100 + 57 + true + + false + false + false + false + + + + + + 2c9c81b670f702ed0170f7fd7b910002 + Invoice_money + STRING + + + Invoice_money + 100 + 58 + true + + false + false + false + false + + + + + + 2c9c81b670f702ed0170f7fd7b530001 + Invoice_date + STRING + + + Invoice_date + 100 + 59 true false From 077280813126fecde72cad777b7c0e29fa6d4d7e Mon Sep 17 00:00:00 2001 From: XZW Date: Sat, 21 Mar 2020 16:15:40 +0800 Subject: [PATCH 21/89] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=BF=87=E6=BB=A4=E5=8F=96=E6=B6=88=E5=85=B3?= =?UTF-8?q?=E6=B3=A8=E7=9A=84=E7=94=A8=E6=88=B7=E7=9B=B8=E5=85=B3=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tenwa/lease/app/quartzmession/WechatMessagePush.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java b/src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java index 71295b508..899ee8135 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java @@ -92,7 +92,7 @@ public class WechatMessagePush implements Job{ int con=0; // 查询所有需要发送还款提醒的数据 - String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT('第', LRP.PLAN_LIST, '期') KEYWORD2,CONCAT(IFNULL(LRP.RENT,0)-IFNULL(LRI.RENT,0), '元') KEYWORD3 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST)LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST WHERE WUI.BINDING_STATUS = 'Y' AND WUI.ATTENTION_STATUS<>'N' AND (TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(), '%Y-%m-%d'),DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m-%d')) <= 3 AND TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(), '%Y-%m-%d'),DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m-%d')) >= 0) AND IFNULL(LRP.RENT,0)-IFNULL(LRI.RENT,0)>0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '1' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') LIMIT 0, 50000 "; + String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT('第', LRP.PLAN_LIST, '期') KEYWORD2,CONCAT(IFNULL(LRP.RENT,0)-IFNULL(LRI.RENT,0), '元') KEYWORD3 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST)LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST WHERE WUI.BINDING_STATUS = 'Y' AND IFNULL(WUI.ATTENTION_STATUS,'Y')<>'N' AND (TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(), '%Y-%m-%d'),DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m-%d')) <= 3 AND TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(), '%Y-%m-%d'),DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m-%d')) >= 0) AND IFNULL(LRP.RENT,0)-IFNULL(LRI.RENT,0)>0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '1' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') LIMIT 0, 50000 "; ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); while(rs.next()) { @@ -172,7 +172,7 @@ public class WechatMessagePush implements Job{ int con=0; // 查询所有需要发送还款提醒的数据 - String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT(ROUND((LRP.RENT + ROUND(IFNULL(getRentPenalty3(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2)) - (IFNULL(LRI.RENT, 0) + IFNULL(LRI.PENALTY, 0)),2),'元') AS KEYWORD2,CONCAT((LRP.RENT - IFNULL(LRI.RENT, 0)),'元') AS KEYWORD3,CONCAT(ROUND(IFNULL(getRentPenalty(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2),'元') AS KEYWORD4 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE,MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY FROM LC_RENT_PLAN WHERE TIMESTAMPDIFF(DAY,DATE_FORMAT(PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 3 GROUP BY CONTRACT_ID,PLAN_LIST) LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST WHERE WUI.BINDING_STATUS = 'Y' AND WUI.ATTENTION_STATUS<>'N' AND (IFNULL(LRP.RENT, 0)+ ROUND(IFNULL(getRentPenalty3(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2)- IFNULL(LRI.RENT, 0) - IFNULL(LRI.PENALTY, 0)) > 0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '2' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') ORDER BY LRP.PLAN_LIST LIMIT 0, 50000 "; + String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT(ROUND((LRP.RENT + ROUND(IFNULL(getRentPenalty3(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2)) - (IFNULL(LRI.RENT, 0) + IFNULL(LRI.PENALTY, 0)),2),'元') AS KEYWORD2,CONCAT((LRP.RENT - IFNULL(LRI.RENT, 0)),'元') AS KEYWORD3,CONCAT(ROUND(IFNULL(getRentPenalty(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2),'元') AS KEYWORD4 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE,MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY FROM LC_RENT_PLAN WHERE TIMESTAMPDIFF(DAY,DATE_FORMAT(PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 3 GROUP BY CONTRACT_ID,PLAN_LIST) LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST WHERE WUI.BINDING_STATUS = 'Y' AND IFNULL(WUI.ATTENTION_STATUS,'Y')<>'N' AND (IFNULL(LRP.RENT, 0)+ ROUND(IFNULL(getRentPenalty3(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2)- IFNULL(LRI.RENT, 0) - IFNULL(LRI.PENALTY, 0)) > 0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '2' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') ORDER BY LRP.PLAN_LIST LIMIT 0, 50000 "; ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); // 循环, 逐条发送 while(rs.next()) { From eb3a0401f37012c835250d89553b779b73595f2f Mon Sep 17 00:00:00 2001 From: XZW Date: Mon, 23 Mar 2020 16:37:20 +0800 Subject: [PATCH 22/89] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8E=A8=E9=80=81=EF=BC=8C=E8=BF=98=E6=AC=BE=E6=8F=90=E9=86=92?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=8E=89=E8=BE=89=E7=85=8C=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E8=9E=8D=E8=B5=84=E7=A7=9F=E8=B5=81=EF=BC=88=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=EF=BC=89=E6=9C=89=E9=99=90=E5=85=AC=E5=8F=B8=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=B9=B6=E5=8F=98=E6=9B=B4=E4=B8=BA=E8=B7=9D=E8=BF=98?= =?UTF-8?q?=E6=AC=BE=E6=97=A5=E6=9C=9F2=E5=A4=A9=E6=8F=90=E9=86=92?= =?UTF-8?q?=EF=BC=9B=E9=80=BE=E6=9C=9F=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=8E=89=E8=BE=89=E7=85=8C=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E8=9E=8D=E8=B5=84=E7=A7=9F=E8=B5=81=EF=BC=88=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=EF=BC=89=E6=9C=89=E9=99=90=E5=85=AC=E5=8F=B8=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tenwa/lease/app/quartzmession/WechatMessagePush.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java b/src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java index 899ee8135..c517400e2 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java @@ -92,7 +92,7 @@ public class WechatMessagePush implements Job{ int con=0; // 查询所有需要发送还款提醒的数据 - String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT('第', LRP.PLAN_LIST, '期') KEYWORD2,CONCAT(IFNULL(LRP.RENT,0)-IFNULL(LRI.RENT,0), '元') KEYWORD3 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST)LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST WHERE WUI.BINDING_STATUS = 'Y' AND IFNULL(WUI.ATTENTION_STATUS,'Y')<>'N' AND (TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(), '%Y-%m-%d'),DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m-%d')) <= 3 AND TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(), '%Y-%m-%d'),DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m-%d')) >= 0) AND IFNULL(LRP.RENT,0)-IFNULL(LRI.RENT,0)>0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '1' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') LIMIT 0, 50000 "; + String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT('第', LRP.PLAN_LIST, '期') KEYWORD2,CONCAT(IFNULL(LRP.RENT, 0) - IFNULL(LRI.RENT, 0),'元') KEYWORD3 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST WHERE WUI.BINDING_STATUS = 'Y' AND IFNULL(WUI.ATTENTION_STATUS, 'Y') <> 'N' AND DI.DISTRIBUTOR_NAME<>'辉煌国际融资租赁（天津）有限公司' AND (TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(), '%Y-%m-%d'),DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m-%d')) <= 2 AND TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(), '%Y-%m-%d'),DATE_FORMAT(LRP.PLAN_DATE, '%Y-%m-%d')) >= 0) AND IFNULL(LRP.RENT, 0) - IFNULL(LRI.RENT, 0) > 0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '1' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') LIMIT 0, 50000 "; ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); while(rs.next()) { @@ -172,7 +172,7 @@ public class WechatMessagePush implements Job{ int con=0; // 查询所有需要发送还款提醒的数据 - String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT(ROUND((LRP.RENT + ROUND(IFNULL(getRentPenalty3(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2)) - (IFNULL(LRI.RENT, 0) + IFNULL(LRI.PENALTY, 0)),2),'元') AS KEYWORD2,CONCAT((LRP.RENT - IFNULL(LRI.RENT, 0)),'元') AS KEYWORD3,CONCAT(ROUND(IFNULL(getRentPenalty(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2),'元') AS KEYWORD4 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE,MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY FROM LC_RENT_PLAN WHERE TIMESTAMPDIFF(DAY,DATE_FORMAT(PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 3 GROUP BY CONTRACT_ID,PLAN_LIST) LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST WHERE WUI.BINDING_STATUS = 'Y' AND IFNULL(WUI.ATTENTION_STATUS,'Y')<>'N' AND (IFNULL(LRP.RENT, 0)+ ROUND(IFNULL(getRentPenalty3(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2)- IFNULL(LRI.RENT, 0) - IFNULL(LRI.PENALTY, 0)) > 0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '2' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') ORDER BY LRP.PLAN_LIST LIMIT 0, 50000 "; + String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT(ROUND((LRP.RENT + ROUND(IFNULL(getRentPenalty3(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2)) - (IFNULL(LRI.RENT, 0) + IFNULL(LRI.PENALTY, 0)),2),'元') AS KEYWORD2,CONCAT((LRP.RENT - IFNULL(LRI.RENT, 0)),'元') AS KEYWORD3,CONCAT(ROUND(IFNULL(getRentPenalty(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2),'元') AS KEYWORD4 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE,MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY FROM LC_RENT_PLAN WHERE TIMESTAMPDIFF(DAY,DATE_FORMAT(PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 3 GROUP BY CONTRACT_ID,PLAN_LIST) LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST WHERE WUI.BINDING_STATUS = 'Y' AND IFNULL(WUI.ATTENTION_STATUS,'Y')<>'N' AND DI.DISTRIBUTOR_NAME<>'辉煌国际融资租赁（天津）有限公司' AND (IFNULL(LRP.RENT, 0)+ ROUND(IFNULL(getRentPenalty3(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2)- IFNULL(LRI.RENT, 0) - IFNULL(LRI.PENALTY, 0)) > 0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '2' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') ORDER BY LRP.PLAN_LIST LIMIT 0, 50000 "; ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); // 循环, 逐条发送 while(rs.next()) { From 32d881d38d0185fc038460d616ecfe06875b28f5 Mon Sep 17 00:00:00 2001 From: zhangjun Date: Mon, 23 Mar 2020 21:28:15 +0800 Subject: [PATCH 23/89] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B7=B1=E5=9C=B3?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BA=A4=E6=98=93=E5=AF=BC=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TheTradeOrderReportImportInfo.jsp | 27 ++++ .../TheTradeOrderReportImportlist.jsp | 115 ++++++++++++++++++ WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 36 +++++- .../com/tenwa/lease/comm/SZ_TRADE_ORDER.java | 112 +++++++++++++++++ .../tenwa/apzl/comm/TheTradeOrderImport.java | 82 +++++++++++++ 5 files changed, 371 insertions(+), 1 deletion(-) create mode 100644 WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportInfo.jsp create mode 100644 WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportlist.jsp create mode 100644 src_jbo/jbo/com/tenwa/lease/comm/SZ_TRADE_ORDER.java create mode 100644 src_tenwa/com/tenwa/apzl/comm/TheTradeOrderImport.java diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportInfo.jsp new file mode 100644 index 000000000..9563cacb8 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportInfo.jsp @@ -0,0 +1,27 @@ +<%@page import="com.itextpdf.text.log.SysoCounter"%> +<%@ page contentType="text/html; charset=GBK"%><%@ +include + file="/Frame/resources/include/include_begin_info.jspf"%> +<% + String sPrevUrl = CurPage.getParameter("PrevUrl"); + if(sPrevUrl == null) sPrevUrl = "/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportlist.jsp"; + String sTempletNo = "TradeOrderInfo";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + dwTemp.ReadOnly = "0";//只读模式 + dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID")); + + String sButtons[][] = { + {"true", "All", "Button", "保存","保存所有修改", "saveRecord()", "", "", "", ""}, + }; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportlist.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportlist.jsp new file mode 100644 index 000000000..50999d59f --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportlist.jsp @@ -0,0 +1,115 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%> +<% + String PG_TITLE = "深圳-交易订单"; // 浏览器窗口标题 PG_TITLE + //商用车 +%> +<% + ASObjectModel doTemp = new ASObjectModel("TradeOrderList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.MultiSelect = true; //多选 + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(30); + dwTemp.genHTMLObjectWindow(""); +%> +<%/*~END~*/%> + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%> +<% + String sButtons[][] = { + //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + //{"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"}, + {"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""}, + {"true","","Button","excel导入","excel导入","importExcel()","","","","btn_icon_import"}, + {"true","","Button","模版下载","模版下载","DiscountDownload()","","","","btn_icon_down",""}, + /* {"true","All","Button","生成租金计划","生成租金计划","createPlan()","","","","btn_icon_generate"}, + {"true","All","Button","测试拷贝","测试拷贝","copyPath()","","","","btn_icon_generate"}, */ + }; +%> +<%/*~END~*/%> +<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%> +<%@include file="/Frame/resources/include/ui/include_list.jspf"%> +<%/*~END~*/%> + +
+
+ +
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%> + +<%/*~END~*/%> +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%> + +<%/*~END~*/%> +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时，进行初始化;]~*/%> + +<%/*~END~*/%> +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 69ee7df72..2fcc83888 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -5285,7 +5285,7 @@ - + @@ -5336,6 +5336,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src_jbo/jbo/com/tenwa/lease/comm/SZ_TRADE_ORDER.java b/src_jbo/jbo/com/tenwa/lease/comm/SZ_TRADE_ORDER.java new file mode 100644 index 000000000..0160f0fa4 --- /dev/null +++ b/src_jbo/jbo/com/tenwa/lease/comm/SZ_TRADE_ORDER.java @@ -0,0 +1,112 @@ +package jbo.com.tenwa.lease.comm; + +import java.lang.String; + +/** +* 深圳交易订单报表 - JBO命名常量类

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface SZ_TRADE_ORDER{ + /** + * 深圳交易订单报表

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.com.tenwa.lease.comm.SZ_TRADE_ORDER"; + /** + * 标识 STRING(32)
+ */ + public static final String id = "id"; + /** + * 生成日期 STRING(32)
+ */ + public static final String creation_date = "creation_date"; + /** + * 总记录数 STRING(32)
+ */ + public static final String total_number_records = "total_number_records"; + /** + * 订单总金额 STRING(32)
+ */ + public static final String total_amount_order = "total_amount_order"; + /** + * 支付金额总数 STRING(32)
+ */ + public static final String Total_amount_paid = "Total_amount_paid"; + /** + * 保留域01 STRING(50)
+ */ + public static final String keep_domain_one = "keep_domain_one"; + /** + * 保留域02 STRING(50)
+ */ + public static final String keep_domain_two = "keep_domain_two"; + /** + * 支付渠道 STRING(50)
+ */ + public static final String payment_channel = "payment_channel"; + /** + * 网银订单号 STRING(50)
+ */ + public static final String Ebank_order_number = "Ebank_order_number"; + /** + * 商户订单号 STRING(50)
+ */ + public static final String merchants_order_number = "merchants_order_number"; + /** + * 交易日期 STRING(32)
+ */ + public static final String Transaction_date = "Transaction_date"; + /** + * 订单金额 STRING(32)
+ */ + public static final String order_amount = "order_amount"; + /** + * 货币名称 STRING(32)
+ */ + public static final String currency_name = "currency_name"; + /** + * 订单状态 STRING(50)
+ */ + public static final String order_type = "order_type"; + /** + * 支付金额 STRING(32)
+ */ + public static final String Pay_amount = "Pay_amount"; + /** + * 银行代码（发卡行） STRING(50)
+ */ + public static final String bank_code = "bank_code"; + /** + * 银联支付单号 STRING(50)
+ */ + public static final String Unionpay_payment_order = "Unionpay_payment_order"; + /** + * 系统流水号 STRING(50)
+ */ + public static final String System_serial_number = "System_serial_number"; + /** + * 登记人 STRING(32)
+ */ + public static final String INPUTUSERID = "INPUTUSERID"; + /** + * 登记部门 STRING(32)
+ */ + public static final String INPUTORGID = "INPUTORGID"; + /** + * 登记时间 STRING(32)
+ */ + public static final String INPUTTIME = "INPUTTIME"; + /** + * 更新人 STRING(32)
+ */ + public static final String UPDATEUSERID = "UPDATEUSERID"; + /** + * 更新部门 STRING(32)
+ */ + public static final String UPDATEORGID = "UPDATEORGID"; + /** + * 更新日期 STRING(32)
+ */ + public static final String UPDATETIME = "UPDATETIME"; +} \ No newline at end of file diff --git a/src_tenwa/com/tenwa/apzl/comm/TheTradeOrderImport.java b/src_tenwa/com/tenwa/apzl/comm/TheTradeOrderImport.java new file mode 100644 index 000000000..fcdb5467d --- /dev/null +++ b/src_tenwa/com/tenwa/apzl/comm/TheTradeOrderImport.java @@ -0,0 +1,82 @@ +package com.tenwa.apzl.comm; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.context.ASUser; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import com.tenwa.comm.exception.BusinessException; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.officetempalte.importcallback.impl.BaseImportExcelCallBack; + +public class TheTradeOrderImport extends BaseImportExcelCallBack{ + + + @Override + public void run(ASUser CurUser, BizObject importObject,Map model, Integer rowIndex, JBOTransaction tx,Transaction Sqlca) throws Exception { + } + + @Override + public void runBefore(ASUser CurUser, Map model, List importObjects, JBOTransaction tx,Transaction Sqlca) throws Exception { + Transaction Sqlca1 = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + /** + * 定义全局变量 + */ + String error=""; // 错误描述 + boolean flag=false; // 错误描述 + String Ebank_order_number=null; // 导入的网银订单号 + String merchants_order_number=null; // 导入的商户订单号 + String System_serial_number=null; // 导入的系统流水号 + String sql1=""; // 原有的数据 + /** + * 校验本次Excel是否有重复的 + */ + + /** + * 校验本次导入数据在导入表是否已有 + */ + List> list = new ArrayList>(); + Map map = new HashMap(); + List arrayList = new ArrayList(); + for(BizObject bo:importObjects){ + Ebank_order_number=bo.getAttribute("Ebank_order_number").getString(); + merchants_order_number=bo.getAttribute("merchants_order_number").getString(); + System_serial_number=bo.getAttribute("System_serial_number").getString(); + arrayList.add(Ebank_order_number); + // 通过本次excel中的数据查询导入的表, 判断是否重复 + sql1="SELECT Ebank_order_number FROM sz_trade_order WHERE Ebank_order_number='"+Ebank_order_number+"' AND merchants_order_number='"+merchants_order_number+"' AND System_serial_number='"+System_serial_number+"'"; + List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); + // 有结果集, 说明重复 + if(dataList.size()>0){ + error=",【网银订单号: "+Ebank_order_number+", 商户订单号: "+merchants_order_number+", 系统流水号 : "+System_serial_number+"】"; + flag=true; + } + } + if(flag) { + error = error.substring(1); + throw new BusinessException(error+"已存在 ！"); + } + long count = arrayList.stream().distinct().count(); + boolean isRepeat = count < arrayList.size(); + if(isRepeat){ + Set set = new HashSet<>(); + Set exist = new HashSet<>(); + for (String s : arrayList) { + if (set.contains(s)) { + exist.add(s); + } else { + set.add(s); + } + } + throw new BusinessException("，excl中的网银订单号:"+String.join(", ", exist)+"重复。"); + } + } +} From a09ec8e8caf8a8cf5500f93905303ce02b63c642 Mon Sep 17 00:00:00 2001 From: zhangjun Date: Mon, 23 Mar 2020 21:29:33 +0800 Subject: [PATCH 24/89] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportList.jsp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportList.jsp index 22239cb31..436dc3841 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportList.jsp @@ -21,7 +21,7 @@ <% String sButtons[][] = { //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, - {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"}, + //{"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"}, {"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""}, {"true","","Button","excel导入","excel导入","importExcel()","","","","btn_icon_import"}, {"true","","Button","模版下载","模版下载","DiscountDownload()","","","","btn_icon_down",""}, @@ -50,7 +50,6 @@ } function viewAndEdit(){ - var sUrl = "/Tenwa/Lease/Flow/Comm/LBImportPage/PayBillImportInfo.jsp"; var sPara = getItemValue(0,getRow(0),'ID'); if(typeof(sPara)=="undefined" || sPara.length==0 ){ @@ -62,7 +61,6 @@ //excel导入 function importExcel(){ - debugger; var importCondition={};//导入配置 importCondition["templateNo"]="8f9770f5088b487abd3f6a03d56d7dd0";//导入的模板编号必填s //增加其他配置参数 From adf65c7c9b38d05f0ba8f1d2ebce0f659d71e6ac Mon Sep 17 00:00:00 2001 From: tangfutang Date: Mon, 23 Mar 2020 22:24:56 +0800 Subject: [PATCH 25/89] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E3=80=81=E5=90=88=E5=90=8C=E5=88=B6=E4=BD=9C=E3=80=81=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=8F=98=E6=9B=B4=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E6=95=B0=E6=8D=AE=E5=B7=B2=E7=BA=AF?= =?UTF-8?q?=E5=9C=A8=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/DocList/BussinessApproveDocList.jsp | 36 ++++++++++++++++- WebContent/Tenwa/Comm/DocList/PayDocList.jsp | 4 +- .../Tenwa/Comm/Document/DocImageShow.jsp | 8 +++- .../Comm/Document/LBDocumentListInfo.jsp | 10 ++++- .../com/tenwa/doc/action/DocListAction.java | 39 +++++++++++++++++++ .../com/tenwa/apzl/comm/BillstopayImport.java | 8 ++-- 6 files changed, 97 insertions(+), 8 deletions(-) diff --git a/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp b/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp index 6184a271b..333e59745 100644 --- a/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp +++ b/WebContent/Tenwa/Comm/DocList/BussinessApproveDocList.jsp @@ -27,6 +27,26 @@ sTempletNo="FlowPayDocList"; } + + String type=CurPage.getParameter("type"); + if(type==null)type=""; + String docClassItemno=CurPage.getParameter("docList"); + + String[] itemnos=docClassItemno.split(","); + String s=""; + String classItemno =""; + for(int i=0;i0){ + s=s.substring(0, s.length()-1); + classItemno = s.replace(",", "@"); + } + if("ProjectCreditFlow".equals(sObjectType)){ + sTempletNo = "FlowPayDocList" ; + } + + String compClientID = request.getParameter("CompClientID"); ASObjectModel doTemp = new ASObjectModel(sTempletNo); @@ -40,7 +60,7 @@ dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "0"; dwTemp.setPageSize(50); - if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ + if(!"BusinessChangeFlow".equals(sObjectType) && !"BContractApproveFlow".equals(sObjectType) && !"BContractChangeFlow".equals(sObjectType) && ((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true")))){ dwTemp.ReadOnly = "1";//只读模式 RightType="ReadOnly"; isShowButton=false; @@ -53,6 +73,7 @@ sButtons=new String[][]{ {"true","","Button","保存","保存所有修改","saveRecord()","","","",""}, + {"true","","Button","批量下载","批量下载","downloadZipFile()","","","","btn_icon_down"}, }; %> @@ -191,5 +212,18 @@ function deleteFile(id){ heping(); } +function downloadZipFile(){ + var objectType="<%=sObjectType%>"; + var projectId="<%=ProjectId%>"; + var classItemnos="<%=classItemno%>"; + var sParams="projectId="+projectId+",classItemnos="+classItemnos+",objectType="+objectType; + var ids = RunJavaMethodTrans("com.tenwa.doc.action.DocListAction","changeFlowgetLibraryIds",sParams); + var filePath="<%=CurConfig.getConfigure("FileSavePath")%>"; + var param="&flowunid=<%=flowunid%>&type=<%=type%>&ids="+ids; + if(!frames["downloadTemplate"]) $("").appendTo("body"); + window.open(sWebRootPath+"/servlet/view/docFlowDownloadZipServlet?CompClientID=<%=sCompClientID%>&filePath="+filePath+param, "downloadTemplate"); + + +} <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp index 34dcdadc7..1558522a2 100644 --- a/WebContent/Tenwa/Comm/DocList/PayDocList.jsp +++ b/WebContent/Tenwa/Comm/DocList/PayDocList.jsp @@ -85,10 +85,10 @@ dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "0"; dwTemp.setPageSize(500); - if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ + if(!"BusinessApplyFlow".equals(sObjectType) && ((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true")))){ dwTemp.ReadOnly = "1";//只读模式 RightType="ReadOnly"; - isShowButton=false; + isShowButton=false; }else{ isShowButton=true; } diff --git a/WebContent/Tenwa/Comm/Document/DocImageShow.jsp b/WebContent/Tenwa/Comm/Document/DocImageShow.jsp index 53846a16d..4c2172b73 100644 --- a/WebContent/Tenwa/Comm/Document/DocImageShow.jsp +++ b/WebContent/Tenwa/Comm/Document/DocImageShow.jsp @@ -32,6 +32,12 @@ border-bottom:1px solid #BCBCBC;} if("BusinessChangeFlow".equals(sObjectType)){ String ProjectId = Sqlca.getString("SELECT proj_id FROM flow_bussiness_object WHERE flow_unid='"+flowunid+"'"); otherWhere = " and rela.proj_id='"+ProjectId+"' and (O.objecttype='"+sObjectType+"' or O.objecttype='BusinessApplyFlow')"; + }else if("BContractApproveFlow".equals(sObjectType)){ + String ProjectId = Sqlca.getString("SELECT proj_id FROM flow_bussiness_object WHERE flow_unid='"+flowunid+"'"); + otherWhere = " and rela.proj_id='"+ProjectId+"' and (O.objecttype='"+sObjectType+"' or O.objecttype='BusinessApplyFlow' or O.objecttype='BusinessChangeFlow')"; + }else if ("BContractChangeFlow".equals(sObjectType)){ + String ProjectId = Sqlca.getString("SELECT proj_id FROM flow_bussiness_object WHERE flow_unid='"+flowunid+"'"); + otherWhere = " and rela.proj_id='"+ProjectId+"' and (O.objecttype='"+sObjectType+"' or O.objecttype='BusinessApplyFlow' or O.objecttype='BusinessChangeFlow' or O.objecttype='BContractApproveFlow' )"; }else{ BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);//流程对象 otherWhere=DocListInitAction.getFlowWhere(flow,"","rela"); @@ -46,7 +52,7 @@ border-bottom:1px solid #BCBCBC;} if("query".equals(query)){ otherWhere = otherWhere+" and rela.objecttype in ('BusinessApplyFlow','FundPaymentCarFlow','MortgageFileFlow') "; }else{ - if(!"BusinessChangeFlow".equals(sObjectType)){ + if(!"BusinessChangeFlow".equals(sObjectType) && !"BContractApproveFlow".equals(sObjectType) && !"BContractChangeFlow".equals(sObjectType) ){ otherWhere = otherWhere+" and rela.objecttype='"+sObjectType+"' "; } } diff --git a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp index 9e155ffbc..7b997eaa5 100644 --- a/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp +++ b/WebContent/Tenwa/Comm/Document/LBDocumentListInfo.jsp @@ -38,6 +38,14 @@ sTempletNo="ChangeFlowLBDocumentList"; String ProjectId = Sqlca.getString("SELECT proj_id FROM flow_bussiness_object WHERE flow_unid='"+flowunid+"'"); otherWhere = " and O.proj_id='"+ProjectId+"' and (O.objecttype='"+sObjectType+"' or O.objecttype='BusinessApplyFlow')"; + }else if("BContractApproveFlow".equals(sObjectType)){ + sTempletNo="ChangeFlowLBDocumentList"; + String ProjectId = Sqlca.getString("SELECT proj_id FROM flow_bussiness_object WHERE flow_unid='"+flowunid+"'"); + otherWhere = " and O.proj_id='"+ProjectId+"' and (O.objecttype='"+sObjectType+"' or O.objecttype='BusinessApplyFlow' or O.objecttype='BusinessChangeFlow')"; + }else if("BContractChangeFlow".equals(sObjectType)){ + sTempletNo="ChangeFlowLBDocumentList"; + String ProjectId = Sqlca.getString("SELECT proj_id FROM flow_bussiness_object WHERE flow_unid='"+flowunid+"'"); + otherWhere = " and O.proj_id='"+ProjectId+"' and (O.objecttype='"+sObjectType+"' or O.objecttype='BusinessApplyFlow' or O.objecttype='BusinessChangeFlow' or O.objecttype='BContractApproveFlow' )"; }else{ BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid);//流程对象 otherWhere= otherWhere+DocListInitAction.getFlowWhere(flow,"","O"); @@ -69,7 +77,7 @@ dwTemp.genHTMLObjectWindow(sObjectType); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] =null; - if((RightType!=null&&RightType.equals("ReadOnly"))||(null!=isHistory&&isHistory.equals("true"))){ + if(!"BusinessApplyFlow".equals(sObjectType) && !"BusinessChangeFlow".equals(sObjectType) && !"BContractApproveFlow".equals(sObjectType)&& !"BContractChangeFlow".equals(sObjectType) && ((RightType!=null&&RightType.equals("ReadOnly"))||(null!=isHistory&&isHistory.equals("true")))){ RightType="ReadOnly"; sButtons=new String[][]{ }; diff --git a/src_core/com/tenwa/doc/action/DocListAction.java b/src_core/com/tenwa/doc/action/DocListAction.java index 9b3173088..6990abaff 100644 --- a/src_core/com/tenwa/doc/action/DocListAction.java +++ b/src_core/com/tenwa/doc/action/DocListAction.java @@ -214,6 +214,45 @@ public class DocListAction { return libId; } + public String changeFlowgetLibraryIds(JBOTransaction tx) throws JBOException{ + String itemnos = classItemnos.replace("@", ","); + String sql = ""; + if("BusinessChangeFlow".equals(objectType)){ + sql = "SELECT O.ID from O " + + " left join jbo.app.tenwa.doc.LB_DOCRELATIVE rela on rela.id=O.relative_Id" + + " where rela.proj_id='"+projectId+"' and ( rela.objecttype='"+objectType+"' or rela.objecttype='BusinessApplyFlow') " + + " and O.doc_Class_Itemno in ("+itemnos+")" + + " ORDER BY DOC_CLASS_ITEMNO,Serial_Num"; + }else if ("BContractApproveFlow".equals(objectType)){ + sql = "SELECT O.ID from O " + + " left join jbo.app.tenwa.doc.LB_DOCRELATIVE rela on rela.id=O.relative_Id" + + " where rela.proj_id='"+projectId+"' and ( rela.objecttype='"+objectType+"' or rela.objecttype='BusinessApplyFlow' or rela.objecttype='BusinessChangeFlow' ) " + + " and O.doc_Class_Itemno in ("+itemnos+")" + + " ORDER BY DOC_CLASS_ITEMNO,Serial_Num"; + }else if ("BContractChangeFlow".equals(objectType)){ + sql = "SELECT O.ID from O " + + " left join jbo.app.tenwa.doc.LB_DOCRELATIVE rela on rela.id=O.relative_Id" + + " where rela.proj_id='"+projectId+"' and ( rela.objecttype='"+objectType+"' or rela.objecttype='BusinessApplyFlow' or rela.objecttype='BusinessChangeFlow' or rela.objecttype='BContractApproveFlow') " + + " and O.doc_Class_Itemno in ("+itemnos+")" + + " ORDER BY DOC_CLASS_ITEMNO,Serial_Num"; + }else{ + sql = "SELECT O.ID from O " + + " left join jbo.app.tenwa.doc.LB_DOCRELATIVE rela on rela.id=O.relative_Id" + + " where rela.proj_id='"+projectId+"' and rela.objecttype='"+objectType+"'" + + " and O.doc_Class_Itemno in ("+itemnos+")" + + " ORDER BY DOC_CLASS_ITEMNO,Serial_Num"; + } + + BizObjectManager relaBm = JBOFactory + .getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME); + List rela = relaBm.createQuery(sql).getResultList(false); + String libId = ""; + for(BizObject biz : rela){ + libId += biz.getAttribute("ID").toString()+"@"; + } + libId = libId.substring(0, libId.length()-1); + return libId; + } public String getProjectId() { diff --git a/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java b/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java index 9ea733061..fe2604c95 100644 --- a/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java +++ b/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java @@ -43,6 +43,7 @@ public class BillstopayImport extends BaseImportExcelCallBack{ List> list = new ArrayList>(); Map map = new HashMap(); List arrayList = new ArrayList(); + List exclarrayList = new ArrayList(); for(BizObject bo:importObjects){ WX_order_number=bo.getAttribute("WX_order_number").getString(); arrayList.add(WX_order_number); @@ -51,13 +52,14 @@ public class BillstopayImport extends BaseImportExcelCallBack{ List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); // 有结果集, 说明重复 if(dataList.size()>0){ - error=",【微信订单号: "+WX_order_number+"】"; + //error=",【微信订单号: "+WX_order_number+"】"; + exclarrayList.add(WX_order_number); flag=true; } } if(flag) { - error = error.substring(1); - throw new BusinessException(error+"已存在 ！"); + //error = error.substring(1); + throw new BusinessException("，excl中的微信订单号:"+String.join(", ", exclarrayList)+"已存在 ！"); } long count = arrayList.stream().distinct().count(); boolean isRepeat = count < arrayList.size(); From c9491d903b0c25ef35ce39811ae1ba413de2d291 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 24 Mar 2020 19:15:21 +0800 Subject: [PATCH 26/89] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java b/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java index fe2604c95..09b7bbb64 100644 --- a/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java +++ b/src_tenwa/com/tenwa/apzl/comm/BillstopayImport.java @@ -53,7 +53,9 @@ public class BillstopayImport extends BaseImportExcelCallBack{ // 有结果集, 说明重复 if(dataList.size()>0){ //error=",【微信订单号: "+WX_order_number+"】"; - exclarrayList.add(WX_order_number); + if(! exclarrayList.contains(WX_order_number) ){ + exclarrayList.add(WX_order_number); + } flag=true; } } From 8039f99e88b465b6c6db30483113220f3a84e9ed Mon Sep 17 00:00:00 2001 From: zhangbb Date: Thu, 26 Mar 2020 14:37:38 +0800 Subject: [PATCH 27/89] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=BD=9A=E6=81=AF?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=AF=BC=E8=87=B4=E7=9A=84=E6=89=A3=E6=AC=BE?= =?UTF-8?q?=E6=A0=B8=E9=94=80=E5=87=BA=E7=8E=B0=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_sql/function/getRentPenalty.sql | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src_sql/function/getRentPenalty.sql b/src_sql/function/getRentPenalty.sql index 8a7888170..dfe4099a2 100644 --- a/src_sql/function/getRentPenalty.sql +++ b/src_sql/function/getRentPenalty.sql @@ -1,4 +1,10 @@ -create function getRentPenalty(r_payment_number varchar(40), r_plan_list varchar(40), calc_date varchar(40)) returns varchar(200) +DELIMITER $$ + +USE `apzl`$$ + +DROP FUNCTION IF EXISTS `getRentPenalty`$$ + +CREATE DEFINER=`apzl`@`%` FUNCTION `getRentPenalty`(r_payment_number VARCHAR(40),r_plan_list VARCHAR(40),calc_date VARCHAR(40)) RETURNS VARCHAR(200) CHARSET gbk RETURN ( SELECT ROUND(MAX(te.rpenalty)+SUM(te.ipenalty)+SUM(te.tpenalty),2) FROM( SELECT lrp.ID,lrp.PLAN_LIST,lccs.payment_number, @@ -7,12 +13,11 @@ CASE WHEN (STR_TO_DATE(lrp.PLAN_DATE,'%Y/%m/%d')+c.attr_value)<=STR_TO_DATE(lri. CASE WHEN (STR_TO_DATE(lrp.PLAN_DATE,'%Y/%m/%d')+c.attr_value)<=STR_TO_DATE(lrit.hire_date,'%Y/%m/%d') THEN lcc.PENA_RATE/10000*(DATEDIFF(STR_TO_DATE(IF(STR_TO_DATE(lrit.hire_date,'%Y/%m/%d')>STR_TO_DATE(calc_date,'%Y/%m/%d'),calc_date,lrit.hire_date),'%Y/%m/%d'),STR_TO_DATE(lrp.PLAN_DATE,'%Y/%m/%d')))*IFNULL(lrit.rent,0) ELSE 0 END tpenalty FROM (SELECT * FROM lc_calc_condition_status WHERE PAYMENT_NUMBER=r_payment_number) lccs LEFT JOIN lc_calc_condition lcc ON lcc.PAYMENT_NUMBER=lccs.PAYMENT_NUMBER -LEFT JOIN CONFIGURATE c ON 1=1 AND c.attr_id='鍏嶇綒鎭ぉ鏁伴厤缃' AND c.field1='姹借溅' +LEFT JOIN CONFIGURATE c ON 1=1 AND c.attr_id='免罚息天数配置' AND c.field1='汽车' LEFT JOIN lc_rent_plan lrp ON lrp.PAYMENT_NUMBER=lccs.PAYMENT_NUMBER AND LRP.PAYMENT_NUMBER=r_payment_number -LEFT JOIN (SELECT * FROM lc_rent_income WHERE hire_date Date: Thu, 26 Mar 2020 18:36:08 +0800 Subject: [PATCH 28/89] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenwa/lease/app/quartzmession/SaveReportHistoryData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/SaveReportHistoryData.java b/src_tenwa/com/tenwa/lease/app/quartzmession/SaveReportHistoryData.java index c2b88e757..9c694881a 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/SaveReportHistoryData.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/SaveReportHistoryData.java @@ -90,7 +90,7 @@ public class SaveReportHistoryData implements Job { ARE.getLog().info("report history copy success ........"); QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.SaveReportHistoryData", "success", "成功", curUserId); } catch (Exception e) { - ARE.getLog().info("report history copy error ........",e); + ARE.getLog().info("report history table ["+tableEnName+"] copy error ........",e); QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.SaveReportHistoryData", "error", "失败", curUserId); try { conn.rollback(); From e74bbba875cbff3bdc9c6726dd106c7cc02f76f7 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Fri, 27 Mar 2020 18:36:03 +0800 Subject: [PATCH 29/89] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=BD=91=E9=93=B6?= =?UTF-8?q?=E6=94=B6=E6=AC=BE=E6=97=B6=EF=BC=8C=E5=BC=B9=E5=87=BA=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96=EF=BC=8C=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=8C=89=E6=9C=80=E6=96=B0=E9=87=91=E9=A2=9D=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=AF=BC=E8=87=B4=E7=BD=9A=E6=81=AF=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E9=94=99=E8=AF=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tenwa/flow/rent/rentincome/RentIncomeMethod.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java b/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java index 5e9d09fe7..ffe37f12b 100644 --- a/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java +++ b/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java @@ -336,7 +336,13 @@ public class RentIncomeMethod { BizObject bo = JBOFactory.getBizObjectManager(VI_LC_RENT_PLAN.CLASS_NAME).createQuery("id=:planID").setParameter("planID", ids[i]).getSingleResult(false); String corpusOver = bo.getAttribute("corpus_over").getString(); String interestOver = bo.getAttribute("interest_over").getString(); - String penaltyOver = bo.getAttribute("penalty_over").getString(); + // String penaltyOver = bo.getAttribute("penalty_over").getString(); + String factPenalty = bo.getAttribute("fact_penalty").getString(); + String penaltyAdjust = bo.getAttribute("penalty_adjust").getString(); + String penalty = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME) + .createQuery("select v.round(v.getRentPenalty('"+bo.getAttribute("payment_number").getString()+"','"+bo.getAttribute("plan_list").getString()+"','"+factDate+"'),2) as v.penalty from O").getSingleResult(false).getAttribute("penalty").getString(); + String penaltyOver = new BigDecimal(penalty).subtract(new BigDecimal(factPenalty)).subtract(new BigDecimal(penaltyAdjust)).toString(); + if("penalty_income".equals(penaltyRule)){ penaltyOver = "0.00"; }else{ From 0b7d8724a42d03556e6ff10008e82eb0b0c4b256 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 27 Mar 2020 21:51:28 +0800 Subject: [PATCH 30/89] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BD=9A=E6=81=AF?= =?UTF-8?q?=E5=87=8F=E5=85=8D=E7=94=B3=E8=AF=B7=E9=80=89=E6=8B=A9=E5=90=88?= =?UTF-8?q?=E5=90=8C=E6=85=A2=E3=80=81=E5=AE=9E=E9=99=85=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9C=AC=E6=AC=A1=E4=BB=98=E6=AC=BE=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=B7=BB=E5=8A=A0=E5=B0=8F=E8=AE=A1=E3=80=81=E6=B8=A0?= =?UTF-8?q?=E9=81=93=E5=95=86=E4=BF=9D=E8=AF=81=E9=87=91=E4=BB=A3=E5=81=BF?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql | 21 +++++++++++++++++++++ 鎶ヨ〃/姹借溅绫绘姤琛ㄤ竴/娓犻亾鍟嗕繚璇侀噾浠ｅ伩绾㈠啿.xml | 17 +++++++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql index a745d127a..c2a21dec8 100644 --- a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql +++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql @@ -164,5 +164,26 @@ INSERT INTO SCENARIO_RELATIVE (scenarioid,groupid,modelid) VALUES (' insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('审批流程','罚息减免流程判断大于100元','Bizlet','罚息减免流程判断大于100元','String','String ObjectNo','com.tenwa.lease.flow.project.businessapply.JudgmentPenaltyAdjustMoneyGreater','','','','','',''); insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('审批流程','罚息减免流程判断小于等于100元','Bizlet','罚息减免流程判断小于等于100元','String','String ObjectNo','com.tenwa.lease.flow.project.businessapply.JudgmentPenaltyAdjustMoneyLess','','','','','',''); +-- 罚息减免申请流程选择合同优化 +DELETE FROM SELECT_CATALOG WHERE selname='SelectPaymentHavePenalty'; +INSERT INTO SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) VALUES ('SelectPaymentHavePenalty','Sql','查询已产生罚息的投放','LB_CONTRACT_INFO','ID','Grid','String businessType','id,project_id,product_id,PROJECT_NAME,PAYMENT_NUMBER,itemname','select lci.contract_number,lci.id,lci.project_id,lci.product_id,lci.PROJECT_NAME,lccs.PAYMENT_NUMBER,vlrp.rentover,vlrp.penaltyover,lul.customername,cl.itemname,ui.username,oi.orgname,lcs.STATUS_NAME from lb_contract_info lci left join lc_calc_condition_status lccs on lccs.contract_id = lci.id left join (select payment_number,sum(rent_over) rentover,sum(penalty_over) penaltyover from ( +SELECT lcf.PAYMENT_NUMBER AS payment_number, +(lcf.RENT - (IFNULL(lcfd.rent,0) + IFNULL(lcfi.rent,0))) AS rent_over, + ROUND((getRentPenalty(lcf.PAYMENT_NUMBER,lcf.PLAN_LIST,DATE_FORMAT(NOW(),''%Y/%m/%d'')) - ((IFNULL(lcfd.penalty,0) + IFNULL(lcfi.penalty,0)) + (IFNULL(lcfd.penalty_adjust,0) + IFNULL(lcfi.penalty_adjust,0)))),2) AS penalty_over +FROM lc_rent_plan lcf +LEFT JOIN lb_contract_info lbc ON lcf.CONTRACT_ID = lbc.ID +LEFT JOIN lc_rent_income_transfer lcfd ON lcf.PAYMENT_NUMBER = lcfd.payment_number AND lcf.PLAN_LIST = lcfd.plan_list +LEFT JOIN lc_rent_income_temp_transfer lcfi ON lcf.PAYMENT_NUMBER = lcfi.payment_number AND lcf.PLAN_LIST = lcfi.plan_list +WHERE plan_date0 group by payment_number) vlrp on vlrp.payment_number = lccs.payment_number left join (select lu.contract_id,ci.customerid,ci.customername from LB_UNIon_LESSEE lu,CUSTOMER_INFO ci where lu.CUSTOMER_ID = ci.customerid and is_main = ''y'') as lul on lul.ConTRACT_ID = lci.id left join user_info ui on ui.userid = lci.PROJECT_MANAGE left join org_info oi on oi.orgid = lci.PROJECT_DEPT left join lb_contract_status lcs on lcs.STATUS_CODE = lccs.plan_status left join code_library cl on cl.itemno = lci.PROJECT_INDUSTRY and cl.codeno = ''cust_kind'' where lci.businesstype = ''#businessType'' and lccs.PLAN_STATUS = ''31'' and vlrp.penaltyover > 0 and lccs.PAYMENT_NUMBER not in (select payment_number from lc_occupy_rent_list where flow_name not in(''网银收款'',''保证金抵扣流程'',''罚息减免流程''))','业务合同号,合同编号,项目编号,产品编号,项目名称,投放编号,租金余额,罚息余额,承租人,内部行业,经销商SP,经销商,投放状态','','id@product_id@project_id@PROJECT_NAME@PAYMENT_NUMBER@contract_number','contract_number,orgname,customername','1','Single','rentover@3@penaltyover@3','','penaltyover@2@rentover@2','','contract_number@ @ @Contains@orgname@ @ @Contains@customername@ @ @Contains','SYS_Designer','','2017/06/26 08:37:31','SYS_Designer','2020/03/25 11:49:16',''); +-- 实际付款流程本次付款明细添加小计 +DELETE FROM awe_do_library WHERE dono='ActualPaymentCarTempList' AND colindex='1030'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('ActualPaymentCarTempList','1030','1030','1','lcct','CLEAN_LEASE_MONEY','CLEAN_LEASE_MONEY','Number','','融资额','','2','Text','2','3','','','','22','1','1','0','1','0',0,'','','','SYS_Designer','2018/07/04 21:02:50','SYS_Designer','2020/03/27 09:49:35','0','','1','','','',''); +DELETE FROM awe_do_library WHERE dono='ActualPaymentCarTempList' AND colindex='1033'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('ActualPaymentCarTempList','1033','1033','1','lcct','HANDLING_CHARGE_MONEY','HANDLING_CHARGE_MONEY','Number','','手续费','','2','Text','2','3','','','','22','1','1','0','1','0',0,'','','','SYS_Designer','2018/07/12 20:51:58','SYS_Designer','2020/03/27 09:49:00','0','','1','','','',''); +DELETE FROM awe_do_library WHERE dono='ActualPaymentCarTempList' AND colindex='1035'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('ActualPaymentCarTempList','1035','1035','1','lcct','CAUTION_MONEY','CAUTION_MONEY','Number','','保证金','','2','Text','2','3','','','','20','1','1','0','1','0',1,'','','','','','SYS_Designer','2020/03/27 09:49:00','0','','0','','','',''); +DELETE FROM awe_do_library WHERE dono='ActualPaymentCarTempList' AND colindex='1480'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('ActualPaymentCarTempList','1480','1037','1','lcct','GPS_FEE','GPS_FEE','Number','','GPS安装服务费','','2','Text','2','3','','','',NULL,'1','1','0','1','0',0,'','','','SYS_Designer','2018/08/15 14:15:59','SYS_Designer','2020/03/27 09:51:21','0','','1','','','',''); diff --git a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ竴/娓犻亾鍟嗕繚璇侀噾浠ｅ伩绾㈠啿.xml b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ竴/娓犻亾鍟嗕繚璇侀噾浠ｅ伩绾㈠啿.xml index 540a74538..13c66da2f 100644 --- a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ竴/娓犻亾鍟嗕繚璇侀噾浠ｅ伩绾㈠啿.xml +++ b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ竴/娓犻亾鍟嗕繚璇侀噾浠ｅ伩绾㈠啿.xml @@ -35,7 +35,20 @@ distributor_repay_back 2c9023815726a036015726a496b00001 SIMPLESQL - SELECT di.distributor_name,lci.contract_no,lul.customer_name,lrp.plan_list,LEFT(O.INPUTTIME,10) AS rinputtime,lrp.rent,ddi.caution_money AS dcaution_money,lrp.PENALTY,O.caution_money,LEFT(lri.hire_date,10) AS + select tt.distributor_name, + tt.contract_no, + tt.customer_name, + tt.plan_list, + tt.rinputtime, + tt.rent, + tt.dcaution_money, + tt.PENALTY, + tt.caution_money, + tt.dinputtime, + tt.income_money, + tt.lripenalty, + tt.back as back from +(SELECT di.distributor_name,lci.contract_no,lul.customer_name,lrp.plan_list,LEFT(O.INPUTTIME,10) AS rinputtime,lrp.rent,ddi.caution_money AS dcaution_money,lrp.PENALTY,O.caution_money,LEFT(lri.hire_date,10) AS dinputtime,lri.income_money,lri.penalty AS lripenalty,IF(ddi.caution_money=O.caution_money,'宸茬孩鍐','鏈孩鍐') AS back FROM D_DEPOSITRETURN_INFO O LEFT JOIN lc_rent_plan lrp ON O.rent_plan_id=lrp.id @@ -44,7 +57,7 @@ LEFT JOIN (SELECT SUM(caution_money) AS caution_money,rent_plan_id,inputtime FRO LEFT JOIN distributor_info di ON di.distributor_no=O.distributor_id LEFT JOIN lb_union_lessee lul ON lul.contract_id=lrp.contract_id LEFT JOIN (SELECT SUM(rent+penalty) AS income_money,plan_id,penalty,MAX(hire_date) AS hire_date FROM lc_rent_income GROUP BY plan_id) lri ON lri.plan_id=lrp.id -WHERE O.money_type='bondRepay' +WHERE O.money_type='bondRepay' ) tt where 1=1 From 8582a32882f7ce0d14d15b62d43742b0de5f5077 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Mon, 30 Mar 2020 11:23:03 +0800 Subject: [PATCH 31/89] =?UTF-8?q?=E7=BD=9A=E6=81=AF=E5=87=8F=E5=85=8D?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B7=BB=E5=8A=A0=E9=80=89=E6=8B=A9=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E8=A7=A6=E5=8F=91=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LCRentIncomeTempReductionList.jsp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp index 8f19f4c7f..7c990150a 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp @@ -88,5 +88,17 @@ return; } } + + function test(datelist){ + console.log("选择的日期："+datelist); + } + $(function(){ + for (var i=0;i <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file From b0474472bbc78574d248070ac0f675afcfef3e36 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Mon, 30 Mar 2020 17:24:27 +0800 Subject: [PATCH 32/89] =?UTF-8?q?1.=E7=BD=9A=E6=81=AF=E5=87=8F=E5=85=8D?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=98=8E=E7=BB=86=E9=87=8C=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=94=B9=E5=8F=98=EF=BC=8C=E7=BD=9A=E6=81=AF=E9=9A=8F=E4=B9=8B?= =?UTF-8?q?=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Lease/Flow/Fund/FundCollection/GetPenalty.jsp | 15 +++++++++++++++ .../LCRentIncomeTempReductionList.jsp | 13 ++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 WebContent/Tenwa/Lease/Flow/Fund/FundCollection/GetPenalty.jsp diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/GetPenalty.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/GetPenalty.jsp new file mode 100644 index 000000000..5c31cf036 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/GetPenalty.jsp @@ -0,0 +1,15 @@ +<%@page import="jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO"%> +<%@page import="com.amarsoft.are.jbo.JBOTransaction"%> +<%@page import="com.amarsoft.are.jbo.BizObject"%> +<%@page import="com.amarsoft.are.jbo.JBOFactory"%> +<%@page import="java.math.BigDecimal"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/IncludeBeginMDAJAX.jsp"%><% + String PAYMENT_NUMBER = CurPage.getParameter("PAYMENT_NUMBER"); + String PLAN_LIST = CurPage.getParameter("PLAN_LIST"); + String HIRE_DATE = CurPage.getParameter("HIRE_DATE"); + String penalty = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME) + .createQuery("select v.round(v.ifnull(v.getRentPenalty('"+PAYMENT_NUMBER+"','"+PLAN_LIST+"','"+HIRE_DATE+"'),0),2) as v.penalty from O").getSingleResult(false).getAttribute("penalty").getString(); + + out.println(penalty); +%><%@ include file="/IncludeEndAJAX.jsp"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp index 7c990150a..7f58c5041 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp @@ -89,13 +89,20 @@ } } - function test(datelist){ - console.log("选择的日期："+datelist); + function changePenalty(datelist){ + debugger; + var PAYMENT_NUMBER = getCurrentItemValue("PAYMENT_NUMBER"); + var PLAN_LIST = getCurrentItemValue("PLAN_LIST"); + var HIRE_DATE = datelist; + + var penalty = AsControl.RunJsp("/Tenwa/Lease/Flow/Fund/FundCollection/GetPenalty.jsp","PAYMENT_NUMBER="+PAYMENT_NUMBER+"&PLAN_LIST="+PLAN_LIST+"&HIRE_DATE="+HIRE_DATE); + alert(penalty); + setItemValue(0, getRow(0), "PENALTY_ADJUST", penalty); } $(function(){ for (var i=0;i Date: Mon, 30 Mar 2020 21:50:30 +0800 Subject: [PATCH 33/89] =?UTF-8?q?1.=E5=8E=BB=E6=8E=89=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp | 1 - 1 file changed, 1 deletion(-) diff --git a/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp index 7f58c5041..eabbe3b7a 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp @@ -96,7 +96,6 @@ var HIRE_DATE = datelist; var penalty = AsControl.RunJsp("/Tenwa/Lease/Flow/Fund/FundCollection/GetPenalty.jsp","PAYMENT_NUMBER="+PAYMENT_NUMBER+"&PLAN_LIST="+PLAN_LIST+"&HIRE_DATE="+HIRE_DATE); - alert(penalty); setItemValue(0, getRow(0), "PENALTY_ADJUST", penalty); } $(function(){ From fbce1102369ad16afef5ccd4ce959bb3acc57d50 Mon Sep 17 00:00:00 2001 From: zhangjun Date: Tue, 31 Mar 2020 14:25:09 +0800 Subject: [PATCH 34/89] =?UTF-8?q?=E9=82=AE=E5=AF=84=E6=9F=9C=E5=8F=B7?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FileInformationImportInfo.jsp | 27 +++++ .../FileInformationImportList.jsp | 112 ++++++++++++++++++ .../comm/MailingContainerNumberImport.java | 78 ++++++++++++ 3 files changed, 217 insertions(+) create mode 100644 WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportInfo.jsp create mode 100644 WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp create mode 100644 src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportInfo.jsp new file mode 100644 index 000000000..2a9bed97d --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportInfo.jsp @@ -0,0 +1,27 @@ +<%@page import="com.itextpdf.text.log.SysoCounter"%> +<%@ page contentType="text/html; charset=GBK"%><%@ +include + file="/Frame/resources/include/include_begin_info.jspf"%> +<% + String sPrevUrl = CurPage.getParameter("PrevUrl"); + if(sPrevUrl == null) sPrevUrl = "/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp"; + String sTempletNo = "FilingCabinetinfo";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + dwTemp.ReadOnly = "0";//只读模式 + dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID")); + + String sButtons[][] = { + {"true", "All", "Button", "保存","保存所有修改", "saveRecord()", "", "", "", ""}, + }; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp new file mode 100644 index 000000000..36a76d85a --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp @@ -0,0 +1,112 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%> +<% + String PG_TITLE = "邮寄柜号导入"; // 浏览器窗口标题 PG_TITLE +%> +<% + ASObjectModel doTemp = new ASObjectModel("FilingCabinetlist"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.MultiSelect = true; //多选 + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(30); + dwTemp.genHTMLObjectWindow(""); +%> +<%/*~END~*/%> + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%> +<% + String sButtons[][] = { + //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"}, + //{"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""}, + //{"true","","Button","excel导入","excel导入","importExcel()","","","","btn_icon_import"}, + //{"true","","Button","模版下载","模版下载","DiscountDownload()","","","","btn_icon_down",""}, + }; +%> +<%/*~END~*/%> +<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%> +<%@include file="/Frame/resources/include/ui/include_list.jspf"%> +<%/*~END~*/%> + +
+
+ +
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%> + +<%/*~END~*/%> +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%> + +<%/*~END~*/%> +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时，进行初始化;]~*/%> + +<%/*~END~*/%> +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java b/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java new file mode 100644 index 000000000..8026a30d0 --- /dev/null +++ b/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java @@ -0,0 +1,78 @@ +package com.tenwa.apzl.comm; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.context.ASUser; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import com.tenwa.comm.exception.BusinessException; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.officetempalte.importcallback.impl.BaseImportExcelCallBack; + +public class MailingContainerNumberImport extends BaseImportExcelCallBack{ + + + @Override + public void run(ASUser CurUser, BizObject importObject,Map model, Integer rowIndex, JBOTransaction tx,Transaction Sqlca) throws Exception { + } + + @Override + public void runBefore(ASUser CurUser, Map model, List importObjects, JBOTransaction tx,Transaction Sqlca) throws Exception { + Transaction Sqlca1 = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + /** + * 定义全局变量 + */ + String error=""; // 错误描述 + boolean flag=false; // 错误描述 + String ARCHIVING_CABINET_NO=null; // 导入的邮寄柜号 + String sql1=""; // 原有的数据 + /** + * 校验本次Excel是否有重复的 + */ + + /** + * 校验本次导入数据在导入表是否已有 + */ + List> list = new ArrayList>(); + Map map = new HashMap(); + List arrayList = new ArrayList(); + for(BizObject bo:importObjects){ + ARCHIVING_CABINET_NO=bo.getAttribute("ARCHIVING_CABINET_NO").getString(); + arrayList.add(ARCHIVING_CABINET_NO); + // 通过本次excel中的数据查询导入的表, 判断是否重复 + sql1="SELECT ARCHIVING_CABINET_NO FROM LB_FILE_MAILARCHIVING_INFO WHERE ARCHIVING_CABINET_NO='"+ARCHIVING_CABINET_NO+"'"; + List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); + // 有结果集, 说明重复 + if(dataList.size()>0){ + error=",【邮寄柜号: "+ARCHIVING_CABINET_NO+"】"; + flag=true; + } + } + if(flag) { + error = error.substring(1); + throw new BusinessException(error+"已存在 ！"); + } + long count = arrayList.stream().distinct().count(); + boolean isRepeat = count < arrayList.size(); + if(isRepeat){ + Set set = new HashSet<>(); + Set exist = new HashSet<>(); + for (String s : arrayList) { + if (set.contains(s)) { + exist.add(s); + } else { + set.add(s); + } + } + throw new BusinessException("，excl中的邮寄柜号:"+String.join(", ", exist)+"重复。"); + } + } +} From 6dfcbb00f5552790d71d509f30b13e5abca522a0 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 1 Apr 2020 19:03:46 +0800 Subject: [PATCH 35/89] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=EF=BC=88=E5=BC=A0=E7=A3=8A=EF=BC=89=E4=BF=AE=E6=94=B9=E5=86=85?= =?UTF-8?q?=E5=AE=B9=EF=BC=88=E6=B7=BB=E5=8A=A0=E7=9B=B4=E7=A7=9F=E5=90=88?= =?UTF-8?q?=E5=90=8C=E6=A8=A1=E6=9D=BF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java index 08b26abda..d4802357c 100644 --- a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java +++ b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java @@ -165,6 +165,8 @@ public class FileTemplateUtil { return "[{'fileTemplate':\""+"[{'text':'大通售后回租模板','value':'25b9e9440c574f89bccfdf148b12128d'}]"+"\"}]"; }else if("XSHZ".equals(operationType)){ return "[{'fileTemplate':\""+"[{'text':'BJ90形式售后回租','value':'8cd356fdc57d442fae1aac56f5ba084f'}]"+"\"}]"; + }else if("CDZZ".equals(operationType)){ + return "[{'fileTemplate':\""+"[{'text':'C端直租','value':'59f109e144c347d1b0d61da63a4fe822'}]"+"\"}]"; }else{ if("01".equals(leasform)){ return "[{'fileTemplate':\""+"[{'text':'合同（直租）','value':'333cd5b36cd846938e618516ba9c8cbb'}]"+"\"}]"; From b49bce6e144b674b8fce8eee00fabbba98ed644e Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 1 Apr 2020 20:02:11 +0800 Subject: [PATCH 36/89] =?UTF-8?q?=E7=BD=9A=E6=81=AF=E5=87=8F=E5=85=8D?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=92=8C=E6=8F=90=E5=89=8D=E7=BB=93=E6=B8=85?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContractTerminateApplyList.jsp | 2 +- src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql | 59 +++++++++++++++++-- .../AdvanceSettleMoneyGreaterHundred.java | 28 +++++++++ .../AdvanceSettleMoneyLessHundred.java | 28 +++++++++ 4 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 src_tenwa/com/tenwa/lease/flow/project/businessapply/AdvanceSettleMoneyGreaterHundred.java create mode 100644 src_tenwa/com/tenwa/lease/flow/project/businessapply/AdvanceSettleMoneyLessHundred.java diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp index d223d2691..6fb3a059c 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp @@ -5,7 +5,7 @@ /*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/ function newApply() { - AsDialog.OpenSelector("selectContractPaymentPlanTerminate","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + AsDialog.OpenSelector("selectContractPaymentPlanTerminate","businessType,1","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){ //alert(getHtmlMessage('1'));//请选择一条信息！ return; diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql index c2a21dec8..8e1976fe8 100644 --- a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql +++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql @@ -160,10 +160,6 @@ insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phased INSERT INTO SCENARIO_MODEL (scenarioid,modelid,sortno,modelname,modeldescribe,modeltype,subtypeno,runcondition,STATUS,nopassdeal,passdeal,passmessage,nopassmessage,executescript,remark,inputuser,inputorg,inputtime,updateuser,updatetime,groupid,modelkind,bizviewer) VALUES ('付款申请(汽车)','0040','0040','发票信息是否填写','','20','','','1','10',NULL,'发票信息已填写','请先填写发票信息','SELECT CASE WHEN id IS NOT NULL THEN ''true'' ELSE ''false'' END FROM lb_Invoice_info_temp WHERE flow_unid=''#{ObjectNo}''','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); INSERT INTO SCENARIO_RELATIVE (scenarioid,groupid,modelid) VALUES ('付款申请(汽车)','0020','0040'); --- 添加罚息减免判断条件方法 -insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('审批流程','罚息减免流程判断大于100元','Bizlet','罚息减免流程判断大于100元','String','String ObjectNo','com.tenwa.lease.flow.project.businessapply.JudgmentPenaltyAdjustMoneyGreater','','','','','',''); -insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('审批流程','罚息减免流程判断小于等于100元','Bizlet','罚息减免流程判断小于等于100元','String','String ObjectNo','com.tenwa.lease.flow.project.businessapply.JudgmentPenaltyAdjustMoneyLess','','','','','',''); - -- 罚息减免申请流程选择合同优化 DELETE FROM SELECT_CATALOG WHERE selname='SelectPaymentHavePenalty'; INSERT INTO SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) VALUES ('SelectPaymentHavePenalty','Sql','查询已产生罚息的投放','LB_CONTRACT_INFO','ID','Grid','String businessType','id,project_id,product_id,PROJECT_NAME,PAYMENT_NUMBER,itemname','select lci.contract_number,lci.id,lci.project_id,lci.product_id,lci.PROJECT_NAME,lccs.PAYMENT_NUMBER,vlrp.rentover,vlrp.penaltyover,lul.customername,cl.itemname,ui.username,oi.orgname,lcs.STATUS_NAME from lb_contract_info lci left join lc_calc_condition_status lccs on lccs.contract_id = lci.id left join (select payment_number,sum(rent_over) rentover,sum(penalty_over) penaltyover from ( @@ -187,3 +183,58 @@ INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualn DELETE FROM awe_do_library WHERE dono='ActualPaymentCarTempList' AND colindex='1480'; INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('ActualPaymentCarTempList','1480','1037','1','lcct','GPS_FEE','GPS_FEE','Number','','GPS安装服务费','','2','Text','2','3','','','',NULL,'1','1','0','1','0',0,'','','','SYS_Designer','2018/08/15 14:15:59','SYS_Designer','2020/03/27 09:51:21','0','','1','','','',''); +-- 添加罚息减免判断条件方法 +insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('审批流程','罚息减免流程判断大于100元','Bizlet','罚息减免流程判断大于100元','String','String ObjectNo','com.tenwa.lease.flow.project.businessapply.JudgmentPenaltyAdjustMoneyGreater','','','','','',''); +insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('审批流程','罚息减免流程判断小于等于100元','Bizlet','罚息减免流程判断小于等于100元','String','String ObjectNo','com.tenwa.lease.flow.project.businessapply.JudgmentPenaltyAdjustMoneyLess','','','','','',''); + +-- 添加提请结清最终金额和还款金额差小于等于100方法 +insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('审批流程','提请结清最终金额和还款金额差小于等于100','Bizlet','提前结清最终金额和还款金额差小于等于100','String','String ObjectNo','com.tenwa.lease.flow.project.businessapply.AdvanceSettleMoneyLessHundred','','','','','',''); +-- 添加提请结清最终金额和还款金额差大于100方法 +insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('审批流程','提请结清最终金额和还款金额差大于100','Bizlet','提前结清最终金额和还款金额差大于100','String','String ObjectNo','com.tenwa.lease.flow.project.businessapply.AdvanceSettleMoneyGreaterHundred','','','','','',''); + +-- 修改罚息减免流程 +delete from FLOW_CATALOG where flowno='PenaltyReductionFlow'; +insert into `FLOW_CATALOG` (`flowno`, `flowname`, `flowtype`, `flowdescribe`, `initphase`, `aaenabled`, `aapolicy`, `viewfile`, `viewfilelength`, `grouptitles`, `metaflowno`, `isinuse`, `version`, `baseflowno`, `baseflowname`, `graphjsondata`, `flowstate`) values('PenaltyReductionFlow','罚息减免','PenaltyReductionApply',NULL,'0010',NULL,NULL,NULL,NULL,NULL,NULL,'1','1','PenaltyReductionFlow',NULL,'{states:{rect1:{type:\'start\',text:{text:\'开始\'}, attr:{ x:270, y:39, width:50, height:50}, props:{text:{value:\'开始\'},key:{value:\'c940405c327a6520ea2e954fae342926\'},position:{value:\'0000\'}}},rect2:{type:\'task\',text:{text:\'回款初审\'}, attr:{ x:241, y:141, width:109, height:48}, props:{text:{value:\'回款初审\'},key:{value:\'d34a2a66fe9ae0746c3790a2aff9becb\'},position:{value:\'0010\'}}},rect3:{type:\'end\',text:{text:\'通过\'}, attr:{ x:153, y:783, width:50, height:50}, props:{text:{value:\'通过\'},key:{value:\'05661eeae597e1b0bdd8226adf21dcc6\'},position:{value:\'1000\'}}},rect4:{type:\'reject\',text:{text:\'否决\'}, attr:{ x:383, y:772, width:50, height:50}, props:{text:{value:\'否决\'},key:{value:\'208282d7bee4d98304858f6e6e5e5f5a\'},position:{value:\'8000\'}}},rect5:{type:\'task\',text:{text:\'汽车业务部总监\'}, attr:{ x:128, y:482, width:100, height:50}, props:{text:{value:\'汽车业务部总监\'},key:{value:\'be0bec090237c844c77e03b4838003f3\'},position:{value:\'0030\'}}},rect6:{type:\'task\',text:{text:\'回款复审\'}, attr:{ x:248, y:233, width:100, height:50}, props:{text:{value:\'回款复审\'},key:{value:\'14e4d20871eea2af1f33387d90c0ba62\'},position:{value:\'0020\'}}},rect7:{type:\'task\',text:{text:\'总经理\'}, attr:{ x:352, y:571, width:100, height:50}, props:{text:{value:\'总经理\'},key:{value:\'c396ac830747591cbad249f7aa2b851d\'},position:{value:\'0050\'}}},rect18:{type:\'exclusive\',text:{text:\'条件\'}, attr:{ x:269, y:326, width:50, height:50}, props:{text:{value:\'条件\'},key:{value:\'e377947ebeec8aaecdeaea795900a78b\'},position:{value:\'\'}}},rect19:{type:\'task\',text:{text:\'汽车业务部总监\'}, attr:{ x:352, y:431, width:100, height:50}, props:{text:{value:\'汽车业务部总监\'},key:{value:\'b70b18db5f792148bf74285a4114b88e\'},position:{value:\'0040\'}}}},paths:{path9:{from:\'rect1\',to:\'rect2\', dots:[],text:{text:\'TO 回款初审\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path10:{from:\'rect2\',to:\'rect6\', dots:[],text:{text:\'TO 回款复审\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path15:{from:\'rect7\',to:\'rect4\', dots:[],text:{text:\'TO 否决\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path17:{from:\'rect7\',to:\'rect3\', dots:[],text:{text:\'TO 通过\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path20:{from:\'rect6\',to:\'rect18\', dots:[],text:{text:\'TO 条件\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path21:{from:\'rect18\',to:\'rect19\', dots:[],text:{text:\'TO 任务\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path22:{from:\'rect19\',to:\'rect7\', dots:[],text:{text:\'TO 总经理\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path23:{from:\'rect18\',to:\'rect5\', dots:[],text:{text:\'TO 汽车业务部总监\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path24:{from:\'rect5\',to:\'rect3\', dots:[],text:{text:\'TO 通过\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path25:{from:\'rect5\',to:\'rect4\', dots:[],text:{text:\'TO 否决\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}}},props:{props:{}}}','synchronized'); +delete from FLOW_MODEL where flowno='PenaltyReductionFlow'; +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('PenaltyReductionFlow','0010','1010','回款初审',NULL,NULL,'!基础操作.合同信息正式到临时(#ObjectNo)','{#UserID}',NULL,'commroute',NULL,'[{usertype:\"指定角色\",userinfo:\"800R00000057,回款初审\"}]','#PhaseOpinion1','closePage,doSubmit,signOpinion',NULL,'all_except',NULL,NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'241','141','109','48','1',NULL,'TASK',NULL,'N','N','PenaltyReductionFLow010',NULL,NULL,'backnextstep',NULL,NULL,'TreeView.addDeleteCallBackSql(\"jbo.com.tenwa.lease.comm.LC_OCCUPY_RENT_LIST\",\"delete from O where flowunid=:FlowUnid\");',NULL,'N','回款复审(0020)',NULL,NULL,NULL,NULL,NULL); +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('PenaltyReductionFlow','0020','1020','回款复审',NULL,NULL,NULL,'toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'conditionroute',NULL,'[{usertype:\"选择指定任务池角色\",userinfo:\"800R00000058,回款复审\"}]','#PhaseOpinion1','closePage,doSubmit,backStep,signOpinion',NULL,NULL,NULL,NULL,NULL,'01',NULL,NULL,'',NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'248','233','100','50','1',NULL,'TASK',NULL,NULL,'Y','PenaltyReductionFLow010',NULL,NULL,'backnextstep','回款初审(0010)',NULL,NULL,NULL,NULL,'[{stepno:\"汽车业务部总监(0030)\",stepcondition:\"!审批流程.罚息减免流程判断小于等于100元(#ObjectNo)\"},{stepno:\"汽车业务部总监(0040)\",stepcondition:\"!审批流程.罚息减免流程判断大于100元(#ObjectNo)\"}]',NULL,NULL,NULL,NULL,NULL); +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('PenaltyReductionFlow','0030','1020','汽车业务部总监',NULL,NULL,NULL,'toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'selectroute',NULL,'[{usertype:\"指定角色\",userinfo:\"800R00000011,汽车业务部总监\"}]','#PhaseOpinion1','doSubmit,backStep,signOpinion',NULL,NULL,NULL,NULL,NULL,'01',NULL,NULL,'[{usertype:\"指定角色\",userinfo:\"800R00000021,C端财务经办\"}]',NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'128','482','100','50','1',NULL,'TASK',NULL,NULL,'Y','PenaltyReductionFLow010',NULL,NULL,'backnextstep','回款复审(0020)',NULL,NULL,NULL,NULL,'[{stepno:\"通过(1000)\",stepcondition:\"提交给通过\"},{stepno:\"否决(8000)\",stepcondition:\"提交给否决\"}]',NULL,NULL,NULL,NULL,NULL); +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('PenaltyReductionFlow','0040','1020','汽车业务部总监',NULL,NULL,NULL,'toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'commroute',NULL,'[{usertype:\"指定角色\",userinfo:\"800R00000011,汽车业务部总监\"}]','#PhaseOpinion1','doSubmit,backStep,signOpinion',NULL,NULL,NULL,NULL,NULL,'01',NULL,NULL,'',NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'352','431','100','50','1',NULL,'TASK',NULL,NULL,'Y','PenaltyReductionFLow010',NULL,NULL,'backnextstep','回款复审(0020)',NULL,NULL,NULL,NULL,'总经理(0050)',NULL,NULL,NULL,NULL,NULL); +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('PenaltyReductionFlow','0050','1020','总经理',NULL,NULL,NULL,'toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'selectroute',NULL,'[{usertype:\"指定角色\",userinfo:\"800R00000039,安鹏租赁总经理\"}]','#PhaseOpinion1','doSubmit,backStep,signOpinion',NULL,NULL,NULL,NULL,NULL,'01',NULL,NULL,'[{usertype:\"指定角色\",userinfo:\"800R00000021,C端财务经办\"}]',NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'352','571','100','50','1',NULL,'TASK',NULL,NULL,'Y','PenaltyReductionFLow010',NULL,NULL,'backnextstep','汽车业务部总监(0040)',NULL,NULL,NULL,NULL,'[{stepno:\"通过(1000)\",stepcondition:\"提交给通过\"},{stepno:\"否决(8000)\",stepcondition:\"提交给否决\"}]',NULL,NULL,NULL,NULL,NULL); +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('PenaltyReductionFlow','1000','1040','通过',NULL,NULL,'!基础操作.租金实收信息临时到正式(#ObjectNo)+!基础操作.流程结束后删除对应租金计划的占用(#ObjectNo)','{\"system\"}',NULL,'commroute',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'01',NULL,NULL,'',NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'153','783','50','50','1',NULL,'END',NULL,NULL,'Y',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('PenaltyReductionFlow','8000','1050','否决',NULL,NULL,'!基础操作.否决后修改租金实收临时表状态(#ObjectNo)+!基础操作.流程结束后删除对应租金计划的占用(#ObjectNo)','{\"system\"}',NULL,'commroute',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'01',NULL,NULL,'[{usertype:\"指定角色\",userinfo:\"800R00000021,C端财务经办\"}]',NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'383','772','50','50','1',NULL,'END',NULL,NULL,'Y',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); + +-- 修改提前结清流程 +delete from FLOW_CATALOG where flowno='ContractTerminateFlow'; +insert into `FLOW_CATALOG` (`flowno`, `flowname`, `flowtype`, `flowdescribe`, `initphase`, `aaenabled`, `aapolicy`, `viewfile`, `viewfilelength`, `grouptitles`, `metaflowno`, `isinuse`, `version`, `baseflowno`, `baseflowname`, `graphjsondata`, `flowstate`) values('ContractTerminateFlow','提前结清','ContractTerminateApply','提前结清','0010',NULL,NULL,NULL,NULL,NULL,NULL,'1','1','ContractTerminateFlow',NULL,'{states:{rect1:{type:\'start\',text:{text:\'开始\'}, attr:{ x:503, y:42, width:50, height:50}, props:{text:{value:\'开始\'},key:{value:\'e5c0fd6e741a8a4fafa9c9c558ac7289\'},position:{value:\'0000\'}}},rect2:{type:\'task\',text:{text:\'提前结清管理员\'}, attr:{ x:483, y:134, width:100, height:50}, props:{text:{value:\'提前结清管理员\'},key:{value:\'ff25b3e452a8d73990065ec15c199da0\'},position:{value:\'0010\'}}},rect3:{type:\'task\',text:{text:\'资产管理负责人\'}, attr:{ x:484, y:220, width:100, height:50}, props:{text:{value:\'资产管理负责人\'},key:{value:\'623121a288ab14917e01f5ba246490e9\'},position:{value:\'0020\'}}},rect4:{type:\'end\',text:{text:\'结束\'}, attr:{ x:456, y:817, width:50, height:50}, props:{text:{value:\'结束\'},key:{value:\'6401b00e18045ff16bbb44cf2b4e8dcd\'},position:{value:\'1000\'}}},rect5:{type:\'task\',text:{text:\'C端财务经办\'}, attr:{ x:479, y:695, width:100, height:50}, props:{text:{value:\'C端财务经办\'},key:{value:\'44bb2fc9788959b275da6f8438b2f2a8\'},position:{value:\'0040\'}}},rect6:{type:\'reject\',text:{text:\'否决\'}, attr:{ x:542, y:809, width:50, height:50}, props:{text:{value:\'否决\'},key:{value:\'97f7ac5605aea082f3f0321aaccd5b36\'},position:{value:\'8000\'}}},rect7:{type:\'exclusive\',text:{text:\'条件\'}, attr:{ x:502, y:303, width:50, height:50}, props:{text:{value:\'条件\'},key:{value:\'c7bae1c172d1d8f6ba63bc794674219c\'},position:{value:\'\'}}},rect8:{type:\'task\',text:{text:\'汽车业务部总监\'}, attr:{ x:479, y:398, width:100, height:50}, props:{text:{value:\'汽车业务部总监\'},key:{value:\'42f849014da2a0558c6fdd08c6b0748e\'},position:{value:\'0030\'}}},rect17:{type:\'task\',text:{text:\'总经理\'}, attr:{ x:480, y:578, width:100, height:50}, props:{text:{value:\'总经理\'},key:{value:\'3bb6ed5957b6eca92d4a961ad79dea74\'},position:{value:\'0050\'}}},rect18:{type:\'fork\',text:{text:\'分支\'}, attr:{ x:504, y:485, width:50, height:50}, props:{text:{value:\'分支\'},key:{value:\'0345b3f77e77850c1b647ed104848848\'},position:{value:\'\'}}}},paths:{path9:{from:\'rect1\',to:\'rect2\', dots:[],text:{text:\'TO 提前结清管理员\'},textPos:{x:0,y:-10}, props:{text:{value:\'TO 提前结清管理员\'}}},path10:{from:\'rect2\',to:\'rect3\', dots:[],text:{text:\'TO 资产管理负责人\'},textPos:{x:0,y:-10}, props:{text:{value:\'TO 资产管理负责人\'}}},path11:{from:\'rect5\',to:\'rect4\', dots:[],text:{text:\'TO 结束\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path12:{from:\'rect5\',to:\'rect6\', dots:[],text:{text:\'TO 否决\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path13:{from:\'rect3\',to:\'rect7\', dots:[],text:{text:\'TO 条件\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path14:{from:\'rect7\',to:\'rect5\', dots:[{x:651,y:331},{x:649,y:424},{x:651,y:715}],text:{text:\'TO C端财务经办\'},textPos:{x:18,y:-7}, props:{text:{value:\'TO C端财务经办\'}}},path15:{from:\'rect7\',to:\'rect8\', dots:[],text:{text:\'TO 汽车业务部总监\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path19:{from:\'rect8\',to:\'rect18\', dots:[],text:{text:\'TO 分支\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path20:{from:\'rect18\',to:\'rect17\', dots:[],text:{text:\'TO 总经理\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path21:{from:\'rect17\',to:\'rect5\', dots:[],text:{text:\'TO C端财务经办\'},textPos:{x:0,y:-10}, props:{text:{value:\'\'}}},path22:{from:\'rect18\',to:\'rect5\', dots:[{x:427,y:512},{x:426,y:609},{x:429,y:721}],text:{text:\'TO C端财务经办\'},textPos:{x:0,y:-10}, props:{text:{value:\'TO C端财务经办\'}}}},props:{props:{}}}','synchronized'); +delete from FLOW_MODEL where flowno='ContractTerminateFlow'; +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('ContractTerminateFlow','0010','1010','提前结清管理员',NULL,NULL,'!基础操作.合同基本信息从正式到临时(#ObjectNo)+!基础操作.租赁物表从正式到临时(#ObjectNo)+!基础操作.商务条件起租到临时表(#ObjectNo)+!基础操作.租金计划表从正式到历史(#ObjectNo)+!审批流程.微信提交信息变更发起流程修改状态(#ObjectNo)','{#UserID}',NULL,'commroute',NULL,'','#PhaseOpinion1','closePage,doSubmit,signOpinion',NULL,'all_except','ContractTerminate',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'483','134','100','50','1',NULL,'TASK',NULL,'N','Y',NULL,'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.updateNodeSetReadOnly(\"变更信息\",null);\r\nTreeView.updateNodeSetReadOnly(\"提前终止变更\",null);\r\nTreeView.updateNodeSetReadOnly(\"一般租赁物\",null);\r\nTreeView.updateNodeSetReadOnly(\"汽车\",null);\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"变更说明\",\"提前结清说明\");\r\nTreeView.addBeforeNodeByCode(\"提前终止变更\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"提前网银核销\", \"11610\");',NULL,'backnextstep',NULL,NULL,'TreeView.addDeleteCallBackSql(\"jbo.com.tenwa.lease.comm.LC_OCCUPY_RENT_LIST\",\"delete from o where o.flowunid=:FlowUnid\");\r\nTreeView.addDeleteCallBackSql(\"jbo.app.tenwa.calc.LC_EBANK_PROCESS\",\"delete from O where flowunid=:FlowUnid\");+!审批流程.扣款卡信息流程发起后取消(#ObjectNo)',NULL,'N','资产管理负责人(0020)',NULL,NULL,NULL,NULL,NULL); +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('ContractTerminateFlow','0020','1020','资产管理负责人',NULL,NULL,NULL,'toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'conditionroute',NULL,'[{usertype:\"指定角色\",userinfo:\"800R00000017,资产管理负责人\"}]','#PhaseOpinion1','closePage,doSubmit,backStep,signOpinion,circulate',NULL,'all_except','ContractTerminate',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'484','220','100','50','1',NULL,'TASK',NULL,'Y','Y',NULL,'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"变更说明\",\"提前结清说明\");\r\nTreeView.addBeforeNodeByCode(\"提前终止变更\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"提前网银核销\", \"11610\");',NULL,'backnextstep','提前结清管理员(0010)',NULL,NULL,NULL,'N','[{stepno:\"汽车业务部总监(0030)\",stepcondition:\"!审批流程.提前结清费用改变(#ObjectNo)\"},{stepno:\"C端财务经办(0040)\",stepcondition:\"!审批流程.提前结清费用未改变(#ObjectNo)\"}]',NULL,NULL,NULL,NULL,NULL); +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('ContractTerminateFlow','0030','1020','汽车业务部总监',NULL,NULL,NULL,'toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'conditionroute',NULL,'[{usertype:\"指定角色\",userinfo:\"800R00000011,汽车业务部总监\"}]','#PhaseOpinion1','closePage,doSubmit,backStep,signOpinion,circulate',NULL,'all_except','ContractTerminate',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'479','398','100','50','1',NULL,'FORK',NULL,'Y','Y',NULL,'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"变更说明\",\"提前结清说明\");\r\nTreeView.addBeforeNodeByCode(\"提前终止变更\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"提前网银核销\", \"11610\");',NULL,'backnextstep','资产管理负责人(0020)',NULL,NULL,NULL,'N','[{stepno:\"总经理(0050)\",stepcondition:\"!审批流程.提前结清最终金额和还款金额差大于100(#ObjectNo)\"},{stepno:\"C端财务经办(0040)\",stepcondition:\"!审批流程.提前结清最终金额和还款金额差小于等于100(#ObjectNo)\"}]',NULL,NULL,NULL,NULL,NULL); +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('ContractTerminateFlow','0040','1020','C端财务经办',NULL,NULL,NULL,'toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'selectroute',NULL,'[{usertype:\"选择指定任务池角色\",userinfo:\"800R00000021,C端财务经办\"}]','#PhaseOpinion1','closePage,doSubmit,backStep,signOpinion',NULL,'all_except','ContractTerminate',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'479','695','100','50','1',NULL,'TASK',NULL,'Y','Y',NULL,'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"变更说明\",\"提前结清说明\");\r\nTreeView.addBeforeNodeByCode(\"提前终止变更\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"提前网银核销\", \"11610\");',NULL,'backnextstep',NULL,NULL,NULL,NULL,'N','[{stepno:\"结束(1000)\",stepcondition:\"提交给结束\"},{stepno:\"否决(8000)\",stepcondition:\"提交给否决\"}]',NULL,NULL,NULL,NULL,NULL); +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('ContractTerminateFlow','0050','1020','总经理',NULL,NULL,NULL,'toStringArray(\"#PhaseAction\",\",\",\" \",1)',NULL,'commroute',NULL,'[{usertype:\"指定角色\",userinfo:\"800R00000039,安鹏租赁总经理\"}]','#PhaseOpinion1','closePage,doSubmit,backStep,signOpinion,circulate',NULL,'all_except','ContractTerminate',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'480','578','100','50','1',NULL,'TASK',NULL,'Y','Y',NULL,'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");\r\nTreeView.updateNodeName(\"变更说明\",\"提前结清说明\");\r\nTreeView.addBeforeNodeByCode(\"提前终止变更\", \"11390\");\r\nTreeView.addBeforeNodeByCode(\"提前网银核销\", \"11610\");',NULL,'backnextstep','汽车业务部总监(0030)',NULL,NULL,NULL,'N','C端财务经办(0040)',NULL,NULL,NULL,NULL,NULL); +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('ContractTerminateFlow','1000','1040','结束',NULL,NULL,'!基础操作.变更信息表从临时到正式(#ObjectNo)+!基础操作.提前结清租金存储过程(#ObjectNo)+!基础操作.商务条件临时表到起租层(#ObjectNo)+!基础操作.租金变更信息临时表到正式表(#ObjectNo)+!基础操作.调息删除互斥(#ObjectNo)+!审批流程.凭证输出--提前结清(#ObjectNo)+!通用流程操作.保存项目进度状态(#ObjectNo,52)+!基础操作.流程结束后删除对应租金计划的占用(#ObjectNo)+!基础操作.提前结清网银信息临时表到正式表(#ObjectNo)+!基础操作.更新合同状态(#ObjectNo,100)+!审批流程.微信提交信息变更发起流程通过(#ObjectNo)','{\"system\"}',NULL,'commroute',NULL,NULL,NULL,'closePage',NULL,'all_except','ContractApproval',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'456','817','50','50','1',NULL,'END',NULL,'N','Y',NULL,'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");',NULL,NULL,NULL,NULL,NULL,NULL,'N',NULL,NULL,NULL,NULL,NULL,NULL); +insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('ContractTerminateFlow','8000','1050','否决',NULL,NULL,'!审批流程.微信提交信息变更发起流程否决(#ObjectNo)','{\"system\"}',NULL,'commroute',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'542','809','50','50','1',NULL,'END',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); + + + + + + + +-- 客户张磊修改内容 +INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('operationType', 'CDZZ', 'C端直租', '', '0120', '1', '', '', '', '', '', '', '', '', '', '', '', 'SYS_Designer', NULL, '2020/03/31 15:08:56', 'SYS_Designer', '2020/03/31 15:08:56', '', ''); + +INSERT INTO `apzl`.`bf_template` (`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('59f109e144c347d1b0d61da63a4fe822', NULL, '', 'C端直租', '融资租赁合同-C端直租.doc', '融资租赁合同-C端直租-定稿版.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '', 'administrator', '8009001', '2020/03/31 14:02:27', 'admin', '8009001', '2020/03/31 02:18:46', '', ''); + +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('25fff44b316c42d397cc8e2c214f2b20', '975294b526544d83b806e3fc2f99cd16', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('31eccaf2a04c471ea341f7ef7a760961', 'bbe36e81f17542078489f223239e658a', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('5952afc7c09044ab9a8966d75bcd7e19', 'ced1455267d64183ba1b270a9eda6089', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('801e60bfebd649e09d673b7fa0f7fc23', '484815c4a7a14cf6bdbf69939e5b060e', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('9d3b561076b74fca88e50e92d51413ef', 'cc67cd6da08745329d0723f5f6fda25d', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('aba1e85d33b5444bb35357f837100335', 'db5b1632a6b44e7ea99e0dd0b2193ef3', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('bd605c45dc554628ae5094c58a270b26', 'be101123ef74413eb0d8acad8b6b22b9', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('f921be5522b14cf38d04320165696a74', '755698c1c27a43efa6c23310757c6163', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); + + + diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/AdvanceSettleMoneyGreaterHundred.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/AdvanceSettleMoneyGreaterHundred.java new file mode 100644 index 000000000..12422d131 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/AdvanceSettleMoneyGreaterHundred.java @@ -0,0 +1,28 @@ +package com.tenwa.lease.flow.project.businessapply; + +import jbo.app.tenwa.calc.LC_FUND_RENT_ADJUST_TEMP; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.flow.baseBussion.BaseBussiness; + +public class AdvanceSettleMoneyGreaterHundred extends BaseBussiness { + + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String flowUnid=this.getAttribute("ObjectNo").toString(); + BizObject lfrat=JBOFactory.createBizObjectQuery(LC_FUND_RENT_ADJUST_TEMP.CLASS_NAME," flowunid=:flowunid ").setParameter("flowunid", flowUnid).getSingleResult(false); + Double contractTotal = lfrat== null ? 0.00 : lfrat.getAttribute("CONTRACT_TOTAL").getDouble();//提前还款金额 + Double maximumTotal = lfrat== null ? 0.00 : lfrat.getAttribute("MAXIMUM_TOTAL").getDouble();//最终还款金额 + + String sMessage; + if(Math.abs(contractTotal-maximumTotal) > 100){//没有查询出数据，说明调整过费用,需要汽车业务部审批 + sMessage="true"; + }else { + sMessage="false"; + } + return sMessage; + } +} \ No newline at end of file diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/AdvanceSettleMoneyLessHundred.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/AdvanceSettleMoneyLessHundred.java new file mode 100644 index 000000000..cff5dfcf7 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/AdvanceSettleMoneyLessHundred.java @@ -0,0 +1,28 @@ +package com.tenwa.lease.flow.project.businessapply; + +import jbo.app.tenwa.calc.LC_FUND_RENT_ADJUST_TEMP; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.flow.baseBussion.BaseBussiness; + +public class AdvanceSettleMoneyLessHundred extends BaseBussiness { + + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + String flowUnid=this.getAttribute("ObjectNo").toString(); + BizObject lfrat=JBOFactory.createBizObjectQuery(LC_FUND_RENT_ADJUST_TEMP.CLASS_NAME," flowunid=:flowunid ").setParameter("flowunid", flowUnid).getSingleResult(false); + Double contractTotal = lfrat== null ? 0.00 : lfrat.getAttribute("CONTRACT_TOTAL").getDouble();//提前还款金额 + Double maximumTotal = lfrat== null ? 0.00 : lfrat.getAttribute("MAXIMUM_TOTAL").getDouble();//最终还款金额 + + String sMessage; + if(Math.abs(contractTotal-maximumTotal) <= 100){//没有查询出数据，说明调整过费用,需要汽车业务部审批 + sMessage="true"; + }else { + sMessage="false"; + } + return sMessage; + } +} \ No newline at end of file From ca4a97eb253809fbb7a0f4fc6df10d2e7551a95f Mon Sep 17 00:00:00 2001 From: zhangbb Date: Thu, 2 Apr 2020 14:20:30 +0800 Subject: [PATCH 37/89] =?UTF-8?q?1.=E7=BD=91=E9=93=B6=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=89=A9=E4=BD=99=E5=BA=94=E8=BF=98=E9=87=91?= =?UTF-8?q?=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp | 2 -- .../tenwa/flow/rent/rentincome/VILCRentPlanListHandler.java | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp index eabbe3b7a..dda6e585a 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/PenaltyReduction/LCRentIncomeTempReductionList.jsp @@ -90,11 +90,9 @@ } function changePenalty(datelist){ - debugger; var PAYMENT_NUMBER = getCurrentItemValue("PAYMENT_NUMBER"); var PLAN_LIST = getCurrentItemValue("PLAN_LIST"); var HIRE_DATE = datelist; - var penalty = AsControl.RunJsp("/Tenwa/Lease/Flow/Fund/FundCollection/GetPenalty.jsp","PAYMENT_NUMBER="+PAYMENT_NUMBER+"&PLAN_LIST="+PLAN_LIST+"&HIRE_DATE="+HIRE_DATE); setItemValue(0, getRow(0), "PENALTY_ADJUST", penalty); } diff --git a/src_tenwa/com/tenwa/flow/rent/rentincome/VILCRentPlanListHandler.java b/src_tenwa/com/tenwa/flow/rent/rentincome/VILCRentPlanListHandler.java index 130b11ffa..f8512ba65 100644 --- a/src_tenwa/com/tenwa/flow/rent/rentincome/VILCRentPlanListHandler.java +++ b/src_tenwa/com/tenwa/flow/rent/rentincome/VILCRentPlanListHandler.java @@ -31,7 +31,9 @@ public class VILCRentPlanListHandler extends CommonHandler{ } bo.setAttributeValue("fact_date", factDate); bo.setAttributeValue("penalty", new BigDecimal(penalty).setScale(2)); - bo.setAttributeValue("penalty_over", new BigDecimal(penalty).subtract(new BigDecimal(bo.getAttribute("fact_penalty").getString())).subtract(new BigDecimal(bo.getAttribute("penalty_adjust").getString())).setScale(2)); - + BigDecimal penalty_over = new BigDecimal(penalty).subtract(new BigDecimal(bo.getAttribute("fact_penalty").getString())).subtract(new BigDecimal(bo.getAttribute("penalty_adjust").getString())).setScale(2); + bo.setAttributeValue("penalty_over", penalty_over); + BigDecimal all_over = BigDecimal.valueOf(rentOver).add(penalty_over); + bo.setAttributeValue("all_over", all_over); } } From 51740ea72ad0a40ed211e9f2afde2017598af051 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Tue, 7 Apr 2020 09:34:48 +0800 Subject: [PATCH 38/89] =?UTF-8?q?=E7=BD=9A=E6=81=AF=E5=87=8F=E5=85=8D?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quartzmession/ReductionPenaltyRemove.java | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 src_tenwa/com/tenwa/lease/app/quartzmession/ReductionPenaltyRemove.java diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/ReductionPenaltyRemove.java b/src_tenwa/com/tenwa/lease/app/quartzmession/ReductionPenaltyRemove.java new file mode 100644 index 000000000..a64bb5508 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/ReductionPenaltyRemove.java @@ -0,0 +1,82 @@ +package com.tenwa.lease.app.quartzmession; + + +import java.util.List; + +import jbo.app.tenwa.calc.LC_RENT_INCOME; +import jbo.app.tenwa.calc.VI_LC_RENT_PLAN; +import jbo.com.tenwa.lease.carbrand.lb_automatic_compensatory; +import jbo.com.tenwa.lease.comm.CONFIGURATE; + +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.are.util.StringFunction; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import com.tenwa.reckon.util.UUIDUtil; + + +/** + * 自动移除罚息减免金额 + * @author tangfutang + */ +public class ReductionPenaltyRemove implements Job{ + + public void execute(JobExecutionContext arg0) throws JobExecutionException { + JBOTransaction tx=null; + try { + tx = JBOFactory.createJBOTransaction(); + BizObject dateNoBo= JBOFactory.getBizObjectManager(CONFIGURATE.CLASS_NAME, tx).createQuery("attr_id='罚息减免申请自动取消' and field1='汽车'").getSingleResult(false); + String dateNo =dateNoBo.getAttribute("ATTR_VALUE").toString(); + String SQL = "settle_method='settlemethod12' AND v.DATEDIFF(v.SYSDATE(),v.STR_TO_DATE(inputtime,'%Y/%m/%d'))>'"+dateNo+"'"; + BizObjectManager bomLri = JBOFactory.getBizObjectManager(LC_RENT_INCOME.CLASS_NAME,tx); + List lriBoList = bomLri.createQuery(SQL).getResultList(false); + for(BizObject lriBo:lriBoList){ + String planId = lriBo.getAttribute("plan_id").toString(); + BizObject clrpBo= JBOFactory.getBizObjectManager(VI_LC_RENT_PLAN.CLASS_NAME, tx).createQuery("id=:id and (rent_over>0 or penalty_over>0)").setParameter("id", planId).getSingleResult(false); + if(clrpBo.getAttribute("id")!=null){ + BizObject boLRi = bomLri.newObject(); + boLRi.setAttributeValue("ID", UUIDUtil.getUUID()); + boLRi.setAttributeValue("PROJECT_ID", lriBo.getAttribute("PROJECT_ID").toString()); + boLRi.setAttributeValue("PROJECT_PLAN_NUMBER", lriBo.getAttribute("PROJECT_PLAN_NUMBER").toString()); + boLRi.setAttributeValue("CONTRACT_ID", lriBo.getAttribute("CONTRACT_ID").toString()); + boLRi.setAttributeValue("CONTRACT_PLAN_NUMBER", lriBo.getAttribute("CONTRACT_PLAN_NUMBER").toString()); + boLRi.setAttributeValue("PAYMENT_NUMBER", lriBo.getAttribute("PAYMENT_NUMBER").toString()); + boLRi.setAttributeValue("PLAN_ID", lriBo.getAttribute("PLAN_ID").toString()); + boLRi.setAttributeValue("PLAN_LIST", lriBo.getAttribute("PLAN_LIST").toString()); + boLRi.setAttributeValue("HIRE_LIST", lriBo.getAttribute("HIRE_LIST").toString()); + boLRi.setAttributeValue("HIRE_DATE", lriBo.getAttribute("HIRE_DATE").toString()); + boLRi.setAttributeValue("RENT", lriBo.getAttribute("RENT").toString()); + boLRi.setAttributeValue("CORPUS", lriBo.getAttribute("CORPUS").toString()); + boLRi.setAttributeValue("INTEREST", lriBo.getAttribute("INTEREST").toString()); + boLRi.setAttributeValue("PENALTY", lriBo.getAttribute("PENALTY").toString()); + boLRi.setAttributeValue("CORPUS_ADJUST", lriBo.getAttribute("CORPUS_ADJUST").toString()); + boLRi.setAttributeValue("INTEREST_ADJUST", lriBo.getAttribute("INTEREST_ADJUST").toString()); + boLRi.setAttributeValue("PENALTY_ADJUST", "-"+lriBo.getAttribute("PENALTY_ADJUST").toString()); + boLRi.setAttributeValue("SETTLE_METHOD", lriBo.getAttribute("SETTLE_METHOD").toString()); + boLRi.setAttributeValue("MEMO", "超期未还款，罚息减免撤销"); + boLRi.setAttributeValue("ROLL_BACK", lriBo.getAttribute("ROLL_BACK").toString()); + boLRi.setAttributeValue("INPUTUSERID", "8009U00000002"); + boLRi.setAttributeValue("INPUTORGID", "8009001"); + boLRi.setAttributeValue("INPUTTIME", StringFunction.getTodayNow()); + boLRi.setAttributeValue("UPDATEUSERID", "8009U00000002"); + boLRi.setAttributeValue("UPDATEORGID", "8009001"); + boLRi.setAttributeValue("UPDATETIME", StringFunction.getTodayNow()); + bomLri.saveObject(boLRi); + } + } + } catch (JBOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + +} From d2bfe30c7a1be5d6d32649ed7a0a4781fe73e3d7 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Tue, 7 Apr 2020 10:35:25 +0800 Subject: [PATCH 39/89] =?UTF-8?q?1.=E5=AE=8C=E5=96=84=E7=BD=9A=E6=81=AF?= =?UTF-8?q?=E5=87=8F=E5=85=8D=E7=A7=BB=E9=99=A4=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quartzmession/ReductionPenaltyRemove.java | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/ReductionPenaltyRemove.java b/src_tenwa/com/tenwa/lease/app/quartzmession/ReductionPenaltyRemove.java index a64bb5508..147d0bc4a 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/ReductionPenaltyRemove.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/ReductionPenaltyRemove.java @@ -5,7 +5,6 @@ import java.util.List; import jbo.app.tenwa.calc.LC_RENT_INCOME; import jbo.app.tenwa.calc.VI_LC_RENT_PLAN; -import jbo.com.tenwa.lease.carbrand.lb_automatic_compensatory; import jbo.com.tenwa.lease.comm.CONFIGURATE; import org.quartz.Job; @@ -18,9 +17,6 @@ import com.amarsoft.are.jbo.JBOException; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.are.util.StringFunction; -import com.amarsoft.awe.util.SqlObject; -import com.amarsoft.awe.util.Transaction; -import com.amarsoft.dict.als.cache.CacheLoaderFactory; import com.tenwa.reckon.util.UUIDUtil; @@ -42,7 +38,8 @@ public class ReductionPenaltyRemove implements Job{ for(BizObject lriBo:lriBoList){ String planId = lriBo.getAttribute("plan_id").toString(); BizObject clrpBo= JBOFactory.getBizObjectManager(VI_LC_RENT_PLAN.CLASS_NAME, tx).createQuery("id=:id and (rent_over>0 or penalty_over>0)").setParameter("id", planId).getSingleResult(false); - if(clrpBo.getAttribute("id")!=null){ + if(clrpBo !=null ){ + System.out.println("罚息减免撤销的plan_id:"+lriBo.getAttribute("PLAN_ID").toString()); BizObject boLRi = bomLri.newObject(); boLRi.setAttributeValue("ID", UUIDUtil.getUUID()); boLRi.setAttributeValue("PROJECT_ID", lriBo.getAttribute("PROJECT_ID").toString()); @@ -74,8 +71,23 @@ public class ReductionPenaltyRemove implements Job{ } } } catch (JBOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + if (tx != null) { + try { + tx.rollback(); + tx=null; + } catch (JBOException e1) { + e1.printStackTrace(); + } + } + }finally{ + try { + if(tx !=null){ + + tx.commit(); + } + } catch (JBOException e) { + e.printStackTrace(); + } } } From 29919d2b7a6b29f6c7eed44e0b7dc626f1139b62 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 8 Apr 2020 20:36:29 +0800 Subject: [PATCH 40/89] =?UTF-8?q?=E6=97=A5=E5=B8=B8bug=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_sql/view/vi_flow_monitoring.sql | 2 +- src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src_sql/view/vi_flow_monitoring.sql b/src_sql/view/vi_flow_monitoring.sql index 35fa521e8..f67768477 100644 --- a/src_sql/view/vi_flow_monitoring.sql +++ b/src_sql/view/vi_flow_monitoring.sql @@ -24,7 +24,7 @@ LEFT JOIN ( FROM APZL.LC_EBANK_TEMP GROUP BY APZL.LC_EBANK_TEMP.FLOWUNID ) LET ON ((LET.FLOWUNID = O.OBJECTNO))) -WHERE (isnull(FT.ENDTIME) OR (FT.PHASENO = '1000') OR (FT.PHASENO = '8000') OR (FT.PHASENO = '0010')); +WHERE (isnull(FT.ENDTIME) OR (FT.PHASENO = '1000') OR (FT.PHASENO = '8000')); -- comment on column vi_flow_monitoring.OBJECTNO not supported: 瀵硅薄缂栧彿 diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql index 8e1976fe8..1aef45189 100644 --- a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql +++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql @@ -216,8 +216,9 @@ insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phased insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('ContractTerminateFlow','1000','1040','结束',NULL,NULL,'!基础操作.变更信息表从临时到正式(#ObjectNo)+!基础操作.提前结清租金存储过程(#ObjectNo)+!基础操作.商务条件临时表到起租层(#ObjectNo)+!基础操作.租金变更信息临时表到正式表(#ObjectNo)+!基础操作.调息删除互斥(#ObjectNo)+!审批流程.凭证输出--提前结清(#ObjectNo)+!通用流程操作.保存项目进度状态(#ObjectNo,52)+!基础操作.流程结束后删除对应租金计划的占用(#ObjectNo)+!基础操作.提前结清网银信息临时表到正式表(#ObjectNo)+!基础操作.更新合同状态(#ObjectNo,100)+!审批流程.微信提交信息变更发起流程通过(#ObjectNo)','{\"system\"}',NULL,'commroute',NULL,NULL,NULL,'closePage',NULL,'all_except','ContractApproval',NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'456','817','50','50','1',NULL,'END',NULL,'N','Y',NULL,'TreeView.addFirstNodeByCode(\"11340\");\r\nTreeView.addFirstNodeByCode(\"11080\");\r\nTreeView.addLastNodeByCode(\"11320\");\r\nTreeView.addLastNodeByCode(\"11330\");\r\nTreeView.addLastNodeByCode(\"11350\");',NULL,NULL,NULL,NULL,NULL,NULL,'N',NULL,NULL,NULL,NULL,NULL,NULL); insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('ContractTerminateFlow','8000','1050','否决',NULL,NULL,'!审批流程.微信提交信息变更发起流程否决(#ObjectNo)','{\"system\"}',NULL,'commroute',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'542','809','50','50','1',NULL,'END',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); - - +-- 邮寄归档未邮寄合同条件修改（放款后督流程未保存档案信息也可发起邮寄归档） +delete from AWE_DO_CATALOG where dono='LBnotAllMailHndHandoverList'; +Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('LBnotAllMailHndHandoverList','经销商未全部邮寄列表',null,'30010',null,'1','1','default','jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO','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','(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'') ','','','',null,'SYS_Designer','2019/07/11 15:35:18','SYS_Designer','2020/04/08 09:19:42','','1',''); From f3226b788ae242765e86ebaf8be379d7bf3a3dc8 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Thu, 9 Apr 2020 21:46:16 +0800 Subject: [PATCH 41/89] =?UTF-8?q?1.=E5=A4=8D=E5=88=B6=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductConfig/CopyProductCatalogInfo.jsp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/WebContent/ProductManage/ProductConfig/CopyProductCatalogInfo.jsp b/WebContent/ProductManage/ProductConfig/CopyProductCatalogInfo.jsp index d4aef86fa..5dfb6d5a8 100644 --- a/WebContent/ProductManage/ProductConfig/CopyProductCatalogInfo.jsp +++ b/WebContent/ProductManage/ProductConfig/CopyProductCatalogInfo.jsp @@ -28,10 +28,20 @@ include file="/Frame/resources/include/ui/include_info.jspf"%> +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml index 7e2b1755c..fb12414da 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml @@ -180,6 +180,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/com/amarsoft/awe/dw/ui/list/ProductsBusinessListUtil.java b/src/com/amarsoft/awe/dw/ui/list/ProductsBusinessListUtil.java new file mode 100644 index 000000000..e42fba365 --- /dev/null +++ b/src/com/amarsoft/awe/dw/ui/list/ProductsBusinessListUtil.java @@ -0,0 +1,182 @@ +package com.amarsoft.awe.dw.ui.list; + +import java.util.Map; + +import com.amarsoft.app.util.ProductParamUtil; + +public class ProductsBusinessListUtil { + + public static String getString( Object obj ) { + if ( obj == null ) { + return ""; + } + return obj.toString(); + } + + //根据产品编号获取产品利率 + public static String getProductProductRate(String TYPENO) throws Exception{ + return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0350", "product_rate", "ProductRate"); + } + + //根据产品编号获取还款周期 + public static String getProductRepaymentCycle(String TYPENO) throws Exception{ + String PayFrequencyType = ""; + Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0301"); + Map parms = productRates.get("even_rent"); + if(parms!=null && parms.size()>0){ + PayFrequencyType = getString(parms.get("PayFrequencyType")); + } + return PayFrequencyType; + //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0301", "even_rent", "PayFrequencyType"); + + } + + //根据产品编号获首付最小比例取 + public static String getProductDownPaymentRatio(String TYPENO) throws Exception{ + String CostTypeMin = ""; + Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); + Map parms = productRates.get("FIRST_PAYMENT"); + if(parms!=null && parms.size()>0){ + CostTypeMin = getString(parms.get("CostType09-MIN")); + } + return CostTypeMin; + //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FIRST_PAYMENT", "CostType09-MIN"); + } + //根据产品编号获首付限定比例取 + public static String getProductXDDownPaymentRatio(String TYPENO) throws Exception{ + String CostType = ""; + Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); + Map parms = productRates.get("FIRST_PAYMENT"); + if(parms!=null && parms.size()>0){ + CostType = getString(parms.get("CostType09")); + } + return CostType; + //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FIRST_PAYMENT", "CostType09"); + } + + //根据产品编号获取保证金最小比例 + public static String getProductMarginRatio(String TYPENO) throws Exception{ + String CostTypeMin = ""; + Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); + Map parms = productRates.get("CAUTION_MONEY"); + if( parms!=null && parms.size()>0){ + CostTypeMin = getString(parms.get("CostType09-MIN")); + } + return CostTypeMin; + //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "CAUTION_MONEY", "CostType09-MIN"); + } + //根据产品编号获取保证金限定比例 + public static String getProductXDMarginRatio(String TYPENO) throws Exception{ + String CostType = ""; + Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); + Map parms = productRates.get("CAUTION_MONEY"); + if(parms!=null && parms.size()>0){ + CostType = getString(parms.get("CostType09")); + } + return CostType; + //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "CAUTION_MONEY", "CostType09"); + } + //根据产品编号获取手续费最小比例 + public static String getProductFeeRatio(String TYPENO) throws Exception{ + String CostTypeMin = ""; + Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); + Map parms = productRates.get("HANDLING_CHARGE_MONEY"); + if(parms!=null && parms.size()>0){ + CostTypeMin = getString(parms.get("CostType09-MIN")); + } + return CostTypeMin; + //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "HANDLING_CHARGE_MONEY", "CostType09-MIN"); + } + //根据产品编号获取手续费限定比例 + public static String getProductXDFeeRatio(String TYPENO) throws Exception{ + String CostType = ""; + Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); + Map parms = productRates.get("HANDLING_CHARGE_MONEY"); + if(parms!=null && parms.size()>0){ + CostType = getString(parms.get("CostType09")); + } + return CostType; + //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "HANDLING_CHARGE_MONEY", "CostType09"); + } + //根据产品编号获取尾款最小比例 + public static String getProductBalanceRatio(String TYPENO) throws Exception{ + String CostTypeMin = ""; + Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); + Map parms = productRates.get("FINAL_PAYMENT"); + if(parms!=null && parms.size()>0){ + CostTypeMin = getString(parms.get("CostType09-MIN")); + } + return CostTypeMin; + //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09-MIN"); + } + //根据产品编号获取尾款限定比例 + public static String getProductXDBalanceRatio(String TYPENO) throws Exception{ + String CostType = ""; + Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); + Map parms = productRates.get("FINAL_PAYMENT"); + if(parms!=null && parms.size()>0){ + CostType =getString( parms.get("CostType09")); + } + return CostType; + //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09"); + } + + //是否产融 + //根据产品编号获取购置费（是否参融） + public static String getProductISPurchase(String TYPENO) throws Exception{ + String isParticipation = ""; + Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); + Map parms = productRates.get("PURCHASE_TAX"); + if(parms!=null && parms.size()>0){ + isParticipation =getString( parms.get("FINAN")); + } + return isParticipation; + //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09"); + } + //根据产品编号获保险（是否参融） + public static String getProductISInsurance(String TYPENO) throws Exception{ + String isParticipation = ""; + Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); + Map parms = productRates.get("PURCHASE_TAX"); + if(parms!=null && parms.size()>0){ + isParticipation =getString( parms.get("INSURANCE_PREMIUM")); + } + return isParticipation; + //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09"); + } + //根据产品编号获取加装（是否参融） + public static String getProductISRetrofitting(String TYPENO) throws Exception{ + String isParticipation = ""; + Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); + Map parms = productRates.get("TABLEWARE_FEE"); + if(parms!=null && parms.size()>0){ + isParticipation =getString( parms.get("INSURANCE_PREMIUM")); + } + return isParticipation.length()>0?isParticipation:"Y"; + //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09"); + } + //根据产品编号获取GPS（是否参融） + public static String getProductISGPS(String TYPENO) throws Exception{ + String isParticipation = ""; + Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); + Map parms = productRates.get("GPS_FEE"); + if(parms!=null && parms.size()>0){ + isParticipation =getString( parms.get("INSURANCE_PREMIUM")); + } + return isParticipation; + //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09"); + } + //根据产品编号获取杂费（是否参融） + public static String getProductISIncidental(String TYPENO) throws Exception{ + String isParticipation = ""; + Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); + Map parms = productRates.get("INCIDENTAL"); + if(parms!=null && parms.size()>0){ + isParticipation =getString( parms.get("INSURANCE_PREMIUM")); + } + return isParticipation.length()>0?isParticipation: "Y" ; + //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09"); + } + + +} diff --git a/src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java b/src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java new file mode 100644 index 000000000..6c2fabe8f --- /dev/null +++ b/src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java @@ -0,0 +1,56 @@ +package jbo.prd; + +import java.lang.String; + +/** +* - JBO命名常量类

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface VI_PRODUCTS_NUMBER{ + /** + *

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.prd.VI_PRODUCTS_NUMBER"; + /** + * 产品编号 STRING(20)
+ */ + public static final String TYPENO = "TYPENO"; + /** + * 产品名称 STRING(20)
+ */ + public static final String TYPENAME = "TYPENAME"; + /** + * 投放方式 STRING(20)
+ */ + public static final String payType = "payType"; + /** + * 租赁形式 STRING(20)
+ */ + public static final String LeasForm = "LeasForm"; + /** + * 租赁物类型 STRING(20)
+ */ + public static final String equip_type = "equip_type"; + /** + * 生效日期 STRING(20)
+ */ + public static final String EFFECTIVEDATE = "EFFECTIVEDATE"; + /** + * 期数 STRING(20)
+ */ + public static final String INCOME_NUMBER = "INCOME_NUMBER"; + /** + * 投放金额 STRING(20)
+ */ + public static final String fact_money = "fact_money"; + /** + * 初次投放时间 STRING(20)
+ */ + public static final String fact_date = "fact_date"; + /** + * 产品类型 STRING(20)
+ */ + public static final String Attribute2 = "Attribute2"; +} \ No newline at end of file diff --git a/src_sql/view/vi_products_number.sql b/src_sql/view/vi_products_number.sql new file mode 100644 index 000000000..27d201e24 --- /dev/null +++ b/src_sql/view/vi_products_number.sql @@ -0,0 +1,12 @@ + +CREATE VIEW apzl.vi_products_number AS +( +SELECT bt.TYPENO,bt.TYPENAME,psl.payType,psl.LeasForm,psl.equip_type,psl.EFFECTIVEDATE,num.INCOME_NUMBER,num.fact_money,num.fact_date,bt.Attribute2 +FROM BUSINESS_TYPE bt + LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON bt.typeno=psl.PRODUCTID +LEFT JOIN (SELECT lcc.INCOME_NUMBER INCOME_NUMBER,lci.product_id product_id,SUM(lfi.fact_money) fact_money,MIN(lfi.fact_date) fact_date +FROM lb_contract_info lci LEFT JOIN LC_CALC_CONDITION lcc ON lci.id=lcc.contract_id +LEFT JOIN lc_fund_income lfi ON lci.id=lfi.contract_id AND lfi.pay_type='pay_type_out' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' +WHERE lci.contract_status >=31 AND lci.contract_status <=100 +GROUP BY lci.product_id,lcc.INCOME_NUMBER) num ON num.product_id=bt.typeno +); \ No newline at end of file diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql index b57ce42e6..45dac18ed 100644 --- a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql +++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql @@ -228,6 +228,47 @@ delete from AWE_DO_CATALOG where dono='LBnotAllMailHndHandoverList'; Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('LBnotAllMailHndHandoverList','经销商未全部邮寄列表',null,'30010',null,'1','1','default','jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO','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','(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'') ','','','',null,'SYS_Designer','2019/07/11 15:35:18','SYS_Designer','2020/04/08 09:19:42','','1',''); +-- 罚息减免流程显示小计 +DELETE FROM awe_do_library WHERE dono='LCRentIncomeTempReductionList' AND colindex='1366'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LCRentIncomeTempReductionList','1366','1366','1','','com.amarsoft.dict.als.manage.ColRelativeInfo.getPlanPenalty(PLAN_ID)','PLAN_PENALTY','String','','应收罚息','','2','Text','2','3','','','',NULL,'1','1','0','1','0',0,'','','','SYS_Designer','2017/07/13 17:28:53','SYS_Designer','2020/04/13 09:36:12','0','','1','','','',''); + +DELETE FROM awe_do_library WHERE dono='LCRentIncomeTempReductionList' AND colindex='1426'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LCRentIncomeTempReductionList','1426','1426','1','','com.amarsoft.dict.als.manage.ColRelativeInfo.getPenaltyOver(FLOWUNID,PLAN_ID)','PENALTY_OVER','String','','罚息余额','','2','Text','2','3','','','',NULL,'1','1','0','1','0',0,'','','','SYS_Designer','2017/07/13 17:28:14','SYS_Designer','2020/04/13 09:36:33','0','','1','','','',''); + +DELETE FROM awe_do_library WHERE dono='LCRentIncomeTempReductionList' AND colindex='1450'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LCRentIncomeTempReductionList','1450','1450','1','O','PENALTY_ADJUST','PENALTY_ADJUST','Number','','本次减免罚息','','2','Text','2','3','','','','0','1','0','0','1','0',1,'0','','','SYS_Designer','2017/06/27 09:58:49','SYS_Designer','2020/04/13 09:36:45','0','','1','','','',''); + +-- 产品统计报表添加模板 +Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('ProductsBusinessList','产品管理报表',null,'30',null,'1','1','default','jbo.prd.VI_PRODUCTS_NUMBER','O','O.Attribute2=''car_product''','','','','','SYS_Designer','2020/04/12 15:59:07','SYS_Designer','2020/04/15 10:54:16','','1',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1000','1000','1','O','TYPENO','TYPENO','String','','产品编号','','1','Text','1','1','','','','32','1','0','1','1','1',1,'0','','','SYS_DESIGNER','2020/04/12 15:59:07','SYS_Designer','2020/04/15 10:54:16','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1020','1020','1','O','TYPENAME','TYPENAME','String','','产品名称','','1','Text','1','1','','','','80','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/04/12 15:59:07','SYS_Designer','2020/04/15 10:54:16','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1030','1030','1','O','payType','payType','String','','放款方式','','1','Select','1','1','Code','payType','','10','1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:05:49','SYS_Designer','2020/04/15 10:54:41','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1040','1040','1','O','LeasForm','LeasForm','String','','租赁类型','','1','Select','1','1','Code','leas_form','','20','1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:05:48','SYS_Designer','2020/04/15 10:54:41','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1060','1060','1','O','equip_type','equip_type','String','','租赁物类型','','1','Select','1','1','Code','CarType','','20','1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:05:49','SYS_Designer','2020/04/15 10:54:41','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1080','1080','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductProductRate(TYPENO)','feil','String','','产品利率/费率(%)','','1','Text','2','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:18:44','SYS_Designer','2020/04/15 11:16:00','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1110','1110','1','O','INCOME_NUMBER','INCOME_NUMBER','String','','租赁期限','','1','Text','1','1','','','','20','1','0','0','1','0',0,'','','','SYS_Designer','2020/04/14 11:17:07','SYS_Designer','2020/04/15 10:54:41','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1140','1140','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductRepaymentCycle(TYPENO)','RepaymentCycle','String','','还款周期','','1','Select','1','1','Code','income_number_year','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:10','SYS_Designer','2020/04/15 10:54:16','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1160','1160','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductDownPaymentRatio(TYPENO)','DownPaymentRatio','String','','首付最小比例(%)','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:10','SYS_Designer','2020/04/15 11:16:00','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1170','1170','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductXDDownPaymentRatio(TYPENO)','XDDownPaymentRatio','String','','首付限定比例(%)','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/14 13:51:05','SYS_Designer','2020/04/15 11:16:00','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1180','1180','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductMarginRatio(TYPENO)','MarginRatio','String','','保证金最小比例(%)','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:11','SYS_Designer','2020/04/15 11:16:00','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1190','1190','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductXDMarginRatio(TYPENO)','XDMarginRatio','String','','保证金限定比例(%)','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/14 13:52:00','SYS_Designer','2020/04/15 11:16:00','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1200','1200','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductFeeRatio(TYPENO)','FeeRatio','String','','手续费最小比例(%)','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:11','SYS_Designer','2020/04/15 11:16:00','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1210','1210','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductXDFeeRatio(TYPENO)','XDFeeRatio','String','','手续费限定比例(%)','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/14 13:52:41','SYS_Designer','2020/04/15 11:16:00','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1220','1220','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductBalanceRatio(TYPENO)','BalanceRatio','String','','尾款最小比例','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:11','SYS_Designer','2020/04/15 11:16:00','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1225','1225','0','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductBalanceRatio(TYPENO)','incidentals','String','','杂费最小比例','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/15 11:03:31','SYS_Designer','2020/04/15 11:08:06','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1230','1230','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductXDBalanceRatio(TYPENO)','XDBalanceRatio','String','','尾款限定比例','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/14 13:53:23','SYS_Designer','2020/04/15 11:16:00','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1235','1235','0','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductXDBalanceRatio(TYPENO)','XDincidentals','String','','杂费限定比例','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/15 11:03:52','SYS_Designer','2020/04/15 11:08:12','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1240','1240','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductISPurchase(TYPENO)','ISPurchase','String','','购置费（是否参融）','','1','Select','1','1','Code','DeleteFlag','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:11','SYS_Designer','2020/04/15 10:59:29','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1260','1260','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductISInsurance(TYPENO)','ISInsurance','String','','保险（是否参融）','','1','Select','1','1','Code','DeleteFlag','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:11','SYS_Designer','2020/04/15 10:59:38','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1280','1280','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductISRetrofitting(TYPENO)','ISRetrofitting','String','Y','加装（是否参融）','','1','Select','1','1','Code','DeleteFlag','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:11','SYS_Designer','2020/04/15 10:59:48','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1300','1300','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductISGPS(TYPENO)','ISGPS','String','','GPS（是否参融）','','1','Select','1','1','Code','DeleteFlag','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:11','SYS_Designer','2020/04/15 10:59:58','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1310','1310','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductISIncidental(TYPENO)','ISincidentals','String','','杂费（是否参融）','','1','Select','1','1','Code','DeleteFlag','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/15 11:02:26','SYS_Designer','2020/04/15 11:08:53','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1320','1320','1','O','EFFECTIVEDATE','EFFECTIVEDATE','String','','生效日期','','1','Text','1','1','','','','10','1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:39:35','SYS_Designer','2020/04/15 10:54:41','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1340','1340','1','O','fact_date','fact_date','String','','初次投放时间','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:11','SYS_Designer','2020/04/15 10:55:02','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1360','1360','1','O','fact_money','fact_money','String','','产品投放金额','','1','Text','2','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:11','SYS_Designer','2020/04/15 10:56:41','0','','1','','','',''); +-- 添加对应的菜单 +Insert Into AWE_MENU_INFO (menuid,menuname,displayname,sortno,url,urlparam,target,style,isinuse,remark,inputorgid,inputuserid,inputtime,updateorgid,updateuserid,updatetime,accesstype,icon,appicon) Values ('9600100313','产品管理报表','产品管理报表','9600100313','/ProductManage/ProductsBusinessList.jsp','','_self','','1','',null,'SYS_Designer','2020/04/12 16:09:26',null,'SYS_Designer','2020/04/12 16:09:26','10','',''); +Insert Into AWE_Role_Menu (roleid,menuid) Values ('099','9600100313'); -- 客户张磊修改内容 @@ -244,13 +285,3 @@ INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSER INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('bd605c45dc554628ae5094c58a270b26', 'be101123ef74413eb0d8acad8b6b22b9', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('f921be5522b14cf38d04320165696a74', '755698c1c27a43efa6c23310757c6163', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); --- 罚息减免流程显示小计 -DELETE FROM awe_do_library WHERE dono='LCRentIncomeTempReductionList' AND colindex='1366'; -INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LCRentIncomeTempReductionList','1366','1366','1','','com.amarsoft.dict.als.manage.ColRelativeInfo.getPlanPenalty(PLAN_ID)','PLAN_PENALTY','String','','应收罚息','','2','Text','2','3','','','',NULL,'1','1','0','1','0',0,'','','','SYS_Designer','2017/07/13 17:28:53','SYS_Designer','2020/04/13 09:36:12','0','','1','','','',''); - -DELETE FROM awe_do_library WHERE dono='LCRentIncomeTempReductionList' AND colindex='1426'; -INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LCRentIncomeTempReductionList','1426','1426','1','','com.amarsoft.dict.als.manage.ColRelativeInfo.getPenaltyOver(FLOWUNID,PLAN_ID)','PENALTY_OVER','String','','罚息余额','','2','Text','2','3','','','',NULL,'1','1','0','1','0',0,'','','','SYS_Designer','2017/07/13 17:28:14','SYS_Designer','2020/04/13 09:36:33','0','','1','','','',''); - -DELETE FROM awe_do_library WHERE dono='LCRentIncomeTempReductionList' AND colindex='1450'; -INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LCRentIncomeTempReductionList','1450','1450','1','O','PENALTY_ADJUST','PENALTY_ADJUST','Number','','本次减免罚息','','2','Text','2','3','','','','0','1','0','0','1','0',1,'0','','','SYS_Designer','2017/06/27 09:58:49','SYS_Designer','2020/04/13 09:36:45','0','','1','','','',''); - From 61fa57610250855c7103c78668e969647536def4 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 15 Apr 2020 16:08:19 +0800 Subject: [PATCH 53/89] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8A=A5=E8=A1=A8=E6=98=AF=E5=90=A6=E5=8F=82?= =?UTF-8?q?=E8=9E=8D=E8=8E=B7=E5=8F=96=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../awe/dw/ui/list/ProductsBusinessListUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/amarsoft/awe/dw/ui/list/ProductsBusinessListUtil.java b/src/com/amarsoft/awe/dw/ui/list/ProductsBusinessListUtil.java index e42fba365..12214154a 100644 --- a/src/com/amarsoft/awe/dw/ui/list/ProductsBusinessListUtil.java +++ b/src/com/amarsoft/awe/dw/ui/list/ProductsBusinessListUtil.java @@ -137,9 +137,9 @@ public class ProductsBusinessListUtil { public static String getProductISInsurance(String TYPENO) throws Exception{ String isParticipation = ""; Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); - Map parms = productRates.get("PURCHASE_TAX"); + Map parms = productRates.get("INSURANCE_PREMIUM"); if(parms!=null && parms.size()>0){ - isParticipation =getString( parms.get("INSURANCE_PREMIUM")); + isParticipation =getString( parms.get("FINAN")); } return isParticipation; //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09"); @@ -150,7 +150,7 @@ public class ProductsBusinessListUtil { Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); Map parms = productRates.get("TABLEWARE_FEE"); if(parms!=null && parms.size()>0){ - isParticipation =getString( parms.get("INSURANCE_PREMIUM")); + isParticipation =getString( parms.get("FINAN")); } return isParticipation.length()>0?isParticipation:"Y"; //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09"); @@ -161,7 +161,7 @@ public class ProductsBusinessListUtil { Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); Map parms = productRates.get("GPS_FEE"); if(parms!=null && parms.size()>0){ - isParticipation =getString( parms.get("INSURANCE_PREMIUM")); + isParticipation =getString( parms.get("FINAN")); } return isParticipation; //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09"); @@ -172,7 +172,7 @@ public class ProductsBusinessListUtil { Map> productRates = ProductParamUtil.getProductComponentType(TYPENO, "PRD0315"); Map parms = productRates.get("INCIDENTAL"); if(parms!=null && parms.size()>0){ - isParticipation =getString( parms.get("INSURANCE_PREMIUM")); + isParticipation =getString( parms.get("FINAN")); } return isParticipation.length()>0?isParticipation: "Y" ; //return ProductParamUtil.getProductParameterValue(TYPENO, "PRD0315", "FINAL_PAYMENT", "CostType09"); From 60f15f97c072283cd77e11a3370a5f0215e25fef Mon Sep 17 00:00:00 2001 From: zhangbb Date: Wed, 15 Apr 2020 22:28:52 +0800 Subject: [PATCH 54/89] =?UTF-8?q?1.=E7=BA=A2=E5=86=B2=E6=97=B6=E7=BA=A2?= =?UTF-8?q?=E5=86=B2=E4=B8=A4=E6=AC=A1bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java b/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java index 313b8574c..9f6a46d1e 100644 --- a/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java +++ b/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java @@ -37,7 +37,7 @@ public class InsertRentPlanStatus extends BaseBussiness{ BigDecimal balance_money = new BigDecimal(money).setScale(2, BigDecimal.ROUND_HALF_UP); System.out.println("===========租金差额为： "+money); //有代偿记录，并且本次租金已经还完 - if(boDDI!=null&&balance_money.compareTo(new BigDecimal("0"))>-1){ + if(boDDI!=null&&(balance_money.compareTo(new BigDecimal("0"))==-1||balance_money.compareTo(new BigDecimal("0"))==0)){ calc.writeBackDistributor(rentPlanId, Sqlca); } } From a6903544cbfa980ab775089b4002bd834dac7bbc Mon Sep 17 00:00:00 2001 From: zhangbb Date: Thu, 16 Apr 2020 14:50:00 +0800 Subject: [PATCH 55/89] =?UTF-8?q?1.=E5=A4=9A=E4=BD=99=E8=BF=98=E6=AC=BE?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quartzmession/SurplusMoneyMakeSureIn.java | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 src_tenwa/com/tenwa/lease/app/quartzmession/SurplusMoneyMakeSureIn.java diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/SurplusMoneyMakeSureIn.java b/src_tenwa/com/tenwa/lease/app/quartzmession/SurplusMoneyMakeSureIn.java new file mode 100644 index 000000000..2265da917 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/SurplusMoneyMakeSureIn.java @@ -0,0 +1,79 @@ +package com.tenwa.lease.app.quartzmession; + + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import jbo.app.tenwa.calc.LC_RENT_INCOME; +import jbo.app.tenwa.calc.VI_LC_RENT_PLAN; +import jbo.com.tenwa.lease.comm.CONFIGURATE; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; + +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.are.util.StringFunction; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.reckon.util.UUIDUtil; + + +/** + * 结清半年后网银自动确认收入 + * @author tangfutang + */ +public class SurplusMoneyMakeSureIn implements Job{ + + public void execute(JobExecutionContext arg0) throws JobExecutionException { + JBOTransaction tx=null; + Transaction Sqlca = null; + try { + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + tx = Sqlca.getTransaction(); + String date_sql = "SELECT DATE_ADD(STR_TO_DATE(lri.hire_date,'%Y/%m/%d'),INTERVAL 183 DAY) as hire_date,contract_id FROM lb_contract_info lci LEFT JOIN (SELECT lria.hire_date, lria.contract_id FROM lc_rent_income lria WHERE lria.hire_date = (SELECT MAX(lrib.hire_date) FROM lc_rent_income lrib WHERE lria.contract_id = lrib.contract_id) GROUP BY contract_id) lri ON lri.contract_id = lci.id WHERE lci.contract_status ='100' OR lci.contract_status ='105'"; + List> date_list = DataOperatorUtil.getDataBySql(date_sql); + for(int i=0;i Date: Thu, 16 Apr 2020 16:53:06 +0800 Subject: [PATCH 56/89] =?UTF-8?q?=E7=BD=91=E9=93=B6=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=8A=A0confirm=5Fmoney=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_calc.xml | 2 ++ src_jbo/jbo/app/tenwa/calc/LC_EBANK.java | 4 ++++ src_jbo/jbo/app/tenwa/calc/LC_EBANK_TEMP.java | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index cdc80e184..2a2d2e573 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -40,6 +40,7 @@ + @@ -245,6 +246,7 @@ + diff --git a/src_jbo/jbo/app/tenwa/calc/LC_EBANK.java b/src_jbo/jbo/app/tenwa/calc/LC_EBANK.java index cbec30373..f567fd10c 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_EBANK.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_EBANK.java @@ -162,6 +162,10 @@ public interface LC_EBANK{ */ public static final String RETURN_MONEY = "RETURN_MONEY"; /** + * 确认收入金额 DOUBLE(22)
+ */ + public static final String CONFIRM_MONEY = "CONFIRM_MONEY"; + /** * 交易时间 STRING(32)
*/ public static final String FACT_TIME = "FACT_TIME"; diff --git a/src_jbo/jbo/app/tenwa/calc/LC_EBANK_TEMP.java b/src_jbo/jbo/app/tenwa/calc/LC_EBANK_TEMP.java index 27180bc14..c7583edef 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_EBANK_TEMP.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_EBANK_TEMP.java @@ -162,6 +162,10 @@ public interface LC_EBANK_TEMP{ */ public static final String RETURN_MONEY = "RETURN_MONEY"; /** + * 确认收入金额 DOUBLE(22)
+ */ + public static final String CONFIRM_MONEY = "CONFIRM_MONEY"; + /** * 业务类型 STRING(10)
*/ public static final String BUSINESS_TYPE = "BUSINESS_TYPE"; From a0bf1314a0b0a849ac505105dac08e727caaf0f9 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Thu, 16 Apr 2020 17:14:14 +0800 Subject: [PATCH 57/89] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=E4=BF=9D=E8=AF=81=E9=87=91=E6=98=AF=E5=90=A6=E7=BA=A2?= =?UTF-8?q?=E5=86=B2=E5=88=A4=E6=96=ADbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java b/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java index 9f6a46d1e..b5ffc9f27 100644 --- a/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java +++ b/src_tenwa/com/tenwa/flow/rent/copyrent/InsertRentPlanStatus.java @@ -37,7 +37,7 @@ public class InsertRentPlanStatus extends BaseBussiness{ BigDecimal balance_money = new BigDecimal(money).setScale(2, BigDecimal.ROUND_HALF_UP); System.out.println("===========租金差额为： "+money); //有代偿记录，并且本次租金已经还完 - if(boDDI!=null&&(balance_money.compareTo(new BigDecimal("0"))==-1||balance_money.compareTo(new BigDecimal("0"))==0)){ + if(boDDI!=null&&(balance_money.compareTo(new BigDecimal("0"))==1||balance_money.compareTo(new BigDecimal("0"))==0)){ calc.writeBackDistributor(rentPlanId, Sqlca); } } From b52cfa89d033cde9aee6c82a7bd13473a4bae0f5 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Thu, 16 Apr 2020 19:00:20 +0800 Subject: [PATCH 58/89] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=93=E6=B8=85183?= =?UTF-8?q?=E5=A4=A9=E4=B9=8B=E5=90=8E=EF=BC=8C=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=B0=86=E8=AF=A5=E5=90=88=E5=90=8C=E6=A0=B8=E9=94=80=E7=A7=9F?= =?UTF-8?q?=E9=87=91=E7=94=A8=E8=BF=87=E7=9A=84=E7=BD=91=E9=93=B6=E5=8F=AF?= =?UTF-8?q?=E6=A0=B8=E9=94=80=E9=87=91=E9=A2=9D=E8=BF=98=E6=9C=89=E5=80=BC?= =?UTF-8?q?=E7=9A=84=E8=BD=AC=E5=85=A5=E6=94=B6=E5=85=A5=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quartzmession/SurplusMoneyMakeSureIn.java | 167 +++++++++++++----- 1 file changed, 125 insertions(+), 42 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/SurplusMoneyMakeSureIn.java b/src_tenwa/com/tenwa/lease/app/quartzmession/SurplusMoneyMakeSureIn.java index 2265da917..204a15ab7 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/SurplusMoneyMakeSureIn.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/SurplusMoneyMakeSureIn.java @@ -1,74 +1,79 @@ package com.tenwa.lease.app.quartzmession; - -import java.text.SimpleDateFormat; -import java.util.Date; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; - -import jbo.app.tenwa.calc.LC_RENT_INCOME; -import jbo.app.tenwa.calc.VI_LC_RENT_PLAN; -import jbo.com.tenwa.lease.comm.CONFIGURATE; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; - import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; - import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.JBOException; import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.are.jbo.JBOTransaction; -import com.amarsoft.are.util.StringFunction; import com.amarsoft.awe.util.Transaction; import com.amarsoft.dict.als.cache.CacheLoaderFactory; import com.tenwa.comm.util.jboutil.DataOperatorUtil; -import com.tenwa.reckon.util.UUIDUtil; - +import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; +import jbo.voucher.LV_VOUCHER_CONFIG; +import jbo.voucher.TAX_CODE; /** * 结清半年后网银自动确认收入 * @author tangfutang */ -public class SurplusMoneyMakeSureIn implements Job{ +public class SurplusMoneyMakeSureIn implements Job { + @SuppressWarnings("deprecation") public void execute(JobExecutionContext arg0) throws JobExecutionException { - JBOTransaction tx=null; Transaction Sqlca = null; + String sql = ""; + String EBANK_SN = ""; try { Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - tx = Sqlca.getTransaction(); - String date_sql = "SELECT DATE_ADD(STR_TO_DATE(lri.hire_date,'%Y/%m/%d'),INTERVAL 183 DAY) as hire_date,contract_id FROM lb_contract_info lci LEFT JOIN (SELECT lria.hire_date, lria.contract_id FROM lc_rent_income lria WHERE lria.hire_date = (SELECT MAX(lrib.hire_date) FROM lc_rent_income lrib WHERE lria.contract_id = lrib.contract_id) GROUP BY contract_id) lri ON lri.contract_id = lci.id WHERE lci.contract_status ='100' OR lci.contract_status ='105'"; - List> date_list = DataOperatorUtil.getDataBySql(date_sql); - for(int i=0;i list = new ArrayList(); + /** + * 1：获取当前已经结清， 并且结清大于等于183天的合同 + */ + sql = "SELECT contract_id FROM lb_contract_info lci LEFT JOIN (SELECT lria.hire_date,lria.contract_id FROM lc_rent_income lria LEFT JOIN LC_EBANK LE ON LE.ID=LRIA.EBANK_NUMBER WHERE lria.hire_date = (SELECT MAX(lrib.hire_date) FROM lc_rent_income lrib WHERE lria.contract_id = lrib.contract_id) AND IFNULL(LE.MAYOPE_MONEY,0)<>0 GROUP BY contract_id) lri ON lri.contract_id = lci.id WHERE (lci.contract_status = '100' OR lci.contract_status = '105') AND DATE_FORMAT(NOW(), '%Y/%m/%d') >= DATE_ADD(STR_TO_DATE(lri.hire_date, '%Y/%m/%d'),INTERVAL 183 DAY) "; + List> date_list = DataOperatorUtil.getDataBySql(sql); + /** + *:2：循环获取合同租金核销用到过并且还有可核销金额的网银信息，将网银流水号存入list集合 + */ + for (int i = 0; i < date_list.size(); i++) { String contractId = date_list.get(i).get("contract_id"); - String hireDate = date_list.get(i).get("hire_date"); - Date nowDate=new Date(); - SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); - Date old=df.parse(hireDate); - if(!nowDate.before(old)){ - //多余的网银收款进行确认收入 - } - } - - } catch (JBOException e) { - if (tx != null) { - try { - tx.rollback(); - tx=null; - } catch (JBOException e1) { - e1.printStackTrace(); + /** + * 3：获取该合同相关租金收款，资金收款用过的网银， 未核销完的网银数据， + */ + sql = "SELECT LE.ID AS EBANK_ID,LE.EBANK_SN FROM (SELECT EBANK_NUMBER FROM LC_RENT_INCOME WHERE CONTRACT_ID = '"+contractId+"' AND (EBANK_NUMBER IS NOT NULL AND EBANK_NUMBER <> '') GROUP BY EBANK_NUMBER )LRI LEFT JOIN LC_EBANK LE ON LE.ID=LRI.EBANK_NUMBER WHERE IFNULL(LE.MAYOPE_MONEY,0)<>0 "; + List> s1 = DataOperatorUtil.getDataBySql(sql); + for (Map map : s1) { + if (!list.contains(map.get("EBANK_SN"))) { + list.add(map.get("EBANK_SN")); + } + } + /** + * 4: 循环网银信息，将多余还款金额确认收入 + */ + for(int a=0; a map = new HashMap(); + Map param = new HashMap(); + CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); + String VOUCHER_TYPE = "1"; + String userid="admin"; + String MONEY = null; + String MONEYNOTAX = null; + String MONEYTAX = null; + String ACCOUNT_DATE = null; + String FACT_DATE = null; + String CONTRACT_NUMBER = null; + String PROJECT_NAME = null; + String leas_form = null; + String DISTRIBUTOR_ID = null; + String DISTRIBUTOR_NAME = null; + String CUSTID = null; + String CUSTNAME = null; + String CUSTOMERTYPE = null; + String BUSINESSTYPE = null; + String TAX_NUM = null; + + String sql = "SELECT ROUND((getTax (lci.LEAS_FORM,'租金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LE.CONFIRM_MONEY,0) AS MONEY,IFNULL(ROUND(IFNULL(LE.CONFIRM_MONEY,0)/getTax(LCI.LEAS_FORM,'租金',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL(IFNULL(LE.CONFIRM_MONEY,0)-ROUND(IFNULL(LE.CONFIRM_MONEY,0)/getTax(LCI.LEAS_FORM,'租金',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(NOW(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(LE.FACT_DATE,'%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,IFNULL(CI1.CUSTOMER_NUM,CI2.CUSTOMER_NUM) AS CUSTOMERID,IFNULL(CI1.CUSTOMERNAME,CI2.CUSTOMERNAME) AS CUSTOMERNAME,IFNULL(CI1.CUSTOMERTYPE,CI2.CUSTOMERTYPE) AS CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_EBANK LE LEFT JOIN (SELECT EBANK_NUMBER,MAX(CONTRACT_ID) AS CONTRACT_ID FROM LC_RENT_INCOME WHERE CONTRACT_ID='"+CONTRACT_ID+"' AND (EBANK_NUMBER IS NOT NULL AND EBANK_NUMBER <> '') GROUP BY CONTRACT_ID,EBANK_NUMBER)LRI ON LRI.EBANK_NUMBER=LE.ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LRI.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CI1 ON CI1.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN CUSTOMER_INFO CI2 ON CI2.CUSTOMERID=LE.CUSTOMER_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LE.EBANK_SN='"+EBANK_SN+"' AND IFNULL(LE.CONFIRM_MONEY,0)>0"; + List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); + + for (int i = 0; i < dataList.size(); i++) { + MONEY = dataList.get(i).get("MONEY"); + MONEYNOTAX = dataList.get(i).get("MONEYNOTAX"); + MONEYTAX = dataList.get(i).get("MONEYTAX"); + ACCOUNT_DATE = dataList.get(i).get("ACCOUNT_DATE"); + FACT_DATE = dataList.get(i).get("FACT_DATE"); + CONTRACT_ID = dataList.get(i).get("CONTRACT_ID"); + CONTRACT_NUMBER = dataList.get(i).get("CONTRACT_NUMBER"); + PROJECT_NAME = dataList.get(i).get("PROJECT_NAME"); + leas_form = "02"; + DISTRIBUTOR_ID = dataList.get(i).get("DISTRIBUTOR_ID"); + DISTRIBUTOR_NAME = dataList.get(i).get("DISTRIBUTOR_NAME"); + CUSTID = dataList.get(i).get("CUSTOMERID"); + CUSTNAME = dataList.get(i).get("CUSTOMERNAME"); + CUSTOMERTYPE = dataList.get(i).get("CUSTOMERTYPE"); + BUSINESSTYPE = dataList.get(i).get("BUSINESSTYPE"); + TAX_NUM = dataList.get(i).get("TAX_NUM"); + // 通过税率获取编码 + BizObject TAX_CODES = null; + if (TAX_NUM != null && !"".equals(TAX_NUM)) { + TAX_CODES = JBOFactory.createBizObjectQuery(TAX_CODE.CLASS_NAME, "TAX_NUMBER='" + TAX_NUM + "'").getSingleResult(false); + } + + param.put("FACT_MONEY", MONEY); + param.put("INTERESTNOTAX", MONEYNOTAX); + param.put("TAX", MONEYTAX); + param.put("ACCOUNT_DATE", ACCOUNT_DATE); + param.put("FACT_DATE", FACT_DATE); + param.put("CONTRACT_ID", CONTRACT_ID); + param.put("CONTRACT_NUMBER", CONTRACT_NUMBER); + param.put("PROJECT_NAME", PROJECT_NAME); + param.put("LEAS_FORM", leas_form); + param.put("DISTRIBUTOR_ID", DISTRIBUTOR_ID); + param.put("DISTRIBUTOR_NAME", DISTRIBUTOR_NAME); + param.put("CUSTID", CUSTID); + param.put("CUSTNAME", CUSTNAME); + param.put("CUSTOMERTYPE", CUSTOMERTYPE); + param.put("BUSINESSTYPE", BUSINESSTYPE); + param.put("F57", EBANK_SN); + param.put("VOUCHERNO", VOUCHERNO); + if (TAX_CODES != null) { + param.put("TAX_CODE", TAX_CODES.getAttribute("TAX_CODES").getString()); + } + + map.clear(); + map.put("PROJ_TYPE", leas_form); + map.put("VOUCHER_NO", VOUCHERNO); + BizObject vouch = DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); + if (vouch != null) { + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca); + } + } + } } From bc6ddde0f6adb4143419d06ac5a1838e0f30b262 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 16 Apr 2020 21:31:36 +0800 Subject: [PATCH 59/89] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=A2=E6=88=B7(?= =?UTF-8?q?=E5=BC=A0=E7=A3=8A)=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 鎶ヨ〃/姹借溅绫绘姤琛ㄤ竴/瀹㈡埛铻嶈祫鏄庣粏琛╛璐㈠姟.xml | 792 ++++---- 鎶ヨ〃/姹借溅绫绘姤琛ㄤ竴/绉熼噾璁″垝琛╛姹借溅.xml | 1718 +++++++++-------- .../缁忛攢鍟嗗垎绫绘姤琛/缁忛攢鍟嗕繚璇侀噾缂寸撼鏄庣粏琛.xml | 170 ++ 3 files changed, 1510 insertions(+), 1170 deletions(-) create mode 100644 鎶ヨ〃/缁忛攢鍟嗗垎绫绘姤琛/缁忛攢鍟嗕繚璇侀噾缂寸撼鏄庣粏琛.xml diff --git a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ竴/瀹㈡埛铻嶈祫鏄庣粏琛╛璐㈠姟.xml b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ竴/瀹㈡埛铻嶈祫鏄庣粏琛╛璐㈠姟.xml index 6d73d19a0..1eccefd0e 100644 --- a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ竴/瀹㈡埛铻嶈祫鏄庣粏琛╛璐㈠姟.xml +++ b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ竴/瀹㈡埛铻嶈祫鏄庣粏琛╛璐㈠姟.xml @@ -38,11 +38,13 @@ 2c9023815726a036015726a496b00001 COMPLEXSQL SELECT + lci.subjectname, LCI.CONTRACT_NUMBER AS CONTRACT_NUMBER , CIF.CUSTOMERNAME AS CUSTOMERNAME, CIF.CERTID AS CERTID, CIF.CUSTOMER_NUM AS CUSTOMER_NUM, LCCT.YEAR_RATE AS YEAR_RATE, + DATE_FORMAT(FB.inputTime,'%Y%m') AS up, IFNULL(LFIF.FACT_MONEY_F,0) AS PAY_MONEY, CASE WHEN PSL.operationType = 'DYCD' THEN IFNULL(LFI.FACT_MONEY,0) ELSE '0.00' END AS DYCD_MONEY, IFNULL(LCCT.GPS_FEE,0) AS GPS_MONEY, @@ -60,10 +62,13 @@ DI.DISTRIBUTOR_NAME AS DISTRIBUTOR_NAME, CASE WHEN (LCI.CONTRACT_STATUS='105' OR LCI.CONTRACT_STATUS='100') AND LCI.ACTUAL_END_DATE IS NOT NULL THEN LCI.ACTUAL_END_DATE WHEN (LCI.CONTRACT_STATUS='105' OR LCI.CONTRACT_STATUS='100') AND LCI.ACTUAL_END_DATE IS NULL THEN LCI.END_DATE - ELSE '' END AS END_DATE + ELSE '' END AS END_DATE,ct.typename FROM LC_CALC_CONDITION LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LCCT.CONTRACT_ID +LEFT JOIN + (SELECT FLOW_KEY,MAX(FLOW_UNID) AS FLOWUNID,inputTime FROM FLOW_BUSSINESS_OBJECT WHERE FLOW_NAME LIKE '%浠樻鐢宠%' GROUP BY FLOW_KEY) FB + ON FB.FLOW_KEY = LCI.CONTRACT_NUMBER LEFT JOIN (SELECT CONTRACT_ID,SUM(IFNULL(LRP.RENT,0)) AS RENT,SUM(IFNULL(LRP.CORPUS,0)) AS CORPUS,SUM(IFNULL(LRP.INTEREST,0)) AS INTEREST FROM LC_RENT_PLAN LRP GROUP BY CONTRACT_ID)LRP ON LRP.CONTRACT_ID=LCI.ID LEFT JOIN (SELECT LFI.CONTRACT_ID,LFI.FACT_MONEY AS FACT_MONEY_F,SUM(IFNULL(LFI.FACT_MONEY,0)) AS FACT_MONEY FROM LC_FUND_INCOME LFI WHERE PAY_TYPE='pay_type_out' GROUP BY CONTRACT_ID)LFI ON LFI.CONTRACT_ID=LCI.ID LEFT JOIN (SELECT CONTRACT_ID FROM LC_FUND_INCOME WHERE PAY_TYPE='pay_type_out' AND SETTLE_METHOD='settlemethod11' AND FEE_TYPE='feetype10' AND FUND_FEETYPE='feetype2' GROUP BY CONTRACT_ID)LFI2 ON LFI2.CONTRACT_ID=LCI.ID @@ -72,75 +77,18 @@ LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID=LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID=LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID -LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID = LPI.PRODUCT_ID +LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID = LPI.PRODUCT_ID LEFT JOIN BUSINESS_TYPE ct ON ct.typeno=lci.PRODUCT_ID WHERE LUL.IS_MAIN='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI.CONTRACT_STATUS='103' OR LCI.CONTRACT_STATUS='105') AND lci.businesstype='1' - 2c9c81b5687ebb7e01696b87ff3401e8 - CONTRACT_NUMBER + 2c9c81b969188a33016fa7c7b4d50513 + subjectname STRING - - CONTRACT_NUMBER - 100 - 21 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b87ff3401ea - CUSTOMERNAME - STRING - - - CUSTOMERNAME - 100 - 22 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b87ff3401e9 - CERTID - STRING - - - CERTID - 100 - 23 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b87ff3401ee - CUSTOMER_NUM - STRING - - - CUSTOMER_NUM - 100 + + subjectname + 210 24 true @@ -152,291 +100,6 @@ WHERE LUL.IS_MAIN='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI.CONTRAC - - 2c9c81b5687ebb7e01696b87ff3301e5 - YEAR_RATE - NUMBER - - - YEAR_RATE - 100 - 25 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b87ff3401f0 - PAY_MONEY - NUMBER - - - PAY_MONEY - 100 - 26 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b87ff3401eb - DYCD_MONEY - NUMBER - - - DYCD_MONEY - 100 - 27 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b87ff3401e6 - GPS_MONEY - NUMBER - - - GPS_MONEY - 100 - 28 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b87ff3401ef - GPS_FEE_FINA - STRING - - - GPS_FEE_FINA - 100 - 29 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b87ff3401e7 - CAUTION_MONEY - NUMBER - - - CAUTION_MONEY - 100 - 30 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01697b077f7002a0 - CAUTION_MONEY_FINA - STRING - - - CAUTION_MONEY_FINA - 100 - 31 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b87ff3401f1 - CLEAN_LEASE_MONEY - NUMBER - - - CLEAN_LEASE_MONEY - 100 - 32 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b87ff3401ec - SUM_MONEY - NUMBER - - - SUM_MONEY - 100 - 33 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b87ff3401ed - EQUIP_AMT - NUMBER - - - EQUIP_AMT - 100 - 34 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b8ae70b01f7 - FIRST_PAYMENT - NUMBER - - - FIRST_PAYMENT - 100 - 35 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b8ae70b01f4 - START_DATE - STRING - - - START_DATE - 100 - 36 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b8ae70b01f3 - RENT - NUMBER - - - RENT - 100 - 37 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b8ae70b01f5 - CORPUS - NUMBER - - - CORPUS - 100 - 38 - true - - false - false - false - false - - - - - - 2c9c81b5687ebb7e01696b8ae70b01f2 - INTEREST - NUMBER - - - INTEREST - 100 - 39 - true - - false - false - false - false - - - - 2c9c81b5687ebb7e01696b8ae70b01f6 DISTRIBUTOR_NAME @@ -445,6 +108,291 @@ WHERE LUL.IS_MAIN='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI.CONTRAC DISTRIBUTOR_NAME 200 + 25 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b87ff3401e8 + CONTRACT_NUMBER + STRING + + + CONTRACT_NUMBER + 100 + 26 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016f7a56385e04ae + typename + STRING + + + typename + 150 + 27 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b87ff3401ea + CUSTOMERNAME + STRING + + + CUSTOMERNAME + 100 + 28 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b87ff3401e9 + CERTID + STRING + + + CERTID + 100 + 29 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b87ff3401ee + CUSTOMER_NUM + STRING + + + CUSTOMER_NUM + 100 + 30 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b8ae70b01f4 + START_DATE + STRING + + + START_DATE + 100 + 31 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b87ff3301e5 + YEAR_RATE + NUMBER + + + YEAR_RATE + 100 + 32 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b87ff3401f0 + PAY_MONEY + NUMBER + + + PAY_MONEY + 100 + 33 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b87ff3401eb + DYCD_MONEY + NUMBER + + + DYCD_MONEY + 100 + 34 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b87ff3401e6 + GPS_MONEY + NUMBER + + + GPS_MONEY + 100 + 35 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b87ff3401ef + GPS_FEE_FINA + STRING + + + GPS_FEE_FINA + 100 + 36 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b87ff3401e7 + CAUTION_MONEY + NUMBER + + + CAUTION_MONEY + 100 + 37 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01697b077f7002a0 + CAUTION_MONEY_FINA + STRING + + + CAUTION_MONEY_FINA + 100 + 38 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b87ff3401f1 + CLEAN_LEASE_MONEY + NUMBER + + + CLEAN_LEASE_MONEY + 100 + 39 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b87ff3401ec + SUM_MONEY + NUMBER + + + SUM_MONEY + 100 40 true @@ -456,6 +404,120 @@ WHERE LUL.IS_MAIN='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI.CONTRAC + + 2c9c81b5687ebb7e01696b87ff3401ed + EQUIP_AMT + NUMBER + + + EQUIP_AMT + 100 + 41 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b8ae70b01f7 + FIRST_PAYMENT + NUMBER + + + FIRST_PAYMENT + 100 + 42 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016fc18c8581052a + up + STRING + + + up + 100 + 43 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b8ae70b01f3 + RENT + NUMBER + + + RENT + 100 + 44 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b8ae70b01f5 + CORPUS + NUMBER + + + CORPUS + 100 + 45 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01696b8ae70b01f2 + INTEREST + NUMBER + + + INTEREST + 100 + 46 + true + + false + false + false + false + + + + 2c9c81b56b88d5af016bd47243540002 END_DATE @@ -464,7 +526,7 @@ WHERE LUL.IS_MAIN='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI.CONTRAC END_DATE 100 - 41 + 47 true false @@ -500,6 +562,36 @@ WHERE LUL.IS_MAIN='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI.CONTRAC TEXT 1 + + 2c9c81b969188a33016fa7c7b4d50512 + subjectname + subjectname + + FILTER + STRING + TEXT + 2 + + + 2c9c81b670d245680170d40729ef0004 + START_DATE + START_DATE + + FILTER + DATE + DATERANGE + 3 + + + 2c9c81b670d245680170d407c6310005 + DISTRIBUTOR_NAME + DISTRIBUTOR_NAME + + FILTER + STRING + TEXT + 4 + 20 diff --git a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ竴/绉熼噾璁″垝琛╛姹借溅.xml b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ竴/绉熼噾璁″垝琛╛姹借溅.xml index 394444b7d..cbbe553e0 100644 --- a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ竴/绉熼噾璁″垝琛╛姹借溅.xml +++ b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ竴/绉熼噾璁″垝琛╛姹借溅.xml @@ -1,820 +1,898 @@ - - - - - 2c9023815726a036015726a496b00001 - eleasing_mysql - SPRING - dataSourceJDBC - - - - - com.tenwa.report.query.dialect.MysqlDialect - Mysql - - - - - 402882355d962cc3015d96302d7e0001 - 绉熼噾璁″垝琛╛姹借溅 - lc_rent_plan - true - 8 - REPORT - 2c9c81b7685efbbc016931c675a50006 - - - ff8080816e6d3692016f4b07ab620399 - - - - - - 402882355d962cc3015d9633af350002 - 绉熼噾璁″垝琛1 - lc_rent_plan - 2c9023815726a036015726a496b00001 - COMPLEXSQL - select rrp.*,CASE WHEN cl.itemname IS NOT NULL THEN cl.itemname ELSE rrp.collect_msg END AS collectmsg from report_rent_plan rrp left join code_library cl on cl.codeno='charge_way' and cl.itemno=rrp.collect_msg - - - - ff8080816e6d3692016f4b07ab6303a6 - contract_number - STRING - - - contract_number - 150 - 36 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab6403b6 - payment_number - STRING - - - payment_number - 100 - 37 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab6303ad - customer_name - STRING - - - customer_name - 100 - 38 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab6303ae - mobile - STRING - - - mobile - 100 - 39 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab6303a7 - distributor_name - STRING - - - distributor_name - 100 - 40 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab6403b5 - plan_list - NUMBER - - - plan_list - 100 - 41 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab6403b2 - plan_date - STRING - - - plan_date - 100 - 42 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab6303a4 - rent - NUMBER - #,##0.00 - - rent - 100 - 43 - true - - false - false - false - false - RIGHT - - - - - - ff8080816e6d3692016f4b07ab6403bc - year_rate - NUMBER - - - year_rate - 100 - 44 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab6303af - corpus - NUMBER - #,##0.00 - - corpus - 100 - 45 - true - - false - false - false - false - RIGHT - - - - - - ff8080816e6d3692016f4b07ab6303a8 - interest - NUMBER - #,##0.00 - - interest - 100 - 46 - true - - false - false - false - false - RIGHT - - - - - - ff8080816e6d3692016f4b07ab6403b4 - ALL_REMAIN_CORPUS - NUMBER - - - ALL_REMAIN_CORPUS - 100 - 47 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab63039f - penalty - NUMBER - #,##0.00 - - penalty - 100 - 48 - true - - false - false - false - false - RIGHT - - - - - - ff8080816e6d3692016f4b07ab6403b9 - penalty_adjust - NUMBER - #,##0.00 - - penalty_adjust - 100 - 49 - true - - false - false - false - false - RIGHT - - - - - - ff8080816e6d3692016f4b07ab6303a5 - fact_rent - NUMBER - #,##0.00 - - fact_rent - 100 - 50 - true - - false - false - false - false - RIGHT - - - - - - ff8080816e6d3692016f4b07ab63039a - fact_corpus - NUMBER - #,##0.00 - - fact_corpus - 100 - 51 - true - - false - false - false - false - RIGHT - - - - - - ff8080816e6d3692016f4b07ab6303b1 - fact_interest - NUMBER - #,##0.00 - - fact_interest - 100 - 52 - true - - false - false - false - false - RIGHT - - - - - - ff8080816e6d3692016f4b07ab6403b7 - fact_penalty - NUMBER - #,##0.00 - - fact_penalty - 100 - 53 - true - - false - false - false - false - RIGHT - - - - - - ff8080816e6d3692016f4b07ab6303a9 - interest_adjust - NUMBER - #,##0.00 - - interest_adjust - 100 - 54 - true - - false - false - false - false - RIGHT - - - - - - ff8080816e6d3692016f4b07ab6303ac - corpus_over - NUMBER - #,##0.00 - - corpus_over - 100 - 55 - true - - false - false - false - false - RIGHT - - - - - - ff8080816e6d3692016f4b07ab6303aa - interest_over - NUMBER - #,##0.00 - - interest_over - 100 - 56 - true - - false - false - false - false - RIGHT - - - - - - ff8080816e6d3692016f4b07ab6403b8 - rent_over - NUMBER - #,##0.00 - - rent_over - 100 - 57 - true - - false - false - false - false - RIGHT - - - - - - ff8080816e6d3692016f4b07ab6303b0 - RemainInterest - NUMBER - - - RemainInterest - 100 - 58 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab6403b3 - project_manage - STRING - - - project_manage - 100 - 59 - false - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab6303a0 - collect_status - STRING - - - collect_status - 100 - 60 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b3f1bda03c5 - collectmsg - STRING - - - collectmsg - 100 - 61 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab63039b - batch_no - STRING - - - batch_no - 100 - 62 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab6303ab - batch_status - STRING - - - batch_status - 100 - 63 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab63039c - batch_sn - STRING - - - batch_sn - 100 - 64 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab63039d - over_days - NUMBER - - - over_days - 100 - 65 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab63039e - own_bank - STRING - - - own_bank - 100 - 66 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab6403ba - HIRE_DATE - STRING - - - HIRE_DATE - 100 - 67 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab6303a3 - ACHIEVED_DATE - STRING - - - ACHIEVED_DATE - 100 - 68 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab6303a2 - num - NUMBER - - - num - 100 - 69 - true - - false - false - false - false - - - - - - ff8080816e6d3692016f4b07ab6403bb - project_manage_name - STRING - - - project_manage_name - 100 - 70 - true - - false - false - false - false - - - - - - - - - - - ff8080816e6d3692016f4b07ab6403c3 - contract_number - contract_number - - FILTER - STRING - TEXT - 0 - - - ff8080816e6d3692016f4b07ab6403c1 - customer_name - customer_name - - FILTER - STRING - TEXT - 1 - - - ff8080816e6d3692016f4b07ab6403be - plan_date - plan_date - - FILTER - DATE - DATERANGE - 2 - - - ff8080816e6d3692016f4b07ab6403c2 - distributor_name - distributor_name - - FILTER - STRING - TEXT - 3 - - - ff8080816e6d3692016f4b07ab6403bf - rent_over - - FILTER - NUMBER - NUMBERRANGE - JSON - 4 - - - ff8080816e6d3692016f4b07ab6403c0 - collect_status - collect_status - - FILTER - STRING - TEXT - 5 - - - ff8080816e6d3692016f4b07ab6403bd - batch_status - batch_status - - FILTER - STRING - COMBOBOX - SQL - SELECT '瀹屾垚' FROM DUAL UNION ALL SELECT '鏈畬鎴' FROM DUAL - 6 - - - - 20 - false - false - false - false - false -
- - - - - - ff8080816e6d3692016f4b07ab620399 - 0 - 0 - 0 - TABLE#402882355d962cc3015d9633af350002 - 402882355d962cc3015d96302d7e0001 - TABLE - - - + + + + + 2c9023815726a036015726a496b00001 + eleasing_mysql + SPRING + dataSourceJDBC + + + + + com.tenwa.report.query.dialect.MysqlDialect + Mysql + + + + + 402882355d962cc3015d96302d7e0001 + 绉熼噾璁″垝琛╛姹借溅 + lc_rent_plan + REPORT_CODE_1501463326078 + true + 8 + REPORT + 2c9c81b7685efbbc016931c675a50006 + + + 2c9c81b56552c9490165562e2e1f000e + + + + + + 402882355d962cc3015d9633af350002 + 绉熼噾璁″垝琛1 + lc_rent_plan + 2c9023815726a036015726a496b00001 + COMPLEXSQL + select rrp.*,CASE WHEN cl.itemname IS NOT NULL THEN cl.itemname ELSE rrp.collect_msg END AS collectmsg from report_rent_plan rrp left join code_library cl on cl.codeno='charge_way' and cl.itemno=rrp.collect_msg + + + + 2c9c81b969188a33016fa4662b1904f9 + subjectname + STRING + + + subjectname + 210 + 38 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016fa4662b1904f8 + collect_msg + STRING + + + collect_msg + 100 + 39 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b014a + contract_number + STRING + + + contract_number + 150 + 40 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b013e + payment_number + STRING + + + payment_number + 100 + 41 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b0147 + customer_name + STRING + + + customer_name + 100 + 42 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b012b + mobile + STRING + + + mobile + 100 + 43 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b0139 + distributor_name + STRING + + + distributor_name + 100 + 44 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc97017183180e1200a5 + start_date + STRING + + + start_date + 100 + 45 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b0145 + plan_list + NUMBER + + + plan_list + 100 + 46 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b0138 + plan_date + STRING + + + plan_date + 100 + 47 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b0130 + rent + NUMBER + #,##0.00 + + rent + 100 + 48 + true + + false + false + false + false + RIGHT + + + + + + 2c9c81b5687ebb7e0169523cb22b013c + year_rate + NUMBER + + + year_rate + 100 + 49 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b013f + corpus + NUMBER + #,##0.00 + + corpus + 100 + 50 + true + + false + false + false + false + RIGHT + + + + + + 2c9c81b5687ebb7e0169523cb22b0148 + interest + NUMBER + #,##0.00 + + interest + 100 + 51 + true + + false + false + false + false + RIGHT + + + + + + 2c9c81b5687ebb7e0169523cb22b0136 + ALL_REMAIN_CORPUS + NUMBER + + + ALL_REMAIN_CORPUS + 100 + 52 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b0142 + penalty + NUMBER + #,##0.00 + + penalty + 100 + 53 + true + + false + false + false + false + RIGHT + + + + + + 2c9c81b5687ebb7e0169523cb22b0134 + penalty_adjust + NUMBER + #,##0.00 + + penalty_adjust + 100 + 54 + true + + false + false + false + false + RIGHT + + + + + + 2c9c81b5687ebb7e0169523cb22b013d + fact_rent + NUMBER + #,##0.00 + + fact_rent + 100 + 55 + true + + false + false + false + false + RIGHT + + + + + + 2c9c81b5687ebb7e0169523cb22b013b + fact_corpus + NUMBER + #,##0.00 + + fact_corpus + 100 + 56 + true + + false + false + false + false + RIGHT + + + + + + 2c9c81b5687ebb7e0169523cb22b0140 + fact_interest + NUMBER + #,##0.00 + + fact_interest + 100 + 57 + true + + false + false + false + false + RIGHT + + + + + + 2c9c81b5687ebb7e0169523cb22b0131 + fact_penalty + NUMBER + #,##0.00 + + fact_penalty + 100 + 58 + true + + false + false + false + false + RIGHT + + + + + + 2c9c81b5687ebb7e0169523cb22b012e + interest_adjust + NUMBER + #,##0.00 + + interest_adjust + 100 + 59 + true + + false + false + false + false + RIGHT + + + + + + 2c9c81b5687ebb7e0169523cb22c014b + corpus_over + NUMBER + #,##0.00 + + corpus_over + 100 + 60 + true + + false + false + false + false + RIGHT + + + + + + 2c9c81b5687ebb7e0169523cb22b0143 + interest_over + NUMBER + #,##0.00 + + interest_over + 100 + 61 + true + + false + false + false + false + RIGHT + + + + + + 2c9c81b5687ebb7e0169523cb22b0132 + rent_over + NUMBER + #,##0.00 + + rent_over + 100 + 62 + true + + false + false + false + false + RIGHT + + + + + + 2c9c81b5687ebb7e0169523cb22b0144 + RemainInterest + NUMBER + + + RemainInterest + 100 + 63 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b0135 + project_manage + STRING + + + project_manage + 100 + 64 + false + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b012d + collect_status + STRING + + + collect_status + 100 + 65 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016f547338c403c2 + collectmsg + STRING + + + collectmsg + 100 + 66 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b012f + batch_no + STRING + + + batch_no + 100 + 67 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b0133 + batch_status + STRING + + + batch_status + 100 + 68 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b0137 + batch_sn + STRING + + + batch_sn + 100 + 69 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b0149 + over_days + NUMBER + + + over_days + 100 + 70 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b012c + own_bank + STRING + + + own_bank + 100 + 71 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b0146 + HIRE_DATE + STRING + + + HIRE_DATE + 100 + 72 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169a33d6cf902ed + ACHIEVED_DATE + STRING + + + ACHIEVED_DATE + 100 + 73 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e01695274c044014c + num + NUMBER + + + num + 100 + 74 + true + + false + false + false + false + + + + + + 2c9c81b5687ebb7e0169523cb22b013a + project_manage_name + STRING + + + project_manage_name + 100 + 75 + true + + false + false + false + false + + + + + + + + + + + 402882355d962cc3015d964057fa0018 + contract_number + contract_number + + FILTER + STRING + TEXT + 0 + + + 402882355d962cc3015d96411df00019 + customer_name + customer_name + + FILTER + STRING + TEXT + 1 + + + 402882355d964f99015d965743fe0001 + plan_date + plan_date + + FILTER + DATE + DATERANGE + 2 + + + 402882355d964f99015d9657c3b40002 + distributor_name + distributor_name + + FILTER + STRING + TEXT + 3 + + + 402882355dea42c5015dea4cd6690001 + rent_over + + FILTER + NUMBER + NUMBERRANGE + JSON + 4 + + + 2c9c81b56753d5c10167e83b21ec007d + collect_status + collect_status + + FILTER + STRING + TEXT + 5 + + + 2c9c81b5687ebb7e016957a522e7014d + batch_status + batch_status + + FILTER + STRING + COMBOBOX + SQL + SELECT '瀹屾垚' FROM DUAL UNION ALL SELECT '鏈畬鎴' FROM DUAL + 6 + + + 2c9c81b969188a33016fa4662b1904f7 + subjectname + subjectname + + FILTER + STRING + TEXT + 7 + + + 2c9c81b9700ecc9701718319140900a6 + start_date + start_date + + FILTER + DATE + DATERANGE + 8 + + + + 20 + false + false + false + false + false +
+ + + + + + 2c9c81b56552c9490165562e2e1f000e + 0 + 0 + 0 + TABLE#402882355d962cc3015d9633af350002 + 402882355d962cc3015d96302d7e0001 + TABLE + + + diff --git a/鎶ヨ〃/缁忛攢鍟嗗垎绫绘姤琛/缁忛攢鍟嗕繚璇侀噾缂寸撼鏄庣粏琛.xml b/鎶ヨ〃/缁忛攢鍟嗗垎绫绘姤琛/缁忛攢鍟嗕繚璇侀噾缂寸撼鏄庣粏琛.xml new file mode 100644 index 000000000..822137191 --- /dev/null +++ b/鎶ヨ〃/缁忛攢鍟嗗垎绫绘姤琛/缁忛攢鍟嗕繚璇侀噾缂寸撼鏄庣粏琛.xml @@ -0,0 +1,170 @@ + + + + + 2c9023815726a036015726a496b00001 + eleasing_mysql + SPRING + dataSourceJDBC + + + + + com.tenwa.report.query.dialect.MysqlDialect + Mysql + + + + + 2c9c81b9700ecc970171831c96dd00a8 + 缁忛攢鍟嗕繚璇侀噾缂寸撼鏄庣粏琛 + depositcharge_details + 6 + REPORT + 2c9c81b7685efbbc016931cef7cd000c + + + 2c9c81b9700ecc970171831c96e100af + + + + + + 2c9c81b9700ecc970171831c96d300a7 + 缁忛攢鍟嗕繚璇侀噾缂寸撼鏄庣粏琛 + depositcharge_details + 2c9023815726a036015726a496b00001 + COMPLEXSQL + SELECT +account, +COLLECT_WAY, +CAUTION_MONEY, +COLLECT_TIME +from D_DEPOSITCHARGE_INFO where MONEY_TYPE = 'bondCollect' order by UPDATETIME desc + + + + 2c9c81b9700ecc970171831c96e100a9 + account + STRING + + + account + 100 + 4 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc970171831c96e100aa + COLLECT_WAY + STRING + + + COLLECT_WAY + 100 + 5 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc970171831c96e100ab + COLLECT_TIME + STRING + + + COLLECT_TIME + 100 + 6 + true + + false + false + false + false + + + + + + 2c9c81b9700ecc970171831c96e100ac + CAUTION_MONEY + NUMBER + + + CAUTION_MONEY + 100 + 7 + true + + false + false + false + false + + + + + + + + + + + 2c9c81b9700ecc970171831c96e100ad + account + account + + FILTER + STRING + TEXT + 0 + + + 2c9c81b9700ecc970171831c96e100ae + COLLECT_TIME + COLLECT_TIME + + FILTER + DATE + DATERANGE + 1 + + + + 20 + false + false + false + false + false +
+ + + + + + 2c9c81b9700ecc970171831c96e100af + 0 + 0 + 0 + TABLE#2c9c81b9700ecc970171831c96d300a7 + 2c9c81b9700ecc970171831c96dd00a8 + TABLE + + + From 004586ecb432e8251c6c6acd17e1644082cf12f5 Mon Sep 17 00:00:00 2001 From: zhangjun Date: Fri, 17 Apr 2020 11:02:36 +0800 Subject: [PATCH 60/89] =?UTF-8?q?=E6=9F=9C=E5=8F=B7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apzl/comm/MailingContainerNumberImport.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java b/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java index cea1879cd..8a604f3e2 100644 --- a/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java +++ b/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java @@ -18,12 +18,9 @@ import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.officetempalte.importcallback.impl.BaseImportExcelCallBack; public class MailingContainerNumberImport extends BaseImportExcelCallBack{ - - @Override public void run(ASUser CurUser, BizObject importObject,Map model, Integer rowIndex, JBOTransaction tx,Transaction Sqlca) throws Exception { } - @Override public void runBefore(ASUser CurUser, Map model, List importObjects, JBOTransaction tx,Transaction Sqlca) throws Exception { Transaction Sqlca1 = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); @@ -33,11 +30,8 @@ public class MailingContainerNumberImport extends BaseImportExcelCallBack{ String error=""; // 错误描述 boolean flag=false; // 错误描述 String ARCHIVING_CABINET_NO=null; // 导入的邮寄柜号 + String CONTRACT_NUMBER=null; String sql1=""; // 原有的数据 - /** - * 校验本次Excel是否有重复的 - */ - /** * 校验本次导入数据在导入表是否已有 */ @@ -49,11 +43,10 @@ public class MailingContainerNumberImport extends BaseImportExcelCallBack{ ARCHIVING_CABINET_NO=bo.getAttribute("ARCHIVING_CABINET_NO").getString(); arrayList.add(ARCHIVING_CABINET_NO); // 通过本次excel中的数据查询导入的表, 判断是否重复 - sql1="SELECT ARCHIVING_CABINET_NO FROM LB_FILE_MAILARCHIVING_INFO WHERE ARCHIVING_CABINET_NO='"+ARCHIVING_CABINET_NO+"'"; + sql1="SELECT ARCHIVING_CABINET_NO,CONTRACT_NUMBER FROM LB_FILE_ARCHIVING_INFO WHERE ARCHIVING_CABINET_NO='"+ARCHIVING_CABINET_NO+"'"; List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); // 有结果集, 说明重复 if(dataList.size()>0){ - //error=",【邮寄柜号: "+ARCHIVING_CABINET_NO+"】"; if(! exclarrayList.contains(ARCHIVING_CABINET_NO) ){ exclarrayList.add(ARCHIVING_CABINET_NO); } @@ -61,8 +54,6 @@ public class MailingContainerNumberImport extends BaseImportExcelCallBack{ } } if(flag) { - //error = error.substring(1); - //throw new BusinessException(error+"已存在 ！"); throw new BusinessException("，excl中的邮寄柜号:"+String.join(", ", exclarrayList)+"已存在 ！"); } long count = arrayList.stream().distinct().count(); From 27b3d64c902ede5b187233651b1ac6facbed3dcb Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 17 Apr 2020 16:24:01 +0800 Subject: [PATCH 61/89] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=BD=92=E6=A1=A3?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comm/MailingContainerNumberImport.java | 66 +++++++++++-------- 1 file changed, 40 insertions(+), 26 deletions(-) diff --git a/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java b/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java index 8a604f3e2..6e19f08b5 100644 --- a/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java +++ b/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java @@ -29,7 +29,6 @@ public class MailingContainerNumberImport extends BaseImportExcelCallBack{ */ String error=""; // 错误描述 boolean flag=false; // 错误描述 - String ARCHIVING_CABINET_NO=null; // 导入的邮寄柜号 String CONTRACT_NUMBER=null; String sql1=""; // 原有的数据 /** @@ -37,38 +36,53 @@ public class MailingContainerNumberImport extends BaseImportExcelCallBack{ */ List> list = new ArrayList>(); Map map = new HashMap(); - List arrayList = new ArrayList(); - List exclarrayList = new ArrayList(); + List arrayList = new ArrayList(); //所有申请合同 + List exclarrayList = new ArrayList(); //申请编号不在系统中的集合 + List exclarrayExist = new ArrayList(); //申请编号在系统中已存在 + boolean flagExist=false; + List exclarrayRepeat = new ArrayList(); //excl中的数据重复 + boolean flagRepeat=false; for(BizObject bo:importObjects){ - ARCHIVING_CABINET_NO=bo.getAttribute("ARCHIVING_CABINET_NO").getString(); - arrayList.add(ARCHIVING_CABINET_NO); - // 通过本次excel中的数据查询导入的表, 判断是否重复 - sql1="SELECT ARCHIVING_CABINET_NO,CONTRACT_NUMBER FROM LB_FILE_ARCHIVING_INFO WHERE ARCHIVING_CABINET_NO='"+ARCHIVING_CABINET_NO+"'"; + CONTRACT_NUMBER=bo.getAttribute("CONTRACT_NUMBER").getString(); + if(arrayList.contains(CONTRACT_NUMBER)){ + if(! exclarrayRepeat.contains(CONTRACT_NUMBER)){ + exclarrayRepeat.add(CONTRACT_NUMBER); + } + flagRepeat=true; + } + arrayList.add(CONTRACT_NUMBER); + + // 通过本次excel中的数据是否在系统中 + //sql1="SELECT ARCHIVING_CABINET_NO,CONTRACT_NUMBER FROM LB_FILE_ARCHIVING_INFO WHERE ARCHIVING_CABINET_NO='"+CONTRACT_NUMBER+"'"; + sql1="select id from lb_contract_info where contract_no='"+CONTRACT_NUMBER+"'"; List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); - // 有结果集, 说明重复 - if(dataList.size()>0){ - if(! exclarrayList.contains(ARCHIVING_CABINET_NO) ){ - exclarrayList.add(ARCHIVING_CABINET_NO); - } + // 无结果，说明不在系统中 + if(dataList.size()<=0){ + if(! exclarrayList.contains(CONTRACT_NUMBER) ){ + exclarrayList.add(CONTRACT_NUMBER); + } flag=true; } + sql1="select id from LB_FILE_ARCHIVING_INFO where CONTRACT_NUMBER='"+CONTRACT_NUMBER+"'"; + dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); + // 无结果，说明不在系统中 + if(dataList.size()>0){ + if(! exclarrayExist.contains(CONTRACT_NUMBER) ){ + exclarrayExist.add(CONTRACT_NUMBER); + } + flagExist=true; + } + + } + if(flagRepeat) { + throw new BusinessException("，excl中的合同号:"+String.join(", ", exclarrayRepeat)+"重复，请检查！！！"); } if(flag) { - throw new BusinessException("，excl中的邮寄柜号:"+String.join(", ", exclarrayList)+"已存在 ！"); + throw new BusinessException("，excl中的合同号:"+String.join(", ", exclarrayList)+"在系统中不存在，请检查！！！"); } - long count = arrayList.stream().distinct().count(); - boolean isRepeat = count < arrayList.size(); - if(isRepeat){ - Set set = new HashSet<>(); - Set exist = new HashSet<>(); - for (String s : arrayList) { - if (set.contains(s)) { - exist.add(s); - } else { - set.add(s); - } - } - throw new BusinessException("，excl中的邮寄柜号:"+String.join(", ", exist)+"重复。"); + if(flagExist) { + throw new BusinessException("，excl中的合同号:"+String.join(", ", exclarrayExist)+"在系统中已存在，请检查！！！"); } + } } From 8ef26b9be70e2541e2892ae5561d2aed2f3dc469 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Mon, 20 Apr 2020 09:49:43 +0800 Subject: [PATCH 62/89] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3-?= =?UTF-8?q?=E5=8D=A1=E6=89=A3=E6=A0=B8=E9=94=80=E5=87=AD=E8=AF=81=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E4=B8=BA=E9=80=9A=E8=BF=87=E5=AE=9E=E6=94=B6=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E7=94=9F=E6=88=90=EF=BC=8C=E4=BB=A3=E5=81=BF=E5=90=8E?= =?UTF-8?q?=E5=8D=A1=E6=89=A3=E7=94=9F=E6=88=90=E4=BB=A3=E5=81=BF=E5=8F=8D?= =?UTF-8?q?=E5=86=B2=E7=9A=84=E9=80=BB=E8=BE=91=E7=94=B1=E5=8E=9F=E6=9D=A5?= =?UTF-8?q?=E5=8D=A1=E6=89=A3=E5=AE=8C=E7=94=9F=E6=88=90=E4=B8=80=E7=AC=94?= =?UTF-8?q?=E5=85=A8=E6=AC=BE=E7=9A=84=E5=8F=98=E6=9B=B4=E4=B8=BA=E5=8D=A1?= =?UTF-8?q?=E6=89=A3=E9=83=A8=E5=88=86=E5=B0=B1=E5=85=88=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=83=A8=E5=88=86=E7=9A=84=EF=BC=88=E6=9B=B4=E6=96=B0=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E9=9C=80=E8=A6=81=E5=B0=86SQL=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8F=98=E6=9B=B4=E4=B8=BA=E5=BD=93=E6=97=A5?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherRedCompensatory.java | 10 ++- .../InsertVoucherRentIncome.java | 78 +++++++++---------- .../voucher/serviceImp/VoucherToV8Impl.java | 3 +- .../CreateVoucherRentIncomeMission.java | 5 -- 4 files changed, 47 insertions(+), 49 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedCompensatory.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedCompensatory.java index 6bfc255d1..4786121ed 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedCompensatory.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedCompensatory.java @@ -17,7 +17,7 @@ import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; */ public class CreateVoucherRedCompensatory { - public void CreateVoucher(String VOUCHERNO,String userid,String LRP_ID) throws Exception{ + public void CreateVoucher(String VOUCHERNO,String userid,String LRI_ID) throws Exception{ Transaction Sqlca =null; Map map=new HashMap(); Map param=new HashMap(); @@ -35,6 +35,7 @@ public class CreateVoucherRedCompensatory { String BUSINESSTYPE=null; String PLAN_LIST=null; String F58=null; + String F56=null; String sql=""; param.clear(); @@ -42,11 +43,10 @@ public class CreateVoucherRedCompensatory { // 代偿反冲-收到的租金 if("PZ2019071500000030".equals(VOUCHERNO)){ - sql="SELECT IFNULL(V8.MONEY, 0) AS MONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LRP.CONTRACT_ID,V8.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,V8.DISTRIBUTOR_NAME,LRP.PLAN_LIST,LRP.ID AS F58,LCI.CONTRACT_NUMBER FROM (SELECT SUM(F7) AS MONEY,MAX(F58) AS F58,MAX(F65) AS DISTRIBUTOR_CODING,MAX(F61) AS DISTRIBUTOR_NAME FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿-收到代偿的租金%' AND F58 = '"+LRP_ID+"' AND F59 = '1' GROUP BY F3) V8 LEFT JOIN LC_RENT_PLAN LRP ON LRP.ID = V8.F58 LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRP.CONTRACT_ID WHERE LCI.BUSINESSTYPE = '1' AND IFNULL(V8.MONEY, 0) > 0 AND NOT EXISTS (SELECT F58 FROM VOUCHER_V8 WHERE F58=V8.F58 AND F59=1 AND MODULE_NAME LIKE '%代偿反冲-收到代偿的租金%') "; + sql="SELECT IFNULL(LRI.RENT, 0) AS MONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LRP.CONTRACT_ID,V8.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,V8.DISTRIBUTOR_NAME,LRP.PLAN_LIST,LRI.PLAN_ID AS F58,LRI.ID AS F56,LCI.CONTRACT_NUMBER FROM LC_RENT_INCOME LRI LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRI.CONTRACT_ID AND LRP.PLAN_LIST=LRI.PLAN_LIST LEFT JOIN (SELECT F58,MAX(F65) AS DISTRIBUTOR_CODING,MAX(F61) AS DISTRIBUTOR_NAME FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿-收到代偿的租金%' AND (F58 IS NOT NULL AND F58<>'') GROUP BY F58)V8 ON V8.F58=LRP.ID LEFT JOIN (SELECT F58,F56 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿反冲-收到代偿的租金%' AND (F56 IS NOT NULL AND F56<>'' AND F58 IS NOT NULL AND F58<>'') GROUP BY F58,F56)V9 ON V9.F58=LRI.PLAN_ID AND V9.F56=LRI.ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRI.CONTRACT_ID WHERE LRI.ID='"+LRI_ID+"' AND LCI.BUSINESSTYPE = '1' AND IFNULL(LRI.RENT, 0) > 0 AND V9.F58 IS NULL "; // 代偿反冲-收到的逾期利息 }else if("PZ2019071500000031".equals(VOUCHERNO)){ - // sql="SELECT IFNULL(LRIT.PENALTY, 0) AS MONEY,IFNULL(V8.MONEY, 0) AS MONEYNOTAX,ROUND((IFNULL(LRIT.PENALTY, 0) - IFNULL(V8.MONEY, 0)),2) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LRP.CONTRACT_ID,V8.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,V8.DISTRIBUTOR_NAME,LRP.PLAN_LIST,LRP.ID AS F58,LCI.CONTRACT_NUMBER FROM (SELECT SUM(F7) AS MONEY,MAX(F58) AS F58,MAX(F65) AS DISTRIBUTOR_CODING,MAX(F61) AS DISTRIBUTOR_NAME FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿-代偿逾期利息%' AND F58 = '"+LRP_ID+"' AND F59 = '1' GROUP BY F3) V8 LEFT JOIN LC_RENT_PLAN LRP ON LRP.ID = V8.F58 LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(PENALTY) AS PENALTY FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST)LRIT ON LRIT.CONTRACT_ID=LRP.CONTRACT_ID AND LRIT.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRP.CONTRACT_ID WHERE LCI.BUSINESSTYPE = '1' AND IFNULL(V8.MONEY, 0) > 0 AND NOT EXISTS (SELECT F58 FROM VOUCHER_V8 WHERE F58 = V8.F58 AND F59 = 1 AND MODULE_NAME LIKE '%代偿反冲-代偿逾期利息%') "; - sql="SELECT IFNULL(LRI.PENALTY, 0) AS MONEY,IFNULL(V8.MONEY, 0) AS MONEYNOTAX,ROUND((IFNULL(LRI.PENALTY, 0) - IFNULL(V8.MONEY, 0)),2) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LRP.CONTRACT_ID,DI.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRP.PLAN_LIST,LRP.ID AS F58,LCI.CONTRACT_NUMBER FROM (SELECT ID,CONTRACT_ID,PLAN_LIST FROM LC_RENT_PLAN WHERE ID = '"+LRP_ID+"') LRP LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRP.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(PENALTY) AS PENALTY FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN (SELECT SUM(F7) AS MONEY,MAX(F58) AS F58 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿-代偿逾期利息%' AND F58 = '"+LRP_ID+"' AND F59 = '1' GROUP BY F3) V8 ON V8.F58 = LRP.ID WHERE LCI.BUSINESSTYPE = '1' AND NOT EXISTS (SELECT F58 FROM VOUCHER_V8 WHERE F58 = LRP.ID AND F59 = 1 AND MODULE_NAME LIKE '%代偿反冲-代偿逾期利息%') "; + sql="SELECT IFNULL(LRI.PENALTY, 0) AS MONEY,IFNULL(V8.MONEY, 0) AS MONEYNOTAX,ROUND((IFNULL(LRI.PENALTY, 0) - IFNULL(V8.MONEY, 0)),2) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LRP.CONTRACT_ID,DI.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRP.PLAN_LIST,LRI.PLAN_ID AS F58,LRI.ID AS F56,LCI.CONTRACT_NUMBER FROM LC_RENT_INCOME LRI LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRI.CONTRACT_ID AND LRP.PLAN_LIST=LRI.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRP.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN (SELECT F58,SUM(F7) AS MONEY FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿-代偿逾期利息%' AND (F58 IS NOT NULL AND F58 <> '') GROUP BY F58) V8 ON V8.F58 = LRP.ID LEFT JOIN (SELECT F58,F56 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿反冲-代偿逾期利息%' AND (F58 IS NOT NULL AND F58 <> '' AND F56 IS NOT NULL AND F56<>'') GROUP BY F58,F56) V9 ON V9.F58 = LRI.PLAN_ID AND V9.F56=LRI.ID WHERE LRI.ID='"+LRI_ID+"' AND LCI.BUSINESSTYPE = '1' AND V9.F58 IS NULL AND IFNULL(LRI.PENALTY,0)>0 "; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, null); @@ -66,6 +66,7 @@ public class CreateVoucherRedCompensatory { BUSINESSTYPE=dataList.get(i).get("BUSINESSTYPE"); PLAN_LIST=dataList.get(i).get("PLAN_LIST"); F58=dataList.get(i).get("F58"); + F56=dataList.get(i).get("F56"); CONTRACT_NUMBER=dataList.get(i).get("CONTRACT_NUMBER"); param.put("FACT_MONEY",MONEY); @@ -79,6 +80,7 @@ public class CreateVoucherRedCompensatory { param.put("CUSTNAME",DISTRIBUTOR_NAME); param.put("PLAN_LIST",PLAN_LIST); param.put("F58",F58); + param.put("F56",F56); param.put("CONTRACT_NUMBER",CONTRACT_NUMBER); param.put("BUSINESSTYPE",BUSINESSTYPE); param.put("VOUCHERNO",VOUCHERNO); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java index b72e0c678..c2a7dbc25 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java @@ -39,16 +39,16 @@ public class InsertVoucherRentIncome { * 查询数据, 判断是否需要执行插入中间表 */ // 查询是否有当月的, 未生成凭证的数据(卡扣) - String sqls1="SELECT lri.RENT FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID) LV2 ON LV2.INCOME_ID = LRI.PLAN_ID AND LV2.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqls1="SELECT lri.RENT FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID = LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID) LV2 ON LV2.INCOME_ID = LRI.PLAN_ID AND LV2.LRI_ID = LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE LRI.CHARGE_WAY IN ('AutoBuckle','WXPay','WXUnionPay') AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') AND DATE_FORMAT(NOW(),'%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m')"; // 查询跨月的, 未生成凭证的数据(卡扣) - String sqls2="SELECT lri.RENT FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID) LV2 ON LV2.INCOME_ID = LRI.PLAN_ID AND LV2.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqls2="SELECT lri.RENT FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID = LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID) LV2 ON LV2.INCOME_ID = LRI.PLAN_ID AND LV2.LRI_ID = LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE LRI.CHARGE_WAY IN ('AutoBuckle','WXPay','WXUnionPay') AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') AND DATE_FORMAT(NOW(),'%Y-%m')<> DATE_FORMAT(lrp.plan_date, '%Y-%m')"; // 查询当前数据是否有逾期利息(卡扣) - String sqls3="SELECT lri.PENALTY FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_penalty_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_PENALTY_PLAN GROUP BY INCOME_ID) LV2 ON LV2.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.penalty > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') "; + String sqls3="SELECT lri.PENALTY FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_penalty_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID = LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_PENALTY_PLAN GROUP BY INCOME_ID) LV2 ON LV2.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE LRI.CHARGE_WAY IN ('AutoBuckle','WXPay','WXUnionPay') AND lri.penalty > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d')"; // 代偿反冲租金 - String sqls4="SELECT lri.RENT,LRP.ID AS F58 FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT F58 FROM VOUCHER_V8 WHERE F59 = 1 AND MODULE_NAME LIKE '%代偿反冲-收到代偿的租金%' GROUP BY F58)V8 ON V8.F58=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NOT NULL OR LV2.INCOME_ID IS NOT NULL) AND V8.F58 IS NULL AND lul.is_main = 'Y' "; + String sqls4="SELECT lri.RENT,LRI.ID AS F56 FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV1 ON LV1.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV2 ON LV2.INCOME_ID = LRP.ID LEFT JOIN (SELECT F58,F56 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿反冲-收到代偿的租金%' AND (F56 IS NOT NULL AND F56 <> '' AND F58 IS NOT NULL AND F58 <> '') GROUP BY F58,F56) V8 ON V8.F58 = LRI.PLAN_ID AND V8.F56 = LRI.ID WHERE LRI.CHARGE_WAY IN ('AutoBuckle','WXPay','WXUnionPay') AND lri.rent > 0 AND (LV1.INCOME_ID IS NOT NULL OR LV2.INCOME_ID IS NOT NULL) AND V8.F58 IS NULL AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/17', '%Y/%m/%d')"; // 代偿反冲逾期利息 - String slqs5="SELECT lri.PENALTY,LRP.ID AS F58 FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT F58 FROM VOUCHER_V8 WHERE F59 = 1 AND MODULE_NAME LIKE '%代偿反冲-代偿逾期利息%' GROUP BY F58)V8 ON V8.F58=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.PENALTY > 0 AND (LV1.INCOME_ID IS NOT NULL OR LV2.INCOME_ID IS NOT NULL) AND V8.F58 IS NULL AND lul.is_main = 'Y' "; + String slqs5="SELECT lri.PENALTY,LRI.ID AS F56 FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV1 ON LV1.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV2 ON LV2.INCOME_ID = LRP.ID LEFT JOIN (SELECT F58,F56 FROM VOUCHER_V8 WHERE MODULE_NAME LIKE '%代偿反冲-代偿逾期利息%' AND (F56 IS NOT NULL AND F56 <> '' AND F58 IS NOT NULL AND F58 <> '') GROUP BY F58,F56) V8 ON V8.F58 = LRI.PLAN_ID AND V8.F56 = LRI.ID WHERE LRI.CHARGE_WAY IN ('AutoBuckle','WXPay','WXUnionPay') AND lri.PENALTY > 0 AND (LV1.INCOME_ID IS NOT NULL OR LV2.INCOME_ID IS NOT NULL) AND V8.F58 IS NULL AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/17', '%Y/%m/%d') "; List> dataList1=DataOperatorUtil.getDataBySql(Sqlca, sqls1, null); List> dataList2=DataOperatorUtil.getDataBySql(Sqlca, sqls2, null); @@ -60,11 +60,11 @@ public class InsertVoucherRentIncome { * 将数据插入中间表的SQL */ // 未逾期及逾期未过月(卡扣) - String sql1="INSERT INTO lv_rent_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,CASE WHEN lrp.collect_msg IN ('WXPay', 'WXUnionPay') THEN lrp.collect_msg ELSE lrp.COLLECT_STATUS END AS COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM,LRI.ID FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID)LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID)LV2 ON LV2.INCOME_ID=LRI.PLAN_ID AND LV2.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV3 ON LV3.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV4 ON LV4.INCOME_ID=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m'))"; + String sql1="INSERT INTO lv_rent_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,LRI.CHARGE_WAY AS COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM,LRI.ID FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID = LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID) LV2 ON LV2.INCOME_ID = LRI.PLAN_ID AND LV2.LRI_ID = LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE LRI.CHARGE_WAY IN ('AutoBuckle','WXPay','WXUnionPay') AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m'))"; // 逾期过月(卡扣) - String sql2="INSERT INTO lv_rent_income2 (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,CASE WHEN lrp.collect_msg IN ('WXPay', 'WXUnionPay') THEN lrp.collect_msg ELSE lrp.COLLECT_STATUS END AS COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM,LRI.ID FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID)LV1 ON LV1.INCOME_ID=LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID)LV2 ON LV2.INCOME_ID=LRI.PLAN_ID AND LV2.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV3 ON LV3.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV4 ON LV4.INCOME_ID=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m')) "; + String sql2="INSERT INTO lv_rent_income2 (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,LRI.CHARGE_WAY AS COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM,LRI.ID FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID = LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID) LV2 ON LV2.INCOME_ID = LRI.PLAN_ID AND LV2.LRI_ID = LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE LRI.CHARGE_WAY IN ('AutoBuckle','WXPay','WXUnionPay') AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') AND DATE_FORMAT(NOW(),'%Y-%m')<> DATE_FORMAT(lrp.plan_date, '%Y-%m'))"; // 逾期利息(卡扣) - String sql3="INSERT INTO lv_penalty_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,0.00,0.00,0.00,lri.PENALTY,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,CASE WHEN lrp.collect_msg IN ('WXPay', 'WXUnionPay') THEN lrp.collect_msg ELSE lrp.COLLECT_STATUS END AS COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM,LRI.ID FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_penalty_income GROUP BY INCOME_ID,LRI_ID)LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_PENALTY_PLAN GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV4 ON LV4.INCOME_ID=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款','部分收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.penalty > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d')) "; + String sql3="INSERT INTO lv_penalty_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.id,lri.HIRE_DATE,lrp.plan_list,0.00,0.00,0.00,lri.PENALTY,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE,LRI.CHARGE_WAY AS COLLECT_STATUS,LCI.BUSINESSTYPE,LCI.LEAS_FORM,LRI.ID FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT income_id,LRI_ID FROM lv_penalty_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID = LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_PENALTY_PLAN GROUP BY INCOME_ID) LV2 ON LV2.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE LRI.CHARGE_WAY IN ('AutoBuckle','WXPay','WXUnionPay') AND lri.penalty > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d'))"; /** * 根据查询语句判断, 有值才执行插入SQL */ @@ -91,20 +91,20 @@ public class InsertVoucherRentIncome { CreateVoucherRedCompensatory cvrc = new CreateVoucherRedCompensatory(); List list = new ArrayList(); for (Map map1 : dataList4) { - if(!list.contains(map1.get("F58"))){ - list.add(map1.get("F58")); + if(!list.contains(map1.get("F56"))){ + list.add(map1.get("F56")); } } for (Map map2 : dataList5) { - if(!list.contains(map2.get("F58"))){ - list.add(map2.get("F58")); + if(!list.contains(map2.get("F56"))){ + list.add(map2.get("F56")); } } - for (String F58 : list) { + for (String F56 : list) { // 判断当期是否已生成经销商代偿凭证, 如已生成, 反冲 - cvrc.CreateVoucher("PZ2019071500000030", "admin",F58);// 代偿反冲-收到的租金 - cvrc.CreateVoucher("PZ2019071500000031", "admin",F58);// 代偿反冲-收到的逾期利息 + cvrc.CreateVoucher("PZ2019071500000030", "admin",F56);// 代偿反冲-收到的租金 + cvrc.CreateVoucher("PZ2019071500000031", "admin",F56);// 代偿反冲-收到的逾期利息 System.out.println("***********************************************************"); System.out.println("**********************代偿反冲凭证收成**************************"); System.out.println("***********************************************************"); @@ -130,38 +130,38 @@ public class InsertVoucherRentIncome { * 汽车回租-卡扣 */ // 当月的租金(卡扣)-(汽车回租) - String sqlqh1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT F58,F56 FROM VOUCHER_V8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND F58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqlqh1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT F58,F56 FROM VOUCHER_V8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND F58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56 = LVRI.LRI_ID WHERE lvri.collect_status IN ('AutoBuckle') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m')"; // 本月以前的租金(卡扣)-(汽车回租) - String sqlqh2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqlqh2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56 = LVRI.LRI_ID WHERE lvri.collect_status IN ('AutoBuckle') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') AND DATE_FORMAT(NOW(),'%Y-%m')<> DATE_FORMAT(lrp.plan_date, '%Y-%m') "; // 逾期利息(卡扣)-(汽车回租) - String sqlqh3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d')"; + String sqlqh3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56 = LVRI.LRI_ID WHERE lvri.collect_status IN ('AutoBuckle') AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') "; /** * 汽车直租-卡扣 */ // 当月的租金(卡扣)-(汽车直租) - String sqlqz1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '01' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqlqz1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56 = LVRI.LRI_ID WHERE lvri.collect_status IN ('AutoBuckle') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '01' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m')"; // 本月以前的租金(卡扣)-(汽车直租) - String sqlqz2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '01' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m')"; + String sqlqz2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56 = LVRI.LRI_ID WHERE lvri.collect_status IN ('AutoBuckle') AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '01' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') AND DATE_FORMAT(NOW(),'%Y-%m')<> DATE_FORMAT(lrp.plan_date, '%Y-%m')"; // 逾期利息(卡扣)-(汽车直租) - String sqlqz3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '01' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d')"; + String sqlqz3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56 = LVRI.LRI_ID WHERE lvri.collect_status IN ('AutoBuckle') AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '01' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d')"; /** * 汽车回租-微信 */ // 当月的租金(微信)-(汽车回租) - String sqlWh1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status ='WXPay' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqlWh1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status ='WXPay' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') "; // 本月以前的租金(微信)-(汽车回租) - String sqlWh2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56 = LVRI.LRI_ID WHERE lvri.collect_status ='WXPay' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m')"; + String sqlWh2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56 = LVRI.LRI_ID WHERE lvri.collect_status ='WXPay' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m')"; // 逾期利息(微信)-(汽车回租) - String sqlWh3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(微信)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status ='WXPay' AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d')"; + String sqlWh3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(微信)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status ='WXPay' AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d')"; /** * 汽车回租-微信银联 */ // 当月的租金(微信)-(汽车直租) - String sqlWYh1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status ='WXUnionPay' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqlWYh1="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status ='WXUnionPay' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') "; // 本月以前的租金(微信)-(汽车直租) - String sqlWYh2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status ='WXUnionPay' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m') "; + String sqlWYh2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status ='WXUnionPay' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m') "; // 逾期利息(微信)-(汽车直租) - String sqlWYh3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status ='WXUnionPay' AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d')"; + String sqlWYh3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status ='WXUnionPay' AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d')"; /** * 汽车回租-卡扣 @@ -193,38 +193,38 @@ public class InsertVoucherRentIncome { * 汽车类-回租-卡扣 */ // 收到的租金--卡扣-当月的-(汽车回租) - String sql_whereqh1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent WHEN LV.sort_number = '2' THEN LVRI.INTEREST ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus WHEN lv.sort_number = '4' THEN lvri.interest WHEN lv.sort_number = '5' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '6' THEN (lvri.interest - ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2)) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '6' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018082100000142')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereqh1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent WHEN LV.sort_number = '2' THEN LVRI.INTEREST ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus WHEN lv.sort_number = '4' THEN lvri.interest WHEN lv.sort_number = '5' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '6' THEN (lvri.interest - ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2)) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '6' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018082100000142')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('AutoBuckle') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; // 收到的租金--卡扣-跨月的-(汽车回租) - String sql_whereqh2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018082100000143')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereqh2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018082100000143')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('AutoBuckle') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; //收到的逾期利息--卡扣-(汽车回租) - String sql_whereqh3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52,F56, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-卡扣-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty /getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2018082100000144')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereqh3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52,F56, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-卡扣-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty /getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2018082100000144')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status IN ('AutoBuckle') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; /** * 汽车类-直租-卡扣 */ // 收到的租金--卡扣-当月的-(汽车直租) - String sql_whereqz1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN LV.sort_number = '1' THEN LVRI.RENT WHEN LV.sort_number = '2' THEN LVRI.INTEREST WHEN LV.sort_number = '3' THEN (LVRI.CORPUS-ROUND(LVRI.CORPUS / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) ELSE 0.00 END f7,CASE WHEN lv.sort_number = '4' THEN lvri.corpus WHEN lv.sort_number = '5' THEN lvri.interest WHEN lv.sort_number = '6' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '7' THEN ((LVRI.CORPUS - ROUND(LVRI.CORPUS /getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2))+(lvri.interest - ROUND(lvri.interest /getTax(LCI.LEAS_FORM,'利息',LCCT.START_DATE),2))) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '7' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '7' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '7' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '6' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '7' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019070100000008')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereqz1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN LV.sort_number = '1' THEN LVRI.RENT WHEN LV.sort_number = '2' THEN LVRI.INTEREST WHEN LV.sort_number = '3' THEN (LVRI.CORPUS-ROUND(LVRI.CORPUS / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) ELSE 0.00 END f7,CASE WHEN lv.sort_number = '4' THEN lvri.corpus WHEN lv.sort_number = '5' THEN lvri.interest WHEN lv.sort_number = '6' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '7' THEN ((LVRI.CORPUS - ROUND(LVRI.CORPUS /getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2))+(lvri.interest - ROUND(lvri.interest /getTax(LCI.LEAS_FORM,'利息',LCCT.START_DATE),2))) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '7' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '7' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '7' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '6' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '7' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019070100000008')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('AutoBuckle') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; // 收到的租金--卡扣-跨月的-(汽车直租) - String sql_whereqz2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019070100000009')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereqz2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-卡扣-',LVRI.PLAN_LIST) ELSE '收到的租金-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019070100000009')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status IN ('AutoBuckle') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; //收到的逾期利息--卡扣-(汽车直租) - String sql_whereqz3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52,F56, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67,F47,F48)SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-卡扣-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2019070100000007')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status IN ('手工收款', '批量收款','部分收款') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereqz3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52,F56, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67,F47,F48)SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-卡扣-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-卡扣' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2019070100000007')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(卡扣)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '01' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status IN ('AutoBuckle') AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; /** * 汽车类-回租-微信 */ // 收到的租金--卡扣-当月的-(汽车回租) - String sql_whereWh1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-微信-',LVRI.PLAN_LIST) ELSE '收到的租金-微信' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent WHEN LV.sort_number = '2' THEN LVRI.INTEREST ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus WHEN lv.sort_number = '4' THEN lvri.interest WHEN lv.sort_number = '5' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '6' THEN (lvri.interest - ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2)) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '北京安鹏昌达资产管理有限公司' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN '807001002013' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '6' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019120900000160')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56 = LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.collect_status ='WXPay' AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereWh1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-微信-',LVRI.PLAN_LIST) ELSE '收到的租金-微信' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent WHEN LV.sort_number = '2' THEN LVRI.INTEREST ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus WHEN lv.sort_number = '4' THEN lvri.interest WHEN lv.sort_number = '5' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '6' THEN (lvri.interest - ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2)) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '北京安鹏昌达资产管理有限公司' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN '807001002013' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '6' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019120900000160')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56 = LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.collect_status ='WXPay' AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; // 收到的租金--卡扣-跨月的-(汽车回租) - String sql_whereWh2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-微信-',LVRI.PLAN_LIST) ELSE '收到的租金-微信' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '北京安鹏昌达资产管理有限公司' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN '807001002013' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019120900000161')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status ='WXPay' AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereWh2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-微信-',LVRI.PLAN_LIST) ELSE '收到的租金-微信' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '北京安鹏昌达资产管理有限公司' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN '807001002013' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019120900000161')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status ='WXPay' AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; //收到的逾期利息--卡扣-(汽车回租) - String sql_whereWh3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52,F56, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-微信-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-微信' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty /getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '北京安鹏昌达资产管理有限公司' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN '807001002013' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2019120900000159')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(微信)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status ='WXPay' AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereWh3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52,F56, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-微信-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-微信' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty /getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE, '%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '北京安鹏昌达资产管理有限公司' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN '807001002013' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2019120900000159')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(微信)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM='02' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status ='WXPay' AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; /** * 汽车类-回租-微信银联 */ // 收到的租金--卡扣-当月的-(汽车回租) - String sql_whereWYh1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-微信银联-',LVRI.PLAN_LIST) ELSE '收到的租金-微信银联' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN LV.sort_number = '1' THEN LVRI.RENT WHEN LV.sort_number = '2' THEN LVRI.INTEREST ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus WHEN lv.sort_number = '4' THEN lvri.interest WHEN lv.sort_number = '5' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date), 2) WHEN lv.sort_number = '6' THEN (lvri.interest - ROUND(lvri.interest / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '6' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019120500000153')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status ='WXUnionPay' AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereWYh1 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-微信银联-',LVRI.PLAN_LIST) ELSE '收到的租金-微信银联' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN LV.sort_number = '1' THEN LVRI.RENT WHEN LV.sort_number = '2' THEN LVRI.INTEREST ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus WHEN lv.sort_number = '4' THEN lvri.interest WHEN lv.sort_number = '5' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date), 2) WHEN lv.sort_number = '6' THEN (lvri.interest - ROUND(lvri.interest / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '6' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019120500000153')) lv ON lv.proj_type = lci.LEAS_FORM LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status ='WXUnionPay' AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; // 收到的租金--卡扣-跨月的-(汽车回租) - String sql_whereWYh2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-微信银联-',LVRI.PLAN_LIST) ELSE '收到的租金-微信银联' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019120500000154')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status ='WXUnionPay' AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereWYh2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-微信银联-',LVRI.PLAN_LIST) ELSE '收到的租金-微信银联' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.rent ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019120500000154')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status ='WXUnionPay' AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; //收到的逾期利息--卡扣-(汽车回租) - String sql_whereWYh3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52,F56, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67,F47,F48)SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-微信银联-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-微信银联' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2019120500000155')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '02' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status ='WXUnionPay' AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/19', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; + String sql_whereWYh3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52,F56, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67,F47,F48)SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-微信银联-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-微信银联' END AS f5,lv.LOAN_SUBJECT AS f6,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'逾期利息',lcct.start_date),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2019120500000155')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '02' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status ='WXUnionPay' AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/04/20', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; /** * 根据查询语句判断, 有值才执行插入SQL diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java index bb4e149c4..f591d9088 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java @@ -122,8 +122,9 @@ public class VoucherToV8Impl implements VoucherService { } d.put("F12", user.getAttribute("username").getString());//制单人 + d.put("F56", param.get("F56"));// 实收id d.put("F57", param.get("EBANK_SN")); - d.put("F58", param.get("F58")); + d.put("F58", param.get("F58"));// 计划id d.put("F59", list.get(i).get("SORT_NUMBER")); d.put("F60",list.get(i).get("CONTRACT_NUMBER")); d.put("F61",list.get(i).get("CUSTNAME")); diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java index fa07b498b..eaf865943 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java @@ -3,13 +3,8 @@ package com.tenwa.lease.app.quartzmession; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; - import com.amarsoft.are.util.StringFunction; import com.base.util.QuartzUtil; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherInsuranceForCarTradition; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherInsuranceSettlement; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMonthSettlement; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRentIncome; import com.tenwa.voucher.CreateVoucherProcess.InsertVoucherRentCompensatory; import com.tenwa.voucher.CreateVoucherProcess.InsertVoucherRentIncome; /** From 437bee588037fb458b232f879fbf4145a861b5f7 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Mon, 20 Apr 2020 11:18:23 +0800 Subject: [PATCH 63/89] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E4=B9=9F=E5=8F=AF=E4=BB=A5=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comm/MailingContainerNumberImport.java | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java b/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java index 6e19f08b5..3bde7e8a3 100644 --- a/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java +++ b/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java @@ -1,18 +1,17 @@ package com.tenwa.apzl.comm; import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; + +import jbo.com.tenwa.lease.comm.LB_FILE_ARCHIVING_INFO; import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; -import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; import com.amarsoft.context.ASUser; -import com.amarsoft.dict.als.cache.CacheLoaderFactory; import com.tenwa.comm.exception.BusinessException; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.officetempalte.importcallback.impl.BaseImportExcelCallBack; @@ -23,19 +22,15 @@ public class MailingContainerNumberImport extends BaseImportExcelCallBack{ } @Override public void runBefore(ASUser CurUser, Map model, List importObjects, JBOTransaction tx,Transaction Sqlca) throws Exception { - Transaction Sqlca1 = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); /** * 定义全局变量 */ - String error=""; // 错误描述 boolean flag=false; // 错误描述 String CONTRACT_NUMBER=null; String sql1=""; // 原有的数据 /** * 校验本次导入数据在导入表是否已有 */ - List> list = new ArrayList>(); - Map map = new HashMap(); List arrayList = new ArrayList(); //所有申请合同 List exclarrayList = new ArrayList(); //申请编号不在系统中的集合 List exclarrayExist = new ArrayList(); //申请编号在系统中已存在 @@ -63,14 +58,24 @@ public class MailingContainerNumberImport extends BaseImportExcelCallBack{ } flag=true; } - sql1="select id from LB_FILE_ARCHIVING_INFO where CONTRACT_NUMBER='"+CONTRACT_NUMBER+"'"; - dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); + //sql1="select FILE_NUMBER from LB_FILE_ARCHIVING_INFO where CONTRACT_NUMBER='"+CONTRACT_NUMBER+"'"; + //dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); + BizObjectManager lfaiManage = JBOFactory.getBizObjectManager(LB_FILE_ARCHIVING_INFO.CLASS_NAME,Sqlca); + BizObject lfai = lfaiManage.createQuery("CONTRACT_NUMBER=:CONTRACT_NUMBER ").setParameter("CONTRACT_NUMBER", CONTRACT_NUMBER).getSingleResult(true); // 无结果，说明不在系统中 - if(dataList.size()>0){ - if(! exclarrayExist.contains(CONTRACT_NUMBER) ){ - exclarrayExist.add(CONTRACT_NUMBER); + if(lfai != null){ + String fileNumber = lfai.getAttribute("FILE_NUMBER") == null ? "":lfai.getAttribute("FILE_NUMBER").getString(); + if(fileNumber != null && !"null".equals(fileNumber) && fileNumber.length()>0 ) { + if(! exclarrayExist.contains(CONTRACT_NUMBER) ){ + exclarrayExist.add(CONTRACT_NUMBER); + } + flagExist=true; + }else { + if(!flagExist){ + lfaiManage.deleteObject(lfai); + } + } - flagExist=true; } } From 2933aaec99de5151ad2324a20a913d6bd9d53af4 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Mon, 20 Apr 2020 16:30:21 +0800 Subject: [PATCH 64/89] =?UTF-8?q?1.=E5=8F=82=E4=B8=8E=E8=9E=8D=E8=B5=84?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E7=94=9F=E6=88=90=E8=B5=84=E9=87=91=E8=AE=A1?= =?UTF-8?q?=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenwa/reckon/executor/FundFundPlanExecutor.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java index 4ae5e41a9..89cc89d82 100644 --- a/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java +++ b/calc/com/tenwa/reckon/executor/FundFundPlanExecutor.java @@ -246,10 +246,10 @@ public class FundFundPlanExecutor { if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){ ffcp.setPayCust(custid); } - /*if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//需要判断是否融资 + if(StringUtil.nullToString(param.get("FINAN")).equals("Y")){//需要判断是否融资 if(con.getAttribute(entry.getKey() + "_FINA").getString().equals("finatype01")) { - FundPlanBean ffcp2 = new FundPlanBean(); + /*FundPlanBean ffcp2 = new FundPlanBean(); ffcp2.setFeeType(item.getItemNo());//费用类型 ffcp2.setPlanList("1"); ffcp2.setSettleMethod("payfund6"); @@ -259,14 +259,15 @@ public class FundFundPlanExecutor { if(StringUtil.nullToString(param.get("CostType03")).equals("cust")){ ffcp2.setPayCust(custid); } - fundPlanBeans.add(ffcp2); + fundPlanBeans.add(ffcp2);*/ fundPlanBeans.add(ffcp); } } else { fundPlanBeans.add(ffcp); - }*/ + } //不管是否参与融资,都生成租金计划 by K 2018/08/10 - fundPlanBeans.add(ffcp); + //参与融资不生成资金计划（张文竹提出） + //fundPlanBeans.add(ffcp); } } return fundPlanBeans; From 558df0f1883b4e8627620714dee9bb09f8d9ee07 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 21 Apr 2020 10:16:15 +0800 Subject: [PATCH 65/89] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=90=8E=E6=9B=B4=E6=96=B0=E5=90=88=E5=90=8C?= =?UTF-8?q?id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FileInformationImportList.jsp | 8 ++++- .../comm/MailingContainerNumberImport.java | 2 +- .../lease/function/ImportContractId.java | 32 +++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 src_tenwa/com/tenwa/lease/function/ImportContractId.java diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp index 9b2db6c68..9a0b796fc 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp @@ -67,7 +67,13 @@ var sparam=JSON.stringify(importCondition).replace(/,/g,"@");//生成模板的参数据 AsDialog.PopView("/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcel.jsp","importparam="+sparam, {width:"350px",height:"40px",title:"上传文件下载数据"},function(){ - reloadSelf();}); + updateContractId(); + }); + } + //更新对应的contractid + function updateContractId(){ + RunJavaMethodSqlca("com.tenwa.lease.function.ImportContractId","updateContractId",""); + reloadSelf(); } //模板下载 function DiscountDownload(){ diff --git a/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java b/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java index 3bde7e8a3..36a975808 100644 --- a/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java +++ b/src_tenwa/com/tenwa/apzl/comm/MailingContainerNumberImport.java @@ -49,7 +49,7 @@ public class MailingContainerNumberImport extends BaseImportExcelCallBack{ // 通过本次excel中的数据是否在系统中 //sql1="SELECT ARCHIVING_CABINET_NO,CONTRACT_NUMBER FROM LB_FILE_ARCHIVING_INFO WHERE ARCHIVING_CABINET_NO='"+CONTRACT_NUMBER+"'"; - sql1="select id from lb_contract_info where contract_no='"+CONTRACT_NUMBER+"'"; + sql1="select id from lb_contract_info where contract_status>=31 and contract_status<100 and contract_no='"+CONTRACT_NUMBER+"'"; List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null); // 无结果，说明不在系统中 if(dataList.size()<=0){ diff --git a/src_tenwa/com/tenwa/lease/function/ImportContractId.java b/src_tenwa/com/tenwa/lease/function/ImportContractId.java new file mode 100644 index 000000000..01d7426f6 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/function/ImportContractId.java @@ -0,0 +1,32 @@ +package com.tenwa.lease.function; + +import java.util.List; + +import org.omg.CORBA.Object; + +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; +import jbo.com.tenwa.lease.comm.LB_FILE_ARCHIVING_INFO; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; + +public class ImportContractId { + + public void updateContractId(Transaction Sqlca ) throws Exception{ + BizObjectManager lfaiManage=JBOFactory.getBizObjectManager(LB_FILE_ARCHIVING_INFO.CLASS_NAME,Sqlca); + BizObjectManager lciManage=JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME,Sqlca); + List lfais = lfaiManage.createQuery(" (contract_id is null) and (contract_number is not null) ").getResultList(true); + for (int i=0;i Date: Tue, 21 Apr 2020 11:20:58 +0800 Subject: [PATCH 66/89] =?UTF-8?q?APP=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commbusiness/LBProjectIntoTempInitCarBusiness.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java index c096542c6..900bcfeaa 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java @@ -95,7 +95,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { String custName=""; String customerId = ""; if("cust_type.cust".equals(custType)){ - if("BAIC_MOTOR".equals(this.getAttribute("operationType").toString())){ + if(this.getAttribute("operationType") != null && "BAIC_MOTOR".equals(this.getAttribute("operationType").toString())){ distributoIid=this.getAttribute("distributorNo").toString(); vndrName=this.getAttribute("distributorName").toString(); }else{ @@ -161,7 +161,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { this.saveUnionLessee(bmLULT,tx,customerId,asUser); this.saveBusinessStatus(bsbom, tx, asUser);//项目进度表 }else{ - if("BAIC_MOTOR".equals(this.getAttribute("operationType").toString())){ + if(this.getAttribute("operationType") != null && "BAIC_MOTOR".equals(this.getAttribute("operationType").toString())){ distributoIid=this.getAttribute("distributorNo").toString(); vndrName=this.getAttribute("distributorName").toString(); }else{ From aed1ad6e4917a6cd8fdb5c116491a3ce3583aa90 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 21 Apr 2020 11:35:20 +0800 Subject: [PATCH 67/89] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8C=82=E8=BD=A63?= =?UTF-8?q?=E3=80=814=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/LBEquipment_Car/LBEquipmentInfo.jsp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp index 2de1c494e..37add180e 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp @@ -83,8 +83,8 @@ CurPage.getCurComp().setAttribute("RightType", null); doTemp.setHtmlEvent("FRAME_NUMBER", "onChange", "checkFrameNumber");//校验车架号格式 doTemp.setHtmlEvent("FRAME_NUMBER2", "onChange", "checkFrameNumber2");//校验车架号格式 - doTemp.setHtmlEvent("FRAME_NUMBER3", "onChange", "checkFrameNumber3");//校验车架号格式 - doTemp.setHtmlEvent("FRAME_NUMBER4", "onChange", "checkFrameNumber4");//校验车架号格式 + //doTemp.setHtmlEvent("FRAME_NUMBER3", "onChange", "checkFrameNumber3");//校验车架号格式 + //doTemp.setHtmlEvent("FRAME_NUMBER4", "onChange", "checkFrameNumber4");//校验车架号格式 /* doTemp.setHtmlEvent("BRAND", "onChange", "selectCarType"); if((null!=RightType&& !RightType.equals("ReadOnly"))||(null!=ishistory&& !ishistory.equals("true"))){ @@ -240,12 +240,12 @@ if(!checkFrameNumber2()){ return; } - if(!checkFrameNumber3()){ - return; - } - if(!checkFrameNumber4()){ - return; - } + //if(!checkFrameNumber3()){ + // return; + //} + //if(!checkFrameNumber4()){ + // return; + //} if(!checkRepeat()){ return; } From 0556cfd2dafbc193c70c8a33101b15dae4c6a757 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 21 Apr 2020 11:38:32 +0800 Subject: [PATCH 68/89] =?UTF-8?q?=E5=AE=A2=E6=88=B7=EF=BC=88=E5=BC=A0?= =?UTF-8?q?=E7=A3=8A=EF=BC=89=E4=BF=AE=E6=94=B9=E4=BF=A1=E5=AE=A1=E8=80=83?= =?UTF-8?q?=E6=A0=B8=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_comm.xml | 24 + .../report/creditAduit/creditHolidayInfo.jsp | 78 ++ .../report/creditAduit/creditHolidayList.jsp | 154 ++++ .../report/creditAduit/creditHolidayMain.jsp | 11 + .../handler/CreditAuditHolidayHandler.java | 59 ++ .../impl/CreditAuditHolidayCallBack.java | 59 ++ .../comm/credit/ST_CREDIT_AUDIT_HOLIDAY.java | 64 ++ .../V20200404/customer(zhanglei)_20200404.sql | 136 ++++ .../CreditAuditHolidayBatch.java | 731 ++++++++++++++++++ 9 files changed, 1316 insertions(+) create mode 100644 WebContent/report/creditAduit/creditHolidayInfo.jsp create mode 100644 WebContent/report/creditAduit/creditHolidayList.jsp create mode 100644 WebContent/report/creditAduit/creditHolidayMain.jsp create mode 100644 src_core/com/tenwa/holiday/handler/CreditAuditHolidayHandler.java create mode 100644 src_core/com/tenwa/officetempalte/importcallback/impl/CreditAuditHolidayCallBack.java create mode 100644 src_jbo/jbo/com/tenwa/entity/comm/credit/ST_CREDIT_AUDIT_HOLIDAY.java create mode 100644 src_sql/鎶曚骇SQL/V20200404/customer(zhanglei)_20200404.sql create mode 100644 src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml index af3e50dac..08ee008fe 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml @@ -1277,6 +1277,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebContent/report/creditAduit/creditHolidayInfo.jsp b/WebContent/report/creditAduit/creditHolidayInfo.jsp new file mode 100644 index 000000000..692d559b0 --- /dev/null +++ b/WebContent/report/creditAduit/creditHolidayInfo.jsp @@ -0,0 +1,78 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%> + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info00;Describe=注释区;]~*/%> +<% + /* + Author:lzb 2017-5-12 + Tester: + Content: 本方信息 + Input Param: + Output param: + History Log: + */ +%> +<%/*~END~*/%> + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info01;Describe=定义页面属性;]~*/%> +<% + String PG_TITLE = "本方信息"; // 浏览器窗口标题 PG_TITLE +%> +<%/*~END~*/%> + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info02;Describe=定义变量，获取参数;]~*/%> + + +<% + String rightType = CurPage.getParameter("rightType"); + if(rightType ==null)rightType=""; +%> +<%/*~END~*/%> + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info03;Describe=定义数据对象;]~*/%> +<% + String sTempletNo = "creditHolidayInfo";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + if(rightType.equals("ReadOnly")){ + dwTemp.ReadOnly = "1";//只读模式 + } + dwTemp.genHTMLObjectWindow(CurPage.getParameter("id")); + CurPage.getCurComp().setAttribute("RightType", rightType); +%> +<%/*~END~*/%> + + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info04;Describe=定义按钮;]~*/%> +<% +//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + {"true","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"}, + {"true","","Button","返回","返回列表页面","parent.AsDialog.ClosePage()","","","","btn_icon_return"} + }; + sButtonPosition = "south"; +%> +<%/*~END~*/%> + + +<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=Info05;Describe=主体页面;]~*/%> +<%@ include file="/Frame/resources/include/ui/include_info.jspf"%> +<%/*~END~*/%> + + +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info06;Describe=定义按钮事件-;]~*/%> + +<%/*~END~*/%> + + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/report/creditAduit/creditHolidayList.jsp b/WebContent/report/creditAduit/creditHolidayList.jsp new file mode 100644 index 000000000..ad06bb8c0 --- /dev/null +++ b/WebContent/report/creditAduit/creditHolidayList.jsp @@ -0,0 +1,154 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> + + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List00;Describe=注释区;]~*/%> +<% + /* + Author:lzb 2017-05-12 + Tester: + Content: 本方信息 + Input Param: + Output param: + History Log: + */ +%> +<%/*~END~*/%> + + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%> +<% + String PG_TITLE = "本方信息"; // 浏览器窗口标题 PG_TITLE +%> +<%/*~END~*/%> + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List02;Describe=定义变量，获取参数;]~*/%> + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%> +<% + ASObjectModel doTemp = new ASObjectModel("creditHolidayList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(30); + dwTemp.genHTMLObjectWindow(""); +%> +<%/*~END~*/%> + + +<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%> +<% + String sButtons[][] = { + {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + {"true","All","Button","修改","修改","edit()","","","","btn_icon_edit",""}, + {"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""}, + {"true","","Button","批量登记","批量登记","inExcel()","","","","btn_icon_detail",""}, + {"true","","Button","下载模板","下载模板","downLoad()","","","","btn_icon_down",""} + }; +%> +<%/*~END~*/%> + + + + +<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%> +<%@include file="/Frame/resources/include/ui/include_list.jspf"%> +<%/*~END~*/%> + +
+
+ +
+
+ +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%> + +<%/*~END~*/%> + + + + +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%> + +<%/*~END~*/%> + + + + +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时，进行初始化;]~*/%> + +<%/*~END~*/%> +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/report/creditAduit/creditHolidayMain.jsp b/WebContent/report/creditAduit/creditHolidayMain.jsp new file mode 100644 index 000000000..d175d8b66 --- /dev/null +++ b/WebContent/report/creditAduit/creditHolidayMain.jsp @@ -0,0 +1,11 @@ +<%@ page contentType="text/html; charset=GBK"%><%@ + include file="/IncludeBegin.jsp"%><% + String PG_TITLE = "隐藏左侧区域的Main页面"; // 浏览器窗口标题 PG_TITLE + String PG_CONTENT_TITLE = "本方信息"; //默认的内容区标题 + String PG_CONTNET_TEXT = "请点击左侧列表";//默认的内容区文字 + String PG_LEFT_WIDTH = "1";//默认的treeview宽度 +%><%@include file="/Resources/CodeParts/Main04.jsp"%> + +<%@ include file="/IncludeEnd.jsp"%> \ No newline at end of file diff --git a/src_core/com/tenwa/holiday/handler/CreditAuditHolidayHandler.java b/src_core/com/tenwa/holiday/handler/CreditAuditHolidayHandler.java new file mode 100644 index 000000000..dcba59b4a --- /dev/null +++ b/src_core/com/tenwa/holiday/handler/CreditAuditHolidayHandler.java @@ -0,0 +1,59 @@ +package com.tenwa.holiday.handler; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.dw.handler.impl.CommonHandler; +import jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY; +import jbo.com.tenwa.entity.comm.holiday.BT_HOLIDAY; + +public class CreditAuditHolidayHandler extends CommonHandler{ + + @Override + protected void beforeInsert(JBOTransaction tx, BizObject bo) + throws Exception { + // TODO Auto-generated method stub + String cdate=bo.getAttribute("c_date").getString(); + String[] vDate=cdate.split("/"); + bo.setAttributeValue("c_year", vDate[0]); + bo.setAttributeValue("c_month", vDate[1]); + bo.setAttributeValue("c_day", vDate[2]); + super.beforeInsert(tx, bo); + } + @Override + protected void beforeUpdate(JBOTransaction tx, BizObject bo)throws Exception { + String cdate=bo.getAttribute("c_date").getString(); + String[] vDate=cdate.split("/"); + bo.setAttributeValue("c_year", vDate[0]); + bo.setAttributeValue("c_month", vDate[1]); + bo.setAttributeValue("c_day", vDate[2]); + super.beforeUpdate(tx, bo); + } + @Override + protected boolean validityCheck(BizObject bo, boolean isInsert) { + try{ + if(isInsert){ + BizObject bx=JBOFactory.createBizObjectQuery(ST_CREDIT_AUDIT_HOLIDAY.CLASS_NAME, "c_date=:c_date").setParameter("c_date", bo.getAttribute("c_date").getString()).getSingleResult(false); + if(bx!=null) + { + this.errors="日期重复"; + return false; + } + }else{ + BizObject bx=JBOFactory.createBizObjectQuery(ST_CREDIT_AUDIT_HOLIDAY.CLASS_NAME, "c_date=:c_date and id<>'"+bo.getAttribute("id").getString()+"'").setParameter("c_date", bo.getAttribute("c_date").getString()).getSingleResult(false); + if(bx!=null) + { + this.errors="日期重复"; + return false; + } + } + }catch(Exception e){ + e.printStackTrace(); + } + + + return super.validityCheck(bo, isInsert); + } + + +} diff --git a/src_core/com/tenwa/officetempalte/importcallback/impl/CreditAuditHolidayCallBack.java b/src_core/com/tenwa/officetempalte/importcallback/impl/CreditAuditHolidayCallBack.java new file mode 100644 index 000000000..91ea6277b --- /dev/null +++ b/src_core/com/tenwa/officetempalte/importcallback/impl/CreditAuditHolidayCallBack.java @@ -0,0 +1,59 @@ +package com.tenwa.officetempalte.importcallback.impl; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.context.ASUser; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * + * Author: guoshanglei 2017年5月11日 + * Tester: + * Describe: + * History Log: + */ +public class CreditAuditHolidayCallBack extends BaseImportExcelCallBack{ + //读取数据运行run方法 + @Override + public void run(ASUser CurUser, BizObject importObject, + Map model, Integer rowIndex, JBOTransaction tx, + Transaction Sqlca) throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss"); + + + String INPUTUSERID = CurUser.getUserID();//获取登记人 + String INPUTORGID = CurUser.getOrgID();//获取登记部门 + String INPUTTIME = sdf.format(new Date()).toString();//格式化登记时间 + + String cdate=importObject.getAttribute("c_date").getString(); + String strSplit=cdate.indexOf("/")>0?"/":"-"; + String[] vDate=cdate.split(strSplit); + importObject.setAttributeValue("c_year", vDate[0]); + importObject.setAttributeValue("c_month", vDate[1]); + importObject.setAttributeValue("c_day", vDate[2]); + + importObject.setAttributeValue("c_date", cdate.replaceAll("-", "/"));//初始化登记人 + importObject.setAttributeValue("INPUTUSERID", INPUTUSERID);//初始化登记人 + importObject.setAttributeValue("INPUTORGID", INPUTORGID);//初始化登记部门 + importObject.setAttributeValue("INPUTTIME", INPUTTIME);//初始化登记时间 + } + + //数据保存进数据库前runBefor运行 + @Override + public void runBefore(ASUser CurUser, Map model,List importObjects, + JBOTransaction tx, Transaction Sqlca) throws Exception { + + } + + //数据保存进数据库后runAfter运行 + @Override + public void runAfter(ASUser CurUser, Map model,List importObjects, + JBOTransaction tx, Transaction Sqlca) throws Exception { + + } +} \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/entity/comm/credit/ST_CREDIT_AUDIT_HOLIDAY.java b/src_jbo/jbo/com/tenwa/entity/comm/credit/ST_CREDIT_AUDIT_HOLIDAY.java new file mode 100644 index 000000000..6768f9f68 --- /dev/null +++ b/src_jbo/jbo/com/tenwa/entity/comm/credit/ST_CREDIT_AUDIT_HOLIDAY.java @@ -0,0 +1,64 @@ +package jbo.com.tenwa.entity.comm.credit; + +import java.lang.String; + +/** +* 工作日节假日维护test - JBO命名常量类

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface ST_CREDIT_AUDIT_HOLIDAY{ + /** + * 工作日节假日维护test

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY"; + /** + * 编号 STRING(32)
+ */ + public static final String id = "id"; + /** + * 年 INT(10)
+ */ + public static final String c_year = "c_year"; + /** + * 月 INT(10)
+ */ + public static final String c_month = "c_month"; + /** + * 日 INT(10)
+ */ + public static final String c_day = "c_day"; + /** + * 当前日期 STRING(32)
+ */ + public static final String c_date = "c_date"; + /** + * 班/休 STRING(21)
+ */ + public static final String otype = "otype"; + /** + * 登记人 STRING(32)
+ */ + public static final String INPUTUSERID = "INPUTUSERID"; + /** + * 登记部门 STRING(32)
+ */ + public static final String INPUTORGID = "INPUTORGID"; + /** + * 登记时间 STRING(32)
+ */ + public static final String INPUTTIME = "INPUTTIME"; + /** + * 更新人 STRING(32)
+ */ + public static final String UPDATEUSERID = "UPDATEUSERID"; + /** + * 更新部门 STRING(32)
+ */ + public static final String UPDATEORGID = "UPDATEORGID"; + /** + * 更新时间 STRING(32)
+ */ + public static final String UPDATETIME = "UPDATETIME"; +} \ No newline at end of file diff --git a/src_sql/鎶曚骇SQL/V20200404/customer(zhanglei)_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/customer(zhanglei)_20200404.sql new file mode 100644 index 000000000..0e0752f80 --- /dev/null +++ b/src_sql/鎶曚骇SQL/V20200404/customer(zhanglei)_20200404.sql @@ -0,0 +1,136 @@ +-- 添加直租合同模板，已更新生产环境 +INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('operationType', 'CDZZ', 'C端直租', '', '0120', '1', '', '', '', '', '', '', '', '', '', '', '', 'SYS_Designer', NULL, '2020/03/31 15:08:56', 'SYS_Designer', '2020/03/31 15:08:56', '', ''); + +INSERT INTO `apzl`.`bf_template` (`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('59f109e144c347d1b0d61da63a4fe822', NULL, '', 'C端直租', '融资租赁合同-C端直租.doc', '融资租赁合同-C端直租-定稿版.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '', 'administrator', '8009001', '2020/03/31 14:02:27', 'admin', '8009001', '2020/03/31 02:18:46', '', ''); + +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('25fff44b316c42d397cc8e2c214f2b20', '975294b526544d83b806e3fc2f99cd16', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('31eccaf2a04c471ea341f7ef7a760961', 'bbe36e81f17542078489f223239e658a', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('5952afc7c09044ab9a8966d75bcd7e19', 'ced1455267d64183ba1b270a9eda6089', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('801e60bfebd649e09d673b7fa0f7fc23', '484815c4a7a14cf6bdbf69939e5b060e', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('9d3b561076b74fca88e50e92d51413ef', 'cc67cd6da08745329d0723f5f6fda25d', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('aba1e85d33b5444bb35357f837100335', 'db5b1632a6b44e7ea99e0dd0b2193ef3', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('bd605c45dc554628ae5094c58a270b26', 'be101123ef74413eb0d8acad8b6b22b9', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('f921be5522b14cf38d04320165696a74', '755698c1c27a43efa6c23310757c6163', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); + +-- --------------------------------------修改信审考核统计报表 +-- ------------------------------【新增SQL】---------------------------------------- +CREATE TABLE `st_credit_audit_order_detail` ( + `id` varchar(32) NOT NULL COMMENT 'id', + `serialno` varchar(32) NOT NULL COMMENT '流水号', + `objectno` varchar(32) NOT NULL COMMENT '订单流程编号', + `userid` varchar(32) DEFAULT NULL COMMENT '承办人编号', + `username` varchar(80) DEFAULT NULL COMMENT '承办人姓名', + `auditFlowType` varchar(32) DEFAULT NULL COMMENT '审核流程阶段类型', + `auditFlowTypeDes` varchar(80) DEFAULT NULL COMMENT '审核流程阶段类型解释', + `createtime` varchar(32) DEFAULT NULL COMMENT '订单流程创建时间', + `begintime` varchar(32) DEFAULT NULL COMMENT '开始执行时间', + `endtime` varchar(32) DEFAULT NULL COMMENT '完成执行时间', + `create_day` varchar(32) DEFAULT NULL COMMENT '跳过节假日-跳过节假日之后流程创建日期', + `audit_day` varchar(32) DEFAULT NULL COMMENT '跳过节假日-跳过节假日之后流程审核日期', + `jump_createtime` varchar(32) DEFAULT NULL COMMENT '跳过节假日-订单流程创建时间', + `jump_begintime` varchar(32) DEFAULT NULL COMMENT '跳过节假日-开始执行时间', + `jump_endtime` varchar(32) DEFAULT NULL COMMENT '跳过节假日-完成执行时间', + `nextAuditFlowType` varchar(250) DEFAULT NULL COMMENT '下阶段审核流程：【任意退回】', + `auditResSts` varchar(255) DEFAULT NULL COMMENT '审核结果状态', + `auditResStsDes` varchar(255) DEFAULT NULL COMMENT '审核结果状态解释', + `remark` varchar(255) DEFAULT NULL COMMENT '备注信息', + `INPUTTIME` varchar(32) DEFAULT NULL COMMENT '登记时间', + `UPDATETIME` varchar(32) DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='信审考核统计订单-明细'; + +CREATE TABLE `st_credit_audit_order` ( + `id` varchar(32) NOT NULL COMMENT 'id', + `every_day` varchar(20) DEFAULT NULL COMMENT '当前日期', + `userid` varchar(32) DEFAULT NULL COMMENT '承办人编号', + `username` varchar(80) DEFAULT NULL COMMENT '承办人姓名', + `auditFlowType` varchar(32) DEFAULT NULL COMMENT '审核流程阶段类型', + `auditFlowTypeDes` varchar(80) DEFAULT NULL COMMENT '审核流程阶段类型解释', + `order_count` int(11) DEFAULT NULL COMMENT '当日进单数量', + `count_audit` int(11) DEFAULT NULL COMMENT '当日审批数量', + `count_audit_pass` int(11) DEFAULT NULL COMMENT '当日审批通过数量', + `count_audit_refuse` int(11) DEFAULT NULL COMMENT '当日审批拒绝数量', + `count_audit_refuse1` int(11) DEFAULT NULL COMMENT '当日审批拒绝数量-分类1：信用不良', + `count_audit_refuse2` int(11) DEFAULT NULL COMMENT '当日审批拒绝数量-分类2：法院执行', + `count_audit_refuse3` int(11) DEFAULT NULL COMMENT '当日审批拒绝数量-分类3：虚假信息', + `count_audit_refuse4` int(11) DEFAULT NULL COMMENT '当日审批拒绝数量-分类4：身份核实异常', + `count_audit_refuse5` int(11) DEFAULT NULL COMMENT '当日审批拒绝数量-分类5：购车目的异常', + `count_audit_refuse6` int(11) DEFAULT NULL COMMENT '当日审批拒绝数量-分类6：综合评分不足', + `begintime` varchar(32) DEFAULT NULL COMMENT '开始执行时间', + `endtime` varchar(32) DEFAULT NULL COMMENT '完成执行时间', + `audittime` varchar(32) DEFAULT NULL COMMENT '审核使用时间', + `remark` varchar(255) DEFAULT NULL COMMENT '备注信息', + `INPUTTIME` varchar(32) DEFAULT NULL COMMENT '登记时间', + `UPDATETIME` varchar(32) DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='信审考核统计订单'; + +CREATE TABLE `st_credit_audit_holiday` ( + `id` varchar(32) NOT NULL COMMENT '编号', + `c_year` int(11) DEFAULT NULL COMMENT '年', + `c_month` int(11) DEFAULT NULL COMMENT '月', + `c_day` int(11) DEFAULT NULL COMMENT '日', + `c_date` varchar(32) DEFAULT NULL COMMENT '当前日期', + `otype` varchar(21) DEFAULT NULL COMMENT '班/休', + `INPUTUSERID` varchar(32) DEFAULT NULL COMMENT '登记人', + `INPUTORGID` varchar(32) DEFAULT NULL COMMENT '登记部门', + `INPUTTIME` varchar(32) DEFAULT NULL COMMENT '登记时间', + `UPDATEUSERID` varchar(32) DEFAULT NULL COMMENT '更新人', + `UPDATEORGID` varchar(32) DEFAULT NULL COMMENT '更新部门', + `UPDATETIME` varchar(32) DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='信审考核-工作日和休息日维护'; + +-- ------------------------------【新增记录-信审节假日维护】---------------------------------------- + +INSERT INTO `apzl`.`awe_do_catalog` (`dono`, `doname`, `dodescribe`, `dotype`, `doclass`, `isinuse`, `colcount`, `modeid`, `jboclass`, `jbofrom`, `jbowhere`, `jbogroup`, `jboorder`, `businessprocess`, `exportflag`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `remark`, `isvalidate`, `parent`) +VALUES ('creditHolidayList', '审核节假日维护', NULL, '30', NULL, '1', '1', 'default', 'jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY', 'O', NULL, NULL, 'c_date', NULL, NULL, 'SYS_Designer', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/12 17:38:59', NULL, '1', NULL); + +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910001', '910001', '1', 'O', 'id', 'id', 'String', null, '编号', null, '1', 'Text', '1', '3', null, null, null, '0', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/13 09:32:31', '0', null, '0', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910002', '910002', '1', 'O', 'c_year', 'c_year', 'String', null, '年', null, '1', 'Text', '2', '3', null, null, null, '0', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/13 09:32:31', '0', null, '0', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910003', '910003', '1', 'O', 'c_month', 'c_month', 'String', null, '月', null, '1', 'Text', '2', '3', null, null, null, '0', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/12 16:43:57', '0', null, '0', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910004', '910004', '1', 'O', 'c_day', 'c_day', 'String', null, '日', null, '1', 'Text', '2', '3', null, null, null, '0', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/12 16:43:57', '0', null, '0', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910005', '910005', '1', 'O', 'c_date', 'c_date', 'String', null, '当前日期', null, '1', 'Date', '3', '2', null, null, null, '32', '1', '0', '0', '1', '1', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2018/08/14 15:45:14', '0', null, '1', null, null, null, 'BigThan,LessThan,Area'); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910006', '910006', '1', 'O', 'otype', 'otype', 'String', null, '班/休', null, '1', 'Text', '1', '1', null, null, null, '21', '1', '0', '0', '1', '1', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2018/08/14 15:45:14', '0', null, '1', null, null, null, 'Like,Equals'); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910007', '910007', '1', 'O', 'INPUTUSERID', 'INPUTUSERID', 'String', null, '登记人', null, '1', 'Text', '1', '1', null, null, null, '32', '1', '0', '0', '1', '1', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2018/08/14 15:45:14', '0', null, '1', null, null, null, 'Like,Equals'); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910008', '910008', '1', 'O', 'INPUTORGID', 'INPUTORGID', 'String', null, '登记部门ID', null, '1', 'Text', '1', '1', null, null, null, '32', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910009', '910009', '1', null, 'NameManager.getOrgName(INPUTORGID)', 'INPUTORGIDName', 'String', null, '登记部门', null, '1', 'Text', '1', '1', null, null, null, '32', '1', '0', '0', '0', '0', '1', '0', null, null, 'SYS_Designer', '2017/09/13 09:17:36', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910010', '910010', '1', 'O', 'INPUTTIME', 'INPUTTIME', 'String', null, '登记时间', null, '1', 'Date', '3', '2', null, null, null, '32', '1', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910011', '910011', '1', 'O', 'UPDATEUSERID', 'UPDATEUSERID', 'String', null, '更新人', null, '1', 'Text', '1', '1', null, null, null, '32', '1', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:56', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910012', '910012', '1', 'O', 'UPDATEORGID', 'UPDATEORGID', 'String', null, '更新部门ID', null, '1', 'Text', '1', '1', null, null, null, '32', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:56', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910013', '910013', '1', 'O', 'UPDATETIME', 'UPDATETIME', 'String', null, '更新时间', null, '1', 'Date', '3', '2', null, null, null, '32', '1', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:56', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null); +INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910014', '910014', '1', null, 'NameManager.getOrgName(UPDATEORGID)', 'UPDATEORGIDName', 'String', null, '更新部门', null, '1', 'Text', '1', '1', null, null, null, '32', '1', '0', '0', '0', '0', '1', '0', null, null, 'SYS_Designer', '2017/09/13 09:26:10', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null); + + + +INSERT INTO `apzl`.`awe_do_catalog` (`dono`, `doname`, `dodescribe`, `dotype`, `doclass`, `isinuse`, `colcount`, `modeid`, `jboclass`, `jbofrom`, `jbowhere`, `jbogroup`, `jboorder`, `businessprocess`, `exportflag`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `remark`, `isvalidate`, `parent`) +VALUES ('creditHolidayInfo', '审核节假日维护', NULL, '30020', NULL, '1', '1', 'default', 'jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY', 'O', 'id=:id', NULL, NULL, 'com.tenwa.holiday.handler.CreditAuditHolidayHandler', NULL, 'SYS_Designer', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/12 16:59:52', NULL, '1', NULL); + +INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditHolidayInfo', '910015', '910015', '1', 'O', 'id', 'id', 'Number', NULL, '编号', NULL, '1', 'Text', '2', '3', NULL, NULL, NULL, '0', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'admin', '2017/09/12 17:19:08', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditHolidayInfo', '910016', '910016', '1', 'O', 'c_year', 'c_year', 'Number', NULL, '年', NULL, '1', 'Text', '2', '3', NULL, NULL, NULL, '0', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'admin', '2017/09/12 17:19:08', '0', NULL, '0', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditHolidayInfo', '910017', '910017', '1', 'O', 'c_month', 'c_month', 'Number', NULL, '月', NULL, '1', 'Text', '2', '3', NULL, NULL, NULL, '0', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'admin', '2017/09/12 17:19:08', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditHolidayInfo', '910018', '910018', '1', 'O', 'c_day', 'c_day', 'Number', NULL, '日', NULL, '1', 'Text', '2', '3', NULL, NULL, NULL, '0', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'admin', '2017/09/12 17:19:08', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditHolidayInfo', '910019', '910019', '1', 'O', 'c_date', 'c_date', 'String', NULL, '当前日期', NULL, '1', 'Date', '3', '2', NULL, NULL, NULL, '32', '1', '0', '1', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/12 17:22:34', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditHolidayInfo', '910020', '910020', '1', 'O', 'otype', 'otype', 'String', NULL, '班/休', NULL, '1', 'Select', '1', '1', 'CodeTable', '班,班,休,休', NULL, '21', '1', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'admin', '2017/09/12 17:19:08', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditHolidayInfo', '910021', '910021', '1', 'O', 'INPUTUSERID', 'INPUTUSERID', 'String', NULL, '登记人ID', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '1', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditHolidayInfo', '910022', '910022', '1', 'O', 'INPUTORGID', 'INPUTORGID', 'String', NULL, '登记部门ID', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditHolidayInfo', '910023', '910023', '1', 'O', 'INPUTTIME', 'INPUTTIME', 'String', NULL, '登记时间', NULL, '1', 'Text', '1', '2', NULL, NULL, NULL, '32', '0', '1', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditHolidayInfo', '910024', '910024', '1', 'O', 'UPDATEUSERID', 'UPDATEUSERID', 'String', NULL, '更新人ID', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '1', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditHolidayInfo', '910025', '910025', '1', 'O', 'UPDATEORGID', 'UPDATEORGID', 'String', NULL, '更新部门ID', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library` (`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('creditHolidayInfo', '910026', '910026', '1', 'O', 'UPDATETIME', 'UPDATETIME', 'String', NULL, '更新时间', NULL, '1', 'Text', '1', '2', NULL, NULL, NULL, '32', '0', '1', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', NULL, '1', NULL, NULL, NULL, NULL); + + + +INSERT INTO `apzl`.`bf_template` (`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) +VALUES ('da670c357a4f11eaae2500163e0ad612', NULL, NULL, '信审考核节假日维护', '信审考核节假日维护.xlsx', '信审考核节假日维护导入.xlsx', 'excel', 'upload', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', NULL, '维护当年中因法定节假日 工作日改为休息日，或休息日调整为节假日', 'admin', '80009000200010001', '2020/03/13 10:07:19', 'admin', '80009000200010001', '2020/03/13 11:02:17', NULL, NULL); + +INSERT INTO `apzl`.`bf_importconfig` (`ID`, `IMPORTTABLE`, `ROWLINE`, `DATEINDEX`, `SHEETNAME`, `ISDELDATE`, `DELCONDITION`, `IMPORTCLASS`, `CENOTE`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `RELATIVECLASS`, `TEMPLATEID`, `ISSAVE`) +VALUES ('e6c678657a4f11eaae2500163e0ad612', 'ST_CREDIT_AUDIT_HOLIDAY', '1', '2', NULL, 'yes', 'c_date=:{c_date}', 'com.tenwa.officetempalte.importcallback.impl.CreditAuditHolidayCallBack', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY', 'da670c357a4f11eaae2500163e0ad612', NULL); + + + +-- ------------------------------【新增记录--定时任务】配置为每天早上5点----------------------------- +INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) +VALUES ('MissionName', 'com.tenwa.lease.app.quartzmession.CreditAuditHolidayBatch', '信审考核统计处理', '5101001', '5101001', '1', '信审考核统计处理', '', '', '', '', '', '', '', '', '', '', 'SYS_Designer', NULL, '2019/12/26 10:13:04', 'SYS_Designer', '2019/12/26 10:14:07', '', ''); + + diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java new file mode 100644 index 000000000..bfe601c7c --- /dev/null +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java @@ -0,0 +1,731 @@ +package com.tenwa.lease.app.quartzmession; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.awe.util.ASResultSet; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.LogManager; +import org.apache.log4j.Logger; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import java.sql.SQLException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.UUID; + +/** + * 初始化信审考核报表数据跑批 + * @author xiezhiwen + */ +public class CreditAuditHolidayBatch implements Job{ + private static final Logger logger = LogManager.getLogger(CreditAuditHolidayBatch.class);// 引入logger日志 + + public void execute(JobExecutionContext arg0) throws JobExecutionException { + initDetail(); + updateDetail(); + initOrderAuditDay(); + saveOrderAuditDay(); + updateOrderAuditDay(); + } + + /** + * 添加审核流程记录明细 + * @return + */ + private void initDetail(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String result1 = initDetail(Sqlca); + Sqlca.commit(); + logger.info("【初始化信审考核明细表】定时任务执行成功<<<<<<<<<<<<<: "+result1); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【初始化信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【初始化信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【初始化信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 修改审核明细的创建时间 + * @return + */ + private void updateDetail(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String result1 = updateDetail(Sqlca); + Sqlca.commit(); + logger.info("【修改信审考核明细表】定时任务执行异常<<<<<<<<<<<<<: "+result1); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 初始化审核统计报表-根据进单日期 + * @return + */ + private void initOrderAuditDay(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String result1 = initOrderAuditDay(Sqlca); + Sqlca.commit(); + logger.info("【修改信审考核明细表】定时任务执行完成<<<<<<<<<<<<<: "+result1); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 初始化或者修改审核统计报表-根据审单日期 + * @return + */ + private void saveOrderAuditDay(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String result1 = saveOrderAuditDay(Sqlca); + Sqlca.commit(); + logger.info("【修改信审考核明细表】定时任务执行完成<<<<<<<<<<<<<: "+result1); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 初始化或者修改审核统计报表-根据审单日期 + * @return + */ + private void updateOrderAuditDay(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String result1 = updateOrderAuditDay(Sqlca); + Sqlca.commit(); + logger.info("【修改信审考核明细表】定时任务执行完成<<<<<<<<<<<<<: "+result1); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + + /** + * 添加审核流程记录明细 + * @return + * @throws Exception + */ + public String initDetail(Transaction Sqlca) throws Exception { + // 定义全局对象 + String uuidDetail = ""; // 业务id + String userid = ""; // 用户id + String username = ""; // 用户姓名 + String objectno = ""; // 流程编号 + String serialno = ""; // 流程处理流水 + String auditFlowType = ""; // 流程审核类型 + String auditFlowTypeDes = ""; // 流程审核类型说明 + String createtime = ""; // 流程创建时间 + String begintime = ""; // 流程开始时间 + String endtime = ""; // 流程结束时间 + String jump_createtime = ""; // 跳过节假日之后流程创建时间 + String create_day = ""; // 跳过节假日之后流程创建日期 + String audit_day = ""; // 跳过节假日之后流程审核日期 + String jump_begintime = ""; // 跳过节假日之后流程开始时间 + String jump_endtime = ""; // 跳过节假日之后流程结束时间 + String nextAuditFlowType = ""; // 下阶段流程审核类型 + String auditResSts = ""; // 流程审核结果 + String auditResStsDes = ""; // 流程审核结果说明 + String remark = ""; + String insertSql = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); + int con=0; + // 查询所有需要发送还款提醒的数据 + String selSql="SELECT \n" + + " FT.userid,\n" + + " FT.username,\n" + + " FT.objectno,\n" + + " FT.serialno,\n" + + " FT.phaseno AS auditFlowType,\n" + + " FT.phasename AS auditFlowTypeDes,\n" + + " FT.begintime,\n" + + " FT.endtime,\n" + + " FT.phaseopinion1 AS nextAuditFlowType,\n" + + " fob.phaseopinion AS auditResSts,\n" + + " (SELECT itemname from code_library WHERE codeno='disagreeOP' AND itemno=fob.phaseopinion) AS auditResStsDes\n" + + "FROM FLOW_TASK FT\n" + + "LEFT JOIN FLOW_OPINION_BUSINESS FOB ON FT.SERIALNO=FOB.SERIALNO \n" + + "WHERE FT.flowname = '业务申请流程' \n" + + "AND FT.phaseno='0030' \n" + + "AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'')"; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + while(rs.next()) { + // 获取接口推送所需数据 + con++; + uuidDetail = UUID.randomUUID().toString().replace("-", ""); + userid = rs.getString("userid"); // 用户id + username = rs.getString("username"); // 用户姓名 + objectno = rs.getString("objectno"); // 流程编号 + serialno = rs.getString("serialno"); // 流程处理流水 + auditFlowType = rs.getString("auditFlowType"); // 流程审核类型 + auditFlowTypeDes = rs.getString("auditFlowTypeDes"); // 流程审核类型说明 + createtime = rs.getString("begintime"); // 流程创建时间 + begintime = rs.getString("begintime"); // 流程开始时间 + endtime = rs.getString("endtime"); // 流程结束时间 + nextAuditFlowType = rs.getString("nextAuditFlowType"); // 下阶段流程审核类型 + auditResSts = rs.getString("auditResSts"); // 流程审核结果 + auditResStsDes = rs.getString("auditResStsDes"); // 流程审核结果说明 + if("任意退回".equals(nextAuditFlowType)){ + continue; + } + if(StringUtils.isNotEmpty(createtime)){//开始时间不为空 + jump_createtime = resJumpHoliday(Sqlca, rs.getString("begintime")); // 跳过节假日之后流程创建时间 + create_day = dayFormat.format(simpleDateFormat.parse(jump_createtime)); + jump_createtime = sdf.format(simpleDateFormat.parse(jump_createtime)); + jump_begintime = jump_createtime; // 跳过节假日之后流程开始时间 + createtime = sdf.format(simpleDateFormat.parse(createtime)); + begintime = createtime; + } + if (StringUtils.isNotEmpty(endtime)){//结束时间不为空 + jump_endtime = resJumpHoliday(Sqlca, rs.getString("endtime")); // 跳过节假日之后流程结束时间 + audit_day = dayFormat.format(simpleDateFormat.parse(jump_endtime)); + endtime = sdf.format(simpleDateFormat.parse(endtime)); + jump_endtime = sdf.format(simpleDateFormat.parse(jump_endtime)); + } + insertSql="INSERT INTO st_credit_audit_order_detail(id,serialno,objectno,userid,username, " + + "auditFlowType," + + "auditFlowTypeDes," + + "createtime," + + "begintime," + + "endtime," + + "create_day," + + "audit_day," + + "jump_createtime," + + "jump_begintime," + + "jump_endtime," + + "nextAuditFlowType," + + "auditResSts," + + "auditResStsDes," + + "remark," + + "INPUTTIME, " + + "UPDATETIME " + + ") " + + "VALUES ( " + + "'"+uuidDetail+"', " + + "'"+serialno+"', " + + "'"+objectno+"', " + + "'"+userid+"', " + + "'"+username+"', " + + "'"+auditFlowType+"', " + + "'"+auditFlowTypeDes+"', " + + " '"+createtime+"', " + + " '"+begintime+"', " + + " '"+endtime+"', " + + " '"+create_day+"', " + + " '"+audit_day+"', " + + " '"+jump_createtime+"', " + + " '"+jump_begintime+"', " + + " '"+jump_endtime+"', " + + "'"+nextAuditFlowType+"', " + + "'"+auditResSts+"', " + + "'"+auditResStsDes+"', " + + "'"+remark+"', " + + "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'), " + + "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') " + + ")"; + Sqlca.executeSQL(new SqlObject(insertSql)); + + } + return String.valueOf(con); + } + + + /** + * 查询最小创建时间更改明细记录中对应的创建时间 + * @return + * @throws Exception + */ + public String updateDetail(Transaction Sqlca) throws Exception { + // 定义全局对象 + String objectno = ""; // 流程编号 + String begintime = ""; // 流程创建时间 + String createtime = ""; // 跳过节假日之后流程创建时间 + String create_day = ""; // 跳过节假日之后流程创建日期 + String updSql = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); + int con=0; + // 查询所有需要发送还款提醒的数据 + // 查询所有需要发送还款提醒的数据 + String selSql="SELECT \n" + + " FT.userid,\n" + + " FT.objectno,\n" + + " min(FT.begintime) AS begintime\n" + + "FROM FLOW_TASK FT\n" + + "LEFT JOIN FLOW_OPINION_BUSINESS FOB ON FT.SERIALNO=FOB.SERIALNO \n" + + "WHERE FT.flowname = '业务申请流程' \n" + + "AND FT.phaseno='0030' \n" + + "AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') group by FT.objectno"; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + while(rs.next()) { + // 获取接口推送所需数据 + con++; + begintime = rs.getString("begintime"); // 流程编号 + objectno = rs.getString("objectno"); // 流程创建时间 + createtime = sdf.format(simpleDateFormat.parse(begintime)); + create_day = dayFormat.format(simpleDateFormat.parse(resJumpHoliday(Sqlca, begintime))); + updSql="UPDATE st_credit_audit_order_detail SET create_day='"+create_day+"', createtime='"+createtime+"'," + + "UPDATETIME=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') WHERE objectno='"+objectno+"' "; + Sqlca.executeSQL(new SqlObject(updSql)); + objectno = ""; + begintime = ""; + createtime = ""; + create_day = ""; + updSql = ""; + } + return String.valueOf(con); + } + + /** + * 初始化审核统计报表-保存审核日期相关订单 + * @return + * @throws Exception + */ + public String initOrderAuditDay(Transaction Sqlca) throws Exception { + String insertSql="INSERT INTO st_credit_audit_order(\n" + + " id,\n" + + " every_day,\n" + + " userid,\n" + + " username,\n" + + " auditFlowType,\n" + + " auditFlowTypeDes,\n" + + " count_audit,\n" + + " count_audit_pass,\n" + + " count_audit_refuse,\n" + + " count_audit_refuse1,\n" + + " count_audit_refuse2,\n" + + " count_audit_refuse3,\n" + + " count_audit_refuse4,\n" + + " count_audit_refuse5,\n" + + " count_audit_refuse6\n" + + " )\n" + + " SELECT \n" + + " replace(uuid(),'-',''),\n" + + " st2.every_day,\n" + + " st2.userid,\n" + + " st2.username,\n" + + " st2.auditFlowType,\n" + + " st2.auditFlowTypeDes,\n" + + " st2.count_audit,\n" + + " st3.count_audit_pass,\n" + + " st4.count_audit_refuse,\n" + + " st5.count_audit_refuse1,\n" + + " st6.count_audit_refuse2,\n" + + " st7.count_audit_refuse3,\n" + + " st8.count_audit_refuse4,\n" + + " st9.count_audit_refuse5,\n" + + " st10.count_audit_refuse6\n" + + " from\n" + + " (SELECT COUNT(1) AS count_audit,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts != 'null'AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st2 \n" + + " left join (SELECT COUNT(1) AS count_audit_pass,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0070'AND (endtime is not null or endtime != '')GROUP BY audit_day, userid) as st3 on st3.every_day = st2.every_day AND st3.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts != '0070' AND auditResSts != 'null' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st4 on st4.every_day = st2.every_day AND st4.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse1,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0010' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st5 on st5.every_day = st2.every_day AND st5.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse2,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0020' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st6 on st6.every_day = st2.every_day AND st6.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse3,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0030' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st7 on st7.every_day = st2.every_day AND st7.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse4,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0040' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st8 on st8.every_day = st2.every_day AND st8.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse5,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0050' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st9 on st9.every_day = st2.every_day AND st9.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse6,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0060' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st10 on st10.every_day = st2.every_day AND st10.userid=st2.userid \n"; + Sqlca.executeSQL(new SqlObject(insertSql)); + return "-1"; + } + + /** + * 根据查询进单统计数据，添加或者更新统计订单数据 + * @return + * @throws Exception + */ + public String saveOrderAuditDay(Transaction Sqlca) throws Exception { + // 定义全局对象 + String id = ""; // 流程编号 + String order_count = ""; // 流程编号 + String userid = ""; // 流程编号 + String every_day = ""; // 流程编号 + String username = ""; // 流程创建时间 + String auditFlowType = ""; // 流程创建时间 + String auditFlowTypeDes = ""; // 跳过节假日之后流程创建时间 + String updSql = ""; + String selSql2 = ""; + int con=0; + // 查询所有需要发送还款提醒的数据 + String selSql="SELECT count(1) as order_count,std1.every_day,std1.userid,std1.username,std1.auditFlowType,std1.auditFlowTypeDes \n" + + " from (SELECT min(create_day) AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail GROUP BY objectno) AS std1 \n" + + " GROUP BY std1.every_day "; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + while(rs.next()) { + id = UUID.randomUUID().toString().replace("-", ""); + // 获取接口推送所需数据 + con++; + every_day = rs.getString("every_day"); // 流程编号 + order_count = rs.getString("order_count"); // 流程创建时间 + userid = rs.getString("userid"); // 流程创建时间 + username = rs.getString("username"); // 流程创建时间 + auditFlowType = rs.getString("auditFlowType"); // 流程创建时间 + auditFlowTypeDes = rs.getString("auditFlowTypeDes"); // 流程创建时间 + + selSql2="SELECT count(1) as countNum FROM st_credit_audit_order WHERE every_day ='" + every_day +"'"; + ASResultSet rs2 = Sqlca.getASResultSet(new SqlObject(selSql2)); + if(rs2.next()) { + if(rs2.getInt("countNum") > 0){ + updSql="UPDATE st_credit_audit_order SET order_count='"+order_count+"', " + + "UPDATETIME=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') WHERE every_day='"+every_day+"' "; + Sqlca.executeSQL(new SqlObject(updSql)); + }else { + String insertSql = "INSERT INTO st_credit_audit_order(\n" + + " id,\n" + + " every_day,\n" + + " userid,\n" + + " username,\n" + + " auditFlowType,\n" + + " auditFlowTypeDes,\n" + + " order_count,\n" + + " INPUTTIME, " + + " UPDATETIME " + + " ) " + + " VALUES ( " + + " '" + id + "', " + + " '" + every_day + "', " + + " '" + userid + "', " + + " '" + userid + "', " + + " '" + username + "', " + + " '" + auditFlowType + "', " + + " '" + auditFlowTypeDes + "', " + + "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'), " + + "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') " + + ")"; + } + } + id = ""; + order_count = ""; + userid = ""; + every_day = ""; + username = ""; + auditFlowType = ""; + auditFlowTypeDes = ""; + updSql = ""; + selSql2 = ""; + } + return String.valueOf(con); + } + + /** + * 根据查询进单统计数据，修改 + * @return + * @throws Exception + */ + public String updateOrderAuditDay(Transaction Sqlca) throws Exception { + // 定义全局对象 + String id = ""; // 流程编号 + String userid = ""; // 流程编号 + String every_day = ""; // 流程编号 + String begintime = ""; // 流程创建时间 + String endtime = ""; // 流程创建时间 + String audittime = ""; // 跳过节假日之后流程创建时间 + String updSql = ""; + String selSql2 = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + int con=0; + // 查询所有需要发送还款提醒的数据 + String selSql="SELECT id, every_day, userid FROM st_credit_audit_order "; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + while(rs.next()) { + // 获取接口推送所需数据 + con++; + id = rs.getString("id"); // 流程编号 + every_day = rs.getString("every_day"); // 流程编号 + userid = rs.getString("userid"); // 流程创建时间 + + selSql2="SELECT \n" + + " jump_begintime,\n" + + " jump_endtime \n" + + " FROM st_credit_audit_order_detail \n" + + " WHERE userid = '" + userid +"'" + + " AND audit_day ='" + every_day +"'" + + " AND auditResSts != 'null'" + + " AND (endtime is not null or endtime != '')" ; + ASResultSet rs2 = Sqlca.getASResultSet(new SqlObject(selSql2)); + begintime = ""; // 流程创建时间 + endtime = ""; + while(rs2.next()) { + String jump_begintime = rs2.getString("jump_begintime"); // 流程创建时间 + String jump_endtime = rs2.getString("jump_endtime"); // 流程创建时间 + if(StringUtils.isEmpty(begintime) || sdf.parse(begintime).getTime() > sdf.parse(jump_begintime).getTime()){ + begintime = jump_begintime; + } + if(StringUtils.isEmpty(endtime) || sdf.parse(jump_endtime).getTime() > sdf.parse(endtime).getTime()){ + endtime = jump_endtime; + } + } + audittime = resDiffJumpHoliday(Sqlca, simpleDateFormat.format(sdf.parse(begintime)), simpleDateFormat.format(sdf.parse(endtime))); + updSql="UPDATE st_credit_audit_order SET begintime='"+begintime+"', " + + " endtime='"+endtime+"', " + + " audittime='"+audittime+"', " + + "UPDATETIME=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') WHERE id='"+id+"' "; + Sqlca.executeSQL(new SqlObject(updSql)); + id = ""; + userid = ""; + every_day = ""; + begintime = ""; + endtime = ""; + audittime = ""; + updSql = ""; + selSql2 = ""; + } + return String.valueOf(con); + } + + + + /** + * 0010 信用不良 + * 0020 法院执行 + * 0030 虚假信息 + * 0040 身份核实异常 + * 0050 购车目的异常 + * 0060 综合评分不足 + * 0070 同意 + * 0080 附条件通过 + */ + /** + * 根据当前时间获得跳过节假日的工作日时间 + * @param date + * @return + */ + private String resJumpHoliday(Transaction Sqlca, String date) throws SQLException, ParseException { + //查询当前时间是否在工作时间 + SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + int hour = Integer.parseInt(date.substring(11, 13)); + int minute = Integer.parseInt(date.substring(14, 16)); + if(hour < 9){//时间小于当天9点，则调整时间为上午九点 + date = date.substring(0, 11) + "09:00:00"; + }else if((hour == 17 && minute > 30) || (hour > 17)){//时间小于当天17:30点，则调整时间为第二天的上午九点 + Date time = simpleDateFormat.parse(date); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(time); + calendar.add(Calendar.DAY_OF_MONTH, 1); + date = simpleDateFormat.format(calendar.getTime()).substring(0, 11) + "09:00:00"; + } + //查询当前时间是否在节假日时间 + String day = date.substring(0, 10); + int count = 0; + while (count < 15){ + count ++; + String selSql="SELECT count(1) as countNum " + + " FROM st_credit_audit_holiday st" + + " WHERE st.c_date='" + day +"'" + + " AND st.otype='休'" ; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + int countNum = 0; + if(rs.next()){ + countNum = rs.getInt("countNum"); + } + if(countNum > 0){ + Date time = simpleDateFormat.parse(date); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(time); + calendar.add(Calendar.DAY_OF_MONTH, 1); + date = simpleDateFormat.format(calendar.getTime()).substring(0, 11) + "09:00:00"; + day = date.substring(0, 10); + }else { + break; + } + } + return date; + } + + /** + * 根据时间段相差时间获得跳过节假日的工作日时间 + * @param begintime 开始时间 + * @param endtime 结束时间 + * @return + */ + private String resDiffJumpHoliday(Transaction Sqlca, String begintime, String endtime) throws SQLException, ParseException { + //获取开始时间、结束时间跳过节假日的时间 + begintime = resJumpHoliday(Sqlca, begintime); + endtime = resJumpHoliday(Sqlca, endtime); + //确认开始时间，到结束时间，中间隔的时间，并排除节假日时间 + //如果结束时间小于或者等于开始时间 + SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + Date beginDate = simpleDateFormat.parse(begintime); + Date endDate = simpleDateFormat.parse(endtime); + long diff = 0; + if(beginDate.getTime() >= endDate.getTime()){ + return "0"; + }else if (begintime.substring(0, 10).equals(endtime.substring(0, 10))){ + diff = diffMinute(beginDate.getTime(), endDate.getTime()); + return String.valueOf(diff); + }else { + long diffBeginAfter = diffBeginDateAfter(begintime, beginDate); + long diffEndDateBefore = diffEndDateBefore(endtime, endDate); + diff = diffBeginAfter + diffEndDateBefore; + //得到相差的天数 betweenDate + + beginDate = dayFormat.parse(dayFormat.format(beginDate)); + endDate = dayFormat.parse(dayFormat.format(endDate)); + long betweenDate = (endDate.getTime() - beginDate.getTime())/(60*60*24*1000); + if (betweenDate == 1){ + return String.valueOf(diff); + }else {//中间相隔大于一天查询数据库相隔天数中有几天是假期， + begintime = dayFormat.format(beginDate); + endtime = dayFormat.format(endDate); + String selSql="SELECT COUNT(1) as countNum FROM (\n" + + " SELECT c_date\n" + + " FROM st_credit_audit_holiday st\n" + + " WHERE st.c_date BETWEEN '"+begintime+"' AND '"+endtime+"'\n" + + " AND st.otype='休'\n" + + " GROUP BY st.c_date\n" + + " ) AS s" ; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + int countNum = 0; + if(rs.next()){ + countNum = rs.getInt("countNum"); + } + diff += (betweenDate - countNum - 1)*8*60; + return String.valueOf(diff); + } + } + } + + private long diffEndDateBefore(String endTime, Date endDate) throws ParseException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + String endtimeBefore = endTime.substring(0, 11) + "09:00:00"; + Date endDateBefore = simpleDateFormat.parse(endtimeBefore); + return diffMinute(endDateBefore.getTime(), endDate.getTime()); + } + + private long diffBeginDateAfter(String beginTime, Date beginDate) throws ParseException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + String begintimeAfter = beginTime.substring(0, 11) + "17:30:00"; + Date beginDateAfter = simpleDateFormat.parse(begintimeAfter); + return diffMinute(beginDate.getTime(), beginDateAfter.getTime()); + } + + private long diffMinute(long begin, long end){ + if(begin > end){ + return -1; + } + return (end - begin)/1000/60; + } + + + private boolean compareTime(String begin, String end) throws ParseException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + return simpleDateFormat.parse(begin).getTime() > simpleDateFormat.parse(begin).getTime(); + } +} From 0033eeba7c800f9671099c43b9868391e3a1d5c6 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Tue, 21 Apr 2020 18:01:03 +0800 Subject: [PATCH 69/89] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp index 56d298aa6..eb9c15e02 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp @@ -10,9 +10,9 @@ String ishistory = CurPage.getParameter("IsHistory"); String sTempletNo = CurPage.getParameter("TempletNo");//模板号 ASObjectModel doTemp = new ASObjectModel("LCRentIncomeTempList"); - if(null!=ishistory&&ishistory.equals("true")){ + /* if(null!=ishistory&&ishistory.equals("true")){ doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory"); - } + } */ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); if("0030".equals(phaseNo)){ doTemp.setReadOnly("", true); From d6c076e9b59ecaf6e37ea630ee447d4dc8b192c5 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 21 Apr 2020 21:39:44 +0800 Subject: [PATCH 70/89] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=B7=BB=E5=8A=A0=E7=BB=8F=E9=94=80=E5=95=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_prd.xml | 3 ++- src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java | 4 ++++ src_sql/view/vi_products_number.sql | 7 +++---- src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql | 13 +++++++------ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml index fb12414da..511512f54 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml @@ -191,7 +191,8 @@ - + + diff --git a/src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java b/src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java index 6c2fabe8f..784476461 100644 --- a/src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java +++ b/src_jbo/jbo/prd/VI_PRODUCTS_NUMBER.java @@ -53,4 +53,8 @@ public interface VI_PRODUCTS_NUMBER{ * 产品类型 STRING(20)
*/ public static final String Attribute2 = "Attribute2"; + /** + * 经销商名称 STRING(20)
+ */ + public static final String distributor_name = "distributor_name"; } \ No newline at end of file diff --git a/src_sql/view/vi_products_number.sql b/src_sql/view/vi_products_number.sql index 27d201e24..8dc23fa42 100644 --- a/src_sql/view/vi_products_number.sql +++ b/src_sql/view/vi_products_number.sql @@ -1,12 +1,11 @@ - CREATE VIEW apzl.vi_products_number AS ( -SELECT bt.TYPENO,bt.TYPENAME,psl.payType,psl.LeasForm,psl.equip_type,psl.EFFECTIVEDATE,num.INCOME_NUMBER,num.fact_money,num.fact_date,bt.Attribute2 +SELECT bt.TYPENO,bt.TYPENAME,psl.payType,psl.LeasForm,psl.equip_type,psl.EFFECTIVEDATE,num.INCOME_NUMBER,num.fact_money,num.fact_date,bt.Attribute2,di.distributor_name FROM BUSINESS_TYPE bt LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON bt.typeno=psl.PRODUCTID -LEFT JOIN (SELECT lcc.INCOME_NUMBER INCOME_NUMBER,lci.product_id product_id,SUM(lfi.fact_money) fact_money,MIN(lfi.fact_date) fact_date +LEFT JOIN (SELECT lcc.INCOME_NUMBER INCOME_NUMBER,lci.product_id product_id,SUM(lfi.fact_money) fact_money,MIN(lfi.fact_date) fact_date,lci.distributor_id AS distributor_id FROM lb_contract_info lci LEFT JOIN LC_CALC_CONDITION lcc ON lci.id=lcc.contract_id LEFT JOIN lc_fund_income lfi ON lci.id=lfi.contract_id AND lfi.pay_type='pay_type_out' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' WHERE lci.contract_status >=31 AND lci.contract_status <=100 -GROUP BY lci.product_id,lcc.INCOME_NUMBER) num ON num.product_id=bt.typeno +GROUP BY lci.product_id,lcc.INCOME_NUMBER,lci.distributor_id) num ON num.product_id=bt.typeno LEFT JOIN distributor_info di ON di.distributor_no=num.distributor_id ); \ No newline at end of file diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql index 45dac18ed..2deac043d 100644 --- a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql +++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql @@ -3,12 +3,12 @@ ALTER TABLE lb_equipment_car ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT ALTER TABLE lb_equipment_car_temp ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3; ALTER TABLE lb_equipment_car_his ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3; -- 模板添加字段 -DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1081'; -INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LBEquipmentInfoTemp_Cars','1081','1081','1','O','FRAME_NUMBER2','FRAME_NUMBER2','String','','挂车车架号1','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/13 08:59:43','0','','1','','','',''); -DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1082'; -INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LBEquipmentInfoTemp_Cars','1082','1082','1','O','FRAME_NUMBER3','FRAME_NUMBER3','String','','挂车车架号2','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/13 08:59:43','','','1','','','',''); -DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1083'; -INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LBEquipmentInfoTemp_Cars','1083','1083','1','O','FRAME_NUMBER4','FRAME_NUMBER4','String','','挂车车架号3','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/13 08:59:43','','','1','','','',''); +delete from awe_do_library where dono='LBEquipmentInfoTemp_Cars' and colindex='1081'; +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1081','1081','1','O','FRAME_NUMBER2','FRAME_NUMBER2','String','','挂车车架号','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/17 16:34:48','0','','1','','','',''); +delete from awe_do_library where dono='LBEquipmentInfoTemp_Cars' and colindex='1082'; +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1082','1082','1','O','FRAME_NUMBER3','FRAME_NUMBER3','String','','挂车车架号2','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/17 16:34:48','','','1','','','',''); +delete from awe_do_library where dono='LBEquipmentInfoTemp_Cars' and colindex='1083'; +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1083','1083','1','O','FRAME_NUMBER4','FRAME_NUMBER4','String','','挂车车架号3','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/17 16:34:48','','','1','','','',''); -- 创建业务申请初审记录表 CREATE TABLE business_apply_userinfo ( @@ -265,6 +265,7 @@ Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualn Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1310','1310','1','','com.amarsoft.awe.dw.ui.list.ProductsBusinessListUtil.getProductISIncidental(TYPENO)','ISincidentals','String','','杂费（是否参融）','','1','Select','1','1','Code','DeleteFlag','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/15 11:02:26','SYS_Designer','2020/04/15 11:08:53','0','','1','','','',''); Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1320','1320','1','O','EFFECTIVEDATE','EFFECTIVEDATE','String','','生效日期','','1','Text','1','1','','','','10','1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:39:35','SYS_Designer','2020/04/15 10:54:41','','','1','','','',''); Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1340','1340','1','O','fact_date','fact_date','String','','初次投放时间','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:11','SYS_Designer','2020/04/15 10:55:02','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1350','1350','1','O','distributor_name','distributor_name','String','','经销商名称','','1','Text','1','1','','','','20','1','0','0','1','0',0,'','','','SYS_Designer','2020/04/21 21:32:54','SYS_Designer','2020/04/21 21:33:32','','','1','','','',''); Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ProductsBusinessList','1360','1360','1','O','fact_money','fact_money','String','','产品投放金额','','1','Text','2','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/12 16:38:11','SYS_Designer','2020/04/15 10:56:41','0','','1','','','',''); -- 添加对应的菜单 Insert Into AWE_MENU_INFO (menuid,menuname,displayname,sortno,url,urlparam,target,style,isinuse,remark,inputorgid,inputuserid,inputtime,updateorgid,updateuserid,updatetime,accesstype,icon,appicon) Values ('9600100313','产品管理报表','产品管理报表','9600100313','/ProductManage/ProductsBusinessList.jsp','','_self','','1','',null,'SYS_Designer','2020/04/12 16:09:26',null,'SYS_Designer','2020/04/12 16:09:26','10','',''); From e5d0cb8514431c4ccd0f2123125bd7849e8067d7 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 22 Apr 2020 09:23:06 +0800 Subject: [PATCH 71/89] =?UTF-8?q?=E5=AE=A2=E6=88=B7=EF=BC=88=E5=BC=A0?= =?UTF-8?q?=E7=A3=8A=EF=BC=89=E4=BF=AE=E6=94=B9=E4=BF=A1=E5=AE=A1=E8=80=83?= =?UTF-8?q?=E6=A0=B8=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreditAuditHolidayBatch.java | 1500 +++++++++-------- 鎶ヨ〃/寰俊鍏紬鍙锋姤琛/鐢ㄦ埛缁戝畾淇℃伅琛.xml | 356 ++-- 鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/淇″鑰冩牳缁熻鎶ヨ〃.xml | 60 +- 3 files changed, 1018 insertions(+), 898 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java index bfe601c7c..e1ef3d8af 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java @@ -1,731 +1,769 @@ -package com.tenwa.lease.app.quartzmession; -import com.amarsoft.are.jbo.JBOException; -import com.amarsoft.awe.util.ASResultSet; -import com.amarsoft.awe.util.SqlObject; -import com.amarsoft.awe.util.Transaction; -import com.amarsoft.dict.als.cache.CacheLoaderFactory; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; -import org.quartz.Job; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import java.sql.SQLException; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -/** - * 初始化信审考核报表数据跑批 - * @author xiezhiwen - */ -public class CreditAuditHolidayBatch implements Job{ - private static final Logger logger = LogManager.getLogger(CreditAuditHolidayBatch.class);// 引入logger日志 - - public void execute(JobExecutionContext arg0) throws JobExecutionException { - initDetail(); - updateDetail(); - initOrderAuditDay(); - saveOrderAuditDay(); - updateOrderAuditDay(); - } - - /** - * 添加审核流程记录明细 - * @return - */ - private void initDetail(){ - Transaction Sqlca=null; - try{ - Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - //初始化信审考核明细表 - String result1 = initDetail(Sqlca); - Sqlca.commit(); - logger.info("【初始化信审考核明细表】定时任务执行成功<<<<<<<<<<<<<: "+result1); - }catch(Exception e){ - logger.error("<<<<<<<<<<<<<<<<<<<<<<【初始化信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - logger.error("<<<<<<<<<<<<<<<<<<<<<<【初始化信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - logger.error("<<<<<<<<<<<<<<<<<<<<<<【初始化信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - try { - Sqlca.rollback(); - } catch (JBOException e1) { - e1.printStackTrace(); - } - e.printStackTrace(); - }finally { - if(Sqlca!=null) { - try { - Sqlca.commit(); - Sqlca.disConnect(); - } catch (JBOException e) { - e.printStackTrace(); - } - } - } - } - - /** - * 修改审核明细的创建时间 - * @return - */ - private void updateDetail(){ - Transaction Sqlca=null; - try{ - Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - //初始化信审考核明细表 - String result1 = updateDetail(Sqlca); - Sqlca.commit(); - logger.info("【修改信审考核明细表】定时任务执行异常<<<<<<<<<<<<<: "+result1); - }catch(Exception e){ - logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - try { - Sqlca.rollback(); - } catch (JBOException e1) { - e1.printStackTrace(); - } - e.printStackTrace(); - }finally { - if(Sqlca!=null) { - try { - Sqlca.commit(); - Sqlca.disConnect(); - } catch (JBOException e) { - e.printStackTrace(); - } - } - } - } - - /** - * 初始化审核统计报表-根据进单日期 - * @return - */ - private void initOrderAuditDay(){ - Transaction Sqlca=null; - try{ - Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - //初始化信审考核明细表 - String result1 = initOrderAuditDay(Sqlca); - Sqlca.commit(); - logger.info("【修改信审考核明细表】定时任务执行完成<<<<<<<<<<<<<: "+result1); - }catch(Exception e){ - logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - try { - Sqlca.rollback(); - } catch (JBOException e1) { - e1.printStackTrace(); - } - e.printStackTrace(); - }finally { - if(Sqlca!=null) { - try { - Sqlca.commit(); - Sqlca.disConnect(); - } catch (JBOException e) { - e.printStackTrace(); - } - } - } - } - - /** - * 初始化或者修改审核统计报表-根据审单日期 - * @return - */ - private void saveOrderAuditDay(){ - Transaction Sqlca=null; - try{ - Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - //初始化信审考核明细表 - String result1 = saveOrderAuditDay(Sqlca); - Sqlca.commit(); - logger.info("【修改信审考核明细表】定时任务执行完成<<<<<<<<<<<<<: "+result1); - }catch(Exception e){ - logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - try { - Sqlca.rollback(); - } catch (JBOException e1) { - e1.printStackTrace(); - } - e.printStackTrace(); - }finally { - if(Sqlca!=null) { - try { - Sqlca.commit(); - Sqlca.disConnect(); - } catch (JBOException e) { - e.printStackTrace(); - } - } - } - } - - /** - * 初始化或者修改审核统计报表-根据审单日期 - * @return - */ - private void updateOrderAuditDay(){ - Transaction Sqlca=null; - try{ - Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - //初始化信审考核明细表 - String result1 = updateOrderAuditDay(Sqlca); - Sqlca.commit(); - logger.info("【修改信审考核明细表】定时任务执行完成<<<<<<<<<<<<<: "+result1); - }catch(Exception e){ - logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - logger.error("<<<<<<<<<<<<<<<<<<<<<<【修改信审考核明细表】定时任务执行异常>>>>>>>>>>>>>>>>>>>>>>>"); - try { - Sqlca.rollback(); - } catch (JBOException e1) { - e1.printStackTrace(); - } - e.printStackTrace(); - }finally { - if(Sqlca!=null) { - try { - Sqlca.commit(); - Sqlca.disConnect(); - } catch (JBOException e) { - e.printStackTrace(); - } - } - } - } - - - /** - * 添加审核流程记录明细 - * @return - * @throws Exception - */ - public String initDetail(Transaction Sqlca) throws Exception { - // 定义全局对象 - String uuidDetail = ""; // 业务id - String userid = ""; // 用户id - String username = ""; // 用户姓名 - String objectno = ""; // 流程编号 - String serialno = ""; // 流程处理流水 - String auditFlowType = ""; // 流程审核类型 - String auditFlowTypeDes = ""; // 流程审核类型说明 - String createtime = ""; // 流程创建时间 - String begintime = ""; // 流程开始时间 - String endtime = ""; // 流程结束时间 - String jump_createtime = ""; // 跳过节假日之后流程创建时间 - String create_day = ""; // 跳过节假日之后流程创建日期 - String audit_day = ""; // 跳过节假日之后流程审核日期 - String jump_begintime = ""; // 跳过节假日之后流程开始时间 - String jump_endtime = ""; // 跳过节假日之后流程结束时间 - String nextAuditFlowType = ""; // 下阶段流程审核类型 - String auditResSts = ""; // 流程审核结果 - String auditResStsDes = ""; // 流程审核结果说明 - String remark = ""; - String insertSql = ""; - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); - SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); - int con=0; - // 查询所有需要发送还款提醒的数据 - String selSql="SELECT \n" + - " FT.userid,\n" + - " FT.username,\n" + - " FT.objectno,\n" + - " FT.serialno,\n" + - " FT.phaseno AS auditFlowType,\n" + - " FT.phasename AS auditFlowTypeDes,\n" + - " FT.begintime,\n" + - " FT.endtime,\n" + - " FT.phaseopinion1 AS nextAuditFlowType,\n" + - " fob.phaseopinion AS auditResSts,\n" + - " (SELECT itemname from code_library WHERE codeno='disagreeOP' AND itemno=fob.phaseopinion) AS auditResStsDes\n" + - "FROM FLOW_TASK FT\n" + - "LEFT JOIN FLOW_OPINION_BUSINESS FOB ON FT.SERIALNO=FOB.SERIALNO \n" + - "WHERE FT.flowname = '业务申请流程' \n" + - "AND FT.phaseno='0030' \n" + - "AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'')"; - ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); - while(rs.next()) { - // 获取接口推送所需数据 - con++; - uuidDetail = UUID.randomUUID().toString().replace("-", ""); - userid = rs.getString("userid"); // 用户id - username = rs.getString("username"); // 用户姓名 - objectno = rs.getString("objectno"); // 流程编号 - serialno = rs.getString("serialno"); // 流程处理流水 - auditFlowType = rs.getString("auditFlowType"); // 流程审核类型 - auditFlowTypeDes = rs.getString("auditFlowTypeDes"); // 流程审核类型说明 - createtime = rs.getString("begintime"); // 流程创建时间 - begintime = rs.getString("begintime"); // 流程开始时间 - endtime = rs.getString("endtime"); // 流程结束时间 - nextAuditFlowType = rs.getString("nextAuditFlowType"); // 下阶段流程审核类型 - auditResSts = rs.getString("auditResSts"); // 流程审核结果 - auditResStsDes = rs.getString("auditResStsDes"); // 流程审核结果说明 - if("任意退回".equals(nextAuditFlowType)){ - continue; - } - if(StringUtils.isNotEmpty(createtime)){//开始时间不为空 - jump_createtime = resJumpHoliday(Sqlca, rs.getString("begintime")); // 跳过节假日之后流程创建时间 - create_day = dayFormat.format(simpleDateFormat.parse(jump_createtime)); - jump_createtime = sdf.format(simpleDateFormat.parse(jump_createtime)); - jump_begintime = jump_createtime; // 跳过节假日之后流程开始时间 - createtime = sdf.format(simpleDateFormat.parse(createtime)); - begintime = createtime; - } - if (StringUtils.isNotEmpty(endtime)){//结束时间不为空 - jump_endtime = resJumpHoliday(Sqlca, rs.getString("endtime")); // 跳过节假日之后流程结束时间 - audit_day = dayFormat.format(simpleDateFormat.parse(jump_endtime)); - endtime = sdf.format(simpleDateFormat.parse(endtime)); - jump_endtime = sdf.format(simpleDateFormat.parse(jump_endtime)); - } - insertSql="INSERT INTO st_credit_audit_order_detail(id,serialno,objectno,userid,username, " + - "auditFlowType," + - "auditFlowTypeDes," + - "createtime," + - "begintime," + - "endtime," + - "create_day," + - "audit_day," + - "jump_createtime," + - "jump_begintime," + - "jump_endtime," + - "nextAuditFlowType," + - "auditResSts," + - "auditResStsDes," + - "remark," + - "INPUTTIME, " + - "UPDATETIME " + - ") " + - "VALUES ( " + - "'"+uuidDetail+"', " + - "'"+serialno+"', " + - "'"+objectno+"', " + - "'"+userid+"', " + - "'"+username+"', " + - "'"+auditFlowType+"', " + - "'"+auditFlowTypeDes+"', " + - " '"+createtime+"', " + - " '"+begintime+"', " + - " '"+endtime+"', " + - " '"+create_day+"', " + - " '"+audit_day+"', " + - " '"+jump_createtime+"', " + - " '"+jump_begintime+"', " + - " '"+jump_endtime+"', " + - "'"+nextAuditFlowType+"', " + - "'"+auditResSts+"', " + - "'"+auditResStsDes+"', " + - "'"+remark+"', " + - "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'), " + - "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') " + - ")"; - Sqlca.executeSQL(new SqlObject(insertSql)); - - } - return String.valueOf(con); - } - - - /** - * 查询最小创建时间更改明细记录中对应的创建时间 - * @return - * @throws Exception - */ - public String updateDetail(Transaction Sqlca) throws Exception { - // 定义全局对象 - String objectno = ""; // 流程编号 - String begintime = ""; // 流程创建时间 - String createtime = ""; // 跳过节假日之后流程创建时间 - String create_day = ""; // 跳过节假日之后流程创建日期 - String updSql = ""; - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); - SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); - int con=0; - // 查询所有需要发送还款提醒的数据 - // 查询所有需要发送还款提醒的数据 - String selSql="SELECT \n" + - " FT.userid,\n" + - " FT.objectno,\n" + - " min(FT.begintime) AS begintime\n" + - "FROM FLOW_TASK FT\n" + - "LEFT JOIN FLOW_OPINION_BUSINESS FOB ON FT.SERIALNO=FOB.SERIALNO \n" + - "WHERE FT.flowname = '业务申请流程' \n" + - "AND FT.phaseno='0030' \n" + - "AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') group by FT.objectno"; - ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); - while(rs.next()) { - // 获取接口推送所需数据 - con++; - begintime = rs.getString("begintime"); // 流程编号 - objectno = rs.getString("objectno"); // 流程创建时间 - createtime = sdf.format(simpleDateFormat.parse(begintime)); - create_day = dayFormat.format(simpleDateFormat.parse(resJumpHoliday(Sqlca, begintime))); - updSql="UPDATE st_credit_audit_order_detail SET create_day='"+create_day+"', createtime='"+createtime+"'," + - "UPDATETIME=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') WHERE objectno='"+objectno+"' "; - Sqlca.executeSQL(new SqlObject(updSql)); - objectno = ""; - begintime = ""; - createtime = ""; - create_day = ""; - updSql = ""; - } - return String.valueOf(con); - } - - /** - * 初始化审核统计报表-保存审核日期相关订单 - * @return - * @throws Exception - */ - public String initOrderAuditDay(Transaction Sqlca) throws Exception { - String insertSql="INSERT INTO st_credit_audit_order(\n" + - " id,\n" + - " every_day,\n" + - " userid,\n" + - " username,\n" + - " auditFlowType,\n" + - " auditFlowTypeDes,\n" + - " count_audit,\n" + - " count_audit_pass,\n" + - " count_audit_refuse,\n" + - " count_audit_refuse1,\n" + - " count_audit_refuse2,\n" + - " count_audit_refuse3,\n" + - " count_audit_refuse4,\n" + - " count_audit_refuse5,\n" + - " count_audit_refuse6\n" + - " )\n" + - " SELECT \n" + - " replace(uuid(),'-',''),\n" + - " st2.every_day,\n" + - " st2.userid,\n" + - " st2.username,\n" + - " st2.auditFlowType,\n" + - " st2.auditFlowTypeDes,\n" + - " st2.count_audit,\n" + - " st3.count_audit_pass,\n" + - " st4.count_audit_refuse,\n" + - " st5.count_audit_refuse1,\n" + - " st6.count_audit_refuse2,\n" + - " st7.count_audit_refuse3,\n" + - " st8.count_audit_refuse4,\n" + - " st9.count_audit_refuse5,\n" + - " st10.count_audit_refuse6\n" + - " from\n" + - " (SELECT COUNT(1) AS count_audit,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + - " WHERE auditResSts != 'null'AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st2 \n" + - " left join (SELECT COUNT(1) AS count_audit_pass,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + - " WHERE auditResSts = '0070'AND (endtime is not null or endtime != '')GROUP BY audit_day, userid) as st3 on st3.every_day = st2.every_day AND st3.userid=st2.userid\n" + - " left join (SELECT COUNT(1) AS count_audit_refuse,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + - " WHERE auditResSts != '0070' AND auditResSts != 'null' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st4 on st4.every_day = st2.every_day AND st4.userid=st2.userid\n" + - " left join (SELECT COUNT(1) AS count_audit_refuse1,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + - " WHERE auditResSts = '0010' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st5 on st5.every_day = st2.every_day AND st5.userid=st2.userid\n" + - " left join (SELECT COUNT(1) AS count_audit_refuse2,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + - " WHERE auditResSts = '0020' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st6 on st6.every_day = st2.every_day AND st6.userid=st2.userid\n" + - " left join (SELECT COUNT(1) AS count_audit_refuse3,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + - " WHERE auditResSts = '0030' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st7 on st7.every_day = st2.every_day AND st7.userid=st2.userid\n" + - " left join (SELECT COUNT(1) AS count_audit_refuse4,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + - " WHERE auditResSts = '0040' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st8 on st8.every_day = st2.every_day AND st8.userid=st2.userid\n" + - " left join (SELECT COUNT(1) AS count_audit_refuse5,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + - " WHERE auditResSts = '0050' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st9 on st9.every_day = st2.every_day AND st9.userid=st2.userid\n" + - " left join (SELECT COUNT(1) AS count_audit_refuse6,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + - " WHERE auditResSts = '0060' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st10 on st10.every_day = st2.every_day AND st10.userid=st2.userid \n"; - Sqlca.executeSQL(new SqlObject(insertSql)); - return "-1"; - } - - /** - * 根据查询进单统计数据，添加或者更新统计订单数据 - * @return - * @throws Exception - */ - public String saveOrderAuditDay(Transaction Sqlca) throws Exception { - // 定义全局对象 - String id = ""; // 流程编号 - String order_count = ""; // 流程编号 - String userid = ""; // 流程编号 - String every_day = ""; // 流程编号 - String username = ""; // 流程创建时间 - String auditFlowType = ""; // 流程创建时间 - String auditFlowTypeDes = ""; // 跳过节假日之后流程创建时间 - String updSql = ""; - String selSql2 = ""; - int con=0; - // 查询所有需要发送还款提醒的数据 - String selSql="SELECT count(1) as order_count,std1.every_day,std1.userid,std1.username,std1.auditFlowType,std1.auditFlowTypeDes \n" + - " from (SELECT min(create_day) AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail GROUP BY objectno) AS std1 \n" + - " GROUP BY std1.every_day "; - ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); - while(rs.next()) { - id = UUID.randomUUID().toString().replace("-", ""); - // 获取接口推送所需数据 - con++; - every_day = rs.getString("every_day"); // 流程编号 - order_count = rs.getString("order_count"); // 流程创建时间 - userid = rs.getString("userid"); // 流程创建时间 - username = rs.getString("username"); // 流程创建时间 - auditFlowType = rs.getString("auditFlowType"); // 流程创建时间 - auditFlowTypeDes = rs.getString("auditFlowTypeDes"); // 流程创建时间 - - selSql2="SELECT count(1) as countNum FROM st_credit_audit_order WHERE every_day ='" + every_day +"'"; - ASResultSet rs2 = Sqlca.getASResultSet(new SqlObject(selSql2)); - if(rs2.next()) { - if(rs2.getInt("countNum") > 0){ - updSql="UPDATE st_credit_audit_order SET order_count='"+order_count+"', " + - "UPDATETIME=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') WHERE every_day='"+every_day+"' "; - Sqlca.executeSQL(new SqlObject(updSql)); - }else { - String insertSql = "INSERT INTO st_credit_audit_order(\n" + - " id,\n" + - " every_day,\n" + - " userid,\n" + - " username,\n" + - " auditFlowType,\n" + - " auditFlowTypeDes,\n" + - " order_count,\n" + - " INPUTTIME, " + - " UPDATETIME " + - " ) " + - " VALUES ( " + - " '" + id + "', " + - " '" + every_day + "', " + - " '" + userid + "', " + - " '" + userid + "', " + - " '" + username + "', " + - " '" + auditFlowType + "', " + - " '" + auditFlowTypeDes + "', " + - "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'), " + - "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') " + - ")"; - } - } - id = ""; - order_count = ""; - userid = ""; - every_day = ""; - username = ""; - auditFlowType = ""; - auditFlowTypeDes = ""; - updSql = ""; - selSql2 = ""; - } - return String.valueOf(con); - } - - /** - * 根据查询进单统计数据，修改 - * @return - * @throws Exception - */ - public String updateOrderAuditDay(Transaction Sqlca) throws Exception { - // 定义全局对象 - String id = ""; // 流程编号 - String userid = ""; // 流程编号 - String every_day = ""; // 流程编号 - String begintime = ""; // 流程创建时间 - String endtime = ""; // 流程创建时间 - String audittime = ""; // 跳过节假日之后流程创建时间 - String updSql = ""; - String selSql2 = ""; - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); - int con=0; - // 查询所有需要发送还款提醒的数据 - String selSql="SELECT id, every_day, userid FROM st_credit_audit_order "; - ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); - while(rs.next()) { - // 获取接口推送所需数据 - con++; - id = rs.getString("id"); // 流程编号 - every_day = rs.getString("every_day"); // 流程编号 - userid = rs.getString("userid"); // 流程创建时间 - - selSql2="SELECT \n" + - " jump_begintime,\n" + - " jump_endtime \n" + - " FROM st_credit_audit_order_detail \n" + - " WHERE userid = '" + userid +"'" + - " AND audit_day ='" + every_day +"'" + - " AND auditResSts != 'null'" + - " AND (endtime is not null or endtime != '')" ; - ASResultSet rs2 = Sqlca.getASResultSet(new SqlObject(selSql2)); - begintime = ""; // 流程创建时间 - endtime = ""; - while(rs2.next()) { - String jump_begintime = rs2.getString("jump_begintime"); // 流程创建时间 - String jump_endtime = rs2.getString("jump_endtime"); // 流程创建时间 - if(StringUtils.isEmpty(begintime) || sdf.parse(begintime).getTime() > sdf.parse(jump_begintime).getTime()){ - begintime = jump_begintime; - } - if(StringUtils.isEmpty(endtime) || sdf.parse(jump_endtime).getTime() > sdf.parse(endtime).getTime()){ - endtime = jump_endtime; - } - } - audittime = resDiffJumpHoliday(Sqlca, simpleDateFormat.format(sdf.parse(begintime)), simpleDateFormat.format(sdf.parse(endtime))); - updSql="UPDATE st_credit_audit_order SET begintime='"+begintime+"', " + - " endtime='"+endtime+"', " + - " audittime='"+audittime+"', " + - "UPDATETIME=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') WHERE id='"+id+"' "; - Sqlca.executeSQL(new SqlObject(updSql)); - id = ""; - userid = ""; - every_day = ""; - begintime = ""; - endtime = ""; - audittime = ""; - updSql = ""; - selSql2 = ""; - } - return String.valueOf(con); - } - - - - /** - * 0010 信用不良 - * 0020 法院执行 - * 0030 虚假信息 - * 0040 身份核实异常 - * 0050 购车目的异常 - * 0060 综合评分不足 - * 0070 同意 - * 0080 附条件通过 - */ - /** - * 根据当前时间获得跳过节假日的工作日时间 - * @param date - * @return - */ - private String resJumpHoliday(Transaction Sqlca, String date) throws SQLException, ParseException { - //查询当前时间是否在工作时间 - SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); - int hour = Integer.parseInt(date.substring(11, 13)); - int minute = Integer.parseInt(date.substring(14, 16)); - if(hour < 9){//时间小于当天9点，则调整时间为上午九点 - date = date.substring(0, 11) + "09:00:00"; - }else if((hour == 17 && minute > 30) || (hour > 17)){//时间小于当天17:30点，则调整时间为第二天的上午九点 - Date time = simpleDateFormat.parse(date); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(time); - calendar.add(Calendar.DAY_OF_MONTH, 1); - date = simpleDateFormat.format(calendar.getTime()).substring(0, 11) + "09:00:00"; - } - //查询当前时间是否在节假日时间 - String day = date.substring(0, 10); - int count = 0; - while (count < 15){ - count ++; - String selSql="SELECT count(1) as countNum " + - " FROM st_credit_audit_holiday st" + - " WHERE st.c_date='" + day +"'" + - " AND st.otype='休'" ; - ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); - int countNum = 0; - if(rs.next()){ - countNum = rs.getInt("countNum"); - } - if(countNum > 0){ - Date time = simpleDateFormat.parse(date); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(time); - calendar.add(Calendar.DAY_OF_MONTH, 1); - date = simpleDateFormat.format(calendar.getTime()).substring(0, 11) + "09:00:00"; - day = date.substring(0, 10); - }else { - break; - } - } - return date; - } - - /** - * 根据时间段相差时间获得跳过节假日的工作日时间 - * @param begintime 开始时间 - * @param endtime 结束时间 - * @return - */ - private String resDiffJumpHoliday(Transaction Sqlca, String begintime, String endtime) throws SQLException, ParseException { - //获取开始时间、结束时间跳过节假日的时间 - begintime = resJumpHoliday(Sqlca, begintime); - endtime = resJumpHoliday(Sqlca, endtime); - //确认开始时间，到结束时间，中间隔的时间，并排除节假日时间 - //如果结束时间小于或者等于开始时间 - SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); - Date beginDate = simpleDateFormat.parse(begintime); - Date endDate = simpleDateFormat.parse(endtime); - long diff = 0; - if(beginDate.getTime() >= endDate.getTime()){ - return "0"; - }else if (begintime.substring(0, 10).equals(endtime.substring(0, 10))){ - diff = diffMinute(beginDate.getTime(), endDate.getTime()); - return String.valueOf(diff); - }else { - long diffBeginAfter = diffBeginDateAfter(begintime, beginDate); - long diffEndDateBefore = diffEndDateBefore(endtime, endDate); - diff = diffBeginAfter + diffEndDateBefore; - //得到相差的天数 betweenDate - - beginDate = dayFormat.parse(dayFormat.format(beginDate)); - endDate = dayFormat.parse(dayFormat.format(endDate)); - long betweenDate = (endDate.getTime() - beginDate.getTime())/(60*60*24*1000); - if (betweenDate == 1){ - return String.valueOf(diff); - }else {//中间相隔大于一天查询数据库相隔天数中有几天是假期， - begintime = dayFormat.format(beginDate); - endtime = dayFormat.format(endDate); - String selSql="SELECT COUNT(1) as countNum FROM (\n" + - " SELECT c_date\n" + - " FROM st_credit_audit_holiday st\n" + - " WHERE st.c_date BETWEEN '"+begintime+"' AND '"+endtime+"'\n" + - " AND st.otype='休'\n" + - " GROUP BY st.c_date\n" + - " ) AS s" ; - ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); - int countNum = 0; - if(rs.next()){ - countNum = rs.getInt("countNum"); - } - diff += (betweenDate - countNum - 1)*8*60; - return String.valueOf(diff); - } - } - } - - private long diffEndDateBefore(String endTime, Date endDate) throws ParseException { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); - String endtimeBefore = endTime.substring(0, 11) + "09:00:00"; - Date endDateBefore = simpleDateFormat.parse(endtimeBefore); - return diffMinute(endDateBefore.getTime(), endDate.getTime()); - } - - private long diffBeginDateAfter(String beginTime, Date beginDate) throws ParseException { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); - String begintimeAfter = beginTime.substring(0, 11) + "17:30:00"; - Date beginDateAfter = simpleDateFormat.parse(begintimeAfter); - return diffMinute(beginDate.getTime(), beginDateAfter.getTime()); - } - - private long diffMinute(long begin, long end){ - if(begin > end){ - return -1; - } - return (end - begin)/1000/60; - } - - - private boolean compareTime(String begin, String end) throws ParseException { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); - return simpleDateFormat.parse(begin).getTime() > simpleDateFormat.parse(begin).getTime(); - } -} +package com.tenwa.lease.app.quartzmession; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.awe.util.ASResultSet; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.LogManager; +import org.apache.log4j.Logger; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import java.sql.SQLException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.UUID; + +/** + * 初始化信审考核报表数据跑批 + * @author xiezhiwen + */ +public class CreditAuditHolidayBatch implements Job{ + private static final Logger logger = LogManager.getLogger(CreditAuditHolidayBatch.class);// 引入logger日志 + + public void execute(JobExecutionContext arg0) throws JobExecutionException { + logger.info("【信审考核统计】【CreditAuditHolidayBatch】【开始】<<<<<<<<<<<<<: "); + deleteCreditAudit(); + initDetail(); + updateDetail(); + initOrderAuditDay(); + saveOrderAuditDay(); + updateOrderAuditDay(); + logger.info("【信审考核统计】【CreditAuditHolidayBatch】【完成】<<<<<<<<<<<<<: "); + } + + /** + * 添加审核流程记录明细 + * @return + */ + private void deleteCreditAudit(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String delSql="truncate table st_credit_audit_order_detail"; + String delSql2="truncate table st_credit_audit_order"; + Sqlca.executeSQL(new SqlObject(delSql)); + Sqlca.executeSQL(new SqlObject(delSql2)); + Sqlca.commit(); + logger.info("【信审考核统计】【deleteCreditAudit】数据清空执行完成<<<<<<<<<<<<<: "); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【deleteCreditAudit】数据清空执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【deleteCreditAudit】数据清空执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【deleteCreditAudit】数据清空执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 添加审核流程记录明细 + * @return + */ + private void initDetail(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String result1 = initDetail(Sqlca); + Sqlca.commit(); + logger.info("【信审考核统计】【initDetail】初始化订单明细记录<<<<<<<<<<<<<: "+result1); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【initDetail】初始化订单明细记录>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【initDetail】初始化订单明细记录>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【initDetail】初始化订单明细记录>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 修改审核明细的创建时间 + * @return + */ + private void updateDetail(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String result1 = updateDetail(Sqlca); + Sqlca.commit(); + logger.info("【信审考核统计】【updateDetail】修改订单明细中的创建时间执行完成<<<<<<<<<<<<<: "+result1); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【updateDetail】修改订单明细中的创建时间执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【updateDetail】修改订单明细中的创建时间执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【updateDetail】修改订单明细中的创建时间执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 初始化审核统计报表-根据进单日期 + * @return + */ + private void initOrderAuditDay(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String result1 = initOrderAuditDay(Sqlca); + Sqlca.commit(); + logger.info("【信审考核统计】【initOrderAuditDay】初始化订单表审核数据统计执行完成<<<<<<<<<<<<<: "+result1); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【initOrderAuditDay】初始化订单表审核数据统计执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【initOrderAuditDay】初始化订单表审核数据统计执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【initOrderAuditDay】初始化订单表审核数据统计执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 初始化或者修改审核统计报表-根据审单日期 + * @return + */ + private void saveOrderAuditDay(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String result1 = saveOrderCreateDay(Sqlca); + Sqlca.commit(); + logger.info("【信审考核统计】【saveOrderAuditDay】根据进单时间新增和修改订单统计表执行完成<<<<<<<<<<<<<: "+result1); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【saveOrderAuditDay】根据进单时间新增和修改订单统计表执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【saveOrderAuditDay】根据进单时间新增和修改订单统计表执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【saveOrderAuditDay】根据进单时间新增和修改订单统计表执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 初始化或者修改审核统计报表-根据审单日期 + * @return + */ + private void updateOrderAuditDay(){ + Transaction Sqlca=null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + //初始化信审考核明细表 + String result1 = updateOrderAuditDay(Sqlca); + Sqlca.commit(); + logger.info("【信审考核统计】【updateOrderAuditDay】计算信审考核统计表审核时间执行完成<<<<<<<<<<<<<: "+result1); + }catch(Exception e){ + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【updateOrderAuditDay】计算信审考核统计表审核时间执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【updateOrderAuditDay】计算信审考核统计表审核时间执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + logger.error("<<<<<<<<<<<<<<<<<<<<<<【信审考核统计】【updateOrderAuditDay】计算信审考核统计表审核时间执行异常>>>>>>>>>>>>>>>>>>>>>>>"); + try { + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.commit(); + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + } + } + + + /** + * 添加审核流程记录明细 + * @return + * @throws Exception + */ + public String initDetail(Transaction Sqlca) throws Exception { + // 定义全局对象 + String uuidDetail = ""; // 业务id + String userid = ""; // 用户id + String username = ""; // 用户姓名 + String objectno = ""; // 流程编号 + String serialno = ""; // 流程处理流水 + String auditFlowType = ""; // 流程审核类型 + String auditFlowTypeDes = ""; // 流程审核类型说明 + String createtime = ""; // 流程创建时间 + String begintime = ""; // 流程开始时间 + String endtime = ""; // 流程结束时间 + String jump_createtime = ""; // 跳过节假日之后流程创建时间 + String create_day = ""; // 跳过节假日之后流程创建日期 + String audit_day = ""; // 跳过节假日之后流程审核日期 + String jump_begintime = ""; // 跳过节假日之后流程开始时间 + String jump_endtime = ""; // 跳过节假日之后流程结束时间 + String nextAuditFlowType = ""; // 下阶段流程审核类型 + String auditResSts = ""; // 流程审核结果 + String auditResStsDes = ""; // 流程审核结果说明 + String remark = ""; + String insertSql = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); + int con=0; + // 查询所有需要发送还款提醒的数据 + String selSql="SELECT \n" + + " FT.userid,\n" + + " FT.username,\n" + + " FT.objectno,\n" + + " FT.serialno,\n" + + " FT.phaseno AS auditFlowType,\n" + + " FT.phasename AS auditFlowTypeDes,\n" + + " FT.begintime,\n" + + " FT.endtime,\n" + + " FT.phaseopinion1 AS nextAuditFlowType,\n" + + " fob.phaseopinion AS auditResSts,\n" + + " (SELECT itemname from code_library WHERE codeno='disagreeOP' AND itemno=fob.phaseopinion) AS auditResStsDes\n" + + "FROM FLOW_TASK FT\n" + + "LEFT JOIN FLOW_OPINION_BUSINESS FOB ON FT.SERIALNO=FOB.SERIALNO \n" + + "WHERE FT.flowname = '业务申请流程' \n" + + "AND FT.phaseno='0030' \n" + + "AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'')"; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + while(rs.next()) { + // 获取接口推送所需数据 + con++; + uuidDetail = UUID.randomUUID().toString().replace("-", ""); + userid = rs.getString("userid"); // 用户id + username = rs.getString("username"); // 用户姓名 + objectno = rs.getString("objectno"); // 流程编号 + serialno = rs.getString("serialno"); // 流程处理流水 + auditFlowType = rs.getString("auditFlowType"); // 流程审核类型 + auditFlowTypeDes = rs.getString("auditFlowTypeDes"); // 流程审核类型说明 + createtime = rs.getString("begintime"); // 流程创建时间 + begintime = rs.getString("begintime"); // 流程开始时间 + endtime = rs.getString("endtime"); // 流程结束时间 + nextAuditFlowType = rs.getString("nextAuditFlowType"); // 下阶段流程审核类型 + auditResSts = rs.getString("auditResSts"); // 流程审核结果 + auditResStsDes = rs.getString("auditResStsDes"); // 流程审核结果说明 + if("任意退回".equals(nextAuditFlowType)){ + continue; + } + if(StringUtils.isNotEmpty(createtime)){//开始时间不为空 + jump_createtime = resJumpHoliday(Sqlca, rs.getString("begintime")); // 跳过节假日之后流程创建时间 + create_day = dayFormat.format(simpleDateFormat.parse(jump_createtime)); + jump_createtime = sdf.format(simpleDateFormat.parse(jump_createtime)); + jump_begintime = jump_createtime; // 跳过节假日之后流程开始时间 + createtime = sdf.format(simpleDateFormat.parse(createtime)); + begintime = createtime; + } + if (StringUtils.isNotEmpty(endtime)){//结束时间不为空 + jump_endtime = resJumpHoliday(Sqlca, rs.getString("endtime")); // 跳过节假日之后流程结束时间 + audit_day = dayFormat.format(simpleDateFormat.parse(jump_endtime)); + endtime = sdf.format(simpleDateFormat.parse(endtime)); + jump_endtime = sdf.format(simpleDateFormat.parse(jump_endtime)); + } + insertSql="INSERT INTO st_credit_audit_order_detail(id,serialno,objectno,userid,username, " + + "auditFlowType," + + "auditFlowTypeDes," + + "createtime," + + "begintime," + + "endtime," + + "create_day," + + "audit_day," + + "jump_createtime," + + "jump_begintime," + + "jump_endtime," + + "nextAuditFlowType," + + "auditResSts," + + "auditResStsDes," + + "remark," + + "INPUTTIME, " + + "UPDATETIME " + + ") " + + "VALUES ( " + + "'"+uuidDetail+"', " + + "'"+serialno+"', " + + "'"+objectno+"', " + + "'"+userid+"', " + + "'"+username+"', " + + "'"+auditFlowType+"', " + + "'"+auditFlowTypeDes+"', " + + " '"+createtime+"', " + + " '"+begintime+"', " + + " '"+endtime+"', " + + " '"+create_day+"', " + + " '"+audit_day+"', " + + " '"+jump_createtime+"', " + + " '"+jump_begintime+"', " + + " '"+jump_endtime+"', " + + "'"+nextAuditFlowType+"', " + + "'"+auditResSts+"', " + + "'"+auditResStsDes+"', " + + "'"+remark+"', " + + "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'), " + + "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') " + + ")"; + Sqlca.executeSQL(new SqlObject(insertSql)); + + } + return String.valueOf(con); + } + + + /** + * 查询最小创建时间更改明细记录中对应的创建时间 + * @return + * @throws Exception + */ + public String updateDetail(Transaction Sqlca) throws Exception { + // 定义全局对象 + String objectno = ""; // 流程编号 + String begintime = ""; // 流程创建时间 + String createtime = ""; // 跳过节假日之后流程创建时间 + String create_day = ""; // 跳过节假日之后流程创建日期 + String updSql = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); + int con=0; + // 查询所有需要发送还款提醒的数据 + // 查询所有需要发送还款提醒的数据 + String selSql="SELECT \n" + + " FT.userid,\n" + + " FT.objectno,\n" + + " min(FT.begintime) AS begintime\n" + + "FROM FLOW_TASK FT\n" + + "LEFT JOIN FLOW_OPINION_BUSINESS FOB ON FT.SERIALNO=FOB.SERIALNO \n" + + "WHERE FT.flowname = '业务申请流程' \n" + + "AND FT.phaseno='0030' \n" + + "AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') group by FT.objectno"; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + while(rs.next()) { + // 获取接口推送所需数据 + con++; + begintime = rs.getString("begintime"); // 流程编号 + objectno = rs.getString("objectno"); // 流程创建时间 + createtime = sdf.format(simpleDateFormat.parse(begintime)); + create_day = dayFormat.format(simpleDateFormat.parse(resJumpHoliday(Sqlca, begintime))); + updSql="UPDATE st_credit_audit_order_detail SET create_day='"+create_day+"', createtime='"+createtime+"'," + + "UPDATETIME=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') WHERE objectno='"+objectno+"' "; + Sqlca.executeSQL(new SqlObject(updSql)); + objectno = ""; + begintime = ""; + createtime = ""; + create_day = ""; + updSql = ""; + } + return String.valueOf(con); + } + + /** + * 初始化审核统计报表-保存审核日期相关订单 + * @return + * @throws Exception + */ + public String initOrderAuditDay(Transaction Sqlca) throws Exception { + String insertSql="INSERT INTO st_credit_audit_order(\n" + + " id,\n" + + " every_day,\n" + + " userid,\n" + + " username,\n" + + " auditFlowType,\n" + + " auditFlowTypeDes,\n" + + " count_audit,\n" + + " count_audit_pass,\n" + + " count_audit_refuse,\n" + + " count_audit_refuse1,\n" + + " count_audit_refuse2,\n" + + " count_audit_refuse3,\n" + + " count_audit_refuse4,\n" + + " count_audit_refuse5,\n" + + " count_audit_refuse6\n" + + " )\n" + + " SELECT \n" + + " replace(uuid(),'-',''),\n" + + " st2.every_day,\n" + + " st2.userid,\n" + + " st2.username,\n" + + " st2.auditFlowType,\n" + + " st2.auditFlowTypeDes,\n" + + " st2.count_audit,\n" + + " st3.count_audit_pass,\n" + + " st4.count_audit_refuse,\n" + + " st5.count_audit_refuse1,\n" + + " st6.count_audit_refuse2,\n" + + " st7.count_audit_refuse3,\n" + + " st8.count_audit_refuse4,\n" + + " st9.count_audit_refuse5,\n" + + " st10.count_audit_refuse6\n" + + " from\n" + + " (SELECT COUNT(1) AS count_audit,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts != 'null'AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st2 \n" + + " left join (SELECT COUNT(1) AS count_audit_pass,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0070'AND (endtime is not null or endtime != '')GROUP BY audit_day, userid) as st3 on st3.every_day = st2.every_day AND st3.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts != '0070' AND auditResSts != 'null' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st4 on st4.every_day = st2.every_day AND st4.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse1,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0010' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st5 on st5.every_day = st2.every_day AND st5.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse2,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0020' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st6 on st6.every_day = st2.every_day AND st6.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse3,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0030' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st7 on st7.every_day = st2.every_day AND st7.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse4,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0040' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st8 on st8.every_day = st2.every_day AND st8.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse5,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0050' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st9 on st9.every_day = st2.every_day AND st9.userid=st2.userid\n" + + " left join (SELECT COUNT(1) AS count_audit_refuse6,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" + + " WHERE auditResSts = '0060' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st10 on st10.every_day = st2.every_day AND st10.userid=st2.userid \n"; + Sqlca.executeSQL(new SqlObject(insertSql)); + return "-1"; + } + + /** + * 根据查询进单统计数据，添加或者更新统计订单数据 + * @return + * @throws Exception + */ + public String saveOrderCreateDay(Transaction Sqlca) throws Exception { + // 定义全局对象 + String id = ""; // 流程编号 + String order_count = ""; // 流程编号 + String userid = ""; // 流程编号 + String every_day = ""; // 流程编号 + String username = ""; // 流程创建时间 + String auditFlowType = ""; // 流程创建时间 + String auditFlowTypeDes = ""; // 跳过节假日之后流程创建时间 + String updSql = ""; + String selSql2 = ""; + int con=0; + // 查询所有需要发送还款提醒的数据 + String selSql="SELECT count(1) as order_count,std1.every_day,std1.userid,std1.username,std1.auditFlowType,std1.auditFlowTypeDes \n" + + " from (SELECT min(create_day) AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail GROUP BY objectno) AS std1 \n" + + " GROUP BY std1.every_day "; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + while(rs.next()) { + id = UUID.randomUUID().toString().replace("-", ""); + // 获取接口推送所需数据 + con++; + every_day = rs.getString("every_day"); // 流程编号 + order_count = rs.getString("order_count"); // 流程创建时间 + userid = rs.getString("userid"); // 流程创建时间 + username = rs.getString("username"); // 流程创建时间 + auditFlowType = rs.getString("auditFlowType"); // 流程创建时间 + auditFlowTypeDes = rs.getString("auditFlowTypeDes"); // 流程创建时间 + + selSql2="SELECT count(1) as countNum FROM st_credit_audit_order WHERE every_day ='" + every_day +"'"; + ASResultSet rs2 = Sqlca.getASResultSet(new SqlObject(selSql2)); + if(rs2.next()) { + if(rs2.getInt("countNum") > 0){ + updSql="UPDATE st_credit_audit_order SET order_count='"+order_count+"', " + + "UPDATETIME=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') WHERE every_day='"+every_day+"' "; + Sqlca.executeSQL(new SqlObject(updSql)); + }else { + String insertSql = "INSERT INTO st_credit_audit_order(\n" + + " id,\n" + + " every_day,\n" + + " userid,\n" + + " username,\n" + + " auditFlowType,\n" + + " auditFlowTypeDes,\n" + + " order_count,\n" + + " INPUTTIME, " + + " UPDATETIME " + + " ) " + + " VALUES ( " + + " '" + id + "', " + + " '" + every_day + "', " + + " '" + userid + "', " + + " '" + userid + "', " + + " '" + username + "', " + + " '" + auditFlowType + "', " + + " '" + auditFlowTypeDes + "', " + + "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'), " + + "DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') " + + ")"; + } + } + id = ""; + order_count = ""; + userid = ""; + every_day = ""; + username = ""; + auditFlowType = ""; + auditFlowTypeDes = ""; + updSql = ""; + selSql2 = ""; + } + return String.valueOf(con); + } + + /** + * 更改主表信审考核时间 + * @return + * @throws Exception + */ + public String updateOrderAuditDay(Transaction Sqlca) throws Exception { + // 定义全局对象 + String id = ""; // 流程编号 + String userid = ""; // 流程编号 + String every_day = ""; // 流程编号 + String begintime = ""; // 流程创建时间 + String endtime = ""; // 流程创建时间 + String audittime = "0"; // 跳过节假日之后流程创建时间 + String updSql = ""; + String selSql2 = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + int con=0; + // 查询所有需要发送还款提醒的数据 + String selSql="SELECT id, every_day, userid FROM st_credit_audit_order "; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + while(rs.next()) { + // 获取接口推送所需数据 + con++; + id = rs.getString("id"); // 流程编号 + every_day = rs.getString("every_day"); // 流程编号 + userid = rs.getString("userid"); // 流程创建时间 + + selSql2="SELECT \n" + + " jump_begintime,\n" + + " jump_endtime \n" + + " FROM st_credit_audit_order_detail \n" + + " WHERE userid = '" + userid +"'" + + " AND audit_day ='" + every_day +"'" + + " AND auditResSts != 'null'" + + " AND (endtime is not null or endtime != '')" ; + ASResultSet rs2 = Sqlca.getASResultSet(new SqlObject(selSql2)); + begintime = ""; // 流程创建时间 + endtime = ""; + while(rs2.next()) { + String jump_begintime = rs2.getString("jump_begintime"); // 流程创建时间 + String jump_endtime = rs2.getString("jump_endtime"); // 流程创建时间 + if(StringUtils.isEmpty(begintime) || sdf.parse(begintime).getTime() > sdf.parse(jump_begintime).getTime()){ + begintime = jump_begintime; + } + if(StringUtils.isEmpty(endtime) || sdf.parse(jump_endtime).getTime() > sdf.parse(endtime).getTime()){ + endtime = jump_endtime; + } + //信审考核时间累加 + String tmpStr = resDiffJumpHoliday(Sqlca, simpleDateFormat.format(sdf.parse(jump_begintime)), simpleDateFormat.format(sdf.parse(jump_endtime))); + int tmpTime = Integer.parseInt(audittime) + Integer.parseInt(tmpStr); + audittime = String.valueOf(tmpTime); + } + + updSql="UPDATE st_credit_audit_order SET begintime='"+begintime+"', " + + " endtime='"+endtime+"', " + + " audittime='"+audittime+"', " + + "UPDATETIME=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') WHERE id='"+id+"' "; + Sqlca.executeSQL(new SqlObject(updSql)); + id = ""; + userid = ""; + every_day = ""; + begintime = ""; + endtime = ""; + audittime = "0"; + updSql = ""; + selSql2 = ""; + } + return String.valueOf(con); + } + + + + /** + * 0010 信用不良 + * 0020 法院执行 + * 0030 虚假信息 + * 0040 身份核实异常 + * 0050 购车目的异常 + * 0060 综合评分不足 + * 0070 同意 + * 0080 附条件通过 + */ + /** + * 根据当前时间获得跳过节假日的工作日时间 + * @param date + * @return + */ + private String resJumpHoliday(Transaction Sqlca, String date) throws SQLException, ParseException { + //查询当前时间是否在工作时间 + SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + int hour = Integer.parseInt(date.substring(11, 13)); + int minute = Integer.parseInt(date.substring(14, 16)); + if(hour < 9){//时间小于当天9点，则调整时间为上午九点 + date = date.substring(0, 11) + "09:00:00"; + }else if((hour == 17 && minute > 30) || (hour > 17)){//时间小于当天17:30点，则调整时间为第二天的上午九点 + Date time = simpleDateFormat.parse(date); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(time); + calendar.add(Calendar.DAY_OF_MONTH, 1); + date = simpleDateFormat.format(calendar.getTime()).substring(0, 11) + "09:00:00"; + } + //查询当前时间是否在节假日时间 + String day = date.substring(0, 10); + int count = 0; + while (count < 15){ + count ++; + String selSql="SELECT count(1) as countNum " + + " FROM st_credit_audit_holiday st" + + " WHERE st.c_date='" + day +"'" + + " AND st.otype='休'" ; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + int countNum = 0; + if(rs.next()){ + countNum = rs.getInt("countNum"); + } + if(countNum > 0){ + Date time = simpleDateFormat.parse(date); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(time); + calendar.add(Calendar.DAY_OF_MONTH, 1); + date = simpleDateFormat.format(calendar.getTime()).substring(0, 11) + "09:00:00"; + day = date.substring(0, 10); + }else { + break; + } + } + return date; + } + + /** + * 根据时间段相差时间获得跳过节假日的工作日时间 + * @param begintime 开始时间 + * @param endtime 结束时间 + * @return + */ + private String resDiffJumpHoliday(Transaction Sqlca, String begintime, String endtime) throws SQLException, ParseException { + //获取开始时间、结束时间跳过节假日的时间 + begintime = resJumpHoliday(Sqlca, begintime); + endtime = resJumpHoliday(Sqlca, endtime); + //确认开始时间，到结束时间，中间隔的时间，并排除节假日时间 + //如果结束时间小于或者等于开始时间 + SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + Date beginDate = simpleDateFormat.parse(begintime); + Date endDate = simpleDateFormat.parse(endtime); + long diff = 0; + if(beginDate.getTime() >= endDate.getTime()){ + return "0"; + }else if (begintime.substring(0, 10).equals(endtime.substring(0, 10))){ + diff = diffMinute(beginDate.getTime(), endDate.getTime()); + return String.valueOf(diff); + }else { + long diffBeginAfter = diffBeginDateAfter(begintime, beginDate); + long diffEndDateBefore = diffEndDateBefore(endtime, endDate); + diff = diffBeginAfter + diffEndDateBefore; + //得到相差的天数 betweenDate + + beginDate = dayFormat.parse(dayFormat.format(beginDate)); + endDate = dayFormat.parse(dayFormat.format(endDate)); + long betweenDate = (endDate.getTime() - beginDate.getTime())/(60*60*24*1000); + if (betweenDate == 1){ + return String.valueOf(diff); + }else {//中间相隔大于一天查询数据库相隔天数中有几天是假期， + begintime = dayFormat.format(beginDate); + endtime = dayFormat.format(endDate); + String selSql="SELECT COUNT(1) as countNum FROM (\n" + + " SELECT c_date\n" + + " FROM st_credit_audit_holiday st\n" + + " WHERE st.c_date BETWEEN '"+begintime+"' AND '"+endtime+"'\n" + + " AND st.otype='休'\n" + + " GROUP BY st.c_date\n" + + " ) AS s" ; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + int countNum = 0; + if(rs.next()){ + countNum = rs.getInt("countNum"); + } + diff += (betweenDate - countNum - 1)*8*60; + return String.valueOf(diff); + } + } + } + + private long diffEndDateBefore(String endTime, Date endDate) throws ParseException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + String endtimeBefore = endTime.substring(0, 11) + "09:00:00"; + Date endDateBefore = simpleDateFormat.parse(endtimeBefore); + return diffMinute(endDateBefore.getTime(), endDate.getTime()); + } + + private long diffBeginDateAfter(String beginTime, Date beginDate) throws ParseException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + String begintimeAfter = beginTime.substring(0, 11) + "17:30:00"; + Date beginDateAfter = simpleDateFormat.parse(begintimeAfter); + return diffMinute(beginDate.getTime(), beginDateAfter.getTime()); + } + + private long diffMinute(long begin, long end){ + if(begin > end){ + return -1; + } + return (end - begin)/1000/60; + } +} diff --git a/鎶ヨ〃/寰俊鍏紬鍙锋姤琛/鐢ㄦ埛缁戝畾淇℃伅琛.xml b/鎶ヨ〃/寰俊鍏紬鍙锋姤琛/鐢ㄦ埛缁戝畾淇℃伅琛.xml index da71268d4..43e02ed8f 100644 --- a/鎶ヨ〃/寰俊鍏紬鍙锋姤琛/鐢ㄦ埛缁戝畾淇℃伅琛.xml +++ b/鎶ヨ〃/寰俊鍏紬鍙锋姤琛/鐢ㄦ埛缁戝畾淇℃伅琛.xml @@ -16,37 +16,43 @@ - 2c9c81b66e5d8b8b016eacb3adb80196 + 2c9c81b969188a33016f371d6341014c 鐢ㄦ埛缁戝畾淇℃伅琛 Wechat_user_buinding_report - true 0 REPORT - 2c9c81b66e5d8b8b016eacb10d170195 + 2c9c81b969188a33016f371cc4f2012a - 2c9c81b66f1cf0bd016f37f08b2f001d + 2c9c81b969188a33016f473dd1b301d5 - 2c9c81b66e5d8b8b016eacb4b11f0197 + 2c9c81b969188a33016f371d633b014b寰俊鐢ㄦ埛缁戝畾淇℃伅琛Wechat_user_buinding_report2c9023815726a036015726a496b00001COMPLEXSQLSELECT +WUI.openid, CI.CUSTOMERNAME, WUI.MOBILE_, WUI.CERTID_, WUI.WECHAT_NAME, - LCI.CONTRACT_NUMBER, + LCI.CONTRACT_NUMBER, + CONCAT('姣忔湀',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'鏃') AS PLAN_DATE, + IFNULL(LRP.RENT, 0.00) AS RENT, LCS.STATUS_NAME, LPI.PRODUCT_NAME, DI.DISTRIBUTOR_NAME, LPI.AFFILIATEDNAME, - LEC.FRAME_NUMBER + LEC.FRAME_NUMBER, +case when WUI.attention_status='N' then '鍚' + else '鏄' + end as attention_status, + WUI.binding_time FROM WECHAT_USER_INFO WUI LEFT JOIN @@ -57,6 +63,7 @@ LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID=LUL.PROJECT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LUL.CONTRACT_ID +LEFT JOIN (SELECT CONTRACT_ID,SUM(RENT) AS RENT,MAX(PLAN_DATE) AS PLAN_DATE FROM LC_RENT_PLAN WHERE PLAN_LIST = 1 GROUP BY CONTRACT_ID) LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN @@ -67,109 +74,13 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b66f1cf0bd016f37f08b320027 + 2c9c81b969188a33016f473dd1b401d6 CUSTOMERNAME STRING CUSTOMERNAME 100 - 10 - true - - false - false - false - false - - - - - - 2c9c81b66f1cf0bd016f37f08b310021 - MOBILE_ - STRING - - - MOBILE_ - 100 - 11 - true - - false - false - false - false - - - - - - 2c9c81b66f1cf0bd016f37f08b320025 - CERTID_ - STRING - - - CERTID_ - 150 - 12 - true - - false - false - false - false - - - - - - 2c9c81b66f1cf0bd016f37f08b310023 - CONTRACT_NUMBER - STRING - - - CONTRACT_NUMBER - 150 - 13 - true - - false - false - false - false - - - - - - 2c9c81b66f1cf0bd016f37f08b310020 - STATUS_NAME - STRING - - - STATUS_NAME - 100 - 14 - true - - false - false - false - false - CENTER - - - - - - 2c9c81b66f1cf0bd016f37f08b320026 - PRODUCT_NAME - STRING - - - PRODUCT_NAME - 200 15 true @@ -182,13 +93,13 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b66f1cf0bd016f37f08b31001f - DISTRIBUTOR_NAME + 2c9c81b6710c46490171148b10680002 + PLAN_DATE STRING - - DISTRIBUTOR_NAME - 200 + + PLAN_DATE + 100 16 true @@ -201,13 +112,13 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b66f1cf0bd016f37f08b31001e - AFFILIATEDNAME - STRING + 2c9c81b6710c46490171148b10680003 + RENT + NUMBER - - AFFILIATEDNAME - 200 + + RENT + 100 17 true @@ -220,13 +131,13 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b66f1cf0bd016f37f08b310022 - FRAME_NUMBER + 2c9c81b969188a33016f473dd1b401db + MOBILE_ STRING - - FRAME_NUMBER - 150 + + MOBILE_ + 100 18 true @@ -239,14 +150,205 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b66f1cf0bd016f37f08b310024 + 2c9c81b969188a33016f473dd1b401d8 + CERTID_ + STRING + + + CERTID_ + 150 + 19 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016f473dd1b401dd + CONTRACT_NUMBER + STRING + + + CONTRACT_NUMBER + 150 + 20 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016f473dd1b401df + STATUS_NAME + STRING + + + STATUS_NAME + 100 + 21 + true + + false + false + false + false + CENTER + + + + + + 2c9c81b969188a33016f473dd1b401d9 + PRODUCT_NAME + STRING + + + PRODUCT_NAME + 200 + 22 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016f473dd1b401de + DISTRIBUTOR_NAME + STRING + + + DISTRIBUTOR_NAME + 200 + 23 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016f473dd1b401da + AFFILIATEDNAME + STRING + + + AFFILIATEDNAME + 200 + 24 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016f473dd1b401dc + FRAME_NUMBER + STRING + + + FRAME_NUMBER + 150 + 25 + true + + false + false + false + false + + + + + + 2c9c81b6710c46490171148b10680004 + attention_status + STRING + + + attention_status + 100 + 26 + true + + false + false + false + false + + + + + + 2c9c81b6710c46490171148b105c0001 + openid + STRING + + + openid + 100 + 27 + true + + false + false + false + false + + + + + + 2c9c81b969188a33016f473dd1b401d7 WECHAT_NAME STRING WECHAT_NAME 100 - 19 + 28 + true + + false + false + false + false + + + + + + 2c9c81b6710c46490171148b10680005 + binding_time + STRING + + + binding_time + 200 + 29 true false @@ -263,7 +365,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b66f1cf0bd016f37f08b320028 + 2c9c81b969188a33016f473dd1b401e0 CUSTOMERNAME CUSTOMERNAME @@ -273,7 +375,7 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI 0 - 2c9c81b66f1cf0bd016f37f08b320029 + 2c9c81b969188a33016f473dd1b401e1 CERTID_ CERTID_ @@ -296,12 +398,12 @@ WHERE WUI.BINDING_STATUS='Y' AND (LCI.CONTRACT_STATUS BETWEEN 31 AND 100 OR LCI - 2c9c81b66f1cf0bd016f37f08b2f001d + 2c9c81b969188a33016f473dd1b301d5 0 0 0 - TABLE#2c9c81b66e5d8b8b016eacb4b11f0197 - 2c9c81b66e5d8b8b016eacb3adb80196 + TABLE#2c9c81b969188a33016f371d633b014b + 2c9c81b969188a33016f371d6341014c TABLE diff --git a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/淇″鑰冩牳缁熻鎶ヨ〃.xml b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/淇″鑰冩牳缁熻鎶ヨ〃.xml index 38da0f7e5..b245835c3 100644 --- a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/淇″鑰冩牳缁熻鎶ヨ〃.xml +++ b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/淇″鑰冩牳缁熻鎶ヨ〃.xml @@ -37,46 +37,26 @@ xskhtj 2c9023815726a036015726a496b00001 COMPLEXSQL - SELECT VED.EVERY_DAY AS every_day,IFNULL(CONCAT(FT1.PHASENAME,'/',FT1.USERNAME),'') AS phseanduser,IFNULL(ROUND(FT2.SPSJ/FT3.SP_NUM,2),'') AS spxl,IFNULL(FT1.INPUT_NUM,'') AS inputnum,IFNULL(FT3.SP_NUM,'') AS spjnum,IFNULL(CONCAT(ROUND(IFNULL(FT3.SP_NUM,0)/IFNULL(FT1.INPUT_NUM,0)*100,2),'%'),'') spl,IFNULL(FT4.SP_PASS_NUM,'') AS tgnum,IFNULL(CONCAT(ROUND(IFNULL(FT4.SP_PASS_NUM,0)/IFNULL(FT3.SP_NUM,0)*100,2),'%'),'') AS tgl,IFNULL(FT5.SP_REFUSE_NUM,'') AS thnum,IFNULL(CONCAT(ROUND(IFNULL(FT5.SP_REFUSE_NUM,0)/IFNULL(FT3.SP_NUM,0)*100,2),'%'),'') AS thl,IFNULL(REFUSE1.REFUSE_NUM,'') AS xynum,IFNULL(REFUSE2.REFUSE_NUM,'') AS fynum,IFNULL(REFUSE3.REFUSE_NUM,'') AS xjnum,IFNULL(REFUSE4.REFUSE_NUM,'') AS sfnum,IFNULL(REFUSE5.REFUSE_NUM,'') AS gcnum,IFNULL(REFUSE6.REFUSE_NUM,'') AS zhnum -FROM VI_EVERY_DAY VED -LEFT JOIN (SELECT CASE WHEN FT.begintime BETWEEN DATE_FORMAT( FT.begintime, '%Y/%m/%d 17:30:59' ) AND DATE_FORMAT( FT.begintime, '%Y/%m/%d 23:59:59' ) THEN LEFT(DATE_FORMAT(DATE_ADD(FT.begintime, INTERVAL 1 DAY ),'%Y/%m/%d'), 10 ) ELSE LEFT( FT.begintime,10 ) END SP_TIME,MAX(FT.PHASENAME) AS PHASENAME,FT.USERNAME,COUNT(FT.BEGINTIME) INPUT_NUM FROM FLOW_TASK FT WHERE FT.flowname = '涓氬姟鐢宠娴佺▼' AND FT.phaseno='0030' AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND FT.BEGINTIME=(SELECT MIN(BEGINTIME) AS BEGINTIME FROM FLOW_TASK WHERE flowname = '涓氬姟鐢宠娴佺▼' AND phaseno='0030' AND (USERNAME IS NOT NULL OR USERNAME <>'') AND OBJECTNO=FT.OBJECTNO GROUP BY OBJECTNO) GROUP BY SP_TIME,FT.USERNAME)FT1 ON FT1.SP_TIME=VED.EVERY_DAY -LEFT JOIN (SELECT LEFT(FT.ENDTIME,10) AS SP_TIME,SUM(CASE WHEN FT.begintime < DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59' ) AND FT.endtime <DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59' ) THEN TIMESTAMPDIFF( SECOND, FT.begintime, FT.endtime ) WHEN FT.begintime < DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59' ) AND (FT.endtime BETWEEN DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59' ) AND DATE_FORMAT( DATE_ADD(FT.begintime, INTERVAL 1 DAY ), '%Y/%m/%d 09:00:00' ) ) THEN TIMESTAMPDIFF( SECOND, FT.begintime, DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59' ) ) WHEN FT.begintime < DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59' ) AND FT.endtime > DATE_FORMAT( DATE_ADD(FT.begintime, INTERVAL 1 DAY ), '%Y/%m/%d 09:00:00' ) THEN TIMESTAMPDIFF( SECOND,FT.begintime, DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59')) +((TIMESTAMPDIFF(DAY,DATE_FORMAT(FT.begintime,'%Y/%m/%d'),DATE_FORMAT(FT.endtime,'%Y/%m/%d'))-1)*8.5*60*60)+(CASE WHEN (FT.endtime BETWEEN DATE_FORMAT(FT.endtime,'%Y/%m/%d 09:00:00' ) AND DATE_FORMAT(FT.endtime,'%Y/%m/%d 17:30:59' )) THEN TIMESTAMPDIFF(SECOND,DATE_FORMAT(FT.endtime,'%Y/%m/%d 09:00:00' ),FT.endtime) ELSE 0 END) WHEN (FT.begintime BETWEEN DATE_FORMAT(FT.begintime,'%Y/%m/%d 17:30:59' ) AND DATE_FORMAT( DATE_ADD(FT.begintime, INTERVAL 1 DAY ), '%Y/%m/%d 09:00:00' ) ) THEN (CASE WHEN TIMESTAMPDIFF(DAY,DATE_FORMAT(FT.begintime,'%Y/%m/%d'),DATE_FORMAT(FT.endtime,'%Y/%m/%d')) >0 THEN ((TIMESTAMPDIFF(DAY,DATE_FORMAT(FT.begintime,'%Y/%m/%d'),DATE_FORMAT(FT.endtime,'%Y/%m/%d'))-1)*8.5*60*60) ELSE 0 END)+(CASE WHEN FT.endtime BETWEEN DATE_FORMAT(FT.endtime,'%Y/%m/%d 09:00:00' ) AND DATE_FORMAT(FT.endtime,'%Y/%m/%d 17:30:59' ) THEN TIMESTAMPDIFF(SECOND,DATE_FORMAT(FT.endtime,'%Y/%m/%d 09:00:00' ),FT.endtime) ELSE 0 END) ELSE TIMESTAMPDIFF( SECOND, FT.begintime, FT.endtime ) END)/60 SPSJ,FT.USERNAME FROM FLOW_TASK FT WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND FT.phaseno='0030' AND FT.endtime IS NOT NULL AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND FT.ENDTIME=(SELECT MAX(ENDTIME) AS ENDTIME FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phaseno='0030' AND endtime IS NOT NULL AND (USERNAME IS NOT NULL OR USERNAME <>'') AND OBJECTNO=FT.OBJECTNO GROUP BY OBJECTNO) AND NOT EXISTS(SELECT 1 FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phasename IN('缁忛攢鍟嗗彂璧','淇″涓撳憳鍒濆','淇″鍒濆') AND (ENDTIME IS NULL OR ENDTIME='') AND OBJECTNO=FT.OBJECTNO) GROUP BY LEFT(FT.endtime,10),FT.USERNAME)FT2 ON FT2.SP_TIME=FT1.SP_TIME AND FT1.USERNAME=FT2.USERNAME -LEFT JOIN (SELECT LEFT(FT.ENDTIME,10) AS SP_TIME,COUNT(FT.ENDTIME) AS SP_NUM,FT.USERNAME FROM FLOW_TASK FT WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND FT.ENDTIME IS NOT NULL AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND FT.PHASENO = '0030' AND FT.ENDTIME=(SELECT MIN(ENDTIME) AS ENDTIME FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND ENDTIME IS NOT NULL AND (USERNAME IS NOT NULL OR USERNAME <>'') AND PHASENO = '0030' AND OBJECTNO=FT.OBJECTNO GROUP BY OBJECTNO) AND EXISTS(SELECT 1 FROM FLOW_OBJECT FO WHERE FO.FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND (FO.PHASENO='1000' OR FO.PHASENO='8000'))GROUP BY LEFT(FT.ENDTIME,10),FT.USERNAME)FT3 ON FT3.SP_TIME=FT1.SP_TIME AND FT3.USERNAME=FT1.USERNAME -LEFT JOIN (SELECT LEFT(FT.ENDTIME,10) AS SP_TIME,COUNT(FT.ENDTIME) AS SP_PASS_NUM,FT.USERNAME FROM FLOW_TASK FT WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND FT.ENDTIME IS NOT NULL AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND FT.PHASENO = '0030' AND FT.ENDTIME=(SELECT MIN(ENDTIME) AS ENDTIME FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND ENDTIME IS NOT NULL AND (USERNAME IS NOT NULL OR USERNAME <>'') AND PHASENO = '0030' AND OBJECTNO=FT.OBJECTNO GROUP BY OBJECTNO) AND EXISTS(SELECT 1 FROM FLOW_OBJECT FO WHERE FO.FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='1000')GROUP BY LEFT(FT.ENDTIME,10),FT.USERNAME)FT4 ON FT4.SP_TIME=FT1.SP_TIME AND FT4.USERNAME=FT1.USERNAME -LEFT JOIN (SELECT LEFT(ENDTIME,10) AS SP_TIME,FT.PHASENAME,COUNT(ENDTIME) AS SP_REFUSE_NUM,FT.USERNAME FROM FLOW_TASK FT WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND FT.ENDTIME IS NOT NULL AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND FT.PHASENO = '0030' AND FT.ENDTIME=(SELECT MAX(ENDTIME) AS ENDTIME FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND ENDTIME IS NOT NULL AND (USERNAME IS NOT NULL OR USERNAME <>'') AND PHASENO = '0030' AND OBJECTNO = FT.OBJECTNO GROUP BY OBJECTNO) AND EXISTS(SELECT 1 FROM FLOW_OBJECT FO WHERE FO.FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='8000')GROUP BY LEFT(FT.ENDTIME,10),FT.USERNAME)FT5 ON FT5.SP_TIME=FT1.SP_TIME AND FT5.USERNAME=FT1.USERNAME -LEFT JOIN (SELECT xin.SP_TIME AS SP_TIME,COUNT(xin.phaseopinion) REFUSE_NUM,us.username FROM ( -SELECT LEFT(ft.endtime,10) AS SP_TIME,FT.PHASENAME,fob.phaseopinion AS phaseopinion -,ft.objectno,ft.endtime FROM FLOW_OPINION_BUSINESS FOB LEFT JOIN FLOW_TASK FT ON FT.RELATIVEOBJECTNO=FOB.SERIALNO WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND (ft.phaseno='0040' OR ft.phaseno='0060') AND FOB.PHASEOPINION='0010' AND EXISTS(SELECT 1 FROM flow_object fo WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='8000') ) xin LEFT JOIN (SELECT username,objectno FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phaseno='0030' GROUP BY objectno - ) us ON us.objectno=xin.objectno -GROUP BY LEFT(xin.endtime,10) )REFUSE1 ON REFUSE1.SP_TIME=FT1.SP_TIME AND REFUSE1.username=FT1.USERNAME -LEFT JOIN (SELECT xin.SP_TIME AS SP_TIME,COUNT(xin.phaseopinion) REFUSE_NUM,us.username FROM ( -SELECT LEFT(ft.endtime,10) AS SP_TIME,FT.PHASENAME,fob.phaseopinion AS phaseopinion -,ft.objectno,ft.endtime FROM FLOW_OPINION_BUSINESS FOB LEFT JOIN FLOW_TASK FT ON FT.RELATIVEOBJECTNO=FOB.SERIALNO WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND (ft.phaseno='0040' OR ft.phaseno='0060') AND FOB.PHASEOPINION='0020' AND EXISTS(SELECT 1 FROM flow_object fo WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='8000') ) xin LEFT JOIN (SELECT username,objectno FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phaseno='0030' GROUP BY objectno - ) us ON us.objectno=xin.objectno -GROUP BY LEFT(xin.endtime,10))REFUSE2 ON REFUSE2.SP_TIME=FT1.SP_TIME AND REFUSE2.username=FT1.USERNAME -LEFT JOIN (SELECT xin.SP_TIME AS SP_TIME,COUNT(xin.phaseopinion) REFUSE_NUM,us.username FROM ( -SELECT LEFT(ft.endtime,10) AS SP_TIME,FT.PHASENAME,fob.phaseopinion AS phaseopinion -,ft.objectno,ft.endtime FROM FLOW_OPINION_BUSINESS FOB LEFT JOIN FLOW_TASK FT ON FT.RELATIVEOBJECTNO=FOB.SERIALNO WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND (ft.phaseno='0040' OR ft.phaseno='0060') AND FOB.PHASEOPINION='0030' AND EXISTS(SELECT 1 FROM flow_object fo WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='8000') ) xin LEFT JOIN (SELECT username,objectno FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phaseno='0030' GROUP BY objectno - ) us ON us.objectno=xin.objectno -GROUP BY LEFT(xin.endtime,10))REFUSE3 ON REFUSE3.SP_TIME=FT1.SP_TIME AND REFUSE3.username=FT1.USERNAME -LEFT JOIN (SELECT xin.SP_TIME AS SP_TIME,COUNT(xin.phaseopinion) REFUSE_NUM,us.username FROM ( -SELECT LEFT(ft.endtime,10) AS SP_TIME,FT.PHASENAME,fob.phaseopinion AS phaseopinion -,ft.objectno,ft.endtime FROM FLOW_OPINION_BUSINESS FOB LEFT JOIN FLOW_TASK FT ON FT.RELATIVEOBJECTNO=FOB.SERIALNO WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND (ft.phaseno='0040' OR ft.phaseno='0060') AND FOB.PHASEOPINION='0040' AND EXISTS(SELECT 1 FROM flow_object fo WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='8000') ) xin LEFT JOIN (SELECT username,objectno FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phaseno='0030' GROUP BY objectno - ) us ON us.objectno=xin.objectno -GROUP BY LEFT(xin.endtime,10))REFUSE4 ON REFUSE4.SP_TIME=FT1.SP_TIME AND REFUSE4.username=FT1.USERNAME -LEFT JOIN ( -SELECT xin.SP_TIME AS SP_TIME,COUNT(xin.phaseopinion) REFUSE_NUM,us.username FROM ( -SELECT LEFT(ft.endtime,10) AS SP_TIME,FT.PHASENAME,fob.phaseopinion AS phaseopinion -,ft.objectno,ft.endtime FROM FLOW_OPINION_BUSINESS FOB LEFT JOIN FLOW_TASK FT ON FT.RELATIVEOBJECTNO=FOB.SERIALNO WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND (ft.phaseno='0040' OR ft.phaseno='0060') AND FOB.PHASEOPINION='0050' AND EXISTS(SELECT 1 FROM flow_object fo WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='8000') ) xin LEFT JOIN (SELECT username,objectno FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phaseno='0030' GROUP BY objectno - ) us ON us.objectno=xin.objectno -GROUP BY LEFT(xin.endtime,10) -)REFUSE5 ON REFUSE5.SP_TIME=FT1.SP_TIME AND REFUSE5.username=FT1.USERNAME -LEFT JOIN (SELECT xin.SP_TIME AS SP_TIME,COUNT(xin.phaseopinion) REFUSE_NUM,us.username FROM ( -SELECT LEFT(ft.endtime,10) AS SP_TIME,FT.PHASENAME,fob.phaseopinion AS phaseopinion -,ft.objectno,ft.endtime FROM FLOW_OPINION_BUSINESS FOB LEFT JOIN FLOW_TASK FT ON FT.RELATIVEOBJECTNO=FOB.SERIALNO WHERE FT.FLOWNAME='涓氬姟鐢宠娴佺▼' AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') AND (ft.phaseno='0040' OR ft.phaseno='0060') AND FOB.PHASEOPINION='0060' AND EXISTS(SELECT 1 FROM flow_object fo WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND FO.OBJECTNO=FT.OBJECTNO AND FO.PHASENO='8000') ) xin LEFT JOIN (SELECT username,objectno FROM FLOW_TASK WHERE FLOWNAME='涓氬姟鐢宠娴佺▼' AND phaseno='0030' GROUP BY objectno - ) us ON us.objectno=xin.objectno -GROUP BY LEFT(xin.endtime,10))REFUSE6 ON REFUSE6.SP_TIME=FT1.SP_TIME AND REFUSE6.username=FT1.USERNAME -ORDER BY ved.every_day DESC + SELECT +VED.EVERY_DAY AS every_day, +IFNULL(CONCAT(st.auditFlowTypeDes,'/',st.username),'') AS phseanduser, +IFNULL(ROUND(st.audittime/st.count_audit,2),'') AS spxl, +IFNULL(st.order_count,'') AS inputnum, +IFNULL(st.count_audit,'') AS spjnum, +IFNULL(CONCAT(ROUND(IFNULL(st.count_audit,0)/IFNULL(st.order_count,0)*100,2),'%'),'') spl, +IFNULL(st.count_audit_pass,'') AS tgnum, +IFNULL(CONCAT(ROUND(IFNULL(st.count_audit_pass,0)/IFNULL(st.count_audit,0)*100,2),'%'),'') AS tgl, +IFNULL(st.count_audit_refuse,'') AS thnum, +IFNULL(CONCAT(ROUND(IFNULL(st.count_audit_refuse,0)/IFNULL(st.count_audit,0)*100,2),'%'),'') AS thl, +IFNULL(st.count_audit_refuse1,'') AS xynum, +IFNULL(st.count_audit_refuse2,'') AS fynum, +IFNULL(st.count_audit_refuse3,'') AS xjnum, +IFNULL(st.count_audit_refuse4,'') AS sfnum, +IFNULL(st.count_audit_refuse5,'') AS gcnum, +IFNULL(st.count_audit_refuse6,'') AS zhnum +FROM VI_EVERY_DAY VED +LEFT JOIN st_credit_audit_order st ON st.every_day = VED.EVERY_DAY +ORDER BY ved.every_day DESC From 3c64731a6b732cfdde14ca3adb93950418ed799e Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 22 Apr 2020 12:03:01 +0800 Subject: [PATCH 72/89] =?UTF-8?q?=E4=BF=A1=E5=AE=A1=E8=80=83=E6=A0=B8?= =?UTF-8?q?=E4=B8=8D=E5=88=B01=E5=88=86=E9=92=9F=E6=8C=891=E5=88=86?= =?UTF-8?q?=E9=92=9F=E8=AE=A1=E7=AE=97=EF=BC=88=E5=BC=A0=E7=A3=8A=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lease/app/quartzmession/CreditAuditHolidayBatch.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java index e1ef3d8af..8761887a9 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java @@ -611,10 +611,12 @@ public class CreditAuditHolidayBatch implements Job{ } //信审考核时间累加 String tmpStr = resDiffJumpHoliday(Sqlca, simpleDateFormat.format(sdf.parse(jump_begintime)), simpleDateFormat.format(sdf.parse(jump_endtime))); + if("0".equals(tmpStr)){//审核时间不足一分钟，按一分钟算 + tmpStr = "1"; + } int tmpTime = Integer.parseInt(audittime) + Integer.parseInt(tmpStr); audittime = String.valueOf(tmpTime); } - updSql="UPDATE st_credit_audit_order SET begintime='"+begintime+"', " + " endtime='"+endtime+"', " + " audittime='"+audittime+"', " + From 6276276df89e8cc8677d2a83b56e533d373f03c9 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 22 Apr 2020 16:55:01 +0800 Subject: [PATCH 73/89] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8C=82=E8=BD=A6?= =?UTF-8?q?=E8=BD=A6=E6=9E=B6=E5=8F=B7=E3=80=81=E4=B8=9A=E5=8A=A1=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E5=88=86=E5=8D=95=E3=80=81=E6=8E=A5=E5=8F=A3=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E6=94=BE=E6=AC=BE=E5=90=8E=E7=9D=A3=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FlowInstanceTrack/FlowInstanceTrack.jsp | 2 +- .../Comm/LBEquipment_Car/LBEquipmentInfo.jsp | 68 +------------------ WebContent/WEB-INF/etc/jbo/jbo_app.xml | 12 ++-- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 18 ++--- src_jbo/jbo/app/LB_EQUIPMENT_CAR.java | 10 +-- src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java | 10 +-- .../tenwa/lease/comm/LB_EQUIPMENT_CAR.java | 10 +-- .../lease/comm/LB_EQUIPMENT_CAR_HIS.java | 10 +-- .../lease/comm/LB_EQUIPMENT_CAR_TEMP.java | 10 +-- src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql | 31 +++------ .../commbusiness/GenerateBackOpinionLog.java | 4 +- .../businessapply/BusinessApproveManager.java | 4 +- 12 files changed, 58 insertions(+), 131 deletions(-) diff --git a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp index 1213efe59..25fc03300 100644 --- a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp +++ b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp @@ -39,7 +39,7 @@ String ros = "true"; if("业务申请分担".equals(soft)){ ros = "false"; - doTemp.appendJboWhere(" O.flow_name='业务申请流程' and O.PHASENAME='信审初审'"); + doTemp.appendJboWhere(" (O.flow_name='业务申请流程' or O.flow_name='业务变更流程') and O.PHASENAME='信审初审'"); }; if("付款业务分担".equals(soft)){ ros = "false"; diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp index 37add180e..c117dfe68 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp @@ -83,8 +83,6 @@ CurPage.getCurComp().setAttribute("RightType", null); doTemp.setHtmlEvent("FRAME_NUMBER", "onChange", "checkFrameNumber");//校验车架号格式 doTemp.setHtmlEvent("FRAME_NUMBER2", "onChange", "checkFrameNumber2");//校验车架号格式 - //doTemp.setHtmlEvent("FRAME_NUMBER3", "onChange", "checkFrameNumber3");//校验车架号格式 - //doTemp.setHtmlEvent("FRAME_NUMBER4", "onChange", "checkFrameNumber4");//校验车架号格式 /* doTemp.setHtmlEvent("BRAND", "onChange", "selectCarType"); if((null!=RightType&& !RightType.equals("ReadOnly"))||(null!=ishistory&& !ishistory.equals("true"))){ @@ -508,79 +506,15 @@ } } - function checkFrameNumber3(){ - var vin = getItemValue(0,getRow(0),"FRAME_NUMBER3"); - if((typeof(vin) == "undefined" || vin == "")){ - setErrorTips("FRAME_NUMBER3",""); - return true; - } - var projectId = "<%=projectId%>"; - var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","checkCarNumber","projectId="+projectId+",plate_number="+vin); - if("EROOR"==sResult){ - setErrorTips("FRAME_NUMBER3","车架号已存在!"); - return false; - } - if (!getCheckCode(vin)){ - setErrorTips("FRAME_NUMBER3","车架号格式有误！"); - return false; - }else{ - setErrorTips("FRAME_NUMBER3",""); - return true; - } - - } - function checkFrameNumber4(){ - var vin = getItemValue(0,getRow(0),"FRAME_NUMBER4"); - if((typeof(vin) == "undefined" || vin == "")){ - setErrorTips("FRAME_NUMBER4",""); - return true; - } - var projectId = "<%=projectId%>"; - var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","checkCarNumber","projectId="+projectId+",plate_number="+vin); - if("EROOR"==sResult){ - setErrorTips("FRAME_NUMBER4","车架号已存在!"); - return false; - } - if (!getCheckCode(vin)){ - setErrorTips("FRAME_NUMBER4","车架号格式有误！"); - return false; - }else{ - setErrorTips("FRAME_NUMBER4",""); - return true; - } - - } + //校验重复 function checkRepeat(){ var vin = getItemValue(0,getRow(0),"FRAME_NUMBER"); var vin2 = getItemValue(0,getRow(0),"FRAME_NUMBER2"); - var vin3 = getItemValue(0,getRow(0),"FRAME_NUMBER3"); - var vin4 = getItemValue(0,getRow(0),"FRAME_NUMBER4"); if((typeof(vin) != "undefined" && vin != "")){ if( vin==vin2 ){ alert("车架号1和车架号2重复"); return false; - }else if( vin==vin3 ){ - alert("车架号1和车架号3重复"); - return false; - }else if( vin==vin4 ){ - alert("车架号1和车架号4重复"); - return false; - } - } - if((typeof(vin2) != "undefined" && vin2 != "")){ - if( vin2==vin3 ){ - alert("车架号2和车架号3重复"); - return false; - }else if( vin2==vin4 ){ - alert("车架号2和车架号4重复"); - return false; - } - } - if((typeof(vin3) != "undefined" && vin3 != "")){ - if( vin3==vin4 ){ - alert("车架号3和车架号4重复"); - return false; } } return true; diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app.xml b/WebContent/WEB-INF/etc/jbo/jbo_app.xml index d359a8b24..e4ba33394 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_app.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_app.xml @@ -4437,9 +4437,9 @@ - - - + + + @@ -4549,9 +4549,9 @@ - - - + + + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 2fcc83888..3b103656c 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -1445,9 +1445,9 @@ - - - + + + @@ -2015,9 +2015,9 @@ - - - + + + @@ -3525,9 +3525,9 @@ - - - + + + diff --git a/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java b/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java index 2906f35af..163470176 100644 --- a/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java +++ b/src_jbo/jbo/app/LB_EQUIPMENT_CAR.java @@ -146,17 +146,17 @@ public interface LB_EQUIPMENT_CAR{ */ public static final String FRAME_NUMBER = "FRAME_NUMBER"; /** - * 车架号2 STRING(100)
+ * 挂车车架号 STRING(100)
*/ public static final String FRAME_NUMBER2 = "FRAME_NUMBER2"; /** - * 车架号3 STRING(100)
+ * 挂车品牌 STRING(100)
*/ - public static final String FRAME_NUMBER3 = "FRAME_NUMBER3"; + public static final String FRAME_BRAND = "FRAME_BRAND"; /** - * 车架号4 STRING(100)
+ * 挂车颜色 STRING(100)
*/ - public static final String FRAME_NUMBER4 = "FRAME_NUMBER4"; + public static final String FRAME_COLOR = "FRAME_COLOR"; /** * 发动机号 STRING(100)
*/ diff --git a/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java b/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java index d195a1e29..8e86eeb79 100644 --- a/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java +++ b/src_jbo/jbo/app/LB_EQUIPMENT_CAR_TEMP.java @@ -146,17 +146,17 @@ public interface LB_EQUIPMENT_CAR_TEMP{ */ public static final String FRAME_NUMBER = "FRAME_NUMBER"; /** - * 车架号2 STRING(100)
+ * 挂车车架号 STRING(100)
*/ public static final String FRAME_NUMBER2 = "FRAME_NUMBER2"; /** - * 车架号3 STRING(100)
+ * 挂车品牌 STRING(100)
*/ - public static final String FRAME_NUMBER3 = "FRAME_NUMBER3"; + public static final String FRAME_BRAND = "FRAME_BRAND"; /** - * 车架号4 STRING(100)
+ * 挂车颜色 STRING(100)
*/ - public static final String FRAME_NUMBER4 = "FRAME_NUMBER4"; + public static final String FRAME_COLOR = "FRAME_COLOR"; /** * 发动机号 STRING(100)
*/ diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java index 098b2cf26..440179e74 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR.java @@ -142,17 +142,17 @@ public interface LB_EQUIPMENT_CAR{ */ public static final String FRAME_NUMBER = "FRAME_NUMBER"; /** - * 车架号2 STRING(100)
+ * 挂车车架号 STRING(100)
*/ public static final String FRAME_NUMBER2 = "FRAME_NUMBER2"; /** - * 车架号3 STRING(100)
+ * 挂车品牌 STRING(100)
*/ - public static final String FRAME_NUMBER3 = "FRAME_NUMBER3"; + public static final String FRAME_BRAND = "FRAME_BRAND"; /** - * 车架号4 STRING(100)
+ * 挂车颜色 STRING(100)
*/ - public static final String FRAME_NUMBER4 = "FRAME_NUMBER4"; + public static final String FRAME_COLOR = "FRAME_COLOR"; /** * 发动机号 STRING(100)
*/ diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java index d6ec4a4b0..f00966e3a 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_HIS.java @@ -146,17 +146,17 @@ public interface LB_EQUIPMENT_CAR_HIS{ */ public static final String FRAME_NUMBER = "FRAME_NUMBER"; /** - * 车架号2 STRING(100)
+ * 挂车车架号 STRING(100)
*/ public static final String FRAME_NUMBER2 = "FRAME_NUMBER2"; /** - * 车架号3 STRING(100)
+ * 挂车品牌 STRING(100)
*/ - public static final String FRAME_NUMBER3 = "FRAME_NUMBER3"; + public static final String FRAME_BRAND = "FRAME_BRAND"; /** - * 车架号4 STRING(100)
+ * 挂车颜色 STRING(100)
*/ - public static final String FRAME_NUMBER4 = "FRAME_NUMBER4"; + public static final String FRAME_COLOR = "FRAME_COLOR"; /** * 发动机号 STRING(100)
*/ diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java index e05f7aa5a..05bae9f21 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_EQUIPMENT_CAR_TEMP.java @@ -146,17 +146,17 @@ public interface LB_EQUIPMENT_CAR_TEMP{ */ public static final String FRAME_NUMBER = "FRAME_NUMBER"; /** - * 车架号2 STRING(100)
+ * 挂车车架号 STRING(100)
*/ public static final String FRAME_NUMBER2 = "FRAME_NUMBER2"; /** - * 车架号3 STRING(100)
+ * 挂车品牌 STRING(100)
*/ - public static final String FRAME_NUMBER3 = "FRAME_NUMBER3"; + public static final String FRAME_BRAND = "FRAME_BRAND"; /** - * 车架号4 STRING(100)
+ * 挂车颜色 STRING(100)
*/ - public static final String FRAME_NUMBER4 = "FRAME_NUMBER4"; + public static final String FRAME_COLOR = "FRAME_COLOR"; /** * 发动机号 STRING(100)
*/ diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql index 2deac043d..393ead24c 100644 --- a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql +++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql @@ -1,14 +1,14 @@ -- 在租赁物表中添加车架号字段 -ALTER TABLE lb_equipment_car ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3; -ALTER TABLE lb_equipment_car_temp ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3; -ALTER TABLE lb_equipment_car_his ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '车架号2' AFTER FRAME_NUMBER, ADD COLUMN FRAME_NUMBER3 VARCHAR(100) NULL COMMENT '车架号3' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_NUMBER4 VARCHAR(100) NULL COMMENT '车架号4' AFTER FRAME_NUMBER3; +ALTER TABLE lb_equipment_car ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '挂车车架号' AFTER FRAME_NUMBER, ADD COLUMN FRAME_BRAND VARCHAR(50) NULL COMMENT '挂车品牌' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_COLOR VARCHAR(20) NULL COMMENT '挂车颜色' AFTER FRAME_BRAND; +ALTER TABLE lb_equipment_car_his ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '挂车车架号' AFTER FRAME_NUMBER, ADD COLUMN FRAME_BRAND VARCHAR(50) NULL COMMENT '挂车品牌' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_COLOR VARCHAR(20) NULL COMMENT '挂车颜色' AFTER FRAME_BRAND; +ALTER TABLE lb_equipment_car_temp ADD COLUMN FRAME_NUMBER2 VARCHAR(100) NULL COMMENT '挂车车架号' AFTER FRAME_NUMBER, ADD COLUMN FRAME_BRAND VARCHAR(50) NULL COMMENT '挂车品牌' AFTER FRAME_NUMBER2, ADD COLUMN FRAME_COLOR VARCHAR(20) NULL COMMENT '挂车颜色' AFTER FRAME_BRAND; -- 模板添加字段 -delete from awe_do_library where dono='LBEquipmentInfoTemp_Cars' and colindex='1081'; -Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1081','1081','1','O','FRAME_NUMBER2','FRAME_NUMBER2','String','','挂车车架号','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/17 16:34:48','0','','1','','','',''); -delete from awe_do_library where dono='LBEquipmentInfoTemp_Cars' and colindex='1082'; -Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1082','1082','1','O','FRAME_NUMBER3','FRAME_NUMBER3','String','','挂车车架号2','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/17 16:34:48','','','1','','','',''); -delete from awe_do_library where dono='LBEquipmentInfoTemp_Cars' and colindex='1083'; -Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBEquipmentInfoTemp_Cars','1083','1083','1','O','FRAME_NUMBER4','FRAME_NUMBER4','String','','挂车车架号3','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/17 16:34:48','','','1','','','',''); +DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1081'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LBEquipmentInfoTemp_Cars','1081','1081','1','O','FRAME_NUMBER2','FRAME_NUMBER2','String','','挂车车架号','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/17 16:34:48','0','','1','','','',''); +DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1082'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LBEquipmentInfoTemp_Cars','1082','1082','1','O','FRAME_BRAND','FRAME_BRAND','String','','挂车品牌','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/22 16:01:19','0','','1','','','',''); +DELETE FROM awe_do_library WHERE dono='LBEquipmentInfoTemp_Cars' AND colindex='1083'; +INSERT INTO awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) VALUES ('LBEquipmentInfoTemp_Cars','1083','1083','1','O','FRAME_COLOR','FRAME_COLOR','String','','挂车颜色','','1','Text','1','1','','','','100','1','0','0','1','0',0,'','0010','','SYS_Designer','2020/03/12 13:54:39','SYS_Designer','2020/04/22 16:01:19','0','','1','','','',''); -- 创建业务申请初审记录表 CREATE TABLE business_apply_userinfo ( @@ -272,17 +272,8 @@ Insert Into AWE_MENU_INFO (menuid,menuname,displayname,sortno,url,urlparam,targe Insert Into AWE_Role_Menu (roleid,menuid) Values ('099','9600100313'); --- 客户张磊修改内容 -INSERT INTO `apzl`.`code_library` (`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('operationType', 'CDZZ', 'C端直租', '', '0120', '1', '', '', '', '', '', '', '', '', '', '', '', 'SYS_Designer', NULL, '2020/03/31 15:08:56', 'SYS_Designer', '2020/03/31 15:08:56', '', ''); -INSERT INTO `apzl`.`bf_template` (`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('59f109e144c347d1b0d61da63a4fe822', NULL, '', 'C端直租', '融资租赁合同-C端直租.doc', '融资租赁合同-C端直租-定稿版.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '', 'administrator', '8009001', '2020/03/31 14:02:27', 'admin', '8009001', '2020/03/31 02:18:46', '', ''); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('25fff44b316c42d397cc8e2c214f2b20', '975294b526544d83b806e3fc2f99cd16', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('31eccaf2a04c471ea341f7ef7a760961', 'bbe36e81f17542078489f223239e658a', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('5952afc7c09044ab9a8966d75bcd7e19', 'ced1455267d64183ba1b270a9eda6089', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('801e60bfebd649e09d673b7fa0f7fc23', '484815c4a7a14cf6bdbf69939e5b060e', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('9d3b561076b74fca88e50e92d51413ef', 'cc67cd6da08745329d0723f5f6fda25d', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('aba1e85d33b5444bb35357f837100335', 'db5b1632a6b44e7ea99e0dd0b2193ef3', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('bd605c45dc554628ae5094c58a270b26', 'be101123ef74413eb0d8acad8b6b22b9', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('f921be5522b14cf38d04320165696a74', '755698c1c27a43efa6c23310757c6163', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL); + + diff --git a/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/GenerateBackOpinionLog.java b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/GenerateBackOpinionLog.java index e7e012afd..bddf32e2b 100644 --- a/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/GenerateBackOpinionLog.java +++ b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/GenerateBackOpinionLog.java @@ -57,8 +57,10 @@ public class GenerateBackOpinionLog extends BaseBussiness{ laolbo.setAttributeValue("PROCESS_NODE","CONTRACT_CHANGES"); }else if("FundPaymentCarApply".equals(applyType)){//放款申请 laolbo.setAttributeValue("PROCESS_NODE","FINANCE_AUDIT"); - }else if("FileReturnApply".equals(applyType)){//归档申请 + }else if("MortgageFileApply".equals(applyType)){//放款后督 laolbo.setAttributeValue("PROCESS_NODE","DATA_ARCHIVE"); + }else if("MortgageFileMailApply".equals(applyType)){//邮寄归档 + laolbo.setAttributeValue("PROCESS_NODE","MAIL_ARCHIVE"); } laolBm.saveObject(laolbo); diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java index 33c0cafc8..49d29b643 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java @@ -229,8 +229,8 @@ public class BusinessApproveManager { public String checkCarNumber(JBOTransaction tx) throws Exception{ BizObjectManager lecManger = JBOFactory.getBizObjectManager(LB_EQUIPMENT_CAR.CLASS_NAME, tx); BizObject lec = lecManger.createQuery("select O.id from O left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci on O.contract_id=lci.id " - + " where ( O.FRAME_NUMBER=:prameNumber or O.FRAME_NUMBER2=:prameNumber2 or O.FRAME_NUMBER3=:prameNumber3 or O.FRAME_NUMBER4=:prameNumber4 ) and project_id<>:projectid and lci.contract_status BETWEEN 21 AND 103") - .setParameter("prameNumber", plate_number).setParameter("prameNumber2", plate_number).setParameter("prameNumber3", plate_number).setParameter("prameNumber4", plate_number).setParameter("projectid", projectId).getSingleResult(false); + + " where ( O.FRAME_NUMBER=:prameNumber or O.FRAME_NUMBER2=:prameNumber2 ) and project_id<>:projectid and lci.contract_status BETWEEN 21 AND 103") + .setParameter("prameNumber", plate_number).setParameter("prameNumber2", plate_number).setParameter("projectid", projectId).getSingleResult(false); if(lec !=null){ /*if(lec.getAttribute("ID").getString().equals(phaseNo)){ return "SUCCESS"; From 0d5ca174c9374cccfd316a44a94354fc06669837 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 22 Apr 2020 21:56:08 +0800 Subject: [PATCH 74/89] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=88=86=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp index 25fc03300..428f586ce 100644 --- a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp +++ b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp @@ -39,7 +39,7 @@ String ros = "true"; if("业务申请分担".equals(soft)){ ros = "false"; - doTemp.appendJboWhere(" (O.flow_name='业务申请流程' or O.flow_name='业务变更流程') and O.PHASENAME='信审初审'"); + doTemp.appendJboWhere("( (O.flow_name='业务申请流程' and O.PHASENAME='信审初审') or ( O.flow_name='业务变更流程' and O.PHASENAME='信审专员初审') )"); }; if("付款业务分担".equals(soft)){ ros = "false"; From bc9852fb000485f8bab516d0a8ce17dd213647c4 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Thu, 23 Apr 2020 19:11:48 +0800 Subject: [PATCH 75/89] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=94=B6=E5=85=A5=E7=AD=9B=E9=80=89=E5=90=88=E5=90=8CSQL?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenwa/lease/app/quartzmession/SurplusMoneyMakeSureIn.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/SurplusMoneyMakeSureIn.java b/src_tenwa/com/tenwa/lease/app/quartzmession/SurplusMoneyMakeSureIn.java index 204a15ab7..c24c77e20 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/SurplusMoneyMakeSureIn.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/SurplusMoneyMakeSureIn.java @@ -34,13 +34,13 @@ public class SurplusMoneyMakeSureIn implements Job { /** * 1：获取当前已经结清， 并且结清大于等于183天的合同 */ - sql = "SELECT contract_id FROM lb_contract_info lci LEFT JOIN (SELECT lria.hire_date,lria.contract_id FROM lc_rent_income lria LEFT JOIN LC_EBANK LE ON LE.ID=LRIA.EBANK_NUMBER WHERE lria.hire_date = (SELECT MAX(lrib.hire_date) FROM lc_rent_income lrib WHERE lria.contract_id = lrib.contract_id) AND IFNULL(LE.MAYOPE_MONEY,0)<>0 GROUP BY contract_id) lri ON lri.contract_id = lci.id WHERE (lci.contract_status = '100' OR lci.contract_status = '105') AND DATE_FORMAT(NOW(), '%Y/%m/%d') >= DATE_ADD(STR_TO_DATE(lri.hire_date, '%Y/%m/%d'),INTERVAL 183 DAY) "; + sql = "SELECT LCI.ID AS CONTRACT_ID FROM LB_CONTRACT_INFO LCI LEFT JOIN (SELECT LRIA.CONTRACT_ID,MAX(LRIA.HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME LRIA WHERE LRIA.HIRE_DATE=(SELECT MAX(LRIB.HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME LRIB WHERE LRIB.CONTRACT_ID=LRIA.CONTRACT_ID) GROUP BY LRIA.CONTRACT_ID)LRI ON LRI.CONTRACT_ID=LCI.ID LEFT JOIN (SELECT LRI.CONTRACT_ID FROM (SELECT EBANK_NUMBER,CONTRACT_ID FROM LC_RENT_INCOME WHERE (EBANK_NUMBER IS NOT NULL OR EBANK_NUMBER<>'') GROUP BY CONTRACT_ID,EBANK_NUMBER) LRI LEFT JOIN LC_EBANK LE ON LE.ID=LRI.EBANK_NUMBER WHERE IFNULL(LE.MAYOPE_MONEY, 0) <> 0 GROUP BY LRI.CONTRACT_ID)LRI2 ON LRI2.CONTRACT_ID=LCI.ID WHERE (lci.contract_status = '100' OR lci.contract_status = '105') AND DATE_FORMAT(NOW(), '%Y/%m/%d') >= DATE_ADD(STR_TO_DATE(lri.hire_date, '%Y/%m/%d'),INTERVAL 183 DAY) AND LRI2.CONTRACT_ID IS NOT NULL "; List> date_list = DataOperatorUtil.getDataBySql(sql); /** *:2：循环获取合同租金核销用到过并且还有可核销金额的网银信息，将网银流水号存入list集合 */ for (int i = 0; i < date_list.size(); i++) { - String contractId = date_list.get(i).get("contract_id"); + String contractId = date_list.get(i).get("CONTRACT_ID"); /** * 3：获取该合同相关租金收款，资金收款用过的网银， 未核销完的网银数据， */ From b5cb57c002ef8dc9786f56c3cbd2e7830f285965 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 23 Apr 2020 22:09:47 +0800 Subject: [PATCH 76/89] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E4=BF=A1=E6=81=AFexcl=E5=AF=BC=E5=85=A5=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FlowInstanceTrack/FlowInstanceTrack.jsp | 2 +- .../BFTemplateTest/uploadExcelOperator.jsp | 2 + .../FileInformationImportList.jsp | 8 +- .../importcallback/ImportCallBack.java | 3 + .../impl/BaseImportExcelCallBack.java | 125 ++++++++++++++++++ .../service/FileTemplateService.java | 61 +++++++++ 6 files changed, 194 insertions(+), 7 deletions(-) diff --git a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp index 428f586ce..98b259c37 100644 --- a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp +++ b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp @@ -46,7 +46,7 @@ doTemp.appendJboWhere(" O.flow_name='付款申请(汽车)' and O.PHASENAME='订单初审'"); }; String button = "true"; - if(!"administrator".equals(userId)){ + if("administrator".equals(userId)){ button="false"; ros = "false"; } diff --git a/WebContent/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcelOperator.jsp b/WebContent/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcelOperator.jsp index a088b21d7..51c0eddec 100644 --- a/WebContent/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcelOperator.jsp +++ b/WebContent/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcelOperator.jsp @@ -42,6 +42,8 @@ sourceMap.put("sFilePath", sFilePath); sourceMap.put("sFileSize", fileSize); cindex=fs.batchImportExcelByConfig( CurUser,myAmarsoftUpload.getFiles().getFile(0).getFileName(), myAmarsoftUpload.getFiles().getFile(0).toInputStream(), sourceMap.get("templateNo"), sourceMap); + }else if (importparam.indexOf("archivesCU")>0){//档案信息导入，自动导入合同id和归档人 + cindex=fs.archivesImportExcelByConfig( CurUser,myAmarsoftUpload.getFiles().getFile(0).getFileName(), myAmarsoftUpload.getFiles().getFile(0).toInputStream(), sourceMap.get("templateNo"), sourceMap); }else{ cindex=fs.importExcelByConfig( CurUser,myAmarsoftUpload.getFiles().getFile(0).getFileName(), myAmarsoftUpload.getFiles().getFile(0).toInputStream(), sourceMap.get("templateNo"), sourceMap); } diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp index 9a0b796fc..30ee741d4 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/FileInformationImportList.jsp @@ -64,17 +64,13 @@ //增加其他配置参数 importCondition["inputuserid"]="<%=CurUser.getUserID()%>"; importCondition["inputorgid"]="<%=CurUser.getOrgID()%>"; + importCondition["type"]="archivesCU"; var sparam=JSON.stringify(importCondition).replace(/,/g,"@");//生成模板的参数据 AsDialog.PopView("/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcel.jsp","importparam="+sparam, {width:"350px",height:"40px",title:"上传文件下载数据"},function(){ - updateContractId(); + reloadSelf(); }); } - //更新对应的contractid - function updateContractId(){ - RunJavaMethodSqlca("com.tenwa.lease.function.ImportContractId","updateContractId",""); - reloadSelf(); - } //模板下载 function DiscountDownload(){ var sId="091cbd1a827243ae821e75fcddc5319b"; diff --git a/src_core/com/tenwa/officetempalte/importcallback/ImportCallBack.java b/src_core/com/tenwa/officetempalte/importcallback/ImportCallBack.java index 3dd0bd325..e66dcdfb6 100644 --- a/src_core/com/tenwa/officetempalte/importcallback/ImportCallBack.java +++ b/src_core/com/tenwa/officetempalte/importcallback/ImportCallBack.java @@ -20,4 +20,7 @@ public abstract class ImportCallBack { public abstract void runAfter(ASUser CurUser,Mapmodel,List importObjects,JBOTransaction tx,Transaction Sqlca) throws Exception; public abstract void importExcel(BizObject importConfig,List columnConfigs,List exceptionMessage, ASUser CurUser,Map model,ListimportObjects,Sheet sheet,JBOTransaction tx,Transaction Sqlca)throws Exception; + public abstract void archivesImportExcel(BizObject importConfig,List columnConfigs,List exceptionMessage, + ASUser CurUser,Map model,ListimportObjects,Sheet sheet,JBOTransaction tx,Transaction Sqlca)throws Exception; + } diff --git a/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java b/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java index 96d49621c..f9461a040 100644 --- a/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java +++ b/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java @@ -33,6 +33,7 @@ import com.tenwa.officetempalte.util.PoiExcelUtil; import com.tenwa.reckon.util.UUIDUtil; import jbo.app.tenwa.calc.LC_CARD_DEDUCT_DOC; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; /** * 默认excel导入处理类 * */ @@ -528,4 +529,128 @@ public class BaseImportExcelCallBack extends ImportCallBack{ } }} + //档案归档信息 + public void archivesImportExcel(BizObject importConfig,List columnConfigs,List exceptionMessage, + ASUser CurUser,Map model,ListimportObjects,Sheet sheet,JBOTransaction tx,Transaction Sqlca) throws Exception { + + BizObjectManager lciManage=JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME,Sqlca); + + String importClass=FileOperatorUtil.nullToString(importConfig.getAttribute("relativeclass").getValue(),"");//导入对应的类 + if(importClass.length()<2){ + throw new BusinessException("导入没有"+importConfig.getAttribute("sheetname").getString()+"配置对应该的表或类"); + } + String sHeaderIndex=FileOperatorUtil.nullToString(importConfig.getAttribute("rowline").getValue(),"1");//标题行 + String sDataIndex=FileOperatorUtil.nullToString(importConfig.getAttribute("dateindex").getValue(),"2");//数据行 + String[] headerIndexs = sHeaderIndex.split(","); + int DataRowindex=Integer.parseInt(sDataIndex); + List headerRows = new ArrayList(); + // 获取标题行 + for (int i = 0; i < headerIndexs.length; i++) { + headerRows.add(sheet.getRow(Integer.parseInt(headerIndexs[i]) - 1)); + } + int rowCount = sheet.getPhysicalNumberOfRows(); + BizObjectManager importManager = JBOFactory.getBizObjectManager(importClass); + tx.join(importManager); + String value=""; + + MapcolumnMap=new HashMap(); + columnMap=ExcelImportUtil.getImportColumnMap(columnConfigs); + + for (int rowIndex =( DataRowindex-1); rowIndex < rowCount; rowIndex++) { + Row row = sheet.getRow(rowIndex); + //判断这一行是不是都为空字符 + boolean isemptyrow=false; + if(null==row){continue;}//如果这个这一行为空则调过这一行 + int cellnumbers=row.getPhysicalNumberOfCells(); + if(cellnumbers<=0){continue;}//如果这一行的单元格数据为O则进调过这一行 + Iterator tempIt = row.cellIterator(); + if(tempIt.hasNext()){ + Cell cellt = (Cell) tempIt.next(); + value = PoiExcelUtil.getCellValue(cellt); + if(value.length()==0){continue;} + if(value.indexOf("合计")>=0){continue;}//如果这一行为合计则跳过这一行。 + } + for (Iterator cit = row.cellIterator(); cit.hasNext();) { + Cell cell = (Cell) cit.next(); + value = PoiExcelUtil.getCellValue(cell); + value = value.trim(); + if(value.length()>0){isemptyrow=true;} + } + if(isemptyrow==false){continue;}//如果这一行都为空则跳过这一行。 + + BizObject importObject=importManager.newObject(); + for (int i=0;i0){ + if(dataType.equals("data_type5")){value=value.replaceAll(",", "");} + if(dateSource.equals("data_source3")||dateSource.equals("data_source4")){ + if(null==sourceSql||sourceSql.length()<10){ + exceptionMessage.add("导入配置中"+headername+"是通过操作取得没有配置对应该的SQL或java类"); + }else{ + + String temp=value; + value=this.getExcelImportMapValue(CurUser,columnConfig, value, model,tx,Sqlca); + if(value==null||value.length()==0){ + exceptionMessage.add("导入第"+(rowIndex+1)+"行中第"+(colIndex+1)+"列中的"+temp+"是在数据库中没有对应该的列"); + } + } + } + importObject.setAttributeValue(columnConfig.getAttribute("importcolumn").getString(), value); + if("合同编号".equals(headername)){ + BizObject lci = lciManage.createQuery(" contract_no=:contract_no ").setParameter("contract_no", value).getSingleResult(false); + importObject.setAttributeValue("contract_id", lci==null?"":lci.getAttribute("id").toString()); + + } + }else if(isImport.equals("yes")){ + exceptionMessage.add("导入第"+(rowIndex+1)+"行中第"+(colIndex+1)+"列中没有数据！"); + } + } + + } + //设计归档人 + importObject.setAttributeValue("ARCHIVING_PERSON", CurUser.getUserName()); + //每列数据从据从前台取数并判断是否必填，和数据类型 + exceptionMessage.addAll(ExcelImportUtil.setImportOjbectDataFromPageAndCheck(columnMap,importObject,model,rowIndex+1)); + try{ + //每导入一行的回调类用来远行自定义的方法 + this.run(CurUser, importObject, model, rowIndex, tx, Sqlca); + }catch(BusinessException e){ + exceptionMessage.add(e.getMessage()); + } + importObjects.add(importObject); + } + if(exceptionMessage.size()>0){ + throw new BusinessException(exceptionMessage.toString()); + }else{ + if(importObjects.size()>0){ + //导入之后的回调 + this.runBefore(CurUser, model,importObjects, tx, Sqlca); + //删除源数据 + deleteSourceDeleteBeforeDelete(importConfig,model,Sqlca); + //导入正式的数据 + String isSave=importConfig.getAttribute("isSave").getString(); + if(isSave.equals("0")){ + }else{ + for(int cindex=0;cindex model) throws Exception{ + if(templateno==null){ + throw new BusinessException("请传入模板号"); + } + MapsearchCondtion=new HashMap(); + searchCondtion.put("id", templateno); + //模板配置 + BizObject template=DataOperatorUtil.getSingleJBO(BF_TEMPLATE.CLASS_NAME, searchCondtion, tx); + if(template==null){ + throw new BusinessException("模板号"+templateno+"在系统中未找到配置"); + } + searchCondtion.clear(); + searchCondtion.put("templateId", template.getAttribute("id").getString()); + List importConfigs=DataOperatorUtil.getSetJBO(BF_IMPORTCONFIG.CLASS_NAME, searchCondtion, tx); + ListexceptionMessage=new ArrayList(); + ListimportObjects=new ArrayList(); + if(null==importConfigs||importConfigs.size()==0){ + throw new BusinessException("导入没有配置"); + }else{ + for(BizObject importConfig : importConfigs){ + searchCondtion.clear(); + searchCondtion.put("importconfig", importConfig.getAttribute("id").getString()); + ListcolumnConfigs=DataOperatorUtil.getSetJBO(BF_IMPORTCOLUMN.CLASS_NAME, searchCondtion, tx); + if(null==columnConfigs||columnConfigs.size()==0){ + throw new BusinessException("导入没有"+importConfig.getAttribute("sheetname").getString()+"配置下面列数据"); + }else{ + String sheetName=FileOperatorUtil.nullToString(importConfig.getAttribute("sheetname").getValue(),""); + Workbook wb = null; + if (fileName.endsWith("xlsx")) { + wb = PoiExcelUtil.readWorkbook(sourceFile, ExcelVersionEnum.VERSION2007); + } else { + wb = PoiExcelUtil.readWorkbook(sourceFile, ExcelVersionEnum.VERSION2003); + } + Sheet sheet =null; + if(sheetName.equals("")){sheet = wb.getSheetAt(0);} + else{sheet=wb.getSheet(sheetName);} + + Class call=null; + Method callImport=null; + String importclass=importConfig.getAttribute("importclass").getString(); + try{ + if(importclass.length()>0){ + call=(Class) Class.forName(importclass); + }else{ + call=(Class) Class.forName("com.tenwa.officetempalte.importcallback.impl.BaseImportExcelCallBack"); + } + }catch(Exception e){ + throw new BusinessException("模板"+template.getAttribute("templatename").getString()+",表："+importConfig.getAttribute("importtable").getString()+"导入处理类没找到"); + } + ImportCallBack cb=call.newInstance(); + cb.archivesImportExcel(importConfig, columnConfigs, exceptionMessage, CurUser, model, importObjects, sheet, tx, Sqlca); + + } + + } + } + + return importObjects.size(); + } + public void closeTransaction() throws Exception{ if(Sqlca!=null){ Sqlca.commit(); From 1b9e80af272094f4c6737bdd86933d9c54d2e836 Mon Sep 17 00:00:00 2001 From: gityjf <2211675158@qq.com> Date: Fri, 24 Apr 2020 17:20:58 +0800 Subject: [PATCH 77/89] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/amarsoft/app/util/ProductParamUtil.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/com/amarsoft/app/util/ProductParamUtil.java b/src/com/amarsoft/app/util/ProductParamUtil.java index 5a35f265d..cb03b8468 100644 --- a/src/com/amarsoft/app/util/ProductParamUtil.java +++ b/src/com/amarsoft/app/util/ProductParamUtil.java @@ -13,6 +13,7 @@ import net.sf.json.JSONArray; import net.sf.json.JSONNull; import net.sf.json.JSONObject; +import org.apache.commons.lang3.StringUtils; import org.dom4j.Document; import org.dom4j.Element; import org.dom4j.io.OutputFormat; @@ -273,14 +274,14 @@ public class ProductParamUtil { String pData = boLPI.getAttribute("PRODUCT_DATA").getString();*/ String pData = ProductConfig.getProductData(realXmlPath); String type = componentType; - if("".equals(pData)){ + if(StringUtils.isEmpty(pData)){ }else{ JSONArray jsonArray = JSONArray.fromObject(pData); Iterator it = jsonArray.iterator(); JSONArray docList = null; JSONArray docGroupConfig = null; while(it.hasNext()){ - JSONObject jo = (JSONObject)it.next().get("jbo.sample.Component"); + JSONObject jo = it.next().getJSONObject("jbo.sample.Component"); if(type.equals(jo.get("TYPE"))){ docList = JSONArray.fromObject(jo.get("DecisionTable")); } @@ -483,13 +484,13 @@ public class ProductParamUtil { String pData = boLPI.getAttribute("PRODUCT_DATA").getString();*/ String pData = ProductConfig.getProductData(realXmlPath); String type = componentType; - if("".equals(pData)){ + if(StringUtils.isEmpty(pData)){ }else{ JSONArray jsonArray = JSONArray.fromObject(pData); Iterator it = jsonArray.iterator(); JSONArray param = null; while(it.hasNext()){ - JSONObject jo = (JSONObject)it.next().get("jbo.sample.Component"); + JSONObject jo = it.next().getJSONObject("jbo.sample.Component"); if(type.equals(jo.get("TYPE")) && id.equals(jo.get("ID"))){ param = JSONArray.fromObject(jo.get("Parameter")); } @@ -686,12 +687,12 @@ public class ProductParamUtil { //切换读取缓存 String pData = ProductConfig.getProductData(realXmlPath); String type = componentType; - if("".equals(pData)){ + if(StringUtils.isEmpty(pData)){ }else{ JSONArray jsonArray = JSONArray.fromObject(pData); Iterator it = jsonArray.iterator(); while(it.hasNext()){ - JSONObject jo = (JSONObject)it.next().get("jbo.sample.Component"); + JSONObject jo = it.next().getJSONObject("jbo.sample.Component"); if(type.equals(jo.get("TYPE"))){ JSONArray ja = JSONArray.fromObject(jo.get("Parameter")); BusinessObject b = BusinessObject.createBusinessObject("Component"); @@ -724,12 +725,12 @@ public class ProductParamUtil { String pData = boLPI.getAttribute("PRODUCT_DATA").getString();*/ String pData = ProductConfig.getProductData(realXmlPath); String type = componentType; - if("".equals(pData)){ + if(StringUtils.isEmpty(pData)){ }else{ JSONArray jsonArray = JSONArray.fromObject(pData); Iterator it = jsonArray.iterator(); while(it.hasNext()){ - JSONObject jo = (JSONObject)it.next().get("jbo.sample.Component"); + JSONObject jo = it.next().getJSONObject("jbo.sample.Component"); if(type.equals(jo.get("TYPE"))){ JSONArray ja = JSONArray.fromObject(jo.get("DecisionTable")); BusinessObject b = BusinessObject.createBusinessObject("Component"); From 224ba1263fb6b28812e43ea4133ce3edce721ee9 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Sat, 25 Apr 2020 18:24:30 +0800 Subject: [PATCH 78/89] =?UTF-8?q?=E6=9B=B4=E6=96=B0excl=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0=E5=92=8C=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BaseImportExcelCallBack.java | 32 ++++++++++++++++--- src_sql/view/vi_products_number.sql | 2 +- src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql | 2 +- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java b/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java index f9461a040..dbf40a562 100644 --- a/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java +++ b/src_core/com/tenwa/officetempalte/importcallback/impl/BaseImportExcelCallBack.java @@ -30,10 +30,12 @@ import com.tenwa.officetempalte.importcallback.ImportCallBack; import com.tenwa.officetempalte.util.ExcelImportUtil; import com.tenwa.officetempalte.util.FileOperatorUtil; import com.tenwa.officetempalte.util.PoiExcelUtil; +import com.tenwa.reckon.util.DateUtil; import com.tenwa.reckon.util.UUIDUtil; import jbo.app.tenwa.calc.LC_CARD_DEDUCT_DOC; import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; +import jbo.com.tenwa.lease.comm.LB_FILE_ARCHIVING_INFO; /** * 默认excel导入处理类 * */ @@ -534,7 +536,8 @@ public class BaseImportExcelCallBack extends ImportCallBack{ ASUser CurUser,Map model,ListimportObjects,Sheet sheet,JBOTransaction tx,Transaction Sqlca) throws Exception { BizObjectManager lciManage=JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME,Sqlca); - + BizObjectManager lfaiManage = JBOFactory.getBizObjectManager(LB_FILE_ARCHIVING_INFO.CLASS_NAME,Sqlca); + BizObject lfai = null; String importClass=FileOperatorUtil.nullToString(importConfig.getAttribute("relativeclass").getValue(),"");//导入对应的类 if(importClass.length()<2){ throw new BusinessException("导入没有"+importConfig.getAttribute("sheetname").getString()+"配置对应该的表或类"); @@ -611,7 +614,8 @@ public class BaseImportExcelCallBack extends ImportCallBack{ if("合同编号".equals(headername)){ BizObject lci = lciManage.createQuery(" contract_no=:contract_no ").setParameter("contract_no", value).getSingleResult(false); importObject.setAttributeValue("contract_id", lci==null?"":lci.getAttribute("id").toString()); - + lfai = lfaiManage.createQuery("CONTRACT_NUMBER=:CONTRACT_NUMBER ").setParameter("CONTRACT_NUMBER", value).getSingleResult(true); + } }else if(isImport.equals("yes")){ exceptionMessage.add("导入第"+(rowIndex+1)+"行中第"+(colIndex+1)+"列中没有数据！"); @@ -619,9 +623,27 @@ public class BaseImportExcelCallBack extends ImportCallBack{ } } - //设计归档人 - importObject.setAttributeValue("ARCHIVING_PERSON", CurUser.getUserName()); - //每列数据从据从前台取数并判断是否必填，和数据类型 + if(lfai != null ){ + String fileNumber = lfai.getAttribute("FILE_NUMBER") == null ? "":lfai.getAttribute("FILE_NUMBER").getString(); + if("null".equals(fileNumber) || fileNumber.length() <= 0 ) { + importObject.setAttributeValue("ARCHIVING_PERSON", lfai.getAttribute("ARCHIVING_PERSON")==null?"":lfai.getAttribute("ARCHIVING_PERSON").getString()); + importObject.setAttributeValue("INPUTUSERID", lfai.getAttribute("INPUTUSERID")==null?"":lfai.getAttribute("INPUTUSERID").getString()); + importObject.setAttributeValue("INPUTORGID", lfai.getAttribute("INPUTORGID")==null?"":lfai.getAttribute("INPUTORGID").getString()); + importObject.setAttributeValue("INPUTTIME", lfai.getAttribute("INPUTTIME")==null?"":lfai.getAttribute("INPUTTIME").getString()); + importObject.setAttributeValue("FILE_EFFECT_TIME", lfai.getAttribute("FILE_EFFECT_TIME")==null?"":lfai.getAttribute("FILE_EFFECT_TIME").getString()); + importObject.setAttributeValue("FILE_BORROWING_TIME", lfai.getAttribute("FILE_BORROWING_TIME")==null?"":lfai.getAttribute("FILE_BORROWING_TIME").getString()); + importObject.setAttributeValue("MORTGAGE_COMPLETION_TIME", lfai.getAttribute("MORTGAGE_COMPLETION_TIME")==null?"":lfai.getAttribute("MORTGAGE_COMPLETION_TIME").getString()); + + importObject.setAttributeValue("UPDATEUSERID",CurUser.getUserID()); + importObject.setAttributeValue("UPDATEORGID", CurUser.getOrgID()); + importObject.setAttributeValue("UPDATETIME", DateUtil.getSystemTimeByFormat("yyyy/MM/dd")); + } + }else{ + importObject.setAttributeValue("INPUTUSERID",CurUser.getUserID()); + importObject.setAttributeValue("INPUTORGID", CurUser.getOrgID()); + importObject.setAttributeValue("INPUTTIME", DateUtil.getSystemTimeByFormat("yyyy/MM/dd")); + } + //每列数据从据从前台取数并判断是否必填，和数据类型 exceptionMessage.addAll(ExcelImportUtil.setImportOjbectDataFromPageAndCheck(columnMap,importObject,model,rowIndex+1)); try{ //每导入一行的回调类用来远行自定义的方法 diff --git a/src_sql/view/vi_products_number.sql b/src_sql/view/vi_products_number.sql index 8dc23fa42..6c116223a 100644 --- a/src_sql/view/vi_products_number.sql +++ b/src_sql/view/vi_products_number.sql @@ -3,7 +3,7 @@ CREATE VIEW apzl.vi_products_number AS SELECT bt.TYPENO,bt.TYPENAME,psl.payType,psl.LeasForm,psl.equip_type,psl.EFFECTIVEDATE,num.INCOME_NUMBER,num.fact_money,num.fact_date,bt.Attribute2,di.distributor_name FROM BUSINESS_TYPE bt LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON bt.typeno=psl.PRODUCTID -LEFT JOIN (SELECT lcc.INCOME_NUMBER INCOME_NUMBER,lci.product_id product_id,SUM(lfi.fact_money) fact_money,MIN(lfi.fact_date) fact_date,lci.distributor_id AS distributor_id +LEFT JOIN (SELECT lcc.INCOME_NUMBER INCOME_NUMBER,lci.product_id product_id,SUM(lcc.CLEAN_LEASE_MONEY) fact_money,MIN(lfi.fact_date) fact_date,lci.distributor_id AS distributor_id FROM lb_contract_info lci LEFT JOIN LC_CALC_CONDITION lcc ON lci.id=lcc.contract_id LEFT JOIN lc_fund_income lfi ON lci.id=lfi.contract_id AND lfi.pay_type='pay_type_out' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' WHERE lci.contract_status >=31 AND lci.contract_status <=100 diff --git a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql index 393ead24c..c26d21627 100644 --- a/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql +++ b/src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql @@ -141,7 +141,7 @@ Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualn Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1040','1040','1','O','Invoice_number','Invoice_number','String','','发票号码','','1','Text','1','1','','','','32','1','0','1','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','',''); Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1050','1050','1','O','Invoice_date','Invoice_date','String','','开票日期','','1','Date','3','2','','','','100','1','0','1','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','0','','1','','','',''); Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1060','1060','1','O','Invoice_money','Invoice_money','String','','开票金额','','1','Text','2','1','','','','20','1','0','1','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','0','','1','','','',''); -Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1070','1070','1','O','tax_due','tax_due','String','','税金','','1','Text','2','1','','','','20','1','0','1','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1070','1070','1','O','tax_due','tax_due','String','','税金','','1','Text','2','1','','','','20','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/04/24 16:06:23','0','','1','','','',''); Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1080','1080','1','O','flow_unid','flow_unid','String','','流程id','','1','Text','1','1','','','','32','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','',''); Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1110','1110','1','O','inputuserid','inputuserid','String','','登记人','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','',''); Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LB_INVOICE_INFO_TEMP','1120','1120','1','O','inputorgid','inputorgid','String','','登记部门','','1','Text','1','1','','','','100','0','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/03/16 18:07:11','','','1','','','',''); From bf0ed945c947fbfd2031fe56bd2e7e3b6f78608e Mon Sep 17 00:00:00 2001 From: tangfutang Date: Sun, 26 Apr 2020 10:04:50 +0800 Subject: [PATCH 79/89] =?UTF-8?q?=E7=BB=93=E6=B8=85=E8=AF=81=E6=98=8E?= =?UTF-8?q?=E7=9B=96=E7=AB=A0=E6=B7=BB=E5=8A=A0=E4=B8=BB=E4=BD=93=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp index 49ed743f3..0fe2419c0 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp @@ -142,9 +142,10 @@ String Jurisdiction="true"; function stamp(){ var number = 0; var CONTRACT_IDS = getItemValueArray(0,'CONTRACT_ID'); + var subjectids = getItemValueArray(0,'SUBJECTID'); // var contractID = getItemValue(0,getRow(0),"CONTRACT_ID"); for(var i=0;i Date: Sun, 26 Apr 2020 18:34:56 +0800 Subject: [PATCH 80/89] =?UTF-8?q?=E5=AE=A2=E6=88=B7=EF=BC=88=E5=BC=A0?= =?UTF-8?q?=E7=A3=8A=EF=BC=89=E7=BB=93=E6=B8=85=E8=AF=81=E6=98=8E=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A4=A9=E6=B4=A5=E4=B8=BB=E4=BD=93=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/LBContractEnd/rightsFileList.jsp | 366 +++++++++--------- 1 file changed, 189 insertions(+), 177 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp index 0fe2419c0..e6de0385f 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp @@ -1,178 +1,190 @@ -<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%> -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> -<%@ page import="org.apache.commons.lang.StringUtils" %> -<% -String userid=CurUser.getUserID().substring(0,5); -String userid1=CurUser.getUserID(); -String Jurisdiction="true"; - - /* - Author: undefined 2018-07-16 - Content: - History Log: - */ - ASObjectModel doTemp = new ASObjectModel("rightsFileList"); - - //合同信息查询加权限 - BizObjectManager manager = JBOFactory.getBizObjectManager("jbo.awe.USER_ROLE"); - List roleListObject = manager.createQuery("userid=:userid").setParameter("userid", userid1).getResultList(false); - List roleList = new ArrayList(); - String roleid = ""; - - for(BizObject bo : roleListObject){ - roleid = bo.getAttribute("roleid").toString(); - roleList.add(roleid); - } - //roleid:800R00000044 北财合作方 - String roleId = "800R00000044"; - - //roleid:800R00000045 rolename: bccuishou - //如果登录人属于bccuishou角色，可以看到北财下的所有的合同 - if(roleList.contains("800R00000045")){ - Jurisdiction="false"; - List userObjectList = manager.createQuery("roleid=:roleid").setParameter("roleid", roleId).getResultList(false); - String userId = ""; - List useridList = new ArrayList(); - for(BizObject bo : userObjectList){ - userId = bo.getAttribute("userid").toString(); - useridList.add("'"+userId+"'"); - } - String useridStr = StringUtils.join(useridList.toArray(), ","); - doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")"); - } - //登录人属于经销商角色 401：经销商roleid - if(roleList.contains("401")){ - doTemp.appendJboWhere(" and O.project_manage='"+userid1+"'"); - } - if(roleList.contains(roleId)){ - Jurisdiction="false"; - } - - - ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); - dwTemp.Style="1"; //--设置为Grid风格-- - dwTemp.ReadOnly = "1"; //只读模式 - dwTemp.MultiSelect=true; - dwTemp.setPageSize(10); - dwTemp.genHTMLObjectWindow(""); - String userId = CurUser.getUserID(); - - //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 - String sButtons[][] = { - {Jurisdiction,"All","Button","结清证明","结清证明","saveRecord()","","","","btn_icon_save"}, - {"true","","Button","批量下载","批量下载","lotdown()","","","","btn_icon_transfer",""}, - {Jurisdiction,"All","Button","公司盖章","公司盖章","stamp()","","","",""}, - }; - sButtonPosition = "north"; -%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> - +<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> +<%@ page import="org.apache.commons.lang.StringUtils" %> +<% +String userid=CurUser.getUserID().substring(0,5); +String userid1=CurUser.getUserID(); +String Jurisdiction="true"; + + /* + Author: undefined 2018-07-16 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("rightsFileList"); + + //合同信息查询加权限 + BizObjectManager manager = JBOFactory.getBizObjectManager("jbo.awe.USER_ROLE"); + List roleListObject = manager.createQuery("userid=:userid").setParameter("userid", userid1).getResultList(false); + List roleList = new ArrayList(); + String roleid = ""; + + for(BizObject bo : roleListObject){ + roleid = bo.getAttribute("roleid").toString(); + roleList.add(roleid); + } + //roleid:800R00000044 北财合作方 + String roleId = "800R00000044"; + + //roleid:800R00000045 rolename: bccuishou + //如果登录人属于bccuishou角色，可以看到北财下的所有的合同 + if(roleList.contains("800R00000045")){ + Jurisdiction="false"; + List userObjectList = manager.createQuery("roleid=:roleid").setParameter("roleid", roleId).getResultList(false); + String userId = ""; + List useridList = new ArrayList(); + for(BizObject bo : userObjectList){ + userId = bo.getAttribute("userid").toString(); + useridList.add("'"+userId+"'"); + } + String useridStr = StringUtils.join(useridList.toArray(), ","); + doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")"); + } + //登录人属于经销商角色 401：经销商roleid + if(roleList.contains("401")){ + doTemp.appendJboWhere(" and O.project_manage='"+userid1+"'"); + } + if(roleList.contains(roleId)){ + Jurisdiction="false"; + } + + + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.MultiSelect=true; + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + String userId = CurUser.getUserID(); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + {Jurisdiction,"All","Button","结清证明","结清证明","saveRecord()","","","","btn_icon_save"}, + {"true","","Button","批量下载","批量下载","lotdown()","","","","btn_icon_transfer",""}, + {Jurisdiction,"All","Button","公司盖章","公司盖章","stamp()","","","",""}, + }; + sButtonPosition = "north"; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file From 0bda68a1604f24a92e737c7d8fbdbf9a00edbd86 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Sun, 26 Apr 2020 21:21:06 +0800 Subject: [PATCH 81/89] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=89=A3=E6=AC=BE?= =?UTF-8?q?=E5=A7=94=E6=89=98=E4=B9=A6=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E4=B8=BB=E4=BD=93=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AccountChangeApprovalApplyList.jsp | 3 +- .../Comm/LBDebitCard/ChangeDebitCardList.jsp | 20 +++++++- .../fileTemplate/鐩存帴鎵ｆ鎺堟潈濮旀墭涔tj.docx | Bin 0 -> 13334 bytes .../action/ContractSignAction.java | 14 ++++-- src_sql/鎶曚骇SQL/V20200404/tft_20200404.sql | 43 ++++++++++++++++++ .../contractaward/ContractAward.java | 20 ++++++++ 6 files changed, 94 insertions(+), 6 deletions(-) create mode 100644 WebContent/fileTemplate/鐩存帴鎵ｆ鎺堟潈濮旀墭涔tj.docx diff --git a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp index 5c64b400a..ff4bf34aa 100644 --- a/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/AccountInfoChange/AccountChangeApprovalApplyList.jsp @@ -54,7 +54,8 @@ var customerId=sReturn[5]; var contractNumber=sReturn[6]; var ProjectName=sReturn[10]; - var param="ContractId="+contractId+",productId="+productId+",product_Name="+product_Name+",ProjectId="+projectId+",CustomerType="+customerType+",customerId="+customerId+",contractNumber="+contractNumber+",FlowKey="+contractNumber+",ProjectName="+ProjectName; + var SubjectId=sReturn[11]; + var param="ContractId="+contractId+",productId="+productId+",product_Name="+product_Name+",ProjectId="+projectId+",CustomerType="+customerType+",customerId="+customerId+",contractNumber="+contractNumber+",FlowKey="+contractNumber+",ProjectName="+ProjectName+",SubjectId="+SubjectId; var sParams =param+",ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/ChangeDebitCardList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/ChangeDebitCardList.jsp index 68480eea8..50e5ffa27 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/ChangeDebitCardList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/ChangeDebitCardList.jsp @@ -9,6 +9,8 @@ String flowunid = CurPage.getParameter("FlowUnid"); String contractid = CurPage.getParameter("ContractId"); String customerType = CurPage.getParameter("CustomerType"); + String projectId = CurPage.getParameter("ProjectId"); + String SubjectId = CurPage.getParameter("SubjectId"); String falg = "false"; if("03".equals(customerType)){ falg = "true"; @@ -33,15 +35,31 @@ %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>