修改

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

@@ -1,5 +1,6 @@
 package com.steerinfo.baseinfo.meterbaseoperationlog.mapper;
 
+import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLogVo;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
 import com.steerinfo.meterwork.meterworkbeltscaleactual.model.MeterWorkBeltScaleActual;
@@ -14,7 +15,7 @@ import java.util.Map;
 public interface MeterBaseOperationLogMapper extends IBaseMapper<MeterBaseOperationLog, String> {
 
     List<MeterBaseOperationLog> doQueryAndMultiple(HashMap<String, Object> obj);
-    List<MeterBaseOperationLog> likeByDesc(HashMap<String, Object> obj);
+    List<MeterBaseOperationLogVo> likeByDesc(HashMap<String, Object> obj);
 
     //根据时间查询所有秤点的结净匹配委托、撤销委托、结净已上传、结净未上传
     List<HashMap> countAllFirstState(Map<String, Object> params);
@@ -27,4 +28,4 @@ public interface MeterBaseOperationLogMapper extends IBaseMapper<MeterBaseOperat
     List<HashMap> countWebResetCar(Map<String, Object> params);
     List<String> operationPageInfo(Map<String, Object> params);
     List<String> operationFunctionInfo(Map<String, Object> params);
-}
+}

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

@@ -23,8 +23,8 @@
     <result column="LOG_TYPE_CODE" jdbcType="VARCHAR" property="logTypeCode" />
   </resultMap>
   <sql id="columns">
-    ID, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME, 
-    UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, OPERATION_PAGE, OPERATION_FUNCTION, 
+    ID, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME,
+    UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, OPERATION_PAGE, OPERATION_FUNCTION,
     OPERATION_ID, OPERATION_PREDICTION_NO, OPERATION_CARN_NO, OPERATION_BEFORE_FIX, OPERATION_AFTER_FIX,
     LOG_TYPE, LOG_TYPE_CODE
   </sql>
@@ -552,14 +552,14 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case ID" close="end">
           when #{item.id,jdbcType=VARCHAR} then #{item.operationAfterFix,jdbcType=VARCHAR}
        </foreach>
-     where ID in 
+     where ID in
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.id,jdbcType=VARCHAR}
-     </foreach> 
+     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_BASE_OPERATION_LOG
-    where ID in 
+    where ID in
     <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>
@@ -803,8 +803,285 @@
     </if>
   </select>
 
