后端修改

src/main/java/com/steerinfo/meterwork/meterworkimagetemp/mapper/MeterWorkImageTempMapper.java

@@ -10,5 +10,5 @@ import java.util.List;
 
 @Mapper
 public interface MeterWorkImageTempMapper extends IBaseMapper<MeterWorkImageTemp, String> {
-    List<MeterWorkImageTemp> imageQuery(HashMap<String, Object> params);
+
 }

src/main/java/com/steerinfo/meterwork/meterworkimagetemp/mapper/MeterWorkImageTempMapper.xml

@@ -262,14 +262,4 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
-  <select id="imageQuery" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where 1 = 1
-      <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-        and  image_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and image_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        and  value_flag = #{valueFlag}
-      </if>
-  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkimagetemp/service/impl/MeterWorkImageTempServiceImpl.java

@@ -74,74 +74,4 @@ public class MeterWorkImageTempServiceImpl extends BaseServiceImpl<MeterWorkImag
         }
         return rm;
     }
-
-    //定时刷新接口 每30秒执行一次
-//    @Scheduled(cron = "0/30 * * * * ? ")
-    @Transactional
-    public void imageAutoUpload(){
-        ComBaseInfo baseInfo = comBaseInfoMapper.selectByPrimaryKey("001043006");
-        if(baseInfo != null && baseInfo.getBaseName() != null && StringUtils.isNotEmpty(baseInfo.getBaseName())) {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Date imageTime = new Date();
-            Calendar beforeD = Calendar.getInstance();
-            Calendar afterD = Calendar.getInstance();
-            beforeD.setTime(imageTime);
-            afterD.setTime(imageTime);
-            beforeD.add(Calendar.MINUTE, -Integer.parseInt(baseInfo.getBaseName()));
-            afterD.add(Calendar.MINUTE, 0);
-            String startTime = sdf.format(beforeD.getTime());
-            String endTime = sdf.format(afterD.getTime());
-            HashMap<String, Object> imageMap = new HashMap();
-            imageMap.put("startTime", startTime);
-            imageMap.put("endTime", endTime);
-            imageMap.put("valueFlag", "0");
-            //查询图片中间表 当前时间-baseInfo.getBaseName()至当前时间的图片信息
-            List<MeterWorkImageTemp> imageTemps = meterWorkImageTempMapper.imageQuery(imageMap);
-
-            if(imageTemps.size() >= 1) {
-                for(MeterWorkImageTemp imageTemp: imageTemps) {
-                    Date createTime = imageTemp.getImageTime();
-                    Calendar beforeDTemp = Calendar.getInstance();
-                    Calendar afterDTemp = Calendar.getInstance();
-                    beforeDTemp.setTime(createTime);
-                    afterDTemp.setTime(createTime);
-                    beforeDTemp.add(Calendar.MINUTE, -6);
-                    afterDTemp.add(Calendar.MINUTE, 0);
-                    String startTimeTemp = sdf.format(beforeDTemp.getTime());
-                    String endTimeTemp = sdf.format(afterDTemp.getTime());
-                    HashMap<String, Object> receivedMap = new HashMap();
-                    receivedMap.put("startTime", startTimeTemp);
-                    receivedMap.put("endTime", endTimeTemp);
-                    receivedMap.put("railwayNo", imageTemp.getRailwayNo());
-                    receivedMap.put("baseSpotNo", imageTemp.getBaseSpotNo());
-
-                    List<MeterWorkRailwayReceived> receiveds = meterWorkRailwayReceivedMapper.getReceived(receivedMap);
-                    if(receiveds.size() == 1) {
-                        MeterWorkImage image = meterWorkImageMapper.selectByPrimaryKey(receiveds.get(0).getActualFirstNo());
-                        if(image != null) {
-                            if(imageTemp.getImageUrl1().indexOf("P1") != -1) {
-                                image.setImageFile3(imageTemp.getImageUrl1());
-                            }else if(imageTemp.getImageUrl1().indexOf("P2") != -1) {
-                                image.setImageFile4(imageTemp.getImageUrl1());
-                            }
-                            meterWorkImageMapper.updateByPrimaryKeySelective(image);
-                            imageTemp.setValueFlag("1");
-                            meterWorkImageTempMapper.updateByPrimaryKeySelective(imageTemp);
-                        }else {
-                            MeterWorkImage imageModel = new MeterWorkImage();
-                            imageModel.setActualFirstNo(receiveds.get(0).getActualFirstNo());
-                            if(imageTemp.getImageUrl1().indexOf("P1") != -1) {
-                                imageModel.setImageFile3(imageTemp.getImageUrl1());
-                            }else if(imageTemp.getImageUrl1().indexOf("P2") != -1) {
-                                imageModel.setImageFile4(imageTemp.getImageUrl1());
-                            }
-                            meterWorkImageMapper.insertSelective(imageModel);
-                            imageTemp.setValueFlag("1");
-                            meterWorkImageTempMapper.updateByPrimaryKeySelective(imageTemp);
-                        }
-                    }
-                }
-            }
-        }
-    }
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.xml

