diff --git a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/RedInformationController.java b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/RedInformationController.java index 820a927..6df6b8e 100644 --- a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/RedInformationController.java +++ b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/RedInformationController.java @@ -1,6 +1,7 @@ package com.jianshui.web.controller.platform; import com.jianshui.common.core.domain.AjaxResult; +import com.jianshui.invoice.domain.dto.FindRedWordDTO; import com.jianshui.platform.dto.invoicered.RedWordSelectionDTO; import com.jianshui.platform.dto.invoicered.RedWordDTO; import com.jianshui.platform.service.RedInformationService; @@ -25,8 +26,8 @@ public class RedInformationController { @ApiOperation("红字信息选择") @PostMapping("/redWordSelection") - public AjaxResult redWordSelection(@RequestBody RedWordSelectionDTO redWordSelectionDTO){ - return redInformationService.redWordSelection(redWordSelectionDTO); + public AjaxResult redWordSelection(@RequestBody RedWordSelectionDTO dto){ + return redInformationService.redWordSelection(dto); } @@ -35,4 +36,11 @@ public class RedInformationController { public AjaxResult redWordSubmit(@RequestBody RedWordDTO dto){ return redInformationService.redWordSubmit(dto); } + + @ApiOperation("红字信息表列表展示") + @PostMapping("/findRedWord") + public AjaxResult findRedWord(@RequestBody FindRedWordDTO dto){ + return redInformationService.findRedWord(dto); + } + } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/FindRedWordDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/FindRedWordDTO.java new file mode 100644 index 0000000..2eddf60 --- /dev/null +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/FindRedWordDTO.java @@ -0,0 +1,47 @@ +package com.jianshui.invoice.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author: kane + * @Description: 红字信息查询类 + * @CreateTime: 2023-06-26 09:20 + * @Version: 1.0 + **/ +@ApiModel("红字信息查询") +@Data +public class FindRedWordDTO { + + @ApiModelProperty("当前页") + private Integer pageNum; + + @ApiModelProperty("每页记录数") + private Integer pageSize; + + @ApiModelProperty("信息表编号") + private String redInfoNo; + + @ApiModelProperty("购方名称") + private String buyerName; + + @ApiModelProperty("购方税号") + private String buyerTaxnum; + + @ApiModelProperty("信息表状态") + private String redInfoStatus; + + @ApiModelProperty("填开日期开始时间") + private String beginBillInputTime; + + @ApiModelProperty("填开日期结束时间") + private String endBillInputTime; + + @ApiModelProperty("发票代码") + private String originFpdm; + + @ApiModelProperty("发票号码") + private String originFphm; + +} diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/mapper/RedinfoMapper.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/mapper/RedinfoMapper.java index bad0ce8..00cdbc0 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/mapper/RedinfoMapper.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/mapper/RedinfoMapper.java @@ -5,6 +5,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jianshui.invoice.domain.Redinfo; import com.jianshui.invoice.domain.Redinfodetail; +import com.jianshui.invoice.domain.dto.FindRedWordDTO; /** * 红字信息表Mapper接口 @@ -85,4 +86,11 @@ public interface RedinfoMapper extends BaseMapper { * @return 结果 */ public int deleteRedinfodetailByRedinfoId(Long id); + + /** + * 功能描述: 红字信息列表展示 + * @param dto + * @return : java.util.List + */ + List findRedInfoList(FindRedWordDTO dto); } diff --git a/jianshui-invoice/src/main/resources/mapper/invoice/RedinfoMapper.xml b/jianshui-invoice/src/main/resources/mapper/invoice/RedinfoMapper.xml index 0210dcb..fa1241a 100644 --- a/jianshui-invoice/src/main/resources/mapper/invoice/RedinfoMapper.xml +++ b/jianshui-invoice/src/main/resources/mapper/invoice/RedinfoMapper.xml @@ -143,7 +143,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join redinfodetail b on b.redinfo_id = a.id where a.id = #{id} - + + insert into redinfo diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/service/RedInformationService.java b/jianshui-platform/src/main/java/com/jianshui/platform/service/RedInformationService.java index f251738..cbb72fd 100644 --- a/jianshui-platform/src/main/java/com/jianshui/platform/service/RedInformationService.java +++ b/jianshui-platform/src/main/java/com/jianshui/platform/service/RedInformationService.java @@ -1,6 +1,7 @@ package com.jianshui.platform.service; import com.jianshui.common.core.domain.AjaxResult; +import com.jianshui.invoice.domain.dto.FindRedWordDTO; import com.jianshui.platform.dto.invoicered.RedWordSelectionDTO; import com.jianshui.platform.dto.invoicered.RedWordDTO; @@ -24,4 +25,11 @@ public interface RedInformationService { * @return : com.jianshui.common.core.domain.AjaxResult */ AjaxResult redWordSubmit(RedWordDTO dto); + + /** + * 功能描述: 红字信息查询 + * @param dto + * @return : com.jianshui.common.core.domain.AjaxResult + */ + AjaxResult findRedWord(FindRedWordDTO dto); } diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/RedInformationServiceImpl.java b/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/RedInformationServiceImpl.java index 02c575f..c7d61c7 100644 --- a/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/RedInformationServiceImpl.java +++ b/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/RedInformationServiceImpl.java @@ -1,5 +1,7 @@ package com.jianshui.platform.service.impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.jianshui.common.core.domain.AjaxResult; import com.jianshui.common.core.domain.entity.Companyservice; import com.jianshui.common.core.domain.entity.SysUser; @@ -13,13 +15,15 @@ import com.jianshui.invoice.domain.Redinfo; import com.jianshui.invoice.domain.Redinfodetail; import com.jianshui.invoice.mapper.InvoiceMapper; import com.jianshui.invoice.mapper.RedinfoMapper; -import com.jianshui.invoice.service.IInvoiceApiService; import com.jianshui.platform.constant.ExceptionInformationConstants; import com.jianshui.platform.constant.RedWordConstants; +import com.jianshui.invoice.domain.dto.FindRedWordDTO; import com.jianshui.platform.dto.invoicered.RedWordSelectionDTO; import com.jianshui.platform.dto.invoicered.RedWordDTO; import com.jianshui.platform.dto.invoicered.RedinfodetailDTO; import com.jianshui.platform.service.RedInformationService; +import com.jianshui.platform.vo.invoicered.FindRedWordVO; +import com.jianshui.platform.vo.invoicered.PageFindRedWordVO; import com.jianshui.platform.vo.invoicered.RedWordSelectionVO; import com.jianshui.system.mapper.CompanyserviceMapper; import com.jianshui.system.mapper.SysUserMapper; @@ -29,12 +33,12 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.UUID; +import static com.github.pagehelper.page.PageMethod.startPage; + /** * @Author: kane * @Description: 红字信息业务类 @@ -165,7 +169,6 @@ public class RedInformationServiceImpl implements RedInformationService { } return AjaxResult.success(RedWordConstants.SUBMITSUCCESS); } - /** * 功能描述: 红字信息保存 * @param dto @@ -248,4 +251,31 @@ public class RedInformationServiceImpl implements RedInformationService { //保存红字信息详情 redinfoMapper.batchRedinfodetail(redinfodetails); } + + + /** + * 功能描述: 红字信息查询 + * @param dto + * @return : com.jianshui.common.core.domain.AjaxResult + */ + @Override + public AjaxResult findRedWord(FindRedWordDTO dto) { + //获取红字信息集合 + PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); + List redinfoList = redinfoMapper.findRedInfoList(dto); + PageInfo pageInfo = new PageInfo<>(redinfoList); + //封装红字信息集合返回 + List findRedWordVOS = new ArrayList<>(); + for (Redinfo redinfo : pageInfo.getList()) { + FindRedWordVO findRedWordVO = new FindRedWordVO(); + BeanUtils.copyProperties(redinfo,findRedWordVO); + findRedWordVOS.add(findRedWordVO); + } + //分页对象 + PageFindRedWordVO pageFindRedWordVO = new PageFindRedWordVO(); + pageFindRedWordVO.setTotal(pageInfo.getTotal()); + pageFindRedWordVO.setRecords(findRedWordVOS); + return AjaxResult.success(pageFindRedWordVO); + } + } diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/vo/invoicered/FindRedWordVO.java b/jianshui-platform/src/main/java/com/jianshui/platform/vo/invoicered/FindRedWordVO.java new file mode 100644 index 0000000..5fb27fa --- /dev/null +++ b/jianshui-platform/src/main/java/com/jianshui/platform/vo/invoicered/FindRedWordVO.java @@ -0,0 +1,88 @@ +package com.jianshui.platform.vo.invoicered; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author: kane + * @Description: 红字信息查询返回类 + * @CreateTime: 2023-06-26 09:51 + * @Version: 1.0 + **/ +@Data +@ApiModel("红字信息查询返回结果") +public class FindRedWordVO { + + @ApiModelProperty("信息表编号") + private String redInfoNo; + + @ApiModelProperty("信息表状态") + private String redInfoStatus; + + + @ApiModelProperty("信息表描述") + private String redInfoMessage; + + + @ApiModelProperty("发票代码") + private String originFpdm; + + + @ApiModelProperty("发票号码") + private String originFphm; + + @ApiModelProperty("开票机号") + private String kpjh; + + @ApiModelProperty("购方名称") + private String buyerName; + + + @ApiModelProperty("购方税号") + private String buyerTaxnum; + + + @ApiModelProperty("销方名称") + private String sellerName; + + + @ApiModelProperty("销方税号") + private String sellerTaxnum; + + + @ApiModelProperty("填开日期") + private String billInputTime; + + @ApiModelProperty("所属月份") + private String ssyf; + + + @ApiModelProperty("合计税额") + private BigDecimal taxfreeamt; + + + @ApiModelProperty("税率") + private BigDecimal taxrate; + + + @ApiModelProperty("合计税额") + private BigDecimal tax; + + @ApiModelProperty("经办人") + private String jbr; + + @ApiModelProperty("申请选择") + private String sqxz; + + + @ApiModelProperty("申请方税号") + private String reqnsrsbh; + + + @ApiModelProperty("设备编号") + private String jspbh; + +} diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/vo/invoicered/PageFindRedWordVO.java b/jianshui-platform/src/main/java/com/jianshui/platform/vo/invoicered/PageFindRedWordVO.java new file mode 100644 index 0000000..e80589f --- /dev/null +++ b/jianshui-platform/src/main/java/com/jianshui/platform/vo/invoicered/PageFindRedWordVO.java @@ -0,0 +1,24 @@ +package com.jianshui.platform.vo.invoicered; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author: kane + * @Description: 红字分页返回对象 + * @CreateTime: 2023-06-26 11:11 + * @Version: 1.0 + **/ +@ApiModel("红字分页返回对象") +@Data +public class PageFindRedWordVO { + + @ApiModelProperty("总条数") + private long total; + + @ApiModelProperty("总数据") + private List records; +}