提交修改

src/main/java/com/steerinfo/meterwork/meterworkcaractual/controller/MeterWorkCarActualController.java

@@ -441,6 +441,34 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
+    @ApiOperation(value = "查询计量票据录入数据")
+    @PostMapping(value = "/selectManualData")
+    @Transactional(rollbackFor = Exception.class)
+    public RESTfulResult selectManualData(@RequestBody CommonPage<MeterWorkCarActual> oci) throws IOException, ParseException {
+        RESTfulResult rm = failed();
+        Map<String, Object> map = FieldsCollector.beanToMap(oci.getParam());
+
+        try {
+            if (StringUtils.isNotEmpty(oci.getStartTime()) && StringUtils.isNotEmpty(oci.getEndTime())) {
+                map.put("startTime", oci.getStartTime());
+                map.put("endTime", oci.getEndTime());
+            }
+            map.put("dataSource", "4");
+            PageHelper.startPage(oci.getPageNum(), oci.getPageSize());
+            List<MeterWorkCarActual> rows = meterWorkCarActualMapper.selectManualData(map);
+            PageList pageInfo = new PageList(rows);
+            return success(pageInfo);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "期限洁净")
     @PostMapping(value = "/termclean")
     public RESTfulResult termclean(@RequestParam String actualFirstNo, String dataNo) {

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

@@ -33,6 +33,8 @@ public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual
 
     List<MeterWorkCarActual> selectParameters(Map<String, Object> map);
 
+    List<MeterWorkCarActual> selectManualData(Map<String, Object> map);
+
     int selectCarNoCount(Map<String, Object> map);
 
     //查询需要

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

@@ -3296,6 +3296,59 @@
         </if>
     </select>
 
+    <!--  查询计量票据录入产生的数据  -->
+    <select id="selectManualData" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <where>
+            (DATA_SOURCE = 4)
+            <if test="predictionNo != null and predictionNo != ''">
+                and PREDICTION_NO = #{predictionNo}
+            </if>
+            <if test="carNo != null and carNo != ''">
+                and CAR_NO = #{carNo}
+            </if>
+            <if test="matterNo != null and matterNo != ''">
+                and MATTER_NO = #{matterNo}
+            </if>
+            <if test="matterName != null and matterName != ''">
+                and MATTER_NAME = #{matterName}
+            </if>
+            <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+                and FORWARDING_UNIT_NO = #{forwardingUnitNo}
+            </if>
+            <if test="forwardingUnitName != null and forwardingUnitName != ''">
+                and FORWARDING_UNIT_NAME = #{forwardingUnitName}
+            </if>
+            <if test="receivingUintNo != null and receivingUintNo != ''">
+                and RECEIVING_UINT_NO = #{receivingUintNo}
+            </if>
+            <if test="receivingUintName != null and receivingUintName != ''">
+                and RECEIVING_UINT_NAME = #{receivingUintName}
+            </if>
+            <if test="grossTime != null">
+                and TO_CHAR(GROSS_TIME,'yyyy-MM-dd') = #{grossTime}
+            </if>
+            <if test="baseSpot1No != null and baseSpot1No != ''">
+                and BASE_SPOT1_NO = #{baseSpot1No}
+            </if>
+            <if test="baseSpot1Name != null and baseSpot1Name != ''">
+                and BASE_SPOT1_NAME = #{baseSpot1Name}
+            </if>
+            <if test="tareTime != null">
+                and TO_CHAR(TARE_TIME,'yyyy-MM-dd') = #{tareTime}
+            </if>
+            <if test="baseSpot2No != null and baseSpot2No != ''">
+                and BASE_SPOT2_NO = #{baseSpot2No}
+            </if>
+            <if test="baseSpot2Name != null and baseSpot2Name != ''">
+                and BASE_SPOT2_NAME = #{baseSpot2Name}
+            </if>
+            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+                and  NET_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and NET_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+            </if>
+        </where> order by net_time asc
+    </select>
+
     <!--查询需要转换到老系统的数据-->
     <select id="selectDataConversionOfCar" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         <include refid="select"/>

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

@@ -328,10 +328,15 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
     }
 
     @ApiOperation(value = "查询一次计量-C#", notes = "根据车号查询未使用和使用中的预报")
-    @GetMapping(value = "/queryByFlag")
-    public RESTfulResult queryFirst(@RequestParam String carNo) {
+    @PostMapping(value = "/queryByFlag")
+    public RESTfulResult queryFirst(@RequestBody MeterWorkCarActualFirst model) {
         RESTfulResult rm = failed();
+        if (model.getCarNo() == null || "".equals(model.getCarNo())) {
+            rm.setMessage("请传入车号参数");
+            return rm;
+        }
         try {
+            String carNo = model.getCarNo();
             rm = meterWorkCarActualFirstService.queryFirst(carNo);
         } catch (MarkerMetException e) {
             e.printStackTrace();

src/main/java/com/steerinfo/pretrack/pretrackscale/controller/PreTrackScaleController.java

@@ -6,8 +6,13 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.meterwork.except.MarkerMetException;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
+import com.steerinfo.pretrack.pretrackscale.mapper.PreTrackScaleMapper;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.pretrack.pretrackscale.service.IPreTrackScaleService;
+import com.steerinfo.util.CommonPage;
+import com.steerinfo.util.FieldsCollector;
+import com.steerinfo.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -18,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * PreTrackScale RESTful接口：
@@ -41,6 +47,9 @@ public class PreTrackScaleController extends BaseRESTfulController {
     @Autowired
     IPreTrackScaleService preTrackScaleService;
 
+    @Autowired
+    PreTrackScaleMapper preTrackScaleMapper;
+
     @ApiOperation(value = "获取列表", notes = "分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -156,14 +165,13 @@ public class PreTrackScaleController extends BaseRESTfulController {
         }
     }
 
-
     @ApiOperation(value = "车号获取", notes = "根据车号获取预报信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", dataType = "Integer")
     })
-    @GetMapping(value = "/queryByFlag")
-    public RESTfulResult selectlist(@RequestParam String carNo, Integer pageNum, Integer pageSize) {
+    @GetMapping(value = "/select")
+    public RESTfulResult select(@RequestParam String carNo, Integer pageNum, Integer pageSize) {
         RESTfulResult rm = failed();
         try {
             PageHelper.startPage(pageNum, pageSize);
@@ -180,6 +188,35 @@ public class PreTrackScaleController extends BaseRESTfulController {
         return rm;
     }
 
+
+    @ApiOperation(value = "车号获取", notes = "根据车号获取预报信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", dataType = "Integer")
+    })
+    @PostMapping(value = "/queryByFlag")
+    public RESTfulResult selectlist(@RequestBody PreTrackScale pre) {
+        RESTfulResult rm = failed();
+        Map<String, Object> map = FieldsCollector.beanToMap(pre);
+
+        try {
+            List<PreTrackScale> rows = preTrackScaleMapper.selectBy(map);
+            rm.setCode("200");
+            rm.setMessage("操作成功");
+            rm.setSucceed();
+            rm.setData(rows);
+            return rm;
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "视图获取当前以及历史数据", notes = "获取预报信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", dataType = "Integer"),

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

@@ -2928,6 +2928,7 @@
         <include refid="select"/>
         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
         <include refid="columns"/>