应收账单保存科目信息和nc推送修改

This commit is contained in:
hjx
2026-01-14 17:24:20 +08:00
parent 14cfad6b50
commit 1708b4384c
9 changed files with 96 additions and 51 deletions
@@ -2,7 +2,7 @@ package com.linke.finance.interfaces.assembler.reconciliationAccount;
import cn.hutool.core.util.ObjectUtil;
import com.linke.finance.domain.reconciliationAccount.repository.todo.ReconciliationAccountDO;
import com.linke.finance.interfaces.dto.reconciliationAccount.ReconciliationAccountDTO;
import com.mhd.common.core.domain.dto.ReconciliationAccountDTO;
import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
import com.mhd.common.core.exception.digitalLogisticsException.UserError;
import com.mhd.common.core.utils.bean.BeanUtils;
@@ -62,4 +62,4 @@ public class ReconciliationAccountAssembler {
return reconciliationAccountDO;
}
}
}
@@ -1,77 +0,0 @@
package com.linke.finance.interfaces.dto.reconciliationAccount;
import com.mhd.common.core.annotation.Excel;
import lombok.Data;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import io.swagger.annotations.ApiModelProperty;
import com.mhd.common.core.web.domain.BaseVOEntity;
import java.util.List;
/**
* 【请填写功能名称】对象 reconciliation_account
*
* @author gen
* @date 2026-01-14
*/
@Data
public class ReconciliationAccountDTO extends BaseVOEntity{
private static final long serialVersionUID = 1L;
@ApiModelProperty("$column.columnComment")
private Long id;
@ApiModelProperty("所属组织")
@Excel(name = "所属组织")
private String orgName;
@ApiModelProperty("组织ID")
@Excel(name = "组织ID")
private Long organizationId;
@ApiModelProperty("一级组织ID")
@Excel(name = "一级组织ID")
private Long topOrganizationId;
@ApiModelProperty("组织名称")
@Excel(name = "组织名称")
private String organizationName;
@ApiModelProperty("应收账单id")
@Excel(name = "应收账单id")
private String reconciliationId;
@ApiModelProperty("科目id")
@Excel(name = "科目id")
private Long accountId;
@ApiModelProperty("科目收支类型(1-应收,2-应付")
@Excel(name = "科目收支类型", readConverterExp = "科目收支类型(1-应收,2-应付")
private Long accountType;
@ApiModelProperty("科目编码")
@Excel(name = "科目编码")
private String subjectCode;
@ApiModelProperty("科目名称")
@Excel(name = "科目名称")
private String subjectName;
@ApiModelProperty("科目费率")
@Excel(name = "科目费率")
private BigDecimal rate;
@ApiModelProperty("金额")
@Excel(name = "金额")
private BigDecimal amount;
@ApiModelProperty(name = "组织ID集合")
private List<Long> organizationIdList;
@ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId;
}
@@ -2,6 +2,7 @@ package com.linke.finance.interfaces.facade.reconciliationAccount;
import java.util.List;
import com.mhd.common.core.domain.dto.ReconciliationAccountDTO;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -11,7 +12,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.linke.finance.interfaces.dto.reconciliationAccount.ReconciliationAccountDTO;
import com.linke.finance.domain.reconciliationAccount.repository.todo.ReconciliationAccountDO;
import com.linke.finance.domain.reconciliationAccount.repository.po.ReconciliationAccountPO;
import com.linke.finance.application.server.reconciliationAccount.ReconciliationAccountApplicationService;