修改

src/main/java/com/steerinfo/baseinfo/meterbaseoperationlog/service/impl/MeterBaseOperationLogServiceImpl.java

@@ -13,6 +13,7 @@ import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualF
 import com.steerinfo.util.CommonPage;
 import com.steerinfo.util.CompareUtil;
 import com.steerinfo.util.PublicMethod;
+import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -76,10 +77,214 @@ public class MeterBaseOperationLogServiceImpl extends BaseServiceImpl<MeterBaseO
     public PageList<MeterBaseOperationLog> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         List<MeterBaseOperationLog> rows = meterBaseOperationLogMapper.likeByDesc(params);
+        if(rows.size() >= 1) {
+            for(MeterBaseOperationLog model: rows) {
+                if (StringUtils.isNotEmpty(model.getOperationBeforeFix())) {
+                    String str = model.getOperationBeforeFix();
+                    if(str.indexOf("MeterWorkCarActualFirst") >= 0){
+                        model.setOperationBeforeFix(translationModel(str));
+                    }else if(str.indexOf("MeterWorkCarActual") >= 0) {
+                        model.setOperationBeforeFix(translationModel(str));
+                    }else if(str.indexOf("MeterWorkRailwayActFirst") >= 0) {
+                        model.setOperationBeforeFix(translationModel(str));
+                    }else if(str.indexOf("MeterWorkRailwayActual") >= 0) {
+                        model.setOperationBeforeFix(translationModel(str));
+                    }else if(str.indexOf("MeterWorkRailwayReceived") >= 0) {
+                        model.setOperationBeforeFix(translationModel(str));
+                    }
+                }
+                if (StringUtils.isNotEmpty(model.getOperationAfterFix())) {
+                    String str = model.getOperationAfterFix();
+                    if(str.indexOf("MeterWorkCarActualFirst") >= 0){
+                        model.setOperationAfterFix(translationModel(str));
+                    }else if(str.indexOf("MeterWorkCarActual") >= 0) {
+                        model.setOperationAfterFix(translationModel(str));
+                    }else if(str.indexOf("MeterWorkRailwayActFirst") >= 0) {
+                        model.setOperationAfterFix(translationModel(str));
+                    }else if(str.indexOf("MeterWorkRailwayActual") >= 0) {
+                        model.setOperationAfterFix(translationModel(str));
+                    }else if(str.indexOf("MeterWorkRailwayReceived") >= 0) {
+                        model.setOperationAfterFix(translationModel(str));
+                    }
+                }
+            }
+        }
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
 
