From bea44db0383b4096c06eec4b065ab91b3be1a71e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=91=E4=B8=8E=E6=98=A5=E9=A3=8E=E7=9A=86=E8=BF=87?= =?UTF-8?q?=E5=AE=A2=E4=B8=B6?= Date: Sat, 6 Jun 2026 16:38:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E5=BF=83=E5=AF=B9=E6=8E=A5=E8=AF=A2?= =?UTF-8?q?=E4=BB=B7=E7=B3=BB=E7=BB=9F=E6=95=B0=E6=8D=AE=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=BB=A3=E7=A0=817=20=E7=94=9F=E6=88=90=E6=8A=95=E4=BF=9D?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/g_app/LCPropPrintController.java | 4 ++-- .../lis/sql/easyquery/g_app/LCPropPrintSql.java | 5 +++-- .../src/main/webapp/g_app/LCPropPrintInput.js | 8 +++++--- .../src/main/webapp/g_app/LCPropPrintInput.jsp | 16 ++++++++-------- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCPropPrintController.java b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCPropPrintController.java index cf744cd2..4200a78d 100644 --- a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCPropPrintController.java +++ b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCPropPrintController.java @@ -127,8 +127,8 @@ public class LCPropPrintController { } else { HashMap para = sqlInfo.getPara(); String para1 = para.get("para1"); -// String para0 = para.get("para5"); - String para0 = "1"; + String para0 = para.get("para5"); +// String para0 = "1"; TransferData tTransferData = new TransferData(); String Operate = "INSERT"; tTransferData.setNameAndValue("AskNo", para1); diff --git a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCPropPrintSql.java b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCPropPrintSql.java index 54f14c7d..b73a4a2e 100644 --- a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCPropPrintSql.java +++ b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCPropPrintSql.java @@ -31,7 +31,7 @@ public interface LCPropPrintSql { " (a.ISHEALTHY = '0' and EXISTS ( select 1 from lduser where OrganPopedom='1' @{5} )) " + " or (a.ISHEALTHY = '1' and EXISTS ( select 1 from lduser where HealthyPopedom ='1' @{5} ))" + " ) " + - "@{0} @{1} @{2} @{3} order by a.quotno, a.quotbatno) " + + "@{0} @{1} @{2} @{3} @{7} order by a.quotno, a.quotbatno) " + "union (select a.quotNo,a.quotbatno," + "b.quottype, '套餐询价',a.ProjName ,c.ExamDate from lsprojquotbasic a,lsquotation b ,LSQuotationProcess c where a.quotno = b.quotno and " + "quotstate = '02' and a.QuotNo = c.QuotNo and (" + @@ -51,11 +51,12 @@ public interface LCPropPrintSql { @Clause(key = 0, clause = "and a.grpname like concat('%',concat('#{para0}','%'))", expression = "#{para0} != empty"), @Clause(key = 4, clause = "and a.Projname like concat('%',concat('#{para0}','%'))", expression = "#{para0} != empty"), @Clause(key = 1, clause = "and a.quotno = '#{para1}'", expression = "#{para1} != empty"), + @Clause(key = 7, clause = "and a.quotbatno = '#{para5}'", expression = "#{para5} != empty"), @Clause(key = 2, clause = "and b.quottype = '#{para2}'", expression = "#{para2} != empty"), @Clause(key = 3, clause = "and a.managecom like concat('#{para3}','%')", expression = "#{para3} != empty"), @Clause(key = 5, clause = "and usercode = '#{para4}'", expression = "#{para4} != empty"), @Clause(key = 6, clause = "and projcom.managecom = '#{para3}'", expression = "#{para3} != empty")}) - SSRS LCPropPrintSql2(@Param("para0") String para0, @Param("para1") String para1, @Param("para2") String para2,@Param("para3") String para3,@Param("para4") String para4); + SSRS LCPropPrintSql2(@Param("para0") String para0, @Param("para1") String para1, @Param("para2") String para2,@Param("para3") String para3,@Param("para4") String para4, @Param("para5") String para5); @SQL(value = "select a.ContPlanCode,a.plancode,a.ContPlanName ,CONCAT(a.INSUPERIOD,(case a.INSUPERIODFLAG when 'D' then '天' when 'M' then '月' ELSE '年' end)) ,Peoples3," + "(select codename from ldcode where codetype='premmode' and CODE=a.premmode) " + diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCPropPrintInput.js b/lis-module-grp-nb-web/src/main/webapp/g_app/LCPropPrintInput.js index 44b7864b..c04086e0 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCPropPrintInput.js +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCPropPrintInput.js @@ -24,12 +24,14 @@ function queryClick() { tSQLInfo.setModule("grp_nb"); tSQLInfo.setResourceName("g_app.LCPropPrintSql"); tSQLInfo.setSqlId("LCPropPrintSql2"); - tSQLInfo.addSubPara(fm.GrpName.value); + // tSQLInfo.addSubPara(fm.GrpName.value); + tSQLInfo.addSubPara(""); tSQLInfo.addSubPara(fm.QuotNo.value); - tSQLInfo.addSubPara(fm.QuotType.value); + // tSQLInfo.addSubPara(fm.QuotType.value); + tSQLInfo.addSubPara(""); tSQLInfo.addSubPara(tManageCom); tSQLInfo.addSubPara(tOperator); - // tSQLInfo.addSubPara(fm.QuotbatNo.value); + tSQLInfo.addSubPara(fm.QuotbatNo.value); turnPage1.queryModal(tSQLInfo.getString(), QuotInfoGrid, 1); } 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 4c0d4db0..01a78dee 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 @@ -48,19 +48,19 @@
- - +<%-- --%> +<%-- --%> - - -<%-- --%> -<%-- --%> - - +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%>
投保单位名称/套餐名称投保单位名称/套餐名称询价号 询价类型批次号
询价类型批次号
批次号