后端修改

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

@@ -26,6 +26,7 @@ import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.Assert;
 
@@ -106,6 +107,7 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
     }
 
     @Override
+    @Transactional
     public RESTfulResult updateList(List<MeterWorkRailwayReceived> models) {
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
@@ -140,8 +142,8 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
                         AiModel.setMeterWeight(new BigDecimal(model.getAiWeight()));
                         AiModel.setRailwayType(model.getRailwayModelName());
                         AiModel.setRailwaySpeed(model.getRailwaySpeed());
-                        AiModel.setUpdateManNo("systemAdd");
-                        AiModel.setUpdateManName("systemAdd");
+                        AiModel.setUpdateManNo(model.getUpdateManNo());
+                        AiModel.setUpdateManName(model.getUpdateManName());
                         AiModel.setUpdateTime(new Date());
                         AiModel.setValueFlag("0");
                         meterBaseRailwayAiweightMapper.updateByPrimaryKeySelective(AiModel);
@@ -151,25 +153,15 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
                         AiModel.setMeterWeight(new BigDecimal(model.getAiWeight()));
                         AiModel.setRailwayType(model.getRailwayModelName());
                         AiModel.setRailwayTypeNo("001019002");
-                        AiModel.setRailwayTypeNo("动态轨道衡");
+                        AiModel.setRailwayTypeName("动态轨道衡");
                         AiModel.setValueFlag("0");
-                        AiModel.setCreateManNo("systemAdd");
-                        AiModel.setCreateManName("systemAdd");
+                        AiModel.setCreateManNo(model.getUpdateManNo());
+                        AiModel.setCreateManName(model.getUpdateManName());
                         AiModel.setCreateTime(new Date());
                         AiModel.setRailwaySpeed(model.getRailwaySpeed());
                         meterBaseRailwayAiweightMapper.insertSelective(AiModel);
                     }
                 }
-//                meterWorkRailwayReceivedMapper.deleteByPrimaryKey(model.getActualFirstNo());
-//                rm.setData(model.getActualFirstNo());
-//                if(model.getRailwayNo() == null && StringUtils.isEmpty(model.getRailwayNo())) {
-//                    model.setRailwayNo("车号异常");
-//                }
-////            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-////            String afl = sdf.format(new Date());
-////            String no = meterWorkRailwayReceivedMapper.getNewID(afl);
-////            model.setActualFirstNo(sdf.format(new Date()) + no);
-//                meterWorkRailwayReceivedMapper.insertSelective(model);
                 meterWorkRailwayReceivedMapper.updateByPrimaryKeySelective(model);
                 count ++;
             }