吊钩秤自助计量添加

src/main/java/com/steerinfo/meterwork/meterworkhookactfirst/controller/MeterWorkHookActFirstController.java

@@ -417,4 +417,22 @@ public class MeterWorkHookActFirstController extends BaseRESTfulController {
         }
         return rm;
     }
+
+    @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
+    @PostMapping(value = "/selfServiceMeasurement")
+    public RESTfulResult selfServiceMeasurement(@RequestBody MeterWorkHookActFirst first) {
+        RESTfulResult rm = failed();
+        try {
+            if(first != null) {
+                rm = meterWorkHookActFirstService.selfServiceMeasurement(first);
+            }else {
+                rm.setMessage("至少需要穿一条一次数据进行匹配洁净保存，请确认！！！！");
+            }
+            return rm;
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>>" + e.getMessage());
+            return rm;
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkhookactfirst/mapper/MeterWorkHookActFirstMapper.java

@@ -6,7 +6,9 @@ import java.math.*;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import com.steerinfo.meterwork.meterworkhookactual.model.MeterWorkHookActual;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import org.apache.ibatis.annotations.Mapper;
@@ -24,6 +26,5 @@ public interface MeterWorkHookActFirstMapper extends IBaseMapper<MeterWorkHookAc
     MeterWorkHookActFirst selectAndMatch(String actualFirstNo, String predictionNo);
 
     List<MeterWorkHookActFirst> distinctCarNo(HashMap<String, Object> obj);
-
     List<MeterWorkHookActFirst> selectBy(HashMap<String, Object> param);
 }

src/main/java/com/steerinfo/meterwork/meterworkhookactfirst/service/IMeterWorkHookActFirstService.java

@@ -52,4 +52,5 @@ public interface IMeterWorkHookActFirstService extends IBaseService<MeterWorkHoo
 
     String doAddWfStatic(MeterWorkHookActFirst firstHook) throws Exception;
     RESTfulResult doAddWfStaticTwo(PreHookScale scale, MeterWorkHookActFirst grossModel, MeterWorkHookActFirst tareModel);
+    RESTfulResult selfServiceMeasurement(MeterWorkHookActFirst first);
 }

src/main/java/com/steerinfo/meterwork/meterworkhookactfirst/service/impl/MeterWorkHookActFirstServiceImpl.java

@@ -20,6 +20,10 @@ import com.steerinfo.meterwork.meterworkimage.mapper.MeterWorkImageMapper;
 import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
+import com.steerinfo.meterwork.meterworkrailwayscheduledhelp.model.MeterWorkRailwayScheduledHelp;
+import com.steerinfo.meterwork.meterworkrailwayscheduledhelp.service.impl.MeterWorkRailwayScheduledHelpServiceImpl;
+import com.steerinfo.meterwork.meterworkscheduledhelp.model.MeterWorkScheduledHelp;
+import com.steerinfo.meterwork.meterworkscheduledhelp.service.impl.MeterWorkScheduledHelpServiceImpl;
 import com.steerinfo.pretrack.prehookscale.mapper.PreHookScaleMapper;
 import com.steerinfo.pretrack.prehookscale.model.PreHookScale;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
@@ -62,6 +66,9 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
     @Resource
     private MeterWorkImageMapper meterWorkImageMapper;
 
+    @Resource
+    private MeterWorkRailwayScheduledHelpServiceImpl meterWorkRailwayScheduledHelpService;
+
     @Resource
     private MeterBaseVideoinfoMapper meterBaseVideoinfoMapper;
 
@@ -773,7 +780,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
                 actualRow.setActualNo(sdf.format(new Date()) + no);
                 actualRow.setNetTime(new Date());
                 actualRow.setNetMode(DbConstants.TYPE);
-//                actualRow.setNote("自动匹配洁净");
+                actualRow.setNote("自动匹配洁净");
                 actualRow.setNetMode("1");
                 actualRow.setUploadFlag("1");
                 actualRow.setValueFlag("1");
@@ -807,7 +814,7 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
                 actualRow.setActualNo(sdf.format(new Date()) + no);
                 actualRow.setNetTime(new Date());
                 actualRow.setNetMode(DbConstants.TYPE);
-//                actualRow.setNote("自动匹配洁净");
+                actualRow.setNote("自动匹配洁净");
                 actualRow.setNetMode("1");
                 actualRow.setUploadFlag("1");
                 actualRow.setValueFlag("1");
@@ -1013,4 +1020,276 @@ public class MeterWorkHookActFirstServiceImpl extends BaseServiceImpl<MeterWorkH
             meterWorkImageMapper.insertSelective(mwi);
         }
     }
