后端提交

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

@@ -120,6 +120,18 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "降序获取列表", notes = "web端不分页模糊查询")
+    @PostMapping(value = "/webByLikeDesc")
+    public RESTfulResult webByLikeDesc(@RequestBody HashMap parmas) {
+        try {
+            List<MeterWorkRailwayActFirst> list = meterWorkRailwayActFirstService.webByLikeDesc(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -266,6 +278,24 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
+    @ApiOperation(value = "C#动轨新增数据", notes = "根据MeterWorkRailwayActFirst对象创建")
+    @ApiImplicitParam(name = "MeterWorkRailwayActFirst", value = "详细实体MeterWorkRailwayActFirst", required = true, dataType = "MeterWorkRailwayActFirst")
+    @PostMapping(value = "/dynamicAdd")
+    public RESTfulResult dynamicAdd(@RequestBody MeterWorkRailwayActFirst model) {
+        RESTfulResult rm = failed();
+        try {
+            rm = meterWorkRailwayActFirstService.dynamicAdd(model);
+            return rm;
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        }
+        return rm;
+    }
+
 
     @ApiOperation(value = "修改数据", notes = "根据MeterWorkRailwayActFirst对象创建")
     @PostMapping(value = "/update")
@@ -445,18 +475,7 @@ throw new MarkerMetException(500, "操作异常！！");
     public RESTfulResult distinctRailwayNo(@RequestParam HashMap param) {
         RESTfulResult rm = failed();
         try {
-            String railwayTypeNo = param.get("railwayTypeNo") == null ? "":param.get("railwayTypeNo").toString();
-            String lcNo = param.get("lcNo") == null ? "" : param.get("lcNo").toString();
-            String railwayNo = param.get("railwayNo") == null ? "":param.get("railwayNo").toString();
-            String startTime = param.get("startTime") == null ? "":param.get("startTime").toString();
-            String endTime = param.get("endTime") == null ? "":param.get("endTime").toString();
-            String baseSpotNo = param.get("baseSpotNo") == null ? "": param.get("baseSpotNo").toString();
-            String matterName = param.get("matterName") == null ? "": param.get("matterName").toString();
-            String predictionNo = param.get("predictionNo") == null ? "": param.get("predictionNo").toString();
-            String forwardingUnitName = param.get("forwardingUnitName") == null ? "": param.get("forwardingUnitName").toString();
-            String receivingUintName = param.get("receivingUintName") == null ? "": param.get("receivingUintName").toString();
-            String valueFlag = param.get("valueFlag") == null ? "":param.get("valueFlag").toString();
-            List<String> rows = meterWorkRailwayActFirstService.distinctRailwayNo(railwayTypeNo, lcNo, railwayNo, startTime, endTime, baseSpotNo, matterName, predictionNo, forwardingUnitName,receivingUintName,valueFlag);
+            List<String> rows = meterWorkRailwayActFirstService.distinctRailwayNo(param);
             return success(rows);
         } catch (Exception e) {
             e.printStackTrace();
@@ -465,15 +484,12 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "一次数据维护-网页", notes = "根据传入时间查询去重列次编号")
+    @ApiOperation(value = "一次数据维护-网页", notes = "根据传入开始时间、结束时间、轨道衡类型、车号、计量点编号、及连点去重列次编号")
     @PostMapping(value = "/distinctLcNo")
     public RESTfulResult distinctLcNo(@RequestBody HashMap param) {
         RESTfulResult rm = failed();
         try {
-            String railwayTypeNo = param.get("railwayTypeNo") == null ? "":param.get("railwayTypeNo").toString();
-            String startTime = param.get("startTime") == null ? "":param.get("startTime").toString();
-            String endTime = param.get("endTime") == null ? "":param.get("endTime").toString();
-            List<String> rows = meterWorkRailwayActFirstService.distinctLcNo(railwayTypeNo, startTime, endTime);
+            List<String> rows = meterWorkRailwayActFirstService.distinctLcNo(param);
             return success(rows);
         } catch (Exception e) {
             e.printStackTrace();
@@ -487,15 +503,7 @@ throw new MarkerMetException(500, "操作异常！！");
     public RESTfulResult distinctLcNoAndRailwayNo(@RequestBody HashMap param) {
         RESTfulResult rm = failed();
         try {
-            String railwayTypeNo = param.get("railwayTypeNo") == null ? "":param.get("railwayTypeNo").toString();
-            String startTime = param.get("startTime") == null ? "":param.get("startTime").toString();
-            String endTime = param.get("endTime") == null ? "":param.get("endTime").toString();
-            String railwayNo = param.get("railwayNo") == null ? "":param.get("railwayNo").toString();
-            String baseSpotName = param.get("baseSpotName") == null ? "": param.get("baseSpotName").toString();
-            String matterName = param.get("matterName") == null ? "": param.get("matterName").toString();
-            String predictionNo = param.get("predictionNo") == null ? "": param.get("predictionNo").toString();
-            String valueFlag = param.get("valueFlag") == null ? "":param.get("valueFlag").toString();
-            rm = meterWorkRailwayActFirstService.distinctLcNoAndRailwayNo(railwayTypeNo, startTime, endTime, railwayNo, baseSpotName, matterName,predictionNo, valueFlag);
+            rm = meterWorkRailwayActFirstService.distinctLcNoAndRailwayNo(param);
             return rm;
         }catch (Exception e) {
             e.printStackTrace();

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

@@ -3356,7 +3356,6 @@
       <if test="railwayTypeName != null and railwayTypeName != ''">
         and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
       </if>
-
       <if test="railwayModelNo != null and railwayModelNo != ''">
         and RAILWAY_MODEL_NO LIKE '%${railwayModelNo}%'
       </if>
@@ -3462,6 +3461,16 @@
       <if test="startTime != null and startTime != null and endTime != '' and endTime != ''">
         and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
       </if>
+      <if test="lcNoTemp != null and lcNoTemp != ''">
+        and lc_no in
+        <foreach collection="lcNoTemp" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+      <!--静轨组列次号需要-->
+      <if test="flag != null and flag != ''">
+        and value_flag in ('1','2')
+      </if>
     </where>
     order by create_time desc
   </select>
@@ -3480,27 +3489,37 @@
     SELECT distinct RAILWAY_NO
     from METER_WORK_RAILWAY_ACT_FIRST
     where 1=1
-    <if test="valueFlag != null and valueFlag != ''">
-      and  VALUE_FLAG = #{valueFlag}
-    </if>
     <!--and RAILWAY_NO like '%${railwayNo}%'-->
     <if test="railwayTypeNo != null and railwayTypeNo != ''">
       and  RAILWAY_TYPE_NO = #{railwayTypeNo}
     </if>
-    <if test="lcNo != null and lcNo != ''">
-      and lc_No like '%${lcNo}%'
+    and lc_no in
+    <foreach collection="lcNoTemp" item="item" open="(" separator="," close=")">
+      #{item}
+    </foreach>
+<!--    <if test="lcNo != null and lcNo != ''">-->
+<!--      and lc_No in (#{lcNo})-->
+<!--    </if>-->
+    <if test="railwayNo != null and railwayNo != ''">
+      and  RAILWAY_NO like '%${railwayNo}%'
     </if>
     <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
       and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>
+    <if test="matterNo != null and matterNo != ''">
+      and  matter_no like '%${matterNo}%'
+    </if>
     <if test="matterName != null and matterName != ''">
       and  matter_name like  '%${matterName}%'
     </if>
     <if test="baseSpotNo != null and baseSpotNo != ''">
-      and  base_spot_no = #{baseSpotNo}
+      and  base_spot_No like '%${baseSpotNo}%'
+    </if>
+    <if test="baseSpotName != null and baseSpotName != ''">
+      and  base_spot_name like '%${baseSpotName}%'
     </if>
     <if test="predictionNo != null and predictionNo != ''">
-      and  prediction_no =  #{predictionNo}
+      and  prediction_no like '%${predictionNo}%'
     </if>
     <if test="forwardingUnitName != null and forwardingUnitName != ''">
       and  forwarding_Unit_Name like '%${forwardingUnitName}%'
@@ -3509,10 +3528,7 @@
       and  receiving_uint_name like  '%${receivingUintName}%'
     </if>
     <if test="valueFlag != null and valueFlag != ''">
-      and  value_flag = #{valueFlag}
-    </if>
-    <if test="railwayNo != null and railwayNo != ''">
-      and  RAILWAY_NO like '%${railwayNo}%'
+      and  VALUE_FLAG = #{valueFlag}
     </if>
   </select>
 
@@ -3529,16 +3545,34 @@
     <if test="railwayNo != null and railwayNo != ''">
       and  railway_no like  '%${railwayNo}%'
     </if>
+    <if test="baseSpotNo != null and baseSpotNo != ''">
+      and  base_spot_No like '%${baseSpotNo}%'
+    </if>
     <if test="baseSpotName != null and baseSpotName != ''">
-      and  base_spot_name = #{baseSpotName}
+      and  base_spot_name like '%${baseSpotName}%'
+    </if>
+    <if test="matterNo != null and matterNo != ''">
+      and  matter_no like '%${matterNo}%'
+    </if>
+    <if test="matterName != null and matterName != ''">
+      and  matter_name like '%${matterName}%'
     </if>
     <if test="predictionNo != null and predictionNo != ''">
-      and  prediction_no =  #{predictionNo}
+      and  prediction_no like '%${predictionNo}%'
+    </if>
+    <if test="forwardingUnitName != null and forwardingUnitName != ''">
+      and  forwarding_Unit_Name like '%${forwardingUnitName}%'
+    </if>
+    <if test="receivingUintName != null and receivingUintName != ''">
+      and  receiving_Uint_Name like '%${receivingUintName}%'
     </if>
     <if test="valueFlag != null and valueFlag != ''">
       and  value_flag = #{valueFlag}
     </if>
-    and lc_no is not null
+    <if test="lcNo != null and lcNo != ''">
+      and  lc_No like '%${lcNo}%'
+    </if>
+--     and lc_no is not null
   </select>
 
   <update id="repairPre" parameterType="java.util.HashMap">

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/IMeterWorkRailwayActFirstService.java

@@ -37,6 +37,7 @@ import java.util.Map;
  */
 public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWorkRailwayActFirst, String>{
     RESTfulResult checkandadd(MeterWorkRailwayActFirst model);
+    RESTfulResult dynamicAdd(MeterWorkRailwayActFirst model);
 
     int checkandupdate(MeterWorkRailwayActFirst model);
     List<MeterWorkRailwayActFirst> noPage(HashMap<String, Object> params);
@@ -59,12 +60,11 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     PageList<MeterWorkRailwayActFirst> selectTa(Map<String, Object> parmas, Integer pageNum, Integer pageSize);
 
     PageList<MeterWorkRailwayActFirst> likeByDesc(HashMap<String, Object> parameters, Integer pageNum, Integer pageSize);
+    List<MeterWorkRailwayActFirst> webByLikeDesc(HashMap<String, Object> parameters);
 
-    List<String> distinctRailwayNo(String railwayTypeNo, String lcNo, String railwayNo, String startTime, String endTime, String baseSpotNo,String matterName, String predictionNo,String forwardingUnitName,String receivingUintName,String valueFlag);
-
-    List<String> distinctLcNo(String railwayTypeNo, String startTime, String endTime);
-
-    RESTfulResult distinctLcNoAndRailwayNo(String railwayTypeNo, String startTime, String endTime, String railwayNo, String baseSpotName, String matterName, String predictionNo,String valueFlag);
+    List<String> distinctRailwayNo(HashMap<String, Object> param);
+    List<String> distinctLcNo(HashMap<String, Object> param);
+    RESTfulResult distinctLcNoAndRailwayNo(HashMap<String, Object> param);
 
     List<MeterWorkRailwayActFirst> selectNet(String weightType, String railwayNo, String flag);
 

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

@@ -159,6 +159,63 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return rm;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public RESTfulResult dynamicAdd(MeterWorkRailwayActFirst model) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            String userId, userName;
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch(Exception e) {
+                userId = "admin";
+                userName = "admins";
+            }
+
+            ///判断这个火车号是不是存在未结净的一次皮重数据，存在的话就把传的一次数据当作作废的存进去，不存在就直接存进去
+            HashMap<String, Object> obj = new HashMap<>();
+            obj.put("weightType", "1");
+            obj.put("railwayNo", model.getRailwayNo());
+            obj.put("valueFlag", "1");
+            List<MeterWorkRailwayActFirst> modelList = meterWorkRailwayActFirstMapper.selectByParameters(obj);
+            if(modelList.size() >= 1) {
+                for (MeterWorkRailwayActFirst model_i:
+                     modelList) {
+                    model_i.setValueFlag("0");
+                    model_i.setNote("一次新增，作废皮重");
+                    model_i.setUpdateManNo(userId);
+                    model_i.setUpdateManName(userName);
+                    model_i.setUpdateTime(new Date());
+                    meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model_i);
+                }
+            }
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            model.setActualFirstNo(sdf + meterWorkRailwayActFirstMapper.getNewID(sdf.format(new Date())));
+            model.setCreateManNo(userId);
+            model.setCreateManName(userName);
+            model.setCreateTime(new Date());
+            model.setValueFlag("1");
+            model.setCheckFlag("0");
+            model.setMeterMode("3");
+            model.setDataSource("1");
+            model.setIsPreSacale("0");
+            model.setHc15("0");
+            model.setNote("一次新增");
+            meterWorkRailwayActFirstMapper.insertSelective(model);
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            rm.setData(model.getActualFirstNo());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常,请确认！！>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -387,32 +444,80 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return pageInfo;
     }
 
+    @Override
+    public List<MeterWorkRailwayActFirst> webByLikeDesc(HashMap<String, Object> parameters) {
+        String[] lcNoTemp = parameters.get("lcNoTemp").toString().split(",");
+        parameters.remove("lcNoTemp");
+        parameters.put("lcNoTemp", lcNoTemp);
+        List<MeterWorkRailwayActFirst> rows = meterWorkRailwayActFirstMapper.likeByDesc(parameters);
+        return rows;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<String> distinctRailwayNo(String railwayTypeNo, String lcNo, String railwayNo, String startTime, String endTime, String baseSpotNo, String matterName, String predictionNo, String forwardingUnitName, String receivingUintName, String valueFlag) {
-        HashMap<String, Object> obj = new HashMap<>();
-        obj.put("railwayTypeNo", railwayTypeNo);
-        obj.put("lcNo", lcNo);
-        obj.put("railwayNo", railwayNo);
-        obj.put("startTime", startTime);
-        obj.put("endTime", endTime);
-        obj.put("baseSpotNo", baseSpotNo);
-        obj.put("matterName", matterName);
-        obj.put("predictionNo", predictionNo);
-        obj.put("forwardingUnitName", forwardingUnitName);
-        obj.put("receivingUintName", receivingUintName);
-        obj.put("valueFlag", valueFlag);
-        List<String> list = meterWorkRailwayActFirstMapper.distinctRailwayNo(obj).stream().map(MeterWorkRailwayActFirst::getRailwayNo).collect(Collectors.toList());
+    public List<String> distinctRailwayNo(HashMap<String, Object> param) {
+//        String railwayTypeNo = param.get("railwayTypeNo") == null ? "":param.get("railwayTypeNo").toString();
+//        String lcNo = param.get("lcNo") == null ? "" : param.get("lcNo").toString();
+//        String railwayNo = param.get("railwayNo") == null ? "":param.get("railwayNo").toString();
+//        String startTime = param.get("startTime") == null ? "":param.get("startTime").toString();
+//        String endTime = param.get("endTime") == null ? "":param.get("endTime").toString();
+//        String baseSpotNo = param.get("baseSpotNo") == null ? "": param.get("baseSpotNo").toString();
+//        String matterName = param.get("matterName") == null ? "": param.get("matterName").toString();
+//        String predictionNo = param.get("predictionNo") == null ? "": param.get("predictionNo").toString();
+//        String forwardingUnitName = param.get("forwardingUnitName") == null ? "": param.get("forwardingUnitName").toString();
+//        String receivingUintName = param.get("receivingUintName") == null ? "": param.get("receivingUintName").toString();
+//        String valueFlag = param.get("valueFlag") == null ? "":param.get("valueFlag").toString();
+//
+//        HashMap<String, Object> obj = new HashMap<>();
+//        obj.put("railwayTypeNo", railwayTypeNo);
+//        obj.put("lcNo", lcNo);
+//        obj.put("railwayNo", railwayNo);
+//        obj.put("startTime", startTime);
+//        obj.put("endTime", endTime);
+//        obj.put("baseSpotNo", baseSpotNo);
+//        obj.put("matterName", matterName);
+//        obj.put("predictionNo", predictionNo);
+//        obj.put("forwardingUnitName", forwardingUnitName);
+//        obj.put("receivingUintName", receivingUintName);
+//        obj.put("valueFlag", valueFlag);
+        String[] lcNoTemp = param.get("lcNo").toString().split(",");
+//        param.remove("lcNo");
+        param.put("lcNoTemp", lcNoTemp);
+        List<String> list = meterWorkRailwayActFirstMapper.distinctRailwayNo(param)
+                .stream()
+                .map(MeterWorkRailwayActFirst::getRailwayNo)
+                .collect(Collectors.toList());
         return list;
     }
 
     @Override
-    public List<String> distinctLcNo(String railwayTypeNo, String startTime, String endTime) {
-        HashMap<String, Object> obj = new HashMap<>();
-        obj.put("railwayTypeNo", railwayTypeNo);
-        obj.put("startTime", startTime);
-        obj.put("endTime", endTime);
-        List<MeterWorkRailwayActFirst> templist = meterWorkRailwayActFirstMapper.distinctLcNo(obj);
+    public List<String> distinctLcNo(HashMap<String, Object> param) {
+//        String railwayTypeNo = param.get("railwayTypeNo") == null ? "":param.get("railwayTypeNo").toString();
+//        String startTime = param.get("startTime") == null ? "":param.get("startTime").toString();
+//        String endTime = param.get("endTime") == null ? "":param.get("endTime").toString();
+//        String railwayNo = param.get("railwayNo") == null ? "": param.get("railwayNo").toString();
+//        String baseSpotNo = param.get("baseSpotNo") == null ? "":param.get("baseSpotNo").toString();
+//        String matterName = param.get("matterName") == null ? "":param.get("matterName").toString();
+//        String predictionNo = param.get("predictionNo") == null ? "":param.get("predictionNo").toString();
+//        String forwardingUnitName = param.get("forwardingUnitName") == null ? "": param.get("forwardingUnitName").toString();
+//        String receivingUintName = param.get("receivingUintName") == null ? "":param.get("receivingUintName").toString();
+//        String valueFlag = param.get("valueFlag") == null ? "": param.get("valueFlag").toString();
+//        String lcNo = param.get("lcNo") == null ? "": param.get("lcNo").toString();
+//
+//        HashMap<String, Object> obj = new HashMap<>();
+//        obj.put("railwayTypeNo", railwayTypeNo);
+//        obj.put("startTime", startTime);
+//        obj.put("endTime", endTime);
+//        obj.put("railwayNo", railwayNo);
+//        obj.put("baseSpotNo", baseSpotNo);
+//        obj.put("matterName", matterName);
+//        obj.put("predictionNo", predictionNo);
+//        obj.put("forwardingUnitName", forwardingUnitName);
+//        obj.put("receivingUintName", receivingUintName);
+//        obj.put("valueFlag", valueFlag);
+//        obj.put("lcNo", lcNo);
+
+        List<MeterWorkRailwayActFirst> templist = meterWorkRailwayActFirstMapper.distinctLcNo(param);
         List<String> list = null;
         if (templist.size() != 0) {
             list = templist.stream().map(MeterWorkRailwayActFirst::getLcNo).distinct().collect(Collectors.toList());
@@ -421,34 +526,45 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     }
 
     @Override
-    public RESTfulResult distinctLcNoAndRailwayNo(String railwayTypeNo, String startTime, String endTime, String railwayNo, String baseSpotName, String matterName, String predictionNo, String valueFlag) {
+    public RESTfulResult distinctLcNoAndRailwayNo(HashMap<String, Object> param) {
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try {
-            HashMap<String, Object> param = new HashMap<>();
+//            String railwayTypeNo = param.get("railwayTypeNo") == null ? "":param.get("railwayTypeNo").toString();
+//            String startTime = param.get("startTime") == null ? "":param.get("startTime").toString();
+//            String endTime = param.get("endTime") == null ? "":param.get("endTime").toString();
+//            String railwayNo = param.get("railwayNo") == null ? "":param.get("railwayNo").toString();
+//            String baseSpotName = param.get("baseSpotName") == null ? "": param.get("baseSpotName").toString();
+//            String matterName = param.get("matterName") == null ? "": param.get("matterName").toString();
+//            String predictionNo = param.get("predictionNo") == null ? "": param.get("predictionNo").toString();
+//            String valueFlag = param.get("valueFlag") == null ? "":param.get("valueFlag").toString();
+//
+//            HashMap<String, Object> param = new HashMap<>();
+//            HashMap<String, Object> obj = new HashMap<>();
+//            obj.put("railwayTypeNo", railwayTypeNo);
+//            obj.put("startTime", startTime);
+//            obj.put("endTime", endTime);
+//            obj.put("railwayNo", railwayNo);
+//            obj.put("baseSpotName", baseSpotName);
+//            obj.put("matterName", matterName);
+//            obj.put("predictionNo", predictionNo);
+//            obj.put("valueFlag", valueFlag);
+
             HashMap<String, Object> obj = new HashMap<>();
-            obj.put("railwayTypeNo", railwayTypeNo);
-            obj.put("startTime", startTime);
-            obj.put("endTime", endTime);
-            obj.put("railwayNo", railwayNo);
-            obj.put("baseSpotName", baseSpotName);
-            obj.put("matterName", matterName);
-            obj.put("predictionNo", predictionNo);
-            obj.put("valueFlag", valueFlag);
 
-            List<MeterWorkRailwayActFirst> tempList = meterWorkRailwayActFirstMapper.distinctLcNo(obj);
+            List<MeterWorkRailwayActFirst> tempList = meterWorkRailwayActFirstMapper.distinctLcNo(param);
             List<String> list = null;
             List<String> railwayNum = null;
             if (tempList.size() != 0) {
                 list = tempList.stream().map(MeterWorkRailwayActFirst::getLcNo).distinct().collect(Collectors.toList());
                 railwayNum = tempList.stream().map(MeterWorkRailwayActFirst::getRailwayNo).distinct().collect(Collectors.toList());
             }
-            param.put("LcList", list);
-            param.put("railwayNoList", railwayNum);
+            obj.put("LcList", list);
+            obj.put("railwayNoList", railwayNum);
             rm.setSucceed();
             rm.setCode("200");
             rm.setMessage("操作成功！！");
-            rm.setData(param);
+            rm.setData(obj);
         } catch (Exception e) {
             e.printStackTrace();
             rm.setMessage("操作异常！！>>" + e.getMessage());

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

@@ -4058,11 +4058,11 @@
         <if test="railwayNo != null and railwayNo != ''">
             and railway_no like '%railwayNo%'
         </if>
-        and value_flag != '0'
         and forwarding_unit_no in
-        <foreach collection="list" item="item" separator="," open="(" close=")">
-            #{item}
+        <foreach collection="list" item="id" separator="," open="(" close=")">
+          #{id}
         </foreach>
-        order by net_time desc
+        and value_flag != '0'
+    order by net_time desc
   </select>
 </mapper>

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

@@ -2095,7 +2095,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             obj.put("pBaseCode", "001038");
             List<String> matterModels = comBaseInfoMapper.matterNoByBaseCode(obj);
             params.put("list", matterModels);
-            List<MeterWorkRailwayActual> actualModels = meterWorkRailwayActualMapper.autoPrintRailway(obj);
+            List<MeterWorkRailwayActual> actualModels = meterWorkRailwayActualMapper.autoPrintRailway(params);
 
             rm.setSucceed();
             rm.setCode("200");