后端修改

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

@@ -237,4 +237,38 @@ public class MeterBaseOperationLogController extends BaseRESTfulController {
         }
         return rm;
     }
+
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbaseoperationlog:view")
+    @GetMapping(value = "/allFirstStateView/")
+    public RESTfulResult allFirstStateView(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<HashMap> list = meterBaseOperationLogService.allFirstStateView(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbaseoperationlog:view")
+    @GetMapping(value = "/allActualStateView/")
+    public RESTfulResult allActualStateView(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<HashMap> list = meterBaseOperationLogService.allActualStateView(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

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

@@ -15,6 +15,9 @@ public interface MeterBaseOperationLogMapper extends IBaseMapper<MeterBaseOperat
 
     List<MeterBaseOperationLog> doQueryAndMultiple(HashMap<String, Object> obj);
 
-    //根据时间查询所有秤点的洁净匹配委托、撤销委托、洁净已上传、洁净未上传
-    List<HashMap> countAllState(Map<String, Object> params);
+    //根据时间查询所有秤点的结净匹配委托、撤销委托、结净已上传、结净未上传
+    List<HashMap> countAllFirstState(Map<String, Object> params);
+    List<HashMap> countAllActualState(Map<String, Object> params);
+    List<HashMap> allFirstStateView(Map<String, Object> params);
+    List<HashMap> allActualStateView(Map<String, Object> params);
 }

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

@@ -609,7 +609,7 @@
     order by CREATE_TIME desc
   </select>
 
-  <select id="countAllState" parameterType="java.util.HashMap" resultType="hashmap">
+  <select id="countAllFirstState" parameterType="java.util.HashMap" resultType="hashmap">
     select t.ID, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME,
     t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME, t.OPERATION_PAGE,
     t.OPERATION_FUNCTION, t.OPERATION_ID, t.OPERATION_PREDICTION_NO, t.OPERATION_CARN_NO,
@@ -629,4 +629,73 @@
       and  B.base_spot_name like '%${baseSpotName}%'
     </if>
   </select>
+
+  <select id="countAllActualState" parameterType="java.util.HashMap" resultType="hashmap">
+    select t.ID, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME,
+    t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME, t.OPERATION_PAGE,
+    t.OPERATION_FUNCTION, t.OPERATION_ID, t.OPERATION_PREDICTION_NO, t.OPERATION_CARN_NO,
+    t.OPERATION_BEFORE_FIX, t.OPERATION_AFTER_FIX, t.LOG_TYPE, t.LOG_TYPE_CODE, B.net_spot3_no, B.net_spot3_name
+    from meter_base_operation_log t
+    left join meter_work_car_actual B
+    on t.operation_id = B.Actual_No
+    where 1=1
+    and t.operation_page in ('web端-汽车衡净重数据维护', 'web端-汽车衡一次数据维护')
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  t.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="baseSpotNo != null and baseSpotNo != ''">
+      and  B.net_spot3_no like '%${baseSpotNo}%'
+    </if>
+    <if test="baseSpotName != null and baseSpotName != ''">
+      and  B.net_spot3_name like '%${baseSpotName}%'
+    </if>
+  </select>
+
+  <select id="allFirstStateView" parameterType="java.util.HashMap" resultType="hashmap">
+    select t.ID, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME,
+    t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME, t.OPERATION_PAGE,
+    t.OPERATION_FUNCTION, t.OPERATION_ID, t.OPERATION_PREDICTION_NO, t.OPERATION_CARN_NO,
+    t.OPERATION_BEFORE_FIX, t.OPERATION_AFTER_FIX, t.LOG_TYPE, t.LOG_TYPE_CODE, B.base_spot_no, B.base_spot_name
+    from meter_base_operation_log t
+    left join meter_work_car_actual_first B
+    on t.operation_id = B.Actual_First_No
+    where 1=1
+    and t.operation_page like '%web端-汽车衡一次数据维护%'
+    <if test="operationFunction != null and operationFunction != ''">
+      operation_function like '%${operationFunction}%'
+    </if>
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  t.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="baseSpotNo != null and baseSpotNo != ''">
+      and  B.base_spot_no like '%${baseSpotNo}%'
+    </if>
+    <if test="baseSpotName != null and baseSpotName != ''">
+      and  B.base_spot_name like '%${baseSpotName}%'
+    </if>
+  </select>
+
+  <select id="allActualStateView" parameterType="java.util.HashMap" resultType="hashmap">
+    select t.ID, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME,
+    t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME, t.OPERATION_PAGE,
+    t.OPERATION_FUNCTION, t.OPERATION_ID, t.OPERATION_PREDICTION_NO, t.OPERATION_CARN_NO,
+    t.OPERATION_BEFORE_FIX, t.OPERATION_AFTER_FIX, t.LOG_TYPE, t.LOG_TYPE_CODE, B.net_spot3_no, B.net_spot3_name
+    from meter_base_operation_log t
+    left join meter_work_car_actual B
+    on t.operation_id = B.Actual_No
+    where 1=1
+    and t.operation_page like '%web端-汽车衡净重数据维护%'
+    <if test="operationFunction != null and operationFunction != ''">
+      and operation_function like '%${operationFunction}%'
+    </if>
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  t.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="baseSpotNo != null and baseSpotNo != ''">
+      and  B.net_spot3_no like '%${baseSpotNo}%'
+    </if>
+    <if test="baseSpotName != null and baseSpotName != ''">
+      and  B.net_spot3_name like '%${baseSpotName}%'
+    </if>
+  </select>
 </mapper>

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

@@ -2,9 +2,11 @@ package com.steerinfo.baseinfo.meterbaseoperationlog.service;
 
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkbeltscaleactual.model.MeterWorkBeltScaleActual;
 import com.steerinfo.util.CommonPage;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -37,4 +39,7 @@ public interface IMeterBaseOperationLogService extends IBaseService<MeterBaseOpe
      * @return
      */
     String addComparePropertiesLog(Object source, Object target,MeterBaseOperationLog model);
+
+    PageList<HashMap> allFirstStateView(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
+    PageList<HashMap> allActualStateView(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
 }

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

@@ -6,7 +6,10 @@ import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
 import com.steerinfo.baseinfo.meterbaseoperationlog.service.IMeterBaseOperationLogService;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.except.MarkerMetException;
+import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.util.CommonPage;
 import com.steerinfo.util.CompareUtil;
 import com.steerinfo.util.PublicMethod;
@@ -145,4 +148,20 @@ public class MeterBaseOperationLogServiceImpl extends BaseServiceImpl<MeterBaseO
         meterBaseOperationLogMapper.insertSelective(model);
         return "";
     }
+
+    @Override
+    public PageList<HashMap> allFirstStateView(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<HashMap> operationLogs = meterBaseOperationLogMapper.allFirstStateView(params);
+        PageList pageInfo = new PageList(operationLogs);
+        return pageInfo;
+    }
+
+    @Override
+    public PageList<HashMap> allActualStateView(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<HashMap> operationLogs = meterBaseOperationLogMapper.allActualStateView(params);
+        PageList pageInfo = new PageList(operationLogs);
+        return pageInfo;
+    }
 }

src/main/java/com/steerinfo/metermonitor/metermonitornote/controller/MeterMonitorNoteController.java

@@ -234,4 +234,35 @@ public class MeterMonitorNoteController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @GetMapping(value = "/allStateView/")
+    public RESTfulResult allStateView(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterMonitorNote> list = meterMonitorNoteService.allStateView(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @GetMapping(value = "/resetCarView/")
+    public RESTfulResult resetCarView(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterMonitorNote> list = meterMonitorNoteService.resetCarView(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

src/main/java/com/steerinfo/metermonitor/metermonitornote/mapper/MeterMonitorNoteMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.metermonitor.metermonitornote.mapper;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
 import com.steerinfo.meterwork.meterworkmonitor.model.MeterWorkMonitor;
+import com.steerinfo.meterwork.meterworkscheduledhelp.model.MeterWorkScheduledHelp;
 import feign.Param;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -23,4 +24,11 @@ public interface MeterMonitorNoteMapper extends IBaseMapper<MeterMonitorNote, St
     List<MeterMonitorNote> selectByType(Map<String, Object> parmas);
 
     List<MeterMonitorNote> queryLikeNoPage(HashMap<String, Object> params);
+
+    //根据时间查询所有秤点的不验证历史皮重、不验证异地计量、不验证零点告警、不验证时间间隔、不验证对射、不验证毛皮超差
+    List<MeterMonitorNote> countAllState(Map<String, Object> params);
+    //重置车号
+    List<MeterMonitorNote> countResetCar(Map<String, Object> params);
+    List<MeterMonitorNote> allStateView(Map<String, Object> params);
+    List<MeterMonitorNote> resetCarView(Map<String, Object> params);
 }

src/main/java/com/steerinfo/metermonitor/metermonitornote/mapper/MeterMonitorNoteMapper.xml

@@ -659,4 +659,78 @@
     <include refid="whereLike"/>
     order by operation_time desc
   </select>
+
+  <!--根据时间查询所有秤点的不验证历史皮重、不验证异地计量、不验证零点告警、不验证时间间隔、不验证对射、不验证毛皮超差-->
+  <select id="countAllState" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    and operation_content like '勾选%'
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and to_date(OPERATION_TIME ,'yyyy-mm-dd HH24:mi:ss') >= to_date(#{startTime},'yyyy-mm-dd HH24:mi:ss')-3/24/60
+      and to_date(OPERATION_TIME ,'yyyy-mm-dd HH24:mi:ss') &lt;= to_date(#{endTime},'yyyy-mm-dd HH24:mi:ss') + 1/(24*60)
+    </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>
+  </select>
+  <!-- 重置车号 -->
+  <select id="countResetCar" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    and operation_content like '%重置车号%'
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and to_date(OPERATION_TIME ,'yyyy-mm-dd HH24:mi:ss') >= to_date(#{startTime},'yyyy-mm-dd HH24:mi:ss')-3/24/60
+      and to_date(OPERATION_TIME ,'yyyy-mm-dd HH24:mi:ss') &lt;= to_date(#{endTime},'yyyy-mm-dd HH24:mi:ss') + 1/(24*60)
+    </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>
+  </select>
+
+  <!--根据时间查询所有秤点的不验证历史皮重、不验证异地计量、不验证零点告警、不验证时间间隔、不验证对射、不验证毛皮超差-->
+  <select id="allStateView" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    <if test="operationContent != null and operationContent != '' and operationContent == '勾选'">
+      and operation_content like '勾选%'
+      <if test="operationContentSecond != null and operationContentSecond != ''">
+        and  operation_content like '%${operationContentSecond}'
+      </if>
+    </if>
+    <if test="operationContent != null and operationContent != '' and operationContent == '重置车号'">
+      and operation_content like '%重置车号%'
+    </if>
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and to_date(OPERATION_TIME ,'yyyy-mm-dd HH24:mi:ss') >= to_date(#{startTime},'yyyy-mm-dd HH24:mi:ss')-3/24/60
+      and to_date(OPERATION_TIME ,'yyyy-mm-dd HH24:mi:ss') &lt;= to_date(#{endTime},'yyyy-mm-dd HH24:mi:ss') + 1/(24*60)
+    </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>
+  </select>
+  <!-- 重置车号 -->
+  <select id="resetCarView" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    and operation_content like '%重置车号%'
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and to_date(OPERATION_TIME ,'yyyy-mm-dd HH24:mi:ss') >= to_date(#{startTime},'yyyy-mm-dd HH24:mi:ss')-3/24/60
+      and to_date(OPERATION_TIME ,'yyyy-mm-dd HH24:mi:ss') &lt;= to_date(#{endTime},'yyyy-mm-dd HH24:mi:ss') + 1/(24*60)
+    </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>
+  </select>
 </mapper>

src/main/java/com/steerinfo/metermonitor/metermonitornote/service/IMeterMonitorNoteService.java

@@ -35,4 +35,8 @@ public interface IMeterMonitorNoteService extends IBaseService<MeterMonitorNote,
 
     List<MeterMonitorNote> queryLikeNoPage(HashMap<String, Object> params);
 
+    //根据时间查询所有秤点的不验证历史皮重、不验证异地计量、不验证零点告警、不验证时间间隔、不验证对射、不验证毛皮超差
+    PageList<MeterMonitorNote> allStateView(HashMap parmas, Integer pageNum, Integer pageSize);
+    PageList<MeterMonitorNote> resetCarView(HashMap parmas, Integer pageNum, Integer pageSize);
+
 }

src/main/java/com/steerinfo/metermonitor/metermonitornote/service/impl/MeterMonitorNoteServiceImpl.java

@@ -105,4 +105,20 @@ public class MeterMonitorNoteServiceImpl extends BaseServiceImpl<MeterMonitorNot
         List<MeterMonitorNote> monitors = meterMonitorNoteMapper.queryLikeNoPage(params);
         return monitors;
     }
+
+    @Override
+    public PageList<MeterMonitorNote> allStateView(HashMap parmas, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterMonitorNote> rows = meterMonitorNoteMapper.allStateView(parmas);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
+    @Override
+    public PageList<MeterMonitorNote> resetCarView(HashMap parmas, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterMonitorNote> rows = meterMonitorNoteMapper.resetCarView(parmas);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
 }

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

@@ -968,7 +968,7 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
-    @ApiOperation(value = "根据时间查询所有秤点的洁净已匹配、洁净未匹配、洁净已上传、洁净未上传", notes = "实绩编号的两个一次计量编号")
+    @ApiOperation(value = "根据时间查询所有秤点的结净已匹配、结净未匹配、结净已上传、结净未上传", notes = "实绩编号的两个一次计量编号")
     @PostMapping(value = "/countAllSpotSate")
     public RESTfulResult countAllSpotSate(@RequestBody HashMap params) {
         try {

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

@@ -62,6 +62,6 @@ public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual
     List<HashMap> doQueryFirstOldAndNew(Map<String, Object> params);
     List<HashMap> countOldAndNew(Map<String, Object> params);
     
-    //根据时间查询所有秤点的洁净已匹配、洁净未匹配、洁净已上传、洁净未上传
+    //根据时间查询所有秤点的结净已匹配、结净未匹配、结净已上传、结净未上传
     List<MeterWorkCarActual> countAllState(Map<String, Object> params);
 }

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

@@ -3906,6 +3906,12 @@
     <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="netSpot3NoStr != null and netSpot3NoStr != ''">
+        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'
     </if>
@@ -4200,7 +4206,7 @@
     </if>
   </select>
 
-  <!--根据时间查询所有秤点的洁净已匹配、洁净未匹配、洁净已上传、洁净未上传、洁净已作废-->
+  <!--根据时间查询所有秤点的结净已匹配、结净未匹配、结净已上传、结净未上传、结净已作废-->
   <select id="countAllState" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     where 1 = 1

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/IMeterWorkCarActualService.java

@@ -100,6 +100,6 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
     RESTfulResult selectByMap(HashMap<String, Object> params);
     RESTfulResult findPictureByActualNo(String actualNo);
 
-    //根据时间查询所有秤点的洁净已匹配、洁净未匹配、洁净已上传、洁净未上传、洁净已作废
+    //根据时间查询所有秤点的结净已匹配、结净未匹配、结净已上传、结净未上传、结净已作废
     List<HashMap> countAllSpotSate(HashMap params);
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.meterwork.meterworkcaractual.service.impl;
 
+import com.github.pagehelper.util.StringUtil;
 import com.steerinfo.baseinfo.meterbasematterinfomatch.mapper.MeterBaseMatterInfoMatchMapper;
 import com.steerinfo.baseinfo.meterbasematterinfomatch.model.MeterBaseMatterInfoMatch;
 import com.steerinfo.baseinfo.meterbaseoperationlog.mapper.MeterBaseOperationLogMapper;
@@ -14,6 +15,8 @@ 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.metermonitor.metermonitornote.mapper.MeterMonitorNoteMapper;
+import com.steerinfo.metermonitor.metermonitornote.model.MeterMonitorNote;
 import com.steerinfo.meterwork.constants.DbConstants;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.metertolimsold.mapper.MeterToLimsOldMapper;
@@ -32,7 +35,6 @@ import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayAct
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import com.steerinfo.meterwork.meterworkscheduledhelp.mapper.MeterWorkScheduledHelpMapper;
 import com.steerinfo.meterwork.meterworkscheduledhelp.model.MeterWorkScheduledHelp;
-import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.pretrack.pretracknotice.mapper.PreTrackNoticeMapper;
 import com.steerinfo.pretrack.pretracknotice.model.PreTrackNotice;
 import com.steerinfo.pretrack.pretrackscale.mapper.PreTrackScaleMapper;
@@ -41,18 +43,17 @@ import com.steerinfo.util.CommonPage;
 import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
-import org.apache.catalina.User;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.sql.DataSource;
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -100,6 +101,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
     @Resource
     private MeterBaseOperationLogMapper meterBaseOperationLogMapper;
 
+    @Resource
+    private MeterMonitorNoteMapper meterMonitorNoteMapper;
+
     @Autowired
     IMeterWorkPreLinkService meterWorkPreLinkService;
 
@@ -226,7 +230,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             }
             PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
             if(scale != null && scale.getValueFlag().equals("9")) {
-                throw new MarkerMetException(500, "只有未结算的洁净数据才能进行撤销发布操作");
+                throw new MarkerMetException(500, "只有未结算的结净数据才能进行撤销发布操作");
             }
             check(model);
             model.setValueFlag("1"); // 状态改为未发布
@@ -424,6 +428,19 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 actualRow.setUpdateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(actualRow);
 
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(userId);
+                logModel.setCreateManName(userName);
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("web端-汽车衡一次数据维护");
+                logModel.setOperationFunction("毛皮结净");
+                logModel.setOperationId(actualRow.getActualNo());
+                logModel.setOperationPredictionNo(actualRow.getPredictionNo());
+                logModel.setOperationCarnNo(actualRow.getCarNo());
+                logModel.setOperationBeforeFix(actualRow.getActualFirst1No()+ "," + actualRow.getActualFirst2No());
+                meterBaseOperationLogMapper.insertSelective(logModel);
+
                 PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(predictionNo);
                 scale.setValueFlag(DbConstants.NET);
                 scale.setUpdateTime(new Date());
@@ -512,6 +529,19 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         actualRow.setUpdateTime(new Date());
                         meterWorkCarActualMapper.insertSelective(actualRow);
 
+                        MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                        logModel.setId(PublicMethod.IdCreate(2));
+                        logModel.setCreateManNo(userId);
+                        logModel.setCreateManName(userName);
+                        logModel.setCreateTime(new Date());
+                        logModel.setOperationPage("web端-汽车衡一次数据维护");
+                        logModel.setOperationFunction("毛皮结净");
+                        logModel.setOperationId(actualRow.getActualNo());
+                        logModel.setOperationPredictionNo(actualRow.getPredictionNo());
+                        logModel.setOperationCarnNo(actualRow.getCarNo());
+                        logModel.setOperationBeforeFix(actualRow.getActualFirst1No()+ "," + actualRow.getActualFirst2No());
+                        meterBaseOperationLogMapper.insertSelective(logModel);
+
                         scale.setValueFlag(DbConstants.NET);
                         scale.setUpdateTime(new Date());
                         scale.setUpdateManNo("system");
@@ -584,6 +614,19 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 actualRow.setUpdateManName(userName);
                 actualRow.setUpdateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(actualRow);
+
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(userId);
+                logModel.setCreateManName(userName);
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("web端-汽车衡一次数据维护");
+                logModel.setOperationFunction("毛皮结净");
+                logModel.setOperationId(actualRow.getActualNo());
+                logModel.setOperationPredictionNo(actualRow.getPredictionNo());
+                logModel.setOperationCarnNo(actualRow.getCarNo());
+                logModel.setOperationBeforeFix(actualRow.getActualFirst1No()+ "," + actualRow.getActualFirst2No());
+                meterBaseOperationLogMapper.insertSelective(logModel);
             }
             return actualRow;
         } catch (MarkerMetException e) {
@@ -694,26 +737,27 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 }
 //                }
                 //meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
-                model.setUploadFlag("1");
-                model.setValueFlag("0");
-                model.setIsPreScale("0");
-                model.setUpdateManNo(userId);
-                model.setUpdateManName(userName);
-                model.setUpdateTime(new Date());
-                meterWorkCarActualMapper.updateByPrimaryKey(model);
+                MeterWorkCarActual modelTemp = meterWorkCarActualMapper.cleanPredcition(model.getActualNo());
+                modelTemp.setUploadFlag("1");
+                modelTemp.setValueFlag("0");
+                modelTemp.setIsPreScale("0");
+                modelTemp.setUpdateManNo(userId);
+                modelTemp.setUpdateManName(userName);
+                modelTemp.setUpdateTime(new Date());
+                meterWorkCarActualMapper.updateByPrimaryKey(modelTemp);
 
                 MeterBaseOperationLog logModel = new MeterBaseOperationLog();
                 logModel.setId(PublicMethod.IdCreate(2));
                 logModel.setCreateManNo(userId);
                 logModel.setCreateManName(userName);
                 logModel.setCreateTime(new Date());
-                logModel.setOperationPage("汽车衡净重数据维护");
-                logModel.setOperationFunction("汽车衡结净毛皮分解");
+                logModel.setOperationPage("web端-汽车衡净重数据维护");
+                logModel.setOperationFunction("毛皮分解");
                 logModel.setOperationId(model.getActualNo());
                 logModel.setOperationPredictionNo(model.getPredictionNo());
                 logModel.setOperationCarnNo(model.getCarNo());
                 logModel.setOperationBeforeFix(model.toString());
-                logModel.setOperationAfterFix("");
+                logModel.setOperationAfterFix(modelTemp.toString());
                 meterBaseOperationLogMapper.insertSelective(logModel);
                 num++;
             }
@@ -806,6 +850,16 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 return rm;
             }
         }
+        String userId = "";
+        String userName = "";
+        try{
+            UserPayload userPayload = UserPayload.getCurrUser();
+            userId = userPayload.getUserCode();
+            userName = userPayload.getUserName();
+        }catch (Exception e) {
+            userId = "system";
+            userName = "system";
+        }
         switch(type){
             case "5":
             case "6":
@@ -855,16 +909,16 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
                     MeterBaseOperationLog logModel = new MeterBaseOperationLog();
                     logModel.setId(PublicMethod.IdCreate(2));
-                    logModel.setCreateManNo(modelTemp.getUpdateManNo());
-                    logModel.setCreateManName(modelTemp.getUpdateManName());
+                    logModel.setCreateManNo(userId);
+                    logModel.setCreateManName(userName);
                     logModel.setCreateTime(new Date());
                     logModel.setOperationPage("web端-汽车衡净重数据维护");
                     if(type.equals("5")){
-                        logModel.setOperationFunction("取消双委托洁净");
+                        logModel.setOperationFunction("取消双委托结净");
                     }else if(type.equals("6")) {
-                        logModel.setOperationFunction("取消混卸洁净");
+                        logModel.setOperationFunction("取消混卸结净");
                     }else if(type.equals("7")) {
-                        logModel.setOperationFunction("取消混装洁净");
+                        logModel.setOperationFunction("取消混装结净");
                     }
                     logModel.setOperationId(model.getActualNo());
                     logModel.setOperationPredictionNo(model.getPredictionNo());
@@ -1045,7 +1099,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 logModel.setCreateManName(userName);
                 logModel.setCreateTime(new Date());
                 logModel.setOperationPage("web端-汽车衡净重数据维护");
-                logModel.setOperationFunction("洁净废除");
+                logModel.setOperationFunction("结净废除");
                 logModel.setOperationId(model.getActualNo());
                 logModel.setOperationPredictionNo(model.getPredictionNo());
                 logModel.setOperationCarnNo(model.getRailwayNo());
@@ -1147,6 +1201,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
     @Override
     public PageList<MeterWorkCarActual> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
+        if(params.get("netSpot3NoStr") != null) {
+            String[] spotNoStr = params.get("netSpot3NoStr").toString().split(",");
+            params.put("spotNoStr", spotNoStr);
+        }
         List<MeterWorkCarActual> rows = meterWorkCarActualMapper.likeByDesc(params);
         PageList pageInfo = new PageList(rows);
         return pageInfo;
@@ -1218,6 +1276,16 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 return rm;
             }
 
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            if(model.getUpdateTime() != null && StringUtils.isNotEmpty(model.getUpdateTime().toString())) {
+                long eTime = df.parse(model.getUpdateTime().toString()).getTime();
+                long sTime = df.parse((new Date()).toString()).getTime();
+                long diff = (eTime - sTime) / 1000;
+                if(diff <= 15) {
+                    throw new MarkerMetException(500, "匹配委托需在解除委托15秒后进行，请稍等");
+                }
+            }
+
             if(scale == null) {
                 rm.setMessage("不存在对应的预报数据,请确认！！");
                 return rm;
@@ -1320,6 +1388,21 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         MeterWorkCarActual mwcaquery = meterWorkCarActualMapper.selectByPrimaryKey(model.getActualNo());
         if (mwcaquery == null) {
             throw new MarkerMetException(500, "不存在对应的结净数据");
+        }else {
+            try{
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                if(mwcaquery.getUpdateTime() != null && StringUtils.isNotEmpty(mwcaquery.getUpdateTime().toString())) {
+                    long eTime = df.parse(mwcaquery.getUpdateTime().toString()).getTime();
+                    long sTime = df.parse((new Date()).toString()).getTime();
+                    long diff = (eTime - sTime) / 1000;
+                    if(diff <= 15) {
+                        throw new MarkerMetException(500, "解除委托需在匹配委托15秒后进行，请稍等");
+                    }
+                }
+            } catch (ParseException e) {
+                e.printStackTrace();
+                throw new MarkerMetException(500, "操作异常");
+            }
         }
 
         PreTrackScale scaleTemp = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
@@ -2525,11 +2608,14 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
     public List<HashMap> countAllSpotSate(HashMap params) {
         List<HashMap> map = new ArrayList<>();
 
-        //根据时间查询所有秤点的洁净已匹配、洁净未匹配、洁净已上传、洁净未上传、已作废数据
+        //根据时间查询所有秤点的结净已匹配、结净未匹配、结净已上传、结净未上传、已作废数据
         List<MeterWorkCarActual> carActual = meterWorkCarActualMapper.countAllState(params);
         List<MeterWorkCarActualFirst> carFirst = meterWorkCarActualFirstMapper.countAllState(params);
         List<MeterWorkScheduledHelp> carHelp = meterWorkScheduledHelpMapper.countAllState(params);
-        List<HashMap> carLog = meterBaseOperationLogMapper.countAllState(params);
+        List<HashMap> carFirstLog = meterBaseOperationLogMapper.countAllFirstState(params);
+        List<HashMap> carActualLog = meterBaseOperationLogMapper.countAllActualState(params);
+        List<MeterMonitorNote> carMonitorLog = meterMonitorNoteMapper.countAllState(params);
+        List<MeterMonitorNote> countResetCarLog = meterMonitorNoteMapper.countResetCar(params);
         //.map(MeterWorkCarActual::getCarNo).distinct().collect(Collectors.toList());
 //        List<String> spotList = carActual.stream().map(MeterWorkCarActual::getNetSpot3Name).distinct().collect(Collectors.toList());
 
@@ -2544,29 +2630,29 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             long countUpload = 0L;
             long countUnUpload = 0L;
             long countActualValid = 0L;
-            if(carActual != null) {
-                //洁净已匹配
+            if(carActual != null && carActual.size() >= 1) {
+                //结净已匹配
                 countIsPrescale = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
                         && model.getNetSpot3Name().equals(spot.getBaseSpotName())
                         && model.getValueFlag().equals("1")
                         && model.getIsPreScale().equals("1")).count();
-                //洁净未匹配
+                //结净未匹配
                 countIsNotPrescale = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
                         && model.getNetSpot3Name().equals(spot.getBaseSpotName())
                         && model.getValueFlag().equals("1")
                         && model.getIsPreScale().equals("0")).count();
-                //洁净已上传
+                //结净已上传
                 countUpload = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
                         && model.getNetSpot3Name().equals(spot.getBaseSpotName())
                         && model.getValueFlag().equals("1")
                         && model.getIsPreScale().equals("1")
                         && model.getUploadFlag().equals("2")).count();
-                //洁净未上传
+                //结净未上传
                 countUnUpload = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
                         && model.getNetSpot3Name().equals(spot.getBaseSpotName())
                         && !model.getUploadFlag().equals("2")
                         && !model.getIsPreScale().equals("0")).count();
-                //洁净数据已作废
+                //结净数据已作废
                 countActualValid = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
                         && model.getNetSpot3Name().equals(spot.getBaseSpotName())
                         && model.getValueFlag().equals("0")).count();
@@ -2575,24 +2661,30 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             long countGross = 0L;
             long countTare = 0L;
             long countTermTare = 0L;
+            long countNullWeightType = 0L;
             long countFirst = 0L;
             long countFirstValid = 0L;
-            if(carFirst != null) {
+            if(carFirst != null && carFirst.size() >= 1) {
                 //一次毛重
-                countGross = carFirst.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                countGross = carFirst.stream().filter(model -> StringUtils.isNotEmpty(model.getWeightType()) && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())
                         && !model.getValueFlag().equals("0")
                         && model.getWeightType().equals("0")).count();
                 //一次皮重
-                countTare = carFirst.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                countTare = carFirst.stream().filter(model -> StringUtils.isNotEmpty(model.getWeightType()) && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())
                         && !model.getValueFlag().equals("0")
-                        && model.getValueFlag().equals("1")).count();
+                        && model.getWeightType().equals("1")).count();
                 //一次期限皮重
-                countTermTare = carFirst.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                countTermTare = carFirst.stream().filter(model -> StringUtils.isNotEmpty(model.getWeightType()) && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())
                         && !model.getValueFlag().equals("0")
                         && model.getWeightType().equals("2")).count();
+                //一次无重量类型
+                countNullWeightType = carFirst.stream().filter(model ->  model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && !model.getValueFlag().equals("0")
+                        && StringUtil.isEmpty(model.getWeightType())).count();
                 //仅一次有效
                 countFirst = carFirst.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())
@@ -2606,7 +2698,11 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             long countCarHelp = 0L;
             long countCarHelpIsNotValue = 0L;
             long countCarHelpIsValue = 0L;
-            if(carHelp != null) {
+            long countCarHelpRfid = 0L;
+            long countCarHelpScanningCode = 0L;
+            long countCarHelpNormal = 0L;
+            long countCarHelpVehicleReset = 0L;
+            if(carHelp != null && carHelp.size() >= 1) {
                 //报警总数
                 countCarHelp = carHelp.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())).count();
@@ -2618,34 +2714,171 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 countCarHelpIsValue = carHelp.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())
                         && model.getValueFlag().equals("1")).count();
+                //报警Rfid
+                countCarHelpRfid = carHelp.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && model.getHelpContent().equals("rfid")).count();
+                //报警扫码
+                countCarHelpScanningCode = carHelp.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && model.getHelpContent().equals("扫码")).count();
+                //报警正常
+                countCarHelpNormal = carHelp.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && model.getHelpContent().equals("正常")).count();
+                //报警车号重置
+                countCarHelpVehicleReset = carHelp.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && model.getHelpContent().equals("车号重置")).count();
             }
 
