Просмотр исходного кода

财务 应收管理 应收应付功能修改

785834757 2 лет назад
Родитель
Сommit
0e0c3e8bde

+ 7 - 0
src/main/java/com/ydtech/modules/inv/controller/InvReceivableController.java

@@ -115,6 +115,13 @@ public class InvReceivableController extends BaseController {
         return b ? HttpResult.ok("修改成功") : HttpResult.error("修改失败");
     }
 
+    @ApiOperation("结算导入数据批量修改")
+    @PostMapping("updateSettlementBatch")
+    public HttpResult updateSettlementBatch(@RequestBody InvSettlementSource invSettlementSource){
+        Boolean b = invReceivableService.updateSettlementBatch(invSettlementSource);
+        return b ? HttpResult.ok("修改成功") : HttpResult.error("修改失败");
+    }
+
     @ApiOperation("结算导出")
     @PostMapping("exportSettlement")
     public HttpResult<PageResult> exportSettlement(@RequestBody InvSettlementSourceQueryVo invSettlementSourceQueryVo) throws IOException {

+ 17 - 1
src/main/java/com/ydtech/modules/inv/model/po/InvSettlementSource.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.inv.model.po;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -23,6 +24,7 @@ import lombok.EqualsAndHashCode;
 @TableName(value ="inv_settlement_source")
 @Data
 @EqualsAndHashCode
+@ExcelIgnoreUnannotated
 @HeadFontStyle(fontHeightInPoints = 10)
 public class InvSettlementSource implements Serializable {
 
@@ -32,7 +34,11 @@ public class InvSettlementSource implements Serializable {
      */
     @TableId(value = "id")
     @ApiModelProperty("编号")
-    private Long id;
+    private String id;
+
+    @TableField(exist = false)
+    @ApiModelProperty("ids")
+    private String[] ids;
 
     /**
      * 工号
@@ -194,6 +200,16 @@ public class InvSettlementSource implements Serializable {
     @ExcelProperty("非车出口比例")
     private BigDecimal nonVehicleExportRatio;
 
+    @TableField(value = "subsidy_ratio")
+    @ExcelProperty("补贴比例")
+    @ApiModelProperty("补贴比例")
+    private BigDecimal subsidyRatio;
+
+    @TableField(value = "subsidy_amount")
+    @ExcelProperty("补贴金额")
+    @ApiModelProperty("补贴金额")
+    private BigDecimal subsidyAmount;
+
     /**
      * 结算金额
      */

+ 2 - 0
src/main/java/com/ydtech/modules/inv/service/InvReceivableService.java

@@ -54,4 +54,6 @@ public interface InvReceivableService {
 
     Boolean updateRecivableBatch(InvSource invSource);
 
+    Boolean updateSettlementBatch(InvSettlementSource invSettlementSource);
+
 }

+ 17 - 0
src/main/java/com/ydtech/modules/inv/service/impl/InvReceivableServiceImpl.java

@@ -511,6 +511,8 @@ public class InvReceivableServiceImpl implements InvReceivableService {
                 invSource.getJqPremiumTax().multiply(invSource.getMaxJqReceivableRatio())
                         .add(invSource.getSyPremiumTax().multiply(invSource.getMaxSyReceivableRatio()))
                         .add(invSource.getNonCarPremiumTax().multiply(invSource.getMaxNonCarReceivableRatio())));
+        invSource.setClearingState("未结算".equals(invSource.getClearingState()) ? "0" :
+                "已结算".equals(invSource.getClearingState()) ? "1" : invSource.getClearingState());
 
         return invSourceMapper.updateById(invSource) > 0 ? true : false;
     }
@@ -649,6 +651,21 @@ public class InvReceivableServiceImpl implements InvReceivableService {
         return true;
     }
 
+    @Override
+    public Boolean updateSettlementBatch(InvSettlementSource invSettlementSource) {
+        List<String> list = Arrays.asList(invSettlementSource.getIds());
+        List<InvSettlementSource> invSettlementSources = invSettlementSourceMapper.selectBatchIds(list);
+        invSettlementSources.forEach(x -> {
+            x.setBusinessOwner(invSettlementSource.getBusinessOwner());
+            x.setCompulsoryExportRatio(invSettlementSource.getCompulsoryExportRatio());
+            x.setCommercialExportRatio(invSettlementSource.getCommercialExportRatio());
+            x.setNonVehicleExportRatio(invSettlementSource.getNonVehicleExportRatio());
+            invSettlementSourceMapper.updateById(x);
+        });
+        return true;
+
+    }
+
 }