修改

src/main/java/com/jisco/dynamicweight/dtcrb/mapper/DtcrbMapper.java

@@ -0,0 +1,14 @@
+package com.jisco.dynamicweight.dtcrb.mapper;
+
+import com.jisco.dynamicweight.dynamicworkupdata.dto.CalNewCokeDto;
+import org.apache.ibatis.annotations.Mapper;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Mapper
+public interface DtcrbMapper {
+
+    BigDecimal getTotalWeight(CalNewCokeDto calNewCokeDto);
+
+    List<String> getMJEStationNums();
+}

src/main/java/com/jisco/dynamicweight/dtcrb/mapper/DtcrbMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jisco.dynamicweight.dtcrb.mapper.DtcrbMapper">
+    <select id="getTotalWeight" resultType="java.math.BigDecimal">
+        SELECT
+        SUM(WEIGHT)
+        FROM
+        WZL_REPORT@DTCRB
+        WHERE MATERIALNUM IN
+        <foreach collection="stationNums" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        AND TIME BETWEEN #{startTime} AND #{endTime}
+    </select>
+    <select id="getMJEStationNums" resultType="java.lang.String">
+        SELECT
+            *
+        FROM
+            WZL_MATERIAL@DTCRB
+        WHERE
+            MATERIALNAME LIKE '%煤焦E%焦%'
+          AND MATERIALNAME NOT LIKE '%煤焦E%粉焦%'
+    </select>
+</mapper>

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/controller/DynamicWorkUpdataController.java

@@ -3,6 +3,7 @@ package com.jisco.dynamicweight.dynamicworkupdata.controller;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.Snowflake;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jisco.dynamicweight.dynamicworkupdata.dto.CalNewCokeDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.CokeComputeDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.InbatchDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.ReturnedDustDto;
@@ -350,4 +351,15 @@ public class DynamicWorkUpdataController extends BaseRESTfulController {
         dynamicWorkUpdataService.reCollect(id);
         return success(null, "操作成功");
     }
+
+    @ApiOperation(value = "新焦炭计算", notes = "新焦炭计算")
+    @PostMapping(value = "/calNewCoke")
+    public RESTfulResult calNewCoke(@RequestBody CalNewCokeDto calNewCokeDto) throws IOException {
+        try{
+            dynamicWorkUpdataService.calNewCoke(calNewCokeDto);
+            return success(null, "操作成功");
+        }catch (Exception e){
+            return failed(null, e.getMessage());
+        }
+    }
 }

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/dto/CalNewCokeDto.java

@@ -0,0 +1,73 @@
+package com.jisco.dynamicweight.dynamicworkupdata.dto;
+
+import java.util.Date;
+import java.util.List;
+
+public class CalNewCokeDto {
+    Date startTime;
+    Date endTime;
+    String receiverCode;
+    String senderCode;
+    List<String> materialIds;
+    List<String> stationNums;
+
+    public List<String> getStationNums() {
+        return stationNums;
+    }
+
+    public void setStationNums(List<String> stationNums) {
+        this.stationNums = stationNums;
+    }
+
+    public String getSenderCode() {
+        return senderCode;
+    }
+
+    public void setSenderCode(String senderCode) {
+        this.senderCode = senderCode;
+    }
+
+    public String getReceiverCode() {
+        return receiverCode;
+    }
+
+    public void setReceiverCode(String receiverCode) {
+        this.receiverCode = receiverCode;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public List<String> getMaterialIds() {
+        return materialIds;
+    }
+
+    public void setMaterialIds(List<String> materialIds) {
+        this.materialIds = materialIds;
+    }
+
+    @Override
+    public String toString() {
+        return "CalNewCokeDto{" +
+                "startTime=" + startTime +
+                ", endTime=" + endTime +
+                ", receiverCode='" + receiverCode + '\'' +
+                ", senderCode='" + senderCode + '\'' +
+                ", materialIds=" + materialIds +
+                ", stationNums=" + stationNums +
+                '}';
+    }
+}

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/mapper/DynamicWorkUpdataMapper.java

@@ -2,11 +2,13 @@ package com.jisco.dynamicweight.dynamicworkupdata.mapper;
 
 import com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever;
 import com.jisco.dynamicweight.dynamicworkauditdata.model.DynamicWorkAuditdata;
+import com.jisco.dynamicweight.dynamicworkupdata.dto.CalNewCokeDto;
 import com.jisco.dynamicweight.dynamicworkupdata.model.DynamicWorkUpdata;
 import com.jisco.dynamicweight.dynamicworkupdata.vo.AuditDataVO;
 import com.jisco.dynamicweight.dynamicworkupdata.vo.DailyReportVO;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -116,4 +118,33 @@ public interface DynamicWorkUpdataMapper extends IBaseMapper<DynamicWorkUpdata,
      * @param auditDataVO
      */
     BigDecimal getWeightForAuditOrUnaudit(DynamicWorkAuditdata auditDataVO);
+
+    /**
+     * 统计“动态秤称重数据维护”内，综1A、综1B、综1C、综1D皮带秤，物料品名包含“焦”，收货库房为“2531”的数据
+     * @param calNewCokeDto
+     * @return
+     */
+    BigDecimal getTotalCoke(CalNewCokeDto calNewCokeDto);
+
+    /**
+     * 计算36B1和煤焦E皮带焦炭量
+     * @param stationCode
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    BigDecimal getCokeByStation(String stationCode, Date startTime, Date endTime);
+
+    /**
+     * 获取综运1A、综运1B、综运1C、综运1D指定时间段内的焦炭记录
+     * @param calNewCokeDto
+     * @return
+     */
+    List<DynamicWorkUpdata> getCokeRecords(CalNewCokeDto calNewCokeDto);
+
+    /**
+     * 按id列表批量作废
+     * @param ids
+     */
+    int batchDisableByIds(@Param("ids") List<String> ids);
 }

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/mapper/DynamicWorkUpdataMapper.xml

