修改

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

@@ -36,4 +36,6 @@ public interface MeterBaseSpotInfoMapper extends IBaseMapper<MeterBaseSpotInfo,
 
      List<MeterBaseSpotInfo> spotGroupCarActual(HashMap<String, Object> params);
      List<MeterBaseSpotInfo> spotGroupRailwayActual(HashMap<String, Object> params);
+
+     List<MeterBaseSpotInfo> queryall(Map<String, Object> params);
 }

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

@@ -1407,4 +1407,118 @@
     group by A.net_spot3_no,
     A.net_spot3_name
   </select>
+
+  <select id="queryall" parameterType="java.util.Map" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <where>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO LIKE '%${baseSpotNo}%'
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME LIKE '%${baseSpotName}%'
+      </if>
+      <if test="spotTypeNo != null and spotTypeNo != ''">
+        and SPOT_TYPE_NO LIKE '%${spotTypeNo}%'
+      </if>
+      <if test="spotTypeName != null and spotTypeName != ''">
+        and SPOT_TYPE_NAME LIKE '%${spotTypeName}%'
+      </if>
+      <if test="spotStateNo != null and spotStateNo != ''">
+        and SPOT_STATE_NO LIKE '%${spotStateNo}%'
+      </if>
+      <if test="spotStateName != null and spotStateName != ''">
+        and SPOT_STATE_NAME LIKE '%${spotStateName}%'
+      </if>
+      <if test="videoIp != null and videoIp != ''">
+        and VIDEO_IP LIKE '%${videoIp}%'
+      </if>
+      <if test="videoPort != null and videoPort != ''">
+        and VIDEO_PORT LIKE '%${videoPort}%'
+      </if>
+      <if test="videoUserName != null and videoUserName != ''">
+        and VIDEO_USER_NAME LIKE '%${videoUserName}%'
+      </if>
+      <if test="videoPassword != null and videoPassword != ''">
+        and VIDEO_PASSWORD LIKE '%${videoPassword}%'
+      </if>
+      <if test="ledIp != null and ledIp != ''">
+        and LED_IP LIKE '%${ledIp}%'
+      </if>
+      <if test="printerIp != null and printerIp != ''">
+        and PRINTER_IP LIKE '%${printerIp}%'
+      </if>
+      <if test="printerName != null and printerName != ''">
+        and PRINTER_NAME LIKE '%${printerName}%'
+      </if>
+      <if test="countNum != null">
+        and COUNT_NUM = #{countNum}
+      </if>
+      <if test="usedNum != null">
+        and USED_NUM = #{usedNum}
+      </if>
+      <if test="controlIp != null and controlIp != ''">
+        and CONTROL_IP LIKE '%${controlIp}%'
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG LIKE '%${validFlag}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="deleteManNo != null and deleteManNo != ''">
+        and DELETE_MAN_NO LIKE '%${deleteManNo}%'
+      </if>
+      <if test="deleteManName != null and deleteManName != ''">
+        and DELETE_MAN_NAME LIKE '%${deleteManName}%'
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+      <if test="flatComputerIp != null and flatComputerIp != ''">
+        and FLAT_COMPUTER_IP LIKE '%${flatComputerIp}%'
+      </if>
+      <if test="mesSpotId != null and mesSpotId != ''">
+        and MES_SPOT_ID LIKE '%${mesSpotId}%'
+      </if>
+      <if test="spotAreaNo != null and spotAreaNo != ''">
+        and SPOT_AREA_NO LIKE '%${spotAreaNo}%'
+      </if>
+      <if test="spotAreaName != null and spotAreaName != ''">
+        and SPOT_AREA_NAME LIKE '%${spotAreaName}%'
+      </if>
+      <if test="allowedTareWeight != null and allowedTareWeight != ''">
+        and ALLOWED_TARE_WEIGHT LIKE '%${allowedTareWeight}%'
+      </if>
+      <if test="scanRequireValid != null and scanRequireValid != ''">
+        and SCAN_REQUIRE_VALID LIKE '%${scanRequireValid}%'
+      </if>
+      <if test="moxaIp != null and moxaIp != ''">
+        and MOXA_IP LIKE '%${moxaIp}%'
+      </if>
+      <if test="plcIp != null and plcIp != ''">
+        and PLC_IP LIKE '%${plcIp}%'
+      </if>
+      <if test="spotTypeNoStr != null and spotTypeNoStr != ''">
+        and SPOT_TYPE_NO in
+        <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+    </where>
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/service/impl/MeterBaseSpotInfoServiceImpl.java

