diff --git a/lis-component-dictionary-bl/src/main/java/com/sinosoft/lis/sql/codequery/CodeQuery_Framework.java b/lis-component-dictionary-bl/src/main/java/com/sinosoft/lis/sql/codequery/CodeQuery_Framework.java index fa3c1ec0..7a1001fe 100644 --- a/lis-component-dictionary-bl/src/main/java/com/sinosoft/lis/sql/codequery/CodeQuery_Framework.java +++ b/lis-component-dictionary-bl/src/main/java/com/sinosoft/lis/sql/codequery/CodeQuery_Framework.java @@ -1225,7 +1225,7 @@ public interface CodeQuery_Framework { SSRS headbank(@Param(value = "HeadBankName", percentPrefix = true, percentSuffix = true) String HeadBankName, @Param(value = "ManageCom", percentSuffix = true) String ManageCom); - @SQL(cache = false,page = false, value = "select distinct bankcode,bankname from ldbankcom where bankcode not in (select trim(code) from ldcode where codetype='pkbank' and codealias='0') and bankcode not in (select trim(code) from ldcode where codetype='pkbank' and codealias='S') and bankcode not like '%-%' and state = '0' @{0} @{1} order by length(bankcode),bankcode", clauses = { + @SQL(cache = false,page = false, value = "select distinct bankcode,bankname from ldbankcom where bankcode not in (select trim(code) from ldcode where codetype='pkbank' and codealias='0') and bankcode not in (select trim(code) from ldcode where codetype='pkbank' and codealias='S') and bankcode not like '%-%' and state = '0' @{0} @{1} order by bankcode", clauses = { @Clause(key = 0, clause = " and (case when length(#{ManageCom}) >=6 then managecom =substr(#{ManageCom},1,6) or managecom =substr(#{ManageCom},1,4) or managecom =substr(#{ManageCom},1,2) when length(#{ManageCom}) = 4 then managecom =#{ManageCom} or managecom =substr(#{ManageCom},1,2) else managecom =substr(#{ManageCom},1,2) end )", expression = "#{ManageCom} != empty"), @Clause(key = 1, clause = " and bankname like #{BankCodeName} ", expression = "#{BankCodeName} != empty")}) SSRS ldbankcom(@Param(value = "ManageCom") String ManageCom,@Param(value = "BankCodeName", percentSuffix = true, percentPrefix = true) String BankCodeName); diff --git a/lis-framework-common/src/main/resources/logback.xml b/lis-framework-common/src/main/resources/logback.xml index e576e267..65dd2bf7 100644 --- a/lis-framework-common/src/main/resources/logback.xml +++ b/lis-framework-common/src/main/resources/logback.xml @@ -2,7 +2,7 @@ lis7 - + diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCContPlanTradInput.jsp b/lis-module-grp-nb-web/src/main/webapp/g_app/LCContPlanTradInput.jsp index a1c4b15f..de31dad8 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCContPlanTradInput.jsp +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCContPlanTradInput.jsp @@ -321,22 +321,22 @@ 各类职业占比 (各职业占比之和应为100%) * - - 一类(%) - - 二类(%) - - 三类(%) - - - - 四类(%) - - 五类(%) - - 六类(%) - - +<%-- --%> +<%-- 一类(%)--%> +<%-- --%> +<%-- 二类(%)--%> +<%-- --%> +<%-- 三类(%)--%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- 四类(%)--%> +<%-- --%> +<%-- 五类(%)--%> +<%-- --%> +<%-- 六类(%)--%> +<%-- --%> +<%-- --%> 人数 @@ -349,10 +349,10 @@ onkeyup="return showCodeListKey('premmode', [this,PremModeName], [0,1], null, null, null, '1', null);" readonly> 男女比例 - ( 2:3) diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompContPolInput.js b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompContPolInput.js index 5c35ad27..c5942e8c 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompContPolInput.js +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompContPolInput.js @@ -1312,10 +1312,10 @@ function saveClick(){ // tBFFlag = "0"; // } - if(relationbtn == 0) { + /*if(relationbtn == 0) { alert("请进行关联方模糊认定查询后,再进行下一步"); return false; - } + }*/ if(!checkPeriod()){ return false; } @@ -4141,7 +4141,7 @@ function InsureListProtect(){ /** * 关联方模糊认定结果 */ -var relationbtn=0; +var relationbtn=1; function relationresult() { relationbtn+=1; var numFlag = 0; diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.js b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.js index e3090378..f71da52b 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.js +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.js @@ -1383,10 +1383,10 @@ function saveClick(){ // tBFFlag = "0"; // } - if(relationbtn == 0) { - alert("请进行关联方模糊认定查询后,再进行下一步"); - return false; - } + // if(relationbtn == 0) { + // alert("请进行关联方模糊认定查询后,再进行下一步"); + // return false; + // } if(!checkPeriod()){ return false; } diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js index 7ecf072a..9132c012 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js @@ -1403,10 +1403,10 @@ function saveClick(){ // tBFFlag = "0"; // } - if(relationbtn == 0) { - alert("请进行关联方模糊认定查询后,再进行下一步"); - return false; - } + // if(relationbtn == 0) { + // alert("请进行关联方模糊认定查询后,再进行下一步"); + // return false; + // } if(!checkPeriod()){ return false; } @@ -4489,7 +4489,7 @@ function InsureListProtect(){ /** * 关联方模糊认定结果 */ -var relationbtn=0; +var relationbtn= 1 ; function relationresult() { relationbtn+=1; var numFlag = 0; diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp index 022904e8..92881f14 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp @@ -126,18 +126,19 @@ 业务分类 - + - ABC业务分类细分 - +<%-- ABC业务分类细分--%> +<%-- --%> + - 电E金服标识 - +<%-- 电E金服标识--%> + 是否为关联交易 - +<%-- --%> @@ -151,8 +152,8 @@ - 强制校验职业占比 - +<%-- 强制校验职业占比--%> + 强制检验投保人数 是否为统括单 @@ -173,8 +174,8 @@ 保费分摊方式 - 政保合作业务标志 - +<%-- 政保合作业务标志--%> + @@ -437,10 +438,10 @@ 保险经办人为唯一合法授权人 - 是否省管产业单位 - - 是否为绿色标识 - +<%-- 是否省管产业单位--%> + +<%-- 是否为绿色标识--%> + 中小微企业标识 @@ -452,17 +453,17 @@ 供应链金融业务-保险产品(短险)标识 - - 产业链上下游企业标识 - - 电网主业人身保险业务标识 - + +<%-- 产业链上下游企业标识--%> + +<%-- 电网主业人身保险业务标识--%> + - 能源行业人身保险业务标识 - - 是否农电工业务 - +<%-- 能源行业人身保险业务标识--%> + +<%-- 是否农电工业务--%> + @@ -702,8 +703,8 @@ - - +<%-- --%> +<%-- --%>
diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpUWInput.jsp b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpUWInput.jsp index 40911bee..d1bab26c 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpUWInput.jsp +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpUWInput.jsp @@ -96,8 +96,8 @@ - - +<%-- --%> +<%-- --%> diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCPropPrintInput.jsp b/lis-module-grp-nb-web/src/main/webapp/g_app/LCPropPrintInput.jsp index 01a78dee..3bc1e71b 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCPropPrintInput.jsp +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCPropPrintInput.jsp @@ -69,7 +69,7 @@ - +<%-- --%>