(1)IP类配置页面修改,支持多选的删除,审核,操作按钮上移

(2)修复验证方法ipCheck影响多个IP配置的bug
This commit is contained in:
wangxin
2018-04-11 13:45:04 +08:00
parent f94e377819
commit 76d190e78a
13 changed files with 773 additions and 174 deletions

View File

@@ -61,5 +61,15 @@ public interface CrudDao<T> {
* @return
*/
public int delete(T entity);
/**
* audit(审核数据)
* (这里描述这个方法适用条件 可选)
* @param t
*void
* @exception
* @since 1.0.0
*/
public int audit(T entity);
}

View File

@@ -18,6 +18,7 @@ public interface IpCfgDao extends CrudDao<BaseIpCfg>{
public BaseIpCfg getById(@Param("tableName")String tableName,@Param("cfgId")Long id) ;
public BaseIpCfg get(BaseIpCfg entity) ;
public List<BaseIpCfg> findList(BaseIpCfg entity) ;
public List<BaseIpCfg> getList(@Param("tableName")String tableName,@Param("ids")String ids) ;
public int insert(BaseIpCfg entity) ;
public int updateByPrimaryKeySelective(BaseIpCfg entity) ;
public int updateValid(BaseIpCfg entity) ;

View File

@@ -161,6 +161,11 @@
AND IS_VALID!=-1
</trim>
</select>
<select id="getList" resultMap="BaseIpMap" >
SELECT
<include refid="BaseIpCfg_Column_List_with_id" />
FROM ${tableName} WHERE IS_VALID!=-1 AND COMPILE_ID in (${ids})
</select>
<select id="findList" resultMap="BaseIpMapWithUser">
select
<!--<choose>
@@ -538,7 +543,7 @@
<update id="updateValid" parameterType="com.nis.domain.configuration.BaseIpCfg" >
update ${tableName} set is_valid = #{isValid,jdbcType=INTEGER}, editor_id = #{editorId,jdbcType=INTEGER} , edit_time = #{editTime,jdbcType=TIMESTAMP} where cfg_id = #{cfgId,jdbcType=BIGINT}
</update>
<update id="audit" parameterType="com.nis.domain.configuration.BaseIpCfg" >
<update id="audit">
update ${tableName} set is_audit = #{isAudit,jdbcType=INTEGER}, auditor_id = #{auditorId,jdbcType=INTEGER}, audit_time = #{auditTime,jdbcType=TIMESTAMP}
<if test="isValid != null" >
,is_valid = #{isValid,jdbcType=INTEGER}
@@ -554,7 +559,15 @@
WHERE CFG_ID = #{cfgId,jdbcType=BIGINT}
</select>
<update id="delete" parameterType="com.nis.domain.configuration.BaseIpCfg" >
update ${tableName} set is_valid = -1, editor_id = #{editorId,jdbcType=INTEGER} , edit_time = #{editTime,jdbcType=TIMESTAMP} where cfg_id = #{cfgId,jdbcType=BIGINT}
update ${tableName} set is_valid = -1, editor_id = #{editorId,jdbcType=INTEGER} , edit_time = #{editTime,jdbcType=TIMESTAMP}
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="cfgId !=null ">
AND cfg_id = #{cfgId,jdbcType=BIGINT}
</if>
<if test="compileId !=null ">
AND compile_id = #{compileId,jdbcType=INTEGER}
</if>
</trim>
</update>
<update id="deleteByCompileId" parameterType="com.nis.domain.configuration.BaseIpCfg" >
update ${tableName} set is_valid = -1, editor_id = #{editorId,jdbcType=INTEGER} , edit_time = #{editTime,jdbcType=TIMESTAMP} where compile_id = #{compileId,jdbcType=INTEGER}