@@ -1489,4 +1489,41 @@
           and t.VALID_FLAG = '1'
           and t.AUDITING_FLAG = #{auditingFlag}
     </select>
+    <!--    统计“动态秤称重数据维护”内，综1A、综1B、综1C、综1D皮带秤，物料品名包含“焦”，收货库房为“2531”的数据-->
+    <select id="getTotalCoke" resultType="java.math.BigDecimal">
+        select sum(WEIGHT) as WEIGHT
+        from DYNAMIC_WORK_UPDATA t
+        WHERE t.STATION_CODE in ('PD0030', 'PD0031', 'PD0033', 'PD0034')
+          AND t.MATERIAL_NAME like '%焦%'
+          AND t.RECIEVER_CODE = #{receiverCode}
+          AND t.END_TIME &gt;= #{startTime}
+          AND t.END_TIME &lt;= #{endTime}
+    </select>
+    <!--    计算36B1和煤焦E皮带焦炭量-->
+    <select id="getCokeByStation" resultType="java.math.BigDecimal">
+        select sum(WEIGHT) as WEIGHT
+        from DYNAMIC_WORK_UPDATA t
+        WHERE t.STATION_CODE = #{stationCode}
+          AND t.MATERIAL_NAME like '%焦%'
+          AND t.MATERIAL_NAME not like '%粉焦%'
+          AND t.END_TIME &gt;= #{startTime}
+          AND t.END_TIME &lt;= #{endTime}
+    </select>
+    <select id="getCokeRecords" resultMap="BaseResultMap">
+        select *
+        from DYNAMIC_WORK_UPDATA t
+        WHERE t.STATION_CODE in ('PD0030', 'PD0031', 'PD0033', 'PD0034')
+          AND t.MATERIAL_NAME like '%焦%'
+          AND t.RECIEVER_CODE = #{receiverCode}
+          AND t.END_TIME &gt;= #{startTime}
+          AND t.END_TIME &lt;= #{endTime}
+    </select>
+    <update id="batchDisableByIds">
+        UPDATE DYNAMIC_WORK_UPDATA t
+        SET t.VALID_FLAG = '0'
+        WHERE t.UPDATA_NO in
+        <foreach collection="ids" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
 </mapper>

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/service/IDynamicWorkUpdataService.java

@@ -1,5 +1,6 @@
 package com.jisco.dynamicweight.dynamicworkupdata.service;
 
+import com.jisco.dynamicweight.dynamicworkupdata.dto.CalNewCokeDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.CokeComputeDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.InbatchDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.ReturnedDustDto;
@@ -126,4 +127,10 @@ public interface IDynamicWorkUpdataService extends IBaseService<DynamicWorkUpdat
      * @return
      */
     void reCollect(String id);
+
+    /**
+     * 新焦炭计算
+     * @param calNewCokeDto
+     */
+    void calNewCoke(CalNewCokeDto calNewCokeDto);
 }

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/service/impl/DynamicWorkUpdataServiceImpl.java

@@ -1,11 +1,13 @@
 package com.jisco.dynamicweight.dynamicworkupdata.service.impl;
 
 import cn.hutool.core.lang.Assert;
