Commit 3f797e66 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.19' into MVP1.7.19

parents d5dd6094 cc1f3430
......@@ -504,6 +504,12 @@ public class TSettleDomain extends BaseEntity {
@ExcelIgnore
private String bpoFlag;
/**
* EKP的 是否启用BPO结算模式: 是 否
*/
@Schema(description = "是否启用BPO结算模式", name = "bpoEnable")
private String bpoEnable;
/**
* EKP的服务团队 : 存
*/
......
......@@ -108,6 +108,12 @@ public class ProjectSetInfoVo implements Serializable {
@ExcelIgnore
private String bpoFlag;
/**
* EKP的 是否启用BPO结算模式: 是 否
*/
@Schema(description = "是否启用BPO结算模式", name = "bpoEnable")
private String bpoEnable;
/**
* MVP1.7.11 增加: 服务项目
*/
......
......@@ -425,6 +425,12 @@ public class TSettleDomainEkpVo implements Serializable {
@Schema(description = "是否BPO", name = "bpoFlag")
private String bpoFlag;
/**
* EKP的 是否启用BPO结算模式: 是 否
*/
@Schema(description = "是否启用BPO结算模式", name = "bpoEnable")
private String bpoEnable;
/**
* EKP的服务团队 : 存
*/
......
......@@ -90,6 +90,7 @@
<result property="riskServerItem" column="RISK_SERVER_ITEM"/>
<result property="unitSeriousIllnessProp" column="UNIT_SERIOUS_ILLNESS_PROP"/>
<result property="bpoFlag" column="BPO_FLAG"/>
<result property="bpoEnable" column="BPO_ENABLE"/>
<result property="buBelong" column="BU_BELONG"/>
<result property="firstIndicatorBelong" column="FIRST_INDICATOR_BELONG"/>
<result property="secondIndicatorBelong" column="SECOND_INDICATOR_BELONG"/>
......@@ -187,6 +188,7 @@
a.RISK_SERVER_ITEM,
a.UNIT_SERIOUS_ILLNESS_PROP,
a.BPO_FLAG,
a.BPO_ENABLE,
a.BU_BELONG,
a.ISSUE_STATUS,
a.FIRST_INDICATOR_BELONG,
......@@ -229,6 +231,7 @@
<result property="commitUserName" column="COMMIT_USER_NAME"/>
<result property="stopFlag" column="STOP_FLAG"/>
<result property="bpoFlag" column="BPO_FLAG"/>
<result property="bpoEnable" column="BPO_ENABLE"/>
<!-- 2025-01-10 FXJ V1.7.5 -->
<result property="hasContainRisks" column="HAS_CONTAIN_RISKS"/>
......@@ -444,6 +447,7 @@
a.RISK_SERVER_ITEM,
a.UNIT_SERIOUS_ILLNESS_PROP,
a.BPO_FLAG,
a.BPO_ENABLE,
a.BU_BELONG,
a.ISSUE_STATUS,
a.FIRST_INDICATOR_BELONG,
......@@ -506,6 +510,7 @@
a.INVOICE_TITLE_SALARY,
a.INVOICE_TITLE_INSURANCE,
a.BPO_FLAG,
a.BPO_ENABLE,
a.SERVER_ITEM
FROM t_settle_domain a
where a.DELETE_FLAG = '0'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment