优化发票明细

java110-bean/src/main/java/com/java110/dto/invoiceApplyItem/InvoiceApplyItemDto.java

@@ -27,6 +27,8 @@ public class InvoiceApplyItemDto extends PageDto implements Serializable {
     private String remark;
     private String communityId;
 
+    private String payTime;
+
 
     private Date createTime;
 

java110-bean/src/main/java/com/java110/po/invoiceApplyItem/InvoiceApplyItemPo.java

@@ -17,6 +17,7 @@ package com.java110.po.invoiceApplyItem;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2023-10-08 18:31:57 mail: 928255095@qq.com
@@ -28,69 +29,94 @@ import java.util.Date;
 public class InvoiceApplyItemPo implements Serializable {
 
     private String itemId;
-private String applyId;
-private String itemType;
-private String itemName;
-private String itemAmount;
-private String itemObjId;
-private String remark;
-private String statusCd = "0";
-private String communityId;
-public String getItemId() {
+    private String applyId;
+    private String itemType;
+    private String itemName;
+    private String itemAmount;
+    private String itemObjId;
+    private String remark;
+    private String statusCd = "0";
+    private String communityId;
+
+    private String payTime;
+
+    public String getItemId() {
         return itemId;
     }
-public void setItemId(String itemId) {
+
+    public void setItemId(String itemId) {
         this.itemId = itemId;
     }
-public String getApplyId() {
+
+    public String getApplyId() {
         return applyId;
     }
-public void setApplyId(String applyId) {
+
+    public void setApplyId(String applyId) {
         this.applyId = applyId;
     }
-public String getItemType() {
+
+    public String getItemType() {
         return itemType;
     }
-public void setItemType(String itemType) {
+
+    public void setItemType(String itemType) {
         this.itemType = itemType;
     }
-public String getItemName() {
+
+    public String getItemName() {
         return itemName;
     }
-public void setItemName(String itemName) {
+
+    public void setItemName(String itemName) {
         this.itemName = itemName;
     }
-public String getItemAmount() {
+
+    public String getItemAmount() {
         return itemAmount;
     }
-public void setItemAmount(String itemAmount) {
+
+    public void setItemAmount(String itemAmount) {
         this.itemAmount = itemAmount;
     }
-public String getItemObjId() {
+
+    public String getItemObjId() {
         return itemObjId;
     }
-public void setItemObjId(String itemObjId) {
+
+    public void setItemObjId(String itemObjId) {
         this.itemObjId = itemObjId;
     }
-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 getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
+    public String getPayTime() {
+        return payTime;
+    }
 
-
+    public void setPayTime(String payTime) {
+        this.payTime = payTime;
+    }
 }

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

@@ -8,9 +8,9 @@
     <!-- 保存发票申请项信息 add by wuxw 2018-07-03 -->
     <insert id="saveInvoiceApplyItemInfo" parameterType="Map">
         insert into invoice_apply_item(
-        item_id,apply_id,item_type,item_name,item_amount,item_obj_id,remark,community_id
+        item_id,apply_id,item_type,item_name,item_amount,item_obj_id,remark,community_id,pay_time
         ) values (
-        #{itemId},#{applyId},#{itemType},#{itemName},#{itemAmount},#{itemObjId},#{remark},#{communityId}
+        #{itemId},#{applyId},#{itemType},#{itemName},#{itemAmount},#{itemObjId},#{remark},#{communityId},#{payTime}
         )
     </insert>
 
@@ -20,7 +20,8 @@
         item_id,apply_id,item_type,item_name,item_amount,item_obj_id,remark,community_id
         ) values
         <foreach collection="invoiceApplyItemPos" item="item" separator=",">
-            (#{item.itemId},#{item.applyId},#{item.itemType},#{item.itemName},#{item.itemAmount},#{item.itemObjId},#{item.remark},#{item.communityId})
+            (#{item.itemId},#{item.applyId},#{item.itemType},#{item.itemName},#{item.itemAmount},#{item.itemObjId},#{item.remark},
+            #{item.communityId}, #{item.payTime})
         </foreach>
     </insert>
 
@@ -29,7 +30,7 @@
     <select id="getInvoiceApplyItemInfo" parameterType="Map" resultType="Map">
         select t.item_id,t.item_id itemId,t.apply_id,t.apply_id applyId,t.item_type,t.item_type
         itemType,t.item_name,t.item_name itemName,t.item_amount,t.item_amount itemAmount,t.item_obj_id,t.item_obj_id
-        itemObjId,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId
+        itemObjId,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.pay_time payTime
         from invoice_apply_item t
         where 1 =1
         <if test="itemId !=null and itemId != ''">
@@ -86,6 +87,9 @@
         <if test="itemObjId !=null and itemObjId != ''">
             , t.item_obj_id= #{itemObjId}
         </if>
+        <if test="payTime !=null and payTime != ''">
+            , t.pay_time= #{payTime}
+        </if>
         <if test="remark !=null and remark != ''">
             , t.remark= #{remark}
         </if>

service-acct/src/main/java/com/java110/acct/cmd/invoice/ListInvoiceApplyItemCmd.java

@@ -37,8 +37,8 @@ import org.slf4j.LoggerFactory;
 
 /**
  * 类表述：查询
- * 服务编码：invoiceApplyItem.listInvoiceApplyItem
- * 请求路劲：/app/invoiceApplyItem.ListInvoiceApplyItem
+ * 服务编码：invoice.listInvoiceApplyItem
+ * 请求路劲：/app/invoice.ListInvoiceApplyItem
  * add by 吴学文 at 2023-10-08 18:31:57 mail: 928255095@qq.com
  * open source address: https://gitee.com/wuxw7/MicroCommunity
  * 官网：http://www.homecommunity.cn

service-acct/src/main/java/com/java110/acct/cmd/invoice/SaveInvoiceApplyCmd.java

@@ -221,6 +221,7 @@ public class SaveInvoiceApplyCmd extends Cmd {
                     + "~"
                     + DateUtil.getFormatTimeStringB(tmpFeeDetailDto.getEndTime())
                     + ")");
+            invoiceApplyItemPo.setPayTime(DateUtil.getFormatTimeStringA(tmpFeeDetailDto.getCreateTime()));
             invoiceApplyItemPo.setItemObjId(tmpFeeDetailDto.getDetailId());
             invoiceApplyItemPo.setItemType(InvoiceApplyItemDto.ITEM_TYPE_FEE);
             invoiceApplyItemPos.add(invoiceApplyItemPo);
@@ -268,7 +269,9 @@ public class SaveInvoiceApplyCmd extends Cmd {
             invoiceApplyItemPo.setItemId(GenerateCodeFactory.getGeneratorId("11"));
             invoiceApplyItemPo.setItemName(tmpAccountReceiptDto.getOwnerName());
             invoiceApplyItemPo.setItemObjId(tmpAccountReceiptDto.getArId());
-            invoiceApplyItemPo.setItemType(InvoiceApplyItemDto.ITEM_TYPE_FEE);
+            invoiceApplyItemPo.setItemType(InvoiceApplyItemDto.ITEM_TYPE_ACCT);
+            invoiceApplyItemPo.setPayTime(DateUtil.getFormatTimeStringA(tmpAccountReceiptDto.getCreateTime()));
+
             invoiceApplyItemPos.add(invoiceApplyItemPo);
         }