Skip to content

T
traffic-front
Commit 4af71232 authored by eddie.woo's avatar eddie.woo
Browse files
Options

Merge branch 'dev_ken' into lg_temp 

# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumInputInvoiceEntityType.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumInputInvoiceRefundReason.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumInputInvoiceSourceType.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumInputInvoiceStatusType.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumInputInvoiceType.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumInputInvoiceUploadType.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumIsIncludedInTaxAmountType.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumProductionServiceType.java
#	atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumProductionType.java
#	atms-api/src/main/java/pwc/taxtech/atms/controller/input/InvoiceManageController.java
#	atms-api/src/main/java/pwc/taxtech/atms/dao/InputInvoiceMapper.java
#	atms-api/src/main/java/pwc/taxtech/atms/dto/input/InputInvoiceDto.java
#	atms-api/src/main/java/pwc/taxtech/atms/dto/input/InputInvoiceQuery.java
#	atms-api/src/main/java/pwc/taxtech/atms/service/InvoiceManageService.java
#	atms-api/src/main/java/pwc/taxtech/atms/service/impl/InvoiceManageServiceImpl.java
#	atms-api/src/main/resources/sqlMapConfig.xml
parent a2325919
Hide whitespace changes
Inline Side-by-side
Showing with 299 additions and 344 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/input/InvoiceManageController.java
View file @ 4af71232
package pwc.taxtech.atms.controller.input;
import org.apache.commons.net.nntp.NewGroupsOrNewsQuery;
import io.swagger.annotations.ApiOperation;
import org.apache.http.HttpStatus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.github.junrar.unpack.decode.LitDecode;
import com.github.pagehelper.PageHelper;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import pwc.taxtech.atms.controller.BaseController;
import pwc.taxtech.atms.dto.ApiResultDto;
import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.dto.input.CamelPagingDto;
import pwc.taxtech.atms.dto.input.CamelPagingResultDto;
import pwc.taxtech.atms.dto.input.InputInvoiceDto;
import pwc.taxtech.atms.dto.input.InputInvoiceItemDto;
import pwc.taxtech.atms.dto.input.InputInvoiceQueryDto;
import pwc.taxtech.atms.dto.input.InvoiceFilterDto;
import pwc.taxtech.atms.dto.vatdto.CustomsInvoiceFilter;
import pwc.taxtech.atms.dto.vatdto.JsonCustomsInvoiceDto;
import pwc.taxtech.atms.dto.vatdto.OutputVATInvoiceInfoDto;
import pwc.taxtech.atms.dto.vatdto.QueryOutputDto;
import pwc.taxtech.atms.entitiy.InputInvoice;
import pwc.taxtech.atms.dto.input.*;
import pwc.taxtech.atms.service.InvoiceManageService;
import pwc.taxtech.atms.thirdparty.ExcelSheet;
import pwc.taxtech.atms.thirdparty.ExcelUtil;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
@Controller
@RequestMapping(value = "api/v1/invoiceManage")
......
atms-api/src/main/java/pwc/taxtech/atms/dao/InputInvoiceItemMapper.java
View file @ 4af71232
......@@ -4,11 +4,13 @@ import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import org.springframework.stereotype.Repository;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entitiy.InputInvoiceItem;
import pwc.taxtech.atms.entitiy.InputInvoiceItemExample;
@Mapper
@Repository
public interface InputInvoiceItemMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/InvoiceManageServiceImpl.java
View file @ 4af71232
package pwc.taxtech.atms.service.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.internal.lang.annotation.ajcDeclareAnnotation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.googlecode.mp4parser.authoring.tracks.AACTrackImpl;
import org.springframework.transaction.annotation.Transactional;
import pwc.taxtech.atms.common.CommonUtils;
import pwc.taxtech.atms.common.ftp.FTPClientConfig;
import pwc.taxtech.atms.common.ftp.FTPClientPool;
import pwc.taxtech.atms.common.util.DateUtil;
import pwc.taxtech.atms.common.util.EnumUtil;
import pwc.taxtech.atms.constant.enums.EnumInputInvoiceEntityType;
import pwc.taxtech.atms.constant.enums.EnumInputInvoiceRefundReason;
import pwc.taxtech.atms.constant.enums.EnumInputInvoiceSourceType;
import pwc.taxtech.atms.constant.enums.EnumInputInvoiceStatusType;
import pwc.taxtech.atms.constant.enums.EnumInputInvoiceType;
import pwc.taxtech.atms.constant.enums.EnumInputInvoiceUploadType;
import pwc.taxtech.atms.constant.enums.EnumIsIncludedInTaxAmountType;
import pwc.taxtech.atms.constant.enums.EnumProductionServiceType;
import pwc.taxtech.atms.constant.enums.EnumProductionType;
import pwc.taxtech.atms.constant.enums.EnumVerifyWay;
import pwc.taxtech.atms.constant.enums.*;
import pwc.taxtech.atms.dao.InputInvoiceItemMapper;
import pwc.taxtech.atms.dao.InputInvoiceMapper;
import pwc.taxtech.atms.dao.dao.InputDeviceDao;
......@@ -45,16 +25,18 @@ import pwc.taxtech.atms.entitiy.InputInvoiceItem;
import pwc.taxtech.atms.service.InvoiceManageService;
import pwc.taxtech.atms.service.UserService;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@Service
public class InvoiceManageServiceImpl extends BaseService implements InvoiceManageService {
private static Logger LOGGER = LoggerFactory.getLogger(InvoiceManageServiceImpl.class);
@Autowired
@Autowired
private InputInvoiceMapper inputInvoiceMapper;
@Autowired
private InputInvoiceItemMapper inputInvoiceItemMapper;
@Autowired
@Autowired
private InputInvoiceItemMapper inputInvoiceItemMapper;
@Autowired
private UserService userService;
@Autowired
private TaskListService taskListService;
......@@ -65,303 +47,302 @@ public class InvoiceManageServiceImpl extends BaseService implements InvoiceMana
private static final String SCAN_REQUEST_URL = "api/v1/ocr/scan";
@Override
public CamelPagingResultDto<InputInvoiceDto> getInputInvoiceList(InputInvoiceQuery inputInvoiceQuery,CamelPagingDto pagingDto) {
public CamelPagingResultDto<InputInvoiceDto> getInputInvoiceList(InputInvoiceQuery inputInvoiceQuery, CamelPagingDto pagingDto) {
InputInvoiceExample example=new InputInvoiceExample();
InputInvoiceExample.Criteria criteria=example.createCriteria();
if(inputInvoiceQuery.getIsP2P()!=null&&inputInvoiceQuery.getIsP2PAndMailroom()!=null) {
if(inputInvoiceQuery.getIsP2P()&&inputInvoiceQuery.getIsP2PAndMailroom()) {
//待处理
criteria.andStatusIn(inputInvoiceQuery.getAllStatus());
}
}
else if(inputInvoiceQuery.getIsOverView()!=null) {
if(inputInvoiceQuery.getIsOverView()) {
//总览
}
}
//条件查询
if(inputInvoiceQuery!=null) {
if(inputInvoiceQuery.getBuyerName()!=null&&!inputInvoiceQuery.getBuyerName().isEmpty()) {
criteria.andBuyerNameEqualTo(inputInvoiceQuery.getBuyerName());
}
//模糊查询
if(inputInvoiceQuery.getSellerName()!=null&&!inputInvoiceQuery.getSellerName().isEmpty()) {
System.out.println(inputInvoiceQuery.getSellerName());
criteria.andSellerNameLike("%"+inputInvoiceQuery.getSellerName()+"%");
}
//模糊查询
if(inputInvoiceQuery.getInvoiceNumber()!=null&&!inputInvoiceQuery.getInvoiceNumber().isEmpty()) {
criteria.andInvoiceNumberLike("%"+inputInvoiceQuery.getInvoiceNumber()+"%");
}
if(inputInvoiceQuery.getStatus()!=null) {
criteria.andStatusEqualTo(inputInvoiceQuery.getStatus());
}
if(inputInvoiceQuery.getInvoiceUploadType()!=null) {
criteria.andUploadTypeEqualTo(inputInvoiceQuery.getInvoiceUploadType());
}
if(inputInvoiceQuery.getInvoiceType()!=null) {
criteria.andInvoiceTypeEqualTo(inputInvoiceQuery.getInvoiceType());
}
if(inputInvoiceQuery.getInvoiceDateFrom()!=null) {
InputInvoiceExample example = new InputInvoiceExample();
InputInvoiceExample.Criteria criteria = example.createCriteria();
if (inputInvoiceQuery.getIsP2P() != null && inputInvoiceQuery.getIsP2PAndMailroom() != null) {
if (inputInvoiceQuery.getIsP2P() && inputInvoiceQuery.getIsP2PAndMailroom()) {
//待处理
criteria.andStatusIn(inputInvoiceQuery.getAllStatus());
}
} else if (inputInvoiceQuery.getIsOverView() != null) {
if (inputInvoiceQuery.getIsOverView()) {
//总览
}
}
//条件查询
if (inputInvoiceQuery != null) {
if (inputInvoiceQuery.getBuyerName() != null && !inputInvoiceQuery.getBuyerName().isEmpty()) {
criteria.andBuyerNameEqualTo(inputInvoiceQuery.getBuyerName());
}
//模糊查询
if (inputInvoiceQuery.getSellerName() != null && !inputInvoiceQuery.getSellerName().isEmpty()) {
System.out.println(inputInvoiceQuery.getSellerName());
criteria.andSellerNameLike("%" + inputInvoiceQuery.getSellerName() + "%");
}
//模糊查询
if (inputInvoiceQuery.getInvoiceNumber() != null && !inputInvoiceQuery.getInvoiceNumber().isEmpty()) {
criteria.andInvoiceNumberLike("%" + inputInvoiceQuery.getInvoiceNumber() + "%");
}
if (inputInvoiceQuery.getStatus() != null) {
criteria.andStatusEqualTo(inputInvoiceQuery.getStatus());
}
if (inputInvoiceQuery.getInvoiceUploadType() != null) {
criteria.andUploadTypeEqualTo(inputInvoiceQuery.getInvoiceUploadType());
}
if (inputInvoiceQuery.getInvoiceType() != null) {
criteria.andInvoiceTypeEqualTo(inputInvoiceQuery.getInvoiceType());
}
if (inputInvoiceQuery.getInvoiceDateFrom() != null) {
criteria.andInvoiceDateGreaterThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getInvoiceDateFrom()));
}
if(inputInvoiceQuery.getInvoiceDateTo()!=null) {
criteria.andInvoiceDateLessThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getInvoiceDateTo()));
}
if(inputInvoiceQuery.getUploadDateFrom()!=null) {
criteria.andUploadDateGreaterThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getUploadDateFrom()));
}
if(inputInvoiceQuery.getUploadDateTo()!=null) {
criteria.andUploadDateLessThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getUploadDateTo()));
}
if(inputInvoiceQuery.getAmountFrom()!=null) {
criteria.andAmountGreaterThanOrEqualTo(inputInvoiceQuery.getAmountFrom());
}
if(inputInvoiceQuery.getAmountTo()!=null) {
criteria.andAmountLessThanOrEqualTo(inputInvoiceQuery.getAmountTo());
}
if(inputInvoiceQuery.getInvoiceEntityType()!=null) {
criteria.andInvoiceEntityTypeEqualTo(inputInvoiceQuery.getInvoiceEntityType());
}
if(inputInvoiceQuery.getInvoiceSourceType()!=null) {
criteria.andInvoiceSourceTypeEqualTo(inputInvoiceQuery.getInvoiceSourceType());
}
if(inputInvoiceQuery.getVerifyType()!=null) {
criteria.andVerifyTypeEqualTo(inputInvoiceQuery.getVerifyType());
}
if(inputInvoiceQuery.getCreateBy()!=null&&!inputInvoiceQuery.getCreateBy().isEmpty()) {
criteria.andCreateByEqualTo(inputInvoiceQuery.getCreateBy());
}
if(inputInvoiceQuery.getSerialNo()!=null&&!inputInvoiceQuery.getSerialNo().isEmpty()) {
criteria.andSerialNoEqualTo(inputInvoiceQuery.getSerialNo());
}
criteria.andInvoiceDateGreaterThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getInvoiceDateFrom()));
}
if (inputInvoiceQuery.getInvoiceDateTo() != null) {
criteria.andInvoiceDateLessThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getInvoiceDateTo()));
}
if (inputInvoiceQuery.getUploadDateFrom() != null) {
criteria.andUploadDateGreaterThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getUploadDateFrom()));
}
if (inputInvoiceQuery.getUploadDateTo() != null) {
criteria.andUploadDateLessThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getUploadDateTo()));
}
if (inputInvoiceQuery.getAmountFrom() != null) {
criteria.andAmountGreaterThanOrEqualTo(inputInvoiceQuery.getAmountFrom());
}
if (inputInvoiceQuery.getAmountTo() != null) {
criteria.andAmountLessThanOrEqualTo(inputInvoiceQuery.getAmountTo());
}
if (inputInvoiceQuery.getInvoiceEntityType() != null) {
criteria.andInvoiceEntityTypeEqualTo(inputInvoiceQuery.getInvoiceEntityType());
}
if (inputInvoiceQuery.getInvoiceSourceType() != null) {
criteria.andInvoiceSourceTypeEqualTo(inputInvoiceQuery.getInvoiceSourceType());
}
if (inputInvoiceQuery.getVerifyType() != null) {
criteria.andVerifyTypeEqualTo(inputInvoiceQuery.getVerifyType());
}
if (inputInvoiceQuery.getCreateBy() != null && !inputInvoiceQuery.getCreateBy().isEmpty()) {
criteria.andCreateByEqualTo(inputInvoiceQuery.getCreateBy());
}
if (inputInvoiceQuery.getSerialNo() != null && !inputInvoiceQuery.getSerialNo().isEmpty()) {
criteria.andSerialNoEqualTo(inputInvoiceQuery.getSerialNo());
}
}
example.setOrderByClause("upload_date ASC");
}
example.setOrderByClause("upload_date ASC");
Integer pageIndex=pagingDto.getPageIndex()!=null?pagingDto.getPageIndex():1;
Integer pageSize=pagingDto.getPageSize()!=null?pagingDto.getPageSize():10;
PageHelper.startPage(pageIndex,pageSize,true);
List<InputInvoice> inputInvoiceList = inputInvoiceMapper.selectByExample(example);
PageInfo pageInfo = new PageInfo<InputInvoice>(inputInvoiceList);
Integer pageIndex = pagingDto.getPageIndex() != null ? pagingDto.getPageIndex() : 1;
Integer pageSize = pagingDto.getPageSize() != null ? pagingDto.getPageSize() : 10;
PageHelper.startPage(pageIndex, pageSize, true);
List<InputInvoice> inputInvoiceList = inputInvoiceMapper.selectByExample(example);
PageInfo pageInfo = new PageInfo<InputInvoice>(inputInvoiceList);
List<InputInvoice> list=pageInfo.getList();
List<InputInvoiceDto> inputInvoiceDtos=new ArrayList<>();
list.forEach(a->{
InputInvoiceDto inputInvoiceDto=new InputInvoiceDto();
CommonUtils.copyProperties(a, inputInvoiceDto);
inputInvoiceDto.setInvoiceEntityTypeString(EnumUtil.getByCode(a.getInvoiceEntityType(), EnumInputInvoiceEntityType.class).name());
inputInvoiceDto.setInvoiceSourceTypeString(EnumUtil.getByCode(a.getInvoiceSourceType(), EnumInputInvoiceSourceType.class).name());
inputInvoiceDto.setInvoiceTypeString(EnumUtil.getByCode(a.getInvoiceType(), EnumInputInvoiceType.class).name());
inputInvoiceDto.setUploadTypeString(EnumUtil.getByCode(a.getUploadType(), EnumInputInvoiceUploadType.class).name());
inputInvoiceDto.setVerifyTypeString(EnumUtil.getByCode(a.getVerifyType(), EnumVerifyWay.class).name());
inputInvoiceDto.setStatusString(EnumUtil.getByCode(a.getStatus(), EnumInputInvoiceStatusType.class).name());
inputInvoiceDtos.add(inputInvoiceDto);
});
CamelPagingResultDto<InputInvoiceDto> camelPagingResultDto=new CamelPagingResultDto<InputInvoiceDto>();
List<InputInvoice> list = pageInfo.getList();
List<InputInvoiceDto> inputInvoiceDtos = new ArrayList<>();
list.forEach(a -> {
InputInvoiceDto inputInvoiceDto = new InputInvoiceDto();
CommonUtils.copyProperties(a, inputInvoiceDto);
inputInvoiceDto.setInvoiceEntityTypeString(EnumUtil.getByCode(a.getInvoiceEntityType(), EnumInputInvoiceEntityType.class).name());
inputInvoiceDto.setInvoiceSourceTypeString(EnumUtil.getByCode(a.getInvoiceSourceType(), EnumInputInvoiceSourceType.class).name());
inputInvoiceDto.setInvoiceTypeString(EnumUtil.getByCode(a.getInvoiceType(), EnumInputInvoiceType.class).name());
inputInvoiceDto.setUploadTypeString(EnumUtil.getByCode(a.getUploadType(), EnumInputInvoiceUploadType.class).name());
inputInvoiceDto.setVerifyTypeString(EnumUtil.getByCode(a.getVerifyType(), EnumVerifyWay.class).name());
inputInvoiceDto.setStatusString(EnumUtil.getByCode(a.getStatus(), EnumInputInvoiceStatusType.class).name());
inputInvoiceDtos.add(inputInvoiceDto);
});
CamelPagingResultDto<InputInvoiceDto> camelPagingResultDto = new CamelPagingResultDto<InputInvoiceDto>();
camelPagingResultDto.setList(inputInvoiceDtos);
pagingDto.setTotalCount((int) pageInfo.getTotal());
camelPagingResultDto.setPageInfo(pagingDto);
return camelPagingResultDto;
camelPagingResultDto.setList(inputInvoiceDtos);
pagingDto.setTotalCount((int) pageInfo.getTotal());
camelPagingResultDto.setPageInfo(pagingDto);
return camelPagingResultDto;
}
@Override
public String exportInvoiceAllInfoList(InputInvoiceQueryDto inputInvoiceQueryDto, CamelPagingDto pagingDto,
String fileName) {
// TODO Auto-generated method stub
return null;
}
@Override
public String exportInvoiceAllInfoList(InputInvoiceQueryDto inputInvoiceQueryDto, CamelPagingDto pagingDto,
String fileName) {
// TODO Auto-generated method stub
return null;
}
@Override
public List<InputInvoiceDto> getInputInvoiceDtoList(InputInvoiceQueryDto inputInvoiceQueryDto) {
@Override
public List<InputInvoiceDto> getInputInvoiceDtoList(InputInvoiceQueryDto inputInvoiceQueryDto) {
List<InputInvoice> inputInvoiceList=getInputInvoiceList(inputInvoiceQueryDto.getInvoiceQuery());
List<InputInvoiceDto> inputInvoiceDtos=new ArrayList<>();
if(inputInvoiceList.size()>0) {
inputInvoiceList.forEach(a->{
InputInvoiceDto inputInvoiceDto=new InputInvoiceDto();
CommonUtils.copyProperties(a, inputInvoiceDto);
inputInvoiceDtos.add(inputInvoiceDto);
});
}
return inputInvoiceDtos;
}
List<InputInvoice> inputInvoiceList = getInputInvoiceList(inputInvoiceQueryDto.getInvoiceQuery());
List<InputInvoiceDto> inputInvoiceDtos = new ArrayList<>();
if (inputInvoiceList.size() > 0) {
inputInvoiceList.forEach(a -> {
InputInvoiceDto inputInvoiceDto = new InputInvoiceDto();
CommonUtils.copyProperties(a, inputInvoiceDto);
inputInvoiceDtos.add(inputInvoiceDto);
});
}
return inputInvoiceDtos;
}
//条件查询所有订单
public List<InputInvoice> getInputInvoiceList(InputInvoiceQuery inputInvoiceQuery) {
InputInvoiceExample example=new InputInvoiceExample();
InputInvoiceExample.Criteria criteria=example.createCriteria();
//条件查询
if(inputInvoiceQuery!=null) {
if(inputInvoiceQuery.getBuyerName()!=null&&!inputInvoiceQuery.getBuyerName().isEmpty()) {
criteria.andBuyerNameEqualTo(inputInvoiceQuery.getBuyerName());
}
//模糊查询
if(inputInvoiceQuery.getSellerName()!=null&&!inputInvoiceQuery.getSellerName().isEmpty()) {
System.out.println(inputInvoiceQuery.getSellerName());
criteria.andSellerNameLike("%"+inputInvoiceQuery.getSellerName()+"%");
}
//模糊查询
if(inputInvoiceQuery.getInvoiceNumber()!=null&&!inputInvoiceQuery.getInvoiceNumber().isEmpty()) {
criteria.andInvoiceNumberLike("%"+inputInvoiceQuery.getInvoiceNumber()+"%");
}
if(inputInvoiceQuery.getStatus()!=null) {
criteria.andStatusEqualTo(inputInvoiceQuery.getStatus());
}
if(inputInvoiceQuery.getInvoiceUploadType()!=null) {
criteria.andUploadTypeEqualTo(inputInvoiceQuery.getInvoiceUploadType());
}
if(inputInvoiceQuery.getInvoiceType()!=null) {
criteria.andInvoiceTypeEqualTo(inputInvoiceQuery.getInvoiceType());
}
if(inputInvoiceQuery.getInvoiceDateFrom()!=null) {
criteria.andInvoiceDateGreaterThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getInvoiceDateFrom()));
}
if(inputInvoiceQuery.getInvoiceDateTo()!=null) {
criteria.andInvoiceDateLessThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getInvoiceDateTo()));
}
if(inputInvoiceQuery.getUploadDateFrom()!=null) {
criteria.andUploadDateGreaterThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getUploadDateFrom()));
}
if(inputInvoiceQuery.getUploadDateTo()!=null) {
criteria.andUploadDateLessThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getUploadDateTo()));
}
if(inputInvoiceQuery.getAmountFrom()!=null) {
criteria.andAmountGreaterThanOrEqualTo(inputInvoiceQuery.getAmountFrom());
}
if(inputInvoiceQuery.getAmountTo()!=null) {
criteria.andAmountLessThanOrEqualTo(inputInvoiceQuery.getAmountTo());
}
if(inputInvoiceQuery.getInvoiceEntityType()!=null) {
criteria.andInvoiceEntityTypeEqualTo(inputInvoiceQuery.getInvoiceEntityType());
}
if(inputInvoiceQuery.getInvoiceSourceType()!=null) {
criteria.andInvoiceSourceTypeEqualTo(inputInvoiceQuery.getInvoiceSourceType());
}
if(inputInvoiceQuery.getVerifyType()!=null) {
criteria.andVerifyTypeEqualTo(inputInvoiceQuery.getVerifyType());
}
if(inputInvoiceQuery.getCreateBy()!=null&&!inputInvoiceQuery.getCreateBy().isEmpty()) {
criteria.andCreateByEqualTo(inputInvoiceQuery.getCreateBy());
}
if(inputInvoiceQuery.getSerialNo()!=null&&!inputInvoiceQuery.getSerialNo().isEmpty()) {
criteria.andSerialNoEqualTo(inputInvoiceQuery.getSerialNo());
}
}
example.setOrderByClause("upload_date ASC");
List<InputInvoice> inputInvoiceList = inputInvoiceMapper.selectByExample(example);
return inputInvoiceList;
}
//条件查询所有订单
public List<InputInvoice> getInputInvoiceList(InputInvoiceQuery inputInvoiceQuery) {
InputInvoiceExample example = new InputInvoiceExample();
InputInvoiceExample.Criteria criteria = example.createCriteria();
//条件查询
if (inputInvoiceQuery != null) {
if (inputInvoiceQuery.getBuyerName() != null && !inputInvoiceQuery.getBuyerName().isEmpty()) {
criteria.andBuyerNameEqualTo(inputInvoiceQuery.getBuyerName());
}
//模糊查询
if (inputInvoiceQuery.getSellerName() != null && !inputInvoiceQuery.getSellerName().isEmpty()) {
System.out.println(inputInvoiceQuery.getSellerName());
criteria.andSellerNameLike("%" + inputInvoiceQuery.getSellerName() + "%");
}
//模糊查询
if (inputInvoiceQuery.getInvoiceNumber() != null && !inputInvoiceQuery.getInvoiceNumber().isEmpty()) {
criteria.andInvoiceNumberLike("%" + inputInvoiceQuery.getInvoiceNumber() + "%");
}
if (inputInvoiceQuery.getStatus() != null) {
criteria.andStatusEqualTo(inputInvoiceQuery.getStatus());
}
if (inputInvoiceQuery.getInvoiceUploadType() != null) {
criteria.andUploadTypeEqualTo(inputInvoiceQuery.getInvoiceUploadType());
}
if (inputInvoiceQuery.getInvoiceType() != null) {
criteria.andInvoiceTypeEqualTo(inputInvoiceQuery.getInvoiceType());
}
if (inputInvoiceQuery.getInvoiceDateFrom() != null) {
criteria.andInvoiceDateGreaterThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getInvoiceDateFrom()));
}
if (inputInvoiceQuery.getInvoiceDateTo() != null) {
criteria.andInvoiceDateLessThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getInvoiceDateTo()));
}
if (inputInvoiceQuery.getUploadDateFrom() != null) {
criteria.andUploadDateGreaterThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getUploadDateFrom()));
}
if (inputInvoiceQuery.getUploadDateTo() != null) {
criteria.andUploadDateLessThanOrEqualTo(DateUtil.getDateFormat(inputInvoiceQuery.getUploadDateTo()));
}
if (inputInvoiceQuery.getAmountFrom() != null) {
criteria.andAmountGreaterThanOrEqualTo(inputInvoiceQuery.getAmountFrom());
}
if (inputInvoiceQuery.getAmountTo() != null) {
criteria.andAmountLessThanOrEqualTo(inputInvoiceQuery.getAmountTo());
}
if (inputInvoiceQuery.getInvoiceEntityType() != null) {
criteria.andInvoiceEntityTypeEqualTo(inputInvoiceQuery.getInvoiceEntityType());
}
if (inputInvoiceQuery.getInvoiceSourceType() != null) {
criteria.andInvoiceSourceTypeEqualTo(inputInvoiceQuery.getInvoiceSourceType());
}
if (inputInvoiceQuery.getVerifyType() != null) {
criteria.andVerifyTypeEqualTo(inputInvoiceQuery.getVerifyType());
}
if (inputInvoiceQuery.getCreateBy() != null && !inputInvoiceQuery.getCreateBy().isEmpty()) {
criteria.andCreateByEqualTo(inputInvoiceQuery.getCreateBy());
}
if (inputInvoiceQuery.getSerialNo() != null && !inputInvoiceQuery.getSerialNo().isEmpty()) {
criteria.andSerialNoEqualTo(inputInvoiceQuery.getSerialNo());
}
}
example.setOrderByClause("upload_date ASC");
List<InputInvoice> inputInvoiceList = inputInvoiceMapper.selectByExample(example);
return inputInvoiceList;
}
@Override
public InvoiceFilterDto getInvoiceFilterBasicData() {
InvoiceFilterDto invoiceFilterDto=new InvoiceFilterDto();
InvoiceDictionaryDto invoiceDictionaryDto;
List<InvoiceDictionaryDto> invoiceStatusList=new ArrayList<InvoiceDictionaryDto>();
//发票状态
for (EnumInputInvoiceStatusType e : EnumInputInvoiceStatusType.values()) {
invoiceDictionaryDto=new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceStatusList.add(invoiceDictionaryDto);
}
//发票实体
List<InvoiceDictionaryDto> invoiceEntityList=new ArrayList<InvoiceDictionaryDto>();
for (EnumInputInvoiceEntityType e : EnumInputInvoiceEntityType.values()) {
invoiceDictionaryDto=new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceEntityList.add(invoiceDictionaryDto);
}
//发票类型
List<InvoiceDictionaryDto> invoiceTypeList=new ArrayList<InvoiceDictionaryDto>();
for (EnumInputInvoiceType e : EnumInputInvoiceType.values()) {
invoiceDictionaryDto=new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceTypeList.add(invoiceDictionaryDto);
}
//发票来源
List<InvoiceDictionaryDto> invoiceSourceList=new ArrayList<InvoiceDictionaryDto>();
for (EnumInputInvoiceSourceType e : EnumInputInvoiceSourceType.values()) {
invoiceDictionaryDto=new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceSourceList.add(invoiceDictionaryDto);
}
//上传方式
List<InvoiceDictionaryDto> invoiceUploadTypeList=new ArrayList<InvoiceDictionaryDto>();
for (EnumInputInvoiceUploadType e : EnumInputInvoiceUploadType.values()) {
invoiceDictionaryDto=new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceUploadTypeList.add(invoiceDictionaryDto);
}
//退票原因
List<InvoiceDictionaryDto> invoiceRefundReasonList=new ArrayList<InvoiceDictionaryDto>();
for (EnumInputInvoiceRefundReason e : EnumInputInvoiceRefundReason.values()) {
invoiceDictionaryDto=new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceRefundReasonList.add(invoiceDictionaryDto);
}
//商品类型
List<InvoiceDictionaryDto> invoiceProductionTypeList=new ArrayList<InvoiceDictionaryDto>();
for (EnumProductionType e : EnumProductionType.values()) {
invoiceDictionaryDto=new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceProductionTypeList.add(invoiceDictionaryDto);
}
//服务类型
List<InvoiceDictionaryDto> invoiceServiceTypeList=new ArrayList<InvoiceDictionaryDto>();
for (EnumProductionServiceType e : EnumProductionServiceType.values()) {
invoiceDictionaryDto=new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceServiceTypeList.add(invoiceDictionaryDto);
}
//是否计入进项税额
List<InvoiceDictionaryDto> isIncludedInTaxAmountTypeList=new ArrayList<InvoiceDictionaryDto>();
for (EnumIsIncludedInTaxAmountType e : EnumIsIncludedInTaxAmountType.values()) {
invoiceDictionaryDto=new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
isIncludedInTaxAmountTypeList.add(invoiceDictionaryDto);
}
invoiceFilterDto.setInvoiceStatusList(invoiceStatusList);
invoiceFilterDto.setInvoiceEntityList(invoiceEntityList);
invoiceFilterDto.setInvoiceTypeList(invoiceTypeList);
invoiceFilterDto.setInvoiceSourceList(invoiceSourceList);
invoiceFilterDto.setInvoiceUploadTypeList(invoiceUploadTypeList);
invoiceFilterDto.setInvoiceRefundReasonList(invoiceRefundReasonList);
invoiceFilterDto.setInvoiceProductionTypeList(invoiceProductionTypeList);
invoiceFilterDto.setIsIncludedInTaxAmountTypeList(isIncludedInTaxAmountTypeList);
invoiceFilterDto.setAllUserList(userService.findAllUsers());
return invoiceFilterDto;
}
@Override
public InvoiceFilterDto getInvoiceFilterBasicData() {
InvoiceFilterDto invoiceFilterDto = new InvoiceFilterDto();
InvoiceDictionaryDto invoiceDictionaryDto;
List<InvoiceDictionaryDto> invoiceStatusList = new ArrayList<InvoiceDictionaryDto>();
//发票状态
for (EnumInputInvoiceStatusType e : EnumInputInvoiceStatusType.values()) {
invoiceDictionaryDto = new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceStatusList.add(invoiceDictionaryDto);
}
//发票实体
List<InvoiceDictionaryDto> invoiceEntityList = new ArrayList<InvoiceDictionaryDto>();
for (EnumInputInvoiceEntityType e : EnumInputInvoiceEntityType.values()) {
invoiceDictionaryDto = new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceEntityList.add(invoiceDictionaryDto);
}
//发票类型
List<InvoiceDictionaryDto> invoiceTypeList = new ArrayList<InvoiceDictionaryDto>();
for (EnumInputInvoiceType e : EnumInputInvoiceType.values()) {
invoiceDictionaryDto = new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceTypeList.add(invoiceDictionaryDto);
}
//发票来源
List<InvoiceDictionaryDto> invoiceSourceList = new ArrayList<InvoiceDictionaryDto>();
for (EnumInputInvoiceSourceType e : EnumInputInvoiceSourceType.values()) {
invoiceDictionaryDto = new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceSourceList.add(invoiceDictionaryDto);
}
//上传方式
List<InvoiceDictionaryDto> invoiceUploadTypeList = new ArrayList<InvoiceDictionaryDto>();
for (EnumInputInvoiceUploadType e : EnumInputInvoiceUploadType.values()) {
invoiceDictionaryDto = new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceUploadTypeList.add(invoiceDictionaryDto);
}
//退票原因
List<InvoiceDictionaryDto> invoiceRefundReasonList = new ArrayList<InvoiceDictionaryDto>();
for (EnumInputInvoiceRefundReason e : EnumInputInvoiceRefundReason.values()) {
invoiceDictionaryDto = new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceRefundReasonList.add(invoiceDictionaryDto);
}
//商品类型
List<InvoiceDictionaryDto> invoiceProductionTypeList = new ArrayList<InvoiceDictionaryDto>();
for (EnumProductionType e : EnumProductionType.values()) {
invoiceDictionaryDto = new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceProductionTypeList.add(invoiceDictionaryDto);
}
//服务类型
List<InvoiceDictionaryDto> invoiceServiceTypeList = new ArrayList<InvoiceDictionaryDto>();
for (EnumProductionServiceType e : EnumProductionServiceType.values()) {
invoiceDictionaryDto = new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
invoiceServiceTypeList.add(invoiceDictionaryDto);
}
//是否计入进项税额
List<InvoiceDictionaryDto> isIncludedInTaxAmountTypeList = new ArrayList<InvoiceDictionaryDto>();
for (EnumIsIncludedInTaxAmountType e : EnumIsIncludedInTaxAmountType.values()) {
invoiceDictionaryDto = new InvoiceDictionaryDto();
invoiceDictionaryDto.setId(e.getCode());
invoiceDictionaryDto.setValue(e.name());
isIncludedInTaxAmountTypeList.add(invoiceDictionaryDto);
}
invoiceFilterDto.setInvoiceStatusList(invoiceStatusList);
invoiceFilterDto.setInvoiceEntityList(invoiceEntityList);
invoiceFilterDto.setInvoiceTypeList(invoiceTypeList);
invoiceFilterDto.setInvoiceSourceList(invoiceSourceList);
invoiceFilterDto.setInvoiceUploadTypeList(invoiceUploadTypeList);
invoiceFilterDto.setInvoiceRefundReasonList(invoiceRefundReasonList);
invoiceFilterDto.setInvoiceProductionTypeList(invoiceProductionTypeList);
invoiceFilterDto.setIsIncludedInTaxAmountTypeList(isIncludedInTaxAmountTypeList);
invoiceFilterDto.setAllUserList(userService.findAllUsers());
return invoiceFilterDto;
}
//查询所有订单关联货物
@Override
public List<InputInvoiceItemDto> getInputInvoiceItemList(String inputInvoiceId) {
//查询所有订单关联货物
@Override
public List<InputInvoiceItemDto> getInputInvoiceItemList(String inputInvoiceId) {
List<InputInvoiceItemDto> inputInvoiceItemDtos=new ArrayList<InputInvoiceItemDto>();
if(StringUtils.isNotEmpty(inputInvoiceId)) {
List<InputInvoiceItem> inputInvoiceItems=inputInvoiceItemMapper.selectByInputInvoiceId(inputInvoiceId);
if(inputInvoiceItems.size()>0) {
inputInvoiceItems.forEach(a->{
InputInvoiceItemDto inputInvoiceItemDto=new InputInvoiceItemDto();
CommonUtils.copyProperties(a, inputInvoiceItemDto);
inputInvoiceItemDtos.add(inputInvoiceItemDto);
});
}
}
return inputInvoiceItemDtos;
}
List<InputInvoiceItemDto> inputInvoiceItemDtos = new ArrayList<InputInvoiceItemDto>();
if (StringUtils.isNotEmpty(inputInvoiceId)) {
List<InputInvoiceItem> inputInvoiceItems = inputInvoiceItemMapper.selectByInputInvoiceId(inputInvoiceId);
if (inputInvoiceItems.size() > 0) {
inputInvoiceItems.forEach(a -> {
InputInvoiceItemDto inputInvoiceItemDto = new InputInvoiceItemDto();
CommonUtils.copyProperties(a, inputInvoiceItemDto);
inputInvoiceItemDtos.add(inputInvoiceItemDto);
});
}
}
return inputInvoiceItemDtos;
}
@Transactional
@Override
......@@ -388,5 +369,4 @@ public class InvoiceManageServiceImpl extends BaseService implements InvoiceMana
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment