From bfa8b64e9cca93b1dec423ca084d08eabe39b8cc Mon Sep 17 00:00:00 2001 From: ChenXono <184642819@qq.com> Date: Mon, 18 May 2026 15:06:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E7=AE=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lis/sql/g_app/LCGrpUWDealBLSQL.java | 86 ++++++----- .../easyquery/g_quot/LSQuotProcessSql.java | 141 ++++++++++-------- .../lis/sql/g_quot/LSQuotCheckBLSQL.java | 2 +- .../webapp/g_quot/LSQuotProjSubmitInput.js | 2 +- .../webapp/g_quot/LSQuotProjUWSaleProInput.js | 2 +- 5 files changed, 124 insertions(+), 109 deletions(-) diff --git a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/g_app/LCGrpUWDealBLSQL.java b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/g_app/LCGrpUWDealBLSQL.java index 00e85005..42191267 100644 --- a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/g_app/LCGrpUWDealBLSQL.java +++ b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/g_app/LCGrpUWDealBLSQL.java @@ -77,7 +77,7 @@ public interface LCGrpUWDealBLSQL { SQLwithBindVariables updateInitNumPeopleAndPeoPlesAndSumNumPeople(@Param("tInsuredType") ArrayList tInsuredType, @Param("mGrpPropNo") String mGrpPropNo); - @SQL(value = "select 1 from LCGUWMaster a,LCGUWTrace b where a.grpcontno=b.grpcontno and a.uwno=b.uwno and (b.UWConclu is null or b.UWConclu='') " + + @SQL(value = "select 1 from LCGUWMaster a,LCGUWTrace b where a.grpcontno=b.grpcontno and a.uwno=b.uwno and (b.UWConclu is null or b.UWConclu=null) " + " and a.grpcontno='?mGrpPropNo?'") String existsByGrpContNoAndUWNoAndUWConcluIsNULL(@Param("mGrpPropNo") String mGrpPropNo); @@ -120,9 +120,9 @@ public interface LCGrpUWDealBLSQL { with tprem as (select aa.ContPlanCode ContPlanCode,aa.dutycode dutycode, - func_cal_vttovat(aa.prem,'?tOtherNoType?',aa.riskcode,'?tManageCom?','','?text1?','?text1?') NetAmount, - func_cal_vttovat(aa.prem,'?tOtherNoType?',aa.riskcode,'?tManageCom?','','?text2?','?text1?') TaxAmount, - func_cal_vttovat(aa.prem,'?tOtherNoType?',aa.riskcode,'?tManageCom?','','?text3?','?text1?') Tax + func_cal_vttovat(aa.prem,'?tOtherNoType?',aa.riskcode,'?tManageCom?',null,'?text1?','?text1?') NetAmount, + func_cal_vttovat(aa.prem,'?tOtherNoType?',aa.riskcode,'?tManageCom?',null,'?text2?','?text1?') TaxAmount, + func_cal_vttovat(aa.prem,'?tOtherNoType?',aa.riskcode,'?tManageCom?',null,'?text3?','?text1?') Tax from ( select @@ -139,7 +139,7 @@ public interface LCGrpUWDealBLSQL { and t3.prem is not null and t3.prem != 0 and t2.grpcontno = '?mGrpPropNo?' ) aa) - select '?tGetNoticeNo?','?ti?','?tGrpContNo?',t2.grppolno,t1.contno,t1.polno,'?text2?',t1.dutycode,t3.payplancode,'?tOtherNoType?',t2.riskcode,'?tAppntNo?','',t3.prem, to_number('?tNumPayIntv?'),'?payDate?','?text0?','?tManageCom?','?tComCode?','?mOperator?',to_date('?mCurrentDate?','yyyy-MM-dd'),'?mCurrentTime?','?mOperator?',to_date('?mCurrentDate?','yyyy-MM-dd'),'?mCurrentTime?' , t2.currency, tp.NetAmount,tp.TaxAmount,tp.Tax + select '?tGetNoticeNo?','?ti?','?tGrpContNo?',t2.grppolno,t1.contno,t1.polno,'?text2?',t1.dutycode,t3.payplancode,'?tOtherNoType?',t2.riskcode,'?tAppntNo?',null,t3.prem, CAST(?tNumPayIntv? AS NUMBER),'?payDate?','?text0?','?tManageCom?','?tComCode?','?mOperator?',to_date('?mCurrentDate?','yyyy-MM-dd'),'?mCurrentTime?','?mOperator?',to_date('?mCurrentDate?','yyyy-MM-dd'),'?mCurrentTime?' , t2.currency, tp.NetAmount,tp.TaxAmount,tp.Tax from lcduty t1,lcpol t2,lcprem t3,tprem tp where t1.polno = t2.polno and t1.dutycode=t3.dutycode and t2.polstate<>'?tPolState?' and t1.polno=t3.polno and t1.contno=t3.contno and t3.prem is not null and t3.prem !=0 and tp.dutycode=t1.DutyCode and tp.ContPlanCode=t2.ContPlanCode and t2.grpcontno ='?mGrpPropNo?' """) @@ -167,8 +167,8 @@ public interface LCGrpUWDealBLSQL { @SQL(value = "insert into ljspayperson (getnoticeno, paycount, grpcontno, grppolno, contno, polno, payaimclass," + " dutycode, payplancode, paytype, riskcode, appntno, endorsementno, sumduepaymoney, payintv, paydate," + " getflag, managecom, comcode, operator, makedate, maketime, modifyoperator, modifydate, modifytime,Currency,NetAmount,TaxAmount,Tax)" + - " select '?tGetNoticeNo?','?ti?','?tGrpContNo?',t2.grppolno,t1.contno,t1.polno,'?text2?',t1.dutycode,t3.payplancode,'?tOtherNoType?',t2.riskcode,'?tAppntNo?','',t3.periodprem," + - " to_number('?tNumPayIntv?'),'?payDate?','?text0?','?tManageCom?','?tComCode?'," + + " select '?tGetNoticeNo?','?ti?','?tGrpContNo?',t2.grppolno,t1.contno,t1.polno,'?text2?',t1.dutycode,t3.payplancode,'?tOtherNoType?',t2.riskcode,'?tAppntNo?',null,t3.periodprem," + + " CAST(?tNumPayIntv? AS NUMBER),'?payDate?','?text0?','?tManageCom?','?tComCode?'," + " '?mOperator?',to_date('?mCurrentDate?','yyyy-MM-dd'),'?mCurrentTime?','?mOperator?',to_date('?mCurrentDate?','yyyy-MM-dd'),'?mCurrentTime?',t2.currency, " + " func_cal_vttovat(t3.periodprem,'?tOtherNoType?',t2.riskcode,'?tManageCom?',t2.currency,'?text1?','?text1?'), " + " func_cal_vttovat(t3.periodprem,'?tOtherNoType?',t2.riskcode,'?tManageCom?',t2.currency,'?text2?','?text1?'), " + @@ -198,24 +198,32 @@ public interface LCGrpUWDealBLSQL { //fixme func_cal_vttovat在oracle里失效 by zhanghanxu 2020/04/13 @SQL(value = """ - insert into ljspayperson (getnoticeno, paycount, grpcontno, grppolno, contno, polno, payaimclass, dutycode,payplancode, paytype, riskcode, appntno, endorsementno, sumduepaymoney, payintv, paydate, getflag, managecom, comcode, operator, makedate, maketime, modifyoperator, modifydate, modifytime,Currency,NetAmount,TaxAmount,Tax,ISMixedPay) + insert into ljspayperson (getnoticeno, paycount, grpcontno, grppolno, contno, polno, payaimclass, dutycode,payplancode, paytype, riskcode, appntno, endorsementno, sumduepaymoney, payintv, paydate, getflag, managecom, comcode, operator, makedate, maketime, modifyoperator, modifydate, modifytime,Currency,NetAmount,TaxAmount,Tax,ISMixedPay) with tprem as (select - aa.ContPlanCode ContPlanCode,aa.dutycode dutycode, - func_cal_vttovat(aa.EnterPriseBurden,'?tOtherNoType?',aa.riskcode,'?tManageCom?','','?text1?','?text1?') NetAmount, - func_cal_vttovat(aa.EnterPriseBurden,'?tOtherNoType?',aa.riskcode,'?tManageCom?','','?text2?','?text1?') TaxAmount, - func_cal_vttovat(aa.EnterPriseBurden,'?tOtherNoType?',aa.riskcode,'?tManageCom?','','?text3?','?text1?') Tax - from - ( - select - distinct - t2.ContPlanCode,t1.dutycode,t4.EnterPriseBurden ,t2.riskcode - from - lcduty t1,lcpol t2,lcprem t3,lccontplandetail t4 - where - t1.polno = t2.polno and t1.dutycode=t3.dutycode and t2.polstate<>'?tPolState?' and t1.polno=t3.polno and t1.contno=t3.contno and t4.PolicyNo =t2.GrpContNo and t4.SysPlanCode =t2.ContPlanCode and t4.DutyCode =t3.DutyCode and (t4.FreeRisk is null or t4.FreeRisk = 0) and t2.grpcontno ='?mGrpPropNo?' ) aa) - select '?tGetNoticeNo?','?ti?','?tGrpContNo?',t2.grppolno,t1.contno,t1.polno,'?text2?',t1.dutycode,t3.payplancode,'?tOtherNoType?',t2.riskcode,'?tAppntNo?','',t4.EnterPriseBurden , to_number('?tNumPayIntv?'),'?payDate?','?text0?','?tManageCom?','?tComCode?','?mOperator?',to_date('?mCurrentDate?','yyyy-MM-dd'),'?mCurrentTime?','?mOperator?',to_date('?mCurrentDate?','yyyy-MM-dd'),'?mCurrentTime?' , t2.currency, tp.NetAmount,tp.TaxAmount,tp.Tax,'?mISMixedPay?' - from lcduty t1,lcpol t2,lcprem t3,lccontplandetail t4 ,tprem tp + aa.ContPlanCode ContPlanCode,aa.dutycode dutycode, + func_cal_vttovat(aa.EnterPriseBurden,'?tOtherNoType?',aa.riskcode,'?tManageCom?',null,'?text1?','?text1?') NetAmount, + func_cal_vttovat(aa.EnterPriseBurden,'?tOtherNoType?',aa.riskcode,'?tManageCom?',null,'?text2?','?text1?') TaxAmount, + func_cal_vttovat(aa.EnterPriseBurden,'?tOtherNoType?',aa.riskcode,'?tManageCom?',null,'?text3?','?text1?') Tax + from + ( + select + distinct + t2.ContPlanCode,t1.dutycode,t4.EnterPriseBurden ,t2.riskcode + from + lcduty t1,lcpol t2,lcprem t3,lccontplandetail t4 + where + t1.polno = t2.polno and t1.dutycode=t3.dutycode and t2.polstate<>'?tPolState?' and t1.polno=t3.polno and t1.contno=t3.contno and t4.PolicyNo =t2.GrpContNo and t4.SysPlanCode =t2.ContPlanCode and t4.DutyCode =t3.DutyCode and (t4.FreeRisk is null or t4.FreeRisk = 0) and t2.grpcontno ='?mGrpPropNo?' ) aa) + select '?tGetNoticeNo?','?ti?','?tGrpContNo?',t2.grppolno,t1.contno,t1.polno,'?text2?',t1.dutycode,t3.payplancode,'?tOtherNoType?',t2.riskcode,'?tAppntNo?',null,t4.EnterPriseBurden, + cast(?tNumPayIntv? as integer), + to_date('?payDate?','YYYY-MM-DD'), + '?text0?','?tManageCom?','?tComCode?','?mOperator?', + to_date('?mCurrentDate?','YYYY-MM-DD'), + '?mCurrentTime?','?mOperator?', + to_date('?mCurrentDate?','YYYY-MM-DD'), + '?mCurrentTime?', + t2.currency, tp.NetAmount,tp.TaxAmount,tp.Tax,'?mISMixedPay?' + from lcduty t1,lcpol t2,lcprem t3,lccontplandetail t4,tprem tp where t1.polno = t2.polno and t1.dutycode=t3.dutycode and t2.polstate<>'?tPolState?' and t1.polno=t3.polno and t1.contno=t3.contno and t4.PolicyNo =t2.GrpContNo and t4.SysPlanCode =t2.ContPlanCode and t4.DutyCode =t3.DutyCode and (t4.FreeRisk is null or t4.FreeRisk = 0) and tp.dutycode=t1.DutyCode and tp.ContPlanCode=t2.ContPlanCode and t2.grpcontno ='?mGrpPropNo?' """) SQLwithBindVariables insertLJSPayPersonByLCDuty_LCPol_LCPremAndPolStateNotGrpContNoAndMore3(@Param("text0") String text0, @@ -240,13 +248,12 @@ public interface LCGrpUWDealBLSQL { @Param("mISMixedPay") String mISMixedPay); //fixme func_cal_vttovat在oracle里失效 by zhanghanxu 2020/04/13 @SQL(value = "insert into ljspayperson (getnoticeno, paycount, grpcontno, grppolno, contno, polno, payaimclass, dutycode,payplancode, paytype, riskcode, appntno, endorsementno, sumduepaymoney, payintv, paydate, getflag, managecom, comcode," + - " operator, makedate, maketime, modifyoperator, modifydate, modifytime,Currency,NetAmount,TaxAmount,Tax,ISMixedPay) select '?tGetNoticeNo?','?ti?','?tGrpContNo?',t2.grppolno,t1.contno,t1.polno,'?text2?',t1.dutycode,t3.payplancode,'?tOtherNoType?',t2.riskcode,'?tAppntNo?','',t4.PersonBurden ," + - " to_number('?tNumPayIntv?'),'?payDate?','?text0?','?tManageCom?','?tComCode?','?mOperator?',to_date('?mCurrentDate?','yyyy-MM-dd'),'?mCurrentTime?','?mOperator?',to_date('?mCurrentDate?','yyyy-MM-dd'),'?mCurrentTime?' , t2.currency, " + - " func_cal_vttovat((t4.PersonBurden ),'?tOtherNoType?',t2.riskcode,'?tManageCom?',t2.currency,'?text1?','?text1?')," + - " func_cal_vttovat((t4.PersonBurden ),'?tOtherNoType?',t2.riskcode,'?tManageCom?',t2.currency,'?text2?','?text1?')," + - " func_cal_vttovat((t4.PersonBurden ),'?tOtherNoType?',t2.riskcode,'?tManageCom?',t2.currency,'?text3?','?text1?'),'?mISMixedPay?' " + + " operator, makedate, maketime, modifyoperator, modifydate, modifytime,Currency,NetAmount,TaxAmount,Tax,ISMixedPay) select '?tGetNoticeNo?','?ti?','?tGrpContNo?',t2.grppolno,t1.contno,t1.polno,'?text2?',t1.dutycode,t3.payplancode,'?tOtherNoType?',t2.riskcode,'?tAppntNo?',null,t4.PersonBurden ," + + " cast(?tNumPayIntv? as integer),'?payDate?','?text0?','?tManageCom?','?tComCode?','?mOperator?',to_date('?mCurrentDate?','YYYY-MM-DD'),'?mCurrentTime?','?mOperator?',to_date('?mCurrentDate?','YYYY-MM-DD'),'?mCurrentTime?' , t2.currency, " + + " func_cal_vttovat(t4.PersonBurden ,'?tOtherNoType?',t2.riskcode,'?tManageCom?',t2.currency,'?text1?','?text1?')," + + " func_cal_vttovat(t4.PersonBurden ,'?tOtherNoType?',t2.riskcode,'?tManageCom?',t2.currency,'?text2?','?text1?')," + + " func_cal_vttovat(t4.PersonBurden ,'?tOtherNoType?',t2.riskcode,'?tManageCom?',t2.currency,'?text3?','?text1?'),'?mISMixedPay?' " + " from lcduty t1,lcpol t2,lcprem t3,lccontplandetail t4 where t1.polno = t2.polno and t1.dutycode=t3.dutycode and t2.polstate<>'?tPolState?' and t1.polno=t3.polno and t1.contno=t3.contno and t4.PolicyNo =t2.GrpContNo and t4.SysPlanCode =t2.ContPlanCode and t4.DutyCode =t3.DutyCode " + - //去除赠险数据 " and (t4.FreeRisk is null or t4.FreeRisk =0) " + " and t2.contno ='?mContNo?'") SQLwithBindVariables insertLJSPayPersonByLCDuty_LCPol_LCPremAndPolStateNotGrpContNoAndMore4(@Param("text0") String text0, @@ -275,7 +282,7 @@ public interface LCGrpUWDealBLSQL { @SQL(value = "insert into ljspaycont (getnoticeno, paycount, grpcontno, contno, paytype, appntno, sumduepaymoney, payintv, paydate," + " enteraccdate, confdate, customername, idtype, idno, bankcode, bankaccno, accname, bankonthewayflag, banksuccflag," + " sendbankcount, state, sendrelano, managecom, comcode, operator, makedate, maketime, modifyoperator, modifydate,modifytime,NetAmount,TaxAmount,Tax)" + - " select t1.getnoticeno, t1.paycount, t1.grpcontno, t1.contno, t1.paytype, t1.appntno, sum(t1.sumduepaymoney), t1.payintv, t1.paydate,null,null,'','','','','','','?text0?','',null,'?tPayState?','',t1.managecom, t1.comcode," + + " select t1.getnoticeno, t1.paycount, t1.grpcontno, t1.contno, t1.paytype, t1.appntno, sum(t1.sumduepaymoney), t1.payintv, t1.paydate,null,null,null,null,null,null,null,null,'?text0?',null,null,'?tPayState?',null,t1.managecom, t1.comcode," + " t1.operator, t1.makedate, t1.maketime, t1.modifyoperator, t1.modifydate, t1.modifytime, (case when sum(t1.NetAmount) is null then 0 else sum(t1.NetAmount) end ), sum(t1.TaxAmount), max(t1.Tax) " + " from ljspayperson t1 where t1.grpcontno='?tGrpContNo?' group by t1.getnoticeno, t1.paycount, t1.grpcontno, t1.contno, t1.paytype, t1.appntno," + " t1.payintv, t1.paydate, t1.managecom, t1.comcode,t1.operator, t1.makedate, t1.maketime, t1.modifyoperator, t1.modifydate, t1.modifytime having sum(t1.sumduepaymoney)<>0") @@ -284,7 +291,7 @@ public interface LCGrpUWDealBLSQL { @Param("tGrpContNo") String tGrpContNo); @SQL(value = "insert into ljspaygrp (getnoticeno, paycount, grpcontno, grppolno, busstype, riskcode, appntno, endorsementno, sumduepaymoney, payintv, paydate, paytype, managecom, comcode, operator, makedate, maketime," + - " modifyoperator, modifydate, modifytime, Currency, NetAmount, TaxAmount, Tax) select t1.getnoticeno, t1.paycount, t1.grpcontno, t1.grppolno, t1.paytype, t1.riskcode, t1.appntno, '', sum(t1.sumduepaymoney) sumduepaymoney," + + " modifyoperator, modifydate, modifytime, Currency, NetAmount, TaxAmount, Tax) select t1.getnoticeno, t1.paycount, t1.grpcontno, t1.grppolno, t1.paytype, t1.riskcode, t1.appntno, null, sum(t1.sumduepaymoney) sumduepaymoney," + " t1.payintv, t1.paydate, '?tFlag?', t1.managecom, t1.comcode, t1.operator, t1.makedate, t1.maketime, t1.modifyoperator, t1.modifydate, t1.modifytime, t1.currency, sum(t1.NetAmount), sum(t1.TaxAmount), max(t1.Tax) " + " from ljspayperson t1 where t1.grpcontno='?tGrpContNo?' group by t1.getnoticeno, t1.paycount, t1.grpcontno, t1.grppolno, t1.paytype, t1.riskcode, t1.appntno, t1.endorsementno, " + " t1.payintv, t1.paydate, t1.managecom, t1.comcode,t1.operator, t1.makedate, t1.maketime, t1.modifyoperator, t1.modifydate, t1.modifytime,t1.currency ") @@ -297,8 +304,8 @@ public interface LCGrpUWDealBLSQL { " balancerelano, sendrelano, currency, managecom, comcode, operator, makedate, maketime, modifyoperator, modifydate, modifytime, NetAmount, TaxAmount, Tax,ISMixedPay)" + " select t1.getnoticeno, '?tGrpContNo?',t1.paycount,t1.paytype,(case t1.paycount when 1 then '?mGrpPropNo?' else '?tGrpContNo?' end), " + " t1.appntno, sum(t1.sumduepaymoney),'?text0?', '?tPayMode?','?tPayObj?', t1.payintv, t1.paydate,null,null," + - " '?tBankCode?', '?tBankAccNo?', '?tAccName?', '', '', '?tGuaranteeFlag?', '?tMasterCom?', '?text0?', '?text0?', '?text0?', '', (case paycount when 1 then 0 else -1 end), '?text0?','',''," + - " '', '?text01?', t1.managecom, t1.comcode, t1.operator, t1.makedate, t1.maketime, t1.modifyoperator, t1.modifydate, t1.modifytime, sum(t1.NetAmount), sum(t1.TaxAmount), max(t1.Tax),t1.ISMixedPay " + + " '?tBankCode?', '?tBankAccNo?', '?tAccName?', null, null, '?tGuaranteeFlag?', '?tMasterCom?', '?text0?', '?text0?', '?text0?', null, (case paycount when 1 then 0 else -1 end), '?text0?',null,null," + + " null, '?text01?', t1.managecom, t1.comcode, t1.operator, t1.makedate, t1.maketime, t1.modifyoperator, t1.modifydate, t1.modifytime, sum(t1.NetAmount), sum(t1.TaxAmount), max(t1.Tax),t1.ISMixedPay " + " from ljspayperson t1 where t1.grpcontno='?tGrpContNo?' group by t1.getnoticeno, t1.grpcontno, t1.paycount,t1.paytype, " + " t1.appntno, t1.payintv, t1.paydate, t1.managecom, t1.comcode,t1.operator, t1.makedate, t1.maketime, t1.modifyoperator, t1.modifydate, t1.modifytime, t1.ISMixedPay ") SQLwithBindVariables insertLJSPayByLJSPayPerson_GrpContNoGroupByGetNoTiceNoAndGrpContNoAndMore(@Param("tGrpContNo") String tGrpContNo, @@ -314,7 +321,7 @@ public interface LCGrpUWDealBLSQL { @Param("text01") String text01); @SQL(value = "insert into ljsget(getnoticeno, grpcontno, othernotype, otherno, getobj, getmode, PayMode,appntno, sumgetmoney, GetDate, guaranteeflag, insurancecom, bankonthewayflag, banksuccflag, sendbankcount, " + - " state, balanceontime, currency, managecom, comcode, operator, makedate, maketime, modifyoperator, modifydate, modifytime) select a.getnoticeno,a.grpcontno,a.othernotype,a.otherno,'?text1?','',''," + + " state, balanceontime, currency, managecom, comcode, operator, makedate, maketime, modifyoperator, modifydate, modifytime) select a.getnoticeno,a.grpcontno,a.othernotype,a.otherno,'?text1?',null,null," + " a.appntno,a.sumduepaymoney*b.premsharerate,a.paydate,'?text2?',b.coincomcode,a.bankonthewayflag,a.banksuccflag,a.sendbankcount,a.state,a.balanceontime,'?text3?'," + " a.managecom,a.comcode,a.operator,a.makedate,a.maketime,a.modifyoperator,a.modifydate,a.modifytime " + " from ljspay a,lccoinsurance b,lcproposaltocont c where a.grpcontno=c.grpcontno and b.grpcontno=c.otherno and b.masterslaveflag='?tMasterSlaveFlag?' and a.grpcontno='?tGrpContNo?'") @@ -349,13 +356,12 @@ public interface LCGrpUWDealBLSQL { String DonateContflagByPrtno(@Param("prtno") String prtno); @SQL(value = "insert into ljspayperson (getnoticeno, paycount, grpcontno, grppolno, contno, polno, payaimclass, dutycode,payplancode, paytype, riskcode, appntno, endorsementno, sumduepaymoney, payintv, paydate, getflag, managecom, comcode," + - " operator, makedate, maketime, modifyoperator, modifydate, modifytime,Currency,NetAmount,TaxAmount,Tax,ISMixedPay) select '?tGetNoticeNo?','?ti?','?tGrpContNo?',t2.grppolno,t1.contno,t1.polno,'?text2?',t1.dutycode,t3.payplancode,'?tOtherNoType?',t2.riskcode,'?tAppntNo?','',t3.prem ," + - " to_number('?tNumPayIntv?'),'?payDate?','?text0?','?tManageCom?','?tComCode?','?mOperator?',to_date('?mCurrentDate?','yyyy-MM-dd'),'?mCurrentTime?','?mOperator?',to_date('?mCurrentDate?','yyyy-MM-dd'),'?mCurrentTime?' , t2.currency, " + - " func_cal_vttovat((t3.prem),'?tOtherNoType?',t2.riskcode,'?tManageCom?',t2.currency,'?text1?','?text1?')," + - " func_cal_vttovat((t3.prem),'?tOtherNoType?',t2.riskcode,'?tManageCom?',t2.currency,'?text2?','?text1?')," + - " func_cal_vttovat((t3.prem),'?tOtherNoType?',t2.riskcode,'?tManageCom?',t2.currency,'?text3?','?text1?'),'?mISMixedPay?' " + + " operator, makedate, maketime, modifyoperator, modifydate, modifytime,Currency,NetAmount,TaxAmount,Tax,ISMixedPay) select '?tGetNoticeNo?','?ti?','?tGrpContNo?',t2.grppolno,t1.contno,t1.polno,'?text2?',t1.dutycode,t3.payplancode,'?tOtherNoType?',t2.riskcode,'?tAppntNo?',null,t4.PersonBurden ," + + " cast(?tNumPayIntv? as integer),'?payDate?','?text0?','?tManageCom?','?tComCode?','?mOperator?',to_date('?mCurrentDate?','YYYY-MM-DD'),'?mCurrentTime?','?mOperator?',to_date('?mCurrentDate?','YYYY-MM-DD'),'?mCurrentTime?' , t2.currency, " + + " func_cal_vttovat(t4.PersonBurden ,'?tOtherNoType?',t2.riskcode,'?tManageCom?',t2.currency,'?text1?','?text1?')," + + " func_cal_vttovat(t4.PersonBurden ,'?tOtherNoType?',t2.riskcode,'?tManageCom?',t2.currency,'?text2?','?text1?')," + + " func_cal_vttovat(t4.PersonBurden ,'?tOtherNoType?',t2.riskcode,'?tManageCom?',t2.currency,'?text3?','?text1?'),'?mISMixedPay?' " + " from lcduty t1,lcpol t2,lcprem t3,lccontplandetail t4 where t1.polno = t2.polno and t1.dutycode=t3.dutycode and t2.polstate<>'?tPolState?' and t1.polno=t3.polno and t1.contno=t3.contno and t4.PolicyNo =t2.GrpContNo and t4.SysPlanCode =t2.ContPlanCode and t4.DutyCode =t3.DutyCode " + - //去除赠险数据 " and (t4.FreeRisk is null or t4.FreeRisk =0) " + " and t2.contno ='?mContNo?'") SQLwithBindVariables insertLJSPayPersonByLCDuty_LCPol_LCPremAndPolStateNotGrpContNoAndMore5(@Param("text0") String text0, diff --git a/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_quot/LSQuotProcessSql.java b/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_quot/LSQuotProcessSql.java index 59bfdd48..71bae25e 100644 --- a/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_quot/LSQuotProcessSql.java +++ b/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_quot/LSQuotProcessSql.java @@ -64,36 +64,38 @@ public interface LSQuotProcessSql { @Param("para6") String para6, @Param("para7") String para7 ); //#销售费用审核(公共池) - @SQL(value = "select * from (SELECT (select managecom from lsquotation where quotno=a.MISSIONPROP1) as f,(SELECT name " + - "FROM ldcom t " + - "WHERE f = t.comcode) comname, a.missionid, a.submissionid, a.activityid, a.missionprop1, a.missionprop2, a.missionprop3,(SELECT t.codename " + - "FROM ldcode t " + - "WHERE t.codetype = 'quottype' " + - "AND t.code = a.missionprop3), a.missionprop6,(select l2.CodeName from ldcode l2 where l2.CodeType= 'salechannel' and l.SaleChannel = l2.Code),a.missionprop11 ,a.missionprop12 ,a.InDate,a.InTime,l.ISHEALTHY ,a.missionprop8 " + + @SQL(value = "select * from (SELECT (select managecom from lsquotation where quotno=a.MISSIONPROP1) as f," + + "(SELECT name FROM ldcom t WHERE t.comcode = (select managecom from lsquotation where quotno=a.MISSIONPROP1)) AS comname," + + " a.missionid, a.submissionid, a.activityid, a.missionprop1, a.missionprop2, a.missionprop3," + + "(SELECT t.codename FROM ldcode t WHERE t.codetype = 'quottype' AND t.code = a.missionprop3)," + + " a.missionprop6," + + "(select l2.CodeName from ldcode l2 where l2.CodeType= 'salechannel' and l.SaleChannel = l2.Code)," + + " a.missionprop11 ,a.missionprop12 ,a.InDate,a.InTime,l.ISHEALTHY ,a.missionprop8 " + "FROM lwmission a,lsquotationprocess b ,lsquotbasic l " + - "where " + - "b.quotno = a.missionprop1 " + - "AND b.quotbatno = a.missionprop2 " + - "and l.QuotNo = a.MissionProp1 " + - "AND a.processid = '0000008001' " + - "and a.ACTIVITYID ='0800100004' " + - "@{0} @{1} @{2} @{4} @{5} @{6} @{7} " + + "where " + + "b.quotno = a.missionprop1 " + + "AND b.quotbatno = a.missionprop2 " + + "and l.QuotNo = a.MissionProp1 " + + "AND a.processid = '0000008001' " + + "and a.ACTIVITYID ='0800100004' " + + "@{0} @{1} @{2} @{4} @{5} @{6} @{7} " + " union " + - " SELECT (select managecom from lsquotation where quotno=a.MISSIONPROP1) as f,(SELECT name "+ - "FROM ldcom t " + - "WHERE f = t.comcode) comname, a.missionid, a.submissionid, a.activityid, a.missionprop1, a.missionprop2, a.missionprop3,(SELECT t.codename " + - "FROM ldcode t " + - "WHERE t.codetype = 'quottype' " + - "AND t.code = a.missionprop3), a.missionprop6,(select l2.CodeName from ldcode l2 where l2.CodeType= 'salechannel' and l.SaleChannel = l2.Code),a.missionprop11 ,a.missionprop12,a.InDate,a.InTime,l.ISHEALTHY,missionprop8 " + - "FROM lwmission a,lsquotationprocess b ,lsprojquotbasic l " + - "where " + - "b.quotno = a.missionprop1 " + - "AND b.quotbatno = a.missionprop2 " + - "and l.QuotNo = a.MissionProp1 " + - "AND a.processid = '0000008001' " + - "and a.ACTIVITYID ='0800100004' " + - "@{0} @{1} @{2} @{4} @{5} @{6} @{7} )as rep " + - "ORDER BY rep.missionprop11 DESC,rep.missionprop12 desc" + " SELECT (select managecom from lsquotation where quotno=a.MISSIONPROP1) as f," + + "(SELECT name FROM ldcom t WHERE t.comcode = (select managecom from lsquotation where quotno=a.MISSIONPROP1)) AS comname," + + " a.missionid, a.submissionid, a.activityid, a.missionprop1, a.missionprop2, a.missionprop3," + + "(SELECT t.codename FROM ldcode t WHERE t.codetype = 'quottype' AND t.code = a.missionprop3)," + + " a.missionprop6," + + "(select l2.CodeName from ldcode l2 where l2.CodeType= 'salechannel' and l.SaleChannel = l2.Code)," + + " a.missionprop11 ,a.missionprop12,a.InDate,a.InTime,l.ISHEALTHY,a.missionprop8 " + + "FROM lwmission a,lsquotationprocess b ,lsprojquotbasic l " + + "where " + + "b.quotno = a.missionprop1 " + + "AND b.quotbatno = a.missionprop2 " + + "and l.QuotNo = a.MissionProp1 " + + "AND a.processid = '0000008001' " + + "and a.ACTIVITYID ='0800100004' " + + "@{0} @{1} @{2} @{4} @{5} @{6} @{7} )as rep " + + "ORDER BY rep.missionprop11 DESC,rep.missionprop12 desc" , clauses = { @Clause(key = 0, clause = "and a.missionprop6 like concat('%',concat('#{para0}','%'))", expression = "#{para0} != empty"), @Clause(key = 1, clause = "and a.missionprop1 = '#{para1}'", expression = "#{para1} != empty"), @@ -109,12 +111,16 @@ public interface LSQuotProcessSql { @Param("para6") String para6, @Param("para7") String para7 ); //审批终结 - @SQL(value = "select * from (SELECT (select managecom from lsquotation where quotno=a.MISSIONPROP1) as f,(SELECT name " + - "FROM ldcom t " + - "WHERE f = t.comcode) comname, a.missionid, a.submissionid, a.activityid, a.missionprop1, a.missionprop2, a.missionprop3,(SELECT t.codename " + - "FROM ldcode t " + + @SQL(value = "select * from (SELECT (select managecom from lsquotation where quotno=a.MISSIONPROP1) as f," + + "(SELECT name FROM ldcom t " + + "WHERE (select managecom from lsquotation where quotno=a.MISSIONPROP1) = t.comcode) comname, " + + "a.missionid, a.submissionid, a.activityid, a.missionprop1, a.missionprop2, a.missionprop3," + + "(SELECT t.codename FROM ldcode t " + "WHERE t.codetype = 'quottype' " + - "AND t.code = a.missionprop3), a.missionprop6,(select l2.CodeName from ldcode l2 where l2.CodeType= 'salechannel' and l.SaleChannel = l2.Code),a.missionprop11 ,a.missionprop12,a.InDate,a.InTime ,l.ISHEALTHY ,a.missionprop8 " + + "AND t.code = a.missionprop3), " + + "a.missionprop6," + + "(select l2.CodeName from ldcode l2 where l2.CodeType= 'salechannel' and l.SaleChannel = l2.Code)," + + "a.missionprop11 ,a.missionprop12,a.InDate,a.InTime ,l.ISHEALTHY ,a.missionprop8 " + "FROM lwmission a,lsquotationprocess b ,lsquotbasic l " + "where " + "b.quotno = a.missionprop1 " + @@ -124,12 +130,17 @@ public interface LSQuotProcessSql { "and a.ACTIVITYID ='0800100005' " + "@{0} @{1} @{2} @{4} @{5} @{6} @{7} " + " union " + - " SELECT (select managecom from lsquotation where quotno=a.MISSIONPROP1) as f,(SELECT name "+ - "FROM ldcom t " + - "WHERE f = t.comcode) comname, a.missionid, a.submissionid, a.activityid, a.missionprop1, a.missionprop2, a.missionprop3,(SELECT t.codename " + + " SELECT (select managecom from lsquotation where quotno=a.MISSIONPROP1) as f," + + "(SELECT name FROM ldcom t " + + "WHERE (select managecom from lsquotation where quotno=a.MISSIONPROP1) = t.comcode) comname, " + + "a.missionid, a.submissionid, a.activityid, a.missionprop1, a.missionprop2, a.missionprop3," + + "(SELECT t.codename " + "FROM ldcode t " + "WHERE t.codetype = 'quottype' " + - "AND t.code = a.missionprop3), a.missionprop6,(select l2.CodeName from ldcode l2 where l2.CodeType= 'salechannel' and l.SaleChannel = l2.Code),a.missionprop11 ,a.missionprop12,a.InDate,a.InTime,l.ISHEALTHY,missionprop8 " + + "AND t.code = a.missionprop3), " + + "a.missionprop6," + + "(select l2.CodeName from ldcode l2 where l2.CodeType= 'salechannel' and l.SaleChannel = l2.Code)," + + "a.missionprop11 ,a.missionprop12,a.InDate,a.InTime,l.ISHEALTHY,a.missionprop8 " + "FROM lwmission a,lsquotationprocess b ,lsprojquotbasic l " + "where " + "b.quotno = a.missionprop1 " + @@ -199,37 +210,35 @@ public interface LSQuotProcessSql { //#总公司核保 - @SQL(value = "select * from (SELECT (select managecom from lsquotation where quotno=a.MISSIONPROP1) as f,(SELECT name " + - "FROM ldcom t " + - "WHERE f = t.comcode) comname, a.missionid, a.submissionid, a.activityid, a.missionprop1, a.missionprop2, a.missionprop3,(SELECT t.codename " + - "FROM ldcode t " + - "WHERE t.codetype = 'quottype' " + - "AND t.code = a.missionprop3), a.missionprop6,(select l2.CodeName from ldcode l2 where l2.CodeType= 'salechannel' and l.SaleChannel = l2.Code),a.missionprop11 ,a.missionprop12 ,a.InDate ," + - "a.InTime ,l.ISHEALTHY ,a.missionprop8,b.ISOVERUWRATEAUDITAUTHREASON " + + @SQL(value = "select * from (SELECT (select managecom from lsquotation where quotno=a.MISSIONPROP1) as f," + + "(SELECT name FROM ldcom t WHERE t.comcode = (SELECT managecom FROM lsquotation WHERE quotno = a.MISSIONPROP1)) AS comname," + + " a.missionid, a.submissionid, a.activityid, a.missionprop1, a.missionprop2, a.missionprop3," + + "(SELECT t.codename FROM ldcode t WHERE t.codetype = 'quottype' AND t.code = a.missionprop3), a.missionprop6," + + "(select l2.CodeName from ldcode l2 where l2.CodeType= 'salechannel' and l.SaleChannel = l2.Code),a.missionprop11 ,a.missionprop12 ,a.InDate ," + + "a.InTime ,l.ISHEALTHY ,a.missionprop8,b.ISOVERUWRATEAUDITAUTHREASON " + "FROM lwmission a,lsquotationprocess b ,lsquotbasic l " + - "where " + - "b.quotno = a.missionprop1 " + - "AND b.quotbatno = a.missionprop2 " + - "and l.QuotNo = a.MissionProp1 " + - "AND a.processid = '0000008001' " + - "and a.ACTIVITYID ='0800100003' " + - "@{0} @{1} @{2} @{4} @{5} @{6} @{7} " + + "where " + + "b.quotno = a.missionprop1 " + + "AND b.quotbatno = a.missionprop2 " + + "and l.QuotNo = a.MissionProp1 " + + "AND a.processid = '0000008001' " + + "and a.ACTIVITYID ='0800100003' " + + "@{0} @{1} @{2} @{4} @{5} @{6} @{7} " + " union " + - " SELECT (select managecom from lsquotation where quotno=a.MISSIONPROP1) as f,(SELECT name "+ - "FROM ldcom t " + - "WHERE f = t.comcode) comname, a.missionid, a.submissionid, a.activityid, a.missionprop1, a.missionprop2, a.missionprop3,(SELECT t.codename " + - "FROM ldcode t " + - "WHERE t.codetype = 'quottype' " + - "AND t.code = a.missionprop3), a.missionprop6,(select l2.CodeName from ldcode l2 where l2.CodeType= 'salechannel' and l.SaleChannel = l2.Code),a.missionprop11 ,a.missionprop12,a.InDate,a.InTime,l.ISHEALTHY,missionprop8,b.ISOVERUWRATEAUDITAUTHREASON " + - "FROM lwmission a,lsquotationprocess b ,lsprojquotbasic l " + - "where " + - "b.quotno = a.missionprop1 " + - "AND b.quotbatno = a.missionprop2 " + - "and l.QuotNo = a.MissionProp1 " + - "AND a.processid = '0000008001' " + - "and a.ACTIVITYID ='0800100003' " + - "@{0} @{1} @{2} @{4} @{5} @{6} @{7} )as rep " + - "ORDER BY rep.missionprop11 DESC,rep.missionprop12 desc" + " SELECT (select managecom from lsquotation where quotno=a.MISSIONPROP1) as f," + + "(SELECT name FROM ldcom t WHERE t.comcode = (SELECT managecom FROM lsquotation WHERE quotno = a.MISSIONPROP1)) AS comname," + + " a.missionid, a.submissionid, a.activityid, a.missionprop1, a.missionprop2, a.missionprop3," + + "(SELECT t.codename FROM ldcode t WHERE t.codetype = 'quottype' AND t.code = a.missionprop3), a.missionprop6," + + "(select l2.CodeName from ldcode l2 where l2.CodeType= 'salechannel' and l.SaleChannel = l2.Code),a.missionprop11 ,a.missionprop12,a.InDate,a.InTime,l.ISHEALTHY,a.missionprop8,b.ISOVERUWRATEAUDITAUTHREASON " + + "FROM lwmission a,lsquotationprocess b ,lsprojquotbasic l " + + "where " + + "b.quotno = a.missionprop1 " + + "AND b.quotbatno = a.missionprop2 " + + "and l.QuotNo = a.MissionProp1 " + + "AND a.processid = '0000008001' " + + "and a.ACTIVITYID ='0800100003' " + + "@{0} @{1} @{2} @{4} @{5} @{6} @{7} )as rep " + + "ORDER BY rep.missionprop11 DESC,rep.missionprop12 desc" , clauses = { @Clause(key = 0, clause = "and a.missionprop6 like concat('%',concat('#{para0}','%'))", expression = "#{para0} != empty"), @Clause(key = 1, clause = "and a.missionprop1 = '#{para1}'", expression = "#{para1} != empty"), diff --git a/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/sql/g_quot/LSQuotCheckBLSQL.java b/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/sql/g_quot/LSQuotCheckBLSQL.java index c1d13f28..6838ff75 100644 --- a/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/sql/g_quot/LSQuotCheckBLSQL.java +++ b/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/sql/g_quot/LSQuotCheckBLSQL.java @@ -24,7 +24,7 @@ public interface LSQuotCheckBLSQL { String existsGrpContByGrpContNoAndCurrentDate(@Param("mGrpContNo")String mGrpContNo,@Param("mCurrentDate")String mCurrentDate); - @SQL("select 1 from lmriskapp a where riskcode = '?RiskCode?' and a.StartDate<= str_to_date('?CurrentDate?', '%Y-%m-%d') and ( a.EndDate > str_to_date('?CurrentDate?', '%Y-%m-%d') or a.EndDate is null)") + @SQL("select 1 from lmriskapp a where riskcode = '?RiskCode?' and a.StartDate<= TO_DATE('?CurrentDate?', 'YYYY-MM-DD') and ( a.EndDate > TO_DATE('?CurrentDate?', 'YYYY-MM-DD') or a.EndDate is null)") String existsRiskByRiskCodeAndStartDateAndEndDate(@Param("RiskCode")String RiskCode,@Param("CurrentDate") String CurrentDate); @SQL("select 1 from lmriskduty a where a.RiskCode='?RiskCode?' and a.DutyCode='?DutyCode?'") diff --git a/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotProjSubmitInput.js b/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotProjSubmitInput.js index 50148c90..1a9890b6 100644 --- a/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotProjSubmitInput.js +++ b/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotProjSubmitInput.js @@ -265,7 +265,7 @@ function submitForm(obj) { var iLeft = (window.screen.availWidth - iWidth) / 2; //获得窗口的水平位置 showInfo = window.open (urlStr,name, "status=no,toolbar=no,menubar=no,location=no,resizable=no,scrollbars=0,titlebar=no,height="+ iHeight+",width="+iWidth+",innerHeight="+iHeight+",innerWidth=" +iWidth+",left="+iLeft+",top="+iTop,false); - showInfo.focus(); + // showInfo.focus(); // obj.submit(); ajaxSubmit2(obj); diff --git a/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotProjUWSaleProInput.js b/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotProjUWSaleProInput.js index bf527496..3a1f2792 100644 --- a/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotProjUWSaleProInput.js +++ b/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotProjUWSaleProInput.js @@ -1156,7 +1156,7 @@ function submitForm(obj, dynamic) { var iLeft = (window.screen.availWidth - iWidth) / 2; //获得窗口的水平位置 showInfo = window.open (urlStr,name, "status=no,toolbar=no,menubar=no,location=no,resizable=no,scrollbars=0,titlebar=no,height="+ iHeight+",width="+iWidth+",innerHeight="+iHeight+",innerWidth=" +iWidth+",left="+iLeft+",top="+iTop,false); - showInfo.focus(); + // showInfo.focus(); if(dynamic != null && dynamic === true){ ajaxSubmit(obj);