@@ -2637,7 +2637,7 @@
            t.RAILWAY_WORK_NO, t.RAILWAY_SPEED, t.RAILWAY_MODEL_NO,t.RAILWAY_MODEL_NAME, t1.MATTER_NO, t1.MATTER_NAME,
            t1.CONTRACT_NO, t1.BATCH_NO, t1.CUSTOMER_SUPPLIER_NO, t1.CUSTOMER_SUPPLIER_NAME, t1.FORWARDING_UNIT_NO,
            t1.FORWARDING_UNIT_NAME, t1.RECEIVING_UINT_NO, t1.RECEIVING_UINT_NAME, t1.MATERIAL_NO,
-           t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t1.conveyance_type,
+           t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t.conveyance_type,
            t1.resource_system, t1.group_package_amount, t1.group_package_unit, t1.package_amount,
            t1.package_unit, t1.theory_amount, t1.measure_batch,t1.measure_batch_count,t1.sender_type,
            t1.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,
@@ -2658,7 +2658,7 @@
             RAILWAY_SPEED, RAILWAY_MODEL_NO,RAILWAY_MODEL_NAME, BIND_CARD_NO,  METER_PROCESS_NO, METER_PROCESS_EDITION_NO, METER_WEIGHT,
             WEIGHT_TYPE, METER_SORT_WEIGHT, METER_BALANCE_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME,
             CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG,
-            UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME,
+            UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME,conveyance_type,
             CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME,METER_TYPE_NO,METER_TYPE_NAME, lc_no
     from METER_WORK_RAILWAY_ACT_FIRST
     where ACTUAL_FIRST_NO= #{actualFirstNo,jdbcType=VARCHAR}

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirstbak/mapper/MeterWorkRailwayActFirstBakMapper.xml

@@ -2636,7 +2636,7 @@
            t.RAILWAY_WORK_NO, t.RAILWAY_SPEED, t.RAILWAY_MODEL_NO,t.RAILWAY_MODEL_NAME, t1.MATTER_NO, t1.MATTER_NAME,
            t1.CONTRACT_NO, t1.BATCH_NO, t1.CUSTOMER_SUPPLIER_NO, t1.CUSTOMER_SUPPLIER_NAME, t1.FORWARDING_UNIT_NO,
            t1.FORWARDING_UNIT_NAME, t1.RECEIVING_UINT_NO, t1.RECEIVING_UINT_NAME, t1.MATERIAL_NO,
-           t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t1.conveyance_type,
+           t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t.conveyance_type,
            t1.resource_system, t1.group_package_amount, t1.group_package_unit, t1.package_amount,
            t1.package_unit, t1.theory_amount, t1.measure_batch,t1.measure_batch_count,t1.sender_type,
            t1.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,
@@ -2657,7 +2657,7 @@
             RAILWAY_SPEED, RAILWAY_MODEL_NO,RAILWAY_MODEL_NAME, BIND_CARD_NO,  METER_PROCESS_NO, METER_PROCESS_EDITION_NO, METER_WEIGHT,
             WEIGHT_TYPE, METER_SORT_WEIGHT, METER_BALANCE_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME,
             CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG,
-            UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME,
+            UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME,conveyance_type,
             CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME,METER_TYPE_NO,METER_TYPE_NAME, lc_no
     from METER_WORK_RAILWAY_ACT_FIRST_BAK
     where ACTUAL_FIRST_NO= #{actualFirstNo,jdbcType=VARCHAR}

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