-            long countLogIsPreScale = 0L;
-            long countLogIsNotPreScale = 0L;
-            long countLogUpdateCar = 0L;
-            long countLogValid = 0L;
-            long countLogRecover = 0L;
-            if(carLog != null) {
+            long countLogFirstIsPreScale = 0L;
+            long countLogFirstIsNotPreScale = 0L;
+            long countLogFirstUpdateCar = 0L;
+            long countLogFirstValid = 0L;
+            long countLogFirstRecover = 0L;
+            if(carFirstLog != null && carFirstLog.size() >= 1) {
                 //日志一次处理匹配委托
-                countLogIsPreScale = carLog.stream().filter(model -> model.get("baseSpotNo").equals(spot.getBaseSpotNo())
-                        && model.get("baseSpotName").equals(spot.getBaseSpotName())
-                        && model.get("operationFunction").equals("汽车衡匹配委托")).count();
-                countLogIsNotPreScale = carLog.stream().filter(model -> model.get("baseSpotNo").equals(spot.getBaseSpotNo())
-                        && model.get("baseSpotName").equals(spot.getBaseSpotName())
-                        && model.get("operationFunction").equals("汽车衡撤销委托")).count();
-                countLogUpdateCar = carLog.stream().filter(model -> model.get("baseSpotNo").equals(spot.getBaseSpotNo())
-                        && model.get("baseSpotName").equals(spot.getBaseSpotName())
-                        && model.get("operationFunction").equals("车号修改")).count();
-                countLogValid = carLog.stream().filter(model -> model.get("baseSpotNo").equals(spot.getBaseSpotNo())
-                        && model.get("baseSpotName").equals(spot.getBaseSpotName())
-                        && model.get("operationFunction").equals("作废")).count();
-                countLogRecover = carLog.stream().filter(model -> model.get("baseSpotNo").equals(spot.getBaseSpotNo())
-                        && model.get("baseSpotName").equals(spot.getBaseSpotName())
-                        && model.get("operationFunction").equals("启用")).count();
+                countLogFirstIsPreScale = carFirstLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
+                        && model.get("BASE_SPOT_NO") != null
+                        && model.get("BASE_SPOT_NAME") != null
+                        && model.get("BASE_SPOT_NO").equals(spot.getBaseSpotNo())
+                        && model.get("BASE_SPOT_NAME").equals(spot.getBaseSpotName())
+                        && model.get("OPERATION_FUNCTION").equals("匹配委托")).count();
+                countLogFirstIsNotPreScale = carFirstLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
+                        && model.get("BASE_SPOT_NO") != null
+                        && model.get("BASE_SPOT_NAME") != null
+                        && model.get("BASE_SPOT_NO").equals(spot.getBaseSpotNo())
+                        && model.get("BASE_SPOT_NAME").equals(spot.getBaseSpotName())
+                        && model.get("OPERATION_FUNCTION").equals("撤销委托")).count();
+                countLogFirstUpdateCar = carFirstLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
+                        && model.get("BASE_SPOT_NO") != null
+                        && model.get("BASE_SPOT_NAME") != null
+                        && model.get("BASE_SPOT_NO").equals(spot.getBaseSpotNo())
+                        && model.get("BASE_SPOT_NAME").equals(spot.getBaseSpotName())
+                        && model.get("OPERATION_FUNCTION").equals("车号修改")).count();
+                countLogFirstValid = carFirstLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
+                        && model.get("BASE_SPOT_NO") != null
+                        && model.get("BASE_SPOT_NAME") != null
+                        && model.get("BASE_SPOT_NO").equals(spot.getBaseSpotNo())
+                        && model.get("BASE_SPOT_NAME").equals(spot.getBaseSpotName())
+                        && model.get("OPERATION_FUNCTION").equals("作废")).count();
+                countLogFirstRecover = carFirstLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
+                        && model.get("BASE_SPOT_NO") != null
+                        && model.get("BASE_SPOT_NAME") != null
+                        && model.get("BASE_SPOT_NO").equals(spot.getBaseSpotNo())
+                        && model.get("BASE_SPOT_NAME").equals(spot.getBaseSpotName())
+                        && model.get("OPERATION_FUNCTION").equals("启用")).count();
+            }
+
+            long countLogActualIsPreScale = 0L;
+            long countLogActualIsNotPreScale = 0L;
+            long countLogActualDecompose = 0L;
+            long countLogActualValid = 0L;
+//            long countLogFirstClean = 0L;
+//            long countLogFirstDoubleEntrust = 0L;
+//            long countLogFirstMixedLoading = 0L;
+//            long countLogFirstMixedDischarge = 0L;
+            if(carActualLog != null && carActualLog.size() >= 1) {
+//                countLogFirstClean = carActualLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
+//                        && model.get("NET_SPOT3_NO") != null
+//                        && model.get("NET_SPOT3_NAME") != null
+//                        && model.get("NET_SPOT3_NO").equals(spot.getBaseSpotNo())
+//                        && model.get("NET_SPOT3_NAME").equals(spot.getBaseSpotName())
+//                        && model.get("OPERATION_FUNCTION").equals("毛皮结净")).count();
+//                countLogFirstDoubleEntrust = carActualLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
+//                        && model.get("NET_SPOT3_NO") != null
+//                        && model.get("NET_SPOT3_NAME") != null
+//                        && model.get("NET_SPOT3_NO").equals(spot.getBaseSpotNo())
+//                        && model.get("NET_SPOT3_NAME").equals(spot.getBaseSpotName())
+//                        && model.get("OPERATION_FUNCTION").equals("毛皮结净")).count();
+//                countLogFirstMixedLoading = carActualLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
+//                        && model.get("NET_SPOT3_NO") != null
+//                        && model.get("NET_SPOT3_NAME") != null
+//                        && model.get("NET_SPOT3_NO").equals(spot.getBaseSpotNo())
+//                        && model.get("NET_SPOT3_NAME").equals(spot.getBaseSpotName())
+//                        && model.get("OPERATION_FUNCTION").equals("毛皮结净")).count();
+//                countLogFirstMixedDischarge = carActualLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
+//                        && model.get("NET_SPOT3_NO") != null
+//                        && model.get("NET_SPOT3_NAME") != null
+//                        && model.get("NET_SPOT3_NO").equals(spot.getBaseSpotNo())
+//                        && model.get("NET_SPOT3_NAME").equals(spot.getBaseSpotName())
+//                        && model.get("OPERATION_FUNCTION").equals("毛皮结净")).count();
+                countLogActualIsPreScale = carActualLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
+                        && model.get("NET_SPOT3_NO") != null
+                        && model.get("NET_SPOT3_NAME") != null
+                        && model.get("NET_SPOT3_NO").equals(spot.getBaseSpotNo())
+                        && model.get("NET_SPOT3_NAME").equals(spot.getBaseSpotName())
+                        && model.get("OPERATION_FUNCTION").equals("匹配委托")).count();
+                countLogActualIsNotPreScale = carActualLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
+                        && model.get("NET_SPOT3_NO") != null
+                        && model.get("NET_SPOT3_NAME") != null
+                        && model.get("NET_SPOT3_NO").equals(spot.getBaseSpotNo())
+                        && model.get("NET_SPOT3_NAME").equals(spot.getBaseSpotName())
+                        && model.get("OPERATION_FUNCTION").equals("撤销委托")).count();
+                countLogActualDecompose = carActualLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
+                        && model.get("NET_SPOT3_NO") != null
+                        && model.get("NET_SPOT3_NAME") != null
+                        && model.get("NET_SPOT3_NO").equals(spot.getBaseSpotNo())
+                        && model.get("NET_SPOT3_NAME").equals(spot.getBaseSpotName())
+                        && model.get("OPERATION_FUNCTION").equals("毛皮分解")).count();
+                countLogActualValid = carActualLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
+                        && model.get("NET_SPOT3_NO") != null
+                        && model.get("NET_SPOT3_NAME") != null
+                        && model.get("NET_SPOT3_NO").equals(spot.getBaseSpotNo())
+                        && model.get("NET_SPOT3_NAME").equals(spot.getBaseSpotName())
+                        && model.get("OPERATION_FUNCTION").equals("结净废除")).count();
+            }
+
+            long countMonitorLogHisTare = 0L;
+            long countMonitorLogGrossTare = 0L;
+            long countMonitorLogActual = 0L;
+            long countMonitorLogInfraredContrast = 0L;
+            long countMonitorLogZero = 0L;
+            long countMonitorLogTime = 0L;
+            if(carMonitorLog != null && carMonitorLog.size() >= 1) {
+                countMonitorLogHisTare = carMonitorLog.stream().filter(model -> model.getBaseSpotNo() != null
+                        && model.getBaseSpotName() != null
+                        && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && model.getOperationContent().endsWith("历史皮重")).count();
+                countMonitorLogGrossTare = carMonitorLog.stream().filter(model -> model.getBaseSpotNo() != null
+                        && model.getBaseSpotName() != null
+                        && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && model.getOperationContent().endsWith("毛皮超差")).count();
+                countMonitorLogActual = carMonitorLog.stream().filter(model -> model.getBaseSpotNo() != null
+                        && model.getBaseSpotName() != null
+                        && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && model.getOperationContent().endsWith("异地计量")).count();
+                countMonitorLogInfraredContrast = carMonitorLog.stream().filter(model -> model.getBaseSpotNo() != null
+                        && model.getBaseSpotName() != null
+                        && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && model.getOperationContent().endsWith("对射")).count();
+                countMonitorLogZero = carMonitorLog.stream().filter(model -> model.getBaseSpotNo() != null
+                        && model.getBaseSpotName() != null
+                        && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && model.getOperationContent().endsWith("零点告警")).count();
+                countMonitorLogTime = carMonitorLog.stream().filter(model -> model.getBaseSpotNo() != null
+                        && model.getBaseSpotName() != null
+                        && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && model.getOperationContent().endsWith("时间间隔")).count();
+            }
+
+            long countResetCar = 0L;
+            if(countResetCarLog != null && countResetCarLog.size() >= 1) {
+                countResetCar = countResetCarLog.stream().filter(model -> model.getBaseSpotNo() != null
+                        && model.getBaseSpotName() != null
+                        && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())).count();
             }
 
             HashMap<String, Object> obj = new HashMap<>();
