gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0000019: 基本配置-专项管理-状态变更

Browse Source 
1、专项状态变更”审核未通过“后，修改专项信息，保存后，专项信息状态变更为”未审核“；
2、删除提示时间过短修改
0000018: 来函管理-状态变更
1、来函状态变更”审核未通过“后，修改来函信息，保存后，来函信息状态变更为”未审核“；
2、删除提示时间过短修改
0000016: 基本配置-专项管理
1、专项管理新增：专项信息新增后，专项信息表字段is_valid=0,is_audit=0；
2、专项信息列表默认按创建时间倒序显示
0000017: 来函管理
1、来函管理新增：来函信息新增后，来函信息表字段is_valid=0,is_audit=0；
2、来函信息列表，默认按创建时间倒序显示。
This commit is contained in:
zhanghongqing
2018-03-19 14:34:39 +08:00
parent c538dd8d21
commit ef269f99c8
9 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
View File

@@ -47,7 +47,7 @@
left join sys_user u on r.editor_id=u.id
left join sys_user e on r.auditor_id=e.id
left join task_info t on r.task_id=t.id
where r.is_valid=1 and r.is_audit !=3
where r.is_valid!=-1 and r.is_audit !=3
<if test="requestTitle != null and requestTitle != ''">
AND r.request_title like
<if test="dbName == 'mysql'">CONCAT('%',#{requestTitle}, '%')</if>
@@ -68,7 +68,7 @@
<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
AND r.edit_time between #{dobeginDate} and #{doendDate}
</if>
order by r.request_time desc
order by r.create_time desc
</select>
<!-- 根据来函号查询 -->
<select id="getRequestInfoByRequestNumber" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -102,7 +102,7 @@
left join sys_user u on r.editor_id=u.id
left join sys_user e on r.auditor_id=e.id
left join task_info t on r.task_id=t.id
where r.is_valid=1 and r.is_audit !=3
where r.is_valid!=-1 and r.is_audit !=3
and r.id = #{id,jdbcType=BIGINT}
</select>
<!-- 新增 -->

6
src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
View File

@@ -25,7 +25,7 @@
select
<include refid="Base_Column_List" />
from task_info t
where is_valid=1 and is_audit !=3
where is_valid!=-1 and is_audit !=3
<if test="id!=null">
AND id = #{id,jdbcType=BIGINT}
</if>
@@ -50,7 +50,7 @@
left join sys_user s on r.creator_id=s.id
left join sys_user u on r.editor_id=u.id
left join sys_user e on r.auditor_id=e.id
where r.is_valid=1 and r.is_audit !=3
where r.is_valid!=-1 and r.is_audit !=3
<if test="taskName != null and taskName != ''">
AND r.task_name like
<if test="dbName == 'mysql'">CONCAT('%',#{taskName}, '%')</if>
@@ -64,7 +64,7 @@
<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
AND r.edit_time between #{dobeginDate} and #{doendDate}
</if>
order by r.task_time desc
order by r.create_time desc
</select>
<!-- 根据来函号查询 -->
<select id="getTaskInfoByTaskName" parameterType="java.lang.String" resultMap="BaseResultMap">