add new api voucherSelectAdvancedByEntry

atms-api/src/main/java/pwc/taxtech/atms/controller/VoucherController.java

 package pwc.taxtech.atms.controller;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import pwc.taxtech.atms.constant.enums.VoucherSearchEnum;
 import pwc.taxtech.atms.dto.OperationResultDto;
 import pwc.taxtech.atms.dto.vatdto.QueryVoucherParmDto;
+import pwc.taxtech.atms.vat.service.VoucherService;
 
 @RequestMapping(value = "api/v1/voucher")
 @RestController
 public class VoucherController {
+    @Autowired
+    VoucherService voucherService;
+
     @RequestMapping(value = "voucherSelectAdvancedByEntry", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public OperationResultDto<Object> voucherSelectAdvancedByEntry(QueryVoucherParmDto parmDto) {
-        return null;
+    public OperationResultDto<Object> voucherSelectAdvancedByEntry(QueryVoucherParmDto parmDto) throws Exception {
+        return voucherService.voucherSelectAdvancedByEntry(parmDto.getListQueryCondition(), VoucherSearchEnum.values()[parmDto.getMainRelation()], parmDto.isAllJe(), parmDto.getPagingInfo());
     }
 
     @RequestMapping(value = "voucherSelectAdvancedCount", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public OperationResultDto<Object> VoucherSelectAdvancedCount(QueryVoucherParmDto parmDto) {
-        return null;
+    public OperationResultDto<Object> voucherSelectAdvancedCount(QueryVoucherParmDto parmDto) throws Exception {
+        return voucherService.voucherSelectAdvancedCount(parmDto.getListQueryCondition(), VoucherSearchEnum.values()[parmDto.getMainRelation()], parmDto.isEntryShow(), parmDto.isAllJe());
     }
 }

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/QueryVoucherDto.java

+package pwc.taxtech.atms.dto.vatdto;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public class QueryVoucherDto {
+
+    private List<VoucherDto> voucherList;
+    //凭证总数
+    private int vidCount;
+    //分录总数
+    private int itemIDCount;
+    private BigDecimal debitSum;
+    private BigDecimal creditSum;
+
+    public List<VoucherDto> getVoucherList() {
+        return voucherList;
+    }
+
+    public void setVoucherList(List<VoucherDto> voucherList) {
+        this.voucherList = voucherList;
+    }
+
+    public int getVidCount() {
+        return vidCount;
+    }
+
+    public void setVidCount(int vidCount) {
+        this.vidCount = vidCount;
+    }
+
+    public int getItemIDCount() {
+        return itemIDCount;
+    }
+
+    public void setItemIDCount(int itemIDCount) {
+        this.itemIDCount = itemIDCount;
+    }
+
+    public BigDecimal getDebitSum() {
+        return debitSum;
+    }
+
+    public void setDebitSum(BigDecimal debitSum) {
+        this.debitSum = debitSum;
+    }
+
+    public BigDecimal getCreditSum() {
+        return creditSum;
+    }
+
+    public void setCreditSum(BigDecimal creditSum) {
+        this.creditSum = creditSum;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/VIDCountDto.java

+package pwc.taxtech.atms.dto.vatdto;
+
+public class VIDCountDto {
+    private String vid;
+    private String group;
+    private Integer period;
+
+    public String getVid() {
+        return vid;
+    }
+
+    public void setVid(String vid) {
+        this.vid = vid;
+    }
+
+    public String getGroup() {
+        return group;
+    }
+
+    public void setGroup(String group) {
+        this.group = group;
+    }
+
+    public Integer getPeriod() {
+        return period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public VIDCountDto(String vid, String group, Integer period) {
+        this.vid = vid;
+        this.group = group;
+        this.period = period;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/VoucherDto.java

+package pwc.taxtech.atms.dto.vatdto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class VoucherDto {
+    private String voucherID;
+    private String vID;
+    private Date date;
+    //private String GroupNum ;
+    private String group;
+    private Integer period;
+    private String customerCode;
+    private String customerName;
+    private String summary;
+    private String acctCode;
+    private BigDecimal debit;
+    private BigDecimal credit;
+    private BigDecimal debitQty;
+    private BigDecimal creditQty;
+    private Long attach;
+    private Long itemID;
+    private Integer status;
+    private Date createdTime;
+    private Integer isManual;
+    private Integer manualUser;
+    private Date manualTime;
+    private String stdCode;
+    private String mappingReason;
+    private Integer mappingUser;
+    private Date mappingTime;
+    private String manualReason;
+    private String foreignCurrency;
+    private BigDecimal foreignDebit;
+    private BigDecimal foreignCredit;
+    private String checkedBy;
+    private String issuedBy;
+    private String bookedBy;
+    private String cashier;
+    /**
+     * 是否被凭证重分类过
+     */
+    private Boolean isRecate;
+    private Integer originalPeriod;
+    private String acctCodeAndNameShow; //界面显示
+    private String customerCodeAndNameShow; //界面显示
+    private String stdCodeAndNameShow; //界面显示
+    private String groupShow; //界面显示
+
+    public String getVoucherID() {
+        return voucherID;
+    }
+
+    public void setVoucherID(String voucherID) {
+        this.voucherID = voucherID;
+    }
+
+    public String getvID() {
+        return vID;
+    }
+
+    public void setvID(String vID) {
+        this.vID = vID;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getGroup() {
+        return group;
+    }
+
+    public void setGroup(String group) {
+        this.group = group;
+    }
+
+    public Integer getPeriod() {
+        return period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public String getCustomerCode() {
+        return customerCode;
+    }
+
+    public void setCustomerCode(String customerCode) {
+        this.customerCode = customerCode;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+    public String getAcctCode() {
+        return acctCode;
+    }
+
+    public void setAcctCode(String acctCode) {
+        this.acctCode = acctCode;
+    }
+
+    public BigDecimal getDebit() {
+        return debit;
+    }
+
+    public void setDebit(BigDecimal debit) {
+        this.debit = debit;
+    }
+
+    public BigDecimal getCredit() {
+        return credit;
+    }
+
+    public void setCredit(BigDecimal credit) {
+        this.credit = credit;
+    }
+
+    public BigDecimal getDebitQty() {
+        return debitQty;
+    }
+
+    public void setDebitQty(BigDecimal debitQty) {
+        this.debitQty = debitQty;
+    }
+
+    public BigDecimal getCreditQty() {
+        return creditQty;
+    }
+
+    public void setCreditQty(BigDecimal creditQty) {
+        this.creditQty = creditQty;
+    }
+
+    public Long getAttach() {
+        return attach;
+    }
+
+    public void setAttach(Long attach) {
+        this.attach = attach;
+    }
+
+    public Long getItemID() {
+        return itemID;
+    }
+
+    public void setItemID(Long itemID) {
+        this.itemID = itemID;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public Integer getIsManual() {
+        return isManual;
+    }
+
+    public void setIsManual(Integer isManual) {
+        this.isManual = isManual;
+    }
+
+    public Integer getManualUser() {
+        return manualUser;
+    }
+
+    public void setManualUser(Integer manualUser) {
+        this.manualUser = manualUser;
+    }
+
+    public Date getManualTime() {
+        return manualTime;
+    }
+
+    public void setManualTime(Date manualTime) {
+        this.manualTime = manualTime;
+    }
+
+    public String getStdCode() {
+        return stdCode;
+    }
+
+    public void setStdCode(String stdCode) {
+        this.stdCode = stdCode;
+    }
+
+    public String getMappingReason() {
+        return mappingReason;
+    }
+
+    public void setMappingReason(String mappingReason) {
+        this.mappingReason = mappingReason;
+    }
+
+    public Integer getMappingUser() {
+        return mappingUser;
+    }
+
+    public void setMappingUser(Integer mappingUser) {
+        this.mappingUser = mappingUser;
+    }
+
+    public Date getMappingTime() {
+        return mappingTime;
+    }
+
+    public void setMappingTime(Date mappingTime) {
+        this.mappingTime = mappingTime;
+    }
+
+    public String getManualReason() {
+        return manualReason;
+    }
+
+    public void setManualReason(String manualReason) {
+        this.manualReason = manualReason;
+    }
+
+    public String getForeignCurrency() {
+        return foreignCurrency;
+    }
+
+    public void setForeignCurrency(String foreignCurrency) {
+        this.foreignCurrency = foreignCurrency;
+    }
+
+    public BigDecimal getForeignDebit() {
+        return foreignDebit;
+    }
+
+    public void setForeignDebit(BigDecimal foreignDebit) {
+        this.foreignDebit = foreignDebit;
+    }
+
+    public BigDecimal getForeignCredit() {
+        return foreignCredit;
+    }
+
+    public void setForeignCredit(BigDecimal foreignCredit) {
+        this.foreignCredit = foreignCredit;
+    }
+
+    public String getCheckedBy() {
+        return checkedBy;
+    }
+
+    public void setCheckedBy(String checkedBy) {
+        this.checkedBy = checkedBy;
+    }
+
+    public String getIssuedBy() {
+        return issuedBy;
+    }
+
+    public void setIssuedBy(String issuedBy) {
+        this.issuedBy = issuedBy;
+    }
+
+    public String getBookedBy() {
+        return bookedBy;
+    }
+
+    public void setBookedBy(String bookedBy) {
+        this.bookedBy = bookedBy;
+    }
+
+    public String getCashier() {
+        return cashier;
+    }
+
+    public void setCashier(String cashier) {
+        this.cashier = cashier;
+    }
+
+    public Boolean getRecate() {
+        return isRecate;
+    }
+
+    public void setRecate(Boolean recate) {
+        isRecate = recate;
+    }
+
+    public Integer getOriginalPeriod() {
+        return originalPeriod;
+    }
+
+    public void setOriginalPeriod(Integer originalPeriod) {
+        this.originalPeriod = originalPeriod;
+    }
+
+    public String getAcctCodeAndNameShow() {
+        return acctCodeAndNameShow;
+    }
+
+    public void setAcctCodeAndNameShow(String acctCodeAndNameShow) {
+        this.acctCodeAndNameShow = acctCodeAndNameShow;
+    }
+
+    public String getCustomerCodeAndNameShow() {
+        return customerCodeAndNameShow;
+    }
+
+    public void setCustomerCodeAndNameShow(String customerCodeAndNameShow) {
+        this.customerCodeAndNameShow = customerCodeAndNameShow;
+    }
+
+    public String getStdCodeAndNameShow() {
+        return stdCodeAndNameShow;
+    }
+
+    public void setStdCodeAndNameShow(String stdCodeAndNameShow) {
+        this.stdCodeAndNameShow = stdCodeAndNameShow;
+    }
+
+    public String getGroupShow() {
+        return groupShow;
+    }
+
+    public void setGroupShow(String groupShow) {
+        this.groupShow = groupShow;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/vat/service/VoucherService.java

@@ -16,7 +16,7 @@ public interface VoucherService {
      * @param pagingInfo 分页信息
      * @return 分录信息
      */
-    OperationResultDto<Object> voucherSelectAdvancedByEntry(List<QueryConditionDto> listQueryCondition, VoucherSearchEnum mainRelation, boolean allJe, PagingDto pagingInfo);
+    OperationResultDto<Object> voucherSelectAdvancedByEntry(List<QueryConditionDto> listQueryCondition, VoucherSearchEnum mainRelation, boolean allJe, PagingDto pagingInfo) throws Exception;
 
     /**
      * 根据满足查询条件返回总数