+import com.jisco.dynamicweight.dtcrb.mapper.DtcrbMapper;
 import com.jisco.dynamicweight.dynamicbasebatchstation.mapper.DynamicBaseBatchStationMapper;
 import com.jisco.dynamicweight.dynamicbasebatchstation.model.DynamicBaseBatchStation;
 import com.jisco.dynamicweight.dynamicbasereciever.model.DynamicBaseReciever;
 import com.jisco.dynamicweight.dynamicworkdata.model.DynamicWorkData;
 import com.jisco.dynamicweight.dynamicworkdata.service.IDynamicWorkDataService;
+import com.jisco.dynamicweight.dynamicworkupdata.dto.CalNewCokeDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.CokeComputeDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.InbatchDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.ReturnedDustDto;
@@ -19,6 +21,9 @@ import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
 import com.steerinfo.baseinfo.combaseinfo.service.IComBaseInfoService;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
+import com.steerinfo.meterwork.meterworkcaractual.service.IMeterWorkCarActualService;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -29,6 +34,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -60,11 +66,14 @@ public class DynamicWorkUpdataServiceImpl extends BaseServiceImpl<DynamicWorkUpd
     private IDynamicWorkDataService dynamicWorkDataService;
 
     @Autowired
-    private DynamicBaseBatchStationMapper stationMapper;
+    private DtcrbMapper dtcrbMapper;
 
     @Autowired
     private IComBaseInfoService comBaseInfoService;
 
+    @Autowired
+    IMeterWorkCarActualService meterWorkCarActualService;
+
     @Override
     protected IBaseMapper<DynamicWorkUpdata, String> getMapper() {
         return dynamicWorkUpdataMapper;
@@ -428,4 +437,148 @@ public class DynamicWorkUpdataServiceImpl extends BaseServiceImpl<DynamicWorkUpd
         this.delete(id);
         dynamicWorkDataService.delete(byId.getOriginalValue());
     }
