update 标协会员导出增加是否借票

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.vo.Result;
+import com.jero.common.constant.CommonConstant;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.query.QueryGenerator;
@@ -27,6 +28,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.member.vo.*;
+import com.jero.project.common.PayProjectCommon;
 import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
@@ -325,6 +327,14 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 					memberProjectSubitem.setPostalCode(payContactsManagement.getPostalCode());
 				}
 			}
+			//是否借票
+			Integer inAccount = memberProjectSubitem.getInAccount();
+			Integer makeInvoice = memberProjectSubitem.getMakeInvoice();
+			if (PayProjectCommon.IN_ACCOUNT0.equals(inAccount) && PayProjectCommon.MAKE_INVOICE1.equals(makeInvoice) ){
+				memberProjectSubitem.setBorrowTicket(CommonConstant.YES);
+			}else {
+				memberProjectSubitem.setBorrowTicket(CommonConstant.NO);
+			}
 		}
         return super.exportListXls(exportList, TbMemberProjectSubitem.class, "标协会员项目成员表");
     }

jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java

@@ -237,6 +237,11 @@ public class TbMemberProjectSubitem implements Serializable {
     @Excel(name = "是否开票", width = 15, dicCode = "make_invoice_type")
     private Integer makeInvoice;
 
+    /**是否借票*/
+    @TableField(exist = false)
+    @Excel(name = "是否借票", width = 15, dicCode = "yn")
+    private Integer borrowTicket;
+
     @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））")
     @Excel(name = "是否确收", width = 15, dicCode = "affirmi_ncome")
     private Integer affirmIncome;