修改

src/main/java/com/steerinfo/baseinfo/meterbaseoperationlog/controller/MeterBaseOperationLogController.java

@@ -81,6 +81,30 @@ public class MeterBaseOperationLogController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "获取操作页面列表", notes = "分页查询")
+    @PostMapping(value = "/operationPageInfo")
+    public RESTfulResult operationPageInfo(@RequestBody(required = false) HashMap parmas) {
+        try {
+            List<String> list = meterBaseOperationLogService.operationPageInfo(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
+    @ApiOperation(value = "获取操作功能列表", notes = "分页查询")
+    @PostMapping(value = "/operationFunctionInfo")
+    public RESTfulResult operationFunctionInfo(@RequestBody(required = false) HashMap parmas) {
+        try {
+            List<String> list = meterBaseOperationLogService.operationFunctionInfo(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

src/main/java/com/steerinfo/baseinfo/meterbaseoperationlog/mapper/MeterBaseOperationLogMapper.java

@@ -25,4 +25,6 @@ public interface MeterBaseOperationLogMapper extends IBaseMapper<MeterBaseOperat
     List<HashMap> allActualStateView(Map<String, Object> params);
     //车号分析Web端车号修改
     List<HashMap> countWebResetCar(Map<String, Object> params);
+    List<String> operationPageInfo(Map<String, Object> params);
+    List<String> operationFunctionInfo(Map<String, Object> params);
 }

src/main/java/com/steerinfo/baseinfo/meterbaseoperationlog/mapper/MeterBaseOperationLogMapper.xml

@@ -806,6 +806,18 @@
   <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select" />
     where 1 = 1
+    <if test="operationPageStr != null and operationPageStr != ''">
+      and operation_page in
+      <foreach collection="pageStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+    <if test="operationFunctionStr != null and operationFunctionStr != ''">
+      and operation_function in
+      <foreach collection="functionStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
     <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
       and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>
@@ -862,4 +874,11 @@
       and B.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>
   </select>
+
+  <select id="operationPageInfo" parameterType="java.util.HashMap" resultType="String">
+    select distinct A.operation_page from meter_base_operation_log A
+  </select>
+  <select id="operationFunctionInfo" parameterType="java.util.HashMap" resultType="String">
+    select distinct A.operation_function from meter_base_operation_log A
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbaseoperationlog/service/IMeterBaseOperationLogService.java

@@ -43,4 +43,6 @@ public interface IMeterBaseOperationLogService extends IBaseService<MeterBaseOpe
 
     PageList<HashMap> allFirstStateView(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
     PageList<HashMap> allActualStateView(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
+    List<String> operationPageInfo(HashMap<String, Object> params);
+    List<String> operationFunctionInfo(HashMap<String, Object> params);
 }

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

@@ -76,6 +76,14 @@ public class MeterBaseOperationLogServiceImpl extends BaseServiceImpl<MeterBaseO
     @Override
     public PageList<MeterBaseOperationLog> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
+        if(params.get("operationPageStr") != null) {
+            String[] pageStr = params.get("operationPageStr").toString().split(",");
+            params.put("pageStr", pageStr);
+        }
+        if(params.get("operationFunctionStr") != null) {
+            String[] pageStr = params.get("operationFunctionStr").toString().split(",");
+            params.put("functionStr", pageStr);
+        }
         List<MeterBaseOperationLog> rows = meterBaseOperationLogMapper.likeByDesc(params);
         if(rows.size() >= 1) {
             for(MeterBaseOperationLog model: rows) {
@@ -377,4 +385,16 @@ public class MeterBaseOperationLogServiceImpl extends BaseServiceImpl<MeterBaseO
         PageList pageInfo = new PageList(operationLogs);
         return pageInfo;
     }
+
+    @Override
+    public List<String> operationPageInfo(HashMap<String, Object> params) {
+        List<String> rows = meterBaseOperationLogMapper.operationPageInfo(params);
+        return rows;
+    }
+
+    @Override
+    public List<String> operationFunctionInfo(HashMap<String, Object> params) {
+        List<String> rows = meterBaseOperationLogMapper.operationFunctionInfo(params);
+        return rows;
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/mapper/MeterBaseSpotInfoMapper.xml

@@ -1134,6 +1134,7 @@
     <if test="spotTypeName != null and spotTypeName != ''">
       and SPOT_TYPE_NAME = #{spotTypeName}
     </if>
+    order by BASE_SPOT_NAME asc
   </select>
 
   <select id="carSpotGroupByActualAndFirst" parameterType="java.util.HashMap" resultMap="BaseResultMap">

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

@@ -117,6 +117,7 @@
     <result column="CONTRACT_ID" jdbcType="VARCHAR" property="contractId" />
     <result column="IS_BOUND_LIST_DOWNLOADED" jdbcType="VARCHAR" property="isBoundListDownloaded" />
     <result column="DOCUMENT_ID" jdbcType="VARCHAR" property="documentId" />
+    <result column="CHECK_FLAG" jdbcType="VARCHAR" property="checkFlag" />
   </resultMap>
   <sql id="columns">
     ACTUAL_NO, PREDICTION_NO, NOTICE_NO, CAR_NO, TRAILER_NO, MATTER_NO, MATTER_NAME, 
@@ -138,7 +139,7 @@
     THEORY_AMOUNT, MEASURE_BATCH, MEASURE_BATCH_COUNT, SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE, 
     RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME, 
     CREATE_TIME, DATA_SOURCE, IS_PRE_SCALE, BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, 
-    IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID
+    IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, CHECK_FLAG
   </sql>
   <sql id="columns_alias">
     t.ACTUAL_NO, t.PREDICTION_NO, t.NOTICE_NO, t.CAR_NO, t.TRAILER_NO, t.MATTER_NO, t.MATTER_NAME, 
@@ -162,7 +163,7 @@
     t.MEASURE_BATCH_COUNT, t.SENDER_TYPE, t.SENDER_REMARK, t.RECEIVER_TYPE, t.RECEIVER_REMARK, 
     t.AMOUNT_UNIT, t.MEASURE_OBJECT_TYPE, t.MEASURE_TASK_NUM, t.BILL_TYPE, t.CREATE_MAN_NAME, 
     t.CREATE_TIME, t.DATA_SOURCE, t.IS_PRE_SCALE, t.BOUND_LIST_URL, t.IS_BOUND_LIST, 
-    t.CONTRACT_ID, t.IS_BOUND_LIST_DOWNLOADED, t.DOCUMENT_ID
+    t.CONTRACT_ID, t.IS_BOUND_LIST_DOWNLOADED, t.DOCUMENT_ID, t.CHECK_FLAG
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM METER_WORK_CAR_ACTUAL
@@ -517,6 +518,9 @@
       <if test="documentId != null and documentId != ''">
         and DOCUMENT_ID = #{documentId}
       </if>
+      <if test="checkFlag != null and checkFlag != ''">
+        and CHECK_FLAG = #{checkFlag}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -866,6 +870,9 @@
       <if test="documentId != null and documentId != ''">
         and DOCUMENT_ID LIKE '%${documentId}%'
       </if>
+      <if test="checkFlag != null and checkFlag != ''">
+        and CHECK_FLAG LIKE '%${checkFlag}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -1217,6 +1224,9 @@
       <if test="documentId != null and documentId != ''">
         or DOCUMENT_ID = #{documentId}
       </if>
+      <if test="checkFlag != null and checkFlag != ''">
+        or CHECK_FLAG = #{checkFlag}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual">
     insert into METER_WORK_CAR_ACTUAL (ACTUAL_NO, PREDICTION_NO, NOTICE_NO, 
@@ -1257,7 +1267,8 @@
       MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME, 
       CREATE_TIME, DATA_SOURCE, IS_PRE_SCALE, 
       BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, 
-      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID)
+      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, CHECK_FLAG
+      )
     values (#{actualNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, 
       #{carNo,jdbcType=VARCHAR}, #{trailerNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, 
       #{matterName,jdbcType=VARCHAR}, #{contractNo,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR}, 
@@ -1296,7 +1307,8 @@
       #{measureTaskNum,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{dataSource,jdbcType=VARCHAR}, #{isPreScale,jdbcType=VARCHAR}, 
       #{boundListUrl,jdbcType=VARCHAR}, #{isBoundList,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR}, 
-      #{isBoundListDownloaded,jdbcType=VARCHAR}, #{documentId,jdbcType=VARCHAR})
+      #{isBoundListDownloaded,jdbcType=VARCHAR}, #{documentId,jdbcType=VARCHAR}, #{checkFlag,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual">
     insert into METER_WORK_CAR_ACTUAL
@@ -1646,6 +1658,9 @@
       <if test="documentId != null">
         DOCUMENT_ID,
       </if>
+      <if test="checkFlag != null">
+        CHECK_FLAG,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="actualNo != null">
@@ -1993,6 +2008,9 @@
       <if test="documentId != null">
         #{documentId,jdbcType=VARCHAR},
       </if>
+      <if test="checkFlag != null">
+        #{checkFlag,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual">
@@ -2110,7 +2128,8 @@
       IS_BOUND_LIST = #{isBoundList,jdbcType=VARCHAR},
       CONTRACT_ID = #{contractId,jdbcType=VARCHAR},
       IS_BOUND_LIST_DOWNLOADED = #{isBoundListDownloaded,jdbcType=VARCHAR},
-      DOCUMENT_ID = #{documentId,jdbcType=VARCHAR}
+      DOCUMENT_ID = #{documentId,jdbcType=VARCHAR},
+      CHECK_FLAG = #{checkFlag,jdbcType=VARCHAR}
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual">
@@ -2458,6 +2477,9 @@
       <if test="documentId != null">
         DOCUMENT_ID = #{documentId,jdbcType=VARCHAR},
       </if>
+      <if test="checkFlag != null">
+        CHECK_FLAG = #{checkFlag,jdbcType=VARCHAR},
+      </if>
     </set>
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </update>
@@ -2518,8 +2540,8 @@
       MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME, 
       CREATE_TIME, DATA_SOURCE, IS_PRE_SCALE, 
       BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, 
-      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID
-      )
+      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, 
+      CHECK_FLAG)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.actualNo,jdbcType=VARCHAR}, 
@@ -2565,8 +2587,8 @@
       #{item.measureTaskNum,jdbcType=VARCHAR}, #{item.billType,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, 
       #{item.createTime,jdbcType=TIMESTAMP}, #{item.dataSource,jdbcType=VARCHAR}, #{item.isPreScale,jdbcType=VARCHAR}, 
       #{item.boundListUrl,jdbcType=VARCHAR}, #{item.isBoundList,jdbcType=VARCHAR}, #{item.contractId,jdbcType=VARCHAR}, 
-      #{item.isBoundListDownloaded,jdbcType=VARCHAR}, #{item.documentId,jdbcType=VARCHAR}
-       from dual  
+      #{item.isBoundListDownloaded,jdbcType=VARCHAR}, #{item.documentId,jdbcType=VARCHAR}, 
+      #{item.checkFlag,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -3032,6 +3054,10 @@
        <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>
+       ,CHECK_FLAG=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkFlag,jdbcType=VARCHAR}
+       </foreach>
      where ACTUAL_NO in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.actualNo,jdbcType=VARCHAR}
@@ -3907,10 +3933,10 @@
       and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>
     <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
-        and net_spot3_no in
-        <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
-          #{item}
-        </foreach>
+      and net_spot3_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
     </if>
     <if test="flag != null and flag != ''">
       and value_flag != '0'
@@ -3930,185 +3956,185 @@
 
   <select id="selectOldAndNew" parameterType="java.util.HashMap" resultType="HashMap">
     SELECT *
-       FROM (
+    FROM (
     select ACTUAL_NO,
-           prediction_no,
-           CAR_NO,
-           GROSS_WEIGHT,
-           BASE_SPOT1_NAME,
-           GROSS_TIME,
-           TARE_WEIGHT,
-           BASE_SPOT2_NAME,
-           TARE_TIME,
-           NET_WEIGHT,
-           net_spot3_no,
-           NET_SPOT3_NAME,
-           NET_TIME,
-           forwarding_unit_no,
-           FORWARDING_UNIT_NAME,
-           receiving_uint_no,
-           RECEIVING_UINT_NAME,
-           matter_no,
-           MATTER_NAME,
-           sender_remark,
-           '新系统' as REMARK
-           from METER_WORK_CAR_ACTUAL
-     where IS_PRE_SCALE='1'
-           and VALUE_FLAG in ('1', '2')
-           and UPLOAD_FLAG='2'
-           and NET_TIME > to_date('2022-07-21'，'YYYY-MM-DD')
-           union
-            (
-               select FS_WEIGHTNO as ACTUAL_NO,
-                      fs_noticeId as prediction_no,
-                      REPLACE(FS_CARNO,'-','') as CAR_NO,
-                      FS_GROSSWEIGHT * 1000 as GROSS_WEIGHT,
-                      FS_GROSSPOINTNAME as BASE_SPOT1_NAME,
-                      FS_GROSSWEIGHTTIME as GROSS_TIME,
-                      FS_TAREWEIGHT * 1000 as TARE_WEIGHT,
-                      FS_TAREPOINTNAME as BASE_SPOT2_NAME,
-                      FS_TAREWEIGHTTIME as TARE_TIME,
-                      FS_NETWEIGHT * 1000 as NET_WEIGHT,
-                      fs_netPointId as net_spot3_no,
-                      FS_NETPOINTNAME as NET_SPOT3_NAME,
-                      FS_NETWEIGHTTIME as NET_TIME,
-                      fs_sender as FORWARDING_UNIT_No,
-                      FS_SENDERNAME as FORWARDING_UNIT_NAME,
-                      fs_receiver as RECEIVING_UINT_No,
-                      FS_RECEIVERNAME as RECEIVING_UINT_NAME,
-                      fs_material as matter_no,
-                      FS_MATERIALNAME as MATTER_NAME,
-                      fs_senderRemark sender_remark,
-                      '老系统' as REMARK
-                from jgweight.view_car_net @MCMS
-                   where FS_NETWEIGHTTIME > to_date('2022-07-21'，'YYYY-MM-DD') AND FS_DELETEDTAG='N'
-                        and fs_noticeId is not null )
-             )
-        where 1 = 1
-          <if test="remark != null and remark != ''">
-            and remark LIKE '%${remark}%'
-          </if>
-          <if test="predictionNo != null and predictionNo != ''">
-            and prediction_no LIKE '%${predictionNo}%'
-          </if>
-          <if test="senderRemark != null and senderRemark != ''">
-            and sender_remark LIKE '%${senderRemark}%'
-          </if>
-          <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-            and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-          </if>
-          <if test="carNo != null and carNo != ''">
-            and car_no like '%${carNo}%'
-          </if>
-          <if test="netSpot3No != null and netSpot3No != ''">
-            and net_spot3_no like '%${netSpot3No}%'
-          </if>
-          <if test="netSpot3Name != null and netSpot3Name != ''">
-            and net_spot3_name like '%${netSpot3Name}%'
-          </if>
-          <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-            and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
-          </if>
-          <if test="forwardingUnitName != null and forwardingUnitName != ''">
-            and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
-          </if>
-          <if test="receivingUintNo != null and receivingUintNo != ''">
-            and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
-          </if>
-          <if test="receivingUintName != null and receivingUintName != ''">
-            and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
-          </if>
-          <if test="matterNo != null and matterNo != ''">
-            and matter_no LIKE '%${matterNo}%'
-          </if>
-          <if test="matterName != null and matterName != ''">
-            and matter_name LIKE '%${matterName}%'
-          </if>
+    prediction_no,
+    CAR_NO,
+    GROSS_WEIGHT,
+    BASE_SPOT1_NAME,
+    GROSS_TIME,
+    TARE_WEIGHT,
+    BASE_SPOT2_NAME,
+    TARE_TIME,
+    NET_WEIGHT,
+    net_spot3_no,
+    NET_SPOT3_NAME,
+    NET_TIME,
+    forwarding_unit_no,
+    FORWARDING_UNIT_NAME,
+    receiving_uint_no,
+    RECEIVING_UINT_NAME,
+    matter_no,
+    MATTER_NAME,
+    sender_remark,
+    '新系统' as REMARK
+    from METER_WORK_CAR_ACTUAL
+    where IS_PRE_SCALE='1'
+    and VALUE_FLAG in ('1', '2')
+    and UPLOAD_FLAG='2'
+    and NET_TIME > to_date('2022-07-21'，'YYYY-MM-DD')
+    union
+    (
+    select FS_WEIGHTNO as ACTUAL_NO,
+    fs_noticeId as prediction_no,
+    REPLACE(FS_CARNO,'-','') as CAR_NO,
+    FS_GROSSWEIGHT * 1000 as GROSS_WEIGHT,
+    FS_GROSSPOINTNAME as BASE_SPOT1_NAME,
+    FS_GROSSWEIGHTTIME as GROSS_TIME,
+    FS_TAREWEIGHT * 1000 as TARE_WEIGHT,
+    FS_TAREPOINTNAME as BASE_SPOT2_NAME,
+    FS_TAREWEIGHTTIME as TARE_TIME,
+    FS_NETWEIGHT * 1000 as NET_WEIGHT,
+    fs_netPointId as net_spot3_no,
+    FS_NETPOINTNAME as NET_SPOT3_NAME,
+    FS_NETWEIGHTTIME as NET_TIME,
+    fs_sender as FORWARDING_UNIT_No,
+    FS_SENDERNAME as FORWARDING_UNIT_NAME,
+    fs_receiver as RECEIVING_UINT_No,
+    FS_RECEIVERNAME as RECEIVING_UINT_NAME,
+    fs_material as matter_no,
+    FS_MATERIALNAME as MATTER_NAME,
+    fs_senderRemark sender_remark,
+    '老系统' as REMARK
+    from jgweight.view_car_net @MCMS
+    where FS_NETWEIGHTTIME > to_date('2022-07-21'，'YYYY-MM-DD') AND FS_DELETEDTAG='N'
+    and fs_noticeId is not null )
+    )
+    where 1 = 1
+    <if test="remark != null and remark != ''">
+      and remark LIKE '%${remark}%'
+    </if>
+    <if test="predictionNo != null and predictionNo != ''">
+      and prediction_no LIKE '%${predictionNo}%'
+    </if>
+    <if test="senderRemark != null and senderRemark != ''">
+      and sender_remark LIKE '%${senderRemark}%'
+    </if>
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="carNo != null and carNo != ''">
+      and car_no like '%${carNo}%'
+    </if>
+    <if test="netSpot3No != null and netSpot3No != ''">
+      and net_spot3_no like '%${netSpot3No}%'
+    </if>
+    <if test="netSpot3Name != null and netSpot3Name != ''">
+      and net_spot3_name like '%${netSpot3Name}%'
+    </if>
+    <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+      and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+    </if>
+    <if test="forwardingUnitName != null and forwardingUnitName != ''">
+      and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+    </if>
+    <if test="receivingUintNo != null and receivingUintNo != ''">
+      and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+    </if>
+    <if test="receivingUintName != null and receivingUintName != ''">
+      and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+    </if>
+    <if test="matterNo != null and matterNo != ''">
+      and matter_no LIKE '%${matterNo}%'
+    </if>
+    <if test="matterName != null and matterName != ''">
+      and matter_name LIKE '%${matterName}%'
+    </if>
   </select>
 
   <select id="doQueryFirstOldAndNew" parameterType="java.util.HashMap" resultType="HashMap">
     select *
-        from (
-            select actual_first_no,
-            prediction_no,
-            car_no,
-            meter_weight,
-            create_time,
-            base_spot_no,
-            base_spot_name,
-            forwarding_unit_no,
-            forwarding_unit_name,
-            receiving_uint_no,
-            receiving_uint_name,
-            matter_no,
-            matter_name,
-            sender_remark,
-            '新系统' remark
-            from meter_work_car_actual_first
-        where is_pre_scale = '1'
-            and value_flag in  ('1', '2')
-            and create_time > to_date('2022-07-21'，'YYYY-MM-DD')
-            union
-              (
-                  select weightNo actual_first_no,
-                  noticeId prediction_no,
-                  replace(carNo, '-', '') car_no,
-                  weight*1000 meter_weight,
-                  weightTime create_time,
-                  fs_pointId base_spot_no,
-                  pointName base_spot_name,
-                  sender forwarding_unit_no,
-                  senderName forwarding_unit_name,
-                  receiver receiving_uint_no,
-                  receiverName receiving_uint_name,
-                  material matter_no,
-                  materialName matter_name,
-                  senderRemark sender_remark,
-                  '老系统' remark
-                  from jgweight.VIEW_CAR_FIRST @MCMS
-            where weightTime > to_date('2022-07-21'，'YYYY-MM-DD') AND FS_DELETEDTAG='N'
-                 and noticeId is not null)
-          ) A
-        where 1 = 1
-          <if test="remark != null and remark != ''">
-            and remark LIKE '%${remark}%'
-          </if>
-          <if test="predictionNo != null and predictionNo != ''">
-            and prediction_no LIKE '%${predictionNo}%'
-          </if>
-          <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-            and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-          </if>
-          <if test="senderRemark != null and senderRemark != ''">
-            and sender_remark LIKE '%${senderRemark}%'
-          </if>
-          <if test="carNo != null and carNo != ''">
-            and car_no like '%${carNo}%'
-          </if>
-          <if test="baseSpotNo != null and baseSpotNo != ''">
-            and base_spot_no like '%${baseSpotNo}%'
-          </if>
-          <if test="baseSpotName != null and baseSpotName != ''">
-            and base_spot_name like '%${baseSpotName}%'
-          </if>
-          <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-            and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
-          </if>
-          <if test="forwardingUnitName != null and forwardingUnitName != ''">
-            and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
-          </if>
-          <if test="receivingUintNo != null and receivingUintNo != ''">
-            and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
-          </if>
-          <if test="receivingUintName != null and receivingUintName != ''">
-            and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
-          </if>
-          <if test="matterNo != null and matterNo != ''">
-            and matter_no LIKE '%${matterNo}%'
-          </if>
-          <if test="matterName != null and matterName != ''">
-            and matter_name LIKE '%${matterName}%'
-          </if>
+    from (
+    select actual_first_no,
+    prediction_no,
+    car_no,
+    meter_weight,
+    create_time,
+    base_spot_no,
+    base_spot_name,
+    forwarding_unit_no,
+    forwarding_unit_name,
+    receiving_uint_no,
+    receiving_uint_name,
+    matter_no,
+    matter_name,
+    sender_remark,
+    '新系统' remark
+    from meter_work_car_actual_first
+    where is_pre_scale = '1'
+    and value_flag in  ('1', '2')
+    and create_time > to_date('2022-07-21'，'YYYY-MM-DD')
+    union
+    (
+    select weightNo actual_first_no,
+    noticeId prediction_no,
+    replace(carNo, '-', '') car_no,
+    weight*1000 meter_weight,
+    weightTime create_time,
+    fs_pointId base_spot_no,
+    pointName base_spot_name,
+    sender forwarding_unit_no,
+    senderName forwarding_unit_name,
+    receiver receiving_uint_no,
+    receiverName receiving_uint_name,
+    material matter_no,
+    materialName matter_name,
+    senderRemark sender_remark,
+    '老系统' remark
+    from jgweight.VIEW_CAR_FIRST @MCMS
+    where weightTime > to_date('2022-07-21'，'YYYY-MM-DD') AND FS_DELETEDTAG='N'
+    and noticeId is not null)
+    ) A
+    where 1 = 1
+    <if test="remark != null and remark != ''">
+      and remark LIKE '%${remark}%'
+    </if>
+    <if test="predictionNo != null and predictionNo != ''">
+      and prediction_no LIKE '%${predictionNo}%'
+    </if>
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="senderRemark != null and senderRemark != ''">
+      and sender_remark LIKE '%${senderRemark}%'
+    </if>
+    <if test="carNo != null and carNo != ''">
+      and car_no like '%${carNo}%'
+    </if>
+    <if test="baseSpotNo != null and baseSpotNo != ''">
+      and base_spot_no like '%${baseSpotNo}%'
+    </if>
+    <if test="baseSpotName != null and baseSpotName != ''">
+      and base_spot_name like '%${baseSpotName}%'
+    </if>
+    <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+      and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+    </if>
+    <if test="forwardingUnitName != null and forwardingUnitName != ''">
+      and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+    </if>
+    <if test="receivingUintNo != null and receivingUintNo != ''">
+      and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+    </if>
+    <if test="receivingUintName != null and receivingUintName != ''">
+      and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+    </if>
+    <if test="matterNo != null and matterNo != ''">
+      and matter_no LIKE '%${matterNo}%'
+    </if>
+    <if test="matterName != null and matterName != ''">
+      and matter_name LIKE '%${matterName}%'
+    </if>
   </select>
 
 
@@ -4128,59 +4154,59 @@
     '新系统' remark
     from meter_work_car_actual
     where 1= 1
-        and IS_PRE_SCALE='1'
-        and VALUE_FLAG in ('1', '2')
-        and UPLOAD_FLAG='2'
-        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-            and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-        </if>
-        <if test="netSpot3No != null and netSpot3No != ''">
-          and net_spot3_no like '%${netSpot3No}%'
-        </if>
-        <if test="netSpot3Name != null and netSpot3Name != ''">
-          and net_spot3_name like '%${netSpot3Name}%'
-        </if>
-        <if test="senderRemark != null and senderRemark != ''">
-          and sender_remark LIKE '%${senderRemark}%'
-        </if>
-        <if test="carNo != null and carNo != ''">
-          and car_no LIKE '%${carNo}%'
-        </if>
+    and IS_PRE_SCALE='1'
+    and VALUE_FLAG in ('1', '2')
+    and UPLOAD_FLAG='2'
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="netSpot3No != null and netSpot3No != ''">
+      and net_spot3_no like '%${netSpot3No}%'
+    </if>
+    <if test="netSpot3Name != null and netSpot3Name != ''">
+      and net_spot3_name like '%${netSpot3Name}%'
+    </if>
+    <if test="senderRemark != null and senderRemark != ''">
+      and sender_remark LIKE '%${senderRemark}%'
+    </if>
+    <if test="carNo != null and carNo != ''">
+      and car_no LIKE '%${carNo}%'
+    </if>
     group by matter_no, matter_name, forwarding_unit_no, forwarding_unit_name, receiving_uint_no, receiving_uint_name
     union
-        (
-        select fs_material matter_no,
-        fs_materialName matter_name,
-        count(1) countSum,
-        sum(fs_netWeight*1000) net_weight,
-        sum(fs_grossWeight*1000) gross_weight,
-        sum(fs_tareWeight*1000) tare_weight,
-        fs_sender forwarding_unit_no,
-        fs_senderName forwarding_unit_name,
-        fs_receiver receiving_uint_no,
-        fs_receiverName receiving_uint_name,
-        '老系统' remark
-        from jgweight.view_car_net @MCMS
-        where 1 = 1
-            and fs_noticeId is not null
-            and FS_DELETEDTAG='N'
-            <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-              and  fs_netweightTime  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and fs_netweightTime  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-            </if>
-            <if test="netSpot3No != null and netSpot3No != ''">
-              and fs_netPointId like '%${netSpot3No}%'
-            </if>
-            <if test="netSpot3Name != null and netSpot3Name != ''">
-              and fs_netPointName like '%${netSpot3Name}%'
-            </if>
-            <if test="senderRemark != null and senderRemark != ''">
-              and fs_senderRemark LIKE '%${senderRemark}%'
-            </if>
-            <if test="carNo != null and carNo != ''">
-              and FS_CARNO LIKE '%${carNo}%'
-            </if>
-        group by fs_material, fs_materialName, fs_sender , fs_senderName , fs_receiver , fs_receiverName
-        )
+    (
+    select fs_material matter_no,
+    fs_materialName matter_name,
+    count(1) countSum,
+    sum(fs_netWeight*1000) net_weight,
+    sum(fs_grossWeight*1000) gross_weight,
+    sum(fs_tareWeight*1000) tare_weight,
+    fs_sender forwarding_unit_no,
+    fs_senderName forwarding_unit_name,
+    fs_receiver receiving_uint_no,
+    fs_receiverName receiving_uint_name,
+    '老系统' remark
+    from jgweight.view_car_net @MCMS
+    where 1 = 1
+    and fs_noticeId is not null
+    and FS_DELETEDTAG='N'
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  fs_netweightTime  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and fs_netweightTime  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="netSpot3No != null and netSpot3No != ''">
+      and fs_netPointId like '%${netSpot3No}%'
+    </if>
+    <if test="netSpot3Name != null and netSpot3Name != ''">
+      and fs_netPointName like '%${netSpot3Name}%'
+    </if>
+    <if test="senderRemark != null and senderRemark != ''">
+      and fs_senderRemark LIKE '%${senderRemark}%'
+    </if>
+    <if test="carNo != null and carNo != ''">
+      and FS_CARNO LIKE '%${carNo}%'
+    </if>
+    group by fs_material, fs_materialName, fs_sender , fs_senderName , fs_receiver , fs_receiverName
+    )
     )
     where 1=1
     <if test="remark != null and remark != ''">
@@ -4247,26 +4273,26 @@
 
   <select id="netWeightAndTheoryAmount" parameterType="java.util.HashMap" resultType="hashmap">
     select A.car_no,
-       A.prediction_no,
-       A.matter_name,
-       to_char(round(B.gross_weight/1000,2),'FM9999999999999999.00') grossWeight,
-       to_char(round(B.tare_weight/1000,2),'FM9999999999999999.00') tareWeight,
-       to_char(round(B.net_weight/1000,2),'FM9999999999999999.00') netWeight,
-       A.theory_amount,
-       to_char(round(B.net_weight/1000,2),'FM9999999999999999.00') - A.theory_amount netWeightSubTheoryWeight,
-       A.forwarding_unit_name,
-       A.receiving_uint_name,
-       B.gross_time,
-       B.base_spot1_name,
-       B.tare_time,
-       B.base_spot2_name,
-       B.net_time,
-       B.net_spot3_name
+    A.prediction_no,
+    A.matter_name,
+    to_char(round(B.gross_weight/1000,2),'FM9999999999999999.00') grossWeight,
+    to_char(round(B.tare_weight/1000,2),'FM9999999999999999.00') tareWeight,
+    to_char(round(B.net_weight/1000,2),'FM9999999999999999.00') netWeight,
+    A.theory_amount,
+    to_char(round(B.net_weight/1000,2),'FM9999999999999999.00') - A.theory_amount netWeightSubTheoryWeight,
+    A.forwarding_unit_name,
+    A.receiving_uint_name,
+    B.gross_time,
+    B.base_spot1_name,
+    B.tare_time,
+    B.base_spot2_name,
+    B.net_time,
+    B.net_spot3_name
     from pre_track_scale A
     left join meter_work_car_actual B
-      on A.prediction_no = B.prediction_no
+    on A.prediction_no = B.prediction_no
     where A.theory_amount is not null
-        and B.actual_no is not null
+    and B.actual_no is not null
     <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
       and  B.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and B.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>
@@ -4297,123 +4323,123 @@
   <!-- 查询符合内倒双委托车辆在铁合金秤点用普通委托信息过磅的结净信息倒序 -->
   <select id="findTHJNetWeight" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     select A.*
-      from meter_work_car_actual A
-     where A.car_no in (select distinct base_name
-                          from com_base_info
-                         where p_base_code = '001047')
-           and A.net_spot3_no = 'JT0026'
-           and ( A.prediction_type is null or A.prediction_type = '1' )
-           and A.is_pre_scale = '1'
+    from meter_work_car_actual A
+    where A.car_no in (select distinct base_name
+    from com_base_info
+    where p_base_code = '001047')
+    and A.net_spot3_no = 'JT0026'
+    and ( A.prediction_type is null or A.prediction_type = '1' )
+    and A.is_pre_scale = '1'
     <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="carNo != null and carNo != ''">
       and A.car_no like '%${carNo}%'
     </if>
-     order by A.net_time desc
+    order by A.net_time desc
   </select>
 
   <select id="findFiveNetWeight" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     select A.*
-      from meter_work_car_actual A
-     where 1 = 1
-        and A.net_spot3_no in ('JT0035', 'JT0034')
-        and A.prediction_type = '5'
-        and A.is_pre_scale = '1'
-        <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="carNo != null and carNo != ''">
-          and A.car_no like '%${carNo}%'
-        </if>
-     order by A.net_time ASC
+    from meter_work_car_actual A
+    where 1 = 1
+    and A.net_spot3_no in ('JT0035', 'JT0034')
+    and A.prediction_type = '5'
+    and A.is_pre_scale = '1'
+    <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="carNo != null and carNo != ''">
+      and A.car_no like '%${carNo}%'
+    </if>
+    order by A.net_time ASC
   </select>
 
   <select id="countDayAllState" parameterType="java.util.HashMap" resultType="hashmap">
     SELECT A.net_spot3_no,
-           A.net_spot3_name,
-           A.net_man_no,
-           A.net_man_name,
-           count(1) count_actual
+    A.net_spot3_name,
+    A.net_man_no,
+    A.net_man_name,
+    count(1) count_actual
     from meter_work_car_actual A
-        left join pre_track_scale B
-            on A.prediction_no = B.prediction_no
+    left join pre_track_scale B
+    on A.prediction_no = B.prediction_no
     where 1 = 1
-      <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="netSpot3NoStr != null and netSpot3NoStr != ''">
-        and A.net_spot3_no in
-        <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
-          #{item}
-        </foreach>
-      </if>
-      <if test="createManNoStr != null and createManNoStr != ''">
-        and A.net_man_no in
-        <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
-          #{item}
-        </foreach>
-      </if>
-      <if test="baseSpotNo != null and baseSpotNo != ''">
-        and  A.net_spot3_no like '%${baseSpotNo}%'
-      </if>
-      <if test="baseSpotName != null and baseSpotName != ''">
-        and  A.net_spot3_name like '%${baseSpotName}%'
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        and  A.value_flag like '%${valueFlag}%'
-      </if>
-      <if test="validFlag != null and validFlag != ''">
-        and  A.value_flag != '0'
-      </if>
-      <if test="isPreScale != null and isPreScale != ''">
-        and  A.is_pre_scale like '%${isPreScale}%'
-      </if>
+    <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="netSpot3NoStr != null and netSpot3NoStr != ''">
+      and A.net_spot3_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+    <if test="createManNoStr != null and createManNoStr != ''">
+      and A.net_man_no in
+      <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+    <if test="baseSpotNo != null and baseSpotNo != ''">
+      and  A.net_spot3_no like '%${baseSpotNo}%'
+    </if>
+    <if test="baseSpotName != null and baseSpotName != ''">
+      and  A.net_spot3_name like '%${baseSpotName}%'
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      and  A.value_flag like '%${valueFlag}%'
+    </if>
+    <if test="validFlag != null and validFlag != ''">
+      and  A.value_flag != '0'
+    </if>
+    <if test="isPreScale != null and isPreScale != ''">
+      and  A.is_pre_scale like '%${isPreScale}%'
+    </if>
     group by A.net_spot3_no,
-            A.net_spot3_name,
-            A.net_man_no,
-            A.net_man_name
+    A.net_spot3_name,
+    A.net_man_no,
+    A.net_man_name
   </select>
 
   <select id="smallAndNegativeNetWeightRatio" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     select A.car_no,
-          A.prediction_no,
-          A.matter_name,
-          A.gross_weight,
-          A.tare_weight,
-          A.net_weight,
-          A.update_man_name,
-          A.update_time,
-          A.note,
-          A.sender_remark,
-          A.forwarding_unit_name,
-          A.receiving_uint_name,
-          A.gross_time,
-          A.base_spot1_name,
-          case when A.gross_mode = '1' then '远程计量'
-          when A.gross_mode = '2' then '智能计量'
-          when A.gross_mode = '3' then '手工计量'
-          else null end gross_mode,
-          A.gross_man_name,
-          A.tare_time,
-          A.base_spot2_name,
-          case when A.tare_mode = '1' then '远程计量'
-          when A.tare_mode = '2' then '智能计量'
-          when A.tare_mode = '3' then '手工计量'
-          else null end tare_mode,
-          A.tare_man_name,
-          A.net_time,
-          A.net_spot3_name,
-          A.net_man_name,
-          case when A.value_flag = '0' then '作废'
-          when A.value_flag = '1' then '有效'
-          else null end value_flag,
-          case when A.upload_flag = '1' then '未同步'
-          when A.upload_flag = '2' then '已同步'
-          else null end upload_flag
+    A.prediction_no,
+    A.matter_name,
+    A.gross_weight,
+    A.tare_weight,
+    A.net_weight,
+    A.update_man_name,
+    A.update_time,
+    A.note,
+    A.sender_remark,
+    A.forwarding_unit_name,
+    A.receiving_uint_name,
+    A.gross_time,
+    A.base_spot1_name,
+    case when A.gross_mode = '1' then '远程计量'
+    when A.gross_mode = '2' then '智能计量'
+    when A.gross_mode = '3' then '手工计量'
+    else null end gross_mode,
+    A.gross_man_name,
+    A.tare_time,
+    A.base_spot2_name,
+    case when A.tare_mode = '1' then '远程计量'
+    when A.tare_mode = '2' then '智能计量'
+    when A.tare_mode = '3' then '手工计量'
+    else null end tare_mode,
+    A.tare_man_name,
+    A.net_time,
+    A.net_spot3_name,
+    A.net_man_name,
+    case when A.value_flag = '0' then '作废'
+    when A.value_flag = '1' then '有效'
+    else null end value_flag,
+    case when A.upload_flag = '1' then '未同步'
+    when A.upload_flag = '2' then '已同步'
+    else null end upload_flag
     from meter_work_car_actual A
     where A.net_weight &lt;= 2000
-        and A.value_flag != '0'
+    and A.value_flag != '0'
     <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>

src/main/java/com/steerinfo/meterwork/meterworkcaractual/model/MeterWorkCarActual.java

@@ -10,7 +10,7 @@ import java.util.Date;
 @ApiModel(value="计量汽车衡结净表")
 public class MeterWorkCarActual implements IBasePO<String> {
     /**
-     * 结净编号（YYYYMMDD+4位流水）(ACTUAL_NO,VARCHAR,20)
+     * 结净编号（YYYYMMDD+4位流水）(ACTUAL_NO,VARCHAR,50)
      */
     @ApiModelProperty(value="结净编号（YYYYMMDD+4位流水）",required=true)
     private String actualNo;
@@ -244,7 +244,7 @@ public class MeterWorkCarActual implements IBasePO<String> {
     private String grossMode;
 
     /**
-     * 皮重计量作业编号(ACTUAL_FIRST2_NO,VARCHAR,20)
+     * 皮重计量作业编号(ACTUAL_FIRST2_NO,VARCHAR,50)
      */
     @ApiModelProperty(value="皮重计量作业编号",required=false)
     private String actualFirst2No;
@@ -352,9 +352,9 @@ public class MeterWorkCarActual implements IBasePO<String> {
     private String netGroup;
 
     /**
-     * 结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）(NET_MODE,VARCHAR,1)
+     * 结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）(NET_MODE,VARCHAR,1)
      */
-    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）",required=false)
+    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）",required=false)
     private String netMode;
 
     /**
@@ -670,7 +670,7 @@ public class MeterWorkCarActual implements IBasePO<String> {
     private String isPreScale;
 
     /**
-     * 电子磅单地址(BOUND_LIST_URL,VARCHAR,100)
+     * 电子磅单地址(BOUND_LIST_URL,VARCHAR,400)
      */
     @ApiModelProperty(value="电子磅单地址",required=false)
     private String boundListUrl;
@@ -699,6 +699,12 @@ public class MeterWorkCarActual implements IBasePO<String> {
     @ApiModelProperty(value="电子签章系统合同文档ID",required=false)
     private String documentId;
 
+    /**
+     * 审核状态（0：未审核；1：已审核）(CHECK_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="审核状态（0：未审核；1：已审核）",required=false)
+    private String checkFlag;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1631,6 +1637,14 @@ public class MeterWorkCarActual implements IBasePO<String> {
         this.documentId = documentId == null ? null : documentId.trim();
     }
 
+    public String getCheckFlag() {
+        return checkFlag;
+    }
+
+    public void setCheckFlag(String checkFlag) {
+        this.checkFlag = checkFlag == null ? null : checkFlag.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1752,6 +1766,7 @@ public class MeterWorkCarActual implements IBasePO<String> {
         sb.append(", contractId=").append(contractId);
         sb.append(", isBoundListDownloaded=").append(isBoundListDownloaded);
         sb.append(", documentId=").append(documentId);
+        sb.append(", checkFlag=").append(checkFlag);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -3086,11 +3086,11 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 //        List<String> spotList = carActual.stream().map(MeterWorkCarActual::getNetSpot3Name).distinct().collect(Collectors.toList());
 
         List<MeterBaseSpotInfo> spotModel = meterBaseSpotInfoMapper.spotInfoByList(params);
-        List<MeterBaseSpotInfo> spotList = spotModel.stream().collect(
-                Collectors. collectingAndThen(
-                        Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getBaseSpotNo() + ";" + o.getBaseSpotName()))), ArrayList::new)
-        );
-        for(MeterBaseSpotInfo spot: spotList) {
+//        List<MeterBaseSpotInfo> spotList = spotModel.stream().collect(
+//                Collectors. collectingAndThen(
+//                        Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getBaseSpotNo() + ";" + o.getBaseSpotName()))), ArrayList::new)
+//        );
+        for(MeterBaseSpotInfo spot: spotModel) {
             long countActual = 0L;
             long countIsPrescale = 0L;
             long countIsNotPrescale = 0L;
@@ -3130,7 +3130,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         && model.getNetSpot3Name().equals(spot.getBaseSpotName())
                         && model.getValueFlag().equals("0")).count();
                 //结净数据已核查
-                countActualCheck = ActualImgDatamodels.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                countActualCheck = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
+                        && model.getNetSpot3Name().equals(spot.getBaseSpotName())).count() - ActualImgDatamodels.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())).count();
             }
 
@@ -3164,7 +3165,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         && !model.getValueFlag().equals("0")
                         && model.getWeightType().equals("1")).count();
                 //一次未结净皮重
-                countTare = carFirst.stream().filter(model -> StringUtils.isNotEmpty(model.getWeightType()) && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                countTareNoClean = carFirst.stream().filter(model -> StringUtils.isNotEmpty(model.getWeightType()) && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())
                         && model.getValueFlag().equals("1")
                         && model.getWeightType().equals("1")).count();
@@ -3183,7 +3184,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())
                         && model.getValueFlag().equals("0")).count();
                 //一次数据已核查
-                countFirstCheck = ActualImgDatamodels.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                countFirstCheck = carFirst.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())).count() - firstImgDatamodels.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())).count();
             }
 

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/controller/MeterWorkCheckFirstActualController.java

@@ -9,6 +9,7 @@ import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualF
 import com.steerinfo.meterwork.meterworkcheckfirstactual.model.CarActualCountCheckNum;
 import com.steerinfo.meterwork.meterworkcheckfirstactual.model.CarFirstCountCheckNum;
 import com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActual;
+import com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActualTemp;
 import com.steerinfo.meterwork.meterworkcheckfirstactual.service.IMeterWorkCheckFirstActualService;
 import com.steerinfo.meterwork.meterworkdatacount.model.RailwayActualGrossWeightComparison;
 import com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup;
@@ -163,7 +164,7 @@ public class MeterWorkCheckFirstActualController extends BaseRESTfulController {
     @PostMapping(value = "/likeByDesc")
     public RESTfulResult likeByDesc(@RequestBody HashMap parmas) {
         try {
-            PageList<MeterWorkCheckFirstActual> list = meterWorkCheckFirstActualService.likeByDesc(parmas);
+            PageList<MeterWorkCheckFirstActualTemp> list = meterWorkCheckFirstActualService.likeByDesc(parmas);
             return success(list);
         } catch (Exception ex) {
             ex.printStackTrace();

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/mapper/MeterWorkCheckFirstActualMapper.java

@@ -4,10 +4,7 @@ import com.steerinfo.baseinfo.meterbasespotinfo.model.MeterBaseSpotInfo;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
-import com.steerinfo.meterwork.meterworkcheckfirstactual.model.CarActualCountCheckNum;
-import com.steerinfo.meterwork.meterworkcheckfirstactual.model.CarFirstCountCheckNum;
-import com.steerinfo.meterwork.meterworkcheckfirstactual.model.FirstActualImgData;
-import com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActual;
+import com.steerinfo.meterwork.meterworkcheckfirstactual.model.*;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.HashMap;
@@ -22,7 +19,7 @@ public interface MeterWorkCheckFirstActualMapper extends IBaseMapper<MeterWorkCh
     List<FirstActualImgData> carActualImgDataList(HashMap<String, Object> pararms);
     List<CarActualCountCheckNum> carActualCountCheckNum(HashMap<String, Object> pararms);
     List<CarFirstCountCheckNum> carFirstCountCheckNum(HashMap<String, Object> pararms);
-    List<MeterWorkCheckFirstActual> likeByDesc(HashMap<String, Object> pararms);
+    List<MeterWorkCheckFirstActualTemp> likeByDesc(HashMap<String, Object> pararms);
     List<CarFirstCountCheckNum> carFirstLikeByDesc(HashMap<String, Object> pararms);
     List<CarActualCountCheckNum> carActualLikeByDesc(HashMap<String, Object> pararms);
 

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/mapper/MeterWorkCheckFirstActualMapper.xml

@@ -397,6 +397,7 @@
     )
     group by baseSpotNo,
              baseSpotName
+    order by baseSpotName asc
   </select>
 
   <resultMap id="CarFirstBaseResultMap" type="com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst">
@@ -510,18 +511,17 @@
     left join meter_work_check_first_actual B
     on A.actual_first_no = B.check_id
     where 1 = 1
-    and A.actual_first_no in (
-    select distinct C.check_id
-    from meter_work_check_first_actual C
-    where 1 = 1
-    and C.value_flag = '0'
-    <if test="typeNo != null and typeName != ''">
-      and C.type_No = #{typeNo}
-    </if>
-    <if test="typeName != null and typeName != ''">
-      and C.type_Name = #{typeName}
-    </if>
-    )
+    and A.actual_first_no not in (
+              select distinct C.check_id
+                from meter_work_check_first_actual C
+              where 1 = 1
+                and C.value_flag = '0'
+              <if test="typeNo != null and typeName != ''">
+                and C.type_No = #{typeNo}
+              </if>
+              <if test="typeName != null and typeName != ''">
+                and C.type_Name = #{typeName}
+              </if>)
     <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
       and  A.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
       and A.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
@@ -664,18 +664,17 @@
         left join meter_work_check_first_actual B
             on A.actual_no = B.check_id
     where 1 = 1
-    and A.actual_no in (
-        select distinct C.check_id
-            from meter_work_check_first_actual C
-        where 1 = 1
-              and C.value_flag = '1'
+    and A.actual_no not in (
+              select distinct C.check_id
+                from meter_work_check_first_actual C
+              where 1 = 1
+                and C.value_flag = '1'
               <if test="typeNo != null and typeName != ''">
                 and C.type_No = #{typeNo}
               </if>
               <if test="typeName != null and typeName != ''">
                 and C.type_Name = #{typeName}
-              </if>
-    )
+              </if>)
     <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')
@@ -747,6 +746,15 @@
                   <if test="typeName != null and typeName != ''">
                     and C.type_Name = #{typeName}
                   </if>)
+    <if test="actualNo != null and actualNo != ''">
+        and A.actual_no = #{actualNo}
+    </if>
+    <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+      and A.net_spot3_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
     <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')
@@ -834,6 +842,15 @@
               <if test="typeName != null and typeName != ''">
                 and C.type_Name = #{typeName}
               </if>)
+    <if test="actualFirstNo != null and actualFirstNo != ''">
+      and A.actual_first_no = #{actualFirstNo}
+    </if>
+    <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+      and A.base_spot_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
     <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
       and  A.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
       and A.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
@@ -858,23 +875,71 @@
             A.value_flag
   </select>
 
-  <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <where>
+  <select id="likeByDesc" parameterType="java.util.HashMap" resultType="com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActualTemp">
+    select baseSpotNo, baseSpotName,checkId,checkStartTime,checkEndTime,checkUsedSeconds,checkManNo,checkManName,checkResult,typeNo,typeName, valueFlag
+        from ((SELECT B.base_spot_no baseSpotNo,
+                    B.base_spot_name baseSpotName,
+                    A.check_id checkId,
+                    A.check_start_time checkStartTime,
+                    A.check_end_time checkEndTime,
+                    A.check_used_seconds checkUsedSeconds,
+                    A.check_man_no checkManNo,
+                    A.check_man_name checkManName,
+                    A.check_result checkResult,
+                    A.type_no typeNo,
+                    A.type_name typeName,
+                    A.value_flag valueFlag
+                FROM METER_WORK_CHECK_FIRST_ACTUAL A
+                left join meter_work_car_actual_first B
+                    on A.check_id = B.actual_first_no
+                WHERE A.TYPE_NO LIKE '%001002001%'
+                    and A.value_flag = '0') union
+              (SELECT B.net_spot3_no   baseSpotNo,
+                    B.net_spot3_name baseSpotName,
+                    A.check_id checkId,
+                    A.check_start_time checkStartTime,
+                    A.check_end_time checkEndTime,
+                    A.check_used_seconds checkUsedSeconds,
+                    A.check_man_no checkManNo,
+                    A.check_man_name checkManName,
+                    A.check_result checkResult,
+                    A.type_no typeNo,
+                    A.type_name typeName,
+                    A.value_flag valueFlag
+              FROM METER_WORK_CHECK_FIRST_ACTUAL A
+              left join meter_work_car_actual B
+                on A.check_id = B.actual_no
+              WHERE A.TYPE_NO LIKE '%001002001%'
+                and A.value_flag = '1'))
+    where 1 = 1
       <if test="checkId != null and checkId != ''">
-        and CHECK_ID LIKE '%${checkId}%'
+        and checkId LIKE '%${checkId}%'
       </if>
       <if test="typeNo != null and typeNo != ''">
-        and TYPE_NO LIKE '%${typeNo}%'
-      </if>
-      <if test="typeName != null and typeName != ''">
-        and TYPE_NAME LIKE '%${typeName}%'
+        and typeNo LIKE '%${typeNo}%'
       </if>
       <if test="valueFlag != null and valueFlag != ''">
-        and VALUE_FLAG LIKE '%${valueFlag}%'
+        and valueFlag = #{valueFlag}
       </if>
-    </where>
-    order by check_start_time desc
+      <if test="minTime != null and minTime != ''">
+        and checkUsedSeconds >= #{minTime}
+      </if>
+      <if test="maxTime != null and maxTime != ''">
+        and checkUsedSeconds &lt;=  #{maxTime}
+      </if>
+      <if test="createManNoStr != null and createManNoStr != ''">
+        and checkManNo in
+        <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+    <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+      and baseSpotNo in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+    order by checkStartTime desc
   </select>
 
   <select id="carFirstLikeByDesc" parameterType="java.util.HashMap"
@@ -920,6 +985,15 @@
               where 1 = 1
                   and C.value_flag = '0'
                   and C.type_no = '001002001')
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        and A.actual_first_no = #{actualFirstNo}
+      </if>
+    <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+      and A.base_spot_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
       <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
         and  A.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
         and A.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
@@ -985,6 +1059,15 @@
             where 1 = 1
               and B.value_flag = '1'
               and B.type_no = '001002001')
+    <if test="actualNo != null and actualNo != ''">
+      and A.actual_no = #{actualNo}
+    </if>
+    <if test="netSpot3NoStr != null and netSpot3NoStr != ''">
+      and A.net_spot3_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
     <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')

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/model/MeterWorkCheckFirstActualTemp.java

@@ -0,0 +1,207 @@
+package com.steerinfo.meterwork.meterworkcheckfirstactual.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="核查汽车衡一次或者结净数据表")
+public class MeterWorkCheckFirstActualTemp implements IBasePO<String> {
+    private String baseSpotNo;
+    private String baseSpotName;
+    /**
+     * 核查主键(ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="核查主键",required=true)
+    private String id;
+
+    /**
+     * 一次或结净主键(CHECK_ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="一次或结净主键",required=true)
+    private String checkId;
+
+    /**
+     * 核查开始时间(CHECK_START_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="核查开始时间",required=false)
+    private Date checkStartTime;
+
+    /**
+     * 核查结束时间(CHECK_END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="核查结束时间",required=false)
+    private Date checkEndTime;
+
+    /**
+     * 核查用时(CHECK_USED_SECONDS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="核查用时",required=false)
+    private BigDecimal checkUsedSeconds;
+
+    /**
+     * 核查人编号(CHECK_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="核查人编号",required=false)
+    private String checkManNo;
+
+    /**
+     * 核查人(CHECK_MAN_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="核查人",required=false)
+    private String checkManName;
+
+    /**
+     * 核查结果(CHECK_RESULT,VARCHAR,255)
+     */
+    @ApiModelProperty(value="核查结果",required=false)
+    private String checkResult;
+
+    /**
+     * 衡器类型（001002001：汽车衡、001019001：静态轨道衡、001019002:动态轨道衡、001019003:静态铁水轨道衡、001019004:动态铁水轨道衡、001019005:吊钩秤）(TYPE_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="衡器类型（001002001：汽车衡、001019001：静态轨道衡、001019002:动态轨道衡、001019003:静态铁水轨道衡、001019004:动态铁水轨道衡、001019005:吊钩秤）",required=false)
+    private String typeNo;
+
+    /**
+     * 衡器类型名称（001002001：汽车衡、001019001：静态轨道衡、001019002:动态轨道衡、001019003:静态铁水轨道衡、001019004:动态铁水轨道衡、001019005:吊钩秤）(TYPE_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="衡器类型名称（001002001：汽车衡、001019001：静态轨道衡、001019002:动态轨道衡、001019003:静态铁水轨道衡、001019004:动态铁水轨道衡、001019005:吊钩秤）",required=false)
+    private String typeName;
+
+    /**
+     * 0:一次数据、1:净重数据(VALUE_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="0:一次数据、1:净重数据",required=false)
+    private String valueFlag;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getBaseSpotNo() {
+        return baseSpotNo;
+    }
+
+    public void setBaseSpotNo(String baseSpotNo) {
+        this.baseSpotNo = baseSpotNo;
+    }
+
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getCheckId() {
+        return checkId;
+    }
+
+    public void setCheckId(String checkId) {
+        this.checkId = checkId == null ? null : checkId.trim();
+    }
+
+    public Date getCheckStartTime() {
+        return checkStartTime;
+    }
+
+    public void setCheckStartTime(Date checkStartTime) {
+        this.checkStartTime = checkStartTime;
+    }
+
+    public Date getCheckEndTime() {
+        return checkEndTime;
+    }
+
+    public void setCheckEndTime(Date checkEndTime) {
+        this.checkEndTime = checkEndTime;
+    }
+
+    public BigDecimal getCheckUsedSeconds() {
+        return checkUsedSeconds;
+    }
+
+    public void setCheckUsedSeconds(BigDecimal checkUsedSeconds) {
+        this.checkUsedSeconds = checkUsedSeconds;
+    }
+
+    public String getCheckManNo() {
+        return checkManNo;
+    }
+
+    public void setCheckManNo(String checkManNo) {
+        this.checkManNo = checkManNo == null ? null : checkManNo.trim();
+    }
+
+    public String getCheckManName() {
+        return checkManName;
+    }
+
+    public void setCheckManName(String checkManName) {
+        this.checkManName = checkManName == null ? null : checkManName.trim();
+    }
+
+    public String getCheckResult() {
+        return checkResult;
+    }
+
+    public void setCheckResult(String checkResult) {
+        this.checkResult = checkResult == null ? null : checkResult.trim();
+    }
+
+    public String getTypeNo() {
+        return typeNo;
+    }
+
+    public void setTypeNo(String typeNo) {
+        this.typeNo = typeNo == null ? null : typeNo.trim();
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName == null ? null : typeName.trim();
+    }
+
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag == null ? null : valueFlag.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", checkId=").append(checkId);
+        sb.append(", checkStartTime=").append(checkStartTime);
+        sb.append(", checkEndTime=").append(checkEndTime);
+        sb.append(", checkUsedSeconds=").append(checkUsedSeconds);
+        sb.append(", checkManNo=").append(checkManNo);
+        sb.append(", checkManName=").append(checkManName);
+        sb.append(", checkResult=").append(checkResult);
+        sb.append(", typeNo=").append(typeNo);
+        sb.append(", typeName=").append(typeName);
+        sb.append(", valueFlag=").append(valueFlag);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/service/IMeterWorkCheckFirstActualService.java

@@ -5,6 +5,7 @@ import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkcheckfirstactual.model.CarActualCountCheckNum;
 import com.steerinfo.meterwork.meterworkcheckfirstactual.model.CarFirstCountCheckNum;
 import com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActual;
+import com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActualTemp;
 import com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup;
 
 import java.util.HashMap;
@@ -28,7 +29,7 @@ public interface IMeterWorkCheckFirstActualService extends IBaseService<MeterWor
     List<HashMap> carFirstActualImgDataList(HashMap<String, Object> params);
     PageList<CarActualCountCheckNum> carActualCountCheckNum(HashMap<String, Object> params);
     PageList<CarFirstCountCheckNum> carFirstCountCheckNum(HashMap<String, Object> params);
-    PageList<MeterWorkCheckFirstActual> likeByDesc(HashMap<String, Object> params);
+    PageList<MeterWorkCheckFirstActualTemp> likeByDesc(HashMap<String, Object> params);
     PageList<CarFirstCountCheckNum> carFirstLikeByDesc(HashMap<String, Object> params);
     PageList<CarActualCountCheckNum> carActualLikeByDesc(HashMap<String, Object> params);
 }

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/service/impl/MeterWorkCheckFirstActualServiceImpl.java

@@ -6,22 +6,27 @@ import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.user.UserPayload;
+import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
+import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActualFirstMapper;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkcheckfirstactual.mapper.MeterWorkCheckFirstActualMapper;
-import com.steerinfo.meterwork.meterworkcheckfirstactual.model.CarActualCountCheckNum;
-import com.steerinfo.meterwork.meterworkcheckfirstactual.model.CarFirstCountCheckNum;
-import com.steerinfo.meterwork.meterworkcheckfirstactual.model.FirstActualImgData;
-import com.steerinfo.meterwork.meterworkcheckfirstactual.model.MeterWorkCheckFirstActual;
+import com.steerinfo.meterwork.meterworkcheckfirstactual.model.*;
 import com.steerinfo.meterwork.meterworkcheckfirstactual.service.IMeterWorkCheckFirstActualService;
 import com.steerinfo.meterwork.meterworkdatacount.model.RfidIdentifyAnalysis;
+import com.steerinfo.meterwork.meterworkrailwayactfirst.mapper.MeterWorkRailwayActFirstMapper;
+import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
+import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
+import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
 import org.apache.shiro.crypto.hash.Hash;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -47,6 +52,18 @@ public class MeterWorkCheckFirstActualServiceImpl extends BaseServiceImpl<MeterW
     @Autowired(required = false)
     private MeterWorkCheckFirstActualMapper meterWorkCheckFirstActualMapper;
 
+    @Resource
+    private MeterWorkCarActualFirstMapper meterWorkCarActualFirstMapper;
+
+    @Resource
+    private MeterWorkCarActualMapper meterWorkCarActualMapper;
+
+    @Resource
+    private MeterWorkRailwayActFirstMapper meterWorkRailwayActFirstMapper;
+
+    @Resource
+    private MeterWorkRailwayActualMapper meterWorkRailwayActualMapper;
+
     @Override
     protected IBaseMapper<MeterWorkCheckFirstActual, String> getMapper() {
         return meterWorkCheckFirstActualMapper;
@@ -68,6 +85,47 @@ public class MeterWorkCheckFirstActualServiceImpl extends BaseServiceImpl<MeterW
             userId = "admin";
             userName = "admins";
         }
+        if(model.getTypeNo().equals("001002001")) { //001002001：汽车衡、valueFlag：0（一次数据）、1:（结净数据）
+            if(model.getValueFlag().equals("0")) {
+                MeterWorkCarActualFirst firstModel = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getCheckId());
+                if(firstModel != null) {
+                    firstModel.setCheckManNo(userId);
+                    firstModel.setCheckManName(userName);
+                    firstModel.setCheckTime(new Date());
+                    firstModel.setCheckFlag("2");
+                    meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstModel);
+                }
+            }else if(model.getValueFlag().equals("1")) {
+                MeterWorkCarActual actualModel = meterWorkCarActualMapper.selectByPrimaryKey(model.getCheckId());
+                if(actualModel != null) {
+                    actualModel.setCheckManNo(userId);
+                    actualModel.setCheckManName(userName);
+                    actualModel.setCheckTime(new Date());
+                    actualModel.setCheckFlag("2");
+                    meterWorkCarActualMapper.updateByPrimaryKeySelective(actualModel);
+                }
+            }
+        }else {
+            if(model.getValueFlag().equals("0")) {
+                MeterWorkRailwayActFirst firstModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getCheckId());
+                if(firstModel != null) {
+                    firstModel.setCheckManNo(userId);
+                    firstModel.setCheckManName(userName);
+                    firstModel.setCheckTime(new Date());
+                    firstModel.setCheckFlag("2");
+                    meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(firstModel);
+                }
+            }else if(model.getValueFlag().equals("1")) {
+                MeterWorkRailwayActual actualModel = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getCheckId());
+                if(actualModel != null) {
+                    actualModel.setCheckManNo(userId);
+                    actualModel.setCheckManName(userName);
+                    actualModel.setCheckTime(new Date());
+                    actualModel.setCheckFlag("2");
+                    meterWorkRailwayActualMapper.updateByPrimaryKeySelective(actualModel);
+                }
+            }
+        }
         model.setCheckManNo(userId);
         model.setCheckManName(userName);
         meterWorkCheckFirstActualMapper.insert(model);
@@ -106,14 +164,14 @@ public class MeterWorkCheckFirstActualServiceImpl extends BaseServiceImpl<MeterW
                 long countCheckFirstDataYes = 0L;
                 long countCheckFirstDataNo = 0L;
                 if(firstImgDatamodels.size() >= 1) {
-                    countCheckFirstDataYes = firstImgDatamodels.stream().filter(item -> StringUtils.isNotEmpty(item.getBaseSpotNo())
+                    countCheckFirstDataNo = firstImgDatamodels.stream().filter(item -> StringUtils.isNotEmpty(item.getBaseSpotNo())
                             && StringUtils.isNotEmpty(item.getBaseSpotName())
                             && StringUtils.isNotEmpty(spotModel.getBaseSpotNo())
                             && StringUtils.isNotEmpty(spotModel.getBaseSpotName())
                             && item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
                             && item.getBaseSpotName().equals(spotModel.getBaseSpotName())).count();
                 }
-                countCheckFirstDataNo = countFirstData - countCheckFirstDataYes;
+                countCheckFirstDataYes = countFirstData - countCheckFirstDataNo;
 
                 long countActualData = actualModels.stream().filter(item -> StringUtils.isNotEmpty(item.getNetSpot3No())
                         && StringUtils.isNotEmpty(item.getNetSpot3Name())
@@ -124,14 +182,14 @@ public class MeterWorkCheckFirstActualServiceImpl extends BaseServiceImpl<MeterW
                 long countCheckActualDataYes = 0L;
                 long countCheckActualDataNo = 0L;
                 if(ActualImgDatamodels.size() >= 1) {
-                    countCheckActualDataYes = ActualImgDatamodels.stream().filter(item -> StringUtils.isNotEmpty(item.getBaseSpotNo())
+                    countCheckActualDataNo = ActualImgDatamodels.stream().filter(item -> StringUtils.isNotEmpty(item.getBaseSpotNo())
                             && StringUtils.isNotEmpty(item.getBaseSpotName())
                             && StringUtils.isNotEmpty(spotModel.getBaseSpotNo())
                             && StringUtils.isNotEmpty(spotModel.getBaseSpotName())
                             && item.getBaseSpotNo().equals(spotModel.getBaseSpotNo())
                             && item.getBaseSpotName().equals(spotModel.getBaseSpotName())).count();
                 }
-                countCheckActualDataNo = countActualData - countCheckActualDataYes;
+                countCheckActualDataYes = countActualData - countCheckActualDataNo;
 
                 HashMap<String, Object> map = new HashMap<>();
                 map.put("baseSpotNo", spotModel.getBaseSpotNo());
@@ -151,6 +209,10 @@ public class MeterWorkCheckFirstActualServiceImpl extends BaseServiceImpl<MeterW
     @Override
     public PageList<CarActualCountCheckNum> carActualCountCheckNum(HashMap<String, Object> params) {
         PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        if(params.get("netSpot3NoStr") != null) {
+            String[] spotNoStr = params.get("netSpot3NoStr").toString().split(",");
+            params.put("spotNoStr", spotNoStr);
+        }
         List<CarActualCountCheckNum> rows = meterWorkCheckFirstActualMapper.carActualCountCheckNum(params);
         PageList pageInfo = new PageList(rows);
         return pageInfo;
@@ -159,15 +221,27 @@ public class MeterWorkCheckFirstActualServiceImpl extends BaseServiceImpl<MeterW
     @Override
     public PageList<CarFirstCountCheckNum> carFirstCountCheckNum(HashMap<String, Object> params) {
         PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        if(params.get("netSpot3NoStr") != null) {
+            String[] spotNoStr = params.get("netSpot3NoStr").toString().split(",");
+            params.put("spotNoStr", spotNoStr);
+        }
         List<CarFirstCountCheckNum> rows = meterWorkCheckFirstActualMapper.carFirstCountCheckNum(params);
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
 
     @Override
-    public PageList<MeterWorkCheckFirstActual> likeByDesc(HashMap<String, Object> params) {
+    public PageList<MeterWorkCheckFirstActualTemp> likeByDesc(HashMap<String, Object> params) {
         PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
-        List<MeterWorkCheckFirstActual> rows = meterWorkCheckFirstActualMapper.likeByDesc(params);
+        if(params.get("createManNoStr") != null) {
+            String[] manNoStr = params.get("createManNoStr").toString().split(",");
+            params.put("manNoStr", manNoStr);
+        }
+        if(params.get("netSpot3NoStr") != null) {
+            String[] spotNoStr = params.get("netSpot3NoStr").toString().split(",");
+            params.put("spotNoStr", spotNoStr);
+        }
+        List<MeterWorkCheckFirstActualTemp> rows = meterWorkCheckFirstActualMapper.likeByDesc(params);
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
@@ -175,6 +249,10 @@ public class MeterWorkCheckFirstActualServiceImpl extends BaseServiceImpl<MeterW
     @Override
     public PageList<CarFirstCountCheckNum> carFirstLikeByDesc(HashMap<String, Object> params) {
         PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        if(params.get("netSpot3NoStr") != null) {
+            String[] spotNoStr = params.get("netSpot3NoStr").toString().split(",");
+            params.put("spotNoStr", spotNoStr);
+        }
         List<CarFirstCountCheckNum> rows = meterWorkCheckFirstActualMapper.carFirstLikeByDesc(params);
         PageList pageInfo = new PageList(rows);
         return pageInfo;
@@ -183,6 +261,10 @@ public class MeterWorkCheckFirstActualServiceImpl extends BaseServiceImpl<MeterW
     @Override
     public PageList<CarActualCountCheckNum> carActualLikeByDesc(HashMap<String, Object> params) {
         PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        if(params.get("netSpot3NoStr") != null) {
+            String[] spotNoStr = params.get("netSpot3NoStr").toString().split(",");
+            params.put("spotNoStr", spotNoStr);
+        }
         List<CarActualCountCheckNum> rows = meterWorkCheckFirstActualMapper.carActualLikeByDesc(params);
         PageList pageInfo = new PageList(rows);
         return pageInfo;

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/mapper/MeterWorkRailwayActualMapper.xml

@@ -113,6 +113,7 @@
     <result column="IS_BOUND_LIST_DOWNLOADED" jdbcType="VARCHAR" property="isBoundListDownloaded" />
     <result column="DOCUMENT_ID" jdbcType="VARCHAR" property="documentId" />
     <result column="IS_AUTO_PUBLISH" jdbcType="VARCHAR" property="isAutoPublish" />
+    <result column="CHECK_FLAG" jdbcType="VARCHAR" property="checkFlag" />
   </resultMap>
   <sql id="columns">
     ACTUAL_NO, PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, MATTER_NO, 
@@ -134,7 +135,7 @@
     AMOUNT_UNIT, MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME, CREATE_TIME, 
     DATA_SOURCE, NOTE, IS_PRE_SACALE, LC_NO, PREDICTION_TYPE, PREDICTION_COMBINATION, 
     BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, 
-    IS_AUTO_PUBLISH
+    IS_AUTO_PUBLISH, CHECK_FLAG
   </sql>
   <sql id="columns_alias">
     t.ACTUAL_NO, t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO, t.MATTER_NO, 
@@ -157,7 +158,8 @@
     t.SENDER_REMARK, t.RECEIVER_TYPE, t.RECEIVER_REMARK, t.AMOUNT_UNIT, t.MEASURE_OBJECT_TYPE, 
     t.MEASURE_TASK_NUM, t.BILL_TYPE, t.CREATE_MAN_NAME, t.CREATE_TIME, t.DATA_SOURCE, 
     t.NOTE, t.IS_PRE_SACALE, t.LC_NO, t.PREDICTION_TYPE, t.PREDICTION_COMBINATION, t.BOUND_LIST_URL, 
-    t.IS_BOUND_LIST, t.CONTRACT_ID, t.IS_BOUND_LIST_DOWNLOADED, t.DOCUMENT_ID, t.IS_AUTO_PUBLISH
+    t.IS_BOUND_LIST, t.CONTRACT_ID, t.IS_BOUND_LIST_DOWNLOADED, t.DOCUMENT_ID, t.IS_AUTO_PUBLISH, 
+    t.CHECK_FLAG
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM METER_WORK_RAILWAY_ACTUAL
@@ -500,6 +502,9 @@
       <if test="isAutoPublish != null and isAutoPublish != ''">
         and IS_AUTO_PUBLISH = #{isAutoPublish}
       </if>
+      <if test="checkFlag != null and checkFlag != ''">
+        and CHECK_FLAG = #{checkFlag}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -837,6 +842,9 @@
       <if test="isAutoPublish != null and isAutoPublish != ''">
         and IS_AUTO_PUBLISH LIKE '%${isAutoPublish}%'
       </if>
+      <if test="checkFlag != null and checkFlag != ''">
+        and CHECK_FLAG LIKE '%${checkFlag}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -1176,6 +1184,9 @@
       <if test="isAutoPublish != null and isAutoPublish != ''">
         or IS_AUTO_PUBLISH = #{isAutoPublish}
       </if>
+      <if test="checkFlag != null and checkFlag != ''">
+        or CHECK_FLAG = #{checkFlag}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
     insert into METER_WORK_RAILWAY_ACTUAL (ACTUAL_NO, PREDICTION_NO, NOTICE_NO, 
@@ -1215,8 +1226,8 @@
       NOTE, IS_PRE_SACALE, LC_NO, 
       PREDICTION_TYPE, PREDICTION_COMBINATION, 
       BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, 
-      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, IS_AUTO_PUBLISH
-      )
+      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, IS_AUTO_PUBLISH, 
+      CHECK_FLAG)
     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}, 
@@ -1254,8 +1265,8 @@
       #{note,jdbcType=VARCHAR}, #{isPreSacale,jdbcType=VARCHAR}, #{lcNo,jdbcType=VARCHAR}, 
       #{predictionType,jdbcType=VARCHAR}, #{predictionCombination,jdbcType=VARCHAR}, 
       #{boundListUrl,jdbcType=VARCHAR}, #{isBoundList,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR}, 
-      #{isBoundListDownloaded,jdbcType=VARCHAR}, #{documentId,jdbcType=VARCHAR}, #{isAutoPublish,jdbcType=VARCHAR}
-      )
+      #{isBoundListDownloaded,jdbcType=VARCHAR}, #{documentId,jdbcType=VARCHAR}, #{isAutoPublish,jdbcType=VARCHAR}, 
+      #{checkFlag,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
     insert into METER_WORK_RAILWAY_ACTUAL
@@ -1593,6 +1604,9 @@
       <if test="isAutoPublish != null">
         IS_AUTO_PUBLISH,
       </if>
+      <if test="checkFlag != null">
+        CHECK_FLAG,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="actualNo != null">
@@ -1928,6 +1942,9 @@
       <if test="isAutoPublish != null">
         #{isAutoPublish,jdbcType=VARCHAR},
       </if>
+      <if test="checkFlag != null">
+        #{checkFlag,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
@@ -2041,7 +2058,8 @@
       CONTRACT_ID = #{contractId,jdbcType=VARCHAR},
       IS_BOUND_LIST_DOWNLOADED = #{isBoundListDownloaded,jdbcType=VARCHAR},
       DOCUMENT_ID = #{documentId,jdbcType=VARCHAR},
-      IS_AUTO_PUBLISH = #{isAutoPublish,jdbcType=VARCHAR}
+      IS_AUTO_PUBLISH = #{isAutoPublish,jdbcType=VARCHAR},
+      CHECK_FLAG = #{checkFlag,jdbcType=VARCHAR}
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
@@ -2377,6 +2395,9 @@
       <if test="isAutoPublish != null">
         IS_AUTO_PUBLISH = #{isAutoPublish,jdbcType=VARCHAR},
       </if>
+      <if test="checkFlag != null">
+        CHECK_FLAG = #{checkFlag,jdbcType=VARCHAR},
+      </if>
     </set>
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </update>
@@ -2435,7 +2456,8 @@
       IS_PRE_SACALE, LC_NO, PREDICTION_TYPE, 
       PREDICTION_COMBINATION, BOUND_LIST_URL, 
       IS_BOUND_LIST, CONTRACT_ID, IS_BOUND_LIST_DOWNLOADED, 
-      DOCUMENT_ID, IS_AUTO_PUBLISH)
+      DOCUMENT_ID, IS_AUTO_PUBLISH, CHECK_FLAG
+      )
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.actualNo,jdbcType=VARCHAR}, 
@@ -2479,7 +2501,8 @@
       #{item.isPreSacale,jdbcType=VARCHAR}, #{item.lcNo,jdbcType=VARCHAR}, #{item.predictionType,jdbcType=VARCHAR}, 
       #{item.predictionCombination,jdbcType=VARCHAR}, #{item.boundListUrl,jdbcType=VARCHAR}, 
       #{item.isBoundList,jdbcType=VARCHAR}, #{item.contractId,jdbcType=VARCHAR}, #{item.isBoundListDownloaded,jdbcType=VARCHAR}, 
-      #{item.documentId,jdbcType=VARCHAR}, #{item.isAutoPublish,jdbcType=VARCHAR} from dual  
+      #{item.documentId,jdbcType=VARCHAR}, #{item.isAutoPublish,jdbcType=VARCHAR}, #{item.checkFlag,jdbcType=VARCHAR}
+       from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -2929,6 +2952,10 @@
        <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.isAutoPublish,jdbcType=VARCHAR}
        </foreach>
+       ,CHECK_FLAG=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkFlag,jdbcType=VARCHAR}
+       </foreach>
      where ACTUAL_NO in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.actualNo,jdbcType=VARCHAR}
@@ -2943,6 +2970,7 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
   <sql id="whereTime">
     <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
       and  NET_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and NET_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
@@ -4373,67 +4401,67 @@
     from (
     (
     select actual_no,
-            railway_no,
-            matter_no,
-            matter_name,
-            meter_type_name,
-            forwarding_unit_name,
-            receiving_uint_name,
-            gross_weight,
-            tare_weight,
-            net_weight,
-            gross_time,
-            tare_time,
-            net_time,
-            net_spot3_name,
-            sender_remark,
-            create_man_name,
-            create_time
+    railway_no,
+    matter_no,
+    matter_name,
+    meter_type_name,
+    forwarding_unit_name,
+    receiving_uint_name,
+    gross_weight,
+    tare_weight,
+    net_weight,
+    gross_time,
+    tare_time,
+    net_time,
+    net_spot3_name,
+    sender_remark,
+    create_man_name,
+    create_time
     from meter_work_railway_actual
-      where 1 = 1
-      <if test="railwayNo != null and railwayNo != ''">
-        and railway_no like '%${railwayNo}%'
-      </if>
-      and MATTER_NAME in
-      <foreach collection="matterNameList" item="id" separator="," open="(" close=")">
-        #{id}
-      </foreach>
-      and forwarding_unit_no in
-      <foreach collection="list" item="id" separator="," open="(" close=")">
-        #{id}
-      </foreach>
-      <if test="matterNo != null and matterNo != ''">
-        and MATTER_NO LIKE '%${matterNo}%'
-      </if>
-      <if test="matterName != null and matterName != ''">
-        and MATTER_NAME LIKE '%${matterName}%'
-      </if>
-      <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
-        and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
-      </if>
-      <if test="forwardingUnitName != null and forwardingUnitName != ''">
-        and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
-      </if>
-      <if test="receivingUintNo != null and receivingUintNo != ''">
-        and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
-      </if>
-      <if test="receivingUintName != null and receivingUintName != ''">
-        and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
-      </if>
-      <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-        and net_time >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time &lt;= TO_DATE(#{endTime},
-        'yyyy-MM-dd HH24:mi:ss')
-      </if>
-      <if test="netSpot3No != null and netSpot3No != ''">
-        and NET_SPOT3_NO LIKE '%${netSpot3No}%'
-      </if>
-      <if test="netSpot3Name != null and netSpot3Name != ''">
-        and NET_SPOT3_NAME LIKE '%${netSpot3Name}%'
-      </if>
+    where 1 = 1
+    <if test="railwayNo != null and railwayNo != ''">
+      and railway_no like '%${railwayNo}%'
+    </if>
+    and MATTER_NAME in
+    <foreach collection="matterNameList" item="id" separator="," open="(" close=")">
+      #{id}
+    </foreach>
+    and forwarding_unit_no in
+    <foreach collection="list" item="id" separator="," open="(" close=")">
+      #{id}
+    </foreach>
+    <if test="matterNo != null and matterNo != ''">
+      and MATTER_NO LIKE '%${matterNo}%'
+    </if>
+    <if test="matterName != null and matterName != ''">
+      and MATTER_NAME LIKE '%${matterName}%'
+    </if>
+    <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+      and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+    </if>
+    <if test="forwardingUnitName != null and forwardingUnitName != ''">
+      and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+    </if>
+    <if test="receivingUintNo != null and receivingUintNo != ''">
+      and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+    </if>
+    <if test="receivingUintName != null and receivingUintName != ''">
+      and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+    </if>
+    <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+      and net_time >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time &lt;= TO_DATE(#{endTime},
+      'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="netSpot3No != null and netSpot3No != ''">
+      and NET_SPOT3_NO LIKE '%${netSpot3No}%'
+    </if>
+    <if test="netSpot3Name != null and netSpot3Name != ''">
+      and NET_SPOT3_NAME LIKE '%${netSpot3Name}%'
+    </if>
     <if test="flag != null and flag != ''">
       and NET_SPOT3_NAME is null
     </if>
-      and value_flag != '0'
+    and value_flag != '0'
     )
     union
     (
@@ -4497,75 +4525,75 @@
   </select>
 
   <select id="batchMatchActualView" parameterType="java.util.HashMap" resultType="HashMap">
-      select A.lc_no,
-            A.actual_no actual_no,
-            A.railway_no railway_no,
-            A.prediction_no prediction_no,
-            A.matter_name matter_name,
-            A.forwarding_unit_name forwarding_unit_name,
-            A.receiving_uint_name receiving_uint_name,
-            A.actual_first1_no grossNo,
-            to_char(round(A.gross_weight / 1000,3),'FM9999999999999999.000') grossWeight,
-            A.gross_time grossTime,
-            A.base_spot1_name grossSpot,
-            A.actual_first2_no tareNo,
-            to_char(round(A.tare_weight / 1000, 3),'FM9999999999999999.000') tareWeight,
-            A.tare_time tareTime,
-            A.base_spot2_name tareSpot,
-            to_char(round(A.net_weight / 1000, 3),'FM9999999999999999.000') netWeight,
-            A.net_time netTime,
-            A.net_spot3_name netSpot,
-            A.note note,
-            E.Lc_No tare_lc_no,
-            E.Actual_First_No tare_no,
-            E.create_time tare_time,
-            E.PREDICTION_NO tare_scale_no,
-            to_char(round(E.Meter_weight / 1000, 3),'FM9999999999999999.000') tare_weight,
-            E.Weight_Type tare_weight_type,
-            A.conveyance_type conveyance_type,
-            to_char(round(B.CARRIAGE_WEIGHT / 1000, 3) ,'FM9999999999999999.000') crriage_weight,
-            A.is_pre_sacale is_pre_sacale,
-            A.value_flag value_Flag
-      from meter_work_railway_actual A
-        left join meter_base_railway_carriage_weight B
-            on A.conveyance_type = B.Carriage_Code
-                and B.value_flag = '1'
-      left join meter_work_railway_act_first E
-            on A.railway_no = E.railway_no
-            and E.value_flag = '1'
-            and E.meter_weight &lt; 35000
-      where A.value_flag != '0'
-      <!--        and ( A.lc_no in-->
-      <!--        <foreach collection="lcNoStr" item="item" open="(" separator="," close=")">-->
-      <!--          #{item}-->
-      <!--        </foreach>-->
-      <!--        <if test="lcNoNull != null and lcNoNull != ''">-->
-      <!--          or A.lc_no is null )-->
-      <!--        </if>-->
-      <!--        <if test="lcNoNull == null or lcNoNull == ''">-->
-      <!--          and A.lc_no is not null)-->
-      <!--        </if>-->
-      <choose>
-        <when test="lcNo != null and lcNo == 'kong'">
-          and A.lc_no is null
-        </when>
-        <when test=" lcNo != null and lcNo != 'kong'">
-          and A.lc_no = #{lcNo}
-        </when>
-      </choose>
-      <if test="railwayTypeNo != null and railwayTypeNo != ''">
-        and  A.RAILWAY_TYPE_NO = #{railwayTypeNo}
-      </if>
-      <if test="startTime != null and startTime != '' and endTime != null 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="isPreSacale != null and isPreSacale != ''">
-        and A.is_pre_sacale = #{isPreSacale}
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        and A.value_flag = #{valueFlag}
-      </if>
-      order by conveyance_type asc, netTime desc
+    select A.lc_no,
+    A.actual_no actual_no,
+    A.railway_no railway_no,
+    A.prediction_no prediction_no,
+    A.matter_name matter_name,
+    A.forwarding_unit_name forwarding_unit_name,
+    A.receiving_uint_name receiving_uint_name,
+    A.actual_first1_no grossNo,
+    to_char(round(A.gross_weight / 1000,3),'FM9999999999999999.000') grossWeight,
+    A.gross_time grossTime,
+    A.base_spot1_name grossSpot,
+    A.actual_first2_no tareNo,
+    to_char(round(A.tare_weight / 1000, 3),'FM9999999999999999.000') tareWeight,
+    A.tare_time tareTime,
+    A.base_spot2_name tareSpot,
+    to_char(round(A.net_weight / 1000, 3),'FM9999999999999999.000') netWeight,
+    A.net_time netTime,
+    A.net_spot3_name netSpot,
+    A.note note,
+    E.Lc_No tare_lc_no,
+    E.Actual_First_No tare_no,
+    E.create_time tare_time,
+    E.PREDICTION_NO tare_scale_no,
+    to_char(round(E.Meter_weight / 1000, 3),'FM9999999999999999.000') tare_weight,
+    E.Weight_Type tare_weight_type,
+    A.conveyance_type conveyance_type,
+    to_char(round(B.CARRIAGE_WEIGHT / 1000, 3) ,'FM9999999999999999.000') crriage_weight,
+    A.is_pre_sacale is_pre_sacale,
+    A.value_flag value_Flag
+    from meter_work_railway_actual A
+    left join meter_base_railway_carriage_weight B
+    on A.conveyance_type = B.Carriage_Code
+    and B.value_flag = '1'
+    left join meter_work_railway_act_first E
+    on A.railway_no = E.railway_no
+    and E.value_flag = '1'
+    and E.meter_weight &lt; 35000
+    where A.value_flag != '0'
+    <!--        and ( A.lc_no in-->
+    <!--        <foreach collection="lcNoStr" item="item" open="(" separator="," close=")">-->
+    <!--          #{item}-->
+    <!--        </foreach>-->
+    <!--        <if test="lcNoNull != null and lcNoNull != ''">-->
+    <!--          or A.lc_no is null )-->
+    <!--        </if>-->
+    <!--        <if test="lcNoNull == null or lcNoNull == ''">-->
+    <!--          and A.lc_no is not null)-->
+    <!--        </if>-->
+    <choose>
+      <when test="lcNo != null and lcNo == 'kong'">
+        and A.lc_no is null
+      </when>
+      <when test=" lcNo != null and lcNo != 'kong'">
+        and A.lc_no = #{lcNo}
+      </when>
+    </choose>
+    <if test="railwayTypeNo != null and railwayTypeNo != ''">
+      and  A.RAILWAY_TYPE_NO = #{railwayTypeNo}
+    </if>
+    <if test="startTime != null and startTime != '' and endTime != null 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="isPreSacale != null and isPreSacale != ''">
+      and A.is_pre_sacale = #{isPreSacale}
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      and A.value_flag = #{valueFlag}
+    </if>
+    order by conveyance_type asc, netTime desc
   </select>
 
   <!--001019003：静态铁水衡、001019005：吊钩秤 -->
@@ -4680,90 +4708,90 @@
 
   <select id="dynamicAndStaticCompare" parameterType="java.util.HashMap" resultType="hashmap">
     select A.railway_no,
-       B.conveyance_type,
-       to_char(round(A.gross_weight/1000,2),'FM9999999999999999.00') dynamic_gross_weight,
-       A.gross_time dynamic_gross_time,
-       A.base_spot1_name dynamic_base_spot1_name,
-       to_char(round(A.tare_weight/1000,2),'FM9999999999999999.00') dynamic_tare_weight,
-       A.tare_time dynamic_tare_time,
-       A.base_spot2_name dynamic_base_spot2_name,
-       to_char(round(A.net_weight/1000,2),'FM9999999999999999.00') dynamic_net_weight,
-       to_char(round(B.gross_weight/1000,2),'FM9999999999999999.00') static_gross_weight,
-       B.gross_time static_gross_time,
-       B.base_spot1_name static_base_spot1_name,
-       to_char(round(B.tare_weight/1000,2),'FM9999999999999999.00') static_tare_weight,
-       B.tare_time static_tare_time,
-       B.base_spot2_name static_base_spot2_name,
-       to_char(round(B.net_weight/1000,2),'FM9999999999999999.00') static_net_weight,
-       round((A.gross_weight - B.gross_weight)/1000,2) gross_weight_sub,
-       round((A.gross_weight - B.gross_weight)/B.gross_weight*100,2) gross_weight_rate,
-       round((A.tare_weight - B.tare_weight)/1000,2) tare_weight_sub,
-       round((A.tare_weight - B.tare_weight)/B.tare_weight*100,2) tare_weight_rate,
-       round((A.net_weight - B.net_weight)/1000,2) net_weight_sub,
-       round((A.net_weight - B.net_weight)/B.net_weight*100,2) net_weight_rate
-  from meter_work_railway_actual A left join meter_work_railway_actual B on A.railway_no = B.railway_no
-  where A.railway_type_no in ('001019002')
-        and B.value_flag != '0'
-        and B.railway_type_no in ('001019001')
-        and B.value_flag != '0'
-        and B.net_time >= A.net_time
-        and B.net_time &lt;= A.net_time + 1/24*${hour}
+    B.conveyance_type,
+    to_char(round(A.gross_weight/1000,2),'FM9999999999999999.00') dynamic_gross_weight,
+    A.gross_time dynamic_gross_time,
+    A.base_spot1_name dynamic_base_spot1_name,
+    to_char(round(A.tare_weight/1000,2),'FM9999999999999999.00') dynamic_tare_weight,
+    A.tare_time dynamic_tare_time,
+    A.base_spot2_name dynamic_base_spot2_name,
+    to_char(round(A.net_weight/1000,2),'FM9999999999999999.00') dynamic_net_weight,
+    to_char(round(B.gross_weight/1000,2),'FM9999999999999999.00') static_gross_weight,
+    B.gross_time static_gross_time,
+    B.base_spot1_name static_base_spot1_name,
+    to_char(round(B.tare_weight/1000,2),'FM9999999999999999.00') static_tare_weight,
+    B.tare_time static_tare_time,
+    B.base_spot2_name static_base_spot2_name,
+    to_char(round(B.net_weight/1000,2),'FM9999999999999999.00') static_net_weight,
+    round((A.gross_weight - B.gross_weight)/1000,2) gross_weight_sub,
+    round((A.gross_weight - B.gross_weight)/B.gross_weight*100,2) gross_weight_rate,
+    round((A.tare_weight - B.tare_weight)/1000,2) tare_weight_sub,
+    round((A.tare_weight - B.tare_weight)/B.tare_weight*100,2) tare_weight_rate,
+    round((A.net_weight - B.net_weight)/1000,2) net_weight_sub,
+    round((A.net_weight - B.net_weight)/B.net_weight*100,2) net_weight_rate
+    from meter_work_railway_actual A left join meter_work_railway_actual B on A.railway_no = B.railway_no
+    where A.railway_type_no in ('001019002')
+    and B.value_flag != '0'
+    and B.railway_type_no in ('001019001')
+    and B.value_flag != '0'
+    and B.net_time >= A.net_time
+    and B.net_time &lt;= A.net_time + 1/24*${hour}
     <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
+    order by A.net_time desc
   </select>
 
   <select id="countDayAllState" parameterType="java.util.HashMap" resultType="hashmap">
     select A.net_spot3_no,
-          A.net_spot3_name,
-          A.net_man_no,
-          A.net_man_name,
-          count(1) count_actual
+    A.net_spot3_name,
+    A.net_man_no,
+    A.net_man_name,
+    count(1) count_actual
     from meter_work_railway_actual A
-        left join pre_railway_scale B
-            on A.prediction_no = B.prediction_no
+    left join pre_railway_scale B
+    on A.prediction_no = B.prediction_no
     where 1 = 1
-      and A.RAILWAY_TYPE_NO in
-      <foreach collection="railwayTypeNo" item="item" open="(" separator="," close=")">
-          #{item}
+    and A.RAILWAY_TYPE_NO in
+    <foreach collection="railwayTypeNo" item="item" open="(" separator="," close=")">
+      #{item}
+    </foreach>
+    <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="netSpot3NoStr != null and netSpot3NoStr != ''">
+      and A.net_spot3_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
       </foreach>
-      <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="netSpot3NoStr != null and netSpot3NoStr != ''">
-        and A.net_spot3_no in
-        <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
-          #{item}
-        </foreach>
-      </if>
+    </if>
     <if test="createManNoStr != null and createManNoStr != ''">
       and A.net_man_no in
       <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
         #{item}
       </foreach>
     </if>
-      <if test="baseSpotNo != null and baseSpotNo != ''">
-        and  A.net_spot3_no like '%${baseSpotNo}%'
-      </if>
-      <if test="baseSpotName != null and baseSpotName != ''">
-        and  A.net_spot3_name like '%${baseSpotName}%'
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        and  A.value_flag like '%${valueFlag}%'
-      </if>
-      <if test="validFlag != null and validFlag != ''">
-        and  A.value_flag != '0'
-      </if>
-      <if test="isPreSacale != null and isPreSacale != ''">
-        and  A.is_pre_sacale like '%${isPreSacale}%'
-      </if>
+    <if test="baseSpotNo != null and baseSpotNo != ''">
+      and  A.net_spot3_no like '%${baseSpotNo}%'
+    </if>
+    <if test="baseSpotName != null and baseSpotName != ''">
+      and  A.net_spot3_name like '%${baseSpotName}%'
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      and  A.value_flag like '%${valueFlag}%'
+    </if>
+    <if test="validFlag != null and validFlag != ''">
+      and  A.value_flag != '0'
+    </if>
+    <if test="isPreSacale != null and isPreSacale != ''">
+      and  A.is_pre_sacale like '%${isPreSacale}%'
+    </if>
     group by A.net_spot3_no,
-            A.net_spot3_name,
-            A.net_man_no,
-            A.net_man_name
+    A.net_spot3_name,
+    A.net_man_no,
+    A.net_man_name
   </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/model/MeterWorkRailwayActual.java

@@ -22,7 +22,7 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     private String predictionNo;
 
     /**
-     * 通知单号(NOTICE_NO,VARCHAR,20)
+     * 通知单号(NOTICE_NO,VARCHAR,50)
      */
     @ApiModelProperty(value="通知单号",required=false)
     private String noticeNo;
@@ -178,7 +178,7 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     private String meterProcessEditionNo;
 
     /**
-     * 毛重计量作业编号(ACTUAL_FIRST1_NO,VARCHAR,20)
+     * 毛重计量作业编号(ACTUAL_FIRST1_NO,VARCHAR,50)
      */
     @ApiModelProperty(value="毛重计量作业编号",required=false)
     private String actualFirst1No;
@@ -238,7 +238,7 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     private String grossMode;
 
     /**
-     * 皮重计量作业编号(ACTUAL_FIRST2_NO,VARCHAR,20)
+     * 皮重计量作业编号(ACTUAL_FIRST2_NO,VARCHAR,50)
      */
     @ApiModelProperty(value="皮重计量作业编号",required=false)
     private String actualFirst2No;
@@ -346,9 +346,9 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     private String netGroup;
 
     /**
-     * 结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）(NET_MODE,VARCHAR,1)
+     * 结净方式（1：正常结净；2：匹配结净）(NET_MODE,VARCHAR,1)
      */
-    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）",required=false)
+    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净）",required=false)
     private String netMode;
 
     /**
@@ -675,6 +675,12 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     @ApiModelProperty(value="取消发布，控制不自动发布（0：自动发布，1：不自动发布）",required=false)
     private String isAutoPublish;
 
+    /**
+     * 审核状态（0：未审核；1：已审核）(CHECK_FLAG,VARCHAR,1)
+     */
+    @ApiModelProperty(value="审核状态（0：未审核；1：已审核）",required=false)
+    private String checkFlag;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1575,6 +1581,14 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         this.isAutoPublish = isAutoPublish == null ? null : isAutoPublish.trim();
     }
 
+    public String getCheckFlag() {
+        return checkFlag;
+    }
+
+    public void setCheckFlag(String checkFlag) {
+        this.checkFlag = checkFlag == null ? null : checkFlag.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1692,6 +1706,7 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         sb.append(", isBoundListDownloaded=").append(isBoundListDownloaded);
         sb.append(", documentId=").append(documentId);
         sb.append(", isAutoPublish=").append(isAutoPublish);
+        sb.append(", checkFlag=").append(checkFlag);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/mapper/MeterWorkScheduledHelpMapper.xml

@@ -567,8 +567,8 @@
   <select id="countAllState" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     where 1 = 1
-    and warm_type in ('1', '2', '3', '8')
-    and help_content != '1'
+    and warm_type in ('1', '2', '3')
+    and warm_type not in ('8')
     <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
       and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>
@@ -627,6 +627,7 @@
       </foreach>
     </if>
     group by base_spot_no, base_spot_name
+    order by base_spot_name asc
   </select>
 
   <select id="helpContentSummary" parameterType="java.util.HashMap" resultMap="BaseResultMap">