From 0ff05e00ffc4d0af3c5a51046b6018f88ad1a4af Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Fri, 16 Mar 2018 12:17:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A5=E5=87=BD=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E6=98=BE=E7=A4=BA=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BD=93=E5=89=8D=E4=BB=BB=E5=8A=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/dao/configuration/RequestInfoDao.xml  | 45 ++++++++++++++-----
 .../nis/web/dao/configuration/TaskInfoDao.xml |  5 ++-
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
index c9e0cc0f8..3baa562e4 100644
--- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
@@ -79,10 +79,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">
@@ -99,31 +120,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">
@@ -150,6 +172,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>
diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
index e20b2db91..d3e936cd4 100644
--- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
@@ -24,9 +24,10 @@
   <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 !=3
     <if test="id!=null">
-   	where id = #{id,jdbcType=BIGINT}
+   		AND id = #{id,jdbcType=BIGINT}
     </if>
   </select>