-            //根据时间查询所有秤点的洁净已匹配、洁净未匹配、洁净已上传、洁净未上传、洁净已作废
+            //根据时间查询所有秤点的结净已匹配、结净未匹配、结净已上传、结净未上传、结净已作废
             obj.put("spotNo", spot.getBaseSpotNo());
             obj.put("spotName", spot.getBaseSpotName());
             obj.put("countIsPrescale", countIsPrescale);
@@ -2657,18 +2890,37 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             obj.put("countGross", countGross);
             obj.put("countTare", countTare);
             obj.put("countTermTare", countTermTare);
+            obj.put("countNullWeightType", countNullWeightType);
             obj.put("countFirst", countFirst);
             obj.put("countFirstValid", countFirstValid);
             //根据时间查询所有秤点的报警总数、报警未处理、报警已处理
             obj.put("countCarHelp", countCarHelp);
             obj.put("countCarHelpIsNotValue", countCarHelpIsNotValue);
             obj.put("countCarHelpIsValue", countCarHelpIsValue);
-            //根据时间查询所有秤点的匹配委托、
-            obj.put("countLogIsPreScale", countLogIsPreScale);
-            obj.put("countLogIsNotPreScale", countLogIsNotPreScale);
-            obj.put("countLogUpdateCar", countLogUpdateCar);
-            obj.put("countLogValid", countLogValid);
-            obj.put("countLogRecover", countLogRecover);
+            obj.put("countCarHelpRfid", countCarHelpRfid);
+            obj.put("countCarHelpScanningCode", countCarHelpScanningCode);
+            obj.put("countCarHelpNormal", countCarHelpNormal);
+            obj.put("countCarHelpVehicleReset", countCarHelpVehicleReset);
+            //根据时间查询所有秤点的一次匹配委托、撤销委托、车号修改、作废、启用
+            obj.put("countLogFirstIsPreScale", countLogFirstIsPreScale);
+            obj.put("countLogFirstIsNotPreScale", countLogFirstIsNotPreScale);
+            obj.put("countLogFirstUpdateCar", countLogFirstUpdateCar);
+            obj.put("countLogFirstValid", countLogFirstValid);
+            obj.put("countLogFirstRecover", countLogFirstRecover);
+            //根据时间查询所有秤点的结净匹配委托、撤销委托、毛皮分解、结净废除
+            obj.put("countLogActualIsPreScale", countLogActualIsPreScale);
+            obj.put("countLogActualIsNotPreScale", countLogActualIsNotPreScale);
+            obj.put("countLogActualDecompose", countLogActualDecompose);
+            obj.put("countLogActualValid", countLogActualValid);
+            //根据时间查询所有秤点的不验证历史皮重、不验证异地计量、不验证零点告警、不验证时间间隔、不验证对射、不验证毛皮超差
+            obj.put("countMonitorLogHisTare", countMonitorLogHisTare);
+            obj.put("countMonitorLogGrossTare", countMonitorLogGrossTare);
+            obj.put("countMonitorLogActual", countMonitorLogActual);
+            obj.put("countMonitorLogInfraredContrast", countMonitorLogInfraredContrast);
+            obj.put("countMonitorLogZero", countMonitorLogZero);
+            obj.put("countMonitorLogTime", countMonitorLogTime);
+            //监控程序重置车号
+            obj.put("countResetCar", countResetCar);
             map.add(obj);
         }
         return map;

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