@@ -3054,7 +3054,7 @@
            t1.receiving_uint_name,t1.material_no,t1.material_name, t1.spec_no,t1.spec_name,t1.load_point_no,
            t1.load_point_name,t1.sample_voucher,t1.carrier_unit_no,t1.carrier_unit_name,t1.meter_type_no,
            t1.meter_type_name,t.actual_first1_no, t.gross_weight,t.gross_man_no,t.gross_man_name,
-           t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t1.conveyance_type,
+           t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t.conveyance_type,
            t1.resource_system, t1.group_package_amount, t1.group_package_unit, t1.package_amount,
            t1.package_unit, t1.theory_amount, t1.measure_batch,t1.measure_batch_count,t1.sender_type,
            t1.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,
@@ -3077,7 +3077,7 @@
            t.net_man_name,t.net_time,t.net_spot3_no,t.net_spot3_name,t.net_class,t.net_group,
            t.net_mode,t.value_flag,t.upload_flag,t.check_man_no,t.check_man_name,t.check_time,
            t.upload_man_no,t.upload_man_name,t.upload_time,t.sample_no,t.railway_type_no,
-           t.railway_type_name, t.memo,t.water_num,t.update_man_no,t.data_source,
+           t.railway_type_name, t.memo,t.water_num,t.update_man_no,t.data_source,t.conveyance_type,
            t.update_man_name, t.update_time, t.create_man_name, t.create_time, t.source_area, t.lc_no
     from meter_work_railway_actual t where t.actual_no = #{actualNo,jdbcType=VARCHAR}
   </select>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/mapper/MeterWorkRailwayActualBakMapper.xml

@@ -3026,7 +3026,7 @@
            t1.receiving_uint_name,t1.material_no,t1.material_name, t1.spec_no,t1.spec_name,t1.load_point_no,
            t1.load_point_name,t1.sample_voucher,t1.carrier_unit_no,t1.carrier_unit_name,t1.meter_type_no,
            t1.meter_type_name,t.actual_first1_no, t.gross_weight,t.gross_man_no,t.gross_man_name,
-           t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t1.conveyance_type,
+           t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t.conveyance_type,
            t1.resource_system, t1.group_package_amount, t1.group_package_unit, t1.package_amount,
            t1.package_unit, t1.theory_amount, t1.measure_batch,t1.measure_batch_count,t1.sender_type,
            t1.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,
@@ -3049,7 +3049,7 @@
            t.net_man_name,t.net_time,t.net_spot3_no,t.net_spot3_name,t.net_class,t.net_group,
            t.net_mode,t.value_flag,t.upload_flag,t.check_man_no,t.check_man_name,t.check_time,
            t.upload_man_no,t.upload_man_name,t.upload_time,t.sample_no,t.railway_type_no,
-           t.railway_type_name, t.memo,t.water_num,t.update_man_no,t.data_source,
+           t.railway_type_name, t.memo,t.water_num,t.update_man_no,t.data_source,t.conveyance_type,
            t.update_man_name, t.update_time,t.source_area, t.lc_no
     from meter_work_railway_actual_bak t where t.actual_no = #{actualNo,jdbcType=VARCHAR}
   </select>

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.java

@@ -21,6 +21,5 @@ public interface MeterWorkRailwayReceivedMapper extends IBaseMapper<MeterWorkRai
     HashMap getCount(HashMap params);
     MeterWorkRailwayReceived selectAndRemove(@Param(value = "actualFirstNo")String actualFirstNo);
 
-    //动态衡图片中间表自动获取从表数据
-    List<MeterWorkRailwayReceived> getReceived(HashMap<String, Object> params);
+
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.xml

@@ -2034,20 +2034,4 @@
     select count(1) as countNum from meter_work_railway_received A where railway_work_no = #{railwayWorkNo} and  value_flag = '1'
   </select>
 
