Commit dc7a4215 authored by fangxinjiang's avatar fangxinjiang

项目立项新增字段-fxj

parent f92664c0
...@@ -527,6 +527,22 @@ public class TSettleDomain extends BaseEntity { ...@@ -527,6 +527,22 @@ public class TSettleDomain extends BaseEntity {
@Schema(description = "二级指标归属", name = "secondIndicatorBelong") @Schema(description = "二级指标归属", name = "secondIndicatorBelong")
private String secondIndicatorBelong ; private String secondIndicatorBelong ;
/**
* 是否含险金 fxj 2025-01-10 v1.7.5
*/
@Schema(description = "是否含险金",name = "hasContainRisks")
private String hasContainRisks;
/**
* 事业部条线 fxj 2025-01-10 v1.7.5
*/
@Schema(description = "事业部条线",name = "newLine")
private String newLine ;
/**
* 事业部 fxj 2025-01-10 v1.7.5
*/
@Schema(description = "事业部",name = "division")
private String division ;
/** /**
* 代发户状态(0否;1是代发户) * 代发户状态(0否;1是代发户)
*/ */
......
...@@ -447,4 +447,20 @@ public class TSettleDomainEkpVo implements Serializable { ...@@ -447,4 +447,20 @@ public class TSettleDomainEkpVo implements Serializable {
@Schema(description = "二级指标归属",name = "secondIndicatorBelong") @Schema(description = "二级指标归属",name = "secondIndicatorBelong")
private String secondIndicatorBelong ; private String secondIndicatorBelong ;
/**
* 是否含险金
*/
@Schema(description = "是否含险金",name = "hasContainRisks")
private String hasContainRisks;
/**
* 事业部条线
*/
@Schema(description = "事业部条线",name = "newLine")
private String newLine ;
/**
* 事业部
*/
@Schema(description = "事业部",name = "division")
private String division ;
} }
...@@ -94,6 +94,12 @@ ...@@ -94,6 +94,12 @@
<result property="firstIndicatorBelong" column="FIRST_INDICATOR_BELONG"/> <result property="firstIndicatorBelong" column="FIRST_INDICATOR_BELONG"/>
<result property="secondIndicatorBelong" column="SECOND_INDICATOR_BELONG"/> <result property="secondIndicatorBelong" column="SECOND_INDICATOR_BELONG"/>
<result property="lineType" column="LINE_TYPE"/> <result property="lineType" column="LINE_TYPE"/>
<!-- 2025-01-10 FXJ V1.7.5 -->
<result property="hasContainRisks" column="HAS_CONTAIN_RISKS"/>
<result property="newLine" column="NEW_LINE"/>
<result property="division" column="DIVISION"/>
<result property="issueStatus" column="ISSUE_STATUS"/> <result property="issueStatus" column="ISSUE_STATUS"/>
</resultMap> </resultMap>
...@@ -178,7 +184,10 @@ ...@@ -178,7 +184,10 @@
a.ISSUE_STATUS, a.ISSUE_STATUS,
a.FIRST_INDICATOR_BELONG, a.FIRST_INDICATOR_BELONG,
a.SECOND_INDICATOR_BELONG, a.SECOND_INDICATOR_BELONG,
a.LINE_TYPE a.LINE_TYPE,
a.HAS_CONTAIN_RISKS,
a.NEW_LINE,
a.DIVISION
</sql> </sql>
<resultMap id="tSettleDomainSelectVoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo"> <resultMap id="tSettleDomainSelectVoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo">
...@@ -209,6 +218,11 @@ ...@@ -209,6 +218,11 @@
<result property="commitUserName" column="COMMIT_USER_NAME"/> <result property="commitUserName" column="COMMIT_USER_NAME"/>
<result property="stopFlag" column="STOP_FLAG"/> <result property="stopFlag" column="STOP_FLAG"/>
<result property="bpoFlag" column="BPO_FLAG"/> <result property="bpoFlag" column="BPO_FLAG"/>
<!-- 2025-01-10 FXJ V1.7.5 -->
<result property="hasContainRisks" column="HAS_CONTAIN_RISKS"/>
<result property="newLine" column="NEW_LINE"/>
<result property="division" column="DIVISION"/>
</resultMap> </resultMap>
<select id="getPage" resultMap="tSettleDomainMap"> <select id="getPage" resultMap="tSettleDomainMap">
...@@ -217,6 +231,15 @@ ...@@ -217,6 +231,15 @@
FROM t_settle_domain a FROM t_settle_domain a
WHERE 1=1 WHERE 1=1
<if test="tSettleDomain != null"> <if test="tSettleDomain != null">
<if test="tSettleDomain.hasContainRisks != null and tSettleDomain.hasContainRisks.trim() != ''">
and a.HAS_CONTAIN_RISKS = #{tSettleDomain.hasContainRisks}
</if>
<if test="tSettleDomain.newLine != null and tSettleDomain.newLine.trim() != ''">
and a.NEW_LINE = #{tSettleDomain.newLine}
</if>
<if test="tSettleDomain.division != null and tSettleDomain.division.trim() != ''">
and a.DIVISION = #{tSettleDomain.division}
</if>
<if test="tSettleDomain.departName != null and tSettleDomain.departName.trim() != ''"> <if test="tSettleDomain.departName != null and tSettleDomain.departName.trim() != ''">
and a.DEPART_NAME like concat('%', #{tSettleDomain.departName} ,'%') and a.DEPART_NAME like concat('%', #{tSettleDomain.departName} ,'%')
</if> </if>
......
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