@@ -1407,4 +1407,20 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @GetMapping(value = "/allStateView/")
+    public RESTfulResult allStateView(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterWorkCarActualFirst> list = meterWorkCarActualFirstService.allStateView(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
 }

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

@@ -85,5 +85,6 @@ public interface MeterWorkCarActualFirstMapper extends IBaseMapper<MeterWorkCarA
     int countFirstByCar(HashMap params);
 
     //根据时间查询所有秤点的一次毛重、一次皮重、一次期限皮、一次有效、一次作废
-    List<MeterWorkCarActual> countAllState(Map<String, Object> params);
+    List<MeterWorkCarActualFirst> countAllState(Map<String, Object> params);
+    List<MeterWorkCarActualFirst> allStateView(Map<String, Object> params);
 }

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

@@ -2920,4 +2920,34 @@
       and  base_spot_name like '%${baseSpotName}%'
     </if>
   </select>
+
+  <!--根据时间查询所有秤点的一次毛重、一次皮重、一次期限皮、一次有效、一次作废-->
+  <select id="allStateView" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    <if test="carNo != null and carNo != ''">
+      and car_no like '%${carNo}%'
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      and value_flag = #{valueFlag}
+    </if>
+    <if test="valueFlag == null and valueFlag == ''">
+      and value_flag != '0'
+    </if>
+    <if test="weightType != null and weightType != ''">
+      and weight_type = #{weightType}
+    </if>
+    <if test="flag != null and flag != ''">
+      and weight_type is null
+    </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="baseSpotNo != null and baseSpotNo != ''">
+      and  base_spot_no like '%${baseSpotNo}%'
+    </if>
+    <if test="baseSpotName != null and baseSpotName != ''">
+      and  base_spot_name like '%${baseSpotName}%'
+    </if>
+  </select>
 </mapper>

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

