后端修改

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrument/controller/MeterWorkMeasuringInstrumentController.java

@@ -1,27 +1,25 @@
 package com.steerinfo.meterwork.meterworkmeasuringinstrument.controller;
 
-import com.steerinfo.baseinfo.meterbaseunitdirect.model.MeterBaseUnitDirect;
+import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkmeasuringinstrument.model.MeterWorkMeasuringInstrument;
+import com.steerinfo.meterwork.meterworkmeasuringinstrument.model.batchAddInfoBo;
 import com.steerinfo.meterwork.meterworkmeasuringinstrument.service.IMeterWorkMeasuringInstrumentService;
+import com.steerinfo.util.StringUtils;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ArrayList;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.math.BigDecimal;
 
 /**
@@ -150,10 +148,36 @@ public class MeterWorkMeasuringInstrumentController extends BaseRESTfulControlle
 
     @ApiOperation(value = "批量导入", notes = "根据MeterWorkMeasuringInstrument对象批量导入")
     @ApiImplicitParam(paramType = "path",  required = true, dataType = "List<MeterWorkMeasuringInstrument>")
-    @Transactional
+    @Transactional(rollbackFor = MarkerMetException.class)
     @PostMapping(value = "/batchAddInfo")//String
-    public RESTfulResult batchAddInfo(@RequestBody List<MeterWorkMeasuringInstrument> models) {
+    public RESTfulResult batchAddInfo(@RequestBody batchAddInfoBo map) {
         try {
+
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date grossTime = sdf.parse(map.getGrossTime());
+            Date tareTime = sdf.parse(map.getTareTime());
+            List<MeterWorkMeasuringInstrument> models =  map.getList();
+            models.get(0).setGrossTime(grossTime);
+            models.get(0).setTareTime(tareTime);
+//            for(int i=0; i < mapList.size(); i++) {
+//                MeterWorkMeasuringInstrument model = new MeterWorkMeasuringInstrument();
+//                if(i == 0) {
+//                    model.setGrossTime(grossTime);
+//                    model.setTareTime(tareTime);
+//                }
+//                String railwayNo = mapList.get(i).get("railwayNo").toString();
+//                BigDecimal grossWeight = new BigDecimal(mapList.get(i).get("grossWeight").toString());
+//                BigDecimal tareWeight = new BigDecimal(mapList.get(i).get("tareWeight").toString());
+//                model.setRailwayNo(railwayNo);
+//                model.setGrossWeight(grossWeight);
+//                model.setTareWeight(tareWeight);
+//                model.setNetWeight(new BigDecimal(mapList.get(i).get("netWeight").toString()));
+//                model.setMatterName(mapList.get(i).get("matterName").toString());
+//                model.setForwardingUnitName(mapList.get(i).get("forwardingUnitName").toString());
+//                model.setReceivingUintName(mapList.get(i).get("receivingUintName").toString());
+//                model.setCarrierUnitName(mapList.get(i).get("carrierUnitName").toString());
+//                models.add(model);
+//            }
             RESTfulResult rm = meterWorkMeasuringInstrumentService.batchAddInfo(models);
             return rm;
         } catch (Exception ex) {

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrument/model/batchAddInfoBo.java

@@ -0,0 +1,33 @@
+package com.steerinfo.meterwork.meterworkmeasuringinstrument.model;
+
+import java.util.List;
+
+public class batchAddInfoBo {
+    private String grossTime;
+    private String tareTime;
+    List<MeterWorkMeasuringInstrument> list;
+
+    public String getGrossTime() {
+        return grossTime;
+    }
+
+    public void setGrossTime(String grossTime) {
+        this.grossTime = grossTime;
+    }
+
+    public String getTareTime() {
+        return tareTime;
+    }
+
+    public void setTareTime(String tareTime) {
+        this.tareTime = tareTime;
+    }
+
+    public List<MeterWorkMeasuringInstrument> getList() {
+        return list;
+    }
+
+    public void setList(List<MeterWorkMeasuringInstrument> list) {
+        this.list = list;
+    }
+}

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

@@ -147,13 +147,14 @@ public class MeterWorkMeasuringInstrumentServiceImpl extends BaseServiceImpl<Met
                     rm.setMessage("皮重时间不能为空");
                     return rm;
                 }
-                if(models.get(i).getNetTime() == null){
-                    rm.setMessage("净重时间不能为空");
-                    return rm;
+                if(models.get(i).getGrossTime().compareTo(models.get(i).getTareTime()) > 0) {
+                    models.get(i).setNetTime(models.get(i).getGrossTime());
+                }else {
+                    models.get(i).setNetTime(models.get(i).getTareTime());
                 }
                 models.get(i).setGrossTime(new Date(sdfDate.format(models.get(i).getGrossTime())));
                 models.get(i).setTareTime(new Date(sdfDate.format(models.get(i).getTareTime())));
-                models.get(i).setNetTime(new Date(sdfDate.format(models.get(i).getNetTime())));
+//                models.get(i).setNetTime(new Date(sdfDate.format(models.get(i).getNetTime())));
             }else {
                 Calendar grossTime = Calendar.getInstance();
                 Calendar tareTime = Calendar.getInstance();