yzc 1 سال پیش
والد
کامیت
d4fbe86992

+ 2 - 2
hx-common/src/main/java/com/fjhx/common/controller/logistics/LogisticsAmountController.java

@@ -47,8 +47,8 @@ public class LogisticsAmountController {
      * 物流发生额编辑
      */
     @PostMapping("/saveOrEditList")
-    public void saveOrEdit(@RequestBody List<LogisticsAmountDto> list) {
-        logisticsAmountService.saveOrEditList(list);
+    public void saveOrEditList(@RequestBody LogisticsAmountDto dto) {
+        logisticsAmountService.saveOrEditList(dto);
     }
 
 }

+ 4 - 0
hx-common/src/main/java/com/fjhx/common/entity/logistics/dto/LogisticsAmountDto.java

@@ -4,6 +4,8 @@ import com.fjhx.common.entity.logistics.po.LogisticsAmount;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 物流发生额新增编辑入参实体
  *
@@ -14,4 +16,6 @@ import lombok.Setter;
 @Setter
 public class LogisticsAmountDto extends LogisticsAmount {
 
+    List<LogisticsAmount> logisticsAmountList;
+
 }

+ 1 - 1
hx-common/src/main/java/com/fjhx/common/service/logistics/LogisticsAmountService.java

@@ -28,5 +28,5 @@ public interface LogisticsAmountService extends BaseService<LogisticsAmount> {
      */
     void saveOrEdit(LogisticsAmountDto logisticsAmountDto);
 
-    void saveOrEditList(List<LogisticsAmountDto> list);
+    void saveOrEditList(LogisticsAmountDto dto);
 }

+ 6 - 5
hx-common/src/main/java/com/fjhx/common/service/logistics/impl/LogisticsAmountServiceImpl.java

@@ -52,12 +52,13 @@ public class LogisticsAmountServiceImpl extends ServiceImpl<LogisticsAmountMappe
 
     @DSTransactional
     @Override
-    public void saveOrEditList(List<LogisticsAmountDto> list) {
-        for (LogisticsAmountDto dto : list) {
-            Assert.notEmpty(dto.getLogisticsCompanyId(), "物流公司不能为空!");
-            Assert.notEmpty(dto.getYear(), "年份不能为空!");
-            this.saveOrUpdate(dto);
+    public void saveOrEditList(LogisticsAmountDto dto) {
+        List<LogisticsAmount> logisticsAmountList = dto.getLogisticsAmountList();
+        for (LogisticsAmount logisticsAmount : logisticsAmountList) {
+            Assert.notEmpty(logisticsAmount.getLogisticsCompanyId(), "物流公司不能为空!");
+            Assert.notEmpty(logisticsAmount.getYear(), "年份不能为空!");
         }
+        this.editLinked(logisticsAmountList, LogisticsAmount::getLogisticsCompanyId, dto.getLogisticsCompanyId());
     }
 
 }