@@ -151,4 +151,6 @@ public interface IMeterWorkCarActualFirstService extends IBaseService<MeterWorkC
     RESTfulResult doAddDoubleMuchNet(List<MeterWorkCarActualFirst> grossModels, MeterWorkCarActualFirst tareModel);
     RESTfulResult countFirstByCar(HashMap<String, Object> parmas);
     RESTfulResult doNetAddMuchGrossDouble(List<MeterWorkCarActualFirst> gross,MeterWorkCarActualFirst tare, MeterMonitorNote note) throws Exception;
+
+    PageList<MeterWorkCarActualFirst> allStateView(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
 }

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

@@ -672,7 +672,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 logModel.setCreateManName(userName);
                 logModel.setCreateTime(new Date());
                 logModel.setOperationPage("web端-汽车衡一次数据维护");
-                logModel.setOperationFunction("解绑委托");
+                logModel.setOperationFunction("撤销委托");
                 logModel.setOperationId(model.getActualFirstNo());
                 logModel.setOperationPredictionNo(model.getPredictionNo());
                 logModel.setOperationCarnNo(model.getCarNo());
@@ -746,7 +746,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             Assert.isTrue(!pts.getValueFlag().equals("9"), "委托编号：" + predictionNo + "已结算不允许匹配委托");
             MeterWorkCarActualFirst model = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualFirstNo);
             Assert.isTrue(model != null, "一次数据不存在");
-            Assert.isTrue(!model.getValueFlag().equals("2"), "一次数据已结净,不允许匹配委托，请在洁净数据维护中进行洁净匹配委托");
+            Assert.isTrue(!model.getValueFlag().equals("2"), "一次数据已结净,不允许匹配委托，请在结净数据维护中进行结净匹配委托");
             Assert.isTrue(model.getPredictionNo() == null && StringUtils.isEmpty(model.getPredictionNo()), "一次数据已匹配,不允许匹配委托");
 
             //操作日志