+
+    @Override
+    public RESTfulResult selfServiceMeasurement(MeterWorkHookActFirst first) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+
+        HashMap<String, Object> resultMap = new HashMap<>();
+        List<MeterWorkHookActFirst> firsts = new ArrayList<>();
+        List<MeterWorkHookActual> actuals = new ArrayList<>();
+
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            String afl = sdf.format(new Date());
+            //报警信息
+            MeterWorkRailwayScheduledHelp railwayHelp = new MeterWorkRailwayScheduledHelp();
+            String railwayNo = first.getRailwayNo() == null ? "" : first.getRailwayNo();
+            railwayHelp.setWarmType("1");
+            railwayHelp.setWarmTypeName("");
+            railwayHelp.setRailwayNo(railwayNo);
+            railwayHelp.setBaseSpotNo(first.getBaseSpotNo());
+            railwayHelp.setBaseSpotName(first.getBaseSpotName());
+
+            //查询车号是否为空，为空写入报警信息表
+            if (StringUtils.isEmpty(first.getRailwayNo())) {
+                first.setActualFirstNo(afl + meterWorkHookActFirstMapper.getNewID(afl));
+                first.setRailwayNo("无车号");
+                first.setCreateTime(new Date());
+                int i = meterWorkHookActFirstMapper.insertSelective(first);
+                if (i >= 1) {
+                    firsts.add(first);
+                    railwayHelp.setHelpContent("车号为空,请联系处理");
+                    meterWorkRailwayScheduledHelpService.checkAdd(railwayHelp);
+                    rm.setSucceed();
+                    rm.setMessage("车号为空,请联系处理");
+                    resultMap.put("firsts", firsts);
+                    resultMap.put("acutals", null);
+                    rm.setData(resultMap);
+                    return rm;
+                }
+            } else {
+                //查询根据车号查询有效的一次数据
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("railwayNo", railwayNo);
+                map.put("valueFlag", "1");
+                List<MeterWorkHookActFirst> firstList = meterWorkHookActFirstMapper.selectByParameters(map);
+                if (firstList.size() >= 1) {
+                    if (firstList.size() == 1) {
+                        first.setActualFirstNo(afl + meterWorkHookActFirstMapper.getNewID(afl));
+                        first.setCreateTime(new Date());
+                        meterWorkHookActFirstMapper.insertSelective(first);
+                        BigDecimal num = firstList.get(0).getMeterWeight().subtract(first.getMeterWeight()).abs();
+                        //洁净数据不能小于10t
+                        if (num.compareTo(DbConstants.RAILWAY_WEIGHT) == -1) {
+                            first.setActualFirstNo(afl + meterWorkHookActFirstMapper.getNewID(afl));
+                            first.setCreateTime(new Date());
+                            int i = meterWorkHookActFirstMapper.insertSelective(first);
+                            if (i >= 1) {
+                                railwayHelp.setHelpContent("计量完成，车号" + first.getRailwayNo() + "存在重量相近的一次记录，无法自动结净匹配");
+                                meterWorkRailwayScheduledHelpService.checkAdd(railwayHelp);
+                                rm.setSucceed();
+                                rm.setMessage("计量完成，车号" + first.getRailwayNo() + "存在重量相近的一次记录，无法自动结净匹配");
+                                resultMap.put("firsts", firsts);
+                                resultMap.put("actuals", null);
+                                rm.setData(resultMap);
+                                return rm;
+                            }
+                        }
+                        String Content;
+                        HashMap<String, Object> obj = new HashMap<>();
+                        if (first.getMeterWeight().compareTo(firstList.get(0).getMeterWeight()) == -1) {
+                            Content = matchPreClean(firstList.get(0), first);
+                            obj.put("actualFirst2No", first.getActualFirstNo());
+                        } else {
+                            Content = matchPreClean(first, firstList.get(0));
+                            obj.put("acutalFirst1No", first.getActualFirstNo());
+                        }
+                        railwayHelp.setHelpContent(Content);
+                        meterWorkRailwayScheduledHelpService.checkAdd(railwayHelp);
+                        rm.setSucceed();
+                        rm.setMessage(Content);
+
+                        List<MeterWorkHookActual> models = meterWorkHookActualMapper.selectByParameter(obj);
+                        if (models.size() >= 1) {
+                            actuals.add(models.get(0));
+                        } else {
+                            actuals.add(null);
+                        }
+                        resultMap.put("firsts", firsts);
+                        resultMap.put("actuals", actuals);
+                        rm.setData(resultMap);
+                        return rm;
+                    } else if (firstList.size() >= 2) {
+                        first.setActualFirstNo(afl + meterWorkHookActFirstMapper.getNewID(afl));
+                        first.setCreateTime(new Date());
+                        int i = meterWorkHookActFirstMapper.insertSelective(first);
+                        if (i >= 1) {
+                            firsts.add(first);
+                            railwayHelp.setHelpContent("计量完成，车号" + first.getRailwayNo() + "存在多条一次记录未洁净，保存一次记录成功！！");
+                            meterWorkRailwayScheduledHelpService.checkAdd(railwayHelp);
+                            rm.setSucceed();
+                            rm.setMessage("计量完成，车号" + first.getRailwayNo() + "存在多条一次记录未洁净，保存一次记录成功！！");
+                            resultMap.put("firsts", firsts);
+                            resultMap.put("actuals", null);
+                            rm.setData(resultMap);
+                            return rm;
+                        }
+                    }
+                } else {
+                    first.setActualFirstNo(afl + meterWorkHookActFirstMapper.getNewID(afl));
+                    first.setCreateTime(new Date());
+                    int i = meterWorkHookActFirstMapper.insertSelective(first);
+                    if (i >= 1) {
+                        firsts.add(first);
+                        railwayHelp.setHelpContent("计量完成，车号" + first.getRailwayNo() + "保存一次记录成功！！");
+                        meterWorkRailwayScheduledHelpService.checkAdd(railwayHelp);
+                        rm.setSucceed();
+                        rm.setMessage("计量完成，车号" + first.getRailwayNo() + "保存一次记录成功！！");
+                        resultMap.put("firsts", firsts);
+                        resultMap.put("actuals", null);
+                        rm.setData(resultMap);
+                        return rm;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常！！>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+    public String matchPreClean(MeterWorkHookActFirst grossModel, MeterWorkHookActFirst tareModel) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        String sfl = sdf.format(new Date());
+        MeterWorkHookActual actualRow = new MeterWorkHookActual();
+
+        List<PreHookScale> railwayScales = preHookScaleMapper.selectByRailwayNo(grossModel.getRailwayNo());
+        if (railwayScales.size() >= 1) {
+            if (railwayScales.size() == 1) {
+                ///////////无委托自动计量
+
+                PreHookScale scale = railwayScales.get(0);
+                MeterWorkHookActFirst actFirst01 = meterWorkHookActFirstMapper.selectAndMatch(grossModel.getActualFirstNo(), scale.getPredictionNo());
+                BeanUtils.copyProperties(actFirst01, grossModel);
+                MeterWorkHookActFirst actFirst02 = meterWorkHookActFirstMapper.selectAndMatch(tareModel.getActualFirstNo(), scale.getPredictionNo());
+                BeanUtils.copyProperties(actFirst02, tareModel);
+
+                //更新预报数据
+                scale.setValueFlag(DbConstants.NET);
+                scale.setUpdateTime(new Date());
+                scale.setUpdateManNo("system");
+                scale.setUpdateManName("自助计量洁净更新");
+                scale.setUploadFlag("1");
+                scale.setPredictionType("1");
+                preHookScaleMapper.updateByPrimaryKeySelective(scale);
+
+                //更新一次数据
+                //更新第一次毛重数据库
+                grossModel.setValueFlag(DbConstants.NET);
+                grossModel.setUpdateManName("system");
+                grossModel.setUpdateManName("智能计量双委托洁净更新");
+                grossModel.setUpdateTime(new Date());
+                grossModel.setWeightType("0");
+                grossModel.setIsPreScale("1");
+                grossModel.setPredictionNo(scale.getPredictionNo());
+                grossModel.setPredictionType("1");
+                meterWorkHookActFirstMapper.updateByPrimaryKey(grossModel);
+                //更新第一次皮重数据库
+                tareModel.setValueFlag(DbConstants.NET);
+                tareModel.setUpdateManName("system");
+                tareModel.setUpdateManName("自助计量洁净更新");
+                tareModel.setUpdateTime(new Date());
+                tareModel.setWeightType("1");
+                tareModel.setIsPreScale("1");
+                tareModel.setPredictionNo(scale.getPredictionNo());
+                tareModel.setPredictionType("1");
+                meterWorkHookActFirstMapper.updateByPrimaryKey(tareModel);
+
+                //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
+                MeterWorkHookActual mwca1 = meterWorkHookActualMapper.manualAddPre(grossModel.getActualFirstNo(), tareModel.getActualFirstNo(), scale.getPredictionNo());
+                BeanUtils.copyProperties(mwca1, actualRow);
+
+                //添加结净数据
+                String no = meterWorkHookActualMapper.getNewID(sdf.format(new Date()));
+                actualRow.setActualNo(sdf.format(new Date()) + no);
+                actualRow.setNetTime(new Date());
+                actualRow.setNetMode(DbConstants.TYPE);
+//                actualRow.setNote("自助计量匹配洁净");
+                actualRow.setNetMode("1");
+                actualRow.setUploadFlag("1");
+                actualRow.setValueFlag("1");
+                actualRow.setIsPreScale("1");
+                actualRow.setPredictionNo(scale.getPredictionNo());
+                actualRow.setPredictionType("1");
+                actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
+                meterWorkHookActualMapper.insertSelective(actualRow);
+                return "计量完成，" + grossModel.getRailwayNo() + "与委托编号" + scale.getPredictionNo() + "计量结净";
+            } else {
+                //更新第一次毛重数据库
+                grossModel.setValueFlag(DbConstants.NET);
+                grossModel.setUpdateManName("system");
+                grossModel.setUpdateManName("自助计量洁净更新");
+                grossModel.setUpdateTime(new Date());
+                grossModel.setWeightType("0");
+                grossModel.setIsPreScale("0");
+                meterWorkHookActFirstMapper.updateByPrimaryKey(grossModel);
+                //更新第一次皮重数据库
+                tareModel.setValueFlag(DbConstants.NET);
+                tareModel.setUpdateManName("system");
+                tareModel.setUpdateManName("自助计量洁净更新");
+                tareModel.setUpdateTime(new Date());
+                tareModel.setWeightType("1");
+                tareModel.setIsPreScale("0");
+                meterWorkHookActFirstMapper.updateByPrimaryKey(tareModel);
+
+                //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
+                MeterWorkHookActual mwca1 = meterWorkHookActualMapper.manualAdd(grossModel.getActualFirstNo(), tareModel.getActualFirstNo());
+                BeanUtils.copyProperties(mwca1, actualRow);
+
+                //添加结净数据
+                String no = meterWorkHookActualMapper.getNewID(sdf.format(new Date()));
+                actualRow.setActualNo(sdf.format(new Date()) + no);
+                actualRow.setNetTime(new Date());
+                actualRow.setNetMode(DbConstants.TYPE);
+                actualRow.setNote("自助计量匹配洁净");
+                actualRow.setNetMode("1");
+                actualRow.setUploadFlag("1");
+                actualRow.setValueFlag("1");
+                actualRow.setIsPreScale("0");
+                actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
+                meterWorkHookActualMapper.insertSelective(actualRow);
+                return "计量完成，车号" + grossModel.getRailwayNo() + "在委托信息表含有多条有效委托信息,无委托洁净";
+            }
+        } else {
+            ///////////无委托自动计量
+
+            //更新第一次毛重数据库
+            grossModel.setValueFlag(DbConstants.NET);
+            grossModel.setUpdateManName("system");
+            grossModel.setUpdateManName("自助计量洁净更新");
+            grossModel.setUpdateTime(new Date());
+            grossModel.setWeightType("0");
+            grossModel.setIsPreScale("0");
+            meterWorkHookActFirstMapper.updateByPrimaryKey(grossModel);
+            //更新第一次皮重数据库
+            tareModel.setValueFlag(DbConstants.NET);
+            tareModel.setUpdateManName("system");
+            tareModel.setUpdateManName("自助计量洁净更新");
+            tareModel.setUpdateTime(new Date());
+            tareModel.setWeightType("1");
+            tareModel.setIsPreScale("0");
+            meterWorkHookActFirstMapper.updateByPrimaryKey(tareModel);
+
+            //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
+            MeterWorkHookActual mwca1 = meterWorkHookActualMapper.manualAdd(grossModel.getActualFirstNo(), tareModel.getActualFirstNo());
+            BeanUtils.copyProperties(mwca1, actualRow);
+
+            //添加结净数据
+            String no = meterWorkHookActualMapper.getNewID(sdf.format(new Date()));
+            actualRow.setActualNo(sdf.format(new Date()) + no);
+            actualRow.setNetTime(new Date());
+            actualRow.setNetMode(DbConstants.TYPE);
+            actualRow.setNote("自助计量匹配洁净");
+            actualRow.setNetMode("1");
+            actualRow.setUploadFlag("1");
+            actualRow.setValueFlag("1");
+            actualRow.setIsPreScale("0");
+            actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
+            meterWorkHookActualMapper.insertSelective(actualRow);
+            return "计量完成，车号" + grossModel.getRailwayNo() + "无委托洁净";
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkhookactual/mapper/MeterWorkHookActualMapper.java

@@ -6,6 +6,7 @@ import java.math.*;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,4 +31,5 @@ public interface MeterWorkHookActualMapper extends IBaseMapper<MeterWorkHookActu
     MeterWorkHookActual cleanPredcition(String actualNo);
 
     void insertSelectiveBar(MeterWorkHookActual netHook);
+    List<MeterWorkHookActual> selectByParameter(Map<String, Object> params);
 }

src/main/java/com/steerinfo/meterwork/meterworkhookactual/mapper/MeterWorkHookActualMapper.xml

@@ -85,6 +85,12 @@
     <result column="IS_PRE_SCALE" jdbcType="VARCHAR" property="isPreScale" />
     <result column="PREDICTION_TYPE" jdbcType="VARCHAR" property="predictionType" />
     <result column="PREDICTION_COMBINATION" jdbcType="VARCHAR" property="predictionCombination" />
+    <result column="NOTE" jdbcType="VARCHAR" property="note" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="DOCUMENT_ID" jdbcType="VARCHAR" property="documentId" />
+    <result column="CONTRACT_ID" jdbcType="VARCHAR" property="contractId" />
+    <result column="IS_BOUND_LIST_DOWNLOADED" jdbcType="VARCHAR" property="isBoundListDownloaded" />
   </resultMap>
   <sql id="columns">
     ACTUAL_NO, PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, MATTER_NO, 
@@ -100,7 +106,8 @@
     UPLOAD_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME, CHECK_TIME, UPLOAD_MAN_NO, UPLOAD_MAN_NAME, 
     UPLOAD_TIME, SAMPLE_NO, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, MEMO, WATER_NUM, ARRIVAL, 
     STATION, UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, SOURCE_AREA, BOUND_LIST_URL, 
-    IS_BOUND_LIST, DATA_SOURCE, LC_NO, IS_PRE_SCALE, PREDICTION_TYPE, PREDICTION_COMBINATION
+    IS_BOUND_LIST, DATA_SOURCE, LC_NO, IS_PRE_SCALE, PREDICTION_TYPE, PREDICTION_COMBINATION, 
+    NOTE, CREATE_MAN_NAME, CREATE_TIME, DOCUMENT_ID, CONTRACT_ID, IS_BOUND_LIST_DOWNLOADED
   </sql>
   <sql id="columns_alias">
     t.ACTUAL_NO, t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO, t.MATTER_NO, 
@@ -118,13 +125,14 @@
     t.UPLOAD_TIME, t.SAMPLE_NO, t.RAILWAY_TYPE_NO, t.RAILWAY_TYPE_NAME, t.MEMO, t.WATER_NUM, 
     t.ARRIVAL, t.STATION, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME, t.SOURCE_AREA, 
     t.BOUND_LIST_URL, t.IS_BOUND_LIST, t.DATA_SOURCE, t.LC_NO, t.IS_PRE_SCALE, t.PREDICTION_TYPE, 
-    t.PREDICTION_COMBINATION
+    t.PREDICTION_COMBINATION, t.NOTE, t.CREATE_MAN_NAME, t.CREATE_TIME, t.DOCUMENT_ID, 
+    t.CONTRACT_ID, t.IS_BOUND_LIST_DOWNLOADED
   </sql>
   <sql id="select">
-    SELECT <include refid="columns"/> FROM METER_WORK_HOOK_ACTUAL
+    SELECT <include refid="columns" /> FROM METER_WORK_HOOK_ACTUAL
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM METER_WORK_HOOK_ACTUAL t
+    SELECT <include refid="columns_alias" /> FROM METER_WORK_HOOK_ACTUAL t
   </sql>
   <sql id="where">
     <where> 
@@ -377,6 +385,24 @@
       <if test="predictionCombination != null and predictionCombination != ''">
         and PREDICTION_COMBINATION = #{predictionCombination}
       </if>
+      <if test="note != null and note != ''">
+        and NOTE = #{note}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="documentId != null and documentId != ''">
+        and DOCUMENT_ID = #{documentId}
+      </if>
+      <if test="contractId != null and contractId != ''">
+        and CONTRACT_ID = #{contractId}
+      </if>
+      <if test="isBoundListDownloaded != null and isBoundListDownloaded != ''">
+        and IS_BOUND_LIST_DOWNLOADED = #{isBoundListDownloaded}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -630,6 +656,24 @@
       <if test="predictionCombination != null and predictionCombination != ''">
         and PREDICTION_COMBINATION LIKE '%${predictionCombination}%'
       </if>
+      <if test="note != null and note != ''">
+        and NOTE LIKE '%${note}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${createManName}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="documentId != null and documentId != ''">
+        and DOCUMENT_ID LIKE '%${documentId}%'
+      </if>
+      <if test="contractId != null and contractId != ''">
+        and CONTRACT_ID LIKE '%${contractId}%'
+      </if>
+      <if test="isBoundListDownloaded != null and isBoundListDownloaded != ''">
+        and IS_BOUND_LIST_DOWNLOADED LIKE '%${isBoundListDownloaded}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -885,6 +929,24 @@
       <if test="predictionCombination != null and predictionCombination != ''">
         or PREDICTION_COMBINATION = #{predictionCombination}
       </if>
+      <if test="note != null and note != ''">
+        or NOTE = #{note}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        or CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="documentId != null and documentId != ''">
+        or DOCUMENT_ID = #{documentId}
+      </if>
+      <if test="contractId != null and contractId != ''">
+        or CONTRACT_ID = #{contractId}
+      </if>
+      <if test="isBoundListDownloaded != null and isBoundListDownloaded != ''">
+        or IS_BOUND_LIST_DOWNLOADED = #{isBoundListDownloaded}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkhookactual.model.MeterWorkHookActual">
     insert into METER_WORK_HOOK_ACTUAL (ACTUAL_NO, PREDICTION_NO, NOTICE_NO, 
@@ -915,7 +977,9 @@
       UPDATE_MAN_NAME, UPDATE_TIME, SOURCE_AREA, 
       BOUND_LIST_URL, IS_BOUND_LIST, DATA_SOURCE, 
       LC_NO, IS_PRE_SCALE, PREDICTION_TYPE, 
-      PREDICTION_COMBINATION)
+      PREDICTION_COMBINATION, NOTE, CREATE_MAN_NAME, 
+      CREATE_TIME, DOCUMENT_ID, CONTRACT_ID, 
+      IS_BOUND_LIST_DOWNLOADED)
     values (#{actualNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, 
       #{railwayNo,jdbcType=VARCHAR}, #{railwayCarriageNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, 
       #{matterName,jdbcType=VARCHAR}, #{contractNo,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR}, 
@@ -944,7 +1008,9 @@
       #{updateManName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{sourceArea,jdbcType=VARCHAR}, 
       #{boundListUrl,jdbcType=VARCHAR}, #{isBoundList,jdbcType=VARCHAR}, #{dataSource,jdbcType=VARCHAR}, 
       #{lcNo,jdbcType=VARCHAR}, #{isPreScale,jdbcType=VARCHAR}, #{predictionType,jdbcType=VARCHAR}, 
-      #{predictionCombination,jdbcType=VARCHAR})
+      #{predictionCombination,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{documentId,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR}, 
+      #{isBoundListDownloaded,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkhookactual.model.MeterWorkHookActual">
     insert into METER_WORK_HOOK_ACTUAL
@@ -1198,6 +1264,24 @@
       <if test="predictionCombination != null">
         PREDICTION_COMBINATION,
       </if>
+      <if test="note != null">
+        NOTE,
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="documentId != null">
+        DOCUMENT_ID,
+      </if>
+      <if test="contractId != null">
+        CONTRACT_ID,
+      </if>
+      <if test="isBoundListDownloaded != null">
+        IS_BOUND_LIST_DOWNLOADED,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="actualNo != null">
@@ -1449,6 +1533,24 @@
       <if test="predictionCombination != null">
         #{predictionCombination,jdbcType=VARCHAR},
       </if>
+      <if test="note != null">
+        #{note,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="documentId != null">
+        #{documentId,jdbcType=VARCHAR},
+      </if>
+      <if test="contractId != null">
+        #{contractId,jdbcType=VARCHAR},
+      </if>
+      <if test="isBoundListDownloaded != null">
+        #{isBoundListDownloaded,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkhookactual.model.MeterWorkHookActual">
@@ -1534,7 +1636,13 @@
       LC_NO = #{lcNo,jdbcType=VARCHAR},
       IS_PRE_SCALE = #{isPreScale,jdbcType=VARCHAR},
       PREDICTION_TYPE = #{predictionType,jdbcType=VARCHAR},
-      PREDICTION_COMBINATION = #{predictionCombination,jdbcType=VARCHAR}
+      PREDICTION_COMBINATION = #{predictionCombination,jdbcType=VARCHAR},
+      NOTE = #{note,jdbcType=VARCHAR},
+      CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      DOCUMENT_ID = #{documentId,jdbcType=VARCHAR},
+      CONTRACT_ID = #{contractId,jdbcType=VARCHAR},
+      IS_BOUND_LIST_DOWNLOADED = #{isBoundListDownloaded,jdbcType=VARCHAR}
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkhookactual.model.MeterWorkHookActual">
@@ -1786,20 +1894,38 @@
       <if test="predictionCombination != null">
         PREDICTION_COMBINATION = #{predictionCombination,jdbcType=VARCHAR},
       </if>
+      <if test="note != null">
+        NOTE = #{note,jdbcType=VARCHAR},
+      </if>
+      <if test="createManName != null">
+        CREATE_MAN_NAME = #{createManName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="documentId != null">
+        DOCUMENT_ID = #{documentId,jdbcType=VARCHAR},
+      </if>
+      <if test="contractId != null">
+        CONTRACT_ID = #{contractId,jdbcType=VARCHAR},
+      </if>
+      <if test="isBoundListDownloaded != null">
+        IS_BOUND_LIST_DOWNLOADED = #{isBoundListDownloaded,jdbcType=VARCHAR},
+      </if>
     </set>
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <include refid="select"/>
+    <include refid="select" />
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
+    <include refid="select" />
+    <include refid="where" />
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
+    <include refid="select" />
+    <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into METER_WORK_HOOK_ACTUAL 
@@ -1833,7 +1959,9 @@
       STATION, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
       UPDATE_TIME, SOURCE_AREA, BOUND_LIST_URL, 
       IS_BOUND_LIST, DATA_SOURCE, LC_NO, 
-      IS_PRE_SCALE, PREDICTION_TYPE, PREDICTION_COMBINATION
+      IS_PRE_SCALE, PREDICTION_TYPE, PREDICTION_COMBINATION, 
+      NOTE, CREATE_MAN_NAME, CREATE_TIME, 
+      DOCUMENT_ID, CONTRACT_ID, IS_BOUND_LIST_DOWNLOADED
       )
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
@@ -1867,7 +1995,9 @@
       #{item.station,jdbcType=VARCHAR}, #{item.updateManNo,jdbcType=VARCHAR}, #{item.updateManName,jdbcType=VARCHAR}, 
       #{item.updateTime,jdbcType=TIMESTAMP}, #{item.sourceArea,jdbcType=VARCHAR}, #{item.boundListUrl,jdbcType=VARCHAR}, 
       #{item.isBoundList,jdbcType=VARCHAR}, #{item.dataSource,jdbcType=VARCHAR}, #{item.lcNo,jdbcType=VARCHAR}, 
-      #{item.isPreScale,jdbcType=VARCHAR}, #{item.predictionType,jdbcType=VARCHAR}, #{item.predictionCombination,jdbcType=VARCHAR}
+      #{item.isPreScale,jdbcType=VARCHAR}, #{item.predictionType,jdbcType=VARCHAR}, #{item.predictionCombination,jdbcType=VARCHAR}, 
+      #{item.note,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
+      #{item.documentId,jdbcType=VARCHAR}, #{item.contractId,jdbcType=VARCHAR}, #{item.isBoundListDownloaded,jdbcType=VARCHAR}
        from dual  
    </foreach> )
   </insert>
@@ -1875,346 +2005,370 @@
      update METER_WORK_HOOK_ACTUAL
      set
        ACTUAL_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.actualNo,jdbcType=VARCHAR}
        </foreach>
        ,PREDICTION_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.predictionNo,jdbcType=VARCHAR}
        </foreach>
        ,NOTICE_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.noticeNo,jdbcType=VARCHAR}
        </foreach>
        ,RAILWAY_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.railwayNo,jdbcType=VARCHAR}
        </foreach>
        ,RAILWAY_CARRIAGE_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.railwayCarriageNo,jdbcType=VARCHAR}
        </foreach>
        ,MATTER_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.matterNo,jdbcType=VARCHAR}
        </foreach>
        ,MATTER_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.matterName,jdbcType=VARCHAR}
        </foreach>
        ,CONTRACT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.contractNo,jdbcType=VARCHAR}
        </foreach>
        ,BATCH_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.batchNo,jdbcType=VARCHAR}
        </foreach>
        ,CUSTOMER_SUPPLIER_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.customerSupplierNo,jdbcType=VARCHAR}
        </foreach>
        ,CUSTOMER_SUPPLIER_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.customerSupplierName,jdbcType=VARCHAR}
        </foreach>
        ,FORWARDING_UNIT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.forwardingUnitNo,jdbcType=VARCHAR}
        </foreach>
        ,FORWARDING_UNIT_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.forwardingUnitName,jdbcType=VARCHAR}
        </foreach>
        ,RECEIVING_UINT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.receivingUintNo,jdbcType=VARCHAR}
        </foreach>
        ,RECEIVING_UINT_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.receivingUintName,jdbcType=VARCHAR}
        </foreach>
        ,MATERIAL_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.materialNo,jdbcType=VARCHAR}
        </foreach>
        ,MATERIAL_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.materialName,jdbcType=VARCHAR}
        </foreach>
        ,SPEC_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.specNo,jdbcType=VARCHAR}
        </foreach>
        ,SPEC_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.specName,jdbcType=VARCHAR}
        </foreach>
        ,LOAD_POINT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.loadPointNo,jdbcType=VARCHAR}
        </foreach>
        ,LOAD_POINT_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.loadPointName,jdbcType=VARCHAR}
        </foreach>
        ,SAMPLE_VOUCHER=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.sampleVoucher,jdbcType=VARCHAR}
        </foreach>
        ,CARRIER_UNIT_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.carrierUnitNo,jdbcType=VARCHAR}
        </foreach>
        ,CARRIER_UNIT_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.carrierUnitName,jdbcType=VARCHAR}
        </foreach>
        ,METER_TYPE_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.meterTypeNo,jdbcType=VARCHAR}
        </foreach>
        ,METER_TYPE_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.meterTypeName,jdbcType=VARCHAR}
        </foreach>
        ,METER_PROCESS_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.meterProcessNo,jdbcType=VARCHAR}
        </foreach>
        ,METER_PROCESS_EDITION_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.meterProcessEditionNo,jdbcType=VARCHAR}
        </foreach>
        ,ACTUAL_FIRST1_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.actualFirst1No,jdbcType=VARCHAR}
        </foreach>
        ,GROSS_WEIGHT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossWeight,jdbcType=DECIMAL}
        </foreach>
        ,GROSS_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossManNo,jdbcType=VARCHAR}
        </foreach>
        ,GROSS_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossManName,jdbcType=VARCHAR}
        </foreach>
        ,GROSS_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossTime,jdbcType=TIMESTAMP}
        </foreach>
        ,BASE_SPOT1_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.baseSpot1No,jdbcType=VARCHAR}
        </foreach>
        ,BASE_SPOT1_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.baseSpot1Name,jdbcType=VARCHAR}
        </foreach>
        ,GROSS_CLASS=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossClass,jdbcType=VARCHAR}
        </foreach>
        ,GROSS_GROUP=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossGroup,jdbcType=VARCHAR}
        </foreach>
        ,GROSS_MODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.grossMode,jdbcType=VARCHAR}
        </foreach>
        ,ACTUAL_FIRST2_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.actualFirst2No,jdbcType=VARCHAR}
        </foreach>
        ,TARE_WEIGHT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareWeight,jdbcType=DECIMAL}
        </foreach>
        ,TARE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareManNo,jdbcType=VARCHAR}
        </foreach>
        ,TARE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareManName,jdbcType=VARCHAR}
        </foreach>
        ,TARE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareTime,jdbcType=TIMESTAMP}
        </foreach>
        ,BASE_SPOT2_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.baseSpot2No,jdbcType=VARCHAR}
        </foreach>
        ,BASE_SPOT2_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.baseSpot2Name,jdbcType=VARCHAR}
        </foreach>
        ,TARE_CLASS=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareClass,jdbcType=VARCHAR}
        </foreach>
        ,TARE_GROUP=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareGroup,jdbcType=VARCHAR}
        </foreach>
        ,TARE_MODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.tareMode,jdbcType=VARCHAR}
        </foreach>
        ,NET_WEIGHT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.netWeight,jdbcType=DECIMAL}
        </foreach>
        ,NET_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.netManNo,jdbcType=VARCHAR}
        </foreach>
        ,NET_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.netManName,jdbcType=VARCHAR}
        </foreach>
        ,NET_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.netTime,jdbcType=TIMESTAMP}
        </foreach>
        ,NET_SPOT3_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.netSpot3No,jdbcType=VARCHAR}
        </foreach>
        ,NET_SPOT3_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.netSpot3Name,jdbcType=VARCHAR}
        </foreach>
        ,NET_CLASS=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.netClass,jdbcType=VARCHAR}
        </foreach>
        ,NET_GROUP=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.netGroup,jdbcType=VARCHAR}
        </foreach>
        ,NET_MODE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.netMode,jdbcType=VARCHAR}
        </foreach>
        ,VALUE_FLAG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.valueFlag,jdbcType=VARCHAR}
        </foreach>
        ,UPLOAD_FLAG=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.uploadFlag,jdbcType=VARCHAR}
        </foreach>
        ,CHECK_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkManNo,jdbcType=VARCHAR}
        </foreach>
        ,CHECK_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkManName,jdbcType=VARCHAR}
        </foreach>
        ,CHECK_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkTime,jdbcType=TIMESTAMP}
        </foreach>
        ,UPLOAD_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.uploadManNo,jdbcType=VARCHAR}
        </foreach>
        ,UPLOAD_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.uploadManName,jdbcType=VARCHAR}
        </foreach>
        ,UPLOAD_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.uploadTime,jdbcType=TIMESTAMP}
        </foreach>
        ,SAMPLE_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.sampleNo,jdbcType=VARCHAR}
        </foreach>
        ,RAILWAY_TYPE_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.railwayTypeNo,jdbcType=VARCHAR}
        </foreach>
        ,RAILWAY_TYPE_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.railwayTypeName,jdbcType=VARCHAR}
        </foreach>
        ,MEMO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.memo,jdbcType=VARCHAR}
        </foreach>
        ,WATER_NUM=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.waterNum,jdbcType=DECIMAL}
        </foreach>
        ,ARRIVAL=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.arrival,jdbcType=VARCHAR}
        </foreach>
        ,STATION=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.station,jdbcType=VARCHAR}
        </foreach>
        ,UPDATE_MAN_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.updateManNo,jdbcType=VARCHAR}
        </foreach>
        ,UPDATE_MAN_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.updateManName,jdbcType=VARCHAR}
        </foreach>
        ,UPDATE_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
        </foreach>
        ,SOURCE_AREA=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.sourceArea,jdbcType=VARCHAR}
        </foreach>
        ,BOUND_LIST_URL=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.boundListUrl,jdbcType=VARCHAR}
        </foreach>
        ,IS_BOUND_LIST=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.isBoundList,jdbcType=VARCHAR}
        </foreach>
        ,DATA_SOURCE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.dataSource,jdbcType=VARCHAR}
        </foreach>
        ,LC_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.lcNo,jdbcType=VARCHAR}
        </foreach>
        ,IS_PRE_SCALE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.isPreScale,jdbcType=VARCHAR}
        </foreach>
        ,PREDICTION_TYPE=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.predictionType,jdbcType=VARCHAR}
        </foreach>
        ,PREDICTION_COMBINATION=
