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 71902f8..a193cf8 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 @@ -28,6 +28,6 @@ public class ComStatsParameter { private String updateBy; private Date updateTime; private String remark; - + private Long paramWidth; } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/LocalconfigMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/LocalconfigMapper.java index 36533c4..0945392 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/LocalconfigMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/LocalconfigMapper.java @@ -18,4 +18,6 @@ public interface LocalconfigMapper { int delComLocalconfigByIds(Long[] sids); int updateComLocalconfig(ComLocalconfig comLocalconfig); List> selectinstrgroupmain(); + List> selectxmfee(); + List> selectzt(); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComLocalconfigServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComLocalconfigServiceImpl.java index e0c50d9..fdf2ff2 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComLocalconfigServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComLocalconfigServiceImpl.java @@ -191,6 +191,12 @@ public class ComLocalconfigServiceImpl implements ComLocalconfigService { return getfzdh(); case "USR": return getusr(); + case "sqxm": + case "SQXM": + return getsqxm(); + case "zt": + case "ZT": + return getzt(); default: if (zdlb.contains("item:")) { String yq=zdlb.trim().substring(5); @@ -203,6 +209,28 @@ public class ComLocalconfigServiceImpl implements ComLocalconfigService { } return commonUtil.getComDictList(zdlb); } + public List> getsqxm() { + List> list = new ArrayList<>(); + List> xmInfolist = localconfigMapper.selectxmfee(); + for (Map xmInfo : xmInfolist) { + Map map = new HashMap<>(); + map.put("zddh", xmInfo.get("sfxmdh").toString()); + map.put("zdmc", xmInfo.get("sfxmmc").toString()); + list.add(map); + } + return list; + } + public List> getzt() { + List> list = new ArrayList<>(); + List> xmInfolist = localconfigMapper.selectzt(); + for (Map xmInfo : xmInfolist) { + Map map = new HashMap<>(); + map.put("zddh", xmInfo.get("dict_value").toString()); + map.put("zdmc", xmInfo.get("dict_label").toString()); + list.add(map); + } + return list; + } public List> getusr() { List> list = new ArrayList<>(); List usrlist = commonUtil.getComUsrList(""); diff --git a/liswork/src/main/resources/mapper/ComLocalconfigMapper.xml b/liswork/src/main/resources/mapper/ComLocalconfigMapper.xml index 6d273d9..3c761fb 100644 --- a/liswork/src/main/resources/mapper/ComLocalconfigMapper.xml +++ b/liswork/src/main/resources/mapper/ComLocalconfigMapper.xml @@ -36,6 +36,12 @@ + + insert into com_localconfig( sid, diff --git a/liswork/src/main/resources/mapper/ComStatsParameterMapper.xml b/liswork/src/main/resources/mapper/ComStatsParameterMapper.xml index 2c385d8..1f382d5 100644 --- a/liswork/src/main/resources/mapper/ComStatsParameterMapper.xml +++ b/liswork/src/main/resources/mapper/ComStatsParameterMapper.xml @@ -21,10 +21,11 @@ + 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 from Com_stats_parameter + status,create_by,create_time,update_by,update_time,remark,precondition,param_width 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 + status,create_by,create_time,update_by,update_time,remark,precondition,param_width from Com_stats_parameter where param_name=#{paramName} and param_type = #{paramType} and stats_code = #{statsCode} @@ -79,7 +80,7 @@ @@ -100,6 +101,7 @@ status, remark, create_by, + param_width, create_time )values( #{paramId}, @@ -117,6 +119,7 @@ #{status}, #{remark}, #{createBy}, + #{paramWidth}, getdate() ) @@ -139,7 +142,7 @@ param_optiontype = #{paramOptiontype},param_defvalue= #{paramDefvalue}, param_sequence= #{paramSequence},precondition=#{precondition}, param_sql = #{paramSql},param_hide = #{paramHide}, - param_sort = #{paramSort},status = #{status}, + param_sort = #{paramSort},status = #{status},param_width = #{paramWidth}, remark = #{remark},update_by = #{updateBy},update_time = getdate() where param_id = #{paramId} @@ -159,6 +162,7 @@ status = #{status}, remark = #{remark}, update_by = #{updateBy}, + param_width = #{paramWidth}, update_time = getdate() where param_id = #{paramId}