-  <select id="getReceived" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    where 1 = 1
-      <if test="railwayNo != null and railwayNo != ''">
-        and  railway_no = #{railwayNo}
-      </if>
-      <if test="valueFlag != null and valueFlag != ''">
-        and  value_flag = #{valueFlag}
-      </if>
-      <if test="baseSpotNo != null and baseSpotNo != ''">
-        and  base_spot_no = #{baseSpotNo}
-      </if>
-      <if test="startTime != null and startTime != '' and endTime != null 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>
-  </select>
 </mapper>

src/main/java/com/steerinfo/pretrack/pretrackscale/controller/PreTrackScaleController.java

@@ -554,4 +554,18 @@ public class PreTrackScaleController extends BaseRESTfulController {
         }
         return rm;
     }
+
+    @ApiOperation(value = "汽车衡新一次补录界面的委托显示", notes = "根据车号获取预报信息")
+    @PostMapping(value = "/selectInUseAndNoUse")
+    public RESTfulResult selectInUseAndNoUse(@RequestBody HashMap model) {
+        RESTfulResult rm = failed();
+        try {
+            List<PreTrackScale> rows = preTrackScaleService.selectInUseAndNoUse(model);
+            return success(rows);
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        }
+        return rm;
+    }
 }

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.java

@@ -45,4 +45,6 @@ public interface PreTrackScaleMapper extends IBaseMapper<PreTrackScale, String>
 
     //净重数据维护界面----根据净重车号查询当前车号已匹配的委托和未使用的有效委托
     List<PreTrackScale> selectByScale(HashMap params);
+    //汽车衡新一次补录界面的委托显示
+    List<PreTrackScale> selectInUseAndNoUse(HashMap params);
 }

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.xml

@@ -3537,4 +3537,43 @@
     order By TRUST_DATE_TIME desc
   </select>
 
+  <select id="selectInUseAndNoUse" 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="forwardingUnitNo != null and forwardingUnitNo != ''">
+      and FORWARDING_UNIT_NO = #{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 = #{receivingUintNo}
+    </if>
+    <if test="receivingUintName != null and receivingUintName != ''">
+      and RECEIVING_UINT_NAME like '%${receivingUintName}%'
+    </if>
+    <if test="materialNo != null and materialNo != ''">
+      and MATERIAL_NO = #{materialNo}
+    </if>
+    <if test="materialName != null and materialName != ''">
+      and MATERIAL_NAME like '%${materialName}%'
+    </if>
+    <if test="meterTypeNo != null and meterTypeNo != ''">
+      and METER_TYPE_NO = #{meterTypeNo}
+    </if>
+    <if test="meterTypeName != null and meterTypeName != ''">
+      and METER_TYPE_NAME = #{meterTypeName}
+    </if>
+    <if test="predictionNo != null and predictionNo != ''">
+      and prediction_no = #{predictionNo}
+    </if>
+    <if test="predictionNo == null or predictionNo == ''">
+      and ((value_flag in  ('0', '1') and TRUST_AVAILABILITY_TIME &gt;= SYSDATE) or value_flag = '4')
+    </if>
+    order By TRUST_DATE_TIME desc
+  </select>
+
 </mapper>

src/main/java/com/steerinfo/pretrack/pretrackscale/service/IPreTrackScaleService.java

@@ -56,4 +56,6 @@ public interface IPreTrackScaleService extends IBaseService<PreTrackScale, Strin
     PreTrackScale checkandaddNotMetter(PreTrackScale scale);
 
     int setPreIndex(PreTrackScale scale);
+    //汽车衡新一次补录界面的委托显示
+    List<PreTrackScale> selectInUseAndNoUse(HashMap<String, Object> model);
 }

src/main/java/com/steerinfo/pretrack/pretrackscale/service/impl/PreTrackScaleServiceImpl.java

@@ -351,6 +351,17 @@ public class PreTrackScaleServiceImpl extends BaseServiceImpl<PreTrackScale, Str
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<PreTrackScale> selectInUseAndNoUse(HashMap<String, Object> model) {
+        String carNo = model.get("carNo") == null ? "": model.get("carNo").toString();
+        if (StringUtils.isEmpty(carNo)) {
+            throw new MarkerMetException(500, "车号为空!!");
+        }
+        List<PreTrackScale> scales = preTrackScaleMapper.selectInUseAndNoUse(model);
+        return scales;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int abolish(List<PreTrackScale> models) {