From 405f5faadcad3a315675f022e0fa0646aabeda7c Mon Sep 17 00:00:00 2001 From: zzk Date: Wed, 20 Sep 2023 09:16:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=B4=B7=E6=AC=BE=E4=BD=99=E9=A2=9D=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=9C=AC=E9=87=91=E4=BD=99=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InsertCustomerHistoryInfo.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertCustomerHistoryInfo.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertCustomerHistoryInfo.java index ecc06aa1d..c01f05b43 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertCustomerHistoryInfo.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertCustomerHistoryInfo.java @@ -122,14 +122,14 @@ public class InsertCustomerHistoryInfo { carwjqnumber = "0"; } //获取客户为主承租剩余租金,逾期租金 - String money_num = "select format(sum(nvl(rent_over,0)),2) as rent_over from customer_person cp left join lb_union_lessee lul on lul.CUSTOMER_ID = cp.CUSTOMERID left join vi_rent_plan_sum vrps on lul.contract_id = vrps.contract_id where cp.CERTID = '"+certid+"' and lul.IS_MAIN = 'Y' group by cp.CERTID"; + String money_num = "select format(sum(nvl(corpus_over,0)),2) as corpus_over from customer_person cp left join lb_union_lessee lul on lul.CUSTOMER_ID = cp.CUSTOMERID left join vi_rent_plan vrps on lul.contract_id = vrps.contract_id where cp.CERTID = '"+certid+"' and lul.IS_MAIN = 'Y' group by cp.CERTID"; List> money_number = conn.executeQuery(money_num); String yqmoney_num = "select format(sum(nvl(rent_over, 0)), 2) as yqrent_over from customer_person cp left join lb_union_lessee lul on lul.CUSTOMER_ID = cp.CUSTOMERID left join vi_rent_plan vrp on lul.contract_id = vrp.contract_id where cp.CERTID = '"+certid+"' and lul.IS_MAIN = 'Y' and STR_TO_DATE(vrp.plan_date,'%Y/%m/%d') < now() group by cp.CERTID"; List> yqmoney_number = conn.executeQuery(yqmoney_num); String czr_rent_over = ""; String czr_yqrent_over = ""; if(money_number.size()>0){ - czr_rent_over = money_number.get(0).get("rent_over"); + czr_rent_over = money_number.get(0).get("corpus_over"); }else { czr_rent_over = "0"; } @@ -202,14 +202,14 @@ public class InsertCustomerHistoryInfo { gtcarwjqnumber = "0"; } //获取客户为共同承租人剩余租金,罚息 - String gt_money_num = "select format(sum(nvl(rent_over,0)),2) as rent_over from customer_family cf left join lb_union_lessee lul on cf.PROJECT_ID = cf.PROJECT_ID left join vi_rent_plan_sum vrps on lul.contract_id = vrps.contract_id where cf.certid = '"+certid+"' and cf.Partner_ = 'Y' group by cf.certid"; + String gt_money_num = "select format(sum(nvl(corpus_over,0)),2) as corpus_over from customer_family cf left join lb_union_lessee lul on cf.PROJECT_ID = cf.PROJECT_ID left join vi_rent_plan vrps on lul.contract_id = vrps.contract_id where cf.certid = '"+certid+"' and cf.Partner_ = 'Y' group by cf.certid"; List> gt_money_number = conn.executeQuery(gt_money_num); String gt_yqmoney_num = "select format(sum(nvl(rent_over, 0)), 2) as yqrent_over from customer_family cf left join lb_union_lessee lul on cf.PROJECT_ID = lul.PROJECT_ID left join vi_rent_plan vrp on lul.contract_id = vrp.contract_id where cf.certid = '"+certid+"' and cf.Partner_ = 'Y' and STR_TO_DATE(vrp.plan_date,'%Y/%m/%d') < now() group by cf.certid"; List> gt_yqmoney_number = conn.executeQuery(gt_yqmoney_num); String gt_rent_over = ""; String gt_yqrent_over = ""; if(gt_money_number.size()>0){ - gt_rent_over = gt_money_number.get(0).get("rent_over"); + gt_rent_over = gt_money_number.get(0).get("corpus_over"); }else { gt_rent_over = "0"; } @@ -282,14 +282,14 @@ public class InsertCustomerHistoryInfo { dbcarwjqnumber = "0"; } //获取客户为担保人剩余租金,罚息 - String db_money_num = "select format(sum(nvl(rent_over,0)),2) as rent_over,format(sum(nvl(penalty_over,0)),2) as penalty_over from lb_guarantee_unit lgu left join vi_rent_plan_sum vrps on lgu.contract_id = vrps.contract_id where lgu.certid = '"+certid+"' group by lgu.certid"; + String db_money_num = "select format(sum(nvl(corpus_over, 0)), 2) as corpus_over from lb_guarantee_unit lgu left join vi_rent_plan vrp on lgu.contract_id = vrp.contract_id where lgu.certid = '"+certid+"' group by lgu.certid"; List> db_money_number = conn.executeQuery(db_money_num); - String db_yqmoney_num = "select format(sum(nvl(rent_over, 0)), 2) as yqrent_over from lb_guarantee_unit lgu left join vi_rent_plan vrp on lgu.contract_id = vrp.contract_id where lgu.certid = '220121197205076448' and STR_TO_DATE(vrp.plan_date,'%Y/%m/%d') < now() group by lgu.certid"; + String db_yqmoney_num = "select format(sum(nvl(rent_over, 0)), 2) as yqrent_over from lb_guarantee_unit lgu left join vi_rent_plan vrp on lgu.contract_id = vrp.contract_id where lgu.certid = '"+certid+"' and STR_TO_DATE(vrp.plan_date,'%Y/%m/%d') < now() group by lgu.certid"; List> db_yqmoney_number = conn.executeQuery(db_yqmoney_num); String db_rent_over = ""; String db_yqrent_over = ""; if(db_money_number.size()>0){ - db_rent_over = db_money_number.get(0).get("rent_over"); + db_rent_over = db_money_number.get(0).get("corpus_over"); }else { db_rent_over = "0"; } From f071140c79d841c9bf480c4c1d2ac4ee04a84bd9 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Wed, 20 Sep 2023 09:20:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8C=97=E8=B4=A2=E9=A3=8E=E6=8E=A7?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5-=E8=AF=84=E5=88=86=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessApplication/ApprovalForm.jsp | 48 +++++++------------ 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index 5130eb4f9..fad3e38f0 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -542,7 +542,7 @@ setItemReadOnly(0,0,"SECONDCHOICE",true); setItemReadOnly(0,0,"SECONDOPINION",true); break; - case '0060'://信审复审高级 + case '0051'://信审复审高级 setItemValue(0,0,"SECONDCHOICE",choiceCodeScoreDefault); setItemRequired(0,"SECONDOPINION",true); $("#SECONDOPINION").removeAttr("disabled"); @@ -551,7 +551,7 @@ setItemReadOnly(0,0,"SECONDCHOICE",true); setItemReadOnly(0,0,"SECONDOPINION",true); break; - case '0070'://信审复审资深 + case '0052'://信审复审资深 setItemValue(0,0,"SECONDCHOICE",choiceCodeScoreDefault); setItemRequired(0,"SECONDOPINION",true); $("#SECONDOPINION").removeAttr("disabled"); @@ -560,7 +560,16 @@ setItemReadOnly(0,0,"SECONDCHOICE",true); setItemReadOnly(0,0,"SECONDOPINION",true); break; - case '0080'://信审会和贷审会 + case '0053'://信审会和贷审会 + setItemValue(0,0,"SECONDCHOICE",choiceCodeScoreDefault); + setItemRequired(0,"SECONDOPINION",true); + $("#SECONDOPINION").removeAttr("disabled"); + defaultRcScoreResult("SECONDOPINION", opinionCodeScoreDefault, attributeCodeScoreDefault); + setItemValue(0,0,"SECONDOPINION",opinionCodeScoreDefault); + setItemReadOnly(0,0,"SECONDCHOICE",true); + setItemReadOnly(0,0,"SECONDOPINION",true); + break; + case '0060'://信审负责人 setItemValue(0,0,"THIRDCHOICE",choiceCodeScoreDefault); setItemRequired(0,"THIRDOPINION",true); $("#THIRDOPINION").removeAttr("disabled"); @@ -569,24 +578,6 @@ setItemReadOnly(0,0,"THIRDCHOICE",true); setItemReadOnly(0,0,"THIRDOPINION",true); break; - case '0100'://安鹏租赁总经理 - setItemValue(0,0,"THIRDCHOICE",choiceCodeScoreDefault); - setItemRequired(0,"THIRDOPINION",true); - $("#THIRDOPINION").removeAttr("disabled"); - defaultRcScoreResult("THIRDOPINION", opinionCodeScoreDefault, attributeCodeScoreDefault); - setItemValue(0,0,"THIRDOPINION",opinionCodeScoreDefault); - setItemReadOnly(0,0,"THIRDCHOICE",true); - setItemReadOnly(0,0,"THIRDOPINION",true); - break; - case '0110'://信审负责人 - setItemValue(0,0,"FOURCHOICE",choiceCodeScoreDefault); - setItemRequired(0,"FOUROPINION",true); - $("#FOUROPINION").removeAttr("disabled"); - defaultRcScoreResult("FOUROPINION", opinionCodeScoreDefault, attributeCodeScoreDefault); - setItemValue(0,0,"FOUROPINION",opinionCodeScoreDefault); - setItemReadOnly(0,0,"FOURCHOICE",true); - setItemReadOnly(0,0,"FOUROPINION",true); - break; } }) @@ -861,27 +852,24 @@ if(checkOpinion("SECONDCHOICE")){ return; } - }else if("<%=phaseNo%>" == "0060"){//信审复审高级 + }else if("<%=phaseNo%>" == "0051"){//信审复审高级 if(checkOpinion("SECONDCHOICE")){ return; } - }else if("<%=phaseNo%>" == "0070"){//信审复审资深 + }else if("<%=phaseNo%>" == "0052"){//信审复审资深 if(checkOpinion("SECONDCHOICE")){ return; } - }else if("<%=phaseNo%>" == "0080"){//信审会和贷审会 - if(checkOpinion("THIRDCHOICE")){ + }else if("<%=phaseNo%>" == "0053"){//信审会和贷审会 + if(checkOpinion("SECONDCHOICE")){ return; } - }else if("<%=phaseNo%>" == "0100"){//安鹏租赁总经理 - if(checkOpinion("FOURCHOICE")){ - return; - } - }else if("<%=phaseNo%>" == "0110"){//信审负责人 + }else if("<%=phaseNo%>" == "0060"){//信审负责人 if(checkOpinion("THIRDCHOICE")){ return; } } + var updatedFields = DisplayFields[0]; if(iV_all(0)){ document.getElementById("messageBox").style.display='none'; From 45eed3d5b1cd120dc9e6939e17569aeb2d1e91cf Mon Sep 17 00:00:00 2001 From: zhanglei Date: Wed, 20 Sep 2023 09:24:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8C=97=E8=B4=A2=E9=A3=8E=E6=8E=A7?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5-=E6=A0=B9=E6=8D=AE=E8=AF=84=E5=88=86?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=92=8C=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E5=AF=B9=E4=B8=9A=E5=8A=A1=E4=BA=BA=E5=91=98=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp | 2 -- 1 file changed, 2 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index fad3e38f0..268bc5cd0 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -792,8 +792,6 @@ $('#THIRDOPINION').append(sReturn); } }); - - } function checkOpinion(scoreDefaultResultChoice){