报告签章筛选调整

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

@@ -172,6 +172,15 @@
 			<if test="signatureName != null and signatureName != ''">
 				AND a.signature_name like concat('%',#{signatureName},'%')
 			</if>
+			<if test="reportSignatureRelation != null and reportSignatureRelation.projectName != null and reportSignatureRelation.projectName != ''">
+				AND rpr.project_name like concat('%',#{reportSignatureRelation.projectName},'%')
+			</if>
+			<if test="reportSignatureRelation != null and reportSignatureRelation.projectNum != null and reportSignatureRelation.projectNum != ''">
+				AND rpr.project_id like concat('%',#{reportSignatureRelation.projectNum},'%')
+			</if>
+			<if test="reportSignatureRelation != null and reportSignatureRelation.reportDataNum != null and reportSignatureRelation.reportDataNum != ''">
+				AND prd.number like concat('%',#{reportSignatureRelation.reportDataNum},'%')
+			</if>
 			<if test="number != null and number != ''">
 				AND a.number like concat('%',#{number},'%')
 			</if>

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

@@ -257,20 +257,27 @@
                     <table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
                     <div class="commonQuery lw6">
                         <div class="layui-item query athird">
-                            <label class="layui-form-label">签章描述：</label>
+                            <label class="layui-form-label">项目编号：</label>
                             <div class="layui-input-block">
-                                <form:input path="signatureName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+                                <form:input path="reportSignatureRelation.projectNum" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
                             </div>
                         </div>
                         <div class="layui-item query athird">
-                            <label class="layui-form-label">签章类型：</label>
-                            <div class="layui-input-block readOnlyFFF">
-                                <form:select placeholder="请选择" path="signatureType" class="form-control editable-select layui-input" id="attachmentProjectSort" value="${signatureType}">
-                                    <form:option value=""/>
-                                    <form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                </form:select>
+                            <label class="layui-form-label">项目名称：</label>
+                            <div class="layui-input-block">
+                                <form:input path="reportSignatureRelation.projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
                             </div>
                         </div>
+
+<%--                        <div class="layui-item query athird">--%>
+<%--                            <label class="layui-form-label">签章类型：</label>--%>
+<%--                            <div class="layui-input-block readOnlyFFF">--%>
+<%--                                <form:select placeholder="请选择" path="signatureType" class="form-control editable-select layui-input" id="attachmentProjectSort" value="${signatureType}">--%>
+<%--                                    <form:option value=""/>--%>
+<%--                                    <form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+<%--                                </form:select>--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
                         <div class="layui-item athird">
                             <div class="input-group">
                                 <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
@@ -283,7 +290,12 @@
                         <div style="    clear:both;"></div>
                     </div>
                     <div id="moresees" style="clear:both;display:none;" class="lw6">
-
+                        <div class="layui-item query athird">
+                            <label class="layui-form-label">报告号：</label>
+                            <div class="layui-input-block">
+                                <form:input path="reportSignatureRelation.reportDataNum" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+                            </div>
+                        </div>
                         <div class="layui-item query athird ">
                             <label class="layui-form-label">登记人：</label>
                             <div class="layui-input-block with-icon">
@@ -291,13 +303,13 @@
                                                                   title="登记人" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                             </div>
                         </div>
-                        <div class="layui-item query athird">
-                            <label class="layui-form-label">部门：</label>
-                            <div class="layui-input-block with-icon">
-                                <sys:treeselectMoHu id="officeId" name="office.id" value="${projectReportSignature.office.id}" labelName="office.name" labelValue="${projectReportSignature.office.name}"
-                                                    title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
-                            </div>
-                        </div>
+<%--                        <div class="layui-item query athird">--%>
+<%--                            <label class="layui-form-label">部门：</label>--%>
+<%--                            <div class="layui-input-block with-icon">--%>
+<%--                                <sys:treeselectMoHu id="officeId" name="office.id" value="${projectReportSignature.office.id}" labelName="office.name" labelValue="${projectReportSignature.office.name}"--%>
+<%--                                                    title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
                         <div class="layui-item query athird ">
                             <label class="layui-form-label">创建时间：</label>
                             <div class="layui-input-block readOnlyFFF">