+    public String translationModel(String str) {
+        String strAll = "";
+        if(str.indexOf("MeterWorkCarActualFirst") >= 0){
+            if(str.indexOf("predictionNo=") >= 1) {
+                str = str.substring(str.indexOf("predictionNo="));
+                strAll += "委托号:" + str.substring("predictionNo=".length(), str.indexOf(","));
+            }
+            if(str.indexOf("carNo=") >= 1) {
+                str = str.substring(str.indexOf("carNo="));
+                strAll += ", 车号:" + str.substring("carNo=".length(), str.indexOf(","));
+            }
+            if(str.indexOf("meterWeight=") >= 1) {
+                str = str.substring(str.indexOf("meterWeight="));
+                String meterWeightStr = str.substring("meterWeight=".length(), str.indexOf(","));
+                String meterWeight = "0.00";
+                if(!meterWeightStr.equals("null")) {
+                    meterWeight = String.format("%.2f", Double.parseDouble(meterWeightStr)/1000);
+                }
+                strAll += ", 重量:" + meterWeight + "t";
+            }
+            if(str.indexOf("baseSpotName=") >= 1) {
+                str = str.substring(str.indexOf("baseSpotName="));
+                strAll += ", 计量点:" + str.substring("baseSpotName=".length(), str.indexOf(","));
+            }
+        }
+        if(str.indexOf("MeterWorkCarActual") >= 0){
+            if(str.indexOf("predictionNo=") >= 1) {
+                str = str.substring(str.indexOf("predictionNo="));
+                strAll += "委托号:" + str.substring("predictionNo=".length(), str.indexOf(","));
+            }
+            if(str.indexOf("carNo=") >= 1) {
+                str = str.substring(str.indexOf("carNo="));
+                strAll += ", 车号:" + str.substring("carNo=".length(), str.indexOf(","));
+            }
+            if(str.indexOf("grossWeight=") >= 1) {
+                str = str.substring(str.indexOf("grossWeight="));
+                String grossStr = str.substring("grossWeight=".length(), str.indexOf(","));
+                String grossWeight = "0.00";
+                if(!grossStr.equals("null")) {
+                    grossWeight = String.format("%.2f", Double.parseDouble(grossStr)/1000);
+                }
+                strAll += ", 毛重:" + grossWeight + "t";
+            }
+            if(str.indexOf("baseSpot1Name=") >= 1) {
+                str = str.substring(str.indexOf("baseSpot1Name="));
+                strAll += ", 毛重计量点:" + str.substring("baseSpot1Name=".length(), str.indexOf(","));
+            }
+            if(str.indexOf("tareWeight=") >= 1) {
+                str = str.substring(str.indexOf("tareWeight="));
+                String tareStr = str.substring("tareWeight=".length(), str.indexOf(","));
+                String tareWeight = "0.00";
+                if(!tareStr.equals("null")) {
+                    tareWeight = String.format("%.2f", Double.parseDouble(tareStr)/1000);
+                }
+                strAll += ", 皮重:" + tareWeight + "t";
+            }
+            if(str.indexOf("baseSpot2Name=") >= 1) {
+                str = str.substring(str.indexOf("baseSpot2Name="));
+                strAll += ", 皮重计量点:" + str.substring("baseSpot2Name=".length(), str.indexOf(","));
+            }
+            if(str.indexOf("netWeight=") >= 1) {
+                str = str.substring(str.indexOf("netWeight="));
+                String netStr = str.substring("netWeight=".length(), str.indexOf(","));
+                String netWeight = "0.00";
+                if(!netStr.equals("null")) {
+                    netWeight = String.format("%.2f", Double.parseDouble(netStr)/1000);
+                }
+                strAll += ", 净重:" + netWeight + "t";
+            }
+            if(str.indexOf("netSpot3Name=") >= 1) {
+                str = str.substring(str.indexOf("netSpot3Name="));
+                strAll += ", 净重计量点:" + str.substring("netSpot3Name=".length(), str.indexOf(","));
+            }
+        }
+        if(str.indexOf("MeterWorkRailwayActFirst") >= 0){
+            if(str.indexOf("predictionNo=") >= 1) {
+                str = str.substring(str.indexOf("predictionNo="));
+                strAll += "委托号:" + str.substring("predictionNo=".length(), str.indexOf(","));
+            }
+            if(str.indexOf("railwayNo=") >= 1) {
+                str = str.substring(str.indexOf("railwayNo="));
+                strAll += ", 车号:" + str.substring("railwayNo=".length(), str.indexOf(","));
+            }
+            if(str.indexOf("meterWeight=") >= 1) {
+                str = str.substring(str.indexOf("meterWeight="));
+                String meterWeightStr = str.substring("meterWeight=".length(), str.indexOf(","));
+                String meterWeight = "0.00";
+                if(!meterWeightStr.equals("null")) {
+                    meterWeight = String.format("%.2f", Double.parseDouble(meterWeightStr)/1000);
+                }
+                strAll += ", 重量:" + meterWeight + "t";
+            }
+            if(str.indexOf("baseSpotName=") >= 1) {
+                str = str.substring(str.indexOf("baseSpotName="));
+                strAll += ", 计量点:" + str.substring("baseSpotName=".length(), str.indexOf(","));
+            }
+        }
+        if(str.indexOf("MeterWorkRailwayActual") >= 0){
+            if(str.indexOf("predictionNo=") >= 1) {
+                str = str.substring(str.indexOf("predictionNo="));
+                strAll += "委托号:" + str.substring("predictionNo=".length(), str.indexOf(","));
+            }
+            if(str.indexOf("railwayNo=") >= 1) {
+                str = str.substring(str.indexOf("railwayNo="));
+                strAll += ", 车号:" + str.substring("railwayNo=".length(), str.indexOf(","));
+            }
+            if(str.indexOf("grossWeight=") >= 1) {
+                str = str.substring(str.indexOf("grossWeight="));
+                String grossStr = str.substring("grossWeight=".length(), str.indexOf(","));
+                String grossWeight = "0.00";
+                if(!grossStr.equals("null")) {
+                    grossWeight = String.format("%.2f", Double.parseDouble(grossStr)/1000);
+                }
+                strAll += ", 毛重:" + grossWeight + "t";
+            }
+            if(str.indexOf("baseSpot1Name=") >= 1) {
+                str = str.substring(str.indexOf("baseSpot1Name="));
+                strAll += ", 毛重计量点:" + str.substring("baseSpot1Name=".length(), str.indexOf(","));
+            }
+            if(str.indexOf("tareWeight=") >= 1) {
+                str = str.substring(str.indexOf("tareWeight="));
+                String tareStr = str.substring("tareWeight=".length(), str.indexOf(","));
+                String tareWeight = "0.00";
+                if(!tareStr.equals("null")) {
+                    tareWeight = String.format("%.2f", Double.parseDouble(tareStr)/1000);
+                }
+                strAll += ", 皮重:" + tareWeight + "t";
+            }
+            if(str.indexOf("baseSpot2Name=") >= 1) {
+                str = str.substring(str.indexOf("baseSpot2Name="));
+                strAll += ", 皮重计量点:" + str.substring("baseSpot2Name=".length(), str.indexOf(","));
+            }
+            if(str.indexOf("netWeight=") >= 1) {
+                str = str.substring(str.indexOf("netWeight="));
+                String netStr = str.substring("netWeight=".length(), str.indexOf(","));
+                String netWeight = "0.00";
+                if(!netStr.equals("null")) {
+                    netWeight = String.format("%.2f", Double.parseDouble(netStr)/1000);
+                }
+                strAll += ", 净重:" + netWeight + "t";
+            }
+            if(str.indexOf("netSpot3Name=") >= 1) {
+                str = str.substring(str.indexOf("netSpot3Name="));
+                strAll += ", 净重计量点:" + str.substring("netSpot3Name=".length(), str.indexOf(","));
+            }
+        }
+        if(str.indexOf("MeterWorkRailwayReceived") >= 0){
+            if(str.indexOf("predictionNo=") >= 1) {
+                str = str.substring(str.indexOf("predictionNo="));
+                strAll += "委托号:" + str.substring("predictionNo=".length(), str.indexOf(","));
+            }
+            if(str.indexOf("railwayNo=") >= 1) {
+                str = str.substring(str.indexOf("railwayNo="));
+                strAll += ", 车号:" + str.substring("railwayNo=".length(), str.indexOf(","));
+            }
+            if(str.indexOf("meterWeight=") >= 1) {
+                str = str.substring(str.indexOf("meterWeight="));
+                String meterWeightStr = str.substring("meterWeight=".length(), str.indexOf(","));
+                String meterWeight = "0.00";
+                if(!meterWeightStr.equals("null")) {
+                    meterWeight = String.format("%.2f", Double.parseDouble(meterWeightStr)/1000);
+                }
+                strAll += ", 重量:" + meterWeight + "t";
+            }
+            if(str.indexOf("baseSpotName=") >= 1) {
+                str = str.substring(str.indexOf("baseSpotName="));
+                strAll += ", 计量点:" + str.substring("baseSpotName=".length(), str.indexOf(","));
+            }
+        }
+        return strAll;
+    }
+
     @Override
     public int doAddLog(MeterBaseOperationLog model) {
         try {

src/main/java/com/steerinfo/meterwork/meterworkdatacount/controller/MeterWorkDataCountController.java

@@ -6,8 +6,10 @@ import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
+import com.steerinfo.meterwork.meterworkdatacount.model.HookTareWeightAndTheoryAmount;
 import com.steerinfo.meterwork.meterworkdatacount.model.MeasurementAccuracyAnalysis;
 import com.steerinfo.meterwork.meterworkdatacount.model.TruckHisTareComparison;
+import com.steerinfo.meterwork.meterworkdatacount.model.TwoMillionTareWeightComparison;
 import com.steerinfo.meterwork.meterworkdatacount.service.IMeterWorkDataCountService;
 import com.steerinfo.meterwork.meterworkdatacount.service.impl.MeterWorkDataCountServiceImpl;
 import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
@@ -352,4 +354,28 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "吊钩秤铁水衡皮重比对核查报表-获取列表", notes = "分页模糊查询")
+    @PostMapping(value = "/hookTareWeightAndTheoryAmount")
+    public RESTfulResult netWeightAndTheoryAmount(@RequestBody HashMap parmas) {
+        try {
+            PageList<HookTareWeightAndTheoryAmount> list = meterWorkDataCountService.hookTareWeightAndTheoryAmount(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
+    @ApiOperation(value = "200万铁水衡铁水罐皮重比对核查报表-获取列表", notes = "分页模糊查询")
+    @PostMapping(value = "/twoMillionTareWeightComparison")
+    public RESTfulResult twoMillionTareWeightComparison(@RequestBody HashMap parmas) {
+        try {
+            PageList<TwoMillionTareWeightComparison> list = meterWorkDataCountService.twoMillionTareWeightComparison(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.java

@@ -1,9 +1,6 @@
 package com.steerinfo.meterwork.meterworkdatacount.mapper;
 
-import com.steerinfo.meterwork.meterworkdatacount.model.CarRegularComparison;
-import com.steerinfo.meterwork.meterworkdatacount.model.MeasurementAccuracyAnalysis;
-import com.steerinfo.meterwork.meterworkdatacount.model.TruckHisTareComparison;
-import com.steerinfo.meterwork.meterworkdatacount.model.WorkLoadReportInfo;
+import com.steerinfo.meterwork.meterworkdatacount.model.*;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.HashMap;
@@ -19,4 +16,6 @@ public interface MeterWorkDataCountMapper {
     List<WorkLoadReportInfo> groupByDayStaticReportInfo(HashMap<String, Object> param);
     List<TruckHisTareComparison> truckHisTareComparison(HashMap<String, Object> param);
     List<MeasurementAccuracyAnalysis> measurementAccuracyAnalysis(HashMap<String, Object> param);
+    List<HookTareWeightAndTheoryAmount> hookTareWeightAndTheoryAmount(HashMap<String, Object> param);
+    List<TwoMillionTareWeightComparison> twoMillionTareWeightComparison(HashMap<String, Object> param);
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.xml

@@ -637,6 +637,30 @@
             on A.operation_id = B.actual_first_no
             where A.operation_page like '%轨道衡从表数据维护%'
         )
+        union
+        (
+            select A.operation_carn_no carNo,
+            A.operation_id actualFirstNo,
+            A.operation_prediction_no predictionNo,
+            A.operation_function operationFunction,
+            A.operation_page operationPage,
+            case when B.value_flag != '0' then '继续'
+            else '取消' end valueFlag,
+            A.Create_Man_No createManNo,
+            A.create_man_name createManName,
+            A.create_time createTime,
+            case when B.meter_mode = '1' then '远程计量'
+            when B.meter_mode = '2' then '智能计量'
+            when B.meter_mode = '3' then '手工计量'
+            else null end meterMode,
+            A.operation_before_fix beforeFix,
+            A.operation_after_fix afterFix,
+            B.memo note
+            from meter_base_operation_log A
+            left join Meter_Work_Railway_Received B
+            on A.operation_id = B.actual_first_no
+            where A.operation_page like '%动轨数据维护%'
+        )
         )
         where 1 = 1
             <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
@@ -649,4 +673,89 @@
         order by createTime desc
     </select>
 
+    <select id="hookTareWeightAndTheoryAmount" parameterType="java.util.HashMap"
+            resultType="com.steerinfo.meterwork.meterworkdatacount.model.HookTareWeightAndTheoryAmount">
+        select A.railway_no railwayNo,
+           A.prediction_no predictionNo,
+           A.matter_no matterNo,
+           A.matter_name matterName,
+           to_char(round(A.gross_Weight/1000, 2),'FM9999999999999999.00') grossWeight,
+           to_char(round(A.tare_weight/1000, 2),'FM9999999999999999.00') tareWeight,
+           to_char(round(A.net_weight/1000, 2),'FM9999999999999999.00') netWeight,
+           to_char(round(to_number(B.memo), 2),'FM9999999999999999.00') theoryAmount,
+           to_char(round((A.tare_weight - to_number(B.memo)*1000) / 1000, 2),'FM9999999999999999.00') tareSubTheoryAmount,
+           A.Sender_Remark senderRemark,
+           A.forwarding_unit_name forwardingUnitName,
+           A.receiving_uint_name receivingUintName,
+           A.gross_time grossTime,
+           A.base_spot1_name baseSpot1Name,
+           A.tare_time tareTime,
+           A.base_spot2_name baseSpot2Name,
+           A.net_time netTime,
+           A.net_spot3_name netSpot3Name,
+           A.net_man_name netManName,
+           A.note note
+      from meter_work_railway_actual A
+      left join com_base_info B
+        on B.base_name = subStr(A.railway_no, length(A.railway_no) - 2)
+     where A.railway_type_no = '001019005'
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+            and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="railwayNo != null and railwayNo != ''">
+            and A.railway_no like '%${railwayNo}%'
+        </if>
+     order by A.net_time desc
+    </select>
+
+    <select id="twoMillionTareWeightComparison" parameterType="java.util.HashMap"
+            resultType="com.steerinfo.meterwork.meterworkdatacount.model.TwoMillionTareWeightComparison">
+        select A.railway_no railwayNo,
+            A.prediction_no predictionNo,
+            A.matter_name matterName,
+            A.forwarding_unit_name forwardingUnitName,
+            A.receiving_uint_name receivingUintName,
+            to_char(round(A.gross_Weight/1000, 2),'FM9999999999999999.00') grossWeight,
+            A.gross_time grossTime,
+            A.base_spot1_name baseSpot1Name,
+            case when A.gross_mode = '1' then '远程计量'
+                when A.gross_mode = '2' then '智能计量'
+                when A.gross_mode = '3' then '手工计量'
+                else null end grossMode,
+            to_char(round(A.tare_weight/1000, 2),'FM9999999999999999.00') tareWeight,
+            to_char(round(to_number(B.memo), 2),'FM9999999999999999.00') theoryAmount,
+            to_char(round(to_number(B.memo) + 37.5, 2),'FM9999999999999999.00') theoryAmountShelf,
+            to_char(round((A.tare_weight - (to_number(B.memo) + 37.5)*1000) / 1000, 2),'FM9999999999999999.00') tareSubTheoryAmount,
+            A.tare_time tareTime,
+            A.base_spot2_name baseSpot2Name,
+            case when A.tare_mode = '1' then '远程计量'
+                when A.tare_mode = '2' then '智能计量'
+                when A.tare_mode = '3' then '手工计量'
+                else null end tareMode,
+            to_char(round(A.net_weight/1000, 2),'FM9999999999999999.00') netWeight,
+            A.net_time netTime,
+            A.net_spot3_name netSpot3Name,
+            case when A.value_flag = '1' then '有效-未发布'
+                when A.value_flag = '2' then '有效-已发布'
+                else null end valueFlag,
+            case when A.upload_flag = '1' then '待上传'
+                when A.upload_flag = '2' then '已上传'
+                else null end uploadFlag，
+            A.Sender_Remark senderRemark,
+            A.conveyance_type conveyanceType,
+            A.note note
+        from meter_work_railway_actual A
+            left join com_base_info B
+                on B.base_name = subStr(A.railway_no, length(A.railway_no) - 2)
+        where A.railway_type_no = '001019003'
+            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+                and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+                and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+            </if>
+            <if test="railwayNo != null and railwayNo != ''">
+                and A.railway_no like '%${railwayNo}%'
+            </if>
+        order by A.net_time desc
+    </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkdatacount/model/HookTareWeightAndTheoryAmount.java

@@ -0,0 +1,187 @@
+package com.steerinfo.meterwork.meterworkdatacount.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class HookTareWeightAndTheoryAmount {
+    private String railwayNo;
+    private String predictionNo;
+    private String matterNo;
+    private String matterName;
+    private BigDecimal grossWeight;
+    private BigDecimal tareWeight;
+    private BigDecimal netWeight;
+    private BigDecimal theoryAmount;
+    private BigDecimal tareSubTheoryAmount;
+    private String senderRemark;
+    private String forwardingUnitName;
+    private String receivingUintName;
+    private Date grossTime;
+    private String baseSpot1Name;
+    private Date tareTime;
+    private String baseSpot2Name;
+    private Date netTime;
+    private String netSpot3Name;
+    private String netManName;
+    private String note;
+
+    public String getRailwayNo() {
+        return railwayNo;
+    }
+
+    public void setRailwayNo(String railwayNo) {
+        this.railwayNo = railwayNo;
+    }
+
+    public String getPredictionNo() {
+        return predictionNo;
+    }
+
+    public void setPredictionNo(String predictionNo) {
+        this.predictionNo = predictionNo;
+    }
+
+    public String getMatterNo() {
+        return matterNo;
+    }
+
+    public void setMatterNo(String matterNo) {
+        this.matterNo = matterNo;
+    }
+
+    public String getMatterName() {
+        return matterName;
+    }
+
+    public void setMatterName(String matterName) {
+        this.matterName = matterName;
+    }
+
+    public BigDecimal getGrossWeight() {
+        return grossWeight;
+    }
+
+    public void setGrossWeight(BigDecimal grossWeight) {
+        this.grossWeight = grossWeight;
+    }
+
+    public BigDecimal getTareWeight() {
+        return tareWeight;
+    }
+
+    public void setTareWeight(BigDecimal tareWeight) {
+        this.tareWeight = tareWeight;
+    }
+
+    public BigDecimal getNetWeight() {
+        return netWeight;
+    }
+
+    public void setNetWeight(BigDecimal netWeight) {
+        this.netWeight = netWeight;
+    }
+
+    public BigDecimal getTheoryAmount() {
+        return theoryAmount;
+    }
+
+    public void setTheoryAmount(BigDecimal theoryAmount) {
+        this.theoryAmount = theoryAmount;
+    }
+
+    public BigDecimal getTareSubTheoryAmount() {
+        return tareSubTheoryAmount;
+    }
+
+    public void setTareSubTheoryAmount(BigDecimal tareSubTheoryAmount) {
+        this.tareSubTheoryAmount = tareSubTheoryAmount;
+    }
+
+    public String getSenderRemark() {
+        return senderRemark;
+    }
+
+    public void setSenderRemark(String senderRemark) {
+        this.senderRemark = senderRemark;
+    }
+
+    public String getForwardingUnitName() {
+        return forwardingUnitName;
+    }
+
+    public void setForwardingUnitName(String forwardingUnitName) {
+        this.forwardingUnitName = forwardingUnitName;
+    }
+
+    public String getReceivingUintName() {
+        return receivingUintName;
+    }
+
+    public void setReceivingUintName(String receivingUintName) {
+        this.receivingUintName = receivingUintName;
+    }
+
+    public Date getGrossTime() {
+        return grossTime;
+    }
+
+    public void setGrossTime(Date grossTime) {
+        this.grossTime = grossTime;
+    }
+
+    public String getBaseSpot1Name() {
+        return baseSpot1Name;
+    }
+
+    public void setBaseSpot1Name(String baseSpot1Name) {
+        this.baseSpot1Name = baseSpot1Name;
+    }
+
+    public Date getTareTime() {
+        return tareTime;
+    }
+
+    public void setTareTime(Date tareTime) {
+        this.tareTime = tareTime;
+    }
+
+    public String getBaseSpot2Name() {
+        return baseSpot2Name;
+    }
+
+    public void setBaseSpot2Name(String baseSpot2Name) {
+        this.baseSpot2Name = baseSpot2Name;
+    }
+
+    public Date getNetTime() {
+        return netTime;
+    }
+
+    public void setNetTime(Date netTime) {
+        this.netTime = netTime;
+    }
+
+    public String getNetSpot3Name() {
+        return netSpot3Name;
+    }
+
+    public void setNetSpot3Name(String netSpot3Name) {
+        this.netSpot3Name = netSpot3Name;
+    }
+
+    public String getNetManName() {
+        return netManName;
+    }
+
+    public void setNetManName(String netManName) {
+        this.netManName = netManName;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkdatacount/model/TwoMillionTareWeightComparison.java

@@ -0,0 +1,223 @@
+package com.steerinfo.meterwork.meterworkdatacount.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TwoMillionTareWeightComparison {
+    private String railwayNo;
+    private String predictionNo;
+    private String matterName;
+    private String forwardingUnitName;
+    private String receivingUintName;
+    private BigDecimal grossWeight;
+    private Date grossTime;
+    private String baseSpot1Name;
+    private String grossMode;
+    private BigDecimal tareWeight;
+    private BigDecimal theoryAmount;
+    private BigDecimal theoryAmountShelf;
+    private BigDecimal tareSubTheoryAmount;
+    private Date tareTime;
+    private String baseSpot2Name;
+    private String tareMode;
+    private BigDecimal netWeight;
+    private Date netTime;
+    private String netSpot3Name;
+    private String valueFlag;
+    private String uploadFlag;
+    private String senderRemark;
+    private String conveyanceType;
+    private String note;
+
+    public String getRailwayNo() {
+        return railwayNo;
+    }
+
+    public void setRailwayNo(String railwayNo) {
+        this.railwayNo = railwayNo;
+    }
+
+    public String getPredictionNo() {
+        return predictionNo;
+    }
+
+    public void setPredictionNo(String predictionNo) {
+        this.predictionNo = predictionNo;
+    }
+
+    public String getMatterName() {
+        return matterName;
+    }
+
+    public void setMatterName(String matterName) {
+        this.matterName = matterName;
+    }
+
+    public String getForwardingUnitName() {
+        return forwardingUnitName;
+    }
+
+    public void setForwardingUnitName(String forwardingUnitName) {
+        this.forwardingUnitName = forwardingUnitName;
+    }
+
+    public String getReceivingUintName() {
+        return receivingUintName;
+    }
+
+    public void setReceivingUintName(String receivingUintName) {
+        this.receivingUintName = receivingUintName;
+    }
+
+    public BigDecimal getGrossWeight() {
+        return grossWeight;
+    }
+
+    public void setGrossWeight(BigDecimal grossWeight) {
+        this.grossWeight = grossWeight;
+    }
+
+    public Date getGrossTime() {
+        return grossTime;
+    }
+
+    public void setGrossTime(Date grossTime) {
+        this.grossTime = grossTime;
+    }
+
+    public String getBaseSpot1Name() {
+        return baseSpot1Name;
+    }
+
+    public void setBaseSpot1Name(String baseSpot1Name) {
+        this.baseSpot1Name = baseSpot1Name;
+    }
+
+    public String getGrossMode() {
+        return grossMode;
+    }
+
+    public void setGrossMode(String grossMode) {
+        this.grossMode = grossMode;
+    }
+
+    public BigDecimal getTareWeight() {
+        return tareWeight;
+    }
+
+    public void setTareWeight(BigDecimal tareWeight) {
+        this.tareWeight = tareWeight;
+    }
+
+    public BigDecimal getTheoryAmount() {
+        return theoryAmount;
+    }
+
+    public void setTheoryAmount(BigDecimal theoryAmount) {
+        this.theoryAmount = theoryAmount;
+    }
+
+    public BigDecimal getTheoryAmountShelf() {
+        return theoryAmountShelf;
+    }
+
+    public void setTheoryAmountShelf(BigDecimal theoryAmountShelf) {
+        this.theoryAmountShelf = theoryAmountShelf;
+    }
+
+    public BigDecimal getTareSubTheoryAmount() {
+        return tareSubTheoryAmount;
+    }
+
+    public void setTareSubTheoryAmount(BigDecimal tareSubTheoryAmount) {
+        this.tareSubTheoryAmount = tareSubTheoryAmount;
+    }
+
+    public Date getTareTime() {
+        return tareTime;
+    }
+
+    public void setTareTime(Date tareTime) {
+        this.tareTime = tareTime;
+    }
+
+    public String getBaseSpot2Name() {
+        return baseSpot2Name;
+    }
+
+    public void setBaseSpot2Name(String baseSpot2Name) {
+        this.baseSpot2Name = baseSpot2Name;
+    }
+
+    public String getTareMode() {
+        return tareMode;
+    }
+
+    public void setTareMode(String tareMode) {
+        this.tareMode = tareMode;
+    }
+
+    public BigDecimal getNetWeight() {
+        return netWeight;
+    }
+
+    public void setNetWeight(BigDecimal netWeight) {
+        this.netWeight = netWeight;
+    }
+
+    public Date getNetTime() {
+        return netTime;
+    }
+
+    public void setNetTime(Date netTime) {
+        this.netTime = netTime;
+    }
+
+    public String getNetSpot3Name() {
+        return netSpot3Name;
+    }
+
+    public void setNetSpot3Name(String netSpot3Name) {
+        this.netSpot3Name = netSpot3Name;
+    }
+
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag;
+    }
+
+    public String getUploadFlag() {
+        return uploadFlag;
+    }
+
+    public void setUploadFlag(String uploadFlag) {
+        this.uploadFlag = uploadFlag;
+    }
+
+    public String getSenderRemark() {
+        return senderRemark;
+    }
+
+    public void setSenderRemark(String senderRemark) {
+        this.senderRemark = senderRemark;
+    }
+
+    public String getConveyanceType() {
+        return conveyanceType;
+    }
+
+    public void setConveyanceType(String conveyanceType) {
+        this.conveyanceType = conveyanceType;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/IMeterWorkDataCountService.java

@@ -2,9 +2,7 @@ package com.steerinfo.meterwork.meterworkdatacount.service;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.meterwork.meterworkdatacount.model.CarRegularComparison;
-import com.steerinfo.meterwork.meterworkdatacount.model.MeasurementAccuracyAnalysis;
-import com.steerinfo.meterwork.meterworkdatacount.model.TruckHisTareComparison;
+import com.steerinfo.meterwork.meterworkdatacount.model.*;
 
 import java.text.ParseException;
 import java.util.HashMap;
@@ -17,4 +15,6 @@ public interface IMeterWorkDataCountService{
     List<HashMap> countDayAllSpot(HashMap<String, Object> params);
     PageList<TruckHisTareComparison> truckHisTareComparison(HashMap<String, Object> params);
     PageList<MeasurementAccuracyAnalysis> measurementAccuracyAnalysis(HashMap<String, Object> params);
+    PageList<HookTareWeightAndTheoryAmount> hookTareWeightAndTheoryAmount(HashMap<String, Object> params);
+    PageList<TwoMillionTareWeightComparison> twoMillionTareWeightComparison(HashMap<String, Object> params);
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/impl/MeterWorkDataCountServiceImpl.java

@@ -10,10 +10,7 @@ import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
 import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActualFirstMapper;
 import com.steerinfo.meterwork.meterworkdatacount.mapper.MeterWorkDataCountMapper;
-import com.steerinfo.meterwork.meterworkdatacount.model.CarRegularComparison;
-import com.steerinfo.meterwork.meterworkdatacount.model.MeasurementAccuracyAnalysis;
-import com.steerinfo.meterwork.meterworkdatacount.model.TruckHisTareComparison;
-import com.steerinfo.meterwork.meterworkdatacount.model.WorkLoadReportInfo;
+import com.steerinfo.meterwork.meterworkdatacount.model.*;
 import com.steerinfo.meterwork.meterworkdatacount.service.IMeterWorkDataCountService;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.mapper.MeterWorkRailwayActFirstMapper;
 import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
@@ -912,4 +909,20 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
         }
         return strAll;
     }
+
+    @Override
+    public PageList<HookTareWeightAndTheoryAmount> hookTareWeightAndTheoryAmount(HashMap<String, Object> params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<HookTareWeightAndTheoryAmount> rows = meterWorkDataCountMapper.hookTareWeightAndTheoryAmount(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
+    @Override
+    public PageList<TwoMillionTareWeightComparison> twoMillionTareWeightComparison(HashMap<String, Object> params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<TwoMillionTareWeightComparison> rows = meterWorkDataCountMapper.twoMillionTareWeightComparison(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
 }