-  <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
+
+
+  <resultMap id="likeByDescMap" type="com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLogVo">
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="BASE_SPOT_NAME" jdbcType="VARCHAR" property="baseSpotName" />
+    <result column="CREATE_MAN_NO" jdbcType="VARCHAR" property="createManNo" />
+    <result column="CREATE_MAN_NAME" jdbcType="VARCHAR" property="createManName" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_MAN_NO" jdbcType="VARCHAR" property="updateManNo" />
+    <result column="UPDATE_MAN_NAME" jdbcType="VARCHAR" property="updateManName" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="DELETE_MAN_NO" jdbcType="VARCHAR" property="deleteManNo" />
+    <result column="DELETE_MAN_NAME" jdbcType="VARCHAR" property="deleteManName" />
+    <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
+    <result column="OPERATION_PAGE" jdbcType="VARCHAR" property="operationPage" />
+    <result column="OPERATION_FUNCTION" jdbcType="VARCHAR" property="operationFunction" />
+    <result column="OPERATION_ID" jdbcType="VARCHAR" property="operationId" />
+    <result column="OPERATION_PREDICTION_NO" jdbcType="VARCHAR" property="operationPredictionNo" />
+    <result column="OPERATION_CARN_NO" jdbcType="VARCHAR" property="operationCarnNo" />
+    <result column="OPERATION_BEFORE_FIX" jdbcType="VARCHAR" property="operationBeforeFix" />
+    <result column="OPERATION_AFTER_FIX" jdbcType="VARCHAR" property="operationAfterFix" />
+    <result column="LOG_TYPE" jdbcType="VARCHAR" property="logType" />
+    <result column="LOG_TYPE_CODE" jdbcType="VARCHAR" property="logTypeCode" />
+  </resultMap>
+  <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="likeByDescMap">
+    select
+    ID, BASE_SPOT_NAME,CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, UPDATE_MAN_NO, UPDATE_MAN_NAME,
+    UPDATE_TIME, DELETE_MAN_NO, DELETE_MAN_NAME, DELETE_TIME, OPERATION_PAGE, OPERATION_FUNCTION,
+    OPERATION_ID, OPERATION_PREDICTION_NO, OPERATION_CARN_NO, OPERATION_BEFORE_FIX, OPERATION_AFTER_FIX,
+    LOG_TYPE, LOG_TYPE_CODE
+    from
+    (
+    (
+      select
+      A.ID,
+      A.CREATE_MAN_NO,
+      A.CREATE_MAN_NAME,
+      A.CREATE_TIME,
+      A.UPDATE_MAN_NO,
+      A.UPDATE_MAN_NAME,
+      A.UPDATE_TIME,
+      A.DELETE_MAN_NO,
+      A.DELETE_MAN_NAME,
+      A.DELETE_TIME,
+      A.OPERATION_PAGE,
+      A.OPERATION_FUNCTION,
+      A.OPERATION_ID,
+      A.OPERATION_PREDICTION_NO,
+      A.OPERATION_CARN_NO,
+      A.OPERATION_BEFORE_FIX,
+      A.OPERATION_AFTER_FIX,
+      A.LOG_TYPE,
+      A.LOG_TYPE_CODE,
+      B.BASE_SPOT_NAME BASE_SPOT_NAME,
+      case when B.value_flag != '0' then '继续'
+      else '停止' end valueFlag,
+      case when B.meter_mode = '1' then '远程计量'
+      when B.meter_mode = '2' then '智能计量'
+      when B.meter_mode = '3' then '手工计量'
+      else null end meterMode,
+      B.note note
+      from meter_base_operation_log A
+      left join meter_work_car_actual_first B
+      on A.operation_id = B.actual_first_no
+      where 1 = 1
+      and A.operation_page like '%汽车衡一次数据维护%'
+    )
+    union
+    (
+      select
+      A.ID,
+      A.CREATE_MAN_NO,
+      A.CREATE_MAN_NAME,
+      A.CREATE_TIME,
+      A.UPDATE_MAN_NO,
+      A.UPDATE_MAN_NAME,
+      A.UPDATE_TIME,
+      A.DELETE_MAN_NO,
+      A.DELETE_MAN_NAME,
+      A.DELETE_TIME,
+      A.OPERATION_PAGE,
+      A.OPERATION_FUNCTION,
+      A.OPERATION_ID,
+      A.OPERATION_PREDICTION_NO,
+      A.OPERATION_CARN_NO,
+      A.OPERATION_BEFORE_FIX,
+      A.OPERATION_AFTER_FIX,
+      A.LOG_TYPE,
+      A.LOG_TYPE_CODE,
+      B.NET_SPOT3_NAME BASE_SPOT_NAME,
+      case when B.value_flag != '0' then '继续'
+      else '取消' end valueFlag,
+      case when B.net_mode = '1' then '远程计量'
+      when B.net_mode = '2' then '智能计量'
+      when B.net_mode = '3' then '手工计量'
+      else null end meterMode,
+      B.note note
+      from meter_base_operation_log A
+      left join meter_work_car_actual B
+      on A.operation_id = B.actual_no
+      where A.operation_page like '%汽车衡净重数据维护%'
+    )
+    union
+    (
+      select
+      A.ID,
+      A.CREATE_MAN_NO,
+      A.CREATE_MAN_NAME,
+      A.CREATE_TIME,
+      A.UPDATE_MAN_NO,
+      A.UPDATE_MAN_NAME,
+      A.UPDATE_TIME,
+      A.DELETE_MAN_NO,
+      A.DELETE_MAN_NAME,
+      A.DELETE_TIME,
+      A.OPERATION_PAGE,
+      A.OPERATION_FUNCTION,
+      A.OPERATION_ID,
+      A.OPERATION_PREDICTION_NO,
+      A.OPERATION_CARN_NO,
+      A.OPERATION_BEFORE_FIX,
+      A.OPERATION_AFTER_FIX,
+      A.LOG_TYPE,
+      A.LOG_TYPE_CODE,
+      B.BASE_SPOT_NAME BASE_SPOT_NAME,
+      case when B.value_flag != '0' then '继续'
+      else '停止' end valueFlag,
+      case when B.meter_mode = '1' then '远程计量'
+      when B.meter_mode = '2' then '智能计量'
+      when B.meter_mode = '3' then '手工计量'
+      else null end meterMode,
+      B.note note
+      from meter_base_operation_log A
+      left join meter_work_railway_act_first B
+      on A.operation_id = B.actual_first_no
+      where 1 = 1
+      and A.operation_page like '%轨道衡一次数据维护%'
+    )
+    union
+    (
+      select
+      A.ID,
+      A.CREATE_MAN_NO,
+      A.CREATE_MAN_NAME,
+      A.CREATE_TIME,
+      A.UPDATE_MAN_NO,
+      A.UPDATE_MAN_NAME,
+      A.UPDATE_TIME,
+      A.DELETE_MAN_NO,
+      A.DELETE_MAN_NAME,
+      A.DELETE_TIME,
+      A.OPERATION_PAGE,
+      A.OPERATION_FUNCTION,
+      A.OPERATION_ID,
+      A.OPERATION_PREDICTION_NO,
+      A.OPERATION_CARN_NO,
+      A.OPERATION_BEFORE_FIX,
+      A.OPERATION_AFTER_FIX,
+      A.LOG_TYPE,
+      A.LOG_TYPE_CODE,
+      B.NET_SPOT3_NAME BASE_SPOT_NAME,
+      case when B.value_flag != '0' then '继续'
+      else '取消' end valueFlag,
+      case when B.net_mode = '1' then '远程计量'
+      when B.net_mode = '2' then '智能计量'
+      when B.net_mode = '3' then '手工计量'
+      else null end meterMode,
+      B.note note
+      from meter_base_operation_log A
+      left join meter_work_railway_actual B
+      on A.operation_id = B.actual_no
+      where A.operation_page like '%轨道衡净重数据维护%'
+    )
+    union
+    (
+      select
+      A.ID,
+      A.CREATE_MAN_NO,
+      A.CREATE_MAN_NAME,
+      A.CREATE_TIME,
+      A.UPDATE_MAN_NO,
+      A.UPDATE_MAN_NAME,
+      A.UPDATE_TIME,
+      A.DELETE_MAN_NO,
+      A.DELETE_MAN_NAME,
+      A.DELETE_TIME,
+      A.OPERATION_PAGE,
+      A.OPERATION_FUNCTION,
+      A.OPERATION_ID,
+      A.OPERATION_PREDICTION_NO,
+      A.OPERATION_CARN_NO,
+      A.OPERATION_BEFORE_FIX,
+      A.OPERATION_AFTER_FIX,
+      A.LOG_TYPE,
+      A.LOG_TYPE_CODE,
+      B.NET_SPOT3_NAME BASE_SPOT_NAME,
+      case when B.value_flag != '0' then '继续'
+      else '取消' end valueFlag,
+      case when B.net_mode = '1' then '远程计量'
+      when B.net_mode = '2' then '智能计量'
+      when B.net_mode = '3' then '手工计量'
+      else null end meterMode,
+      B.note note
+      from meter_base_operation_log A
+      left join meter_work_railway_actual B
+      on A.operation_id = B.actual_no
+      where A.operation_page like '%动轨净重数据维护%'
+    )
+    union
+    (
+      select
+      A.ID,
+      A.CREATE_MAN_NO,
+      A.CREATE_MAN_NAME,
+      A.CREATE_TIME,
+      A.UPDATE_MAN_NO,
+      A.UPDATE_MAN_NAME,
+      A.UPDATE_TIME,
+      A.DELETE_MAN_NO,
+      A.DELETE_MAN_NAME,
+      A.DELETE_TIME,
+      A.OPERATION_PAGE,
+      A.OPERATION_FUNCTION,
+      A.OPERATION_ID,
+      A.OPERATION_PREDICTION_NO,
+      A.OPERATION_CARN_NO,
+      A.OPERATION_BEFORE_FIX,
+      A.OPERATION_AFTER_FIX,
+      A.LOG_TYPE,
+      A.LOG_TYPE_CODE,
+      B.BASE_SPOT_NAME BASE_SPOT_NAME,
+      case when B.value_flag != '0' then '继续'
+      else '取消' end valueFlag,
+      case when B.meter_mode = '1' then '远程计量'
+      when B.meter_mode = '2' then '智能计量'
+      when B.meter_mode = '3' then '手工计量'
+      else null end meterMode,
+      B.memo note
+      from meter_base_operation_log A
+      left join Meter_Work_Railway_Received B
+      on A.operation_id = B.actual_first_no
+      where A.operation_page like '%轨道衡从表数据维护%'
+    )
+    union
+    (
+      select
+      A.ID,
+      A.CREATE_MAN_NO,
+      A.CREATE_MAN_NAME,
+      A.CREATE_TIME,
+      A.UPDATE_MAN_NO,
+      A.UPDATE_MAN_NAME,
+      A.UPDATE_TIME,
+      A.DELETE_MAN_NO,
+      A.DELETE_MAN_NAME,
+      A.DELETE_TIME,
+      A.OPERATION_PAGE,
+      A.OPERATION_FUNCTION,
+      A.OPERATION_ID,
+      A.OPERATION_PREDICTION_NO,
+      A.OPERATION_CARN_NO,
+      A.OPERATION_BEFORE_FIX,
+      A.OPERATION_AFTER_FIX,
+      A.LOG_TYPE,
+      A.LOG_TYPE_CODE,
+      B.BASE_SPOT_NAME BASE_SPOT_NAME,
+      case when B.value_flag != '0' then '继续'
+      else '取消' end valueFlag,
+      case when B.meter_mode = '1' then '远程计量'
+      when B.meter_mode = '2' then '智能计量'
+      when B.meter_mode = '3' then '手工计量'
+      else null end meterMode,
+      B.memo note
+      from meter_base_operation_log A
+      left join Meter_Work_Railway_Received B
+      on A.operation_id = B.actual_first_no
+      where A.operation_page like '%动轨数据维护%'
+      )
+    )
     where 1 = 1
     <if test="operationPageStr != null and operationPageStr != ''">
       and operation_page in
