发票，发票管理 新增 项目名称和报告号查询

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -395,6 +395,10 @@
 			,wid.total_money as "widTotalMoney"
 		FROM work_invoice a
 		<include refid="workInvoiceJoins"/>
+		left join work_invoice_project_relation wipr on a.id = wipr.invoice_id
+		left join rural_project_records rprs on wipr.project_id = rprs.id
+		left join rural_project_records rpr on rpr.id = wipr.project_id
+		left join project_report_data prds on rpr.id = prds.project_id
 		left join work_invoice_detail wid on a.id = wid.invoice_id
 		LEFT JOIN sys_user sua ON sua.id = a.account_checking_user_id
 		<where>
@@ -536,6 +540,25 @@
 				<if test="dbName == 'mssql'">'%'+#{newDrawer}+'%'</if>
 				<if test="dbName == 'mysql'">concat('%',#{newDrawer},'%')</if>
 			</if>
+			<if test="projectName != null and projectName != ''">
+				and (wipr.details like
+				<if test="dbName == 'oracle'">'%'||#{projectName}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{projectName}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{projectName},'%')</if>
+				or rpr.project_name like
+				<if test="dbName == 'oracle'">'%'||#{projectName}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{projectName}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{projectName},'%')</if>
+		    	)
+			</if>
+			<if test="reportNumber != null and reportNumber != ''">
+				and prds.number like
+				<if test="dbName == 'oracle'">'%'||#{reportNumber}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{reportNumber}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{reportNumber},'%')</if>
+			</if>
+
+
 			${sqlMap.dsf}
 		</where>
 		<choose>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoList.jsp

@@ -652,6 +652,18 @@
 										</form:select>
 									</div>
 								</div>
+								<div class="layui-item query athird">
+									<label class="layui-form-label">项目名称：</label>
+									<div class="layui-input-block with-icon">
+										<form:input path="projectName" htmlEscape="false"  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">
+										<form:input path="reportNumber" htmlEscape="false"  class=" form-control layui-input"/>
+									</div>
+								</div>
 					</div>
 				</form:form>
 			</div>

src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoList.jsp

@@ -667,6 +667,19 @@
 									</form:select>
 								</div>
 							</div>
+
+							<div class="layui-item query athird">
+								<label class="layui-form-label">项目名称：</label>
+								<div class="layui-input-block with-icon">
+									<form:input path="projectName" htmlEscape="false"  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">
+									<form:input path="reportNumber" htmlEscape="false"  class=" form-control layui-input"/>
+								</div>
+							</div>
 					</div>
 				</form:form>
 			</div>