From c8894efc2fe3134fb8fdf9282abb9c9dba041def Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 12 Mar 2024 14:26:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/pack/entity/PayPackCompany.java     | 2 ++
 .../com/jero/pack/service/impl/PayPackCompanyServiceImpl.java  | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java
index 37c03abf..a9e4d6e9 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jero.common.aspect.annotation.Dict;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -138,6 +139,7 @@ public class PayPackCompany implements Serializable {
     private java.lang.String packPrincipalId;
 
     @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））")
+    @JsonProperty("affirmIncome")
     private Integer incomeAffirm;
 
     /**确认金额税额*/
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java
index 23208d8a..e12304af 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java
@@ -11,6 +11,7 @@ import com.jero.pack.entity.PayPackCompany;
 import com.jero.pack.mapper.PayPackCompanyMapper;
 import com.jero.pack.service.IPayPackCompanyService;
 import com.jero.pack.vo.PayPackCompanyProjectInput;
+import com.jero.project.common.PayProjectCommon;
 import com.jero.project.entity.PayCommonProject;
 import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.jero.statistics.entity.AllMoney;
@@ -162,6 +163,8 @@ public class PayPackCompanyServiceImpl extends ServiceImpl<PayPackCompanyMapper,
         }
         payPackCompany.setPackContactTemporaryId(mailContactsName.getId());
         payPackCompany.setPackContactTemporaryName(mailContactsName.getName());
+        payPackCompany.setInAccount(PayProjectCommon.IN_ACCOUNT0);
+        payPackCompany.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
         return payPackCompany;
     }