优化代码

java110-bean/src/main/java/com/java110/dto/ownerInvoice/OwnerInvoiceDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.ownerInvoice;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,14 +16,18 @@ import java.util.Date;
 public class OwnerInvoiceDto extends PageDto implements Serializable {
 
     private String oiId;
-private String invoiceName;
-private String ownerName;
-private String invoiceType;
-private String invoiceAddress;
-private String remark;
-private String ownerId;
-private String communityId;
-private String invoiceNum;
+    private String invoiceName;
+    private String ownerName;
+    private String invoiceType;
+    private String invoiceAddress;
+    private String remark;
+    private String ownerId;
+    private String communityId;
+    private String invoiceNum;
+
+    private String invoiceLink;
+
+    private String invoiceAccount;
 
 
     private Date createTime;
@@ -33,55 +38,72 @@ private String invoiceNum;
     public String getOiId() {
         return oiId;
     }
-public void setOiId(String oiId) {
+
+    public void setOiId(String oiId) {
         this.oiId = oiId;
     }
-public String getInvoiceName() {
+
+    public String getInvoiceName() {
         return invoiceName;
     }
-public void setInvoiceName(String invoiceName) {
+
+    public void setInvoiceName(String invoiceName) {
         this.invoiceName = invoiceName;
     }
-public String getOwnerName() {
+
+    public String getOwnerName() {
         return ownerName;
     }
-public void setOwnerName(String ownerName) {
+
+    public void setOwnerName(String ownerName) {
         this.ownerName = ownerName;
     }
-public String getInvoiceType() {
+
+    public String getInvoiceType() {
         return invoiceType;
     }
-public void setInvoiceType(String invoiceType) {
+
+    public void setInvoiceType(String invoiceType) {
         this.invoiceType = invoiceType;
     }
-public String getInvoiceAddress() {
+
+    public String getInvoiceAddress() {
         return invoiceAddress;
     }
-public void setInvoiceAddress(String invoiceAddress) {
+
+    public void setInvoiceAddress(String invoiceAddress) {
         this.invoiceAddress = invoiceAddress;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getOwnerId() {
+
+    public String getOwnerId() {
         return ownerId;
     }
-public void setOwnerId(String ownerId) {
+
+    public void setOwnerId(String ownerId) {
         this.ownerId = ownerId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getInvoiceNum() {
+
+    public String getInvoiceNum() {
         return invoiceNum;
     }
-public void setInvoiceNum(String invoiceNum) {
+
+    public void setInvoiceNum(String invoiceNum) {
         this.invoiceNum = invoiceNum;
     }
 
@@ -101,4 +123,20 @@ public void setInvoiceNum(String invoiceNum) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getInvoiceLink() {
+        return invoiceLink;
+    }
+
+    public void setInvoiceLink(String invoiceLink) {
+        this.invoiceLink = invoiceLink;
+    }
+
+    public String getInvoiceAccount() {
+        return invoiceAccount;
+    }
+
+    public void setInvoiceAccount(String invoiceAccount) {
+        this.invoiceAccount = invoiceAccount;
+    }
 }

java110-bean/src/main/java/com/java110/po/ownerInvoice/OwnerInvoicePo.java

@@ -17,6 +17,7 @@ package com.java110.po.ownerInvoice;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2023-10-08 16:21:23 mail: 928255095@qq.com
@@ -28,76 +29,113 @@ import java.util.Date;
 public class OwnerInvoicePo implements Serializable {
 
     private String oiId;
-private String invoiceName;
-private String ownerName;
-private String invoiceType;
-private String invoiceAddress;
-private String remark;
-private String statusCd = "0";
-private String ownerId;
-private String communityId;
-private String invoiceNum;
-public String getOiId() {
+    private String invoiceName;
+    private String ownerName;
+    private String invoiceType;
+    private String invoiceAddress;
+    private String remark;
+    private String statusCd = "0";
+    private String ownerId;
+    private String communityId;
+    private String invoiceNum;
+
+    private String invoiceLink;
+
+    private String invoiceAccount;
+
+    public String getOiId() {
         return oiId;
     }
-public void setOiId(String oiId) {
+
+    public void setOiId(String oiId) {
         this.oiId = oiId;
     }
-public String getInvoiceName() {
+
+    public String getInvoiceName() {
         return invoiceName;
     }
-public void setInvoiceName(String invoiceName) {
+
+    public void setInvoiceName(String invoiceName) {
         this.invoiceName = invoiceName;
     }
-public String getOwnerName() {
+
+    public String getOwnerName() {
         return ownerName;
     }
-public void setOwnerName(String ownerName) {
+
+    public void setOwnerName(String ownerName) {
         this.ownerName = ownerName;
     }
-public String getInvoiceType() {
+
+    public String getInvoiceType() {
         return invoiceType;
     }
-public void setInvoiceType(String invoiceType) {
+
+    public void setInvoiceType(String invoiceType) {
         this.invoiceType = invoiceType;
     }
-public String getInvoiceAddress() {
+
+    public String getInvoiceAddress() {
         return invoiceAddress;
     }
-public void setInvoiceAddress(String invoiceAddress) {
+
+    public void setInvoiceAddress(String invoiceAddress) {
         this.invoiceAddress = invoiceAddress;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getOwnerId() {
+
+    public String getOwnerId() {
         return ownerId;
     }
-public void setOwnerId(String ownerId) {
+
+    public void setOwnerId(String ownerId) {
         this.ownerId = ownerId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getInvoiceNum() {
+
+    public String getInvoiceNum() {
         return invoiceNum;
     }
-public void setInvoiceNum(String invoiceNum) {
+
+    public void setInvoiceNum(String invoiceNum) {
         this.invoiceNum = invoiceNum;
     }
 
+    public String getInvoiceLink() {
+        return invoiceLink;
+    }
 
+    public void setInvoiceLink(String invoiceLink) {
+        this.invoiceLink = invoiceLink;
+    }
 
+    public String getInvoiceAccount() {
+        return invoiceAccount;
+    }
+
+    public void setInvoiceAccount(String invoiceAccount) {
+        this.invoiceAccount = invoiceAccount;
+    }
 }

java110-db/src/main/resources/mapper/acct/OwnerInvoiceV1ServiceDaoImplMapper.xml

@@ -5,138 +5,146 @@
 <mapper namespace="ownerInvoiceV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存业主发票信息 add by wuxw 2018-07-03 -->
     <insert id="saveOwnerInvoiceInfo" parameterType="Map">
         insert into owner_invoice(
-oi_id,invoice_name,owner_name,invoice_type,invoice_address,remark,owner_id,community_id,invoice_num
-) values (
-#{oiId},#{invoiceName},#{ownerName},#{invoiceType},#{invoiceAddress},#{remark},#{ownerId},#{communityId},#{invoiceNum}
-)
+        oi_id,invoice_name,owner_name,invoice_type,invoice_address,remark,owner_id,community_id,invoice_num,
+        invoice_link,invoice_account
+        ) values (
+        #{oiId},#{invoiceName},#{ownerName},#{invoiceType},#{invoiceAddress},#{remark},#{ownerId},#{communityId},#{invoiceNum},
+        ,#{invoiceLink},#{invoiceAccount}
+        )
     </insert>
 
 
-
     <!-- 查询业主发票信息 add by wuxw 2018-07-03 -->
     <select id="getOwnerInvoiceInfo" parameterType="Map" resultType="Map">
-        select  t.oi_id,t.oi_id oiId,t.invoice_name,t.invoice_name invoiceName,t.owner_name,t.owner_name ownerName,t.invoice_type,t.invoice_type invoiceType,t.invoice_address,t.invoice_address invoiceAddress,t.remark,t.status_cd,t.status_cd statusCd,t.owner_id,t.owner_id ownerId,t.community_id,t.community_id communityId,t.invoice_num,t.invoice_num invoiceNum 
-from owner_invoice t 
-where 1 =1 
-<if test="oiId !=null and oiId != ''">
-   and t.oi_id= #{oiId}
-</if> 
-<if test="invoiceName !=null and invoiceName != ''">
-   and t.invoice_name= #{invoiceName}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-   and t.owner_name= #{ownerName}
-</if> 
-<if test="invoiceType !=null and invoiceType != ''">
-   and t.invoice_type= #{invoiceType}
-</if> 
-<if test="invoiceAddress !=null and invoiceAddress != ''">
-   and t.invoice_address= #{invoiceAddress}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="invoiceNum !=null and invoiceNum != ''">
-   and t.invoice_num= #{invoiceNum}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.oi_id,t.oi_id oiId,t.invoice_name,t.invoice_name invoiceName,t.owner_name,t.owner_name
+        ownerName,t.invoice_type,t.invoice_type invoiceType,t.invoice_address,t.invoice_address
+        invoiceAddress,t.remark,t.status_cd,t.status_cd statusCd,t.owner_id,t.owner_id
+        ownerId,t.community_id,t.community_id communityId,t.invoice_num,t.invoice_num invoiceNum,
+        t.invoice_link invoiceLink,t.invoice_account invoiceAccount
+        from owner_invoice t
+        where 1 =1
+        <if test="oiId !=null and oiId != ''">
+            and t.oi_id= #{oiId}
+        </if>
+        <if test="invoiceName !=null and invoiceName != ''">
+            and t.invoice_name= #{invoiceName}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            and t.owner_name= #{ownerName}
+        </if>
+        <if test="invoiceType !=null and invoiceType != ''">
+            and t.invoice_type= #{invoiceType}
+        </if>
+        <if test="invoiceAddress !=null and invoiceAddress != ''">
+            and t.invoice_address= #{invoiceAddress}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="invoiceNum !=null and invoiceNum != ''">
+            and t.invoice_num= #{invoiceNum}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改业主发票信息 add by wuxw 2018-07-03 -->
     <update id="updateOwnerInvoiceInfo" parameterType="Map">
-        update  owner_invoice t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="invoiceName !=null and invoiceName != ''">
-, t.invoice_name= #{invoiceName}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-, t.owner_name= #{ownerName}
-</if> 
-<if test="invoiceType !=null and invoiceType != ''">
-, t.invoice_type= #{invoiceType}
-</if> 
-<if test="invoiceAddress !=null and invoiceAddress != ''">
-, t.invoice_address= #{invoiceAddress}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-, t.owner_id= #{ownerId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="invoiceNum !=null and invoiceNum != ''">
-, t.invoice_num= #{invoiceNum}
-</if> 
- where 1=1 <if test="oiId !=null and oiId != ''">
-and t.oi_id= #{oiId}
-</if> 
+        update owner_invoice t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="invoiceName !=null and invoiceName != ''">
+            , t.invoice_name= #{invoiceName}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            , t.owner_name= #{ownerName}
+        </if>
+        <if test="invoiceType !=null and invoiceType != ''">
+            , t.invoice_type= #{invoiceType}
+        </if>
+        <if test="invoiceAddress !=null and invoiceAddress != ''">
+            , t.invoice_address= #{invoiceAddress}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            , t.owner_id= #{ownerId}
+        </if>
+
+        <if test="invoiceNum !=null and invoiceNum != ''">
+            , t.invoice_num= #{invoiceNum}
+        </if>
+        <if test="invoiceLink !=null and invoiceLink != ''">
+            , t.invoice_link= #{invoiceLink}
+        </if>
+        <if test="invoiceAccount !=null and invoiceAccount != ''">
+            , t.invoice_account= #{invoiceAccount}
+        </if>
+        where 1=1
+        <if test="oiId !=null and oiId != ''">
+            and t.oi_id= #{oiId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
     </update>
 
     <!-- 查询业主发票数量 add by wuxw 2018-07-03 -->
-     <select id="queryOwnerInvoicesCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from owner_invoice t 
-where 1 =1 
-<if test="oiId !=null and oiId != ''">
-   and t.oi_id= #{oiId}
-</if> 
-<if test="invoiceName !=null and invoiceName != ''">
-   and t.invoice_name= #{invoiceName}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-   and t.owner_name= #{ownerName}
-</if> 
-<if test="invoiceType !=null and invoiceType != ''">
-   and t.invoice_type= #{invoiceType}
-</if> 
-<if test="invoiceAddress !=null and invoiceAddress != ''">
-   and t.invoice_address= #{invoiceAddress}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="invoiceNum !=null and invoiceNum != ''">
-   and t.invoice_num= #{invoiceNum}
-</if> 
+    <select id="queryOwnerInvoicesCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from owner_invoice t
+        where 1 =1
+        <if test="oiId !=null and oiId != ''">
+            and t.oi_id= #{oiId}
+        </if>
+        <if test="invoiceName !=null and invoiceName != ''">
+            and t.invoice_name= #{invoiceName}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            and t.owner_name= #{ownerName}
+        </if>
+        <if test="invoiceType !=null and invoiceType != ''">
+            and t.invoice_type= #{invoiceType}
+        </if>
+        <if test="invoiceAddress !=null and invoiceAddress != ''">
+            and t.invoice_address= #{invoiceAddress}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="invoiceNum !=null and invoiceNum != ''">
+            and t.invoice_num= #{invoiceNum}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>