提交修改

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -327,6 +327,24 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         return rm;
     }
 
+    @ApiOperation(value = "查询一次计量-C#", notes = "根据车号查询未使用和使用中的预报")
+    @GetMapping(value = "/queryFirst")
+    public RESTfulResult queryFirst(@RequestParam String carNo) {
+        RESTfulResult rm = failed();
+        try {
+            rm = meterWorkCarActualFirstService.queryFirst(carNo);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "启用", notes = "根据MeterWorkCarActualFirst对象创建")
     @PostMapping(value = "/recover")
     public RESTfulResult recover(@RequestBody List<MeterWorkCarActualFirst> models) {

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

@@ -20,6 +20,8 @@ public interface MeterWorkCarActualFirstMapper extends IBaseMapper<MeterWorkCarA
 
     List<MeterWorkCarActualFirst> selectTa(Map<String, Object> parmas);
 
+    List<MeterWorkCarActualFirst> selectByCarNo(@Param(value = "carNo") String carNo);
+
     List<MeterWorkCarActualFirst> selectNet(@Param(value = "weightType") String weightType, @Param(value = "carNo") String carNo);
 
     List<StaffPerformanceAnalysis> analysis(HashMap<String, Object> obj);

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

@@ -2415,6 +2415,13 @@
         </where>
     </select>
 
+    <select id="selectByCarNo" parameterType="java.lang.String" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <where>
+            VALUE_FLAG IN ('1', '3') AND CAR_NO= #{carNo,jdbcType=VARCHAR} order by create_time desc
+        </where>
+    </select>
+
     <select id="selectView" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         SELECT
         <include refid="columns"/>

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/IMeterWorkCarActualFirstService.java

@@ -69,6 +69,8 @@ public interface IMeterWorkCarActualFirstService extends IBaseService<MeterWorkC
 
     RESTfulResult doQueryWf(MeterWorkCarActualFirst oci);
 
+    RESTfulResult queryFirst(String carNo);
+
     RESTfulResult doUpdateWf(MeterWorkCarActualFirst oci);
 
     RESTfulResult doAddInnerWf(MeterWorkCarActualFirst oci, String saveTare, MeterMonitorNote note) throws Exception;

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -716,6 +716,20 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         return rm;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public RESTfulResult queryFirst(String carNo) {
+        RESTfulResult rm = new RESTfulResult();
+        try {
+            rm.setCode("200");
+            rm.setData(meterWorkCarActualFirstMapper.selectByCarNo(carNo));
+        } catch (Exception ex) {
+            rm.setCode("500");
+            rm.setMessage("查询失败：" + ex.getMessage());
+        }
+        return rm;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public RESTfulResult doUpdateWf(MeterWorkCarActualFirst oci) {

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.java

@@ -1,6 +1,7 @@
 package com.steerinfo.pretrack.pretrackscale.mapper;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import feign.Param;
 import org.apache.ibatis.annotations.Mapper;
@@ -11,6 +12,7 @@ import java.util.Objects;
 
 @Mapper
 public interface PreTrackScaleMapper extends IBaseMapper<PreTrackScale, String> {
+    // 根据车号查询未使用和使用中的预报
     List<PreTrackScale> selectlist(@Param( value = "carNo") String carNo);
 
     List<PreTrackScale> selectView(Map<String, Objects> param);

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.xml

@@ -2926,7 +2926,7 @@
 
     <select id="selectlist" parameterType="java.lang.String" resultMap="BaseResultMap">
         <include refid="select"/>
-        where CAR_NO=#{carNo,jdbcType=VARCHAR} and (value_flag='1' or value_flag='4' )
+        where CAR_NO=#{carNo,jdbcType=VARCHAR} and (value_flag='1' or value_flag='4' ) order by create_time desc
     </select>
     <select id="selectView" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         SELECT