后端提交

src/main/java/com/steerinfo/baseinfo/meterbaseoperationlog/mapper/MeterBaseOperationLogMapper.xml

@@ -628,6 +628,12 @@
     <if test="baseSpotName != null and baseSpotName != ''">
       and  B.base_spot_name like '%${baseSpotName}%'
     </if>
+    <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+      and B.base_spot_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
   </select>
 
   <select id="countAllActualState" parameterType="java.util.HashMap" resultType="hashmap">
@@ -649,6 +655,12 @@
     <if test="baseSpotName != null and baseSpotName != ''">
       and  B.net_spot3_name like '%${baseSpotName}%'
     </if>
+    <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+      and B.net_spot3_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
   </select>
 
   <select id="allFirstStateView" parameterType="java.util.HashMap" resultType="hashmap">

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/mapper/MeterBaseSpotInfoMapper.java

@@ -25,4 +25,6 @@ public interface MeterBaseSpotInfoMapper extends IBaseMapper<MeterBaseSpotInfo,
      List<MeterBaseSpotInfo> selectSpotByUserID(Map<String, Object> parameters);
 
      List<MeterBaseSpotInfo> TSDGSpotInfo(Map<String, Object> parameters);
+
+     List<MeterBaseSpotInfo> spotInfoByList(Map<String, Object> param);
 }

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/mapper/MeterBaseSpotInfoMapper.xml

@@ -1107,4 +1107,15 @@
     select * from meter_base_spot_info
         where spot_type_no in ('001019003','001019005')
   </select>
+
+  <select id ="spotInfoByList" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    select * from meter_base_spot_info
+        where VALID_FLAG='1'
+        <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+          and base_spot_no in
+          <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+            #{item}
+          </foreach>
+        </if>
+  </select>
 </mapper>

src/main/java/com/steerinfo/metermonitor/metermonitornote/mapper/MeterMonitorNoteMapper.xml

@@ -675,6 +675,12 @@
     <if test="baseSpotName != null and baseSpotName != ''">
       and  base_spot_name like '%${baseSpotName}%'
     </if>
+    <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+      and base_spot_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
   </select>
   <!-- 重置车号 -->
   <select id="countResetCar" parameterType="java.util.HashMap" resultMap="BaseResultMap">
@@ -691,6 +697,12 @@
     <if test="baseSpotName != null and baseSpotName != ''">
       and  base_spot_name like '%${baseSpotName}%'
     </if>
+    <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+      and base_spot_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
   </select>
 
   <!--根据时间查询所有秤点的不验证历史皮重、不验证异地计量、不验证零点告警、不验证时间间隔、不验证对射、不验证毛皮超差-->

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -4219,6 +4219,12 @@
     <if test="baseSpotName != null and baseSpotName != ''">
       and  net_spot3_name like '%${baseSpotName}%'
     </if>
+    <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+      and net_spot3_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
   </select>
 
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -2636,6 +2636,11 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
     public List<HashMap> countAllSpotSate(HashMap params) {
         List<HashMap> map = new ArrayList<>();
 
+        if(params.get("netSpot3NoStr") != null) {
+            String[] spotNoStr = params.get("netSpot3NoStr").toString().split(",");
+            params.put("spotNoStr", spotNoStr);
+        }
+
         //根据时间查询所有秤点的结净已匹配、结净未匹配、结净已上传、结净未上传、已作废数据
         List<MeterWorkCarActual> carActual = meterWorkCarActualMapper.countAllState(params);
         List<MeterWorkCarActualFirst> carFirst = meterWorkCarActualFirstMapper.countAllState(params);
@@ -2647,7 +2652,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         //.map(MeterWorkCarActual::getCarNo).distinct().collect(Collectors.toList());
 //        List<String> spotList = carActual.stream().map(MeterWorkCarActual::getNetSpot3Name).distinct().collect(Collectors.toList());
 
-        List<MeterBaseSpotInfo> spotModel = meterBaseSpotInfoMapper.selectByParameters(params);
+        List<MeterBaseSpotInfo> spotModel = meterBaseSpotInfoMapper.spotInfoByList(params);
         List<MeterBaseSpotInfo> spotList = spotModel.stream().collect(
                 Collectors. collectingAndThen(
                         Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getBaseSpotNo() + ";" + o.getBaseSpotName()))), ArrayList::new)

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -2919,6 +2919,12 @@
     <if test="baseSpotName != null and baseSpotName != ''">
       and  base_spot_name like '%${baseSpotName}%'
     </if>
+    <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+      and base_spot_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
   </select>
 
   <!--根据时间查询所有秤点的一次毛重、一次皮重、一次期限皮、一次有效、一次作废-->

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/mapper/MeterWorkScheduledHelpMapper.xml

@@ -533,6 +533,12 @@
     <if test="baseSpotName != null and baseSpotName != ''">
       and  base_spot_name like '%${baseSpotName}%'
     </if>
+    <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+      and base_spot_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
   </select>
 
   <select id="allStateView" parameterType="java.util.HashMap" resultMap="BaseResultMap">