@@ -4017,17 +4017,31 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             scale1.setMeasureStationName(actualRow2.getNetSpot3Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
 
-            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
-            logModel.setId(PublicMethod.IdCreate(2));
-            logModel.setCreateManNo(userId);
-            logModel.setCreateManName(userName);
-            logModel.setCreateTime(new Date());
-            logModel.setOperationPage("web端-汽车衡一次数据维护");
-            logModel.setOperationFunction("混装委托结净");
-            logModel.setOperationId(actualNo1 + "+" + actualNo2 + "+" + actualNo3);
-            logModel.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
-            logModel.setOperationCarnNo(actualRow1.getCarNo());
-            meterBaseOperationLogMapper.insertSelective(logModel);
+            MeterBaseOperationLog logModel01 = new MeterBaseOperationLog();
+            logModel01.setId(PublicMethod.IdCreate(2));
+            logModel01.setCreateManNo(userId);
+            logModel01.setCreateManName(userName);
+            logModel01.setCreateTime(new Date());
+            logModel01.setOperationPage("web端-汽车衡一次数据维护");
+            logModel01.setOperationFunction("混装委托结净");
+            logModel01.setOperationId(actualRow1.getActualNo());
+            logModel01.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel01.setOperationBeforeFix(actualNo1 + "+" + actualNo2 + "+" + actualNo3);
+            logModel01.setOperationCarnNo(actualRow1.getCarNo());
+            meterBaseOperationLogMapper.insertSelective(logModel01);
+
+            MeterBaseOperationLog logModel02 = new MeterBaseOperationLog();
+            logModel02.setId(PublicMethod.IdCreate(2));
+            logModel02.setCreateManNo(userId);
+            logModel02.setCreateManName(userName);
+            logModel02.setCreateTime(new Date());
+            logModel02.setOperationPage("web端-汽车衡一次数据维护");
+            logModel02.setOperationFunction("混装委托结净");
+            logModel02.setOperationId(actualRow2.getActualNo());
+            logModel02.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel01.setOperationBeforeFix(actualNo1 + "+" + actualNo2 + "+" + actualNo3);
+            logModel02.setOperationCarnNo(actualRow2.getCarNo());
+            meterBaseOperationLogMapper.insertSelective(logModel02);
         }
         catch (Exception e){
             e.printStackTrace();
@@ -4271,17 +4285,31 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             scale1.setMeasureStationName(actualRow2.getNetSpot3Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
 
-            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
-            logModel.setId(PublicMethod.IdCreate(2));
-            logModel.setCreateManNo(userId);
-            logModel.setCreateManName(userName);
-            logModel.setCreateTime(new Date());
-            logModel.setOperationPage("web端-汽车衡一次数据维护");
-            logModel.setOperationFunction("混卸委托结净");
-            logModel.setOperationId(actualNo1 + "+" + actualNo2 + "+" + actualNo3);
-            logModel.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
-            logModel.setOperationCarnNo(actualRow1.getCarNo());
-            meterBaseOperationLogMapper.insertSelective(logModel);
+            MeterBaseOperationLog logModel01 = new MeterBaseOperationLog();
+            logModel01.setId(PublicMethod.IdCreate(2));
+            logModel01.setCreateManNo(userId);
+            logModel01.setCreateManName(userName);
+            logModel01.setCreateTime(new Date());
+            logModel01.setOperationPage("web端-汽车衡一次数据维护");
+            logModel01.setOperationFunction("混卸委托结净");
+            logModel01.setOperationId(actualRow1.getActualNo());
+            logModel01.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel01.setOperationBeforeFix(actualNo1 + "," + actualNo2 + "," + actualNo3);
+            logModel01.setOperationCarnNo(actualRow1.getCarNo());
+            meterBaseOperationLogMapper.insertSelective(logModel01);
+
+            MeterBaseOperationLog logModel02 = new MeterBaseOperationLog();
+            logModel02.setId(PublicMethod.IdCreate(2));
+            logModel02.setCreateManNo(userId);
+            logModel02.setCreateManName(userName);
+            logModel02.setCreateTime(new Date());
+            logModel02.setOperationPage("web端-汽车衡一次数据维护");
+            logModel02.setOperationFunction("混卸委托结净");
+            logModel02.setOperationId(actualRow2.getActualNo());
+            logModel02.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel01.setOperationBeforeFix(actualNo1 + "," + actualNo2 + "," + actualNo3);
+            logModel02.setOperationCarnNo(actualRow2.getCarNo());
+            meterBaseOperationLogMapper.insertSelective(logModel02);
         }
         catch (Exception e){
             e.printStackTrace();
@@ -4595,17 +4623,31 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             scale1.setMeasureStationName(actualRow2.getNetSpot3Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
 
-            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
-            logModel.setId(PublicMethod.IdCreate(2));
-            logModel.setCreateManNo(userId);
-            logModel.setCreateManName(userName);
-            logModel.setCreateTime(new Date());
-            logModel.setOperationPage("web端-汽车衡一次数据维护");
-            logModel.setOperationFunction("双委托结净");
-            logModel.setOperationId(actualNo1 + "+" + actualNo2);
-            logModel.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
-            logModel.setOperationCarnNo(actualRow1.getCarNo());
-            meterBaseOperationLogMapper.insertSelective(logModel);
+            MeterBaseOperationLog logModel01 = new MeterBaseOperationLog();
+            logModel01.setId(PublicMethod.IdCreate(2));
+            logModel01.setCreateManNo(userId);
+            logModel01.setCreateManName(userName);
+            logModel01.setCreateTime(new Date());
+            logModel01.setOperationPage("web端-汽车衡一次数据维护");
+            logModel01.setOperationFunction("双委托结净");
+            logModel01.setOperationId(actualNo1);
+            logModel01.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel01.setOperationBeforeFix(actualRow1.getActualFirst1No() + "," + actualRow1.getActualFirst2No());
+            logModel01.setOperationCarnNo(actualRow1.getCarNo());
+            meterBaseOperationLogMapper.insertSelective(logModel01);
+
+            MeterBaseOperationLog logModel02 = new MeterBaseOperationLog();
+            logModel02.setId(PublicMethod.IdCreate(2));
+            logModel02.setCreateManNo(userId);
+            logModel02.setCreateManName(userName);
+            logModel02.setCreateTime(new Date());
+            logModel02.setOperationPage("web端-汽车衡一次数据维护");
+            logModel02.setOperationFunction("双委托结净");
+            logModel02.setOperationId(actualNo2);
+            logModel02.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel01.setOperationBeforeFix(actualRow2.getActualFirst1No() + "," + actualRow2.getActualFirst2No());
+            logModel02.setOperationCarnNo(actualRow2.getCarNo());
+            meterBaseOperationLogMapper.insertSelective(logModel02);
 
             rm.setSucceed();
             rm.setMessage("操作成功!!");
@@ -5676,7 +5718,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     grossModel.setIsPreScale("1");
                     grossModel.setPredictionType("1");
                     grossModel.setPredictionNo(scale.getPredictionNo());
-                    grossModel.setNote("期限皮结净");
+                    grossModel.setNote("期限皮匹配委托结净");
                     meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(grossModel);
                     tareModel.setUpdateManNo(userId);
                     tareModel.setUpdateManName(userName);
@@ -5687,7 +5729,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     tareModel.setDataSource("2");
                     tareModel.setPredictionType("1");
                     tareModel.setPredictionNo(scale.getPredictionNo());
-                    tareModel.setNote("期限皮结净");
+                    tareModel.setNote("期限皮匹配委托结净");
                     meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(tareModel);
 
                     MeterWorkCarActual actualRow = meterWorkCarActualMapper.manualAddPre(grossModel.getActualFirstNo(), tareModel.getActualFirstNo(), scale.getPredictionNo());
@@ -5699,7 +5741,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     actualRow.setValueFlag("1");
                     actualRow.setPredictionNo(scale.getPredictionNo());
                     actualRow.setPredictionType("1");
-                    actualRow.setNote("期限皮匹配结净");
+                    actualRow.setNote("期限皮匹配委托结净");
                     actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
                     if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
@@ -5736,12 +5778,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     logModel.setCreateManName(userName);
                     logModel.setCreateTime(new Date());
                     logModel.setOperationPage("web端-汽车衡一次数据维护");
-                    logModel.setOperationFunction("期限皮洁净");
+                    logModel.setOperationFunction("期限皮结净");
                     logModel.setOperationId(grossModel.getActualFirstNo());
                     logModel.setOperationPredictionNo(grossModel.getPredictionNo());
                     logModel.setOperationCarnNo(grossModel.getCarNo());
                     logModel.setOperationBeforeFix("一次数据：" + grossModel.toString());
-                    logModel.setOperationAfterFix("洁净数据：" + actualRow.toString());
+                    logModel.setOperationAfterFix("结净数据：" + actualRow.toString());
                     meterBaseOperationLogMapper.insertSelective(logModel);
 
                     rm.setSucceed();
@@ -5814,12 +5856,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     logModel.setCreateManName(userName);
                     logModel.setCreateTime(new Date());
                     logModel.setOperationPage("web端-汽车衡一次数据维护");
-                    logModel.setOperationFunction("期限皮洁净");
+                    logModel.setOperationFunction("期限皮结净");
                     logModel.setOperationId(grossModel.getActualFirstNo());
                     logModel.setOperationPredictionNo(grossModel.getPredictionNo());
                     logModel.setOperationCarnNo(grossModel.getCarNo());
                     logModel.setOperationBeforeFix("一次数据：" + grossModel.toString());
-                    logModel.setOperationAfterFix("洁净数据：" + actualRow.toString());
+                    logModel.setOperationAfterFix("结净数据：" + actualRow.toString());
                     meterBaseOperationLogMapper.insertSelective(logModel);
 
                     rm.setSucceed();
@@ -6215,7 +6257,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             grossFirst01.setUpdateManNo("system");
             grossFirst01.setUpdateManName("system");
             grossFirst01.setUpdateTime(new Date());
-            grossFirst01.setNote("内倒双委托一次洁净");
+            grossFirst01.setNote("内倒双委托一次结净");
             meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(grossFirst01);
 
             grossFirst02.setActualFirstNo(PublicMethod.IdCreate(3));
@@ -6229,7 +6271,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             grossFirst02.setUpdateManNo("system");
             grossFirst02.setUpdateManName("system");
             grossFirst02.setUpdateTime(new Date());
-            grossFirst02.setNote("内倒双委托一次洁净");
+            grossFirst02.setNote("内倒双委托一次结净");
             meterWorkCarActualFirstMapper.insertSelective(grossFirst02);
 
 
@@ -6243,7 +6285,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             tareFirst01.setUpdateManNo("system");
             tareFirst01.setUpdateManName("system");
             tareFirst01.setUpdateTime(new Date());
-            tareFirst01.setNote("内倒双委托一次洁净");
+            tareFirst01.setNote("内倒双委托一次结净");
             meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(tareFirst01);
 
             tareFirst02.setActualFirstNo(PublicMethod.IdCreate(3));
@@ -6257,7 +6299,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             tareFirst02.setUpdateManNo("system");
             tareFirst02.setUpdateManName("system");
             tareFirst02.setUpdateTime(new Date());
-            tareFirst01.setNote("内倒双委托一次洁净");
+            tareFirst01.setNote("内倒双委托一次结净");
             meterWorkCarActualFirstMapper.insertSelective(tareFirst02);
 
             //保存历史皮重信息
@@ -6447,7 +6489,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             grossFirst01.setUpdateManNo("system");
             grossFirst01.setUpdateManName("system");
             grossFirst01.setUpdateTime(new Date());
-            grossFirst01.setNote("内倒双委托一次保存期限皮洁净");
+            grossFirst01.setNote("内倒双委托一次保存期限皮结净");
             meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(grossFirst01);
 
             grossFirst02.setActualFirstNo(PublicMethod.IdCreate(3));
@@ -6461,7 +6503,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             grossFirst02.setUpdateManNo("system");
             grossFirst02.setUpdateManName("system");
             grossFirst02.setUpdateTime(new Date());
-            grossFirst02.setNote("内倒双委托一次保存期限皮洁净");
+            grossFirst02.setNote("内倒双委托一次保存期限皮结净");
             meterWorkCarActualFirstMapper.insertSelective(grossFirst02);
 
             tareFirst01.setActualFirstNo(PublicMethod.IdCreate(3));
@@ -6475,7 +6517,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             tareFirst01.setUpdateManNo("system");
             tareFirst01.setUpdateManName("system");
             tareFirst01.setUpdateTime(new Date());
-            tareFirst01.setNote("内倒双委托一次保存期限皮洁净");
+            tareFirst01.setNote("内倒双委托一次保存期限皮结净");
             meterWorkCarActualFirstMapper.insertSelective(tareFirst01);
 
             tareFirst02.setActualFirstNo(PublicMethod.IdCreate(3));
@@ -6489,7 +6531,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             tareFirst02.setUpdateManNo("system");
             tareFirst02.setUpdateManName("system");
             tareFirst02.setUpdateTime(new Date());
-            tareFirst02.setNote("内倒双委托一次保存期限皮洁净");
+            tareFirst02.setNote("内倒双委托一次保存期限皮结净");
             meterWorkCarActualFirstMapper.insertSelective(tareFirst02);
 
             //作废一次皮重
@@ -6674,16 +6716,16 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             no = tareModel.getActualFirstNo();
 
             for (MeterWorkCarActualFirst grossModel: grossModels){
-                //将毛重数据洁净
+                //将毛重数据结净
                 grossModel.setValueFlag("2");
                 grossModel.setUpdateManNo("system");
                 grossModel.setUpdateManName("system");
                 grossModel.setUpdateTime(new Date());
-                grossModel.setNote("内倒多毛一皮匹配委托洁净");
+                grossModel.setNote("内倒多毛一皮匹配委托结净");
                 meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(grossModel);
 
                 tareModel = meterWorkCarActualFirstMapper.selectAndMatch(tareModel.getActualFirstNo(), grossModel.getPredictionNo());
-                //多毛回空皮洁净
+                //多毛回空皮结净
                 tareModel.setActualFirstNo(PublicMethod.IdCreate(3));
                 tareModel.setMeterMode("2");
                 tareModel.setWeightType("1");
@@ -6694,7 +6736,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 tareModel.setUpdateManNo("system");
                 tareModel.setUpdateManName("system");
                 tareModel.setUpdateTime(new Date());
-                tareModel.setNote("内倒多毛一皮匹配委托洁净");
+                tareModel.setNote("内倒多毛一皮匹配委托结净");
                 meterWorkCarActualFirstMapper.insertSelective(tareModel);
 
                 //将委托信息插入结净数据
@@ -6702,7 +6744,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 //更新结净数据状态
                 mwca.setActualNo(PublicMethod.IdCreate(3));
                 mwca.setNetMode(DbConstants.TYPE);
-                mwca.setNote("内倒多毛一皮匹配委托洁净");
+                mwca.setNote("内倒多毛一皮匹配委托结净");
                 mwca.setUploadFlag("1");
                 mwca.setIsPreScale("1");
                 mwca.setValueFlag("1");
@@ -6972,6 +7014,14 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         return rm;
     }
 
+    @Override
+    public PageList<MeterWorkCarActualFirst> allStateView(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkCarActualFirst> firstList = meterWorkCarActualFirstMapper.allStateView(params);
+        PageList pageInfo = new PageList(firstList);
+        return pageInfo;
+    }
+
     @Override
     public RESTfulResult doNetAddMuchGross(List<MeterWorkCarActualFirst> gross, MeterWorkCarActualFirst tare, MeterMonitorNote note) throws Exception {
         RESTfulResult rm = new RESTfulResult();

src/main/java/com/steerinfo/meterwork/meterworkparammap/controller/MeterWorkParamMap.java

@@ -25,7 +25,7 @@ public class MeterWorkParamMap extends BaseRESTfulController {
     @Resource
     private MeterWorkParamMapService meterWorkParamMapService;
 
-    @ApiOperation(value="查询监控表信息、最近一次计量数据、未使用和使用中的委托、洁净数据、委托信息", notes="返回List<HashMap>对象")
+    @ApiOperation(value="查询监控表信息、最近一次计量数据、未使用和使用中的委托、结净数据、委托信息", notes="返回List<HashMap>对象")
     @PostMapping(value = "combinationByParams")
     public RESTfulResult combinationByParams(@RequestBody HashMap params) {
         RESTfulResult rm = failed();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -430,7 +430,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             logModel.setCreateManNo(userId);
             logModel.setCreateManName(userName);
             logModel.setCreateTime(new Date());
-            logModel.setOperationPage("Web端-静轨一次数据维护");
+            logModel.setOperationPage("Web端-轨道衡一次数据维护");
             logModel.setOperationFunction("作废");
             logModel.setOperationId(model.getActualFirstNo());
             logModel.setOperationPredictionNo(model.getPredictionNo());
@@ -514,7 +514,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             logModel.setCreateManNo(userId);
             logModel.setCreateManName(userName);
             logModel.setCreateTime(new Date());
-            logModel.setOperationPage("Web端-静轨一次数据维护");
+            logModel.setOperationPage("Web端-轨道衡一次数据维护");
             logModel.setOperationFunction("启用");
             logModel.setOperationId(model.getActualFirstNo());
             logModel.setOperationPredictionNo(model.getPredictionNo());
@@ -566,7 +566,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             logModel.setCreateManNo(userId);
             logModel.setCreateManName(userName);
             logModel.setCreateTime(new Date());
-            logModel.setOperationPage("Web端-静轨一次数据维护");
+            logModel.setOperationPage("Web端-轨道衡一次数据维护");
             logModel.setOperationFunction("车号修改");
             logModel.setOperationId(model.getActualFirstNo());
             logModel.setOperationPredictionNo(model.getPredictionNo());
@@ -3600,7 +3600,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             logModel.setCreateManNo(userId);
             logModel.setCreateManName(userName);
             logModel.setCreateTime(new Date());
-            logModel.setOperationPage("Web端-静轨一次数据维护");
+            logModel.setOperationPage("Web端-轨道衡一次数据维护");
             logModel.setOperationFunction("撤销委托");
             logModel.setOperationId(model.getActualFirstNo());
             logModel.setOperationPredictionNo(model.getPredictionNo());
@@ -3702,7 +3702,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             logModel.setCreateManNo(userId);
             logModel.setCreateManName(userName);
             logModel.setCreateTime(new Date());
-            logModel.setOperationPage("Web端-静轨一次数据维护");
+            logModel.setOperationPage("Web端-轨道衡一次数据维护");
             logModel.setOperationFunction("匹配委托");
             logModel.setOperationId(model.getActualFirstNo());
             logModel.setOperationPredictionNo(predictionNo);
@@ -8491,6 +8491,16 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try{
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "system";
+                userName = "system";
+            }
             int count = 0;
             //将一次数据表的与标识皮进行结净
             for (HashMap model: models) {
@@ -8567,6 +8577,10 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             actualRow.setCreateManName(actualRow.getTareManName());
                             actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                         }
+                        actualRow.setUpdateManNo(userId);
+                        actualRow.setUpdateManName(userName);
+                        actualRow.setUpdateTime(new Date());
+                        actualRow.setNote("一次批量匹配标识皮结净");
                         meterWorkRailwayActualMapper.insertSelective(actualRow);
 
                         //更新预报数
@@ -8633,8 +8647,23 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             actualRow.setCreateManName(actualRow.getTareManName());
                             actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                         }
+                        actualRow.setUpdateManNo(userId);
+                        actualRow.setUpdateManName(userName);
+                        actualRow.setUpdateTime(new Date());
+                        actualRow.setNote("一次批量匹配标识皮结净");
                         meterWorkRailwayActualMapper.insertSelective(actualRow);
                     }
+                    MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                    logModel.setId(PublicMethod.IdCreate(2));
+                    logModel.setCreateManNo(userId);
+                    logModel.setCreateManName(userName);
+                    logModel.setCreateTime(new Date());
+                    logModel.setOperationPage("Web端-静轨一次数据批量维护");
+                    logModel.setOperationFunction("一次批量匹配标识皮");
+                    logModel.setOperationId(grossModel.getActualFirstNo());
+                    logModel.setOperationPredictionNo(grossModel.getPredictionNo());
+                    logModel.setOperationCarnNo(grossModel.getRailwayNo());
+                    meterBaseOperationLogMapper.insertSelective(logModel);
                     count++;
                 }
             }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -1,7 +1,5 @@
 package com.steerinfo.meterwork.meterworkrailwayactual.service.impl;
 
-import com.github.pagehelper.util.StringUtil;
-import com.google.inject.internal.cglib.proxy.$FixedValue;
 import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
 import com.steerinfo.baseinfo.meterbaseoperationlog.mapper.MeterBaseOperationLogMapper;
 import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
@@ -17,30 +15,22 @@ import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.meterwork.constants.DbConstants;
 import com.steerinfo.meterwork.except.MarkerMetException;
-import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
-import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.mapper.MeterWorkRailwayActFirstMapper;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.service.IMeterWorkRailwayActFirstService;
 import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import com.steerinfo.meterwork.meterworkrailwayactual.service.IMeterWorkRailwayActualService;
-import com.steerinfo.meterwork.meterworkrailwaymotorialreceived.mapper.MeterWorkRailwayMotorialReceivedMapper;
-import com.steerinfo.meterwork.meterworkrailwaymotorialreceived.model.MeterWorkRailwayMotorialReceived;
 import com.steerinfo.meterwork.meterworkrailwayreceived.mapper.MeterWorkRailwayReceivedMapper;
 import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
 import com.steerinfo.pretrack.prerailwayscale.mapper.PreRailwayScaleMapper;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
-import com.steerinfo.pretrack.prerailwayscale.service.IPreRailwayScaleService;
-import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.util.CommonPage;
 import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
-import io.micrometer.core.instrument.Meter;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -158,7 +148,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         }
         PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
         if(scale != null && scale.getValueFlag().equals("9")) {
-            throw new MarkerMetException(500, "只有未结算的洁净数据才能进行撤销发布操作");
+            throw new MarkerMetException(500, "只有未结算的结净数据才能进行撤销发布操作");
         }
 
         UserPayload userPayload = new UserPayload();
@@ -171,6 +161,18 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         model.setUpdateManNo(userId);
         try {
             meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
+
+            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+            logModel.setId(PublicMethod.IdCreate(2));
+            logModel.setCreateManNo(userId);
+            logModel.setCreateManName(userName);
+            logModel.setCreateTime(new Date());
+            logModel.setOperationPage("web端-轨道衡净重数据维护");
+            logModel.setOperationFunction("取消发布");
+            logModel.setOperationId(model.getActualNo());
+            logModel.setOperationPredictionNo(model.getPredictionNo());
+            logModel.setOperationCarnNo(model.getRailwayNo());
+            meterBaseOperationLogMapper.insertSelective(logModel);
         } catch (Exception e) {
             throw e;
         }
@@ -193,7 +195,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 }
                 PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
                 if(scale != null && scale.getValueFlag().equals("9")) {
-                    throw new MarkerMetException(500, "只有未结算的洁净数据才能进行撤销发布操作");
+                    throw new MarkerMetException(500, "只有未结算的结净数据才能进行撤销发布操作");
                 }
             }
             UserPayload userPayload = new UserPayload();