+
+    /**
+     * 新焦炭计算
+     *
+     * @param calNewCokeDto
+     */
+    @Transactional
+    @Override
+    public synchronized void calNewCoke(CalNewCokeDto calNewCokeDto) {
+        Assert.notNull(calNewCokeDto, "参数不能为空");
+        Assert.notNull(calNewCokeDto.getStartTime(), "开始时间不能为空");
+        Assert.notNull(calNewCokeDto.getEndTime(), "结束时间不能为空");
+        Assert.isTrue(!CollectionUtils.isEmpty(calNewCokeDto.getStationNums()), "3-6#高炉料斗秤列表不能为空");
+        //必须先计算3-6炉，再计算7炉，因为计算7炉时会修改料斗秤编号列表
+        calNewCoke3_6(calNewCokeDto);
+        // 计算7炉新焦炭
+        calNewCoke7(calNewCokeDto);
+    }
+
+    private void calNewCoke7(CalNewCokeDto calNewCokeDto) {
+        //        二、7#高炉焦炭结算
+//        1、统计“动态秤称重数据维护”内，综1A、综1B、综1C、综1D皮带秤，物料品名包含“焦”，收货库房为“2546”的数据，并求和；假设结果为A，并作废原始数据
+        calNewCokeDto.setReceiverCode("2546");
+        BigDecimal a = dynamicWorkUpdataMapper.getTotalCoke(calNewCokeDto);
+//        2、查询“动态秤日报”内返焦4皮带总量；假设结果为B
+        calNewCokeDto.setStationNums(Arrays.asList("001336"));
+        BigDecimal b = dtcrbMapper.getTotalWeight(calNewCokeDto);
+        ;
+//        3、统计“物资量系统”内，汽车衡，物料品名包含“焦”，发货库房为“2548”的数据；并求和；假设结果为C
+        calNewCokeDto.setReceiverCode(null);
+        calNewCokeDto.setSenderCode("2548");
+        BigDecimal c = getTotalCokeOfCar(calNewCokeDto);
+//        4、统计“动态称日报”内，7#高炉14-19#料斗秤数据，并求和；假设结果为D
+        calNewCokeDto.setStationNums(Arrays.asList("002063", "002064", "002065", "002066", "002067", "002068"));
+        BigDecimal d = dtcrbMapper.getTotalWeight(calNewCokeDto);
+//        5、统计“动态称日报”内，煤焦E皮带秤，物料品名包含“焦”的数据（不包含粉焦），并求和；假设结果为E，并作废原始数据
+        List<String> stationNums = dtcrbMapper.getMJEStationNums();
+        calNewCokeDto.setStationNums(stationNums);
+        BigDecimal e = dtcrbMapper.getTotalWeight(calNewCokeDto);
+        ;
+//        6、计算系数K=（C+D+B）/ (A+E)
+        BigDecimal k = c.add(d).add(b).divide(a.add(e), 5, RoundingMode.HALF_UP);
+//        7、分别用“动态秤称重数据维护”内，综1A、综1B、综1C、综1D皮带秤，物料品名包含“焦”，收货库房为“2546”的数据，和煤焦E皮带秤，物料品名包含“焦”的数据乘以计算系数K，并将结果汇总存放“动态称数据审核”
+        calNewCokeDto.setReceiverCode("2546");
+        List<DynamicWorkUpdata> dynamicWorkUpdataList = dynamicWorkUpdataMapper.getCokeRecords(calNewCokeDto);
+        //插入乘完k系统的新数据
+        saveNewCoke(dynamicWorkUpdataList, k);
+        // 作废原始数据
+        int i = dynamicWorkUpdataMapper.batchDisableByIds(dynamicWorkUpdataList.stream().map(item -> item.getUpdataNo()).collect(Collectors.toList()));
+        Assert.isTrue(i == dynamicWorkUpdataList.size(), "作废原数据失败");
+    }
+
+    private void calNewCoke3_6(CalNewCokeDto calNewCokeDto) {
+        //        一、3#-6#高炉焦炭结算
+//        1、统计“动态秤称重数据维护”内，综1A、综1B、综1C、综1D皮带秤，物料品名包含“焦”，收货库房为“2531”的数据，并求和；假设结果为A，并作废原始数据
+        calNewCokeDto.setReceiverCode("2531");
+        BigDecimal a = dynamicWorkUpdataMapper.getTotalCoke(calNewCokeDto);
+//        2、统计“物资量系统”内，汽车衡，物料品名包含“焦”，收货库房为“2531”的数据；并求和；假设结果为B
+        BigDecimal b = getTotalCokeOfCar(calNewCokeDto);
+//        3、统计“物资量系统”内，汽车衡，物料品名包含“焦”，发货库房为“2533”的数据；并求和；假设结果为C
+        calNewCokeDto.setReceiverCode(null);
+        calNewCokeDto.setSenderCode("2533");
+        BigDecimal c = getTotalCokeOfCar(calNewCokeDto);
+//        4、统计“动态称日报”内，3#、4#、5#、6#高炉焦炭料斗秤（因3#料斗秤上料经常变料，故每座高炉的1#、2#、3#料斗秤应设置可勾选界面，由岗位根据权限可进行是否为焦炭勾选）、焦丁皮带秤数据，并求和；假设结果为D
+        BigDecimal d = dtcrbMapper.getTotalWeight(calNewCokeDto);
+//        5、统计“动态秤称重数据维护”内，36B1计量焦炭数据（不包含粉焦），并求和；假设结果为E，并作废原始数据
+        BigDecimal e = getCokeByStation("PD0039", calNewCokeDto.getStartTime(), calNewCokeDto.getEndTime());
+//        6、计算系数K=（C+D-E-B）/ A
+        BigDecimal k = c.add(d).subtract(b).subtract(e).divide(a, 5, RoundingMode.HALF_UP);
+//        7、用“动态秤称重数据维护”内，综1A、综1B、综1C、综1D皮带秤，物料品名包含“焦”，收货库房为“2531”的数据，每条数据乘以系数K，并将结果汇总存放“动态称数据审核”
+        calNewCokeDto.setReceiverCode("2531");
+        List<DynamicWorkUpdata> dynamicWorkUpdataList = dynamicWorkUpdataMapper.getCokeRecords(calNewCokeDto);
+        //插入乘完k系统的新数据
+        saveNewCoke(dynamicWorkUpdataList, k);
+        // 作废原始数据
+        int i = dynamicWorkUpdataMapper.batchDisableByIds(dynamicWorkUpdataList.stream().map(item -> item.getUpdataNo()).collect(Collectors.toList()));
+        Assert.isTrue(i == dynamicWorkUpdataList.size(), "作废原数据失败");
+    }
+
+    private void saveNewCoke(List<DynamicWorkUpdata> dynamicWorkUpdataList, BigDecimal k) {
+        List<DynamicWorkUpdata> list = new ArrayList<>();
+        for (DynamicWorkUpdata dynamicWorkUpdata : dynamicWorkUpdataList) {
+            DynamicWorkUpdata data = new DynamicWorkUpdata();
+            data.setUpdataNo(null);
+            data.setMaterialName(dynamicWorkUpdata.getMaterialName());
+            data.setMaterialCode(dynamicWorkUpdata.getMaterialCode());
+            data.setStationName(dynamicWorkUpdata.getStationName());
+            data.setStationCode(dynamicWorkUpdata.getStationCode());
+            data.setRecieverName(dynamicWorkUpdata.getRecieverName());
+            data.setRecieverCode(dynamicWorkUpdata.getRecieverCode());
+            data.setRecieverType(dynamicWorkUpdata.getRecieverType());
+            data.setSenderName(dynamicWorkUpdata.getSenderName());
+            data.setSenderCode(dynamicWorkUpdata.getSenderCode());
+            data.setSenderType(dynamicWorkUpdata.getSenderType());
+            data.setWeight(dynamicWorkUpdata.getWeight().multiply(k));
+            data.setUploaded(null);
+            data.setStartTime(dynamicWorkUpdata.getStartTime());
+            data.setEndTime(dynamicWorkUpdata.getEndTime());
+            data.setMemo(null);
+            data.setAuditingManNo(null);
+            data.setAuditingManName(null);
+            data.setAuditingTime(null);
+            data.setAuditingFlag("0");
+            data.setOriginalValue(null);
+            data.setSyslog(null);
+            data.setValidFlag("1");
+            data.setCreateManNo(UserUtil.getCurrentUserId());
+            data.setCreateManName(UserUtil.getCurrentUserName());
+            data.setCreateTime(new Date());
+            data.setUpdateManNo(null);
+            data.setUpdateManName(null);
+            data.setUpdateTime(null);
+            list.add(data);
+        }
+        int batchAdd = this.batchAdd(list);
+        Assert.isTrue(batchAdd == dynamicWorkUpdataList.size(), "插入新焦炭数据失败");
+    }
+
+    private BigDecimal getCokeByStation(String stationCode, Date startTime, Date endTime) {
+        return dynamicWorkUpdataMapper.getCokeByStation(stationCode, startTime, endTime);
+    }
+
+    private BigDecimal getTotalCokeOfCar(CalNewCokeDto calNewCokeDto) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("startTime", sdf.format(calNewCokeDto.getStartTime()));
+        params.put("endTime", sdf.format(calNewCokeDto.getEndTime()));
+        params.put("matterName", "焦");
+        params.put("validFlag", "1");
+        if (calNewCokeDto.getReceiverCode() != null) {
+            params.put("receivingUintNo", calNewCokeDto.getReceiverCode());
+        } else if (calNewCokeDto.getSenderCode() != null) {
+            params.put("forwardingUnitNo", calNewCokeDto.getSenderCode());
+        } else {
+            throw new RuntimeException("必须选择发货库房或者收货库房");
+        }
+        BigDecimal b = BigDecimal.ZERO;
+        PageList<MeterWorkCarActual> meterWorkCarActualPageList = meterWorkCarActualService.likeByDesc(params, 1, 2000);
+        List<MeterWorkCarActual> meterWorkCarActuals = meterWorkCarActualPageList.getList();
+        for (MeterWorkCarActual meterWorkCarActual : meterWorkCarActuals) {
+            b = b.add(meterWorkCarActual.getNetWeight());
+        }
+        return b.divide(new BigDecimal(1000));
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.meterwork.meterworkcaractual.service;
 
