Parcourir la source

【BUG】修复了记录故障查询原因类型多选不对的问题。

fenghao il y a 4 ans
Parent
commit
ca25476976

+ 2 - 0
railway-business/src/main/java/com/railway/business/catenary/domain/BusJlgz.java

@@ -53,6 +53,8 @@ public class BusJlgz extends BaseEntity{
     @ApiModelProperty(value = "原因类型")
     private String yylxText;
 
+    private String[] yylxs;
+
     @ApiModelProperty(value = "记录日期")
     @Length(max = 100, message = "【记录日期】长度必须介于 {min} 和 {max} 之间")
     private String operationDate;

+ 6 - 1
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJlgzServiceImpl.java

@@ -7,10 +7,10 @@ import com.railway.business.catenary.domain.BusJlgz;
 import com.railway.business.catenary.domain.BusJlgzPic;
 import com.railway.business.catenary.domain.vo.BusJlgzListByZzVo;
 import com.railway.business.catenary.domain.vo.BusJlgzQueryVo;
-import com.railway.common.enums.DelFlagEnum;
 import com.railway.business.catenary.mapper.BusJlgzMapper;
 import com.railway.business.catenary.mapper.BusJlgzPicMapper;
 import com.railway.business.catenary.service.IBusJlgzService;
+import com.railway.common.enums.DelFlagEnum;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.sql.SqlUtil;
@@ -127,6 +127,11 @@ public class BusJlgzServiceImpl implements IBusJlgzService {
 		if (busJlgz.getPillarArea() == null) {
 			busJlgz.setPillarArea("500");
 		}
+
+		if (StringUtils.isNotEmpty(busJlgz.getYylx())) {
+			String[] yylxArr = busJlgz.getYylx().split(",");
+			busJlgz.setYylxs(yylxArr);
+		}
 		// 有站场区间,支柱号 查询支柱公里标
 		if (StringUtils.isNoneBlank(busJlgz.getPillarCode())
 				&& busJlgz.getStationId() != null) {

+ 5 - 2
railway-business/src/main/resources/mapper/catenary/BusJlgzMapper.xml

@@ -198,8 +198,11 @@
         AND (t.marker + 0.0) BETWEEN (#{marker} + 0.0) - (#{pillarArea} + 0.0)
         AND (#{marker} + 0.0) + (#{pillarArea} + 0.0)
       </if>
-      <if test="yylx!=null and yylx!=''">
-        and t.yylx=#{yylx}
+      <if test="yylxs!=null and yylxs.length > 0">
+        and t.yylx in
+        <foreach collection="yylxs" item="yylx" open="(" separator="," close=")">
+          #{yylx}
+        </foreach>
       </if>
       <if test="operationDate!=null and operationDate!=''">
         and STR_TO_DATE(t.operation_date,'%Y-%m-%d')=#{operationDate}