@@ -881,4 +1158,4 @@
   <select id="operationFunctionInfo" parameterType="java.util.HashMap" resultType="String">
     select distinct A.operation_function from meter_base_operation_log A
   </select>
-</mapper>
+</mapper>

src/main/java/com/steerinfo/baseinfo/meterbaseoperationlog/model/MeterBaseOperationLogVo.java

@@ -0,0 +1,313 @@
+package com.steerinfo.baseinfo.meterbaseoperationlog.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value="计量系统操作日志Vo对象")
+public class MeterBaseOperationLogVo implements IBasePO<String> {
+    /**
+     * 主键(ID,VARCHAR,100)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private String id;
+
+    @ApiModelProperty(value="计量站点",required=true)
+    private String baseSpotName;
+    /**
+     * 创建人编号(CREATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="创建人编号",required=false)
+    private String createManNo;
+
+    /**
+     * 创建人姓名(CREATE_MAN_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="创建人姓名",required=false)
+    private String createManName;
+
+    /**
+     * 创建时间（YYYY-MM-DD HH:mm:SS）(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="创建时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date createTime;
+
+    /**
+     * 修改人编号(UPDATE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="修改人编号",required=false)
+    private String updateManNo;
+
+    /**
+     * 修改人姓名(UPDATE_MAN_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="修改人姓名",required=false)
+    private String updateManName;
+
+    /**
+     * 修改时间（YYYY-MM-DD HH:mm:SS）(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date updateTime;
+
+    /**
+     * 删除人编号(DELETE_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="删除人编号",required=false)
+    private String deleteManNo;
+
+    /**
+     * 删除人姓名(DELETE_MAN_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="删除人姓名",required=false)
+    private String deleteManName;
+
+    /**
+     * 删除时间（YYYY-MM-DD HH:mm:SS）(DELETE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="删除时间（YYYY-MM-DD HH:mm:SS）",required=false)
+    private Date deleteTime;
+
+    /**
+     * 操作界面-页面名称(OPERATION_PAGE,VARCHAR,200)
+     */
+    @ApiModelProperty(value="操作界面-页面名称",required=false)
+    private String operationPage;
+
+    /**
+     * 操作界面-功能名称(OPERATION_FUNCTION,VARCHAR,50)
+     */
+    @ApiModelProperty(value="操作界面-功能名称",required=false)
+    private String operationFunction;
+
+    /**
+     * 操作界面-数据主键(OPERATION_ID,VARCHAR,200)
+     */
+    @ApiModelProperty(value="操作界面-数据主键",required=false)
+    private String operationId;
+
+    /**
+     * 操作界面-预报编号(OPERATION_PREDICTION_NO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="操作界面-预报编号",required=false)
+    private String operationPredictionNo;
+
+    /**
+     * 操作界面-车号(OPERATION_CARN_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="操作界面-车号",required=false)
+    private String operationCarnNo;
+
+    /**
+     * 操作界面-修改前数据(OPERATION_BEFORE_FIX,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="操作界面-修改前数据",required=false)
+    private String operationBeforeFix;
+
+    /**
+     * 操作界面-修改后数据(OPERATION_AFTER_FIX,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="操作界面-修改后数据",required=false)
+    private String operationAfterFix;
+
+    /**
+     * 日志类型(LOG_TYPE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="日志类型",required=false)
+    private String logType;
+
+    /**
+     * 类型编码(LOG_TYPE_CODE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="类型编码",required=false)
+    private String logTypeCode;
+
+    public String getLogType() {
+        return logType;
+    }
+
+    public void setLogType(String logType) {
+        this.logType = logType;
+    }
+
+    public String getLogTypeCode() {
+        return logTypeCode;
+    }
+
+    public void setLogTypeCode(String logTypeCode) {
+        this.logTypeCode = logTypeCode;
+    }
+
+    private static final long serialVersionUID = 1L;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo == null ? null : createManNo.trim();
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName == null ? null : createManName.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateManNo() {
+        return updateManNo;
+    }
+
+    public void setUpdateManNo(String updateManNo) {
+        this.updateManNo = updateManNo == null ? null : updateManNo.trim();
+    }
+
+    public String getUpdateManName() {
+        return updateManName;
+    }
+
+    public void setUpdateManName(String updateManName) {
+        this.updateManName = updateManName == null ? null : updateManName.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getDeleteManNo() {
+        return deleteManNo;
+    }
+
+    public void setDeleteManNo(String deleteManNo) {
+        this.deleteManNo = deleteManNo == null ? null : deleteManNo.trim();
+    }
+
+    public String getDeleteManName() {
+        return deleteManName;
+    }
+
+    public void setDeleteManName(String deleteManName) {
+        this.deleteManName = deleteManName == null ? null : deleteManName.trim();
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+    public String getOperationPage() {
+        return operationPage;
+    }
+
+    public void setOperationPage(String operationPage) {
+        this.operationPage = operationPage == null ? null : operationPage.trim();
+    }
+
+    public String getOperationFunction() {
+        return operationFunction;
+    }
+
+    public void setOperationFunction(String operationFunction) {
+        this.operationFunction = operationFunction == null ? null : operationFunction.trim();
+    }
+
+    public String getOperationId() {
+        return operationId;
+    }
+
+    public void setOperationId(String operationId) {
+        this.operationId = operationId == null ? null : operationId.trim();
+    }
+
+    public String getOperationPredictionNo() {
+        return operationPredictionNo;
+    }
+
+    public void setOperationPredictionNo(String operationPredictionNo) {
+        this.operationPredictionNo = operationPredictionNo == null ? null : operationPredictionNo.trim();
+    }
+
+    public String getOperationCarnNo() {
+        return operationCarnNo;
+    }
+
+    public void setOperationCarnNo(String operationCarnNo) {
+        this.operationCarnNo = operationCarnNo == null ? null : operationCarnNo.trim();
+    }
+
+    public String getOperationBeforeFix() {
+        return operationBeforeFix;
+    }
+
+    public void setOperationBeforeFix(String operationBeforeFix) {
+        this.operationBeforeFix = operationBeforeFix == null ? null : operationBeforeFix.trim();
+    }
+
+    public String getOperationAfterFix() {
+        return operationAfterFix;
+    }
+
+    public void setOperationAfterFix(String operationAfterFix) {
+        this.operationAfterFix = operationAfterFix == null ? null : operationAfterFix.trim();
+    }
+
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName;
+    }
+
+    @Override
+    public String toString() {
+        return "MeterBaseOperationLog{" +
+                "id='" + id + '\'' +
+                ", createManNo='" + createManNo + '\'' +
+                ", baseSpotName='" + baseSpotName + '\'' +
+                ", createManName='" + createManName + '\'' +
+                ", createTime=" + createTime +
+                ", updateManNo='" + updateManNo + '\'' +
+                ", updateManName='" + updateManName + '\'' +
+                ", updateTime=" + updateTime +
+                ", deleteManNo='" + deleteManNo + '\'' +
+                ", deleteManName='" + deleteManName + '\'' +
+                ", deleteTime=" + deleteTime +
+                ", operationPage='" + operationPage + '\'' +
+                ", operationFunction='" + operationFunction + '\'' +
+                ", operationId='" + operationId + '\'' +
+                ", operationPredictionNo='" + operationPredictionNo + '\'' +
+                ", operationCarnNo='" + operationCarnNo + '\'' +
+                ", operationBeforeFix='" + operationBeforeFix + '\'' +
+                ", operationAfterFix='" + operationAfterFix + '\'' +
+                ", logType='" + logType + '\'' +
+                ", logTypeCode='" + logTypeCode + '\'' +
+                '}';
+    }
+}

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

@@ -3,6 +3,7 @@ package com.steerinfo.baseinfo.meterbaseoperationlog.service.impl;
 import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
 import com.steerinfo.baseinfo.meterbaseoperationlog.mapper.MeterBaseOperationLogMapper;
 import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
+import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLogVo;
 import com.steerinfo.baseinfo.meterbaseoperationlog.service.IMeterBaseOperationLogService;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
@@ -84,9 +85,9 @@ public class MeterBaseOperationLogServiceImpl extends BaseServiceImpl<MeterBaseO
             String[] pageStr = params.get("operationFunctionStr").toString().split(",");
             params.put("functionStr", pageStr);
         }
-        List<MeterBaseOperationLog> rows = meterBaseOperationLogMapper.likeByDesc(params);
+        List<MeterBaseOperationLogVo> rows = meterBaseOperationLogMapper.likeByDesc(params);
         if(rows.size() >= 1) {
-            for(MeterBaseOperationLog model: rows) {
+            for(MeterBaseOperationLogVo model: rows) {
                 if (StringUtils.isNotEmpty(model.getOperationBeforeFix())) {
                     String str = model.getOperationBeforeFix();
                     if(str.indexOf("MeterWorkCarActualFirst") >= 0){

src/main/java/com/steerinfo/baseinfo/meterbaseuserspotconfig/controller/MeterBaseUserSpotConfigController.java

@@ -62,7 +62,7 @@ public class MeterBaseUserSpotConfigController extends BaseRESTfulController {
         PageList<MeterBaseUserSpotConfig> list = meterBaseUserSpotConfigService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
-    
+
     @ApiOperation(value="创建", notes="根据MeterBaseUserSpotConfig对象创建")
     @ApiImplicitParam(name = "meterBaseUserSpotConfig", value = "详细实体meterBaseUserSpotConfig", required = true, dataType = "MeterBaseUserSpotConfig")
     //@RequiresPermissions("meterbaseuserspotconfig:create")
@@ -125,4 +125,19 @@ public class MeterBaseUserSpotConfigController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @PostMapping(value = "/delete")//String
+    public RESTfulResult delete2(@RequestBody List<String> ids){
+        try {
+            if(ids==null||ids.size()==0){
+                return failed("请选择数据！");
+            }
+            meterBaseUserSpotConfigService.deleteUserSpot(ids);
+            //int i=1/0;
+            return success(true);
+        }catch (Exception e){
+            e.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbaseuserspotconfig/service/IMeterBaseUserSpotConfigService.java

@@ -23,4 +23,6 @@ import java.util.List;
 public interface IMeterBaseUserSpotConfigService extends IBaseService<MeterBaseUserSpotConfig, String>{
     RESTfulResult addModel(List<MeterBaseUserSpotConfig> models);
     List<MeterBaseUserSpotConfig> noPage(HashMap<String, Object> map);
-}
+
+    void deleteUserSpot(List<String> ids);
+}

src/main/java/com/steerinfo/baseinfo/meterbaseuserspotconfig/service/impl/MeterBaseUserSpotConfigServiceImpl.java

@@ -102,4 +102,16 @@ public class MeterBaseUserSpotConfigServiceImpl extends BaseServiceImpl<MeterBas
     public List<MeterBaseUserSpotConfig> noPage(HashMap<String, Object> map) {
         return meterBaseUserSpotConfigMapper.noPage(map);
     }
+
+    @Override
+    @Transactional
+    public void deleteUserSpot(List<String> ids) {
+        try {
+            for (String id : ids) {
+                meterBaseUserSpotConfigMapper.deleteByPrimaryKey(id);
+            }
+        }catch (Exception e){
+            throw e;
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/service/impl/MeterWorkCarnoIdentifyServiceImpl.java

@@ -77,12 +77,16 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
             for(MeterBaseSpotInfo spot: spotModels) {
                 //一次计量车数
                 long countCarFirst = 0L;
+                //车号识别率=(一次计量车数-（大厅修正车号数+Web修正车号数）)/一次计量车数
+                double countCarIdentifyRate = 0;
                 //枪机车号使用数
                 long countGunUsedIdentify = 0L;
                 //球机车号使用数
                 long countBallUsedIdentify = 0L;
                 //扫码车号使用数
                 long countScanCarIdentify = 0L;
+                //扫码车号计量比例=扫码车号使用数/一次计量车数
+                double countScanCarIdentifyRate = 0;
                 //球机车号识别数
                 long countBallIdentify = 0L;
                 //球机车号未识别数
@@ -152,6 +156,10 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
                             && StringUtils.isNotEmpty(model.getScanCarNo())
                             && model.getScanCarNo().equals(model.getCarNo())).count();
+                    //扫码车号计量比例=扫码车号使用数/一次计量车数
+                    if(countCarFirst != 0) {
+                        countScanCarIdentifyRate = Math.round((countScanCarIdentify/(countCarFirst*1.0))*100*100)/100.0;
+                    }
                     //球机车号识别数
                     countBallIdentify = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
@@ -209,14 +217,19 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                             && StringUtils.isNotEmpty(model.getVideoCarNo2())
                             && !model.getVideoCarNo1().equals(model.getVideoCarNo2())).count();
 
-                    //修正车号数
+                    //大厅修正车号数
                     countResetCar = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
                             && model.getCarNoType().equals("4")).count();
+                    //Web修正车号数
                     if(logModels.size() >= 1) {
                         countWebResetCar = logModels.stream().filter(model -> spot.getBaseSpotNo().equals(model.get("BASESPOTNO"))
                             && spot.getBaseSpotName().equals(model.get("BASESPOTNAME"))).count();
                     }
+                    //车号识别率=(一次计量车数-（大厅修正车号数+Web修正车号数）)/一次计量车数
+                    if(countCarFirst != 0) {
+                        countCarIdentifyRate = Math.round(((countCarFirst-(countResetCar+countWebResetCar))/(countCarFirst*1.0))*100*100)/100.0;
+                    }
                     //枪机修改车号数
                     countGunResetCar = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
@@ -257,6 +270,7 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                     obj.put("countGunUsedIdentify", countGunUsedIdentify);
                     obj.put("countBallUsedIdentify", countBallUsedIdentify);
                     obj.put("countScanCarIdentify", countScanCarIdentify);
+                    obj.put("countScanCarIdentifyRate", countScanCarIdentifyRate);
                     obj.put("countBallIdentify", countBallIdentify);
                     obj.put("countGunIdentify", countGunIdentify);
                     obj.put("countVisualIdentify", countVisualIdentify);
@@ -265,6 +279,7 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                     obj.put("countRfidIdentify", countRfidIdentify);
                     obj.put("countResetCar", countResetCar);
                     obj.put("countWebResetCar", countWebResetCar);
+                    obj.put("countCarIdentifyRate", countCarIdentifyRate);
                     obj.put("countGunResetCar", countGunResetCar);
                     obj.put("countBallResetCar", countBallResetCar);
                     obj.put("countGunIndentifyRate", countGunIndentifyRate);

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

@@ -353,6 +353,21 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "获取操作页面", notes = "根据计量时间、车号查询")
+    @PostMapping(value = "/measurementAccuracyOperationPage")
+    public RESTfulResult measurementAccuracyOperationPage(@RequestBody(required = false) HashMap params) {
+        try {
+            List<String> list1 = meterWorkDataCountService.measurementAccuracyOperationPage(params);
+            List<String> list2 = meterWorkDataCountService.measurementAccuracyCreateManName(params);
+            List<List<String>> list =new ArrayList<>();
+            list.add(list1);
+            list.add(list2);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
     @ApiOperation(value = "计量准确性分析", notes = "根据计量时间、车号查询")
     @PostMapping(value = "/measurementAccuracyAnalysis")
     public RESTfulResult measurementAccuracyAnalysis(@RequestBody(required = false) HashMap params) {

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

@@ -33,4 +33,9 @@ public interface MeterWorkDataCountMapper {
     List<NetWeightAndTheoryAmount> railwayNetWeightAndTheoryAmount(Map<String, Object> params);
     List<LongCarMeterWeightComparison> longCarMeterWeightComparison(Map<String, Object> params);
     List<ScaleOrCarComparison> scaleOrCarComparison(Map<String, Object> params);
+
+    List<String> measurementAccuracyOperationPage(HashMap params);
+
+    List<String> measurementAccuracyCreateManName(HashMap params);
+
 }

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

@@ -504,7 +504,9 @@
 
     <select id="measurementAccuracyAnalysis" parameterType="java.util.HashMap"
             resultType="com.steerinfo.meterwork.meterworkdatacount.model.MeasurementAccuracyAnalysis">
-    select carNo,
+    select
+        base_spot_name,
+        carNo,
         actualFirstNo,
         predictionNo,
         operationFunction,
@@ -519,7 +521,9 @@
         note
     from (
         (
-            select A.operation_carn_no carNo,
+            select
+            B.base_spot_name base_spot_name,
+            A.operation_carn_no carNo,
             A.operation_id actualFirstNo,
             A.operation_prediction_no predictionNo,
             A.operation_function operationFunction,
@@ -544,7 +548,9 @@
         )
         union
         (
-            select A.operation_carn_no carNo,
+            select
+            B.net_spot3_name base_spot_name,
+            A.operation_carn_no carNo,
             A.operation_id actualFirstNo,
             A.operation_prediction_no predictionNo,
             A.operation_function operationFunction,
@@ -568,7 +574,9 @@
         )
         union
         (
-        select A.operation_carn_no carNo,
+        select
+        B.base_spot_name base_spot_name,
+        A.operation_carn_no carNo,
         A.operation_id actualFirstNo,
         A.operation_prediction_no predictionNo,
         A.operation_function operationFunction,
@@ -593,7 +601,9 @@
         )
         union
         (
-        select A.operation_carn_no carNo,
+        select
+        B.net_spot3_name base_spot_name,
+        A.operation_carn_no carNo,
         A.operation_id actualFirstNo,
         A.operation_prediction_no predictionNo,
         A.operation_function operationFunction,
@@ -617,7 +627,9 @@
         )
         union
         (
-            select A.operation_carn_no carNo,
+            select
+            B.net_spot3_name base_spot_name,
+            A.operation_carn_no carNo,
             A.operation_id actualFirstNo,
             A.operation_prediction_no predictionNo,
             A.operation_function operationFunction,
@@ -641,7 +653,9 @@
         )
         union
         (
-            select A.operation_carn_no carNo,
+            select
+            B.base_spot_name base_spot_name,
+            A.operation_carn_no carNo,
             A.operation_id actualFirstNo,
             A.operation_prediction_no predictionNo,
             A.operation_function operationFunction,
@@ -665,7 +679,9 @@
         )
         union
         (
-            select A.operation_carn_no carNo,
+            select
+            B.base_spot_name base_spot_name,
+            A.operation_carn_no carNo,
             A.operation_id actualFirstNo,
             A.operation_prediction_no predictionNo,
             A.operation_function operationFunction,
@@ -702,6 +718,18 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="operationPage != null and operationPage != ''">
+                and operationPage in
+                <foreach collection="operationPageList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="createManName != null and createManName != ''">
+                and createManName in
+                <foreach collection="createManNameList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         order by createTime desc
     </select>
 
@@ -1362,4 +1390,23 @@
     )
     order by netTime desc
     </select>
-</mapper>
+    <select id="measurementAccuracyOperationPage" resultType="java.lang.String">
+        select distinct A.operation_page operationPage
+        from meter_base_operation_log A
+        where 1 = 1
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  A.create_Time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+            and A.create_Time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+    <select id="measurementAccuracyCreateManName" resultType="java.lang.String">
+        select distinct A.create_man_name createManName
+        from meter_base_operation_log A
+        where 1 = 1
+        and A.create_man_name is not null
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  A.create_Time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+            and A.create_Time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </select>
+</mapper>

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

@@ -3,6 +3,7 @@ package com.steerinfo.meterwork.meterworkdatacount.model;
 import java.util.Date;
 
 public class MeasurementAccuracyAnalysis {
+    private String base_spot_name;
     private String carNo;
     private String actualFirstNo;
     private String predictionNo;
@@ -18,6 +19,14 @@ public class MeasurementAccuracyAnalysis {
     private String afterFix;
     private String note;
 
+    public String getBase_spot_name() {
+        return base_spot_name;
+    }
+
+    public void setBase_spot_name(String base_spot_name) {
+        this.base_spot_name = base_spot_name;
+    }
+
     public String getCarNo() {
         return carNo;
     }

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

@@ -32,4 +32,9 @@ public interface IMeterWorkDataCountService{
     PageList<NetWeightAndTheoryAmount> railwayNetWeightAndTheoryAmount(HashMap<String, Object> params);
     PageList<LongCarMeterWeightComparison> longCarMeterWeightComparison(HashMap<String, Object> params);
     PageList<ScaleOrCarComparison> scaleOrCarComparison(HashMap<String, Object> params);
+
+    List<String> measurementAccuracyOperationPage(HashMap params);
+
+    List<String> measurementAccuracyCreateManName(HashMap params);
+
 }

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

@@ -722,6 +722,16 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
             String[] operationFunctionList =  params.get("operationFunction").toString().split(",");
             params.put("operationFunctionList", operationFunctionList);
         }
+
+        if(params.get("operationPage") != null) {
+            String[] operationFunctionList =  params.get("operationPage").toString().split(",");
+            params.put("operationPageList", operationFunctionList);
+        }
+
+        if(params.get("createManName") != null) {
+            String[] operationFunctionList =  params.get("createManName").toString().split(",");
+            params.put("createManNameList", operationFunctionList);
+        }
         List<MeasurementAccuracyAnalysis> models = meterWorkDataCountMapper.measurementAccuracyAnalysis(params);
         if (models.size() >= 1) {
             for (MeasurementAccuracyAnalysis model : models) {
@@ -1280,4 +1290,15 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
+
+    @Override
+    public List<String> measurementAccuracyOperationPage(HashMap params) {
+        return meterWorkDataCountMapper.measurementAccuracyOperationPage(params);
+    }
+
+    @Override
+    public List<String> measurementAccuracyCreateManName(HashMap params) {
+        return meterWorkDataCountMapper.measurementAccuracyCreateManName(params);
+    }
+
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/controller/MeterWorkRailwayActualController.java

@@ -209,6 +209,18 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "自动获取轨道衡打印信息", notes = "根据车号、收发货单位获取打印信息")
+    @GetMapping(value = "/autoPrintRailway2/")
+    public RESTfulResult autoPrintRailway2(@RequestParam HashMap params) {
+        try {
+            RESTfulResult rm  = meterWorkRailwayActualService.autoPrintRailway2(params);
+            return rm;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "创建", notes = "根据MeterWorkRailwayActual对象创建")
     @ApiImplicitParam(name = "meterWorkRailwayActual", value = "详细实体meterWorkRailwayActual", required = true, dataType = "MeterWorkRailwayActual")
     //@RequiresPermissions("meterworkrailwayactual:create")

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

@@ -64,4 +64,6 @@ public interface MeterWorkRailwayActualMapper extends IBaseMapper<MeterWorkRailw
     List<HashMap> dynamicAndStaticCompare(HashMap<String, Object> params);
 
     List<HashMap> countDayAllState(Map<String, Object> params);
+
+    List<MeterWorkRailwayActual> autoPrintRailway2(HashMap<String, Object> params);
 }

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

@@ -4695,6 +4695,151 @@
     )
     order by net_time desc
   </select>
+  <select id="autoPrintRailway2" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    select * from (
+      select t1.actual_no,
+        t1.railway_no,
+        t1.matter_no,
+        t1.matter_name,
+        decode(t1.meter_type_name,'SendToOutTms','外发','PO2GM','外进','GM2GM','厂内转储',t1.meter_type_name) meter_type_name,
+        t1.forwarding_unit_name,
+        t1.receiving_uint_name,
+        nvl(t1.gross_weight,0)/1000 gross_weight,
+        nvl(t1.tare_weight,0)/1000 tare_weight,
+        nvl(t1.net_weight,0)/1000 net_weight,
+        t1.gross_time,
+        t1.tare_time,
+        t1.net_time,
+        t1.net_spot3_name,
+        t1.sender_remark,
+        t1.create_man_name,
+        t1.create_time,
+        nvl(t2.print_num,0) PACKAGE_AMOUNT
+      from (
+        (
+          select actual_no,
+            railway_no,
+            matter_no,
+            matter_name,
+            meter_type_name,
+            forwarding_unit_name,
+            receiving_uint_name,
+            gross_weight,
+            tare_weight,
+            net_weight,
+            gross_time,
+            tare_time,
+            net_time create_time,
+            net_spot3_name,
+            sender_remark,
+            create_man_name,
+            create_time net_time
+          from meter_work_railway_actual
+          where 1 = 1
+          <if test="railwayNo != null and railwayNo != ''">
+            and railway_no like '%${railwayNo}%'
+          </if>
+          and MATTER_NAME in (select base_name from com_base_info where p_base_code = '001044' and valid_flag = '1')
+          and forwarding_unit_no in (select memo from com_base_info where p_base_code = '001038' and valid_flag = '1')
+          <if test="matterNo != null and matterNo != ''">
+            and MATTER_NO LIKE '%${matterNo}%'
+          </if>
+          <if test="matterName != null and matterName != ''">
+            and MATTER_NAME LIKE '%${matterName}%'
+          </if>
+          <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+          </if>
+          <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+          </if>
+          <if test="receivingUintNo != null and receivingUintNo != ''">
+            and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+          </if>
+          <if test="receivingUintName != null and receivingUintName != ''">
+            and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+          </if>
+          <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and net_time between TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+          </if>
+          <if test="netSpot3No != null and netSpot3No != ''">
+            and NET_SPOT3_NO LIKE '%${netSpot3No}%'
+          </if>
+          <if test="netSpot3Name != null and netSpot3Name != ''">
+            and NET_SPOT3_NAME LIKE '%${netSpot3Name}%'
+          </if>
+          <if test="flag != null and flag != ''">
+            and NET_SPOT3_NAME is null
+          </if>
+          and value_flag != '0'
+        )
+        union
+        (
+          select actual_no,
+            railway_no,
+            matter_no,
+            matter_name,
+            meter_type_name,
+            forwarding_unit_name,
+            receiving_uint_name,
+            gross_weight,
+            tare_weight,
+            net_weight,
+            gross_time,
+            tare_time,
+            net_time create_time,
+            net_spot3_name,
+            sender_remark,
+            create_man_name,
+            create_time net_time
+          from meter_work_measuring_instrument
+            where 1 = 1
+              and value_flag != '0'
+              <if test="railwayNo != null and railwayNo != ''">
+                and railway_no like '%${railwayNo}%'
+              </if>
+              <if test="matterNo != null and matterNo != ''">
+                and MATTER_NO LIKE '%${matterNo}%'
+              </if>
+              <if test="matterName != null and matterName != ''">
+                and MATTER_NAME LIKE '%${matterName}%'
+              </if>
+              <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+                and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+              </if>
+              <if test="forwardingUnitName != null and forwardingUnitName != ''">
+                and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+              </if>
+              <if test="receivingUintNo != null and receivingUintNo != ''">
+                and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+              </if>
+              <if test="receivingUintName != null and receivingUintName != ''">
+                and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+              </if>
+              <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and net_time between TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+              </if>
+              <if test="netSpot3No != null and netSpot3No != ''">
+                and NET_SPOT3_NO LIKE '%${netSpot3No}%'
+              </if>
+              <if test="netSpot3Name != null and netSpot3Name != ''">
+                and NET_SPOT3_NAME LIKE '%${netSpot3Name}%'
+              </if>
+              <if test="flag != null and flag != ''">
+                and NET_SPOT3_NAME is null
+              </if>
+          )
+      )t1,meter_base_print t2
+      where t1.actual_no=t2.actual_no(+)
+    )
+    <if test="printNum != null and printNum == '0'.toString()">
+      where PACKAGE_AMOUNT='0'
+    </if>
+    <if test="printNum != null and printNum != '' and printNum != '0'.toString()">
+      where PACKAGE_AMOUNT!='0'
+    </if>
+    order by net_time desc
+  </select>
 
   <select id="batchMatchActualView" parameterType="java.util.HashMap" resultType="HashMap">
     select A.lc_no,

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/IMeterWorkRailwayActualService.java

@@ -135,4 +135,6 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
 
     PageList<HashMap> dynamicAndStaticCompare(HashMap<String, Object> parameters, Integer pageNum, Integer pageSize);
     RESTfulResult auditRailwayActual(List<MeterWorkRailwayActual> models, String memo);
+
+    RESTfulResult autoPrintRailway2(HashMap<String, Object> map);
 }

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

@@ -3409,7 +3409,49 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                         for (MeterBaseVehicleRangePrintConfig configModel: printConfigs){
                             //判断净重信息物料、车型相同、并且净重在净重上限、下限之间就是有效数据；否者不显示
                             if(configModel.getRailwayNo().equals(model.getRailwayNo())
-                                && configModel.getCarrigeNo().equals(model.getConveyanceType())) {
+                                    && configModel.getCarrigeNo().equals(model.getConveyanceType())) {
+                                if((model.getNetWeight().compareTo(new BigDecimal(configModel.getNetWeightUpper())) != 1)
+                                        && (model.getNetWeight().compareTo(new BigDecimal(configModel.getNetWeightLower()))) != -1) {
+                                    railwayModels.add(model);
+                                }
+                            }else{
+                                railwayModels.add(model);
+                            }
+                        }
+                    }
+                }
+            }
+
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setData(actualModels);
+            rm.setMessage("操作成功,总共"+ actualModels.size() +"条数据!!");
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常！！>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+    @Override
+    public RESTfulResult autoPrintRailway2(HashMap<String, Object> params) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            List<MeterWorkRailwayActual> actualModels = meterWorkRailwayActualMapper.autoPrintRailway2(params);
+            //获取轨道衡有效打印限制配置（车号、车型、自重、净重上限、净重下限）
+            HashMap<String, Object> printMap = new HashMap<>();
+            printMap.put("valueFlag", "1");
+            List<MeterBaseVehicleRangePrintConfig> printConfigs = meterBaseVehicleRangePrintConfigMapper.likeByDesc(printMap);
+            List<MeterWorkRailwayActual> railwayModels = new ArrayList<>();
+            if(actualModels.size() >= 1) {
+                for (MeterWorkRailwayActual model: actualModels) {
+                    if(printConfigs.size() >= 1) {
+                        //循环所有净重信息
+                        for (MeterBaseVehicleRangePrintConfig configModel: printConfigs){
+                            //判断净重信息物料、车型相同、并且净重在净重上限、下限之间就是有效数据；否者不显示
+                            if(configModel.getRailwayNo().equals(model.getRailwayNo())
+                                    && configModel.getCarrigeNo().equals(model.getConveyanceType())) {
                                 if((model.getNetWeight().compareTo(new BigDecimal(configModel.getNetWeightUpper())) != 1)
                                         && (model.getNetWeight().compareTo(new BigDecimal(configModel.getNetWeightLower()))) != -1) {
                                     railwayModels.add(model);

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/service/impl/MeterWorkRailwayReceivedServiceImpl.java

@@ -573,6 +573,25 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try{
+            if(StringUtils.isEmpty(model.getPredictionNo())) {
+                rm.setMessage("请选择一条委托！！");
+                return rm;
+            }
+            //修改前数据
+            MeterWorkRailwayReceived modelTemp = meterWorkRailwayReceivedMapper.selectByPrimaryKey(model.getActualFirstNo());
+
+            MeterBaseOperationLog note = new MeterBaseOperationLog();
+            note.setId(PublicMethod.IdCreate(3));
+            note.setCreateManNo(model.getUpdateManNo());
+            note.setCreateManName(model.getUpdateManName());
+            note.setCreateTime(new Date());
+            note.setOperationPage("终端-轨道衡从表数据维护");
+            note.setOperationFunction("匹配委托");
+            note.setOperationId(model.getActualFirstNo());
+            note.setOperationPredictionNo(model.getPredictionNo());
+            note.setOperationCarnNo(model.getRailwayNo());
+            note.setOperationBeforeFix(modelTemp.toString());
+
             PreRailwayScale preRailwayScale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
             preRailwayScale.setValueFlag("4");
             preRailwayScale.setUploadFlag("1");
@@ -582,10 +601,14 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
                 MeterWorkRailwayReceived firstRec1 = meterWorkRailwayReceivedMapper.selectAndMatch(model.getActualFirstNo(), preRailwayScale.getPredictionNo());
                 BeanUtils.copyProperties(firstRec1,model);
                 model.setPredictionType("1");
-                meterWorkRailwayReceivedMapper.updateByPrimaryKey(model);
+                meterWorkRailwayReceivedMapper.updateByPrimaryKeySelective(model);
             }
             model.setRailwayNo(preRailwayScale.getRailwayNo());
             meterWorkRailwayReceivedMapper.updateByPrimaryKeySelective(model);
+
+            note.setOperationAfterFix(model.toString());
+            meterBaseOperationLogMapper.insertSelective(note);
+
             rm.setSucceed();
             rm.setMessage("操作成功");
             rm.setCode("200");
@@ -606,29 +629,46 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
         try{
             int count = 0;
             for(MeterWorkRailwayReceived model: models) {
+                //修改前数据
                 MeterWorkRailwayReceived modelTemp = meterWorkRailwayReceivedMapper.selectByPrimaryKey(model.getActualFirstNo());
-                if(StringUtil.isEmpty(modelTemp.getPredictionNo())) {
-                    PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
-                    scale.setValueFlag("4");
-                    scale.setUploadFlag("1");
-                    preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
 
-                    if(StringUtils.isNotEmpty(model.getPredictionNo())) {
-                        MeterWorkRailwayReceived firstRec1 = meterWorkRailwayReceivedMapper.selectAndMatch(model.getActualFirstNo(), scale.getPredictionNo());
-                        BeanUtils.copyProperties(firstRec1,model);
-                        model.setPredictionType("1");
-                        meterWorkRailwayReceivedMapper.updateByPrimaryKey(model);
-                    }
-                    model.setRailwayNo(scale.getRailwayNo());
-                    model.setMatterNo(scale.getMatterNo());
-                    model.setMatterName(scale.getMatterName());
-                    model.setReceivingUintNo(scale.getReceivingUintNo());
-                    model.setReceivingUintName(scale.getReceivingUintName());
-                    model.setForwardingUnitNo(scale.getForwardingUnitNo());
-                    model.setForwardingUnitName(scale.getForwardingUnitName());
-                    meterWorkRailwayReceivedMapper.updateByPrimaryKeySelective(model);
-                    count ++;
+                MeterBaseOperationLog note = new MeterBaseOperationLog();
+                note.setId(PublicMethod.IdCreate(3));
+                note.setCreateManNo(model.getUpdateManNo());
+                note.setCreateManName(model.getUpdateManName());
+                note.setCreateTime(new Date());
+                note.setOperationPage("终端-轨道衡从表数据维护");
+                note.setOperationFunction("匹配委托");
+                note.setOperationId(model.getActualFirstNo());
+                note.setOperationPredictionNo(model.getPredictionNo());
+                note.setOperationCarnNo(model.getRailwayNo());
+                note.setOperationBeforeFix(modelTemp.toString());
+
+                PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
+                scale.setValueFlag("4");
+                scale.setUploadFlag("1");
+                scale.setMeasureStation(modelTemp.getBaseSpotNo());
+                scale.setMeasureStationName(modelTemp.getBaseSpotName());
+                preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+
+                if(StringUtils.isNotEmpty(model.getPredictionNo())) {
+                    MeterWorkRailwayReceived firstRec1 = meterWorkRailwayReceivedMapper.selectAndMatch(model.getActualFirstNo(), scale.getPredictionNo());
+                    BeanUtils.copyProperties(firstRec1,model);
+                    model.setPredictionType("1");
+                    meterWorkRailwayReceivedMapper.updateByPrimaryKey(model);
                 }
+                model.setRailwayNo(scale.getRailwayNo());
+                model.setMatterNo(scale.getMatterNo());
+                model.setMatterName(scale.getMatterName());
+                model.setReceivingUintNo(scale.getReceivingUintNo());
+                model.setReceivingUintName(scale.getReceivingUintName());
+                model.setForwardingUnitNo(scale.getForwardingUnitNo());
+                model.setForwardingUnitName(scale.getForwardingUnitName());
+                meterWorkRailwayReceivedMapper.updateByPrimaryKeySelective(model);
+                count ++;
+
+                note.setOperationAfterFix(model.toString());
+                meterBaseOperationLogMapper.insertSelective(note);
             }
             rm.setSucceed();
             rm.setMessage("操作成功,共有" + count + "条数据匹配委托成功");