Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
20f84e62
You need to sign in or sign up before continuing.
Commit
20f84e62
authored
Jan 13, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.7.19-第一天
parent
6088dea5
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
36 additions
and
9 deletions
+36
-9
EmployeeRegistrationPreMapper.xml
...c/main/resources/mapper/EmployeeRegistrationPreMapper.xml
+1
-1
TCompleteMonitorMapper.xml
...-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
+1
-1
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+1
-1
EmployeeRegistrationLeaveExportVo.java
...oud/plus/v1/csp/vo/EmployeeRegistrationLeaveExportVo.java
+3
-0
EmployeeRegistrationLeaveTableVo.java
...loud/plus/v1/csp/vo/EmployeeRegistrationLeaveTableVo.java
+5
-0
EmployeeRegistrationLeaveMapper.xml
...main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
+3
-1
EmployeeRegistrationMapper.xml
.../src/main/resources/mapper/EmployeeRegistrationMapper.xml
+1
-1
TInsuranceAlert.java
...cloud/plus/v1/yifu/insurances/entity/TInsuranceAlert.java
+4
-0
TInsuranceAlertExportVO.java
...d/plus/v1/yifu/insurances/vo/TInsuranceAlertExportVO.java
+5
-0
TEmployeeInsurancePreMapper.xml
...sources/mapper/insurances/TEmployeeInsurancePreMapper.xml
+1
-1
TInsuranceWarnMapper.xml
...main/resources/mapper/insurances/TInsuranceWarnMapper.xml
+6
-0
SociaFriendYgsAddVo.java
...ifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
+1
-1
SysBaseSetInfoMapper.xml
...al-biz/src/main/resources/mapper/SysBaseSetInfoMapper.xml
+3
-1
TDispatchInfoPreMapper.xml
...-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/EmployeeRegistrationPreMapper.xml
View file @
20f84e62
...
...
@@ -144,7 +144,7 @@
</foreach>
</if>
<if
test=
"employeeRegistrationPre.customerUsernameNew != null and employeeRegistrationPre.customerUsernameNew.trim() != ''"
>
AND a.customer_username_new = #{employeeRegistrationPre.customerUsernameNew}
AND a.customer_username_new like CONCAT('%',#{employeeRegistrationPre.customerUsernameNew},'%')
</if>
<if
test=
"employeeRegistrationPre.customerUserLoginname != null and employeeRegistrationPre.customerUserLoginname.trim() != ''"
>
AND a.customer_user_loginname = #{employeeRegistrationPre.customerUserLoginname}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
View file @
20f84e62
...
...
@@ -136,7 +136,7 @@
AND a.PROJECT_SOURCE = #{employeeRegistrationPre.dataSource}
</if>
<if
test=
"employeeRegistrationPre.customerUsernameNew != null and employeeRegistrationPre.customerUsernameNew.trim() != ''"
>
AND c.CS_NAME
= #{employeeRegistrationPre.customerUsernameNew}
AND c.CS_NAME
like CONCAT('%',#{employeeRegistrationPre.customerUsernameNew},'%')
</if>
<if
test=
"employeeRegistrationPre.authSql != null and employeeRegistrationPre.authSql.trim() != ''"
>
${employeeRegistrationPre.authSql}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
20f84e62
...
...
@@ -236,7 +236,7 @@
AND a.signatory like CONCAT('%',#{tEmployeeContractPre.signatory},'%')
</if>
<if
test=
"tEmployeeContractPre.customerUsername != null and tEmployeeContractPre.customerUsername.trim() != ''"
>
AND a.customer_username
= #{tEmployeeContractPre.customerUsername}
AND a.customer_username
like CONCAT('%',#{tEmployeeContractPre.customerUsername},'%')
</if>
<if
test=
"tEmployeeContractPre.customerUserLoginname != null and tEmployeeContractPre.customerUserLoginname.trim() != ''"
>
AND a.customer_user_loginname = #{tEmployeeContractPre.customerUserLoginname}
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationLeaveExportVo.java
View file @
20f84e62
...
...
@@ -84,4 +84,7 @@ public class EmployeeRegistrationLeaveExportVo {
@ExcelProperty
(
"减档"
)
private
String
doStatusEmp
;
@ExcelProperty
(
"前端客服"
)
private
String
customerUsernameNew
;
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationLeaveTableVo.java
View file @
20f84e62
...
...
@@ -17,6 +17,7 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -204,4 +205,8 @@ public class EmployeeRegistrationLeaveTableVo extends EmployeeRegistrationLeaveE
@Schema
(
description
=
"项目档案失败时间"
)
private
LocalDateTime
failEmpProjectTime
;
@TableField
(
exist
=
false
)
@Schema
(
description
=
"前端客服"
)
private
String
customerUsernameNew
;
}
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
View file @
20f84e62
...
...
@@ -68,6 +68,7 @@
<result
property=
"joinLeaveDate"
column=
"join_leave_date"
/>
<result
property=
"deptName"
column=
"dept_name"
/>
<result
property=
"deptNo"
column=
"dept_no"
/>
<result
property=
"customerUsernameNew"
column=
"customer_username_new"
/>
</resultMap>
<!-- 新表全量字段-确认、派单时使用 -->
...
...
@@ -406,7 +407,8 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
b.emp_idcard,
DATE_FORMAT(b.join_leave_date,'%Y-%m-%d') join_leave_date,
b.dept_name,
b.dept_no
b.dept_no,
b.customer_username_new
</sql>
<!-- 离职确认列表 -->
...
...
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationMapper.xml
View file @
20f84e62
...
...
@@ -213,7 +213,7 @@
AND a.data_source = #{employeeRegistration.dataSource}
</if>
<if
test=
"employeeRegistration.customerUsernameNew != null and employeeRegistration.customerUsernameNew.trim() != ''"
>
AND a.customer_username_new
= #{employeeRegistration.customerUsernameNew}
AND a.customer_username_new
like CONCAT('%',#{employeeRegistration.customerUsernameNew},'%')
</if>
<if
test=
"employeeRegistration.departIdSet != null and employeeRegistration.departIdSet.size > 0"
>
AND a.emp_deptid in
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceAlert.java
View file @
20f84e62
...
...
@@ -292,5 +292,9 @@ public class TInsuranceAlert extends BaseEntity {
@Schema
(
description
=
"保单生效日期-新"
)
private
LocalDate
policyEffectNew
;
@TableField
(
exist
=
false
)
@Schema
(
description
=
"前端客服"
)
private
String
customerUsername
;
private
static
final
long
serialVersionUID
=
1L
;
}
\ No newline at end of file
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/TInsuranceAlertExportVO.java
View file @
20f84e62
...
...
@@ -20,6 +20,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
/**
...
...
@@ -101,4 +102,8 @@ public class TInsuranceAlertExportVO {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"状态"
)
private
String
processStatus
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"前端客服"
)
private
String
customerUsername
;
}
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TEmployeeInsurancePreMapper.xml
View file @
20f84e62
...
...
@@ -145,7 +145,7 @@
</foreach>
</if>
<if
test=
"tEmployeeInsurancePre.customerUsername != null and tEmployeeInsurancePre.customerUsername.trim() != ''"
>
AND a.customer_username
= #{tEmployeeInsurancePre.customerUsername}
AND a.customer_username
like CONCAT('%',#{tEmployeeInsurancePre.customerUsername},'%')
</if>
<if
test=
"tEmployeeInsurancePre.deptName != null and tEmployeeInsurancePre.deptName.trim() != ''"
>
AND a.dept_name like CONCAT('%',#{tEmployeeInsurancePre.deptName},'%')
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceWarnMapper.xml
View file @
20f84e62
...
...
@@ -59,6 +59,7 @@
<result
property=
"policyStartNew"
column=
"POLICY_START_NEW"
jdbcType=
"DATE"
/>
<result
property=
"policyEndNew"
column=
"POLICY_END_NEW"
jdbcType=
"DATE"
/>
<result
property=
"policyEffectNew"
column=
"POLICY_EFFECT_NEW"
jdbcType=
"DATE"
/>
<result
property=
"customerUsername"
column=
"CUSTOMER_USERNAME"
jdbcType=
"VARCHAR"
/>
</resultMap>
<!-- 商险续签待办专用 -->
...
...
@@ -111,6 +112,7 @@
b.error_time
,DATE_FORMAT(b.expected_collection_time,'%Y-%m-%d %H:%i') expected_collection_time
,b.INSURANCES_ID_NEW
,b.CUSTOMER_USERNAME
</sql>
<sql
id=
"tInsuranceAlert_where"
>
<if
test=
"tInsuranceAlert != null"
>
...
...
@@ -249,6 +251,9 @@
<if
test=
"tInsuranceAlert.haveWorkDay != null and tInsuranceAlert.haveWorkDay.trim() != ''"
>
AND a.HAVE_WORK_DAY = #{tInsuranceAlert.haveWorkDay}
</if>
<if
test=
"tInsuranceAlert.customerUsername != null and tInsuranceAlert.customerUsername.trim() != ''"
>
AND b.CUSTOMER_USERNAME like CONCAT('%',#{tInsuranceAlert.customerUsername},'%')
</if>
<if
test=
"tInsuranceAlert.deptNoList != null and tInsuranceAlert.deptNoList.size > 0"
>
AND a.DEPT_NO in
<foreach
item=
"idStr"
index=
"index"
collection=
"tInsuranceAlert.deptNoList"
open=
"("
separator=
","
...
...
@@ -422,6 +427,7 @@
,DATE_FORMAT(b.expected_collection_time,'%Y-%m-%d %H:%i') expected_collection_time
,case b.process_status when '0' then '待确认' when '1' then '待派单' when '2' then '派单失败'
when '3' then '待投保' when '4' then '投保中' when '5' then '投保退回' when '6' then '已投保' else '-' end process_status
,b.CUSTOMER_USERNAME
FROM t_insurance_alert a
JOIN t_insurance_pre_renew_detail b ON a.INSURANCES_PRE_RENEW_DETAIL_ID = b.ID
<where>
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
View file @
20f84e62
...
...
@@ -204,7 +204,7 @@ public class SociaFriendYgsAddVo implements Serializable {
@ExcelProperty
(
"是否强制停保"
)
private
String
sfqztb
;
// 池州特殊减员映射1:减员原因
// 池州特殊减员映射1:减员原因
(用作花名册)
@ExcelProperty
(
"池州特殊减员映射1:减员原因"
)
private
String
chiZhouTbyy
;
// 池州特殊减员映射2:劳动用工备案解除/终止原因
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/SysBaseSetInfoMapper.xml
View file @
20f84e62
...
...
@@ -368,7 +368,9 @@
1=1
<include
refid=
"sysBaseSetInfo_where"
/>
</where>
order by a.CREATE_TIME desc
order by
FIELD(a.DEPART_NAME, '安徽皖信人力资源管理有限公司-市直', '安徽皖信人力资源管理有限公司-省直', '安徽皖信人力资源管理有限公司') DESC,
a.CREATE_TIME desc
</select>
<!--sysBaseSetInfo简单查询-->
<select
id=
"getAllByEntity"
resultMap=
"sysBaseSetInfoMap"
>
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
View file @
20f84e62
...
...
@@ -370,7 +370,7 @@
AND a.TYPE_SUB = #{tDispatchInfoPre.typeSub}
</if>
<if
test=
"tDispatchInfoPre.customerUsername != null and tDispatchInfoPre.customerUsername.trim() != ''"
>
AND a.CUSTOMER_USERNAME
= #{tDispatchInfoPre.customerUsername}
AND a.CUSTOMER_USERNAME
like CONCAT('%',#{tDispatchInfoPre.customerUsername},'%')
</if>
<if
test=
"tDispatchInfoPre.customerUserLoginName != null and tDispatchInfoPre.customerUserLoginName.trim() != ''"
>
AND a.CUSTOMER_USER_LOGIN_NAME = #{tDispatchInfoPre.customerUsername.customerUserLoginName}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment