财务查询修改

pom.xml

@@ -20,7 +20,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <druid.version>1.2.6</druid.version>
-        <fastjson.version>2.0.1</fastjson.version>
+        <fastjson.version>1.2.58</fastjson.version>
         <kaptcha.version>0.0.9</kaptcha.version>
         <mapstruct.version>1.5.4.Final</mapstruct.version>
         <zxing.version>3.5.1</zxing.version>

src/main/java/com/ydtech/aop/LogAspect.java

@@ -1,6 +1,7 @@
 package com.ydtech.aop;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysLog;
@@ -60,7 +61,7 @@ public class LogAspect {
             Object[] args = joinPoint.getArgs();
             for (Object obj : args) {
                 if (null != obj && (obj.getClass().getName().startsWith("com.ydtech.modules") || obj instanceof String)) {
-                    sysLog.setParams(JSONObject.toJSON(obj).toString());
+                    sysLog.setParams(JSON.toJSON(obj).toString());
                 }
             }
             if (request.getMethod().equals("GET")) {

src/main/java/com/ydtech/modules/inv/controller/InvAccountController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.inv.model.InvAccount;
 import com.ydtech.modules.inv.model.InvAccountCard;
+import com.ydtech.modules.inv.model.vo.InvAccountQueryVo;
 import com.ydtech.modules.inv.service.InvAccountCardService;
 import com.ydtech.modules.inv.service.InvAccountService;
 import io.swagger.annotations.Api;
@@ -31,8 +32,8 @@ public class InvAccountController {
 
     @ApiOperation("获取账户列表")
     @PostMapping("getAccount")
-    public HttpResult<IPage<InvAccount>> getInsAccountList(@RequestBody InvAccount insAccount) {
-        return HttpResult.ok("", invAccountService.selectAccountsListPage(insAccount));
+    public HttpResult<IPage<InvAccount>> getInsAccountList(@RequestBody InvAccountQueryVo invAccountQueryVo) {
+        return HttpResult.ok("", invAccountService.selectAccountsListPage(invAccountQueryVo));
     }
 
     @ApiOperation("获取账户详细信息")

src/main/java/com/ydtech/modules/inv/controller/InvAccountIncoiceController.java

@@ -1,17 +1,19 @@
 package com.ydtech.modules.inv.controller;
 
 
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.modules.inv.model.InvAccountIncoice;
+import com.ydtech.modules.inv.model.vo.InvAccountIncoiceQueryVo;
 import com.ydtech.modules.inv.service.InvAccountIncoiceService;
+import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import java.io.Serializable;
 
@@ -24,7 +26,7 @@ import java.io.Serializable;
 @RestController
 @RequestMapping("invAccountIncoice")
 @Api(tags = "发票管理表", value = "发票管理表")
-public class InvAccountIncoiceController{
+public class InvAccountIncoiceController {
     /**
      * 服务对象
      */
@@ -46,12 +48,25 @@ public class InvAccountIncoiceController{
      */
     @PostMapping("page")
     @ApiOperation("分页查询")
-    public HttpResult selectAll(@RequestBody InvAccountIncoice invAccountIncoice) {
+    public HttpResult<Page<InvAccountIncoice>> selectAll(@RequestBody InvAccountIncoiceQueryVo invAccountIncoice) {
         PageRequest pageRequest = new PageRequest();
         pageRequest.setPageNum(invAccountIncoice.getPageNo());
         pageRequest.setPageSize(invAccountIncoice.getPageSize());
-        Page page = PageRequest.buildPageRequest(pageRequest);
-        return HttpResult.ok(this.invAccountIncoiceService.page(page, new QueryWrapper<>(invAccountIncoice)));
+        Page<InvAccountIncoice> page = PageRequest.buildPageRequest(pageRequest);
+        LambdaQueryWrapper<InvAccountIncoice> lambdaQuery = new LambdaQueryWrapper<>();
+        lambdaQuery
+                .eq(!StringUtils.isEmpty(invAccountIncoice.getBiller()), InvAccountIncoice::getBiller, invAccountIncoice.getBiller())
+                .eq(!StringUtils.isEmpty(invAccountIncoice.getInvoiceBy()), InvAccountIncoice::getInvoiceBy,
+                        invAccountIncoice.getInvoiceBy())
+                .eq(!StringUtils.isEmpty(invAccountIncoice.getInvoiceType()), InvAccountIncoice::getInvoiceType,
+                        invAccountIncoice.getInvoiceType());
+
+        if (!ObjectUtils.isEmpty(invAccountIncoice.getInvoiceTime())) {
+            lambdaQuery.eq(InvAccountIncoice::getInvoiceTime, invAccountIncoice.getInvoiceTime().toString());
+        }
+
+        Page<InvAccountIncoice> invAccountIncoicePage = this.invAccountIncoiceService.page(page, lambdaQuery);
+        return HttpResult.ok(invAccountIncoicePage);
     }
 
     /**

src/main/java/com/ydtech/modules/inv/dao/InvAccountMapper.java

@@ -1,9 +1,10 @@
 package com.ydtech.modules.inv.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.modules.inv.model.InvAccount;
+import com.ydtech.modules.inv.model.vo.InvAccountQueryVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -16,9 +17,9 @@ import java.util.List;
  */
 public interface InvAccountMapper extends BaseMapper<InvAccount> {
 
-    IPage<InvAccount> selectAccountsListPage(Page page, @Param("account")InvAccount account);
+    IPage<InvAccount> selectAccountsListPage(Page page, @Param("account") InvAccountQueryVo invAccountQueryVo);
 
-    List<InvAccount> selectAccountsList(@Param("account")InvAccount account);
+    List<InvAccount> selectAccountsList(@Param("account") InvAccount account);
 }
 
 

src/main/java/com/ydtech/modules/inv/model/InvAccount.java

@@ -3,22 +3,20 @@ package com.ydtech.modules.inv.model;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
-import java.io.PipedReader;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 /**
  * 账户信息表
+ *
  * @TableName ins_account
  */
-@TableName(value ="inv_account")
+@TableName(value = "inv_account")
 @Data
 public class InvAccount implements Serializable {
     /**
@@ -33,7 +31,6 @@ public class InvAccount implements Serializable {
      */
     @ApiModelProperty(value = "户名")
     private String accountName;
-
     /**
      * 营业性质
      */
@@ -56,7 +53,7 @@ public class InvAccount implements Serializable {
      * 成立日期
      */
     @ApiModelProperty(value = "成立日期")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date establishTime;
 
     /**
@@ -93,7 +90,7 @@ public class InvAccount implements Serializable {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -106,10 +103,9 @@ public class InvAccount implements Serializable {
      * 更新时间
      */
     @ApiModelProperty(value = "更新时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
-
     /**
      * 外部账户标识(0内部账户 1外部账户)
      */
@@ -126,7 +122,7 @@ public class InvAccount implements Serializable {
     private int pageNo;
 
     @TableField(exist = false)
-    private int PageSize;
+    private int pageSize;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/ydtech/modules/inv/model/vo/InvAccountIncoiceQueryVo.java

@@ -0,0 +1,35 @@
+package com.ydtech.modules.inv.model.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+
+@Data
+public class InvAccountIncoiceQueryVo implements Serializable {
+
+    private static final long serialVersionUID = -4787031637747901966L;
+
+    @ApiModelProperty(value = "开票员")
+    private String biller;
+
+    @ApiModelProperty(value = "开票方")
+    private String invoiceBy;
+
+    @ApiModelProperty(value = "开票日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate invoiceTime;
+
+    //发票类型
+    @ApiModelProperty(value = "发票类型")
+    @ExcelProperty("发票类型")
+    private String invoiceType;
+
+    private int pageNo;
+
+    private int pageSize;
+}

src/main/java/com/ydtech/modules/inv/model/vo/InvAccountQueryVo.java

@@ -0,0 +1,29 @@
+package com.ydtech.modules.inv.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class InvAccountQueryVo implements Serializable {
+
+    private static final long serialVersionUID = 9024014475026448799L;
+
+    @ApiModelProperty(value = "户名")
+    private String accountName;
+
+    @ApiModelProperty(value = "账户类别")
+    private String accountQuality;
+
+    @ApiModelProperty(value = "银行卡号")
+    private String bankCardNum;
+
+    @ApiModelProperty(value = "外部账户标识(0内部账户 1外部账户)")
+    private String outerFlag;
+
+    private int pageNo;
+
+    private int pageSize;
+
+}

src/main/java/com/ydtech/modules/inv/service/InvAccountService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.inv.model.InvAccount;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.inv.model.vo.InvAccountQueryVo;
 
 import java.util.List;
 
@@ -14,7 +15,7 @@ import java.util.List;
 */
 public interface InvAccountService extends IService<InvAccount> {
 
-    IPage<InvAccount> selectAccountsListPage(InvAccount account);
+    IPage<InvAccount> selectAccountsListPage(InvAccountQueryVo account);
 
     List<InvAccount> selectAccounts(InvAccount account);
 

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountServiceImpl.java

@@ -1,20 +1,17 @@
 package com.ydtech.modules.inv.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
-import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.inv.dao.InvAccountMapper;
 import com.ydtech.modules.inv.model.InvAccount;
+import com.ydtech.modules.inv.model.vo.InvAccountQueryVo;
 import com.ydtech.modules.inv.service.InvAccountService;
-import com.ydtech.modules.inv.dao.InvAccountMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -36,12 +33,12 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
      * @return
      */
     @Override
-    public IPage<InvAccount> selectAccountsListPage(InvAccount account) {
+    public IPage<InvAccount> selectAccountsListPage(InvAccountQueryVo invAccountQueryVo) {
         PageRequest pageRequest = new PageRequest();
-        pageRequest.setPageNum(account.getPageNo());
-        pageRequest.setPageSize(account.getPageSize());
+        pageRequest.setPageNum(invAccountQueryVo.getPageNo());
+        pageRequest.setPageSize(invAccountQueryVo.getPageSize());
         Page page = PageRequest.buildPageRequest(pageRequest);
-        IPage<InvAccount> invAccountIPage = insAccountMapper.selectAccountsListPage(page, account);
+        IPage<InvAccount> invAccountIPage = insAccountMapper.selectAccountsListPage(page, invAccountQueryVo);
         List<InvAccount> records = invAccountIPage.getRecords();
         records.forEach(invAccount -> {
             if (invAccount.getInvAccountCardList().size() < 2) {

src/main/java/com/ydtech/modules/order/entity/api/dajia/request/ODR1010Request.java

@@ -211,7 +211,7 @@ public class ODR1010Request extends DaJiaBaseRequest {
     //交强特约信息
     public void setJqSpecialEngageList(List<BodyDTO.JqSpecialEngageListDTO> jqSpecialEngageList){
         if(Objects.isNull(body.jqSpecialEngageList)){
-            body.jqSpecialEngageList = new ArrayList<BodyDTO.JqSpecialEngageListDTO>();
+            body.jqSpecialEngageList = new ArrayList<>();
         }
         body.jqSpecialEngageList = jqSpecialEngageList;
     }
@@ -219,7 +219,7 @@ public class ODR1010Request extends DaJiaBaseRequest {
     //商业特约信息
     public void setSySpecialEngageList(List<ODR1009Response.ResultDTO.SySpecialEngageListDTO> sySpecialEngageList){
         if(Objects.isNull(body.sySpecialEngageList)){
-            body.sySpecialEngageList = new ArrayList<ODR1009Response.ResultDTO.SySpecialEngageListDTO>();
+            body.sySpecialEngageList = new ArrayList<>();
         }
         body.sySpecialEngageList = sySpecialEngageList;
     }
@@ -230,7 +230,7 @@ public class ODR1010Request extends DaJiaBaseRequest {
             body.checkInfo = new BodyDTO.CheckInfoDTO();
         }
         //车牌号
-        if(!insOrders.getCarinfo().getBoolean("noLicenseFlag")){
+        if(!insOrders.getCarinfo().getBooleanValue("noLicenseFlag")){
             body.checkInfo.setVehiclePlateNo(insOrders.getLicenseno());
         }
 

src/main/resources/mapper/modules/inv/InvAccountMapper.xml

@@ -19,7 +19,7 @@
         <result property="biller" column="biller" jdbcType="VARCHAR"/>
         <result property="invoicingAmount" column="invoicing_amount" jdbcType="VARCHAR"/>
         <result property="invoicingAmountExcess" column="invoicing_amount_excess" jdbcType="VARCHAR"/>
-        <collection property="invAccountCardList" ofType="com.ydtech.modules.inv.model.InvAccountCard" resultMap="invAccountCardList" />
+        <collection property="invAccountCardList" ofType="com.ydtech.modules.inv.model.InvAccountCard" resultMap="invAccountCardList"/>
     </resultMap>
 
     <resultMap id="invAccountCardList" type="com.ydtech.modules.inv.model.InvAccountCard">
@@ -108,17 +108,17 @@
         from inv_account a
         left join inv_account_card b on a.account_id = b.account_id
         where a.del_flag = '0'
-        <if test="account.accountId != null and account.accountId != ''">
-            and a.account_id = #{account.accountId}
-        </if>
         <if test="account.accountName!= null and account.accountName!= ''">
             and a.account_name like concat('%',#{account.accountName},'%')
         </if>
-        <if test="account.businessQuality!= null and account.businessQuality!= ''">
-            and a.business_quality = #{account.businessQuality}
+        <if test="account.outerFlag!= null and account.outerFlag!= ''">
+            and a.outer_flag like concat('%',#{account.outerFlag},'%')
         </if>
-        <if test="account.juridicalPerson!= null and account.juridicalPerson!= ''">
-            and a.juridical_person like concat('%',#{account.juridicalPerson},'%')
+        <if test="account.accountQuality!= null and account.accountQuality!= ''">
+            and b.account_quality like concat('%',#{account.accountQuality},'%')
+        </if>
+        <if test="account.bankCardNum!= null and account.bankCardNum!= ''">
+            and b.bank_card_num like concat('%',#{account.bankCardNum},'%')
         </if>
     </select>