+import com.jisco.dynamicweight.dynamicworkupdata.dto.CalNewCokeDto;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.framework.service.pagehelper.PageList;
@@ -9,6 +10,7 @@ import com.steerinfo.util.CommonPage;
 import io.micrometer.core.instrument.Meter;
 import org.apache.shiro.crypto.hash.Hash;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -104,4 +106,5 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
 
     //根据时间查询所有秤点的结净已匹配、结净未匹配、结净已上传、结净未上传、结净已作废
     List<HashMap> countAllSpotSate(HashMap params);
+
 }

src/main/java/com/steerinfo/meterwork/meterworkmonitor/mapper/MeterWorkMonitorMapper.xml

@@ -2161,6 +2161,9 @@
     <if test="photoCar != null and photoCar != ''">
       or PHOTO_CAR = #{photoCar}
     </if>
+    <if test="photoCar2 != null and photoCar2 != ''">
+      or PHOTO_CAR2 = #{photoCar2}
+    </if>
     <if test="scanCar != null and scanCar != ''">
       or SCAN_CAR = #{scanCar}
     </if>

src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/impl/MeterWorkMonitorServiceImpl.java

@@ -140,6 +140,7 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
             map.put("setCar", rfidCar);
             map.put("rfidCar", rfidCar);
             map.put("photoCar", rfidCar);
+            map.put("photoCar2", rfidCar);
             map.put("scanCar", rfidCar);
             map.put("editCar", rfidCar);
             List<MeterWorkMonitor> models = meterWorkMonitorMapper.weightByCarNo(map);