新增金额撤销

新增报表查看

src/main/java/com/ydtech/modules/inv/controller/InvAccountController.java

@@ -13,8 +13,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.sql.Wrapper;
-
 
 /**
  * @author jianlong
@@ -36,6 +34,13 @@ public class InvAccountController {
         return invAccountService.selectAccountExcel(invAccountQueryVo);
     }
 
+
+    @PostMapping("look")
+    @ApiOperation("报表查看")
+    public HttpResult look(@RequestBody InvAccountQueryVo invAccountQueryVo) {
+        return invAccountService.look(invAccountQueryVo);
+    }
+
     @PostMapping("accountExcel")
     @ApiOperation("账户信息导出")
     public HttpResult accountExcel(@RequestBody InvAccountQueryVo invAccountQueryVo) {

src/main/java/com/ydtech/modules/inv/controller/InvAccountIncoiceController.java

@@ -11,11 +11,9 @@ import com.ydtech.modules.inv.model.InvAccountIncoice;
 import com.ydtech.modules.inv.model.InvAccountIncoiceResult;
 import com.ydtech.modules.inv.model.vo.InvAccountIncoiceQueryVo;
 import com.ydtech.modules.inv.service.InvAccountIncoiceService;
-import com.ydtech.modules.inv.service.InvAccountOpService;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,8 +21,6 @@ import javax.annotation.Resource;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.DoubleStream;
 
 import static com.ydtech.modules.inv.service.impl.InvAccountIncoiceServiceImpl.getBigDecimal;
 import static com.ydtech.modules.inv.utils.TransferUtils.isProfitFull;

src/main/java/com/ydtech/modules/inv/controller/InvAccountOperateController.java

@@ -3,7 +3,6 @@ package com.ydtech.modules.inv.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.exception.SystemException;
 import com.ydtech.modules.inv.model.InvAccountOperate;
 import com.ydtech.modules.inv.service.InvAccountOperateService;
 import io.swagger.annotations.Api;
@@ -11,9 +10,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
-import java.util.Map;
-
 import static com.ydtech.modules.inv.utils.TransferUtils.isProfitFull;
 
 
@@ -58,4 +54,11 @@ public class InvAccountOperateController {
         isProfitFull(outProfit, entProfit);
         return invAccountOperateService.insert(accountOperate);
     }
+
+
+    @GetMapping("delete")
+    @ApiOperation("撤销账户操作")
+    public HttpResult deleteAccountOperate(@RequestParam("accountOperateId") String accountOperateId) {
+        return invAccountOperateService.deleteById(accountOperateId);
+    }
 }

src/main/java/com/ydtech/modules/inv/controller/InvChannelsExternalBillsDetailsController.java

@@ -9,23 +9,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.constants.enums.dict.finance.CheckingStatusEnum;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.admin.model.dto.SysUserDto;
-import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.base.controller.BaseController;
-import com.ydtech.modules.base.model.dto.BaseDto;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.inv.model.InvChannelsExternalBillsDetails;
 import com.ydtech.modules.inv.model.InvChannelsExternalBillsDetailsHistory;
-import com.ydtech.modules.inv.model.InvExternalBills;
 import com.ydtech.modules.inv.model.InvInsExternalBillsDetails;
 import com.ydtech.modules.inv.model.dto.InvInsCompanyDto;
-import com.ydtech.modules.inv.model.dto.InvInsImportDto;
-import com.ydtech.modules.inv.model.vo.InvInsCompanyVo;
-import com.ydtech.modules.inv.model.vo.req.InvInsExternalBillsDetailsReqVO;
 import com.ydtech.modules.inv.service.InvChannelsExternalBillsDetailsHistoryService;
 import com.ydtech.modules.inv.service.InvChannelsExternalBillsDetailsService;
 import com.ydtech.modules.inv.service.InvInsExternalBillsDetailsService;
@@ -35,14 +27,11 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

src/main/java/com/ydtech/modules/inv/controller/InvExternalBillsController.java

@@ -1,32 +1,19 @@
 package com.ydtech.modules.inv.controller;
 
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
-import com.ydtech.exception.SystemException;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.base.model.dto.PageDto;
-import com.ydtech.modules.base.model.dto.TestDto;
 import com.ydtech.modules.base.model.vo.PageVo;
-import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
-import com.ydtech.modules.fnc.vo.FncVoucherVo;
-import com.ydtech.modules.ins.utils.ExcelStyleUtil;
-import com.ydtech.modules.inv.model.InvBaseExternalBillsDetails;
-import com.ydtech.modules.inv.model.InvChannelsExternalBillsDetails;
 import com.ydtech.modules.inv.model.InvExternalBills;
 import com.ydtech.modules.inv.model.InvInsExternalBillsDetails;
 import com.ydtech.modules.inv.model.dto.InvInsCompanyDto;
 import com.ydtech.modules.inv.model.dto.InvInsImportDto;
-import com.ydtech.modules.inv.model.vo.InsChannelMatchVo;
 import com.ydtech.modules.inv.model.vo.InvInsCompanyExportVo;
 import com.ydtech.modules.inv.model.vo.InvInsCompanyVo;
 import com.ydtech.modules.inv.model.vo.req.InvChannelExternalBillsDetailsReqVO;
@@ -37,10 +24,7 @@ import com.ydtech.modules.inv.service.InvExternalBillsService;
 import com.ydtech.modules.inv.service.InvInsExternalBillsDetailsService;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.excel.ExcelEasypoiUtils;
-import com.ydtech.utils.excel.ExcelUtils2;
 import io.swagger.annotations.*;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -48,7 +32,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

src/main/java/com/ydtech/modules/inv/controller/InvInsExternalBillsDetailsController.java

@@ -15,7 +15,6 @@ import com.ydtech.modules.inv.service.InvInsExternalBillsDetailsService;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

src/main/java/com/ydtech/modules/inv/controller/InvInvoiceInfoController.java

@@ -23,7 +23,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
 import java.util.List;
 
 /**

src/main/java/com/ydtech/modules/inv/controller/InvReceivableController.java

@@ -228,16 +228,4 @@ public class InvReceivableController extends BaseController {
         return HttpResult.ok("", false);
     }
 
-    @ApiOperation("获取应收模版")
-    @GetMapping("/getAccountsReceivable")
-    public HttpResult<String> getAccountsReceivable() {
-        return HttpResult.ok("", "/template/finance/accountsReceivable.xlsx");
-    }
-
-    @ApiOperation("获取结算模板")
-    @GetMapping("/getSettlement")
-    public HttpResult<String> getSettlement() {
-        return HttpResult.ok("", "/template/finance/settlement.xlsx");
-    }
-
 }

src/main/java/com/ydtech/modules/inv/controller/InvSettlementSourController.java

@@ -5,7 +5,10 @@ import com.ydtech.modules.inv.service.InvReceivableService;
 import com.ydtech.modules.inv.service.InvSettlementSourceService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
 

src/main/java/com/ydtech/modules/inv/controller/InvSourceController.java

@@ -1,14 +1,14 @@
 package com.ydtech.modules.inv.controller;
 
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.inv.model.excel.InvSourceExcel;
-import com.ydtech.modules.inv.model.po.InvSource;
 import com.ydtech.modules.inv.service.InvReceivableService;
 import com.ydtech.modules.inv.service.InvSourceService;
-import com.ydtech.modules.inv.utils.EasyExcelUtils;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
 

src/main/java/com/ydtech/modules/inv/controller/invAccountExcelController.java

@@ -5,21 +5,15 @@ import com.ydtech.constants.enums.inv.InvPayMethodEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.base.controller.BaseController;
-import com.ydtech.modules.inv.model.InvAccount;
-import com.ydtech.modules.inv.model.InvAccountCard;
 import com.ydtech.modules.inv.model.InvAccountExcel;
-import com.ydtech.modules.inv.service.InvAccountCardService;
 import com.ydtech.modules.inv.service.InvAccountExcelService;
-import com.ydtech.modules.inv.service.InvAccountService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 import static com.ydtech.modules.inv.utils.TransferUtils.isProfitFull;
 

src/main/java/com/ydtech/modules/inv/controller/invAccountProfitController.java

@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
 import java.util.List;
 
 /**

src/main/java/com/ydtech/modules/inv/model/InvAccount.java

@@ -1,11 +1,8 @@
 package com.ydtech.modules.inv.model;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/ydtech/modules/inv/model/InvAccountCard.java

@@ -1,6 +1,5 @@
 package com.ydtech.modules.inv.model;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/com/ydtech/modules/inv/model/InvAccountExcel.java

@@ -9,15 +9,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 资金申请单表

src/main/java/com/ydtech/modules/inv/model/InvAccountExpenses.java

@@ -3,14 +3,14 @@ package com.ydtech.modules.inv.model;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 费用支出明细表
  * @TableName ins_account_expenses

src/main/java/com/ydtech/modules/inv/model/InvAccountIncoice.java

@@ -11,9 +11,9 @@ import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.util.Date;
 
 /**
  * 发票管理表(InvAccountIncoice)表实体类

src/main/java/com/ydtech/modules/inv/model/InvAccountOp.java

@@ -4,8 +4,6 @@ package com.ydtech.modules.inv.model;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 
-import java.io.Serializable;
-
 /**
  * (InvAccountOp)表实体类
  *
@@ -32,5 +30,8 @@ public class InvAccountOp extends Model<InvAccountOp> {
     //发票序号
     private String invoiceId;
 
+    //操作id
+    private String accountOperateId;
+
 }
 

src/main/java/com/ydtech/modules/inv/model/InvAccountOpDto.java

@@ -0,0 +1,16 @@
+package com.ydtech.modules.inv.model;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author jianlong
+ * @date 2024-02-05 15:08
+ */
+@Data
+public class InvAccountOpDto {
+    private List<Map<String, String>> head;
+    private List<Map<String, String>> maps;
+}

