【CHG】检测表筛选操作人模糊查询

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcab.java

@@ -41,6 +41,8 @@ public class BusJcab extends BaseEntity {
   @ApiModelProperty(value = "站/区间ID")
   private Long stationId;
 
+  private Long[] stationIds;
+
   @ApiModelProperty(value = "车间-区间站场关联id")
   private Long deptStationId;
 

railway-business/src/main/java/com/railway/business/catenary/domain/BusJceb.java

@@ -11,65 +11,68 @@ import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 检测表-关节式分相 
+ * 检测表
+ *
  * @author zhaomn
  */
 @Data
-@ApiModel("检测表 -  ")
+@ApiModel("检测表")
 @EqualsAndHashCode(callSuper = true)
-public class BusJceb extends BaseEntity{
+public class BusJceb extends BaseEntity {
 
-    @ApiModelProperty(value = "主键", hidden = true)
-    private Long id;
+  @ApiModelProperty(value = "主键", hidden = true)
+  private Long id;
 
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
+  @ApiModelProperty(value = "部门id")
+  private Long deptId;
 
-    @ApiModelProperty(value = "所属部门")
-    private String deptName;
+  @ApiModelProperty(value = "所属部门")
+  private String deptName;
 
-    @ApiModelProperty(value = "线路id")
-    private Long lineId;
+  @ApiModelProperty(value = "线路id")
+  private Long lineId;
 
-    @ApiModelProperty(value = "线别")
-    private String lineName;
+  @ApiModelProperty(value = "线别")
+  private String lineName;
 
-    @ApiModelProperty(value = "站/区间名称")
-    private String stationName;
+  @ApiModelProperty(value = "站/区间名称")
+  private String stationName;
 
-    @ApiModelProperty(value = "站/区间ID")
-    private Long stationId;
+  @ApiModelProperty(value = "站/区间ID")
+  private Long stationId;
 
-    @ApiModelProperty(value = "车间-区间站场关联id")
-    private Long deptStationId;
+  private Long[] stationIds;
 
-    @ApiModelProperty(value = "行别")
-    @Length(min = 1, max = 10, message = "【行别】长度必须介于 {min} 和 {max} 之间")
-    private String xingbie;
+  @ApiModelProperty(value = "车间-区间站场关联id")
+  private Long deptStationId;
 
-    @ApiModelProperty(value = "行别")
-    private String xingbieText;
+  @ApiModelProperty(value = "行别")
+  @Length(min = 1, max = 10, message = "【行别】长度必须介于 {min} 和 {max} 之间")
+  private String xingbie;
 
-    @ApiModelProperty(value = "检查日期")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern="yyyy-MM-dd")
-    private LocalDate operationDate;
+  @ApiModelProperty(value = "行别")
+  private String xingbieText;
 
-    @ApiModelProperty(value = "检测人")
-    private String operator;
+  @ApiModelProperty(value = "检查日期")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private LocalDate operationDate;
 
-    @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")
-    @Length(min = 1, max = 1, message = "【提交状态 0未提交 1已提交 2已退回 9已确认】长度必须介于 {min} 和 {max} 之间")
-    private String submitState;
+  @ApiModelProperty(value = "检测人")
+  private String operator;
 
-    @ApiModelProperty(value = "del_flag")
-    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
-    private String delFlag;
+  @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")
+  @Length(min = 1, max = 1, message = "【提交状态 0未提交 1已提交 2已退回 9已确认】长度必须介于 {min} 和 {max} 之间")
+  private String submitState;
 
-    @ApiModelProperty(value = "要排序的列")
-    private String orderBy;
+  @ApiModelProperty(value = "del_flag")
+  @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+  private String delFlag;
 
-    @ApiModelProperty(value = "1-ASC 正序排序，0-DESC 倒序排序")
-    private String isAsc;
+  @ApiModelProperty(value = "要排序的列")
+  private String orderBy;
+
+  @ApiModelProperty(value = "1-ASC 正序排序，0-DESC 倒序排序")
+  private String isAsc;
 
 }

railway-business/src/main/java/com/railway/business/catenary/domain/vo/JcebQueryParamVo.java

@@ -0,0 +1,26 @@
+package com.railway.business.catenary.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * 检测表查询参数
+ *
+ * @author zhaomn
+ */
+@Data
+public class JcebQueryParamVo implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @ApiModelProperty(value = "车间id")
+  private Long deptId;
+
+  @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")
+  private String submitState;
+
+  @ApiModelProperty(value = "创建者")
+  private String createBy;
+
+}

