Преглед изворни кода

添加删除时 将对应资金申请单状态改为未转账状态

y пре 2 година
родитељ
комит
cde53d3e79

+ 5 - 0
src/main/java/com/ydtech/modules/inv/model/InvAccountOperate.java

@@ -152,6 +152,11 @@ public class InvAccountOperate implements Serializable {
     @ApiModelProperty(value = "发票序号")
     private String invoiceId;
 
+    /**
+     * 资金申请单序号
+     */
+    private String excelAccountOperateId;
+
     @ApiModelProperty(value = "外部转内部需携带转入银行卡id")
     @TableField(exist = false)
     private String enterCardId;

+ 5 - 0
src/main/java/com/ydtech/modules/inv/service/impl/InvAccountExcelServiceImpl.java

@@ -140,10 +140,14 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
             InvAccountOperate invAccountOperate = insertOutAccountOperate(invAccountExcel);
             invAccountOperate.setDel(String.valueOf(date.getTime()));
             invAccountOperate.setOutCardNum(outAccountCard.getBankCardNum());
+            invAccountOperate.setExcelAccountOperateId(invAccountExcel.getExcelAccountOperateId());
+
             InvAccountOperate invAccountOperate1 = insertRevenueAccountOperate(invAccountExcel);
             invAccountOperate1.setEnterCardNum(enterAccountCard.getBankCardNum());
             invAccountOperate1.setOutCardNum(invAccountOperate.getOutCardNum());
             invAccountOperate1.setDel(String.valueOf(date.getTime()));
+            invAccountOperate1.setExcelAccountOperateId(invAccountExcel.getExcelAccountOperateId());
+
             //支出信息
             list.add(invAccountOperate);
             //收入信息
@@ -166,6 +170,7 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
             }
             InvAccountOperate invAccountOperate = insertOutAccountOperate(invAccountExcel);
             invAccountOperate.setOutCardNum(outAccountCard.getBankCardNum());
+            invAccountOperate.setExcelAccountOperateId(invAccountExcel.getExcelAccountOperateId());
             insAccountOperateService.save(invAccountOperate);
             JSONObject outProfit = invAccountExcel.getOutProfit();
             outJsonUtil(invAccountExcel, outProfit, outAccount, outAccountCard,invAccountOperate.getAccountOperateId());

+ 12 - 0
src/main/java/com/ydtech/modules/inv/service/impl/InvAccountOperateServiceImpl.java

@@ -24,6 +24,7 @@ import java.io.File;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -50,6 +51,8 @@ public class InvAccountOperateServiceImpl extends ServiceImpl<InvAccountOperateM
 
     @Autowired
     private InvAccountService invAccountService;
+    @Autowired
+    private InvAccountExcelService invAccountExcelService;
 
     @Autowired
     private InvAccountProfitService invAccountProfitService;
@@ -237,6 +240,15 @@ public class InvAccountOperateServiceImpl extends ServiceImpl<InvAccountOperateM
                 invAccountIncoiceService.updateById(byId);
             }
 
+            if (invAccountOperate.getExcelAccountOperateId() != null){
+                InvAccountExcel invAccountExcel = new InvAccountExcel();
+                invAccountExcel.setExcelAccountOperateId(invAccountOperate.getExcelAccountOperateId());
+                invAccountExcel.setUpdateBy(baseController.getUserName());
+                invAccountExcel.setUpdateTime(new Date());
+                invAccountExcel.setTransferFlag("1");
+                invAccountExcelService.updateById(invAccountExcel);
+            }
+
             invAccountOpService.removeBatchByIds(list);
             invAccountCardService.updateBatchById(invAccountCards);
             InvAccountOperateService invAccountOperateService = new InvAccountOperateServiceImpl();