报告签章筛选调整

src/main/resources/mappings/modules/signature/projectReport/ProjectReportSignatureDao.xml

@@ -209,7 +209,12 @@
 			<if test="status != null and status != ''">
 				AND a.status = #{status}
 			</if>
-
+			<if test="reportStatus != null and reportStatus != ''">
+				AND rsr.status = #{reportStatus}
+			</if>
+			<if test="approvalStatus != null and approvalStatus != ''">
+				AND rsa.status = #{approvalStatus}
+			</if>
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
 				AND ( a.company_id = #{currentUser.company.id} ${sqlMap.dsf} )
 			</if>
@@ -277,7 +282,12 @@
 			<if test="status != null and status != ''">
 				AND a.status = #{status}
 			</if>
-
+			<if test="reportStatus != null and reportStatus != ''">
+				AND rsr.status = #{reportStatus}
+			</if>
+			<if test="approvalStatus != null and approvalStatus != ''">
+				AND rsa.status = #{approvalStatus}
+			</if>
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
 				AND ( a.company_id = #{currentUser.company.id} ${sqlMap.dsf} )
 			</if>

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkList.jsp

@@ -423,15 +423,24 @@
                                 </input>
                             </div>
                         </div>
-                        <%--<div class="layui-item query athird ">
-                            <label class="layui-form-label">状态：</label>
+                        <div class="layui-item query athird ">
+                            <label class="layui-form-label">报告状态：</label>
                             <div class="layui-input-block">
-                                <form:select path="status" class=" form-control  simple-select">
+                                <form:select path="reportStatus" class=" form-control  simple-select">
                                     <form:option value="" label=""/>
                                     <form:options items="${fns:getRuralDictList('rural_project_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                                 </form:select>
                             </div>
-                        </div>--%>
+                        </div>
+                        <div class="layui-item query athird ">
+                            <label class="layui-form-label">审定单状态：</label>
+                            <div class="layui-input-block">
+                                <form:select path="approvalStatus" class=" form-control  simple-select">
+                                    <form:option value="" label=""/>
+                                    <form:options items="${fns:getRuralDictList('rural_project_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                                </form:select>
+                            </div>
+                        </div>
                         <div style="clear:both;"></div>
                     </div>
                 </form:form>