统计字典调整

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;
 }

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<ComStatsParameter> columnlist=list.stream().filter(ss->"1".equals(ss.getParamType())||"6".equals(ss.getParamType())).collect(Collectors.toList());
         List<ComStatsParameter> summarylist=list.stream().filter(ss->"3".equals(ss.getParamType())).collect(Collectors.toList());
-        List<ComStatsParameter> parameter=list.stream().filter(ss->"0".equals(ss.getParamType())).collect(Collectors.toList());
+        List<ComStatsParameter> parameter=list.stream().filter(ss->"0".equals(ss.getParamType())||"5".equals(ss.getParamType())).collect(Collectors.toList());
         List<ComStatsParameter> subquery=list.stream().filter(ss->"4".equals(ss.getParamType())).collect(Collectors.toList());
         if(parameter!=null&&parameter.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;
+            String type=parameter.getParamType();
-            if("".equals(value.trim()))continue;
+            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="";

liswork/src/main/resources/mapper/ComStatsParameterMapper.xml

@@ -22,10 +22,12 @@
         <result property="updateTime"    column="update_time"   />
         <result property="remark"        column="remark"        />
         <result property="paramWidth"        column="param_width"        />
+        <result property="paramZct"        column="param_zct"        />
+
     </resultMap>
     <sql id="selectComStatsParameterVo">
         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
     </sql>
     <select id="selectComStatsParameterList" resultMap="ComStatsParameterResult"  parameterType="com.czlis.common.core.domain.entity.lis.ComStatsParameter"  >
         <include refid="selectComStatsParameterVo"></include>
@@ -72,7 +74,7 @@
 
     <select id="checkDictNameUnique" parameterType="String" resultMap="ComStatsParameterResult">
         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}
     </select>
@@ -80,7 +82,7 @@
     <select id="checkDictCodeUnique" parameterType="String" resultMap="ComStatsParameterResult">
         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_code=#{paramCode} and param_type = #{paramType} and stats_code = #{statsCode}
     </select>
@@ -102,6 +104,8 @@
         <if test="remark != null and remark != ''">remark,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
         <if test="paramWidth != null ">param_width,</if>
+        <if test="paramZct != null ">param_zct,</if>
+
         create_time
         )values(
         <if test="paramId != null and paramId != 0">#{paramId},</if>
@@ -120,6 +124,7 @@
         <if test="remark != null and remark != ''">#{remark},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         <if test="paramWidth != null ">#{paramWidth},</if>
+        <if test="paramZct != null ">#{paramZct},</if>
         getdate()
         )
     </insert>
@@ -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}
     </update>
@@ -163,6 +168,7 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="paramWidth != null">param_width = #{paramWidth},</if>
+            <if test="paramZct != null">param_zct = #{paramZct},</if>
             update_time = getdate()
         </set>
         where param_id = #{paramId}