src/main/java/com/ydtech/modules/inv/model/InvAccountOperate.java

@@ -11,15 +11,15 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
 /**
  * 账户操作记录表
  * @TableName ins_account_operate
@@ -61,6 +61,7 @@ public class InvAccountOperate implements Serializable {
 
     @ApiModelProperty("无需传递")
     @ExcelProperty("板块")
+    @TableField(exist = false)
     private String plate;
 
     /**
@@ -141,6 +142,10 @@ public class InvAccountOperate implements Serializable {
     @ApiModelProperty(value = "收入0支出1")
     private String revenueOutlay;
 
+
+    @ApiModelProperty("删除唯一标识无需传递")
+    private String del;
+
     /**
      *发票序号
      */

src/main/java/com/ydtech/modules/inv/model/InvBaseExternalBillsDetails.java

@@ -1,9 +1,7 @@
 package com.ydtech.modules.inv.model;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/ydtech/modules/inv/model/InvCompany.java

@@ -10,7 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 
 @TableName(value = "inv_company")

src/main/java/com/ydtech/modules/inv/model/InvExternalBills.java

@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ydtech.constants.enums.dict.IBaseEnum;
 import com.ydtech.utils.BigDecimalUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.poi.ss.formula.functions.T;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.io.Serializable;

src/main/java/com/ydtech/modules/inv/model/InvInsExternalBillsDetails.java

@@ -1,6 +1,5 @@
 package com.ydtech.modules.inv.model;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/com/ydtech/modules/inv/model/InvInvoiceInfo.java

@@ -5,16 +5,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydtech.modules.base.model.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * 发票信息
  *

src/main/java/com/ydtech/modules/inv/model/InvInvoiceInfoInOut.java

@@ -1,15 +1,12 @@
 package com.ydtech.modules.inv.model;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydtech.modules.base.model.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.tomcat.util.modeler.BaseModelMBean;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

src/main/java/com/ydtech/modules/inv/model/InvPayableStatement.java

@@ -5,13 +5,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
-import lombok.Data;
-
 /**
  * 应付明细表
  *
@@ -203,4 +202,4 @@ public class InvPayableStatement implements Serializable {
         sb.append("]");
         return sb.toString();
     }
-}
+}

src/main/java/com/ydtech/modules/inv/model/dto/InvBaseExcelDto.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.inv.model.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.math.BigDecimal;

src/main/java/com/ydtech/modules/inv/model/dto/InvInsChinaCoalExcelDto.java

@@ -2,10 +2,6 @@ package com.ydtech.modules.inv.model.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;

src/main/java/com/ydtech/modules/inv/model/dto/InvInsCompanyDto.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 

src/main/java/com/ydtech/modules/inv/model/dto/InvInsExcelDto.java

@@ -1,11 +1,8 @@
 package com.ydtech.modules.inv.model.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.ydtech.modules.inv.model.InvBaseExternalBillsDetails;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 财务 - 保险公司 - 标准Excel模板 DTO
  */

src/main/java/com/ydtech/modules/inv/model/dto/InvInsImportDto.java

@@ -3,8 +3,6 @@ package com.ydtech.modules.inv.model.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.constraints.NotNull;
 

src/main/java/com/ydtech/modules/inv/model/excel/AccountExcel.java

@@ -1,13 +1,6 @@
 package com.ydtech.modules.inv.model.excel;
 
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ContentStyle;
-import com.alibaba.excel.enums.poi.BorderStyleEnum;
-import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
-import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
-import com.google.gson.JsonObject;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;

src/main/java/com/ydtech/modules/inv/model/excel/InvSettlementSourceExcel.java

@@ -1,18 +1,10 @@
 package com.ydtech.modules.inv.model.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * 结算来源表

src/main/java/com/ydtech/modules/inv/model/excel/InvSourceExcel.java

@@ -1,13 +1,11 @@
 package com.ydtech.modules.inv.model.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * 来源表

src/main/java/com/ydtech/modules/inv/model/po/InvChannelAccount.java

@@ -3,12 +3,12 @@ package com.ydtech.modules.inv.model.po;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * 渠道账户表
  * @TableName inv_channel_account

src/main/java/com/ydtech/modules/inv/model/po/InvSettlementSource.java