@@ -176,7 +176,11 @@ public class MeterBaseSpotInfoServiceImpl extends BaseServiceImpl<MeterBaseSpotI
     @Override
     public List<MeterBaseSpotInfo> queryall(Map<String,Object> parmas)
     {
-        return meterBaseSpotInfoMapper.selectByParameters(parmas);
+        if (parmas.get("spotTypeNoStr") != null) {
+            String[] spotNoStr = parmas.get("spotTypeNoStr").toString().split(",");
+            parmas.put("spotNoStr", spotNoStr);
+        }
+        return meterBaseSpotInfoMapper.queryall(parmas);
     }
 
     @Override

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -178,6 +178,21 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "轨道衡综合查询---获取列表", notes = "分页模糊查询，参数：pageNum、pageSize、startTime、endTime、railwayTypeNoStr、baseSpotNoStr")
+    //@RequiresPermissions("meterworkrailwayactual:view")
+    @PostMapping(value = "/totalQueryByDesc")
+    public RESTfulResult totalQueryByDesc(@RequestBody HashMap parmas) {
+        try {
+            int pageNum = Integer.parseInt(parmas.get("pageNum").toString());
+            int pageSize = Integer.parseInt(parmas.get("pageSize").toString());
+            PageList<MeterWorkRailwayActFirst> list = meterWorkRailwayActFirstService.likeByDesc(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.xml

@@ -3453,16 +3453,18 @@
       <if test="cancelType != null and cancelType != ''">
         and CANCEL_TYPE LIKE '%${cancelType}%'
       </if>
-      <if test="railwayTypeNo != null and railwayTypeNo = '001019001'">
-        <if test="railwayNo != null and railwayNo != ''">
-          and RAILWAY_NO LIKE '${railwayNo}%'
-        </if>
-      </if>
-      <if test="railwayTypeNo != null and railwayTypeNo != '001019001'">
-        <if test="railwayNo != null and railwayNo != ''">
-          and RAILWAY_NO LIKE '%${railwayNo}%'
-        </if>
-      </if>
+      <choose>
+        <when test="railwayTypeNo != null and railwayTypeNo == '001019001'">
+          <if test="railwayNo != null and railwayNo != ''">
+            and  RAILWAY_NO like '${railwayNo}%'
+          </if>
+        </when>
+        <otherwise>
+          <if test="railwayNo != null and railwayNo != ''">
+            and  RAILWAY_NO like '%${railwayNo}%'
+          </if>
+        </otherwise>
+      </choose>
       <if test="railwayNoList != null and railwayNoList != ''">
         and ( railway_no in
         <foreach collection="railwayNoList" item="item" open="(" separator="," close=")">
@@ -3487,6 +3489,12 @@
           #{item}
         </foreach>
       </if>
+      <if test="baseSpotNoStr != null and baseSpotNoStr != ''">
+        and base_spot_no in
+        <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
       <if test="lcNoTemp != null and lcNoTemp != ''">
         and ( lc_no in
         <foreach collection="lcNoTemp" item="item" open="(" separator="," close=")">

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -600,6 +600,10 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             String[] typeNoStr = params.get("railwayTypeNoStr").toString().split(",");
             params.put("typeNoStr", typeNoStr);
         }
+        if(params.get("baseSpotNoStr") != null) {
+            String[] spotNoStr = params.get("baseSpotNoStr").toString().split(",");
+            params.put("spotNoStr", spotNoStr);
+        }
         List<MeterWorkRailwayActFirst> rows = meterWorkRailwayActFirstMapper.likeByDesc(params);
         PageList pageInfo = new PageList(rows);
         return pageInfo;

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/controller/MeterWorkRailwayActualController.java

@@ -101,6 +101,21 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "轨道衡综合查询---获取列表", notes = "分页模糊查询，参数：pageNum、pageSize、startTime、endTime、railwayTypeNoStr、netSpot3NoStr")
+    //@RequiresPermissions("meterworkrailwayactual:view")
+    @PostMapping(value = "/totalQueryByDesc")
+    public RESTfulResult totalQueryByDesc(@RequestBody HashMap parmas) {
+        try {
+            int pageNum = Integer.parseInt(parmas.get("pageNum").toString());
+            int pageSize = Integer.parseInt(parmas.get("pageSize").toString());
+            PageList<MeterWorkRailwayActual> list = meterWorkRailwayActualService.likeByDesc(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "C#获取列表", notes = "不分页分页模糊查询")
     @PostMapping(value = "/noPage")
     public RESTfulResult noPage(@RequestBody HashMap parmas) {

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/mapper/MeterWorkRailwayActualMapper.xml

@@ -4022,15 +4022,23 @@
       <if test="noticeNo != null and noticeNo != ''">
         and NOTICE_NO LIKE '%${noticeNo}%'
       </if>
-      <if test="railwayTypeNo != null and railwayTypeNo = '001019001'">
-        <if test="railwayNo != null and railwayNo != ''">
-          and  RAILWAY_NO like '${railwayNo}%'
-        </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
       </if>
-      <if test="railwayTypeNo != null and railwayTypeNo != '001019001'">
-        <if test="railwayNo != null and railwayNo != ''">
-          and  RAILWAY_NO like '%${railwayNo}%'
-        </if>
+      <choose>
+        <when test="railwayTypeNo != null and railwayTypeNo == '001019001'">
+          <if test="railwayNo != null and railwayNo != ''">
+            and  RAILWAY_NO like '${railwayNo}%'
+          </if>
+        </when>
+        <otherwise>
+          <if test="railwayNo != null and railwayNo != ''">
+            and  RAILWAY_NO like '%${railwayNo}%'
+          </if>
+        </otherwise>
+      </choose>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
       </if>
       <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
         and RAILWAY_CARRIAGE_NO LIKE '%${railwayCarriageNo}%'
@@ -4194,12 +4202,6 @@
       <if test="sampleNo != null and sampleNo != ''">
         and SAMPLE_NO LIKE '%${sampleNo}%'
       </if>
-      <if test="railwayTypeNo != null and railwayTypeNo != ''">
-        and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
-      </if>
-      <if test="railwayTypeName != null and railwayTypeName != ''">
-        and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
-      </if>
       <if test="waterNum != null">
         and WATER_NUM = #{waterNum}
       </if>
@@ -4251,6 +4253,12 @@
           #{item}
         </foreach>
       </if>
+      <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+        and net_spot3_no in
+        <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
       <if test="predictionType != null and predictionType != ''">
         and PREDICTION_TYPE LIKE '%${predictionType}%'
       </if>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -3102,6 +3102,10 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             String[] typeNoStr = params.get("railwayTypeNoStr").toString().split(",");
             params.put("typeNoStr", typeNoStr);
         }
+        if(params.get("netSpot3NoStr") != null) {
+            String[] spotNoStr = params.get("netSpot3NoStr").toString().split(",");
+            params.put("spotNoStr", spotNoStr);
+        }
         List<MeterWorkRailwayActual> rows = meterWorkRailwayActualMapper.likeByDesc(params);
         PageList pageInfo = new PageList(rows);
         return pageInfo;