-       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_NO" close="end">
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.predictionCombination,jdbcType=VARCHAR}
        </foreach>
+       ,NOTE=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.note,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_MAN_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.createManName,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,DOCUMENT_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.documentId,jdbcType=VARCHAR}
+       </foreach>
+       ,CONTRACT_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.contractId,jdbcType=VARCHAR}
+       </foreach>
+       ,IS_BOUND_LIST_DOWNLOADED=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.isBoundListDownloaded,jdbcType=VARCHAR}
+       </foreach>
      where ACTUAL_NO in 
-     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.actualNo,jdbcType=VARCHAR}
      </foreach> 
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_WORK_HOOK_ACTUAL
     where ACTUAL_NO in 
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
   </delete>
@@ -2303,6 +2457,12 @@
     from METER_WORK_HOOK_ACTUAL t where t.actual_no = #{actualNo,jdbcType=VARCHAR}
   </select>
 
+  <select id="selectByParameter" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+    order by net_time desc
+  </select>
+
   <insert id="insertSelectiveBar" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
     insert into METER_WORK_HOOK_ACTUAL
     <trim prefix="(" suffix=")" suffixOverrides=",">

src/main/java/com/steerinfo/meterwork/meterworkhookactual/model/MeterWorkHookActual.java

@@ -508,6 +508,42 @@ public class MeterWorkHookActual implements IBasePO<String> {
     @ApiModelProperty(value="委托组合",required=false)
     private String predictionCombination;
 
+    /**
+     * 操作原因(NOTE,VARCHAR,100)
+     */
+    @ApiModelProperty(value="操作原因",required=false)
+    private String note;
+
+    /**
+     * 创建人(CREATE_MAN_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="创建人",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间",required=false)
+    private Date createTime;
+
+    /**
+     * 电子签章系统合同文档ID(DOCUMENT_ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="电子签章系统合同文档ID",required=false)
+    private String documentId;
+
+    /**
+     * 电子签章系统合同ID(CONTRACT_ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="电子签章系统合同ID",required=false)
+    private String contractId;
+
+    /**
+     * 是否已从电子签章系统下载电子磅单(IS_BOUND_LIST_DOWNLOADED,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否已从电子签章系统下载电子磅单",required=false)
+    private String isBoundListDownloaded;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1184,6 +1220,54 @@ public class MeterWorkHookActual implements IBasePO<String> {
         this.predictionCombination = predictionCombination == null ? null : predictionCombination.trim();
     }
 
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note == null ? null : note.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getDocumentId() {
+        return documentId;
+    }
+
+    public void setDocumentId(String documentId) {
+        this.documentId = documentId == null ? null : documentId.trim();
+    }
+
+    public String getContractId() {
+        return contractId;
+    }
+
+    public void setContractId(String contractId) {
+        this.contractId = contractId == null ? null : contractId.trim();
+    }
+
+    public String getIsBoundListDownloaded() {
+        return isBoundListDownloaded;
+    }
+
+    public void setIsBoundListDownloaded(String isBoundListDownloaded) {
+        this.isBoundListDownloaded = isBoundListDownloaded == null ? null : isBoundListDownloaded.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1273,6 +1357,12 @@ public class MeterWorkHookActual implements IBasePO<String> {
         sb.append(", isPreScale=").append(isPreScale);
         sb.append(", predictionType=").append(predictionType);
         sb.append(", predictionCombination=").append(predictionCombination);
+        sb.append(", note=").append(note);
+        sb.append(", createManName=").append(createManName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", documentId=").append(documentId);
+        sb.append(", contractId=").append(contractId);
+        sb.append(", isBoundListDownloaded=").append(isBoundListDownloaded);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/pretrack/prehookscale/mapper/PreHookScaleMapper.java

@@ -6,6 +6,8 @@ import java.math.*;
 import java.util.HashMap;
 import java.util.List;
 
+import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
+import feign.Param;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
@@ -19,4 +21,6 @@ public interface PreHookScaleMapper extends IBaseMapper<PreHookScale, String> {
     int batchUpdateByIdsForUsed(List<String> ids);
 
     List<PreHookScale> selectPre(HashMap map);
+
+    List<PreHookScale> selectByRailwayNo(@Param( value = "railwayNo") String railwayNo);
 }

src/main/java/com/steerinfo/pretrack/prehookscale/mapper/PreHookScaleMapper.xml

@@ -1785,4 +1785,12 @@
       #{id}
     </foreach>
   </update>
+
+  <select id="selectByRailwayNo" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <where>
+      railway_no = #{railwayNo}
+      and value_flag = '1'
+    </where>
+  </select>
 </mapper>