@@ -3,20 +3,17 @@ 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;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 /**
  * 结算来源表
  * @TableName inv_settlement_source

src/main/java/com/ydtech/modules/inv/model/po/InvSource.java

@@ -2,25 +2,18 @@ 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.ContentFontStyle;
-import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
-import com.alibaba.excel.annotation.write.style.HeadStyle;
-import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 /**
  * 来源表
  * @TableName inv_source

src/main/java/com/ydtech/modules/inv/model/po/QueryInvChannelAccount.java

@@ -1,13 +1,9 @@
 package com.ydtech.modules.inv.model.po;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.ydtech.core.page.PageRequest;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 渠道账户表

src/main/java/com/ydtech/modules/inv/model/vo/InsChannelMatchVo.java

@@ -1,15 +1,11 @@
 package com.ydtech.modules.inv.model.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.inv.model.vo.res.InvBaseChannelMatchInsResVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  *  财务  保司、渠道 匹配 VO
  *

src/main/java/com/ydtech/modules/inv/model/vo/InvAccountQueryVo.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data

src/main/java/com/ydtech/modules/inv/model/vo/InvInsCompanyExportVo.java

@@ -1,8 +1,6 @@
 package com.ydtech.modules.inv.model.vo;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;

src/main/java/com/ydtech/modules/inv/model/vo/InvSettlementSourceQueryVo.java

@@ -10,7 +10,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 
 /**
  * 结算来源表

src/main/java/com/ydtech/modules/inv/model/vo/InvSourceQueryVo.java

@@ -1,9 +1,7 @@
 package com.ydtech.modules.inv.model.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydtech.core.page.PageRequest;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,7 +9,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 
 /**
  * 来源表

src/main/java/com/ydtech/modules/inv/model/vo/ReceivableAndSettlementQueryVo.java

@@ -1,9 +1,6 @@
 package com.ydtech.modules.inv.model.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.ydtech.core.page.PageRequest;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/ydtech/modules/inv/model/vo/ReceivableAndSettlementVo.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.inv.model.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
-import com.ydtech.modules.nai.httpvo.excel.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/ydtech/modules/inv/model/vo/ReceivableResultVo.java

@@ -1,8 +1,6 @@
 package com.ydtech.modules.inv.model.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ydtech.modules.nai.httpvo.excel.Excel;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/ydtech/modules/inv/model/vo/SettlementSourceDataVo.java

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
 
 @Data
 public class SettlementSourceDataVo {

src/main/java/com/ydtech/modules/inv/model/vo/SettlementSourceResultVo.java

@@ -1,7 +1,5 @@
 package com.ydtech.modules.inv.model.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/ydtech/modules/inv/model/vo/req/InvChannelExternalBillsDetailsReqVO.java

@@ -1,7 +1,5 @@
 package com.ydtech.modules.inv.model.vo.req;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ydtech.core.page.BasePageVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/ydtech/modules/inv/model/vo/res/InvBaseChannelMatchInsResVO.java

@@ -1,13 +1,9 @@
 package com.ydtech.modules.inv.model.vo.res;
 
-import com.ydtech.core.page.BasePageVO;
-import com.ydtech.modules.inv.model.InvBaseExternalBillsDetails;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * 财务 - 基础 渠道匹配保司数据  响应
  *

src/main/java/com/ydtech/modules/inv/service/InvAccountCardService.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.inv.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.modules.inv.model.InvAccount;
 import com.ydtech.modules.inv.model.InvAccountCard;
 import org.springframework.stereotype.Service;
 

src/main/java/com/ydtech/modules/inv/service/InvAccountOperateService.java

@@ -1,9 +1,9 @@
 package com.ydtech.modules.inv.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.inv.model.InvAccountOperate;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
 * @author Administrator
@@ -20,4 +20,6 @@ public interface InvAccountOperateService extends IService<InvAccountOperate> {
 
 
     HttpResult excelAccount(InvAccountOperate accountOperate);
+
+    HttpResult deleteById(String accountOperateId);
 }

src/main/java/com/ydtech/modules/inv/service/InvAccountService.java

@@ -1,13 +1,11 @@
 package com.ydtech.modules.inv.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.inv.model.InvAccount;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.inv.model.vo.InvAccountQueryVo;
 
-import java.util.List;
-
 /**
 * @author Administrator
 * @description 针对表【ins_account(账户信息表)】的数据库操作Service
@@ -25,4 +23,6 @@ public interface InvAccountService extends IService<InvAccount> {
     HttpResult selectAccountExcel(InvAccountQueryVo invAccountQueryVo);
 
     HttpResult selectAccountList(InvAccountQueryVo invAccountQueryVo);
+
+    HttpResult look(InvAccountQueryVo invAccountQueryVo);
 }

src/main/java/com/ydtech/modules/inv/service/InvChannelsExternalBillsDetailsHistoryService.java

@@ -1,14 +1,7 @@
 package com.ydtech.modules.inv.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.inv.model.InvChannelsExternalBillsDetails;
 import com.ydtech.modules.inv.model.InvChannelsExternalBillsDetailsHistory;
-import com.ydtech.modules.inv.model.InvExternalBills;
-import com.ydtech.modules.inv.model.vo.req.InvChannelExternalBillsDetailsReqVO;
-import com.ydtech.modules.inv.model.vo.res.InvBaseChannelMatchInsResVO;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 

src/main/java/com/ydtech/modules/inv/service/InvChannelsExternalBillsDetailsService.java

@@ -1,16 +1,10 @@
 package com.ydtech.modules.inv.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.inv.model.InvChannelsExternalBillsDetails;
-import com.ydtech.modules.inv.model.InvExternalBills;
-import com.ydtech.modules.inv.model.vo.req.InvChannelExternalBillsDetailsReqVO;
-import com.ydtech.modules.inv.model.vo.res.InvBaseChannelMatchInsResVO;
-import com.ydtech.modules.inv.model.vo.res.InvChannelMatchInsResVO;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;

src/main/java/com/ydtech/modules/inv/service/InvExternalBillsService.java

@@ -1,13 +1,11 @@
 package com.ydtech.modules.inv.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.modules.admin.model.vo.SysReferrerVo;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.inv.model.InvExternalBills;
 import com.ydtech.modules.inv.model.dto.InvInsImportDto;
 import com.ydtech.modules.inv.model.vo.InvInsCompanyVo;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.multipart.MultipartFile;
 
 /**

src/main/java/com/ydtech/modules/inv/service/InvInsExternalBillsDetailsService.java

@@ -1,10 +1,9 @@
 package com.ydtech.modules.inv.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.inv.model.InvExternalBills;
 import com.ydtech.modules.inv.model.InvInsExternalBillsDetails;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.inv.model.dto.InvInsImportDto;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.multipart.MultipartFile;
 
 /**

src/main/java/com/ydtech/modules/inv/service/InvPayableStatementService.java

@@ -1,7 +1,7 @@
 package com.ydtech.modules.inv.service;
 
-import com.ydtech.modules.inv.model.InvPayableStatement;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.inv.model.InvPayableStatement;
 
 import java.util.List;
 

src/main/java/com/ydtech/modules/inv/service/InvSettlementSourceService.java

@@ -3,7 +3,6 @@ package com.ydtech.modules.inv.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.inv.model.po.InvSettlementSource;
-import org.springframework.beans.factory.annotation.Value;
 
 import java.util.List;
 

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountCardServiceImpl.java

@@ -1,9 +1,7 @@
 package com.ydtech.modules.inv.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.inv.dao.InvAccountCardMapper;
-import com.ydtech.modules.inv.model.InvAccount;
 import com.ydtech.modules.inv.model.InvAccountCard;
 import com.ydtech.modules.inv.service.InvAccountCardService;
 import com.ydtech.modules.inv.service.InvAccountService;
@@ -11,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 
 /**

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountExcelServiceImpl.java

@@ -5,27 +5,22 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 import com.ydtech.constants.enums.inv.InvPayMethodEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.inv.dao.InvAccountExcelMapper;
 import com.ydtech.modules.inv.model.*;
 import com.ydtech.modules.inv.service.*;
 import com.ydtech.modules.inv.utils.EasyExcelUtils;
-import com.ydtech.modules.inv.utils.TransferUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 import static com.ydtech.modules.inv.utils.TransferUtils.*;
 
@@ -137,39 +132,54 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
 
             //内部转账操作
             List<InvAccountOperate> list = new ArrayList<>();
-            JSONObject outProfit = invAccountExcel.getOutProfit();
-            JSONObject entProfit = invAccountExcel.getEntProfit();
-            outJsonUtil(invAccountExcel, outProfit, outAccount, outAccountCard);
-            entJsonUtil(invAccountExcel, entProfit, enterAccount, enterAccountCard);
 
+
+            //放入关联删除标识
+            Date date = new Date();
+            InvAccountOperate invAccountOperate = insertOutAccountOperate(invAccountExcel);
+            invAccountOperate.setDel(String.valueOf(date.getTime()));
+            invAccountOperate.setOutCardNum(outAccountCard.getBankCardNum());
+            InvAccountOperate invAccountOperate1 = insertRevenueAccountOperate(invAccountExcel);
+            invAccountOperate1.setEnterCardNum(enterAccountCard.getBankCardNum());
+            invAccountOperate1.setOutCardNum(invAccountOperate.getOutCardNum());
+            invAccountOperate1.setDel(String.valueOf(date.getTime()));
             //支出信息
-            list.add(insertOutAccountOperate(invAccountExcel));
+            list.add(invAccountOperate);
             //收入信息
-            list.add(insertRevenueAccountOperate(invAccountExcel));
+            list.add(invAccountOperate1);
 
             if (!insAccountOperateService.saveBatch(list)) {
                 throw new RuntimeException("添加转账信息失败");
             }
+
+            JSONObject outProfit = invAccountExcel.getOutProfit();
+            JSONObject entProfit = invAccountExcel.getEntProfit();
+            outJsonUtil(invAccountExcel, outProfit, outAccount, outAccountCard,list.get(0).getAccountOperateId());
+            entJsonUtil(invAccountExcel, entProfit, enterAccount, enterAccountCard, list.get(1).getAccountOperateId());
+
         } else {
             //内转外部转账
             List<InvAccountCard> invAccounts = enterDeTransfer(outAccountCard, outAccount, enterAccountCard, enterAccount, applyAmount);
             if (!invAccountCardService.saveBatch(invAccounts)) {
                 throw new RuntimeException("添加转账信息失败");
             }
+            InvAccountOperate invAccountOperate = insertOutAccountOperate(invAccountExcel);
+            invAccountOperate.setOutCardNum(outAccountCard.getBankCardNum());
+            insAccountOperateService.save(invAccountOperate);
             JSONObject outProfit = invAccountExcel.getOutProfit();
-            outJsonUtil(invAccountExcel, outProfit, outAccount, outAccountCard);
-            insAccountOperateService.save(insertOutAccountOperate(invAccountExcel));
+            outJsonUtil(invAccountExcel, outProfit, outAccount, outAccountCard,invAccountOperate.getAccountOperateId());
+
         }
         return HttpResult.ok("", insAccountExcelMapper.updateById(invAccountExcel));
     }
 
-    private void outJsonUtil(InvAccountExcel invAccountExcel, JSONObject outProfit, InvAccount outAccount, InvAccountCard outCard) {
-        List<InvAccountOp> list = invAccountOutOpList(outProfit, outAccount, outCard, invAccountExcel.getApplyAmount());
+    private void outJsonUtil(InvAccountExcel invAccountExcel, JSONObject outProfit, InvAccount outAccount, InvAccountCard outCard,String operateId) {
+        List<InvAccountOp> list = invAccountOutOpList(outProfit, outAccount, outCard, invAccountExcel.getApplyAmount(),operateId);
         insAccountOpService.saveBatch(list);
     }
 
-    private void entJsonUtil(InvAccountExcel invAccountExcel, JSONObject outProfit, InvAccount entAccount, InvAccountCard entCard) {
-        List<InvAccountOp> list = invAccountEntOpList(outProfit, entAccount, entCard, invAccountExcel.getApplyAmount());
+    private void entJsonUtil(InvAccountExcel invAccountExcel, JSONObject outProfit, InvAccount entAccount, InvAccountCard entCard,String operateId) {
+        List<InvAccountOp> list = invAccountEntOpList(outProfit, entAccount, entCard, invAccountExcel.getApplyAmount(),operateId);
         insAccountOpService.saveBatch(list);
     }
 

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountIncoiceServiceImpl.java

@@ -4,8 +4,6 @@ package com.ydtech.modules.inv.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 import com.ydtech.constants.enums.inv.InvoiceTypeEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
@@ -14,7 +12,6 @@ import com.ydtech.modules.inv.model.*;
 import com.ydtech.modules.inv.model.vo.InvAccountIncoiceQueryVo;
 import com.ydtech.modules.inv.service.*;
 import com.ydtech.modules.inv.utils.EasyExcelUtils;
-import com.ydtech.modules.inv.utils.TransferUtils;
 import com.ydtech.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -26,8 +23,8 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 import static com.ydtech.modules.inv.utils.TransferUtils.*;
 
@@ -122,6 +119,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
         //资金流出
         String fundFlow = invAccountIncoice1.getOtherUnit() + "→" + invAccountIncoice1.getInvoiceBy();
 
+        Date date = new Date();
 
         //收入操作记录
         InvAccountOperate invAccountOperate = new InvAccountOperate();
@@ -136,6 +134,9 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
         invAccountOperate.setInvoiceId(invAccountIncoice1.getInvoiceId());
         invAccountOperate.setCreateTime(LocalDateTime.now());
         invAccountOperate.setEntProfit(entProfit);
+        invAccountOperate.setDel(String.valueOf(date.getTime()));
+        invAccountOperate.setOutCardNum(outCard.getBankCardNum());
+        invAccountOperate.setEnterCardNum(entCard.getBankCardNum());
 
         //支出操作记录
         InvAccountOperate outInvAccountOperate = new InvAccountOperate();
@@ -150,21 +151,11 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
         outInvAccountOperate.setInvoiceId(invAccountIncoice1.getInvoiceId());
         outInvAccountOperate.setCreateTime(LocalDateTime.now());
         outInvAccountOperate.setOutProfit(outProfit);
+        outInvAccountOperate.setDel(String.valueOf(date.getTime()));
+        outInvAccountOperate.setOutCardNum(outCard.getBankCardNum());
+        outInvAccountOperate.setEnterCardNum(entCard.getBankCardNum());
 
 
-        //归属列表
-        List<InvAccountOp> list = new ArrayList<>();
-        List<InvAccountOp> list1 = invAccountEntOpList(entProfit, revInvAccount, entCard, payoutMoney);
-        List<InvAccountOp> list2 = invAccountOutOpList(outProfit, outInvAccount, outCard, payoutMoney);
-        //将发票id放入  防止撤销发票时对应归属没删掉
-        list1.forEach(invAccountOp -> {
-            invAccountOp.setInvoiceId(invAccountIncoice1.getInvoiceId());
-        });
-        list2.forEach(invAccountOp -> {
-            invAccountOp.setInvoiceId(invAccountIncoice1.getInvoiceId());
-        });
-        list.addAll(list1);
-        list.addAll(list2);
 
         //放入操作记录list中
         List<InvAccountOperate> invAccountOperateList = new ArrayList<>();
@@ -180,6 +171,21 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
                 List<InvAccountCard> invAccountCards = insideTransfer(outCard, outInvAccount, entCard, revInvAccount, payoutMoney);
                 invAccountCardService.updateBatchById(invAccountCards);
                 invAccountOperateService.saveBatch(invAccountOperateList);
+
+                //归属列表
+                List<InvAccountOp> list = new ArrayList<>();
+                List<InvAccountOp> list1 = invAccountEntOpList(entProfit, revInvAccount, entCard, payoutMoney,invAccountOperateList.get(0).getAccountOperateId());
+                List<InvAccountOp> list2 = invAccountOutOpList(outProfit, outInvAccount, outCard, payoutMoney,invAccountOperateList.get(0).getAccountOperateId());
+                //将发票id放入  防止撤销发票时对应归属没删掉
+                list1.forEach(invAccountOp -> {
+                    invAccountOp.setInvoiceId(invAccountIncoice1.getInvoiceId());
+                });
+                list2.forEach(invAccountOp -> {
+                    invAccountOp.setInvoiceId(invAccountIncoice1.getInvoiceId());
+                });
+                list.addAll(list1);
+                list.addAll(list2);
+
                 invAccountOpService.saveBatch(list);
 
             } else {
@@ -189,6 +195,21 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
                 List<InvAccountCard> invAccountCards = enterDeTransfer(outCard, outInvAccount, entCard, revInvAccount, payoutMoney);
                 invAccountCardService.updateBatchById(invAccountCards);
                 invAccountOperateService.saveBatch(invAccountOperateList);
+
+                //归属列表
+                List<InvAccountOp> list = new ArrayList<>();
+                List<InvAccountOp> list1 = invAccountEntOpList(entProfit, revInvAccount, entCard, payoutMoney,invAccountOperateList.get(0).getAccountOperateId());
+                List<InvAccountOp> list2 = invAccountOutOpList(outProfit, outInvAccount, outCard, payoutMoney,invAccountOperateList.get(0).getAccountOperateId());
+                //将发票id放入  防止撤销发票时对应归属没删掉
+                list1.forEach(invAccountOp -> {
+                    invAccountOp.setInvoiceId(invAccountIncoice1.getInvoiceId());
+                });
+                list2.forEach(invAccountOp -> {
+                    invAccountOp.setInvoiceId(invAccountIncoice1.getInvoiceId());
+                });
+                list.addAll(list1);
+                list.addAll(list2);
+
                 invAccountOpService.saveBatch(list);
             }
         } else {
@@ -206,6 +227,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
             invAccountOperate1.setInvoiceId(invAccountIncoice1.getInvoiceId());
             invAccountOperate1.setOutProfit(outProfit);
             invAccountOperate1.setEntProfit(entProfit);
+            outInvAccountOperate.setEnterCardNum(entCard.getBankCardNum());
             invAccountOperateService.insert(invAccountOperate1);
         }
 
@@ -239,7 +261,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
         InvAccountCard outAccount = invAccountCardService.getById(enInvAccountIncoice.getOutBankCardNum());
 
         //新增收入回滚操作
-        List<InvAccountCard> invAccount = quashOutsideTransfer(outAccount, enterAccount, enInvAccountIncoice);
+        List<InvAccountCard> invAccount = quashOutsideTransfer(outAccount, enterAccount, new BigDecimal(enInvAccountIncoice.getInvoiceMoney()));
         InvAccountOperate invAccountOperate = new InvAccountOperate();
         invAccountOperate.setRevenueOutlay("1");
         invAccountOperate.setApplyAmount("发票撤销 收入撤销");

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountOperateServiceImpl.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.inv.service.impl;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,9 +10,9 @@ import com.ydtech.constants.enums.inv.InvPayMethodEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.inv.dao.InvAccountOperateMapper;
 import com.ydtech.modules.inv.model.*;
 import com.ydtech.modules.inv.service.*;
-import com.ydtech.modules.inv.dao.InvAccountOperateMapper;
 import com.ydtech.modules.inv.utils.EasyExcelUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -19,15 +20,12 @@ import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import static com.ydtech.modules.inv.utils.TransferUtils.invAccountEntOpList;
-import static com.ydtech.modules.inv.utils.TransferUtils.outsideTransfer;
+import static com.ydtech.modules.inv.utils.TransferUtils.*;
 
 /**
  * @author Administrator
@@ -108,7 +106,7 @@ public class InvAccountOperateServiceImpl extends ServiceImpl<InvAccountOperateM
         if (entAccountCard.equals(outAccountCard)) {
             for (Map.Entry<String, Object> entry : outProfit.entrySet()) {
                 for (Map.Entry<String, Object> entry2 : entProfit.entrySet()) {
-                    if (Integer.parseInt(entry.getValue().toString()) != 0 && Integer.parseInt(entry2.getValue().toString()) != 0){
+                    if (Integer.parseInt(entry.getValue().toString()) != 0 && Integer.parseInt(entry2.getValue().toString()) != 0) {
                         if (entry.getKey().equals(entry2.getKey())) {
                             throw new SystemException("无法向同公司同板块互相转账");
                         }
@@ -125,9 +123,10 @@ public class InvAccountOperateServiceImpl extends ServiceImpl<InvAccountOperateM
 
         invAccountOperate.setCreateTime(LocalDateTime.now());
         invAccountOperate.setOutProfit(null);
+        invAccountOperate.setEnterCardNum(entAccountCard.getBankCardNum());
         insAccountOperateMapper.insert(invAccountOperate);
 
-        List<InvAccountOp> list = invAccountEntOpList(entProfit, entAccount, entAccountCard, applyAmount);
+        List<InvAccountOp> list = invAccountEntOpList(entProfit, entAccount, entAccountCard, applyAmount,invAccountOperate.getAccountOperateId());
         invAccountOpService.saveBatch(list);
 
         return HttpResult.ok("新增收入成功");
@@ -174,6 +173,45 @@ public class InvAccountOperateServiceImpl extends ServiceImpl<InvAccountOperateM
 
     }
 
+    @Override
+    public HttpResult deleteById(String accountOperateId) {
+        InvAccountOperate invAccountOperate = insAccountOperateMapper.selectById(accountOperateId);
+        if (invAccountOperate == null) {
+            throw new SystemException("操作为空无法删除");
+        }
+        List<InvAccountOperate> invAccountOperates = new ArrayList<>();
+        if (invAccountOperate.getDel() != null) {
+            LambdaQueryWrapper<InvAccountOperate> queryWrapper = new LambdaQueryWrapper<InvAccountOperate>();
+            queryWrapper.eq(InvAccountOperate::getDel, invAccountOperate.getDel());
+            invAccountOperates = insAccountOperateMapper.selectList(queryWrapper);
+        }
+        if (invAccountOperates.isEmpty()){
+            invAccountOperates.add(invAccountOperate);
+        }
+
+        if (invAccountOperate.getRevenueOutlay().equals("0")) {
+            String outCardNum = invAccountOperate.getOutCardNum();
+            String enterCardNum = invAccountOperate.getEnterCardNum();
+            InvAccountCard outAccountCard = invAccountCardService.getById(outCardNum);
+            InvAccountCard entAccountCard = invAccountCardService.getById(enterCardNum);
+            List<InvAccountCard> invAccountCards = quashOutsideTransfer(outAccountCard, entAccountCard, new BigDecimal(invAccountOperate.getApplyAmount()));
+            List<InvAccountOp> opList = new ArrayList<>();
+            invAccountOperates.forEach(invAccountOperate1 -> {
+                LambdaQueryWrapper<InvAccountOp> queryWrapper = new LambdaQueryWrapper<InvAccountOp>();
+                queryWrapper.eq(InvAccountOp::getAccountOperateId, invAccountOperate1.getAccountOperateId());
+                opList.addAll(invAccountOpService.list(queryWrapper));
+            });
+
+            invAccountOpService.removeBatchByIds(opList);
+            invAccountCardService.updateBatchById(invAccountCards);
+            insAccountOperateMapper.deleteBatchIds(invAccountOperates);
+            return HttpResult.ok("删除成功");
+        } else {
+            return HttpResult.error("此操作为收入账户，无法删除");
+        }
+    }
+
+
 }
 
 

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.inv.service.impl;
 
+import com.alibaba.excel.util.ListUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.HttpResult;
@@ -8,6 +9,7 @@ import com.ydtech.exception.SystemException;
 import com.ydtech.modules.inv.dao.InvAccountMapper;
 import com.ydtech.modules.inv.model.InvAccount;
 import com.ydtech.modules.inv.model.InvAccountOp;
+import com.ydtech.modules.inv.model.InvAccountOpDto;
 import com.ydtech.modules.inv.model.InvAccountProfit;
 import com.ydtech.modules.inv.model.excel.AccountExcel;
 import com.ydtech.modules.inv.model.vo.InvAccountQueryVo;
@@ -23,9 +25,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -82,11 +82,11 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
                                 rel.setQuarterAmountExcess(new BigDecimal("300000").subtract(new BigDecimal("5000000").subtract(new BigDecimal(ord.getInvoicingAmountExcess()))).toString());
                                 rel.setSumInvoicingAmount("0");
                             } else {
-                                if (!rel.getBusinessQuality().equals("0") && rel.getOuterFlag().equals("0")) {
+                                if (!rel.getBusinessQuality().equals("0")&&rel.getOuterFlag().equals("0")) {
                                     rel.setQuarterAmountExcess("300000");
                                 }
                                 rel.setSumInvoicingAmount("0");
-                                if (rel.getInvoicingAmountExcess() == null) {
+                                if (rel.getInvoicingAmountExcess() == null){
                                     rel.setInvoicingAmountExcess(rel.getInvoicingAmount());
                                 }
                             }
@@ -198,11 +198,11 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
                             if (ord.getInvoicingAmountExcess() != null) {
                                 rel.setQuarterAmountExcess(new BigDecimal("300000").subtract(new BigDecimal("5000000").subtract(new BigDecimal(ord.getInvoicingAmountExcess()))).toString());
                             } else {
-                                if (!rel.getBusinessQuality().equals("0") && rel.getOuterFlag().equals("0")) {
+                                if (!rel.getBusinessQuality().equals("0")&&rel.getOuterFlag().equals("0")) {
                                     rel.setQuarterAmountExcess("300000");
                                 }
                                 rel.setSumInvoicingAmount("0");
-                                if (rel.getInvoicingAmountExcess() == null) {
+                                if (rel.getInvoicingAmountExcess() == null){
                                     rel.setInvoicingAmountExcess(rel.getInvoicingAmount());
                                 }
                             }
@@ -272,6 +272,71 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
         return HttpResult.ok("", EasyExcelUtils.downExcel(uploadFilePath, AccountExcel.class, accountExcels));
     }
 
+    @Override
+    public HttpResult look(InvAccountQueryVo invAccountQueryVo) {
+        List<InvAccount> insAccounts = insAccountMapper.selectAccountsList(invAccountQueryVo);
+        List<InvAccountProfit> invAccountProfitList = invAccountProfitService.list();
+        List<InvAccountOp> list = invAccountOpService.list();
+
+        List<Map<String, String>> head = head(invAccountProfitList);
+        List<Map<String, String>> maps = dataList(insAccounts, list, invAccountProfitList);
+        InvAccountOpDto invAccountOpDto = new InvAccountOpDto();
+        invAccountOpDto.setHead(head);
+        invAccountOpDto.setMaps(maps);
+        return HttpResult.ok("",invAccountOpDto);
+    }
+
+
+    private static List<Map<String, String>> head(List<InvAccountProfit> invAccountProfitList) {
+        List<Map<String, String>> list = ListUtils.newArrayList();
+        Map<String, String> mm = new HashMap<>();
+        mm.put("accountXing", "账户性质");
+        mm.put("accountName", "户名");
+        mm.put("bank", "开户银行");
+        mm.put("banlce", "银行卡余额");
+        for (Map.Entry<String, String> m : mm.entrySet()) {
+            Map<String, String> map = new HashMap<>();
+            map.put(m.getKey(), m.getValue());
+            map.put("eng",m.getKey());
+            list.add(map);
+        }
+
+        invAccountProfitList.forEach(invAccountProfit -> {
+            Map<String, String> map = new HashMap<>();
+            map.put(invAccountProfit.getProfitEng(), invAccountProfit.getProfitName());
+            map.put("eng",invAccountProfit.getProfitEng());
+            list.add(map);
+        });
+        return list;
+    }
+
+    private static  List<Map<String,String>> dataList(List<InvAccount> invAccounts, List<InvAccountOp> invAccountOpList, List<InvAccountProfit> invAccountProfitList) {
+        List<Map<String,String>> map = new ArrayList<>();
+        invAccounts.forEach(invAccount -> {
+            invAccount.getInvAccountCardList().forEach(invAccountCard -> {
+                Map<String, String> data = new HashMap<>();
+                if (invAccountCard.getBankCardNum() != null) {
+                    data.put("accountXing",invAccount.getOuterFlag().equals("0") ? "内部账户" : "外部账户");
+                    data.put("accountName",invAccount.getAccountName());
+                    data.put("bank",invAccountCard.getBankName());
+                    data.put("banlce",invAccountCard.getBalance());
+
+                    invAccountProfitList.forEach(invAccountProfitList1 -> {
+                        String a = "0";
+                        for (InvAccountOp invAccountProfit : invAccountOpList) {
+                            if (invAccountProfitList1.getProfitEng().equals(invAccountProfit.getProfit()) && invAccountCard.getBankCardNum().equals(invAccountProfit.getCardNum())) {
+                                a = new BigDecimal(a).add(new BigDecimal(invAccountProfit.getMoney())).toString();
+                            }
+                        }
+                        data.put(invAccountProfitList1.getProfitEng(),a);
+                    });
+                    map.add(data);
+                }
+            });
+
+        });
+        return map;
+    }
 }
 
 

src/main/java/com/ydtech/modules/inv/service/impl/InvChannelAccountServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.modules.inv.dao.InvChannelAccountMapper;
-import com.ydtech.modules.inv.model.InvAccount;
 import com.ydtech.modules.inv.model.po.InvChannelAccount;
 import com.ydtech.modules.inv.model.po.QueryInvChannelAccount;
 import com.ydtech.modules.inv.service.InvChannelAccountService;

src/main/java/com/ydtech/modules/inv/service/impl/InvCompanyServiceImpl.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.inv.dao.InvCompanyMapper;
 import com.ydtech.modules.inv.model.InvCompany;
-import com.ydtech.modules.inv.service.InvCompanyService;
 import com.ydtech.modules.inv.model.vo.req.InvCompanyReqVO;
 import com.ydtech.modules.inv.model.vo.res.InvCompanyResVO;
+import com.ydtech.modules.inv.service.InvCompanyService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/com/ydtech/modules/inv/service/impl/InvExternalBillsServiceImpl.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.inv.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.vo.SysReferrerVo;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.esm.model.EsmInsCompany;
@@ -12,13 +11,12 @@ import com.ydtech.modules.inv.model.InvExternalBills;
 import com.ydtech.modules.inv.model.dto.InvInsImportDto;
 import com.ydtech.modules.inv.model.vo.InvInsCompanyVo;
 import com.ydtech.modules.inv.service.InvChannelsExternalBillsDetailsService;
-import com.ydtech.modules.inv.service.InvInsExternalBillsDetailsService;
 import com.ydtech.modules.inv.service.InvExternalBillsService;
+import com.ydtech.modules.inv.service.InvInsExternalBillsDetailsService;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 
 @Service

src/main/java/com/ydtech/modules/inv/service/impl/InvInsExternalBillsDetailsServiceImpl.java

@@ -9,9 +9,9 @@ import com.ydtech.modules.inv.dao.InvInsExternalBillsDetailsMapper;
 import com.ydtech.modules.inv.model.InvExternalBills;
 import com.ydtech.modules.inv.model.InvInsExternalBillsDetails;
 import com.ydtech.modules.inv.model.dto.InvInsChinaCoalExcelDto;
+import com.ydtech.modules.inv.model.dto.InvInsExcelDto;
 import com.ydtech.modules.inv.model.dto.InvInsImportDto;
 import com.ydtech.modules.inv.model.dto.InvInsSimpleSysExcelDto;
-import com.ydtech.modules.inv.model.dto.InvInsExcelDto;
 import com.ydtech.modules.inv.service.InvExternalBillsService;
 import com.ydtech.modules.inv.service.InvInsExternalBillsDetailsService;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementProductCosts;

src/main/java/com/ydtech/modules/inv/service/impl/InvInvoiceInfoServiceImpl.java

@@ -21,7 +21,6 @@ import com.ydtech.modules.inv.service.InvInvoiceInfoService;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.excel.ExcelEasypoiUtils;
 import com.ydtech.utils.excel.ExcelUtils2;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 

src/main/java/com/ydtech/modules/inv/service/impl/InvPayableStatementServiceImpl.java

@@ -2,9 +2,9 @@ package com.ydtech.modules.inv.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.inv.dao.InvPayableStatementMapper;
 import com.ydtech.modules.inv.model.InvPayableStatement;
 import com.ydtech.modules.inv.service.InvPayableStatementService;
-import com.ydtech.modules.inv.dao.InvPayableStatementMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/ydtech/modules/inv/service/impl/InvSettlementSourceServiceImpl.java

@@ -1,15 +1,12 @@
 package com.ydtech.modules.inv.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.inv.dao.InvSettlementSourceMapper;
 import com.ydtech.modules.inv.model.excel.InvSettlementSourceExcel;
-import com.ydtech.modules.inv.model.po.InvChannelAccount;
 import com.ydtech.modules.inv.model.po.InvSettlementSource;
-import com.ydtech.modules.inv.model.po.InvSource;
 import com.ydtech.modules.inv.service.InvChannelAccountService;
 import com.ydtech.modules.inv.service.InvSettlementSourceService;
 import com.ydtech.modules.inv.utils.EasyExcelUtils;
@@ -18,9 +15,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

src/main/java/com/ydtech/modules/inv/service/impl/InvSourceServiceImpl.java

@@ -10,14 +10,11 @@ import com.ydtech.modules.inv.model.excel.InvSourceExcel;
 import com.ydtech.modules.inv.model.po.InvSource;
 import com.ydtech.modules.inv.service.InvSourceService;
 import com.ydtech.modules.inv.utils.EasyExcelUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

src/main/java/com/ydtech/modules/inv/service/impl/InvoiceServiceImpl.java

@@ -8,9 +8,9 @@ import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.ins.dao.InsSettleMapper;
 import com.ydtech.modules.ins.model.InsSettle;
 import com.ydtech.modules.inv.dao.InvoiceMapper;
-import com.ydtech.modules.inv.service.InvoiceService;
 import com.ydtech.modules.inv.model.vo.req.InvoiceReq;
 import com.ydtech.modules.inv.model.vo.res.InvoiceRes;
+import com.ydtech.modules.inv.service.InvoiceService;
 import com.ydtech.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/ydtech/modules/inv/utils/EasyExcelUtils.java

@@ -11,21 +11,22 @@ import com.ydtech.modules.inv.service.InvAccountExcelService;
 import com.ydtech.modules.inv.utils.excel.InvSettlementSourceDataListener;
 import com.ydtech.modules.inv.utils.excel.InvSourceDataListener;
 import lombok.SneakyThrows;
-import org.aspectj.weaver.ast.Literal;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
-import static cn.com.zfc.day018.ZipMultiFile.zipFiles;
+import static com.ydtech.modules.inv.utils.ZipMultiFile.zipFiles;
+
 
 /**
  * @author jianlong
@@ -77,8 +78,6 @@ public class EasyExcelUtils {
             head0.add(invAccountProfit.getProfitName());
             list.add(head0);
         });
-
-
         return list;
     }
 
@@ -256,18 +255,20 @@ public class EasyExcelUtils {
                             InvAccountProfit::getProfitEng
                     ));
 
-            for (Map.Entry<String, Object> entry : excel.getEntProfit().entrySet()) {
+            for (Map.Entry<String, Object> entry : excel.getOutProfit().entrySet()) {
                 if (Integer.parseInt(entry.getValue().toString()) != 0) {
-                    stringBuffer.append(collect.get(entry.getKey()).get(0).getProfitName()).append("   ").append(entry.getValue()).append("%");
+                    stringBuffer.append(collect.get(entry.getKey()).get(0).getProfitName()).append("    ").append(entry.getValue()).append("%");
                 }
             }
+
             stringBuffer.append("→");
 
-            for (Map.Entry<String, Object> entry : excel.getOutProfit().entrySet()) {
+            for (Map.Entry<String, Object> entry : excel.getEntProfit().entrySet()) {
                 if (Integer.parseInt(entry.getValue().toString()) != 0) {
-                    stringBuffer.append(collect.get(entry.getKey()).get(0).getProfitName()).append("    ").append(entry.getValue()).append("%");
+                    stringBuffer.append(collect.get(entry.getKey()).get(0).getProfitName()).append("   ").append(entry.getValue()).append("%");
                 }
             }
+
             excel.setPlate(stringBuffer.toString());
 
 

src/main/java/com/ydtech/modules/inv/utils/LocalDateTimeUtils.java

@@ -5,7 +5,6 @@ package com.ydtech.modules.inv.utils;
  * @date 2024-01-24 18:26
  */
 import java.time.*;
