后端修改

src/main/java/com/jisco/dynamicweight/dynamicworkauditdata/controller/DynamicWorkAuditdataController.java

@@ -167,7 +167,7 @@ public class DynamicWorkAuditdataController extends BaseRESTfulController {
     }
 
     @ApiOperation(value = "导出上传数据到Excel", notes = "导出上传数据到Excel")
-    @GetMapping(value = "/exportUploadDataExcel/{auditingTime1}/{auditingTime2}")
+    @PostMapping(value = "/exportExcel/{auditingTime1}/{auditingTime2}")
     public void exportUploadDataExcel(HttpServletResponse response, @PathVariable String auditingTime1, @PathVariable String auditingTime2) throws IOException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {

src/main/java/com/jisco/dynamicweight/dynamicworkauditdata/service/impl/DynamicWorkAuditdataServiceImpl.java

@@ -135,6 +135,7 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
     @Transactional
     @Override
     public void cancelUpload(List<DynamicWorkAuditdata> list) {
+        Assert.isTrue(!CollectionUtils.isEmpty(list), "请选择需要撤销上传的数据!");
         List<String> ids = new ArrayList<>();
         for (DynamicWorkAuditdata auditdata : list) {
             Assert.isTrue(auditdata.getUploaded().equals("1"), "数据未上传，不能撤销上传:" + auditdata);

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

@@ -11,6 +11,15 @@ public class ReturnedDustDto {
     private BigDecimal weight;
     private String recieverCode;
     private String recieverName;
+    private String recieverType;
+
+    public String getRecieverType() {
+        return recieverType;
+    }
+
+    public void setRecieverType(String recieverType) {
+        this.recieverType = recieverType;
+    }
 
     public String getStationCode() {
         return stationCode;
@@ -78,6 +87,7 @@ public class ReturnedDustDto {
                 ", weight=" + weight +
                 ", recieverCode='" + recieverCode + '\'' +
                 ", recieverName='" + recieverName + '\'' +
+                ", recieverType='" + recieverType + '\'' +
                 '}';
     }
 }

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

@@ -200,6 +200,7 @@ public class DynamicWorkUpdataServiceImpl extends BaseServiceImpl<DynamicWorkUpd
             data.setStationName(returnedDustDto.getStationName());
             data.setRecieverCode(returnedDustDto.getRecieverCode());
             data.setRecieverName(returnedDustDto.getRecieverName());
+            data.setRecieverType(returnedDustDto.getRecieverType());
             data.setSenderCode(updata.getSenderCode());
             data.setSenderName(updata.getSenderName());
             data.setSenderType(updata.getSenderType());

src/main/java/com/jisco/dynamicweight/pika/mapper/CenternetMapper.java

@@ -3,10 +3,11 @@ package com.jisco.dynamicweight.pika.mapper;
 import com.jisco.dynamicweight.pika.model.Centernet;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 @Mapper
 public interface CenternetMapper extends IBaseMapper<Centernet, String> {
-    void cancelUpload(List<Centernet> centernets);
+    void cancelUpload(@Param("centernets") List<Centernet> centernets);
 }

src/main/java/com/jisco/dynamicweight/pika/mapper/CenternetMapper.xml

@@ -2413,13 +2413,13 @@
     </delete>
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-    <!--    撤销上传-->
-<!--    <delete id="batchDelete" parameterType="java.util.List">-->
-<!--        update jgshared."CenterNet"@PIKATEST-->
-<!--        set Delete-->
-<!--        where "Identity" in-->
-<!--        <foreach collection="list" item="id" open="(" close=")" separator=",">-->
-<!--            #{id}-->
-<!--        </foreach>-->
-<!--    </delete>-->
+    <!--        撤销上传-->
+    <delete id="cancelUpload" parameterType="java.util.List">
+        update jgshared."CenterNet"@PIKATEST
+        set "DeletedTag" = 'Y'
+        where "Identity" in
+        <foreach collection="centernets" item="item" open="(" close=")" separator=",">
+            #{item.identity,jdbcType=VARCHAR}
+        </foreach>
+    </delete>
 </mapper>

src/main/java/com/jisco/dynamicweight/pika/service/impl/CenternetServiceImpl.java

@@ -145,11 +145,12 @@ public class CenternetServiceImpl extends BaseServiceImpl<Centernet, String> imp
     @Override
     public void cancelUpload(List<String> list) {
         List<Centernet> centernets = new ArrayList<>();
-//        for (DynamicWorkAuditdata auditdata : list) {
-//            Centernet centernet = this.getById(auditdata.getPikaDataId());
-//            centernet.setDeletedtag("Y");
-//            centernets.add(centernet);
-//        }
-        centernetMapper.batchDelete(list);
+        for (String pikaDataId : list) {
+            Centernet centernet = this.getById(pikaDataId);
+            centernet.setDeletedtag("Y");
+            centernets.add(centernet);
+        }
+        centernetMapper.cancelUpload(centernets);
+//        centernetMapper.batchDelete(list);
     }
 }

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrument/service/impl/MeterWorkMeasuringInstrumentServiceImpl.java

@@ -100,6 +100,13 @@ public class MeterWorkMeasuringInstrumentServiceImpl extends BaseServiceImpl<Met
             if (StringUtils.isEmpty(model.getRailwayNo())) {
                 rm.setMessage("车号不能为空");
                 return rm;
+            }else {
+                Pattern pattern2 = Pattern.compile("[0-9]*");
+                Matcher matcher2 = pattern2.matcher(model.getRailwayNo());
+                if (!matcher2.matches()) {
+                    rm.setMessage("火车号包含字母或者其他特殊字符");
+                    return rm;
+                }
             }
             if (StringUtils.isEmpty(model.getMatterName())){
                 rm.setMessage("物资名称不能为空");
@@ -138,6 +145,7 @@ public class MeterWorkMeasuringInstrumentServiceImpl extends BaseServiceImpl<Met
             models.get(i).setGrossWeight(models.get(i).getGrossWeight().multiply(new BigDecimal(1000)));
             models.get(i).setTareWeight(models.get(i).getTareWeight().multiply(new BigDecimal(1000)));
             models.get(i).setNetWeight(models.get(i).getNetWeight().multiply(new BigDecimal(1000)));
+            models.get(i).setCarrierUnitName(models.get(0).getCarrierUnitName());
             if(i == 0) {
                 if(models.get(i).getGrossTime() == null){
                     rm.setMessage("毛重时间不能为空");