Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/java/com/zjugis/business/bean/request/ProjectTrackingPageRequest.java

@@ -30,8 +30,8 @@ public class ProjectTrackingPageRequest extends PageParam {
     @Schema(description = "追踪开关状态")
     private Integer status;
 
-    @Schema(description = "状态")
-    private String zt;
+    @Schema(description = "年份")
+    private Integer year;
 
     @Schema(description = "所属板块")
     private String ssbk;

zjugis-business/src/main/java/com/zjugis/business/mapper/ProjectTrackingMapper.java

@@ -29,8 +29,8 @@ public interface ProjectTrackingMapper extends BaseMapperX<ProjectTracking> {
                 .eqIfPresent(ProjectTracking::getXmbmId, reqVO.getXmbmId())
                 .eqIfPresent(ProjectTracking::getStatus, reqVO.getStatus())
                 .likeIfPresent(ProjectTracking::getXmmc, reqVO.getXmmc())
+                .eqIfPresent(ProjectTracking::getYear, reqVO.getYear())
                 .eqIfPresent(ProjectTracking::getSsbk, reqVO.getSsbk())
-                .eqIfPresent(ProjectTracking::getZt, reqVO.getZt())
                 .eqIfPresent(ProjectTracking::getXzqdm, reqVO.getDistrict())
                 .inIfPresent(ProjectTracking::getZt, reqVO.getZts())
                 .and(wq -> wq.like(ProjectTracking::getVisibleUserIds, SecurityFrameworkUtils.getLoginUserId())
@@ -49,8 +49,8 @@ public interface ProjectTrackingMapper extends BaseMapperX<ProjectTracking> {
                 .eqIfPresent(ProjectTracking::getXmbmId, reqVO.getXmbmId())
                 .eqIfPresent(ProjectTracking::getStatus, reqVO.getStatus())
                 .likeIfPresent(ProjectTracking::getXmmc, reqVO.getXmmc())
+                .eqIfPresent(ProjectTracking::getYear, reqVO.getYear())
                 .eqIfPresent(ProjectTracking::getSsbk, reqVO.getSsbk())
-                .eqIfPresent(ProjectTracking::getZt, reqVO.getZt())
                 .eqIfPresent(ProjectTracking::getXzqdm, reqVO.getDistrict())
                 .inIfPresent(ProjectTracking::getZt, reqVO.getZts())
                 .and(wq -> wq.like(ProjectTracking::getVisibleUserIds, SecurityFrameworkUtils.getLoginUserId())