@@ -208,6 +210,18 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 modelTemp.setUpdateManName(userName);
                 modelTemp.setUpdateManNo(userId);
                 meterWorkRailwayActualMapper.updateByPrimaryKeySelective(modelTemp);
+
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(userId);
+                logModel.setCreateManName(userName);
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("web端-轨道衡净重数据维护");
+                logModel.setOperationFunction("批量取消发布");
+                logModel.setOperationId(model.getActualNo());
+                logModel.setOperationPredictionNo(model.getPredictionNo());
+                logModel.setOperationCarnNo(model.getRailwayNo());
+                meterBaseOperationLogMapper.insertSelective(logModel);
                 count ++;
             }
             rm.setSucceed();
@@ -316,8 +330,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 logModel.setCreateManNo(userId);
                 logModel.setCreateManName(userName);
                 logModel.setCreateTime(new Date());
-                logModel.setOperationPage("动态轨道衡-动轨净重数据维护");
-                logModel.setOperationFunction("净重数据作废");
+                logModel.setOperationPage("C#端-动轨净重数据维护");
+                logModel.setOperationFunction("结净废除");
                 logModel.setOperationId(model.getActualNo());
                 logModel.setOperationPredictionNo(model.getPredictionNo());
                 logModel.setOperationCarnNo(model.getRailwayNo());
@@ -358,6 +372,18 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         model.setUpdateManNo(userId);
         try {
             meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
+
+            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+            logModel.setId(PublicMethod.IdCreate(2));
+            logModel.setCreateManNo(userId);
+            logModel.setCreateManName(userName);
+            logModel.setCreateTime(new Date());
+            logModel.setOperationPage("web端-轨道衡净重数据维护");
+            logModel.setOperationFunction("发布");
+            logModel.setOperationId(model.getActualNo());
+            logModel.setOperationPredictionNo(model.getPredictionNo());
+            logModel.setOperationCarnNo(model.getRailwayNo());
+            meterBaseOperationLogMapper.insertSelective(logModel);
         } catch (Exception e) {
             throw e;
         }
@@ -389,6 +415,18 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 modelTemp.setUpdateManName(userName);
                 modelTemp.setUpdateManNo(userId);
                 meterWorkRailwayActualMapper.updateByPrimaryKeySelective(modelTemp);
+
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(userId);
+                logModel.setCreateManName(userName);
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("web端-轨道衡净重数据维护");
+                logModel.setOperationFunction("批量发布");
+                logModel.setOperationId(model.getActualNo());
+                logModel.setOperationPredictionNo(model.getPredictionNo());
+                logModel.setOperationCarnNo(model.getRailwayNo());
+                meterBaseOperationLogMapper.insertSelective(logModel);
                 count ++;
             }
             rm.setSucceed();
@@ -786,6 +824,21 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         } else if (!queryrow.getIsPreSacale().equals("0") && queryrow.getPredictionNo() != null) {
             throw new MarkerMetException(500, "只有未匹配的净重数据才能进行委托匹配操作");
         }
+        try{
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            if(queryrow.getUpdateTime() != null && StringUtils.isNotEmpty(queryrow.getUpdateTime().toString())) {
+                long eTime = df.parse(queryrow.getUpdateTime().toString()).getTime();
+                long sTime = df.parse((new Date()).toString()).getTime();
+                long diff = (eTime - sTime) / 1000;
+                if(diff <= 15) {
+                    throw new MarkerMetException(500, "匹配委托需在解除委托15秒后进行，请稍等");
+                }
+            }
+        }catch(Exception e) {
+            e.printStackTrace();
+            throw new MarkerMetException(500, "操作失败");
+        }
+
         PreRailwayScale prerow = preRailwayScaleMapper.selectByPrimaryKey(predictionNo);
         if (prerow == null) {
             throw new MarkerMetException(500, "不存在对应的委托数据");
@@ -858,7 +911,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         logModel.setCreateManNo(userId);
         logModel.setCreateManName(userName);
         logModel.setCreateTime(new Date());
-        logModel.setOperationPage("静态轨道衡-静轨净重数据维护");
+        logModel.setOperationPage("web端-轨道衡净重数据维护");
         logModel.setOperationFunction("匹配委托");
         logModel.setOperationId(mwca.getActualNo());
         logModel.setOperationPredictionNo(predictionNo);
@@ -982,6 +1035,21 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         MeterWorkRailwayActual mwcaquery = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
         if (mwcaquery == null) {
             throw new MarkerMetException(500, "不存在对应的结净数据");
+        }else {
+            try{
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                if(mwcaquery.getUpdateTime() != null && StringUtils.isNotEmpty(mwcaquery.getUpdateTime().toString())) {
+                    long eTime = df.parse(mwcaquery.getUpdateTime().toString()).getTime();
+                    long sTime = df.parse((new Date()).toString()).getTime();
+                    long diff = (eTime - sTime) / 1000;
+                    if(diff <= 15) {
+                        throw new MarkerMetException(500, "解除委托需在匹配委托15秒后进行，请稍等");
+                    }
+                }
+            }catch(Exception e) {
+                e.printStackTrace();
+                throw new MarkerMetException(500, "操作失败");
+            }
         }
 
         if(model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())){
@@ -1049,7 +1117,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         logModel.setCreateManNo(userId);
         logModel.setCreateManName(userName);
         logModel.setCreateTime(new Date());
-        logModel.setOperationPage("静态轨道衡-静轨净重数据维护");
+        logModel.setOperationPage("web端-轨道衡净重数据维护");
         logModel.setOperationFunction("撤销委托");
         logModel.setOperationId(mwca.getActualNo());
         logModel.setOperationPredictionNo(model.getPredictionNo());
@@ -1172,8 +1240,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 logModel.setCreateManNo(userId);
                 logModel.setCreateManName(userName);
                 logModel.setCreateTime(new Date());
-                logModel.setOperationPage("轨道衡净重数据维护");
-                logModel.setOperationFunction("轨道衡撤销委托");
+                logModel.setOperationPage("web端-轨道衡净重数据维护");
+                logModel.setOperationFunction("毛皮分解");
                 logModel.setOperationId(model.getActualNo());
                 logModel.setOperationPredictionNo(model.getPredictionNo());
                 logModel.setOperationCarnNo(model.getRailwayNo());
@@ -2608,7 +2676,16 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 return rm;
             }
         }
-
+        String userId = "";
+        String userName = "";
+        try{
+            UserPayload userPayload = UserPayload.getCurrUser();
+            userId = userPayload.getUserCode();
+            userName = userPayload.getUserName();
+        }catch (Exception e) {
+            userId = "system";
+            userName = "system";
+        }
         switch(type){
             case "5":
             case "6":
@@ -2652,8 +2729,29 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                         removeFirstEl(firstTare);
                         meterWorkRailwayActFirstMapper.updateByPrimaryKey(firstTare);
                     }
