APP相关模块统一使用appCode作为检索条件

This commit is contained in:
duandongmei
2019-05-13 19:10:21 +08:00
parent 35ca1636ef
commit d4e153533a
15 changed files with 701 additions and 60 deletions

View File

@@ -620,8 +620,13 @@
<if test="cfgDesc != null and cfgDesc != ''">
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
</if>
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
<if test="appCode != null">
AND r.app_code=#{appCode,jdbcType=INTEGER}
</if>
<if test="appCode == null">
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
</if>
</if>
<if test="cfgType != null and cfgType != ''">
AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%')
@@ -721,8 +726,13 @@
<if test="cfgDesc != null and cfgDesc != ''">
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
</if>
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
<if test="appCode != null">
AND r.app_code=#{appCode,jdbcType=INTEGER}
</if>
<if test="appCode == null">
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
</if>
</if>
<if test="action != null">
AND r.ACTION=#{action,jdbcType=INTEGER}
@@ -896,8 +906,13 @@
<if test="cfgDesc != null and cfgDesc != ''">
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
</if>
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
<if test="appCode != null">
AND r.app_code=#{appCode,jdbcType=INTEGER}
</if>
<if test="appCode == null">
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
</if>
</if>
<if test="cfgType != null and cfgType != ''">
AND r.CFG_TYPE like concat(concat('%',#{CFG_TYPE,jdbcType=VARCHAR}),'%')
@@ -1067,8 +1082,13 @@
<if test="cfgDesc != null and cfgDesc != ''">
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
</if>
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
<if test="appCode != null">
AND r.app_code=#{appCode,jdbcType=INTEGER}
</if>
<if test="appCode == null">
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
</if>
</if>
<if test="cfgType != null and cfgType != ''">
AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%')
@@ -1186,8 +1206,13 @@
<if test="cfgDesc != null and cfgDesc != ''">
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
</if>
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
<if test="appCode != null">
AND r.app_code=#{appCode,jdbcType=INTEGER}
</if>
<if test="appCode == null">
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
</if>
</if>
<if test="cfgType != null and cfgType != ''">
AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%')
@@ -1457,8 +1482,13 @@
<if test="cfgDesc != null and cfgDesc != ''">
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
</if>
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
<if test="appCode != null">
AND r.app_code=#{appCode,jdbcType=INTEGER}
</if>
<if test="appCode == null">
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
</if>
</if>
<if test="cfgType != null and cfgType != ''">
AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%')
@@ -1652,8 +1682,13 @@
<if test="cfgDesc != null and cfgDesc != ''">
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
</if>
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
<if test="appCode != null">
AND r.app_code=#{appCode,jdbcType=INTEGER}
</if>
<if test="appCode == null">
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
</if>
</if>
<if test="cfgType != null and cfgType != ''">
AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%')

View File

@@ -267,8 +267,13 @@
<if test="cfgDesc != null and cfgDesc != ''">
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
</if>
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
<if test="appCode != null">
AND r.app_code=#{appCode,jdbcType=INTEGER}
</if>
<if test="appCode == null">
<if test="specServiceId != null">
AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
</if>
</if>
<if test="action != null">
AND r.ACTION=#{action,jdbcType=INTEGER}

View File

@@ -20,7 +20,7 @@ public interface SpecificServiceCfgDao extends CrudDao<SpecificServiceCfg> {
* @return
*/
SpecificServiceCfg getBySpecServiceId(Integer specServiceId);
List<SpecificServiceCfg> getBySpecServiceCodes(@Param("ids")String ids);
List<SpecificServiceCfg> getBySpecServiceCodes(@Param("ids")String ids,@Param("cfgType")Integer cfgType);
/**
* 查询所有符合条件顶层分页列表
* @param specificServiceCfg

View File

@@ -39,11 +39,11 @@
<!-- 根据id查出对象 -->
<select id="getBySpecServiceId" resultType="com.nis.domain.specific.SpecificServiceCfg" parameterType="java.lang.Integer">
select <include refid="specificServiceCfgColumns" />
from specific_service_cfg s where s.spec_service_id = #{specServiceId}
from specific_service_cfg s where s.spec_service_id = #{specServiceId} and s.is_valid=1
</select>
<select id="getBySpecServiceCodes" resultType="com.nis.domain.specific.SpecificServiceCfg" parameterType="java.lang.String">
<select id="getBySpecServiceCodes" resultType="com.nis.domain.specific.SpecificServiceCfg">
select <include refid="specificServiceCfgColumns" />
from specific_service_cfg s where s.spec_service_code in(${ids})
from specific_service_cfg s where s.spec_service_code in(${ids}) and s.is_valid=1 and s.cfg_type=#{cfgType}
</select>
<select id="getRepeat" resultType="com.nis.domain.specific.SpecificServiceCfg" >
select <include refid="specificServiceCfgColumns" />
@@ -54,11 +54,11 @@
</select>
<select id="getParentType" resultType="java.lang.Integer" parameterType="java.lang.Integer">
select cfg_type
from specific_service_cfg s where s.spec_service_id = #{specServiceId}
from specific_service_cfg s where s.spec_service_id = #{specServiceId} and s.is_valid=1
</select>
<select id="getParentCode" resultType="java.lang.Integer" parameterType="java.lang.Integer">
select spec_service_code
from specific_service_cfg s where s.spec_service_id = #{specServiceId}
from specific_service_cfg s where s.spec_service_id = #{specServiceId} and s.is_valid=1
</select>
<!-- 查出所有符合条件的顶层数据 -->