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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
chenjinsong
2018-03-22 14:41:33 +08:00
parent 659dc9fc2c 19d346e2de
commit 5a82405825
79 changed files with 5111 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,7 @@
u.name AS editorName,
r.edit_time AS editTime,
e.name AS currentName,
e.name AS auditorName,
r.audit_time AS auditTime,
t.task_name AS taskName
from request_info r
@@ -46,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>
@@ -56,7 +57,8 @@
<if test="dbName == 'mysql'">CONCAT('%',#{requestContent},'%')</if>
</if>
<if test="requestNumber != null and requestNumber != ''">
AND r.request_number=#{requestNumber}
AND r.request_number like
<if test="dbName == 'mysql'">CONCAT('%',#{requestNumber},'%')</if>
</if>
<if test="isAudit != null">
AND r.is_audit=${isAudit}
@@ -65,9 +67,18 @@
AND r.request_time between #{beginDate} and #{endDate}
</if>
<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate})
</if>
order by r.request_time desc
AND r.edit_time between #{dobeginDate} and #{doendDate}
</if>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
</when>
<otherwise>
ORDER BY r.create_time desc
</otherwise>
</choose>
</select>
<!-- 根据来函号查询 -->
<select id="getRequestInfoByRequestNumber" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -78,10 +89,31 @@
</select>
<!-- 根据来id查询 -->
<select id="getRequestInfoById" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from request_info
where id = #{id,jdbcType=BIGINT}
select
r.id AS id,
r.task_id AS taskId,
r.request_number AS requestNumber,
r.request_org AS requestOrg,
r.request_time AS requestTime,
r.request_title AS requestTitle,
r.request_content AS requestContent,
r.is_valid AS isValid,
r.is_audit AS isAudit,
s.name AS creatorName,
r.create_time AS createTime,
u.name AS editorName,
r.edit_time AS editTime,
e.name AS currentName,
e.name AS auditorName,
r.audit_time AS auditTime,
t.task_name AS taskName
from request_info r
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
left join task_info t on r.task_id=t.id
where r.is_valid!=-1 and r.is_audit !=3
and r.id = #{id,jdbcType=BIGINT}
</select>
<!-- 新增 -->
<insert id="insert" parameterType="com.nis.domain.configuration.RequestInfo">
@@ -98,31 +130,32 @@
editor_id,
edit_time,
auditor_id,
audit_time
audit_time,
task_id
)
values (#{requestNumber,jdbcType=VARCHAR}, #{requestOrg,jdbcType=VARCHAR},
#{requestTime,jdbcType=DATE}, #{requestTitle,jdbcType=VARCHAR}, #{requestContent,jdbcType=VARCHAR},
#{isValid,jdbcType=INTEGER}, #{isAudit,jdbcType=INTEGER}, #{creatorId,jdbcType=INTEGER},
#{createTime,jdbcType=DATE}, #{editorId,jdbcType=INTEGER}, #{editTime,jdbcType=DATE},
#{auditorId,jdbcType=INTEGER}, #{auditTime,jdbcType=DATE})
#{auditorId,jdbcType=INTEGER}, #{auditTime,jdbcType=DATE}, #{taskId,jdbcType=BIGINT})
</insert>
<!--修改 -->
<update id="update" parameterType="com.nis.domain.configuration.RequestInfo">
update request_info
<set>
<if test="requestNumber != null">
<if test="requestNumber != null and requestNumber!=''" >
request_number = #{requestNumber,jdbcType=VARCHAR},
</if>
<if test="requestOrg != null">
<if test="requestOrg != null and requestOrg!=''">
request_org = #{requestOrg,jdbcType=VARCHAR},
</if>
<if test="requestTime != null">
request_time = #{requestTime,jdbcType=DATE},
</if>
<if test="requestTitle != null">
<if test="requestTitle != null and requestTitle!=''">
request_title = #{requestTitle,jdbcType=VARCHAR},
</if>
<if test="requestContent != null">
<if test="requestContent != null and requestContent!=''">
request_content = #{requestContent,jdbcType=VARCHAR},
</if>
<if test="isValid != null">
@@ -149,6 +182,9 @@
<if test="auditTime != null">
audit_time = #{auditTime,jdbcType=DATE},
</if>
<if test="taskId != null">
task_id = #{taskId},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>

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

@@ -20,13 +20,14 @@
id, task_name, task_org, task_time, task_desc, is_valid, is_audit, creator_id, create_time,
editor_id, edit_time, auditor_id, audit_time
</sql>
<!-- 查询有效且通过审核 -->
<select id="findList" parameterType="com.nis.domain.configuration.TaskInfo" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from task_info
from task_info t
where is_valid =1 and is_audit =1
<if test="id!=null">
where id = #{id,jdbcType=BIGINT}
AND id = #{id,jdbcType=BIGINT}
</if>
</select>
@@ -36,6 +37,7 @@
r.id AS id,
r.task_name AS taskName,
r.task_org AS taskOrg,
r.task_desc AS taskDesc,
r.task_time AS taskTime,
r.is_valid AS isValid,
r.is_audit AS isAudit,
@@ -43,13 +45,13 @@
r.create_time AS createTime,
u.name AS editorName,
r.edit_time AS editTime,
e.name AS currentName,
e.name AS auditorName,
r.audit_time AS auditTime
from task_info r
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>
@@ -61,9 +63,16 @@
AND r.task_time between #{beginDate} and #{endDate}
</if>
<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate})
AND r.edit_time between #{dobeginDate} and #{doendDate}
</if>
order by r.task_time desc
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
</when>
<otherwise>
ORDER BY r.create_time desc
</otherwise>
</choose>
</select>
<!-- 根据来函号查询 -->
<select id="getTaskInfoByTaskName" parameterType="java.lang.String" resultMap="BaseResultMap">