-import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAdjusters;
 import java.util.Date;

src/main/java/com/ydtech/modules/inv/utils/TransferUtils.java

@@ -20,13 +20,14 @@ import java.util.Map;
 public class TransferUtils {
     /**
      * 插入收入归属
+     *
      * @param entProfit
      * @param entAccount
      * @param entAccountCard
      * @param applyAmount
      * @return
      */
-    public static List<InvAccountOp> invAccountEntOpList(JSONObject entProfit,InvAccount entAccount, InvAccountCard entAccountCard, String applyAmount){
+    public static List<InvAccountOp> invAccountEntOpList(JSONObject entProfit, InvAccount entAccount, InvAccountCard entAccountCard, String applyAmount, String operateId) {
         List<InvAccountOp> list = new ArrayList<>();
         if (entProfit != null) {
             for (Map.Entry<String, Object> entry : entProfit.entrySet()) {
@@ -36,6 +37,7 @@ public class TransferUtils {
                     invAccountOp.setAccountName(entAccount.getAccountName());
                     invAccountOp.setCardNum(entAccountCard.getBankCardNum());
                     invAccountOp.setCardName(entAccountCard.getBankName());
+                    invAccountOp.setAccountOperateId(operateId);
                     invAccountOp.setProfit(entry.getKey());
                     invAccountOp.setMoney(new BigDecimal(entry.getValue().toString()).multiply(new BigDecimal(applyAmount)).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).toString());
                     list.add(invAccountOp);
@@ -48,13 +50,14 @@ public class TransferUtils {
 
     /**
      * 插入支出归属
+     *
      * @param outProfit
      * @param outAccount
      * @param outAccountCard
      * @param applyAmount
      * @return
      */
-    public static List<InvAccountOp> invAccountOutOpList(JSONObject outProfit,InvAccount outAccount, InvAccountCard outAccountCard, String applyAmount){
+    public static List<InvAccountOp> invAccountOutOpList(JSONObject outProfit, InvAccount outAccount, InvAccountCard outAccountCard, String applyAmount, String operateId) {
         List<InvAccountOp> list = new ArrayList<>();
         for (Map.Entry<String, Object> entry : outProfit.entrySet()) {
             if (Integer.parseInt(entry.getValue().toString()) != 0) {
@@ -64,6 +67,7 @@ public class TransferUtils {
                 invAccountOp.setCardNum(outAccountCard.getBankCardNum());
                 invAccountOp.setCardName(outAccountCard.getBankName());
                 invAccountOp.setProfit(entry.getKey());
+                invAccountOp.setAccountOperateId(operateId);
                 invAccountOp.setMoney(new BigDecimal(String.valueOf(entry.getValue())).multiply(new BigDecimal(applyAmount)).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP).negate().toString());
                 list.add(invAccountOp);
             }
@@ -105,6 +109,7 @@ public class TransferUtils {
         operate.setEnterCardNum(insAccountExcel.getEnterCardNum());
         return operate;
     }
+
     private static InvAccountOperate operate(InvAccountExcel invAccountExcel, InvAccountOperate invAccountOperate) {
         invAccountOperate.setApplicant(invAccountExcel.getApplicant());
         invAccountOperate.setApplySector(invAccountExcel.getApplySector());
@@ -121,7 +126,6 @@ public class TransferUtils {
     }
 
 
-
     /**
      * 判断各余额是否足够
      *
@@ -207,11 +211,12 @@ public class TransferUtils {
 
     /**
      * 判断归属是否分配完毕
+     *
      * @param outProfit
      * @param entProfit
      * @return
      */
-    public static Boolean isProfitFull (JSONObject outProfit,JSONObject entProfit) {
+    public static Boolean isProfitFull(JSONObject outProfit, JSONObject entProfit) {
         BigDecimal outAmount = new BigDecimal(0);
         BigDecimal entAmount = new BigDecimal(0);
         for (Map.Entry<String, Object> entry : outProfit.entrySet()) {
@@ -325,7 +330,7 @@ public class TransferUtils {
      *
      * @return
      */
-    private static InvAccountCard enterAccountUtils(InvAccountCard enterAccountCard, String  invAccountExcelApplyAmount) {
+    private static InvAccountCard enterAccountUtils(InvAccountCard enterAccountCard, String invAccountExcelApplyAmount) {
         if (enterAccountCard.getBalance() != null && !enterAccountCard.getBalance().isEmpty()) {
             enterAccountCard.setBalance(new BigDecimal(enterAccountCard.getBalance()).add(new BigDecimal(invAccountExcelApplyAmount)).toString());
         }
@@ -336,29 +341,32 @@ public class TransferUtils {
     /**
      * 撤销发票方法
      */
-    public static List<InvAccountCard> quashOutsideTransfer(InvAccountCard outAccountCard, InvAccountCard enterAccountCard, InvAccountIncoice invAccountIncoice) {
-        if (enterAccountCard == null || invAccountIncoice == null) {
-            throw new SystemException("账户为空");
-        }
-
-        BigDecimal applyAmount = new BigDecimal(invAccountIncoice.getInvoiceMoney());
+    public static List<InvAccountCard> quashOutsideTransfer(InvAccountCard outAccountCard, InvAccountCard enterAccountCard, BigDecimal applyAmount) {
         List<InvAccountCard> list = new ArrayList<>();
-        list.add(enterAccountBreakUtils(enterAccountCard, applyAmount));
-        list.add(outAccountBreakUtils(outAccountCard, applyAmount));
+        list.add(enterAccountBreakUtils(enterAccountCard, outAccountCard, applyAmount));
+        InvAccountCard invAccountCard = outAccountBreakUtils(outAccountCard, enterAccountCard, applyAmount);
+        if (invAccountCard != null) {
+            list.add(invAccountCard);
+        }
         return list;
     }
 
 
-
-
-
     /**
      * 收入方回滚利润方法
      *
      * @return
      */
-    private static InvAccountCard enterAccountBreakUtils(InvAccountCard enterAccountCard, BigDecimal invAccountExcelApplyAmount) {
-        enterAccountCard.setBalance(new BigDecimal(enterAccountCard.getBalance()).subtract(invAccountExcelApplyAmount).toString());
+    private static InvAccountCard enterAccountBreakUtils(InvAccountCard enterAccountCard, InvAccountCard outAccountCard, BigDecimal invAccountExcelApplyAmount) {
+
+        if (enterAccountCard != null) {
+            if (outAccountCard != null){
+                if (enterAccountCard.getBalance().equals("0")) {
+                    throw new SystemException("账户余额不足");
+                }
+            }
+            enterAccountCard.setBalance(new BigDecimal(enterAccountCard.getBalance()).subtract(invAccountExcelApplyAmount).toString());
+        }
         return enterAccountCard;
     }
 
@@ -367,11 +375,33 @@ public class TransferUtils {
      *
      * @return
      */
-    private static InvAccountCard outAccountBreakUtils(InvAccountCard enterAccountCard, BigDecimal invAccountExcelApplyAmount) {
-        if (enterAccountCard.getBalance() != null && !enterAccountCard.getBalance().isEmpty()) {
-            enterAccountCard.setBalance(new BigDecimal(enterAccountCard.getBalance()).add(invAccountExcelApplyAmount).toString());
+
+    private static InvAccountCard outAccountBreakUtils(InvAccountCard outAccountCard, InvAccountCard enterAccountCard, BigDecimal invAccountExcelApplyAmount) {
+        if (outAccountCard != null) {
+            if (outAccountCard.getBalance() != null && !outAccountCard.getBalance().isEmpty()) {
+                outAccountCard.setBalance(new BigDecimal(outAccountCard.getBalance()).add(invAccountExcelApplyAmount).toString());
+                outAccountCard.setSpend(new BigDecimal(outAccountCard.getSpend()).subtract(invAccountExcelApplyAmount).toString());
+                if (outAccountCard.getDayStrokeNumExcess() != null && !outAccountCard.getDayStrokeNumExcess().isEmpty()) {
+                    outAccountCard.setDayStrokeNumExcess(new BigDecimal(outAccountCard.getDayStrokeNumExcess()).add(new BigDecimal("1")).toString());
+                }
+                if (enterAccountCard.getAccountQuality().equals("0")) {
+                    if (outAccountCard.getPubDayLinesExcess() != null && !outAccountCard.getPubDayLinesExcess().isEmpty()) {
+                        outAccountCard.setPubDayLinesExcess(new BigDecimal(outAccountCard.getPubDayLinesExcess()).add(invAccountExcelApplyAmount).toString());
+                    }
+                    if (outAccountCard.getPubYearExcess() != null && !outAccountCard.getPubYearExcess().isEmpty()) {
+                        outAccountCard.setPubYearExcess(new BigDecimal(outAccountCard.getPubYearExcess()).add(invAccountExcelApplyAmount).toString());
+                    }
+                } else {
+                    if (outAccountCard.getPriDayLinesExcess() != null && !outAccountCard.getPriDayLinesExcess().isEmpty()) {
+                        outAccountCard.setPriDayLinesExcess(new BigDecimal(outAccountCard.getPriDayLinesExcess()).add(invAccountExcelApplyAmount).toString());
+                    }
+                    if (outAccountCard.getPriYearExcess() != null && !outAccountCard.getPriYearExcess().isEmpty()) {
+                        outAccountCard.setPriYearExcess(new BigDecimal(outAccountCard.getPriYearExcess()).add(invAccountExcelApplyAmount).toString());
+                    }
+                }
+            }
         }
-        return enterAccountCard;
+        return outAccountCard;
     }
 
 }

src/main/java/com/ydtech/modules/inv/utils/ZipMultiFile.java

@@ -1,4 +1,4 @@
-package cn.com.zfc.day018;
+package com.ydtech.modules.inv.utils;
 
 import java.io.File;
 import java.io.FileInputStream;

src/main/java/com/ydtech/modules/inv/utils/excel/InvSettlementSourceDataListener.java

@@ -2,15 +2,11 @@ package com.ydtech.modules.inv.utils.excel;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
-import com.alibaba.excel.util.ListUtils;
 import com.ydtech.modules.inv.model.excel.InvSettlementSourceExcel;
-import com.ydtech.modules.inv.model.excel.InvSourceExcel;
 
 import java.lang.reflect.Field;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-import java.time.temporal.ChronoField;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -79,4 +75,4 @@ public class InvSettlementSourceDataListener implements ReadListener<InvSettleme
         // 这里也要保存数据，确保最后遗留的数据也存储到数据库
     }
 
-}
+}

src/main/resources/mapper/modules/inv/InvAccountMapper.xml

@@ -97,7 +97,7 @@
         <include refid="Base_Column_List"/>
         from inv_account a
         left join inv_account_card b on a.account_id = b.account_id
-        left join inv_account_incoice c on a.account_id = c.account_id
+        left join inv_account_incoice c on a.account_id = c.account_id and c.del_flag = '0'
         <if test="account.invoiceTimeStart!= null">
             and c.invoice_time &gt;= #{account.invoiceTimeStart}
         </if>
@@ -128,7 +128,7 @@
     <select id="getSumInvoicingAmount" resultMap="BaseResultMap">
         select a.account_id, SUM(b.no_has_tax) as sum_invoicing_amount
         from inv_account a
-        left join inv_account_incoice b on a.account_id = b.account_id
+        left join inv_account_incoice b on a.account_id = b.account_id and b.del_flag = '0'
         where
         a.del_flag = '0'
         <if test="account.accountId != null and account.accountId != ''">
@@ -151,7 +151,7 @@
         <include refid="Base_Column_List"/>
         from inv_account a
         left join inv_account_card b on a.account_id = b.account_id
-        left join inv_account_incoice c on a.account_id = c.account_id
+        left join inv_account_incoice c on a.account_id = c.account_id and c.del_flag = '0'
         <if test="account.invoiceTimeStart!= null">
             and c.invoice_time &gt;= #{account.invoiceTimeStart}
         </if>

src/main/resources/mapper/modules/inv/InvAccountOperateMapper.xml

@@ -89,6 +89,9 @@
         <if test="insAccountOperate.invoiceId != null and insAccountOperate.invoiceId != ''">
             and invoice_id like concat('%',#{insAccountOperate.invoiceId},'%')
         </if>
+        <if test="insAccountOperate.createTime != null and insAccountOperate.createTime != ''">
+            and create_time like concat('%',#{insAccountOperate.createTime},'%')
+        </if>
     </select>
     <select id="selectOperateList"  resultMap="BaseResultMap">
         select