git-svn-id: https://192.168.57.71/svn/jsgkj@1896 931142cf-59ea-a443-aa0e-51397b428577

znjg/trunk/WebContent/WEB-INF/view/jsp/aqjg/whcx.jsp

@@ -125,6 +125,7 @@
 							<option value="10" <c:if test="${spzt==10}">selected</c:if>>变更已完成</option>
 							<option value="6" <c:if test="${spzt==6}">selected</c:if>>取消完成</option>
 							<option value="2" <c:if test="${spzt==2 or spzt==null}">selected</c:if>>完成</option>
+							<option value="4" <c:if test="${spzt==4}">selected</c:if>>不通过</option>
 						</select>
 						</td>
                         <td align="right">

znjg/trunk/src/com/jsjty/aqjgwhcx/xml/AqjgwhcxMapper.xml

@@ -33,6 +33,7 @@
        j.GKJYR,
        (case (s.RECORD_STATUS) when 10 then '变更已完成'
       when 6 then '取消完成'
+      when 4 then '不通过'
       when 8 then '作废'
 			when 2 then '完成'
 			end) RECORD_STATUS,
@@ -71,7 +72,8 @@
   		 and t3.task_key = 'xssc'
  		where (s.record_status = 2
     	or s.record_status = 10
-    	or s.record_status = 6)
+    	or s.record_status = 6
+    	or s.record_status = 4)
 		]]>
 		<if test="szd!=null and szd!=''">  
 			AND s.SZD LIKE CONCAT(CONCAT('%', '${szd}'),'%')  
@@ -135,6 +137,7 @@
        (case (s.RECORD_STATUS) when 10 then '变更已完成'
       	when 6 then '取消完成'
         when 8 then '作废'
+        when 4 then '不通过'
 			when 2 then '完成'
 			end) RECORD_STATUS,
        (case (s.RECORD_STATUS) when 10 then T3.AUDIT_USERNAME
@@ -172,7 +175,8 @@
   		 and t3.task_key = 'xssc'
  		where (s.record_status = 2
     	or s.record_status = 10
-    	or s.record_status = 6)
+    	or s.record_status = 6
+    	or s.record_status = 4)
 		]]>
 		<if test="szd!=null and szd!=''">  
 			AND s.SZD LIKE CONCAT(CONCAT('%', '${szd}'),'%')  

znjg/trunk/src/com/jsjty/aqjgwhtj/xml/AqjgwhtjMapper.xml

@@ -20,7 +20,7 @@
                     count(w.id) count,
                     round(sum(w.zysl) / 10000,4) sum
                from T_YJPT_WXHWGKZYSBD W
-              where W.RECORD_STATUS != 9
+              where W.RECORD_STATUS != 9 and W.RECORD_STATUS != 4
              <if test="startDate!=null and startDate!=''">  
 			<![CDATA[ AND w.bgsj >=
 			TRUNC(#{startDate}, 'dd')