railway-business/src/main/java/com/railway/business/catenary/domain/vo/JcebQueryVo.java

@@ -23,6 +23,8 @@ public class JcebQueryVo implements Serializable {
   @ApiModelProperty(value = "区间站场id")
   private Long stationId;
 
+  private Long[] stationIds;
+
   @ApiModelProperty(value = "支柱号")
   private String pillarCode;
 

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcabServiceImpl.java

@@ -4,11 +4,9 @@ import com.railway.business.baseinfo.domain.BaseDeptStation;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.catenary.domain.BusJcab;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
-import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
-import com.railway.common.core.domain.entity.SysUser;
+import com.railway.business.catenary.util.JcebQueryUtil;
 import com.railway.common.enums.DelFlagEnum;
-import com.railway.common.enums.PostTypeEnum;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.sql.SqlUtil;
@@ -31,30 +29,16 @@ public abstract class BusJcabServiceImpl {
   }
 
   protected void setQuery(JcebQueryVo query) {
-    SysUser user = SecurityUtils.getLoginUser().getUser();
-    String post = user.getPost();
-    PostTypeEnum postType = PostTypeEnum.ofValue(post);
-    if(postType == PostTypeEnum.LEADER){
-      query.setSubmitState(JcebStatusEnum.REPORTED.getCode());
-      query.setDeptId(user.getDeptId());
-    }else {
-      query.setCreateBy(user.getUserName());
-    }
+    // 设置查询权限
+    JcebQueryUtil.setBusJcebQuery(query);
   }
 
   /**
    * 列表
    */
   protected void setList(BusJcab jcab) {
-    SysUser user = SecurityUtils.getLoginUser().getUser();
-    String post = user.getPost();
-    PostTypeEnum postType = PostTypeEnum.ofValue(post);
-    if(postType == PostTypeEnum.LEADER){
-      jcab.setSubmitState(JcebStatusEnum.REPORTED.getCode());
-      jcab.setDeptId(user.getDeptId());
-    }else {
-      jcab.setCreateBy(user.getUserName());
-    }
+    // 设置查询权限
+    JcebQueryUtil.setBusJcab(jcab);
     if(StringUtils.isNotEmpty(jcab.getOrderBy())){
       jcab.setOrderBy(SqlUtil.humpToLine(jcab.getOrderBy()));
     } else {
@@ -68,6 +52,7 @@ public abstract class BusJcabServiceImpl {
    * 创建
    */
   protected void setCreate(BusJcab jcab) {
+    // 设置关联ID
     setDeptStationId(jcab);
     if (StringUtils.isBlank(jcab.getSubmitState())) {
       jcab.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
@@ -81,6 +66,7 @@ public abstract class BusJcabServiceImpl {
    * 更新
    */
   protected void setUpdate(BusJcab jcab) {
+    // 设置关联ID
     setDeptStationId(jcab);
     jcab.setUpdateTime(new Date());
     jcab.setUpdateBy(SecurityUtils.getUsername());

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebServiceImpl.java

@@ -9,9 +9,8 @@ import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcebMapper;
 import com.railway.business.catenary.service.IBusJcebService;
-import com.railway.common.core.domain.entity.SysUser;
+import com.railway.business.catenary.util.JcebQueryUtil;
 import com.railway.common.enums.DelFlagEnum;
-import com.railway.common.enums.PostTypeEnum;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.sql.SqlUtil;
@@ -60,15 +59,8 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
 	 */
 	@Override
 	public JcebRecordVo getCountByType(JcebQueryVo query) {
-		SysUser user = SecurityUtils.getLoginUser().getUser();
-		String post = user.getPost();
-		PostTypeEnum postType = PostTypeEnum.ofValue(post);
-		if(postType == PostTypeEnum.LEADER){
-			query.setSubmitState(JcebStatusEnum.REPORTED.getCode());
-			query.setDeptId(user.getDeptId());
-		}else {
-			query.setCreateBy(user.getUserName());
-		}
+		// 设置查询权限
+		JcebQueryUtil.setBusJcebQuery(query);
 		return busJcebMapper.getCountByType(query);
 	}
 
@@ -76,15 +68,8 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
 	 * 列表
 	 */
 	protected void setList(BusJceb jceb) {
-		SysUser user = SecurityUtils.getLoginUser().getUser();
-		String post = user.getPost();
-		PostTypeEnum postType = PostTypeEnum.ofValue(post);
-		if(postType == PostTypeEnum.LEADER){
-			jceb.setSubmitState(JcebStatusEnum.REPORTED.getCode());
-			jceb.setDeptId(user.getDeptId());
-		}else {
-			jceb.setCreateBy(user.getUserName());
-		}
+		// 设置查询权限
+		JcebQueryUtil.setBusJceb(jceb);
 		if(StringUtils.isNotEmpty(jceb.getOrderBy())){
 			jceb.setOrderBy(SqlUtil.humpToLine(jceb.getOrderBy()));
 		} else {
@@ -98,6 +83,7 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
 	 * 创建
 	 */
 	protected void setCreate(BusJceb jceb) {
+		// 设置关联ID
 		setDeptStationId(jceb);
 		if (StringUtils.isBlank(jceb.getSubmitState())) {
 			jceb.setSubmitState(JcebStatusEnum.UNREPORTED.getCode());
@@ -111,6 +97,7 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
 	 * 更新
 	 */
 	protected void setUpdate(BusJceb jceb) {
+		// 设置关联ID
 		setDeptStationId(jceb);
 		jceb.setUpdateTime(new Date());
 		jceb.setUpdateBy(SecurityUtils.getUsername());

railway-business/src/main/java/com/railway/business/catenary/util/JcebQueryUtil.java

@@ -0,0 +1,53 @@
+package com.railway.business.catenary.util;
+
+import com.railway.business.catenary.domain.BusJcab;
+import com.railway.business.catenary.domain.BusJceb;
+import com.railway.business.catenary.domain.vo.JcebQueryParamVo;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.enums.JcebStatusEnum;
+import com.railway.common.core.domain.entity.SysUser;
+import com.railway.common.enums.PostTypeEnum;
+import com.railway.common.utils.SecurityUtils;
+import com.railway.common.utils.bean.BeanUtils;
+
+/**
+ * @author ZhaoMn
+ */
+public class JcebQueryUtil {
+
+  private static JcebQueryParamVo getJcebQuery(){
+    SysUser user = SecurityUtils.getLoginUser().getUser();
+    String post = user.getPost();
+    PostTypeEnum postType = PostTypeEnum.ofValue(post);
+    JcebQueryParamVo jcebQuery = new JcebQueryParamVo();
+    if(postType == PostTypeEnum.LEADER){
+      jcebQuery.setSubmitState(JcebStatusEnum.REPORTED.getCode());
+      jcebQuery.setDeptId(user.getDeptId());
+    }else {
+      jcebQuery.setCreateBy(user.getUserName());
+    }
+    return jcebQuery;
+  }
+
+  public static void setBusJceb(BusJceb jceb){
+    JcebQueryParamVo jcebQuery = getJcebQuery();
+    jceb.setSubmitState(jcebQuery.getSubmitState());
+    jceb.setDeptId(jcebQuery.getDeptId());
+    jceb.setCreateBy(jcebQuery.getCreateBy());
+  }
+
+  public static void setBusJcab(BusJcab jcab){
+    JcebQueryParamVo jcebQuery = getJcebQuery();
+    jcab.setSubmitState(jcebQuery.getSubmitState());
+    jcab.setDeptId(jcebQuery.getDeptId());
+    jcab.setCreateBy(jcebQuery.getCreateBy());
+  }
+
+  public static void setBusJcebQuery(JcebQueryVo query){
+    JcebQueryParamVo jcebQuery = getJcebQuery();
+    query.setSubmitState(jcebQuery.getSubmitState());
+    query.setDeptId(jcebQuery.getDeptId());
+    query.setCreateBy(jcebQuery.getCreateBy());
+  }
+
+}

railway-business/src/main/resources/mapper/catenary/BusJcbBlqMapper.xml

@@ -369,9 +369,15 @@
       <if test="blqId!=null and blqId!=''">
         and t.blq_id=#{blqId}
       </if>
+      <if test="deptId!=null and deptId!=''">
+        and v.dept_id=#{deptId}
+      </if>
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
       </if>
@@ -529,6 +535,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcbDmcgyqMapper.xml

@@ -353,9 +353,15 @@
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
+      <if test="deptId!=null and deptId!=''">
+        and v.dept_id=#{deptId}
+      </if>
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="fenxiang!=null and fenxiang!=''">
         and t.fenxiang=#{fenxiang}
       </if>
@@ -475,6 +481,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcbFdfxjyqMapper.xml

@@ -492,9 +492,15 @@
       <if test="fdfxjyqId!=null and fdfxjyqId!=''">
         and t.fdfxjyq_id=#{fdfxjyqId}
       </if>
+      <if test="deptId!=null and deptId!=''">
+        and v.dept_id=#{deptId}
+      </if>
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
       </if>
@@ -721,6 +727,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcbGlkgMapper.xml

@@ -678,20 +678,11 @@
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
       </if>
-      <if test="deptName!=null and deptName!=''">
-        and v.dept_name=#{deptName}
-      </if>
-      <if test="lineId!=null and lineId!=''">
-        and v.line_id=#{lineId}
-      </if>
-      <if test="lineName!=null and lineName!=''">
-        and v.line_name=#{lineName}
-      </if>
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
-      <if test="stationName!=null and stationName!=''">
-        and v.station_name=#{stationName}
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
       </if>
       <if test="xingbie!=null and xingbie!=''">
         and t.xingbie=#{xingbie}
@@ -948,6 +939,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcbJcxcMapper.xml

@@ -485,9 +485,15 @@
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
       t.del_flag='0'
+      <if test="deptId!=null and deptId!=''">
+        and v.dept_id=#{deptId}
+      </if>
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
       </if>
@@ -652,6 +658,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcbWjcxcMapper.xml

@@ -432,9 +432,15 @@
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
       t.del_flag='0'
+      <if test="deptId!=null and deptId!=''">
+        and v.dept_id=#{deptId}
+      </if>
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
       </if>
@@ -581,6 +587,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcebGjsfxMapper.xml

@@ -282,6 +282,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarStart!=null and pillarStart!=''">
         and t.pillar_start=#{pillarStart}
       </if>
@@ -386,6 +389,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcebJddzMapper.xml

@@ -221,6 +221,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
       </if>
@@ -304,6 +307,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcebJyzqsjlMapper.xml

@@ -208,6 +208,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
       </if>
@@ -273,6 +276,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcebLbjghjlMapper.xml

@@ -227,6 +227,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="dd!=null and dd!=''">
         and t.dd=#{dd}
       </if>
@@ -310,6 +313,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcebQmjcjlMapper.xml

@@ -255,6 +255,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
       </if>
@@ -350,6 +353,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcebXsjcjlMapper.xml

@@ -242,6 +242,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="operationDate!=null">
         and t.operation_date=#{operationDate}
       </if>
@@ -334,6 +337,9 @@
       <if test="stationId!=null and stationId!=''">
         and v.station_id=#{stationId}
       </if>
+      <if test="stationIds!=null and stationIds.length > 0">
+        and v.station_id in (#{stationIds}
+      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_start=#{pillarCode}
       </if>

railway-common/src/main/java/com/railway/common/enums/PostTypeEnum.java

@@ -1,5 +1,8 @@
 package com.railway.common.enums;
 
+import com.railway.common.core.domain.entity.SysUser;
+import com.railway.common.utils.SecurityUtils;
+
 /**
  * 岗位
  *
@@ -38,4 +41,11 @@ public enum PostTypeEnum {
     }
     return STAFF;
   }
+
+  public static PostTypeEnum getPostTypeEnum() {
+    SysUser user = SecurityUtils.getLoginUser().getUser();
+    String post = user.getPost();
+    return ofValue(post);
+  }
+
 }