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

（1）修复来函，专项任务重复验证提示为保存失败

Browse Source 
（2）来函，专项任务重复验证排除失效数据
This commit is contained in:
wangxin
2018-12-28 13:58:43 +06:00
parent 620810c1f1
commit 1ab978fb33
7 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/web/controller/basics/TaskInfoController.java
View File

@@ -77,7 +77,8 @@ public class TaskInfoController extends BaseController{
}else{ }else{
if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){ if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){
logger.info(taskInfo.getTaskName()+"重复数据"); logger.info(taskInfo.getTaskName()+"重复数据");
addMessage("error",model,"save_failed"); Properties props=this.getMsgProp();
addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("task_name", "Task Name"));
return form(taskInfo, model); return form(taskInfo, model);
} }
// 保存用户信息 // 保存用户信息

3
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -83,7 +83,8 @@ public class RequestInfoController extends BaseController{
}else{ }else{
if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){ if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
logger.info(requestInfo.getRequestNumber()+"重复数据"); logger.info(requestInfo.getRequestNumber()+"重复数据");
addMessage("error",model,"save_failed"); Properties props=this.getMsgProp();
addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("title", "Title"));
return form(requestInfo, model); return form(requestInfo, model);
} }
// 保存用户信息 // 保存用户信息

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

@@ -99,7 +99,7 @@
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from request_info from request_info
where request_number = #{requestNumber,jdbcType=VARCHAR} where request_number = #{requestNumber,jdbcType=VARCHAR} and is_valid !=-1
</select> </select>
<!-- 根据来id查询 --> <!-- 根据来id查询 -->
<select id="getRequestInfoById" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="getRequestInfoById" parameterType="java.lang.Long" resultMap="BaseResultMap">

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

@@ -96,7 +96,7 @@
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from task_info from task_info
where task_name = #{taskName,jdbcType=VARCHAR} where task_name = #{taskName,jdbcType=VARCHAR} and is_valid !=-1
</select> </select>
<!-- 根据来id查询 --> <!-- 根据来id查询 -->
<select id="getTaskInfoById" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="getTaskInfoById" parameterType="java.lang.Long" resultMap="BaseResultMap">

3
src/main/resources/messages/message_en.properties
View File

@@ -1432,4 +1432,5 @@ control_num=CONTROL
contains_non_hex_char=Contains non-hexadecimal characters contains_non_hex_char=Contains non-hexadecimal characters
max_length=Maximum Length max_length=Maximum Length
min_length=Minimum Length min_length=Minimum Length
length_error=Length Error length_error=Length Error
duplicate=Duplicate

3
src/main/resources/messages/message_ru.properties
View File

@@ -1436,4 +1436,5 @@ control_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0423\
contains_non_hex_char=Contains non-hexadecimal characters contains_non_hex_char=Contains non-hexadecimal characters
max_length=Maximum Length max_length=Maximum Length
min_length=Minimum Length min_length=Minimum Length
length_error=Length Error length_error=Length Error
duplicate=Duplicate

3
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1432,4 +1432,5 @@ control_num=\u7ba1\u63a7\u6570\u91cf
contains_non_hex_char=\u5305\u542b\u975e\u5341\u516d\u8fdb\u5236\u5b57\u7b26 contains_non_hex_char=\u5305\u542b\u975e\u5341\u516d\u8fdb\u5236\u5b57\u7b26
max_length=\u6700\u5927\u957F\u5EA6 max_length=\u6700\u5927\u957F\u5EA6
min_length=\u6700\u5C0F\u957F\u5EA6 min_length=\u6700\u5C0F\u957F\u5EA6
length_error=\u957F\u5EA6\u9519\u8BEF length_error=\u957F\u5EA6\u9519\u8BEF
duplicate=\u91CD\u590D\u7684