-                    removeEl(model);
-                    meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
+                    MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.cleanPredcition(model.getActualNo());
+                    removeEl(modelTemp);
+                    meterWorkRailwayActualMapper.updateByPrimaryKeySelective(modelTemp);
+
+                    MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                    logModel.setId(PublicMethod.IdCreate(2));
+                    logModel.setCreateManNo(userId);
+                    logModel.setCreateManName(userName);
+                    logModel.setCreateTime(new Date());
+                    logModel.setOperationPage("web端-轨道衡净重数据维护");
+                    if(type.equals("5")){
+                        logModel.setOperationFunction("取消双委托结净");
+                    }else if(type.equals("6")) {
+                        logModel.setOperationFunction("取消混卸结净");
+                    }else if(type.equals("7")) {
+                        logModel.setOperationFunction("取消混装结净");
+                    }
+                    logModel.setOperationId(model.getActualNo());
+                    logModel.setOperationPredictionNo(model.getPredictionNo());
+                    logModel.setOperationCarnNo(model.getRailwayNo());
+                    logModel.setOperationBeforeFix(model.toString());
+                    logModel.setOperationAfterFix(modelTemp.toString());
+                    meterBaseOperationLogMapper.insertSelective(logModel);
                 }
                 rm.setSucceed();
                 rm.setMessage("操作成功！！");
@@ -2758,6 +2856,18 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 meterWorkRailwayActualMapper.updateByPrimaryKey(cleanModel);
                 //删结净
                 //meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
+
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(userId);
+                logModel.setCreateManName(userName);
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("web端-轨道衡净重数据维护");
+                logModel.setOperationFunction("结净废除");
+                logModel.setOperationId(model.getActualNo());
+                logModel.setOperationPredictionNo(model.getPredictionNo());
+                logModel.setOperationCarnNo(model.getRailwayNo());
+                logModel.setOperationBeforeFix(model.toString());
             }
             rm.setSucceed();
             rm.setMessage("操作成功！！");
@@ -3063,7 +3173,24 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                                 actualModel.setCreateManName(actualModel.getTareManName());
                                 actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));
                             }
+                            actualModel.setUpdateManNo(userId);
+                            actualModel.setUpdateManName(userName);
+                            actualModel.setUpdateTime(new Date());
+                            actualModel.setNote("净重批量匹配回空皮");
                             meterWorkRailwayActualMapper.updateByPrimaryKeySelective(actualModel);
+
+                            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                            logModel.setId(PublicMethod.IdCreate(2));
+                            logModel.setCreateManNo(userId);
+                            logModel.setCreateManName(userName);
+                            logModel.setCreateTime(new Date());
+                            logModel.setOperationPage("Web端-静轨净重数据批量维护");
+                            logModel.setOperationFunction("净重批量匹配回空皮");
+                            logModel.setOperationId(actualModel.getActualNo());
+                            logModel.setOperationPredictionNo(actualModel.getPredictionNo());
+                            logModel.setOperationCarnNo(actualModel.getRailwayNo());
+                            meterBaseOperationLogMapper.insertSelective(logModel);
+
                             count ++;
                         }
                     }else {
@@ -3104,14 +3231,31 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                             actualModel.setCreateManName(actualModel.getTareManName());
                             actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));
                         }
+                        actualModel.setUpdateManNo(userId);
+                        actualModel.setUpdateManName(userName);
+                        actualModel.setUpdateTime(new Date());
+                        actualModel.setNote("净重批量匹配回空皮");
                         meterWorkRailwayActualMapper.updateByPrimaryKeySelective(actualModel);
+
+                        MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                        logModel.setId(PublicMethod.IdCreate(2));
+                        logModel.setCreateManNo(userId);
+                        logModel.setCreateManName(userName);
+                        logModel.setCreateTime(new Date());
+                        logModel.setOperationPage("Web端-静轨净重数据批量维护");
+                        logModel.setOperationFunction("净重批量匹配回空皮");
+                        logModel.setOperationId(actualModel.getActualNo());
+                        logModel.setOperationPredictionNo(actualModel.getPredictionNo());
+                        logModel.setOperationCarnNo(actualModel.getRailwayNo());
+                        meterBaseOperationLogMapper.insertSelective(logModel);
+
                         count ++;
                     }
                 }
             }
             rm.setSucceed();
             rm.setData("200");
-            rm.setMessage("共有" + count + "条数据一次批量成功");
+            rm.setMessage("共有" + count + "条数据净重批量匹配回空皮成功");
         }catch(Exception e) {
             e.printStackTrace();
             rm.setMessage(e.getMessage());
@@ -3261,7 +3405,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 logModel.setCreateManNo(model.getCreateManName());
                 logModel.setCreateManName(model.getCreateManName());
                 logModel.setCreateTime(new Date());
-                logModel.setOperationPage("动态轨道衡-数据维护");
+                logModel.setOperationPage("C#端-动轨净重数据维护");
                 logModel.setOperationFunction("数据补录");
                 logModel.setOperationId(model.getActualNo());
                 logModel.setOperationPredictionNo("");
@@ -3373,7 +3517,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 logModel.setCreateManName(userName);
                 logModel.setCreateTime(new Date());
                 logModel.setOperationPage("C#端-动轨净重数据维护");
-                logModel.setOperationFunction("动态衡匹配委托");
+                logModel.setOperationFunction("匹配委托");
                 logModel.setOperationId(modelTemp.getActualNo());
                 logModel.setOperationPredictionNo(modelTemp.getPredictionNo());
                 logModel.setOperationCarnNo(modelTemp.getRailwayNo());
@@ -3521,7 +3665,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     logModel.setCreateManName(userName);
                     logModel.setCreateTime(new Date());
                     logModel.setOperationPage("C#端-动轨净重数据维护");
-                    logModel.setOperationFunction("动态衡撤销委托");
+                    logModel.setOperationFunction("撤销委托");
                     logModel.setOperationId(modelTemp.getActualNo());
                     logModel.setOperationPredictionNo(modelTemp.getPredictionNo());
                     logModel.setOperationCarnNo(modelTemp.getRailwayNo());
@@ -3628,7 +3772,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 logModel.setCreateManName(userName);
                 logModel.setCreateTime(new Date());
                 logModel.setOperationPage("C#端-动轨净重数据维护");
-                logModel.setOperationFunction("动态衡毛皮分解");
+                logModel.setOperationFunction("毛皮分解");
                 logModel.setOperationId(modelTemp.getActualNo());
                 logModel.setOperationPredictionNo(modelTemp.getPredictionNo());
                 logModel.setOperationCarnNo(modelTemp.getRailwayNo());
@@ -3864,7 +4008,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 actFirst01.setIsPreSacale("1");
                 actFirst01.setPredictionNo(scale.getPredictionNo());
                 actFirst01.setPredictionType("1");
-                actFirst01.setNote("手动毛皮洁净");
+                actFirst01.setNote("手动毛皮结净");
                 meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(actFirst01);
                 //更新第一次皮重数据库
                 actFirst02.setWeightType("1");
@@ -3875,7 +4019,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 actFirst02.setIsPreSacale("1");
                 actFirst02.setPredictionNo(scale.getPredictionNo());
                 actFirst02.setPredictionType("1");
-                actFirst02.setNote("手动毛皮洁净");
+                actFirst02.setNote("手动毛皮结净");
                 meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(actFirst02);
 
                 MeterWorkRailwayActual mwca = meterWorkRailwayActualMapper.manualAddPre(actFirst01.getActualFirstNo(), actFirst02.getActualFirstNo(), scale.getPredictionNo());
@@ -3892,7 +4036,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 actualRow.setNetTime(new Date());
                 actualRow.setUpdateManNo(userId);
                 actualRow.setUpdateManName(userName);
-                actualRow.setNote("手动毛皮洁净");
+                actualRow.setNote("手动毛皮结净");
                 actualRow.setLcNo(actFirst01.getLcNo());
                 actualRow.setNetMode(DbConstants.TYPE);
                 actualRow.setPredictionType("1");
@@ -3935,14 +4079,14 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 actFirst01.setWeightType("0");
                 actFirst01.setUpdateManNo(userId);
                 actFirst01.setUpdateManName(userName);
-                actFirst01.setNote("手动毛皮洁净");
+                actFirst01.setNote("手动毛皮结净");
                 actFirst01.setIsPreSacale("0");
                 actFirst01.setValueFlag(DbConstants.NET);
                 meterWorkRailwayActFirstMapper.updateByPrimaryKey(actFirst01);
                 actFirst02.setWeightType("1");
                 actFirst02.setUpdateManNo(userId);
                 actFirst02.setUpdateManName(userName);
-                actFirst02.setNote("手动毛皮洁净");
+                actFirst02.setNote("手动毛皮结净");
                 actFirst02.setIsPreSacale("0");
                 actFirst02.setValueFlag(DbConstants.NET);
                 meterWorkRailwayActFirstMapper.updateByPrimaryKey(actFirst02);
@@ -3964,7 +4108,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 actualRow.setIsPreSacale("0");
                 actualRow.setUpdateManNo(userId);
                 actualRow.setUpdateManName(userName);
-                actualRow.setNote("手动毛皮洁净");
+                actualRow.setNote("手动毛皮结净");
                 actualRow.setLcNo(actFirst01.getLcNo());
                 actualRow.setCreateManName(userName);
                 actualRow.setCreateTime(new Date());

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/controller/MeterWorkScheduledHelpController.java

@@ -203,4 +203,16 @@ public class MeterWorkScheduledHelpController extends BaseRESTfulController {
         }
         return rm;
     }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkscheduledhelp:view")
+    @GetMapping(value = "/allStateView/")
+    public RESTfulResult allStateView(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkScheduledHelp> list = meterWorkScheduledHelpService.allStateView(parmas, pageNum, pageSize);
+        return success(list);
+    }
 }

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

@@ -18,4 +18,5 @@ public interface MeterWorkScheduledHelpMapper extends IBaseMapper<MeterWorkSched
 
     //根据时间查询所有秤点的报警总数、报警未处理、报警已处理
     List<MeterWorkScheduledHelp> countAllState(Map<String, Object> params);
+    List<MeterWorkScheduledHelp> allStateView(Map<String, Object> params);
 }

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

@@ -522,7 +522,28 @@
   <select id="countAllState" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     where 1 = 1
-    and warm_type in ('1', '2', '3')
+    and warm_type in ('1', '2', '3', '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>
+    <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>
+  </select>
+
+  <select id="allStateView" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    and warm_type in ('1', '2', '3', '8')
+    <if test="valueFlag != null and valueFlag != ''">
+      and  value_flag like '%${valueFlag}%'
+    </if>
+    <if test="helpContent != null and helpContent != ''">
+      and  help_content like '%${helpContent}%'
+    </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>

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/service/IMeterWorkScheduledHelpService.java

@@ -26,4 +26,5 @@ public interface IMeterWorkScheduledHelpService extends IBaseService<MeterWorkSc
     RESTfulResult checkAdd(MeterWorkScheduledHelp model);
     PageList<MeterWorkScheduledHelp> likeByDesc(Map<String, Object> var1, Integer var2, Integer var3);
     PageList<MeterWorkScheduledHelp> HelpMsgByDesc(Map<String, Object> var1, Integer var2, Integer var3);
+    PageList<MeterWorkScheduledHelp> allStateView(Map<String, Object> params, Integer pageNum, Integer pageSize);
 }

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/service/impl/MeterWorkScheduledHelpServiceImpl.java

@@ -168,4 +168,12 @@ public class MeterWorkScheduledHelpServiceImpl extends BaseServiceImpl<MeterWork
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
+
+    @Override
+    public PageList<MeterWorkScheduledHelp> allStateView(Map<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkScheduledHelp> rows = meterWorkScheduledHelpMapper.allStateView(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
 }