Commit 47613349 authored by fangxinjiang's avatar fangxinjiang

项目信息新增字段:bpoFlag---- 是 否

parent b1e862c5
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
*/ */
package com.yifu.cloud.plus.v1.yifu.archives.entity; package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
...@@ -480,4 +481,11 @@ public class TSettleDomain extends BaseEntity { ...@@ -480,4 +481,11 @@ public class TSettleDomain extends BaseEntity {
@Schema(description = "单位大病比例", name = "unitSeriousIllnessProp") @Schema(description = "单位大病比例", name = "unitSeriousIllnessProp")
private BigDecimal unitSeriousIllnessProp; private BigDecimal unitSeriousIllnessProp;
/**
* EKP的 是否BPO: 是 否
*/
@Schema(description = "是否BPO", name = "bpoFlag")
@ExcelIgnore
private String bpoFlag;
} }
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
<result property="manageServerItem" column="MANAGE_SERVER_ITEM"/> <result property="manageServerItem" column="MANAGE_SERVER_ITEM"/>
<result property="riskServerItem" column="RISK_SERVER_ITEM"/> <result property="riskServerItem" column="RISK_SERVER_ITEM"/>
<result property="unitSeriousIllnessProp" column="UNIT_SERIOUS_ILLNESS_PROP"/> <result property="unitSeriousIllnessProp" column="UNIT_SERIOUS_ILLNESS_PROP"/>
<result property="bpoFlag" column="BPO_FLAG"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -161,7 +162,8 @@ ...@@ -161,7 +162,8 @@
a.RISK_FUND_TYPE, a.RISK_FUND_TYPE,
a.MANAGE_SERVER_ITEM, a.MANAGE_SERVER_ITEM,
a.RISK_SERVER_ITEM, a.RISK_SERVER_ITEM,
a.UNIT_SERIOUS_ILLNESS_PROP a.UNIT_SERIOUS_ILLNESS_PROP,
a.BPO_FLAG
</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">
...@@ -191,24 +193,19 @@ ...@@ -191,24 +193,19 @@
<result property="commitUser" column="COMMIT_USER"/> <result property="commitUser" column="COMMIT_USER"/>
<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"/>
</resultMap> </resultMap>
<select id="selectSettleDomainSelectVosById" <select id="selectSettleDomainSelectVosById"
resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo"> resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo">
SELECT SELECT
<include refid="Base_Column_List"/>, <include refid="Base_Column_List"/>,
c.customerId, a.CUSTOMER_ID AS 'customerId',
c.CUSTOMER_NAME as 'customerName', a.CUSTOMER_NAME as 'customerName',
c.CUSTOMER_CODE as 'customerCode', a.CUSTOMER_NO as 'customerCode',
c.INDUSTRY_BELONG as 'industryBelong' a.INVOICE_TITLE_SALARY as 'businessSubjectName'
FROM FROM
t_settle_domain a t_settle_domain a
LEFT JOIN (
select ID AS 'customerId',
CUSTOMER_NAME,
INDUSTRY_BELONG,
CUSTOMER_CODE from t_customer_info
) c ON a.CUSTOMER_ID = c.customerId
WHERE a.DEPART_NO=#{departNo} GROUP BY a.DEPART_NO WHERE a.DEPART_NO=#{departNo} GROUP BY a.DEPART_NO
</select> </select>
...@@ -216,32 +213,23 @@ ...@@ -216,32 +213,23 @@
resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo"> resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo">
SELECT SELECT
<include refid="Base_Column_List"/>, <include refid="Base_Column_List"/>,
c.customerId, a.CUSTOMER_ID AS 'customerId',
c.CUSTOMER_NAME as 'customerName', a.CUSTOMER_NAME as 'customerName',
c.CUSTOMER_CODE as 'customerCode', a.CUSTOMER_NO as 'customerCode',
c.INDUSTRY_BELONG as 'industryBelong',
a.INVOICE_TITLE_SALARY as 'businessSubjectName' a.INVOICE_TITLE_SALARY as 'businessSubjectName'
FROM FROM
t_settle_domain a t_settle_domain a
LEFT JOIN (
select ID AS 'customerId',
CUSTOMER_NAME,
INDUSTRY_BELONG,
CUSTOMER_CODE from t_customer_info
) c ON a.CUSTOMER_ID = c.customerId
WHERE a.id=#{id} GROUP BY a.id WHERE a.id=#{id} GROUP BY a.id
</select> </select>
<select id="selectAllSettleDomainSelectVos" resultMap="tSettleDomainSelectVoMap"> <select id="selectAllSettleDomainSelectVos" resultMap="tSettleDomainSelectVoMap">
SELECT SELECT
<include refid="Base_Column_List"/>, <include refid="Base_Column_List"/>,
c.ID AS 'customerId', a.CUSTOMER_ID AS 'customerId',
c.CUSTOMER_NAME as 'customerName', a.CUSTOMER_NAME as 'customerName',
c.CUSTOMER_CODE as 'customerCode', a.CUSTOMER_NO as 'customerCode'
c.customer_type as 'customerTypeName'
FROM FROM
t_settle_domain a t_settle_domain a
LEFT JOIN t_customer_info c ON a.CUSTOMER_ID = c.ID
where a.DELETE_FLAG = '0' where a.DELETE_FLAG = '0'
</select> </select>
<select id="getSetInfoByCodes" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo"> <select id="getSetInfoByCodes" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo">
......
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