科目信息修改
This commit is contained in:
+6
@@ -101,4 +101,10 @@ public class ExpenseAccount extends BaseVOEntity{
|
||||
@ApiModelProperty(name = "收支类型")
|
||||
private Integer accountExpenseType;
|
||||
|
||||
@ApiModelProperty(name = "创建订单是否固定显示 0-否 1-是")
|
||||
private Integer fixedOrderDisplay;
|
||||
|
||||
@ApiModelProperty("费率")
|
||||
private BigDecimal rate;
|
||||
|
||||
}
|
||||
|
||||
+7
@@ -122,4 +122,11 @@ public class ExpenseAccountPO extends BaseVOEntity{
|
||||
@Excel(name = "服务项税率")
|
||||
private BigDecimal taxRate;
|
||||
|
||||
|
||||
|
||||
@ApiModelProperty("费率")
|
||||
private BigDecimal rate;
|
||||
|
||||
@ApiModelProperty(name = "创建订单是否固定显示 0-否 1-是")
|
||||
private Integer fixedOrderDisplay;
|
||||
}
|
||||
|
||||
+6
@@ -125,4 +125,10 @@ public class ExpenseAccountDO extends BaseVOEntity{
|
||||
|
||||
@ApiModelProperty("服务项名称")
|
||||
private String serviceItemsName;
|
||||
|
||||
@ApiModelProperty("费率")
|
||||
private BigDecimal rate;
|
||||
|
||||
@ApiModelProperty(name = "创建订单是否固定显示 0-否 1-是")
|
||||
private Integer fixedOrderDisplay;
|
||||
}
|
||||
|
||||
+6
@@ -126,4 +126,10 @@ public class ExpenseAccountDTO extends BaseVOEntity{
|
||||
|
||||
@ApiModelProperty("服务项名称")
|
||||
private String serviceItemsName;
|
||||
|
||||
@ApiModelProperty("费率")
|
||||
private BigDecimal rate;
|
||||
|
||||
@ApiModelProperty(name = "创建订单是否固定显示 0-否 1-是")
|
||||
private Integer fixedOrderDisplay;
|
||||
}
|
||||
|
||||
@@ -213,6 +213,9 @@
|
||||
<if test="expenseAccountDO.serviceItemsCode != null and expenseAccountDO.serviceItemsCode != ''">
|
||||
and b.service_items_code = #{expenseAccountDO.serviceItemsCode}
|
||||
</if>
|
||||
<if test="expenseAccountDO.fixedOrderDisplay != null ">
|
||||
and a.fixed_order_display = #{expenseAccountDO.fixedOrderDisplay}
|
||||
</if>
|
||||
</sql>
|
||||
<select id="selectExpenseAccount" parameterType="com.mhd.basic.domain.expenseAccount.repository.todo.SearchExpenseAccountDO" resultType="com.mhd.basic.domain.expenseAccount.repository.po.QueryExpenseAccountPO">
|
||||
select
|
||||
|
||||
+72
@@ -0,0 +1,72 @@
|
||||
package com.linke.finance.application.server.reconciliationAccount;
|
||||
|
||||
import com.linke.finance.domain.reconciliationAccount.repository.po.ReconciliationAccountPO;
|
||||
import com.linke.finance.domain.reconciliationAccount.repository.todo.ReconciliationAccountDO;
|
||||
import com.linke.finance.domain.reconciliationAccount.service.ReconciliationAccountDomainService;
|
||||
import com.mhd.common.security.utils.SecurityUtils;
|
||||
import com.mhd.system.api.model.LoginUser;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import java.util.List;
|
||||
/**
|
||||
* 【请填写功能名称】ApplicationService
|
||||
*
|
||||
* @author gen
|
||||
* @date 2026-01-14
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class ReconciliationAccountApplicationService {
|
||||
@Autowired
|
||||
private ReconciliationAccountDomainService reconciliationAccountDomainService;
|
||||
|
||||
|
||||
/**
|
||||
* 分页查询【请填写功能名称】列表
|
||||
*/
|
||||
|
||||
public List<ReconciliationAccountPO> queryList(ReconciliationAccountDO reconciliationAccountDO) {
|
||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||
if (loginUser != null){
|
||||
Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
|
||||
if (topOrganizationId != null && topOrganizationId != 1){
|
||||
reconciliationAccountDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
|
||||
}
|
||||
}
|
||||
return reconciliationAccountDomainService.queryList(reconciliationAccountDO);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 新增【请填写功能名称】
|
||||
*/
|
||||
public Boolean insert(ReconciliationAccountDO reconciliationAccountDO) {
|
||||
|
||||
return reconciliationAccountDomainService.insert(reconciliationAccountDO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改【请填写功能名称】
|
||||
*/
|
||||
public Boolean update(ReconciliationAccountDO reconciliationAccountDO) {
|
||||
return reconciliationAccountDomainService.update(reconciliationAccountDO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除【请填写功能名称】
|
||||
*/
|
||||
public boolean delete(Long[] ids) {
|
||||
return reconciliationAccountDomainService.delete(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取【请填写功能名称】详细信息
|
||||
*/
|
||||
public ReconciliationAccountPO getInfo(Long id)
|
||||
{
|
||||
return reconciliationAccountDomainService.getInfo(id);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
+74
@@ -0,0 +1,74 @@
|
||||
package com.linke.finance.domain.reconciliationAccount.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import java.math.BigDecimal;
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
|
||||
/**
|
||||
* 【请填写功能名称】对象 reconciliation_account
|
||||
*
|
||||
* @author gen
|
||||
* @date 2026-01-14
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class ReconciliationAccount extends BaseVOEntity{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("$column.columnComment")
|
||||
@TableId(type = IdType.AUTO)
|
||||
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;
|
||||
|
||||
|
||||
}
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
package com.linke.finance.domain.reconciliationAccount.repository.facade;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.linke.finance.domain.reconciliationAccount.entity.ReconciliationAccount;
|
||||
import com.linke.finance.domain.reconciliationAccount.repository.po.ReconciliationAccountPO;
|
||||
import com.linke.finance.domain.reconciliationAccount.repository.todo.ReconciliationAccountDO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 【请填写功能名称】Service接口
|
||||
*
|
||||
* @author gen
|
||||
* @date 2026-01-14
|
||||
*/
|
||||
public interface IReconciliationAccountService extends IService<ReconciliationAccount>
|
||||
{
|
||||
/**
|
||||
* 分页查询【请填写功能名称】列表
|
||||
*/
|
||||
public List<ReconciliationAccountPO> queryList(ReconciliationAccountDO reconciliationAccountDO);
|
||||
|
||||
/**
|
||||
* 新增【请填写功能名称】
|
||||
*/
|
||||
public Boolean insert(ReconciliationAccountDO reconciliationAccountDO);
|
||||
|
||||
/**
|
||||
* 修改【请填写功能名称】
|
||||
*/
|
||||
public Boolean update(ReconciliationAccountDO reconciliationAccountDO);
|
||||
|
||||
/**
|
||||
* 批量删除【请填写功能名称】
|
||||
*/
|
||||
public Boolean delete(Long[] ids);
|
||||
|
||||
|
||||
/**
|
||||
* 查询【请填写功能名称】
|
||||
*/
|
||||
public ReconciliationAccountPO getInfo(Long id);
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package com.linke.finance.domain.reconciliationAccount.repository.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.linke.finance.domain.reconciliationAccount.entity.ReconciliationAccount;
|
||||
import com.linke.finance.domain.reconciliationAccount.repository.po.ReconciliationAccountPO;
|
||||
import com.linke.finance.domain.reconciliationAccount.repository.todo.ReconciliationAccountDO;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
/**
|
||||
* 【请填写功能名称】Mapper接口
|
||||
*
|
||||
* @author gen
|
||||
* @date 2026-01-14
|
||||
*/
|
||||
public interface ReconciliationAccountMapper extends BaseMapper<ReconciliationAccount>
|
||||
{
|
||||
/**
|
||||
* 查询【请填写功能名称】列表
|
||||
*/
|
||||
public List<ReconciliationAccountPO> queryList(ReconciliationAccountDO reconciliationAccountDO);
|
||||
|
||||
}
|
||||
+81
@@ -0,0 +1,81 @@
|
||||
package com.linke.finance.domain.reconciliationAccount.repository.persistence;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.linke.finance.domain.reconciliationAccount.entity.ReconciliationAccount;
|
||||
import com.linke.finance.domain.reconciliationAccount.repository.facade.IReconciliationAccountService;
|
||||
import com.linke.finance.domain.reconciliationAccount.repository.mapper.ReconciliationAccountMapper;
|
||||
import com.linke.finance.domain.reconciliationAccount.repository.po.ReconciliationAccountPO;
|
||||
import com.linke.finance.domain.reconciliationAccount.repository.todo.ReconciliationAccountDO;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 【请填写功能名称】Service业务层处理
|
||||
*
|
||||
* @author gen
|
||||
* @date 2026-01-14
|
||||
*/
|
||||
@Service
|
||||
public class ReconciliationAccountImpl extends ServiceImpl<ReconciliationAccountMapper, ReconciliationAccount> implements IReconciliationAccountService{
|
||||
@Autowired
|
||||
private ReconciliationAccountMapper reconciliationAccountMapper;
|
||||
|
||||
/**
|
||||
* 查询【请填写功能名称】列表
|
||||
*/
|
||||
@Override
|
||||
public List<ReconciliationAccountPO> queryList(ReconciliationAccountDO reconciliationAccountDO)
|
||||
{
|
||||
return reconciliationAccountMapper.queryList(reconciliationAccountDO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增【请填写功能名称】
|
||||
*/
|
||||
@Override
|
||||
public Boolean insert(ReconciliationAccountDO reconciliationAccountDO) {
|
||||
ReconciliationAccount reconciliationAccount = new ReconciliationAccount();
|
||||
BeanUtils.copyProperties(reconciliationAccountDO,reconciliationAccount);
|
||||
return this.save(reconciliationAccount);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改【请填写功能名称】
|
||||
*/
|
||||
@Override
|
||||
public Boolean update(ReconciliationAccountDO reconciliationAccountDO) {
|
||||
ReconciliationAccount reconciliationAccount = new ReconciliationAccount();
|
||||
BeanUtils.copyProperties(reconciliationAccountDO,reconciliationAccount);
|
||||
return this.updateById(reconciliationAccount);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除【请填写功能名称】
|
||||
*/
|
||||
@Override
|
||||
public Boolean delete(Long[] ids ) {
|
||||
List<ReconciliationAccount> list = new ArrayList<>();
|
||||
for (Long id : ids) {
|
||||
ReconciliationAccount reconciliationAccount = new ReconciliationAccount();
|
||||
reconciliationAccount.setId(id);
|
||||
reconciliationAccount.setDelFlag(2);
|
||||
list.add(reconciliationAccount);
|
||||
}
|
||||
return this.updateBatchById(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改【请填写功能名称】
|
||||
*/
|
||||
@Override
|
||||
public ReconciliationAccountPO getInfo(Long id) {
|
||||
ReconciliationAccount reconciliationAccount = this.getById(id);
|
||||
ReconciliationAccountPO reconciliationAccountPO = new ReconciliationAccountPO();
|
||||
BeanUtils.copyProperties(reconciliationAccount,reconciliationAccountPO);
|
||||
return reconciliationAccountPO;
|
||||
}
|
||||
}
|
||||
+74
@@ -0,0 +1,74 @@
|
||||
package com.linke.finance.domain.reconciliationAccount.repository.po;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import java.math.BigDecimal;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
|
||||
|
||||
/**
|
||||
* 【请填写功能名称】对象 reconciliation_account
|
||||
*
|
||||
* @author gen
|
||||
* @date 2026-01-14
|
||||
*/
|
||||
|
||||
@Data
|
||||
@ApiModel(value = "【请填写功能名称】对象", description = "【请填写功能名称】响应对象")
|
||||
public class ReconciliationAccountPO 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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
package com.linke.finance.domain.reconciliationAccount.repository.todo;
|
||||
|
||||
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 ReconciliationAccountDO 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;
|
||||
}
|
||||
+64
@@ -0,0 +1,64 @@
|
||||
package com.linke.finance.domain.reconciliationAccount.service;
|
||||
|
||||
import com.linke.finance.domain.reconciliationAccount.repository.facade.IReconciliationAccountService;
|
||||
import com.linke.finance.domain.reconciliationAccount.repository.po.ReconciliationAccountPO;
|
||||
import com.linke.finance.domain.reconciliationAccount.repository.todo.ReconciliationAccountDO;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
/**
|
||||
* 【请填写功能名称】
|
||||
*
|
||||
* @author gen
|
||||
* @date 2026-01-14
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class ReconciliationAccountDomainService {
|
||||
|
||||
@Autowired
|
||||
private IReconciliationAccountService reconciliationAccountService;
|
||||
|
||||
|
||||
/**
|
||||
* 分页查询【请填写功能名称】列表
|
||||
*/
|
||||
public List<ReconciliationAccountPO> queryList(ReconciliationAccountDO reconciliationAccountDO) {
|
||||
return reconciliationAccountService.queryList(reconciliationAccountDO);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 新增【请填写功能名称】
|
||||
*/
|
||||
public Boolean insert(ReconciliationAccountDO reconciliationAccountDO) {
|
||||
|
||||
return reconciliationAccountService.insert(reconciliationAccountDO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改【请填写功能名称】
|
||||
*/
|
||||
public Boolean update(ReconciliationAccountDO reconciliationAccountDO) {
|
||||
return reconciliationAccountService.update(reconciliationAccountDO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除【请填写功能名称】
|
||||
*/
|
||||
public Boolean delete(Long[] ids) {
|
||||
return reconciliationAccountService.delete(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取【请填写功能名称】详细信息
|
||||
*/
|
||||
public ReconciliationAccountPO getInfo(Long id)
|
||||
{
|
||||
return reconciliationAccountService.getInfo(id);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
+65
@@ -0,0 +1,65 @@
|
||||
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.exception.digitalLogisticsException.DigitalLogisticsException;
|
||||
import com.mhd.common.core.exception.digitalLogisticsException.UserError;
|
||||
import com.mhd.common.core.utils.bean.BeanUtils;
|
||||
import com.mhd.common.core.utils.IgnoreNullUtil;
|
||||
import com.mhd.common.security.utils.SecurityUtils;
|
||||
import com.mhd.system.api.model.LoginUser;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 【请填写功能名称】Assembler
|
||||
*
|
||||
* @author gen
|
||||
* @date 2026-01-14
|
||||
*/
|
||||
@Component
|
||||
public class ReconciliationAccountAssembler {
|
||||
|
||||
/**
|
||||
* 转换实体
|
||||
*/
|
||||
public ReconciliationAccountDO toDO(ReconciliationAccountDTO reconciliationAccountDTO) {
|
||||
ReconciliationAccountDO reconciliationAccountDO = new ReconciliationAccountDO();
|
||||
// 拷贝
|
||||
BeanUtils.copyProperties(reconciliationAccountDTO, reconciliationAccountDO, IgnoreNullUtil.getNullPropertyNames(reconciliationAccountDTO));
|
||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||
if (ObjectUtil.isNull(loginUser)) {
|
||||
throw new DigitalLogisticsException(UserError.TIMEOUT);
|
||||
}
|
||||
String userName = loginUser.getUsername();
|
||||
// 获取登录人id
|
||||
Long userId = loginUser.getUserid();
|
||||
if(reconciliationAccountDTO.getId() != null){
|
||||
if(userId != null){
|
||||
reconciliationAccountDO.setUpdateBy(userId);
|
||||
}else {
|
||||
reconciliationAccountDO.setUpdateBy(new Long("0"));
|
||||
}
|
||||
reconciliationAccountDO.setUpdateByName(userName);
|
||||
reconciliationAccountDO.setUpdateTime(new Date());
|
||||
|
||||
}else {
|
||||
if(userId != null){
|
||||
reconciliationAccountDO.setCreateBy(userId);
|
||||
reconciliationAccountDO.setUpdateBy(userId);
|
||||
}else {
|
||||
reconciliationAccountDO.setCreateBy(new Long("0"));
|
||||
reconciliationAccountDO.setUpdateBy(new Long("0"));
|
||||
}
|
||||
reconciliationAccountDO.setCreateByName(userName);
|
||||
reconciliationAccountDO.setUpdateByName(userName);
|
||||
reconciliationAccountDO.setCreateTime(new Date());
|
||||
reconciliationAccountDO.setUpdateTime(new Date());
|
||||
reconciliationAccountDO.setDelFlag(1);
|
||||
}
|
||||
return reconciliationAccountDO;
|
||||
}
|
||||
|
||||
}
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
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;
|
||||
}
|
||||
+99
@@ -0,0 +1,99 @@
|
||||
package com.linke.finance.interfaces.facade.reconciliationAccount;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
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;
|
||||
import com.linke.finance.interfaces.assembler.reconciliationAccount.ReconciliationAccountAssembler;
|
||||
import javax.annotation.Resource;
|
||||
import com.mhd.common.core.web.controller.BaseController;
|
||||
import com.mhd.common.core.web.domain.AjaxResult;
|
||||
import com.mhd.common.core.web.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 【请填写功能名称】Api
|
||||
*
|
||||
* @author gen
|
||||
* @date 2026-01-14
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/reconciliationAccountApi")
|
||||
public class ReconciliationAccountApi extends BaseController{
|
||||
@Autowired
|
||||
private ReconciliationAccountApplicationService reconciliationAccountApplicationService;
|
||||
|
||||
@Resource
|
||||
private ReconciliationAccountAssembler reconciliationAccountAssembler;
|
||||
|
||||
/**
|
||||
* 分页查询【请填写功能名称】列表
|
||||
*/
|
||||
@ApiOperation("查询【请填写功能名称】列表")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(ReconciliationAccountDTO reconciliationAccountDTO)
|
||||
{
|
||||
//转换实体
|
||||
ReconciliationAccountDO reconciliationAccountDO = reconciliationAccountAssembler.toDO(reconciliationAccountDTO);
|
||||
startPage();
|
||||
List<ReconciliationAccountPO> list = reconciliationAccountApplicationService.queryList(reconciliationAccountDO);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑【请填写功能名称】
|
||||
*/
|
||||
@ApiOperation("编辑【请填写功能名称】")
|
||||
@PostMapping("/edit")
|
||||
public AjaxResult edit(@RequestBody ReconciliationAccountDTO reconciliationAccountDTO)
|
||||
{
|
||||
//转换实体
|
||||
ReconciliationAccountDO reconciliationAccountDO = reconciliationAccountAssembler.toDO(reconciliationAccountDTO);
|
||||
if(reconciliationAccountDTO.getId() != null){
|
||||
return toAjax(reconciliationAccountApplicationService.update(reconciliationAccountDO));
|
||||
}else {
|
||||
return toAjax(reconciliationAccountApplicationService.insert(reconciliationAccountDO));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除【请填写功能名称】
|
||||
*/
|
||||
@ApiOperation("批量删除【请填写功能名称】")
|
||||
@DeleteMapping("/deleteByIds/{ids}")
|
||||
public AjaxResult delete(@PathVariable Long[] ids)
|
||||
{
|
||||
return toAjax(reconciliationAccountApplicationService.delete(ids));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取【请填写功能名称】详细信息
|
||||
*/
|
||||
@ApiOperation("获取【请填写功能名称】")
|
||||
@GetMapping(value = "/getInfo/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") Long id)
|
||||
{
|
||||
return AjaxResult.success(reconciliationAccountApplicationService.getInfo(id));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
CREATE TABLE NGWL_TEST_FINANCE.`RECONCILIATION_ACCOUNT` (
|
||||
`ID` varchar(36) NOT NULL,
|
||||
`CREATE_BY` varchar(50) DEFAULT NULL ,
|
||||
`CREATE_TIME` datetime DEFAULT NULL ,
|
||||
`UPDATE_BY` varchar(50) DEFAULT NULL ,
|
||||
`UPDATE_TIME` datetime DEFAULT NULL ,
|
||||
`DEL_FLAG` int DEFAULT '0' ,
|
||||
`ORG_NAME` varchar(255) DEFAULT NULL,
|
||||
`ORGANIZATION_ID` int DEFAULT '0',
|
||||
`TOP_ORGANIZATION_ID` int DEFAULT '0',
|
||||
`ORGANIZATION_NAME` varchar(255) DEFAULT NULL ,
|
||||
`RECONCILIATION_ID` varchar(32) DEFAULT NULL ,
|
||||
`ACCOUNT_ID` int DEFAULT '0' ,
|
||||
`ACCOUNT_TYPE` int DEFAULT '0',
|
||||
`SUBJECT_CODE` varchar(255) DEFAULT NULL,
|
||||
`SUBJECT_NAME` varchar(255) DEFAULT NULL,
|
||||
`RATE` decimal(10,2) DEFAULT '0.00',
|
||||
`AMOUNT` decimal(10,2) DEFAULT '0.00',
|
||||
PRIMARY KEY (`ID`)
|
||||
);
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."CREATE_BY" IS '创建人';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."CREATE_TIME" IS '创建日期';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."UPDATE_BY" IS '更新人';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."UPDATE_TIME" IS '更新日期';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."DEL_FLAG" IS '删除标识';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."ORG_NAME" IS '所属组织';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."ORGANIZATION_ID" IS '组织ID';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."TOP_ORGANIZATION_ID" IS '一级组织ID';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."ORGANIZATION_NAME" IS '组织名称';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."RECONCILIATION_ID" IS '应付账单id';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."ACCOUNT_ID" IS '科目id';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."ACCOUNT_TYPE" IS '科目收支类型(1-应收,2-应付)';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."SUBJECT_CODE" IS '科目编码';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."SUBJECT_NAME" IS '科目名称';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."RATE" IS '科目费率';
|
||||
COMMENT ON COLUMN "NGWL_TEST_FINANCE"."RECONCILIATION_ACCOUNT"."AMOUNT" IS '金额';
|
||||
@@ -0,0 +1,5 @@
|
||||
ALTER TABLE "NGWL_TEST_SYSTEM"."EXPENSE_ACCOUNT" ADD COLUMN rate decimal(10, 2) DEFAULT 0.00;
|
||||
COMMENT ON COLUMN "NGWL_TEST_SYSTEM"."EXPENSE_ACCOUNT".rate IS '费率';
|
||||
|
||||
ALTER TABLE "NGWL_TEST_SYSTEM"."EXPENSE_ACCOUNT" ADD COLUMN fixed_order_display INT DEFAULT 0;
|
||||
COMMENT ON COLUMN "NGWL_TEST_SYSTEM"."EXPENSE_ACCOUNT".fixed_order_display IS '创建订单是否固定显示 0-否 1-是';
|
||||
Reference in New Issue
Block a user