From 1a2b3c19bfb62ba98b6a5b16e7d6923906e64ced Mon Sep 17 00:00:00 2001 From: tangw Date: Wed, 9 Sep 2026 11:09:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=AD=97=E5=85=B8=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/entity/lis/ComStatsParameter.java | 2 +- .../service/impl/stats/StatsServiceImpl.java | 16 +++++++++++----- .../resources/mapper/ComStatsParameterMapper.xml | 14 ++++++++++---- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComStatsParameter.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComStatsParameter.java index a193cf8..945cf30 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComStatsParameter.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComStatsParameter.java @@ -29,5 +29,5 @@ public class ComStatsParameter { private Date updateTime; private String remark; private Long paramWidth; - + private String paramZct; } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/stats/StatsServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/stats/StatsServiceImpl.java index d67f1ed..c9efd9b 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/stats/StatsServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/stats/StatsServiceImpl.java @@ -46,7 +46,7 @@ public class StatsServiceImpl implements StatsService { if(list==null||list.size()==0)return new Result("-1","未找到该模板参数"); List columnlist=list.stream().filter(ss->"1".equals(ss.getParamType())||"6".equals(ss.getParamType())).collect(Collectors.toList()); List summarylist=list.stream().filter(ss->"3".equals(ss.getParamType())).collect(Collectors.toList()); - List parameter=list.stream().filter(ss->"0".equals(ss.getParamType())).collect(Collectors.toList()); + List parameter=list.stream().filter(ss->"0".equals(ss.getParamType())||"5".equals(ss.getParamType())).collect(Collectors.toList()); List subquery=list.stream().filter(ss->"4".equals(ss.getParamType())).collect(Collectors.toList()); if(parameter!=null&¶meter.size()>0){ for(ComStatsParameter p:parameter){ @@ -102,18 +102,24 @@ public class StatsServiceImpl implements StatsService { String where=""; for(ComStatsParameter parameter :parameterlist){ String value=parameter.getParamDefvalue(); - if(value==null)continue; - if("".equals(value.trim()))continue; + String type=parameter.getParamType(); + if(!"5".equals(type)){ + if (value == null) continue; + if ("".equals(value.trim())) continue; + } + String sql=parameter.getParamSql(); + if (sql == null) continue; + if ("".equals(sql.trim())) continue; String precondition=parameter.getPrecondition(); if(precondition!=null&&!"".equals(precondition)) { Result result = checkprecondition(precondition, parameterlist); if (!"0".equals(result.getCode())) return result; boolean flag = (boolean) result.getData(); if (flag) { - where = where + " " + parameter.getParamSql(); + where = where + " " + sql; } }else{ - where = where + " " + parameter.getParamSql(); + where = where + " " + sql; } } String columns=""; diff --git a/liswork/src/main/resources/mapper/ComStatsParameterMapper.xml b/liswork/src/main/resources/mapper/ComStatsParameterMapper.xml index 1f382d5..41837d5 100644 --- a/liswork/src/main/resources/mapper/ComStatsParameterMapper.xml +++ b/liswork/src/main/resources/mapper/ComStatsParameterMapper.xml @@ -22,10 +22,12 @@ + + select param_id,param_type,param_code,param_name,param_optiontype,param_sql,param_hide,param_sort,stats_code,param_defvalue,param_sequence, - status,create_by,create_time,update_by,update_time,remark,precondition,param_width from Com_stats_parameter + status,create_by,create_time,update_by,update_time,remark,precondition,param_width,param_zct from Com_stats_parameter select top 1 param_id,param_type,param_code,param_name,param_optiontype,param_sql,param_sort,param_hide,stats_code,param_defvalue,param_sequence, - status,create_by,create_time,update_by,update_time,remark,precondition,param_width + status,create_by,create_time,update_by,update_time,remark,precondition,param_width,param_zct from Com_stats_parameter where param_name=#{paramName} and param_type = #{paramType} and stats_code = #{statsCode} @@ -80,7 +82,7 @@ @@ -102,6 +104,8 @@ remark, create_by, param_width, + param_zct, + create_time )values( #{paramId}, @@ -120,6 +124,7 @@ #{remark}, #{createBy}, #{paramWidth}, + #{paramZct}, getdate() ) @@ -142,7 +147,7 @@ param_optiontype = #{paramOptiontype},param_defvalue= #{paramDefvalue}, param_sequence= #{paramSequence},precondition=#{precondition}, param_sql = #{paramSql},param_hide = #{paramHide}, - param_sort = #{paramSort},status = #{status},param_width = #{paramWidth}, + param_sort = #{paramSort},status = #{status},param_width = #{paramWidth},param_zct = #{paramZct}, remark = #{remark},update_by = #{updateBy},update_time = getdate() where param_id = #{paramId} @@ -163,6 +168,7 @@ remark = #{remark}, update_by = #{updateBy}, param_width = #{paramWidth}, + param_zct = #{paramZct}, update_time = getdate() where param_id = #{paramId}