银行回单认款,银行回单代码转移模块

new
parent a5b896a76a
commit 97972999a4

@ -12,4 +12,7 @@ public interface ErrorCodeConstants {
ErrorCode ACCOUNTING_REPORT_NOT_EXISTS = new ErrorCode(500100, "会计报表不存在"); ErrorCode ACCOUNTING_REPORT_NOT_EXISTS = new ErrorCode(500100, "会计报表不存在");
ErrorCode INVOICES_NOT_EXISTS = new ErrorCode(400100, "发票不存在"); ErrorCode INVOICES_NOT_EXISTS = new ErrorCode(400100, "发票不存在");
ErrorCode BANK_SLIP_NOT_EXISTS = new ErrorCode(400500, "银行回单不存在");
} }

@ -1,34 +1,30 @@
package cn.iocoder.yudao.module.archives.controller.admin.bankslip; package cn.iocoder.yudao.module.accounting.controller.admin.bankslip;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo.*;
import cn.iocoder.yudao.module.accounting.convert.bankslip.BankSlipConvert;
import cn.iocoder.yudao.module.accounting.dal.dataobject.bankslip.BankSlipDO;
import cn.iocoder.yudao.module.accounting.service.bankslip.BankSlipService;
import cn.iocoder.yudao.module.setting.service.passwords.PasswordsService; import cn.iocoder.yudao.module.setting.service.passwords.PasswordsService;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated; import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize; import javax.validation.Valid;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException; import java.io.IOException;
import java.util.Collection;
import java.util.List;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
import cn.iocoder.yudao.module.archives.controller.admin.bankslip.vo.*;
import cn.iocoder.yudao.module.archives.dal.dataobject.bankslip.BankSlipDO;
import cn.iocoder.yudao.module.archives.convert.bankslip.BankSlipConvert;
import cn.iocoder.yudao.module.archives.service.bankslip.BankSlipService;
@Tag(name = "管理后台 - 银行回单") @Tag(name = "管理后台 - 银行回单")
@RestController @RestController
@ -50,7 +46,7 @@ public class BankSlipController {
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新银行回单") @Operation(summary = "更新/认款银行回单")
@PreAuthorize("@ss.hasPermission('archives:bank-slip:update')") @PreAuthorize("@ss.hasPermission('archives:bank-slip:update')")
public CommonResult<Boolean> updateBankSlip(@Valid @RequestBody BankSlipUpdateReqVO updateReqVO) { public CommonResult<Boolean> updateBankSlip(@Valid @RequestBody BankSlipUpdateReqVO updateReqVO) {
bankSlipService.updateBankSlip(updateReqVO); bankSlipService.updateBankSlip(updateReqVO);
@ -95,7 +91,7 @@ public class BankSlipController {
@GetMapping("/downloadXml") @GetMapping("/downloadXml")
@Operation(summary = "获得银行回单分页Xml") @Operation(summary = "获得银行回单分页Xml")
@PreAuthorize("@ss.hasPermission('accounting:invoices:query')") @PreAuthorize("@ss.hasPermission('accounting:invoices:query')")
public void downloadXml(@Valid BankSlipPageReqVO pageVO,HttpServletResponse response) throws IOException { public void downloadXml(@Valid BankSlipPageReqVO pageVO, HttpServletResponse response) throws IOException {
PageResult<BankSlipDO> pageResult = bankSlipService.getBankSlipPage(pageVO); PageResult<BankSlipDO> pageResult = bankSlipService.getBankSlipPage(pageVO);
PageResult<BankSlipRespVO> invoicesRespVOPageResult = BankSlipConvert.INSTANCE.convertPage(pageResult); PageResult<BankSlipRespVO> invoicesRespVOPageResult = BankSlipConvert.INSTANCE.convertPage(pageResult);
String jsonString = JSONObject.toJSONString(invoicesRespVOPageResult); String jsonString = JSONObject.toJSONString(invoicesRespVOPageResult);

@ -1,15 +1,11 @@
package cn.iocoder.yudao.module.archives.controller.admin.bankslip.vo; package cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.Data;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/** /**
@ -140,4 +136,14 @@ public class BankSlipBaseVO {
@Schema(description = "密码") @Schema(description = "密码")
private String password; private String password;
@Schema(description = "认款员工id")
private String staffId;
@Schema(description = "认款员工名称")
private String staffName;
@Schema(description = "认款状态 0:未认款 1 已认款")
private String subscriptionStatus;
} }

@ -1,9 +1,9 @@
package cn.iocoder.yudao.module.archives.controller.admin.bankslip.vo; package cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.*; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@Schema(description = "管理后台 - 银行回单创建 Request VO") @Schema(description = "管理后台 - 银行回单创建 Request VO")
@Data @Data

@ -1,14 +1,9 @@
package cn.iocoder.yudao.module.archives.controller.admin.bankslip.vo; package cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/** /**
* Excel VO * Excel VO

@ -1,12 +1,11 @@
package cn.iocoder.yudao.module.archives.controller.admin.bankslip.vo; package cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import lombok.Data;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 银行回单 Excel 导出 Request VO参数和 BankSlipPageReqVO 是一致的") @Schema(description = "管理后台 - 银行回单 Excel 导出 Request VO参数和 BankSlipPageReqVO 是一致的")

@ -1,10 +1,12 @@
package cn.iocoder.yudao.module.archives.controller.admin.bankslip.vo; package cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

@ -1,7 +1,10 @@
package cn.iocoder.yudao.module.archives.controller.admin.bankslip.vo; package cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Schema(description = "管理后台 - 银行回单 Response VO") @Schema(description = "管理后台 - 银行回单 Response VO")

@ -1,9 +1,11 @@
package cn.iocoder.yudao.module.archives.controller.admin.bankslip.vo; package cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.Data;
import java.util.*; import lombok.EqualsAndHashCode;
import javax.validation.constraints.*; import lombok.ToString;
import javax.validation.constraints.NotNull;
@Schema(description = "管理后台 - 银行回单更新 Request VO") @Schema(description = "管理后台 - 银行回单更新 Request VO")
@Data @Data

@ -1,13 +1,16 @@
package cn.iocoder.yudao.module.archives.convert.bankslip; package cn.iocoder.yudao.module.accounting.convert.bankslip;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo.BankSlipCreateReqVO;
import cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo.BankSlipExcelVO;
import cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo.BankSlipRespVO;
import cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo.BankSlipUpdateReqVO;
import cn.iocoder.yudao.module.accounting.dal.dataobject.bankslip.BankSlipDO;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
import cn.iocoder.yudao.module.archives.controller.admin.bankslip.vo.*;
import cn.iocoder.yudao.module.archives.dal.dataobject.bankslip.BankSlipDO; import java.util.List;
/** /**
* Convert * Convert

@ -1,13 +1,12 @@
package cn.iocoder.yudao.module.archives.dal.dataobject.bankslip; package cn.iocoder.yudao.module.accounting.dal.dataobject.bankslip;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*; import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
/** /**
* DO * DO
@ -190,4 +189,20 @@ public class BankSlipDO extends BaseDO {
*/ */
private String password; private String password;
/**
* id
*/
private String staffId;
/**
*
*/
private String staffName;
/**
* 0: 1
*/
private String subscriptionStatus;
} }

@ -1,13 +1,14 @@
package cn.iocoder.yudao.module.archives.dal.mysql.bankslip; package cn.iocoder.yudao.module.accounting.dal.mysql.bankslip;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.archives.dal.dataobject.bankslip.BankSlipDO; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo.BankSlipExportReqVO;
import cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo.BankSlipPageReqVO;
import cn.iocoder.yudao.module.accounting.dal.dataobject.bankslip.BankSlipDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.archives.controller.admin.bankslip.vo.*;
import java.util.List;
/** /**
* Mapper * Mapper

@ -1,10 +1,15 @@
package cn.iocoder.yudao.module.archives.service.bankslip; package cn.iocoder.yudao.module.accounting.service.bankslip;
import java.util.*;
import javax.validation.*;
import cn.iocoder.yudao.module.archives.controller.admin.bankslip.vo.*;
import cn.iocoder.yudao.module.archives.dal.dataobject.bankslip.BankSlipDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo.BankSlipCreateReqVO;
import cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo.BankSlipExportReqVO;
import cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo.BankSlipPageReqVO;
import cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo.BankSlipUpdateReqVO;
import cn.iocoder.yudao.module.accounting.dal.dataobject.bankslip.BankSlipDO;
import javax.validation.Valid;
import java.util.Collection;
import java.util.List;
/** /**
* Service * Service

@ -1,21 +1,24 @@
package cn.iocoder.yudao.module.archives.service.bankslip; package cn.iocoder.yudao.module.accounting.service.bankslip;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo.BankSlipCreateReqVO;
import cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo.BankSlipExportReqVO;
import cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo.BankSlipPageReqVO;
import cn.iocoder.yudao.module.accounting.controller.admin.bankslip.vo.BankSlipUpdateReqVO;
import cn.iocoder.yudao.module.accounting.convert.bankslip.BankSlipConvert;
import cn.iocoder.yudao.module.accounting.dal.dataobject.bankslip.BankSlipDO;
import cn.iocoder.yudao.module.accounting.dal.mysql.bankslip.BankSlipMapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*; import java.util.Collection;
import cn.iocoder.yudao.module.archives.controller.admin.bankslip.vo.*; import java.util.List;
import cn.iocoder.yudao.module.archives.dal.dataobject.bankslip.BankSlipDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.archives.convert.bankslip.BankSlipConvert;
import cn.iocoder.yudao.module.archives.dal.mysql.bankslip.BankSlipMapper;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.archives.enums.ErrorCodeConstants.*; import static cn.iocoder.yudao.module.accounting.enums.ErrorCodeConstants.BANK_SLIP_NOT_EXISTS;
/** /**
* Service * Service

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.archives.dal.mysql.bankslip.BankSlipMapper"> <mapper namespace="cn.iocoder.yudao.module.accounting.dal.mysql.bankslip.BankSlipMapper">
<!-- <!--
一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。 一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。

@ -13,6 +13,5 @@ public interface ErrorCodeConstants {
ErrorCode FLOW_NOT_EXISTS = new ErrorCode(300400, "审批流程不存在"); ErrorCode FLOW_NOT_EXISTS = new ErrorCode(300400, "审批流程不存在");
ErrorCode BANK_SLIP_NOT_EXISTS = new ErrorCode(400500, "银行回单不存在");
} }
Loading…
Cancel
Save