合同报表功能

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractReportController.java

@@ -46,6 +46,7 @@ public class WorkContractReportController extends BaseController {
         List<String> yearList = workContractReportService.getYear(workContractReportInfo);
         model.addAttribute("yearList", yearList);
         model.addAttribute("page", page);
+        model.addAttribute("yearValue", workContractReportInfo.getYear());
         return "modules/workcontractinfo/workContractReport/workContractReportList";
     }
 

src/main/resources/mappings/modules/workcontractinfo/WorkContractReportDao.xml

@@ -47,24 +47,6 @@
 		<include refid="workContractInfoJoins"/>
 		<where>
 			a.del_flag = 0
-			<if test="year != null and year != ''">
-				AND YEAR(a.contract_date) = #{year}
-			</if>
-			<if test="contractType != null and contractType != ''">
-				AND a.contractTypeDoc = #{contractType}
-			</if>
-			<if test="contractState != null and contractState != ''">
-				AND a.contract_state = #{contractState}
-			</if>
-			<if test="clientName != null and clientName != ''">
-				AND client.name LIKE concat('%',#{clientName},'%')
-			</if>
-			<if test="contractName != null and contractName != ''">
-				AND a.name LIKE
-				<if test="dbName == 'oracle'">'%'||#{contractName}||'%'</if>
-				<if test="dbName == 'mssql'">'%'+#{contractName}+'%'</if>
-				<if test="dbName == 'mysql'">concat('%',#{contractName},'%')</if>
-			</if>
 			${sqlMap.dsf}
 		</where>
 	</select>

src/main/webapp/webpage/modules/workcontractinfo/workContractReport/workContractReportList.jsp

@@ -413,10 +413,10 @@
 					<div class="layui-item query athird">
 						<label class="layui-form-label">签订年份：</label>
 						<div class="layui-input-block with-icon">
-							<form:select path="year"  class="form-control simple-select">
+							<form:select path="year" class="form-control simple-select">
 								<form:option value="" label=""/>
 								<c:forEach items="${yearList}" var="year">
-									<option value="${year}">${year}</option>
+									<option value="${year}" <c:if test="${yearValue==year}">selected</c:if> >${year}</option>
 								</c:forEach>
 							</form:select>
 						</div>