后端修改

src/main/java/com/steerinfo/baseinfo/meterbasemattermap/service/impl/MeterBaseMatterMapServiceImpl.java

@@ -162,9 +162,8 @@ public class MeterBaseMatterMapServiceImpl extends BaseServiceImpl<MeterBaseMatt
                             //判断未被选择的委托中是否存在跟已选择的委托存在双委托关系
                             HashMap preNoSel = new HashMap();
                             preNoSel.put("carNo",carNo);
-                            preNoSel.put("valueFlag","1");
                             preNoSel.put("lineDesc","0");
-                            List<PreTrackScale> pts = preTrackScaleMapper.selectByParameters(preNoSel);
+                            List<PreTrackScale> pts = preTrackScaleMapper.selectBy(preNoSel);
                             if(pts.size() > 0) {
                                 //循环判断是否有满足的双委托，有则计数
                                 for (PreTrackScale modelPre : pts){
@@ -184,10 +183,9 @@ public class MeterBaseMatterMapServiceImpl extends BaseServiceImpl<MeterBaseMatt
                                     //判断未被选择的委托中是否存在跟映射关系已选择的委托存在双委托关系
                                     HashMap preNoSelMbmm = new HashMap();
                                     preNoSelMbmm.put("carNo",carNo);
-                                    preNoSelMbmm.put("valueFlag","1");
                                     preNoSelMbmm.put("lineDesc","0");
                                     preNoSelMbmm.put("matterNo",map.getMaaterNo2());
-                                    List<PreTrackScale> ptsMbmm = preTrackScaleMapper.selectByParameters(preNoSelMbmm);
+                                    List<PreTrackScale> ptsMbmm = preTrackScaleMapper.selectBy(preNoSelMbmm);
                                     if(ptsMbmm.size() > 0){
                                         for (PreTrackScale modelPre : ptsMbmm){
                                             if((model.getForwardingUnitNo().equals(receivingUintNo) && model.getMatterNo().equals(map.getMaaterNo2())) ||

src/main/java/com/steerinfo/baseinfo/meterbaseunitinfo/service/impl/MeterBaseUnitInfoServiceImpl.java

@@ -6,6 +6,7 @@ import com.steerinfo.baseinfo.meterbaseunitinfo.service.IMeterBaseUnitInfoServic
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -60,6 +61,12 @@ public class MeterBaseUnitInfoServiceImpl extends BaseServiceImpl<MeterBaseUnitI
             map.put("forwardingUnitNo", model.getForwardingUnitNo());
             map.put("receivingUnitNo", model.getReceivingUnitNo());
             map.put("matterNo", model.getMatterNo());
+            if(model.getCarNo() != null && StringUtils.isNotEmpty(model.getCarNo())) {
+                String carNo = model.getCarNo();
+                if(StringUtils.isNotEmpty(carNo)) {
+                    map.put("carNo", model.getCarNo());
+                }
+            }
             List<MeterBaseUnitInfo> models = meterBaseUnitInfoMapper.selectByParameters(map);
             if(models.size() == 1) {
                 rm.setMessage("配置的收货单位、发货单位、物料、车号存在相同的数据信息，请确认！！！");

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

@@ -1557,4 +1557,30 @@ throw new MarkerMetException(500, "操作异常！！");
             return failed(null, "操作异常，请确认！");
         }
     }
+
+    @ApiOperation(value = "铁水吊钩秤web端--一次数据维护", notes = "根据传入时间和火车号，查询给定时间段去重车号")
+    @GetMapping(value = "/distinctHookRailwayNo")
+    public RESTfulResult distinctHookRailwayNo(@RequestParam HashMap param) {
+        RESTfulResult rm = failed();
+        try {
+            List<String> rows = meterWorkRailwayActFirstService.distinctHookRailwayNo(param);
+            return success(rows);
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+    @ApiOperation(value = "铁水吊钩秤web端--降序获取列表", notes = "web端不分页模糊查询")
+    @PostMapping(value = "/hookFirstByDesc")
+    public RESTfulResult hookFirstByDesc(@RequestBody HashMap parmas) {
+        try {
+            List<MeterWorkRailwayActFirst> list = meterWorkRailwayActFirstService.hookFirstByDesc(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

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

@@ -56,4 +56,8 @@ public interface MeterWorkRailwayActFirstMapper extends IBaseMapper<MeterWorkRai
     List<MeterWorkRailwayActFirst> selectById(List<String> actualNoList);
     List<HashMap> batchMatchView(HashMap params);
     List<HashMap> batchMatchFirstView(HashMap params);
+
+    //铁水吊钩秤业务
+    List<MeterWorkRailwayActFirst> distinctHookRailwayNo(HashMap<String, Object> obj);
+    List<MeterWorkRailwayActFirst> hookFirstByDesc(HashMap parmas);
 }

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

@@ -729,13 +729,6 @@
       </if>
     </where>
   </sql>
-  <sql id="whereLikeTSDG">
-    <where>
-      <if test="railwayNo != null and railwayNo != ''">
-        and RAILWAY_NO LIKE '%${railwayNo}%'
-      </if>
-    </where>
-  </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from METER_WORK_RAILWAY_ACT_FIRST
     where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
@@ -3501,13 +3494,73 @@
     </where>
     order by create_time desc
   </select>
+
+  <!--001019003：静态铁水衡、001019005：吊钩秤 -->
+  <sql id="whereLikeTSDG">
+    <where>    1 = 1
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and PREDICTION_NO like '%${predictionNo}%'
+      </if>
+      <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="matterNo != null and matterNo != ''">
+        and MATTER_NO like '%${matterNo}%'
+      </if>
+      <if test="matterName != null and matterName != ''">
+        and MATTER_NAME like '%${matterName}%'
+      </if>
+      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+        and FORWARDING_UNIT_NO like '%${forwardingUnitNo}%'
+      </if>
+      <if test="forwardingUnitName != null and forwardingUnitName != ''">
+        and FORWARDING_UNIT_NAME like '%${forwardingUnitName}%'
+      </if>
+      <if test="receivingUintNo != null and receivingUintNo != ''">
+        and RECEIVING_UINT_NO like '%${receivingUintNo}%'
+      </if>
+      <if test="receivingUintName != null and receivingUintName != ''">
+        and RECEIVING_UINT_NAME like '%${receivingUintName}%'
+      </if>
+      <if test="meterTypeNo != null and meterTypeNo != ''">
+        and METER_TYPE_NO like '%${meterTypeNo}'
+      </if>
+      <if test="meterTypeName != null and meterTypeName != ''">
+        and METER_TYPE_NAME like '%${meterTypeName}%'
+      </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="senderRemark != null and senderRemark != ''">
+        and SENDER_REMARK = #{senderRemark}
+      </if>
+      <if test="isPreSacale != null and isPreSacale != ''">
+        and IS_PRE_SACALE = #{isPreSacale}
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and  value_flag = #{valueFlag}
+      </if>
+      <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>
+      and railway_type_no in ('001019003', '001019005')
+    </where>
+  </sql>
   <select id="likeByDescTSDG" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLikeTSDG"/>
-    and matter_no in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
     and value_flag in ('0', '1')
     order by create_time desc
   </select>
@@ -3822,4 +3875,20 @@
   <select id="getFirstLcNo" parameterType="java.lang.String" resultType="String">
     select distinct lc_no from METER_WORK_RAILWAY_ACT_FIRST A where actual_first_no = #{actualFirstNo}
   </select>
+
+  <select id="distinctHookRailwayNo" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    SELECT distinct railway_no, create_time
+    from METER_WORK_RAILWAY_ACT_FIRST
+    <include refid="whereLikeTSDG" />
+    <if test="valueFlag != null and valueFlag != ''">
+      and  value_flag = #{valueFlag}
+    </if>
+    order by create_time desc
+  </select>
+
+  <select id="hookFirstByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLikeTSDG" />
+    order by create_time desc
+  </select>
 </mapper>

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

@@ -159,6 +159,8 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
 
     RESTfulResult doRecovery(List<MeterWorkRailwayActFirst> models);
 
-
+    //铁水吊钩秤web端
+    List<String> distinctHookRailwayNo(HashMap<String, Object> param);
+    List<MeterWorkRailwayActFirst> hookFirstByDesc(HashMap<String, Object> parameters);
 }
 

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

@@ -6814,9 +6814,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     public PageList<MeterWorkRailwayActFirst> likeByDescTSDG(HashMap<String, Object> param, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         HashMap<String, Object> obj = new HashMap<>();
-        obj.put("pBaseCode", "001036");
-        List<String> matterList = comBaseInfoMapper.matterNoByBaseCode(obj);
-        param.put("list", matterList);
+//        obj.put("pBaseCode", "001036");
+//        List<String> matterList = comBaseInfoMapper.matterNoByBaseCode(obj);
+//        param.put("list", matterList);
         List<MeterWorkRailwayActFirst> rows = meterWorkRailwayActFirstMapper.likeByDescTSDG(param);
         PageList pageInfo = new PageList(rows);
         return pageInfo;
@@ -9150,5 +9150,39 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return rm;
     }
 
+    @Override
+    public List<String> distinctHookRailwayNo(HashMap<String, Object> param) {
+        List<MeterWorkRailwayActFirst> templist = meterWorkRailwayActFirstMapper.distinctHookRailwayNo(param);
+        List<String> list = new ArrayList<>();
+        if (templist != null && !templist.isEmpty() ) {
+            try{
+                list = templist.stream().map(MeterWorkRailwayActFirst::getRailwayNo).distinct().collect(Collectors.toList());
+                if(list==null && list.isEmpty()) {
+                    list.add("");
+                }
+            }catch (Exception e) {
+                list.add("");
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public List<MeterWorkRailwayActFirst> hookFirstByDesc(HashMap<String, Object> parameters) {
+//        String[] railwayNoList = parameters.get("railwayNoList") == null? "".split(",") :parameters.get("railwayNoList").toString().split(",");
+//        parameters.remove("railwayNoList");
+//        parameters.put("railwayNoList", railwayNoList);
+//        for (String str: railwayNoList) {
+//            if(str.equals("")) {
+//                parameters.put("railwayNoNull", "1");
+//                break;
+//            }else {
+//                parameters.put("railwayNoNull", "");
+//            }
+//        }
+        List<MeterWorkRailwayActFirst> rows = meterWorkRailwayActFirstMapper.hookFirstByDesc(parameters);
+        return rows;
+    }
+
 
 }

src/main/java/com/steerinfo/pretrack/prerailwayscale/controller/PreRailwayScaleController.java

@@ -477,4 +477,16 @@ throw new MarkerMetException(500, "操作异常！！");
 throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "铁水吊钩秤web端--降序获取委托列表", notes = "不分页模糊查询静态铁水衡和吊钩秤委托")
+    @GetMapping(value = "/hookScaleByDesc/")
+    public RESTfulResult hookScaleByDesc(@RequestParam HashMap parmas) {
+        try {
+            List<PreRailwayScale> list = preRailwayScaleService.hookScaleByDesc(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

src/main/java/com/steerinfo/pretrack/prerailwayscale/mapper/PreRailwayScaleMapper.java

@@ -60,4 +60,7 @@ public interface PreRailwayScaleMapper extends IBaseMapper<PreRailwayScale, Stri
 
     //净重数据维护界面----根据净重车号查询当前车号已匹配的委托和未使用的有效委托
     List<PreRailwayScale> selectByScale(HashMap params);
+
+    //铁水吊钩秤业务
+    List<PreRailwayScale> hookScaleByDesc(Map<String, Object> var1);
 }

src/main/java/com/steerinfo/pretrack/prerailwayscale/mapper/PreRailwayScaleMapper.xml

@@ -3219,5 +3219,23 @@
   </select>
 
 
+  <select id="hookScaleByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="TSDGwhereLike"/>
+    and matter_no in
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+    <if test="predictionNo != null and predictionNo != ''">
+      and (   PREDICTION_NO = #{predictionNo}
+      or (value_flag in ('1', '0') and TRUST_AVAILABILITY_TIME &gt;= SYSDATE) )
+    </if>
+    <if test="predictionNo == null or predictionNo == ''">
+      and value_flag in ('1', '0')
+      and TRUST_AVAILABILITY_TIME &gt;= SYSDATE
+    </if>
+    order by TRUST_DATE_TIME desc
+  </select>
+
   </mapper>
 

src/main/java/com/steerinfo/pretrack/prerailwayscale/service/IPreRailwayScaleService.java

@@ -51,4 +51,7 @@ public interface IPreRailwayScaleService extends IBaseService<PreRailwayScale, S
     PageList<PreRailwayScale> likeByList(HashMap param, Integer pageNum, Integer pageSize);
     List<PreRailwayScale> noPage(HashMap param);
     List<PreRailwayScale> noPageDesc(HashMap param);
+
+    //铁水吊钩秤业务
+    List<PreRailwayScale> hookScaleByDesc(HashMap param);
 }

src/main/java/com/steerinfo/pretrack/prerailwayscale/service/impl/PreRailwayScaleServiceImpl.java

@@ -345,6 +345,16 @@ public class PreRailwayScaleServiceImpl extends BaseServiceImpl<PreRailwayScale,
         return rows;
     }
 
+    @Override
+    public List<PreRailwayScale> hookScaleByDesc(HashMap param) {
+        HashMap<String, Object> obj = new HashMap<>();
+        obj.put("pBaseCode", "001036");
+        List<String> matterList = comBaseInfoMapper.matterNoByBaseCode(obj);
+        param.put("list", matterList);
+        List<PreRailwayScale> rows = preRailwayScaleMapper.hookScaleByDesc(param);
+        return rows;
+    }
+
 
     @Autowired
     DataSource dataSource;