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
a164cdbd
Commit
a164cdbd
authored
Apr 16, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.22' into MVP1.7.22
parents
3c85015e
574e0451
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
82 additions
and
33 deletions
+82
-33
TAttaInfo.java
.../com/yifu/cloud/plus/v1/yifu/social/entity/TAttaInfo.java
+2
-1
TDispatchInfo.java
.../yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
+13
-0
SociaFriendYgsAddVo.java
...ifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
+4
-0
FileUploadController.java
.../plus/v1/yifu/social/controller/FileUploadController.java
+2
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+30
-24
TSocialFriendPushServiceImpl.java
...ifu/social/service/impl/TSocialFriendPushServiceImpl.java
+21
-6
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+6
-1
TSocialFriendMapper.xml
...ial-biz/src/main/resources/mapper/TSocialFriendMapper.xml
+4
-0
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TAttaInfo.java
View file @
a164cdbd
...
@@ -58,10 +58,11 @@ public class TAttaInfo extends BaseEntity {
...
@@ -58,10 +58,11 @@ public class TAttaInfo extends BaseEntity {
private
String
attaType
;
private
String
attaType
;
/**
/**
* 1户配置的章;2:派单审核附件,税友单个使用,社保3医保附件;11社保增花名册模板;12社保减花名册模板;13医保增花名册模板;14医保减花名册模板
* 1户配置的章;2:派单审核附件,税友单个使用,社保3医保附件;11社保增花名册模板;12社保减花名册模板;13医保增花名册模板;14医保减花名册模板
* 4:单个附件_社保_花名册;5:单个附件_医保_花名册;6:单个附件_解除劳动合同证明书(1.7.22版本)
*/
*/
@NotBlank
(
message
=
"关系类型不能为空"
)
@NotBlank
(
message
=
"关系类型不能为空"
)
@Length
(
max
=
2
,
message
=
"关系类型不能超过2个字符"
)
@Length
(
max
=
2
,
message
=
"关系类型不能超过2个字符"
)
@Schema
(
description
=
"关系类型(1户配置的章;2:派单审核附件,税友单个使用,社保;3医保附件;11社保增花名册模板;12社保减花名册模板;13医保增花名册模板;14医保减花名册模板)"
)
@Schema
(
description
=
"关系类型(1户配置的章;2:派单审核附件,税友单个使用,社保;3医保附件;
4:单个附件_社保_花名册;5:单个附件_医保_花名册;6:单个附件_解除劳动合同证明书;
11社保增花名册模板;12社保减花名册模板;13医保增花名册模板;14医保减花名册模板)"
)
private
String
relationType
;
private
String
relationType
;
/**
/**
* 实体id和关系类型共同确定附件所属(9、10、21、22、23、24、25存项目档案id,0、2、26存附属表id)
* 实体id和关系类型共同确定附件所属(9、10、21、22、23、24、25存项目档案id,0、2、26存附属表id)
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
View file @
a164cdbd
...
@@ -910,4 +910,17 @@ public class TDispatchInfo extends BaseEntity {
...
@@ -910,4 +910,17 @@ public class TDispatchInfo extends BaseEntity {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"我司到款单位"
)
@ExcelProperty
(
"我司到款单位"
)
private
String
unitOfOurCompany
;
private
String
unitOfOurCompany
;
@ExcelAttribute
(
name
=
"是否自动生成社保花名册:0否1是;null是"
)
@Schema
(
description
=
"是否自动生成社保花名册:0否1是;null是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否自动生成社保花名册:0否1是;null是"
)
private
String
isAutoYgsHmc
;
@ExcelAttribute
(
name
=
"是否自动生成医保花名册:0否1是;null是"
)
@Schema
(
description
=
"是否自动生成医保花名册:0否1是;null是"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否自动生成医保花名册:0否1是;null是"
)
private
String
isAutoYsdHmc
;
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
View file @
a164cdbd
...
@@ -90,6 +90,10 @@ public class SociaFriendYgsAddVo implements Serializable {
...
@@ -90,6 +90,10 @@ public class SociaFriendYgsAddVo implements Serializable {
private
List
<
String
>
imgListYgs
;
private
List
<
String
>
imgListYgs
;
// 单个附件list——医保
// 单个附件list——医保
private
List
<
String
>
imgListYsd
;
private
List
<
String
>
imgListYsd
;
// 是否自动生成_社保_花名册,0否1是,默认是(1.7.22版本)
private
String
isAutoYgsHmc
;
// 是否自动生成_医保_花名册,0否1是,默认是(1.7.22版本)
private
String
isAutoYsdHmc
;
// 自动生成解除劳动证明
// 自动生成解除劳动证明
private
String
autoLeaveDoc
;
private
String
autoLeaveDoc
;
// 当前行政经办区——2025-3-31 10:23:02 盛宇与税友沟通,可以默认安徽省,暂时不用这个字段了,后面有特殊要求再加
// 当前行政经办区——2025-3-31 10:23:02 盛宇与税友沟通,可以默认安徽省,暂时不用这个字段了,后面有特殊要求再加
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/FileUploadController.java
View file @
a164cdbd
...
@@ -169,7 +169,8 @@ public class FileUploadController {
...
@@ -169,7 +169,8 @@ public class FileUploadController {
/**
/**
* @param domainId 关联id
* @param domainId 关联id
* @param type 类型
* @param type 类型 1户配置的章;2:派单审核附件,税友单个使用,社保3医保附件;11社保增花名册模板;12社保减花名册模板;13医保增花名册模板;14医保减花名册模板
* 4:单个附件_社保_花名册;5:单个附件_医保_花名册;6:单个附件_解除劳动合同证明书(1.7.22版本)
* @Description: 获取社保服务的附件信息
* @Description: 获取社保服务的附件信息
* @Author: hgw
* @Author: hgw
* @Date: 2025/4/28 14:12
* @Date: 2025/4/28 14:12
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
a164cdbd
...
@@ -4351,6 +4351,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -4351,6 +4351,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private
String
getHignEducationValue
(
String
educationName
)
{
private
String
getHignEducationValue
(
String
educationName
)
{
String
educationNameValue
;
String
educationNameValue
;
if
(
Common
.
isNotNull
(
educationName
))
{
if
(
educationName
.
equals
(
"文盲"
))
{
if
(
educationName
.
equals
(
"文盲"
))
{
educationNameValue
=
"1"
;
educationNameValue
=
"1"
;
}
else
if
(
educationName
.
equals
(
"小学"
))
{
}
else
if
(
educationName
.
equals
(
"小学"
))
{
...
@@ -4376,13 +4377,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -4376,13 +4377,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
else
{
}
else
{
educationNameValue
=
null
;
educationNameValue
=
null
;
}
}
}
else
{
educationNameValue
=
null
;
}
return
educationNameValue
;
return
educationNameValue
;
}
}
// 获取是否大专及以上
// 获取是否大专及以上
private
Integer
getIsCollege
(
String
educationName
)
{
private
Integer
getIsCollege
(
String
educationName
)
{
Integer
isCollegeValue
=
CommonConstants
.
ZERO_INT
;
Integer
isCollegeValue
=
CommonConstants
.
ZERO_INT
;
if
(
educationName
.
equals
(
"大专"
)
||
educationName
.
equals
(
"本科"
)
||
educationName
.
equals
(
"硕士"
)
||
educationName
.
equals
(
"博士"
))
{
if
(
Common
.
isNotNull
(
educationName
)
&&
(
educationName
.
equals
(
"大专"
)
||
educationName
.
equals
(
"本科"
)
||
educationName
.
equals
(
"硕士"
)
||
educationName
.
equals
(
"博士"
)))
{
isCollegeValue
=
CommonConstants
.
ONE_INT
;
isCollegeValue
=
CommonConstants
.
ONE_INT
;
}
}
return
isCollegeValue
;
return
isCollegeValue
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendPushServiceImpl.java
View file @
a164cdbd
...
@@ -279,6 +279,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -279,6 +279,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
boolean
isAutoLeaveDoc
;
boolean
isAutoLeaveDoc
;
// 社保是否自动生成花名册
// 社保是否自动生成花名册
boolean
rosterAutoFlagYgs
;
boolean
rosterAutoFlagYgs
;
// 社保是否自动生成花名册 0否1是;null是(审核时的选择)
boolean
isAutoYgsHmc
;
// 社保仅补缴生成材料 0否1是
// 社保仅补缴生成材料 0否1是
boolean
dataFlagYgs
;
boolean
dataFlagYgs
;
int
nowMonth
=
Integer
.
parseInt
(
DateUtil
.
getThisMonth
());
int
nowMonth
=
Integer
.
parseInt
(
DateUtil
.
getThisMonth
());
...
@@ -357,7 +359,9 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -357,7 +359,9 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
if
(
isHuiZhou
||
isAutoLeaveDoc
||
isSingle
||
nextFlag
||
i
%
10
==
0
||
index
>=
ygsAddlist
.
size
()-
1
)
{
if
(
isHuiZhou
||
isAutoLeaveDoc
||
isSingle
||
nextFlag
||
i
%
10
==
0
||
index
>=
ygsAddlist
.
size
()-
1
)
{
rosterAutoFlagYgs
=
Common
.
isEmpty
(
vo
.
getRosterAutoFlagYgs
())
||
CommonConstants
.
ONE_STRING
.
equals
(
vo
.
getRosterAutoFlagYgs
());
rosterAutoFlagYgs
=
Common
.
isEmpty
(
vo
.
getRosterAutoFlagYgs
())
||
CommonConstants
.
ONE_STRING
.
equals
(
vo
.
getRosterAutoFlagYgs
());
if
(
rosterAutoFlagYgs
&&
!
huaListVo
.
isEmpty
())
{
// 判断是否不需要自动生成花名册
isAutoYgsHmc
=
Common
.
isEmpty
(
vo
.
getIsAutoYgsHmc
())
||
CommonConstants
.
ONE_STRING
.
equals
(
vo
.
getIsAutoYgsHmc
());
if
(
isAutoYgsHmc
&&
rosterAutoFlagYgs
&&
!
huaListVo
.
isEmpty
())
{
urlR
=
doExportRosterNew
(
vo
,
type
,
huaListVo
,
zhangMap
,
templateSrcMap
);
urlR
=
doExportRosterNew
(
vo
,
type
,
huaListVo
,
zhangMap
,
templateSrcMap
);
...
@@ -370,7 +374,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -370,7 +374,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
if
(
isSingle
&&
Common
.
isNotNull
(
vo
.
getDispatchId
()))
{
if
(
isSingle
&&
Common
.
isNotNull
(
vo
.
getDispatchId
()))
{
// 获取单个附件并推送税友,返回 imgList 到Vo里
// 获取单个附件并推送税友,返回 imgList 到Vo里
this
.
setImgList
(
vo
);
// 单个附件_社保、医保、解除劳动合同证明书_花名册(1.7.22版本)
this
.
setImgList
(
vo
,
isAutoYgsHmc
,
false
,
isAutoLeaveDoc
);
}
}
// 派减且是要自动生成离职证明:
// 派减且是要自动生成离职证明:
if
(
isAutoLeaveDoc
)
{
if
(
isAutoLeaveDoc
)
{
...
@@ -492,7 +497,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -492,7 +497,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
* @Date: 2025/4/28 17:05
* @Date: 2025/4/28 17:05
* @return: void
* @return: void
**/
**/
private
void
setImgList
(
SociaFriendYgsAddVo
vo
)
{
private
void
setImgList
(
SociaFriendYgsAddVo
vo
,
boolean
isAutoYgsHmc
,
boolean
isAutoYsdHmc
,
boolean
isAutoLeaveDoc
)
{
URL
url
;
URL
url
;
InputStream
inStream
=
null
;
InputStream
inStream
=
null
;
List
<
String
>
imgListYgs
=
new
ArrayList
<>();
List
<
String
>
imgListYgs
=
new
ArrayList
<>();
...
@@ -519,8 +524,14 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -519,8 +524,14 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
if
(
Common
.
isNotNull
(
imgUrl
)){
if
(
Common
.
isNotNull
(
imgUrl
)){
if
(
Common
.
isEmpty
(
attaInfo
.
getRelationType
())
||
CommonConstants
.
TWO_STRING
.
equals
(
attaInfo
.
getRelationType
()))
{
if
(
Common
.
isEmpty
(
attaInfo
.
getRelationType
())
||
CommonConstants
.
TWO_STRING
.
equals
(
attaInfo
.
getRelationType
()))
{
imgListYgs
.
add
(
imgUrl
);
imgListYgs
.
add
(
imgUrl
);
}
else
{
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
attaInfo
.
getRelationType
()))
{
imgListYsd
.
add
(
imgUrl
);
imgListYsd
.
add
(
imgUrl
);
}
else
if
(
CommonConstants
.
FOUR_STRING
.
equals
(
attaInfo
.
getRelationType
())
&&
!
isAutoYgsHmc
)
{
vo
.
setQyzgshbxzyhmc
(
imgUrl
);
}
else
if
(
CommonConstants
.
FIVE_STRING
.
equals
(
attaInfo
.
getRelationType
())
&&
!
isAutoYsdHmc
)
{
vo
.
setQyzgjbylbxcbdjb
(
imgUrl
);
}
else
if
(
CommonConstants
.
SIX_STRING
.
equals
(
attaInfo
.
getRelationType
())
&&
!
isAutoLeaveDoc
)
{
vo
.
setAutoLeaveDoc
(
imgUrl
);
}
}
}
}
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
...
@@ -584,6 +595,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -584,6 +595,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
boolean
isSingle
;
boolean
isSingle
;
// 社保是否自动生成花名册
// 社保是否自动生成花名册
boolean
rosterAutoFlagYsd
;
boolean
rosterAutoFlagYsd
;
// 医保是否自动生成花名册
boolean
isAutoYsdHmc
;
// 社保仅补缴生成材料 0否1是
// 社保仅补缴生成材料 0否1是
boolean
dataFlagYsd
;
boolean
dataFlagYsd
;
int
nowMonth
=
Integer
.
parseInt
(
DateUtil
.
getThisMonth
());
int
nowMonth
=
Integer
.
parseInt
(
DateUtil
.
getThisMonth
());
...
@@ -676,7 +689,9 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -676,7 +689,9 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
if
(
isAutoLeaveDoc
||
isSingle
||
nextFlag
||
i
%
10
==
0
||
index
>=
ysdAddlist
.
size
()-
1
)
{
if
(
isAutoLeaveDoc
||
isSingle
||
nextFlag
||
i
%
10
==
0
||
index
>=
ysdAddlist
.
size
()-
1
)
{
rosterAutoFlagYsd
=
Common
.
isEmpty
(
vo
.
getRosterAutoFlagYsd
())
||
CommonConstants
.
ONE_STRING
.
equals
(
vo
.
getRosterAutoFlagYsd
());
rosterAutoFlagYsd
=
Common
.
isEmpty
(
vo
.
getRosterAutoFlagYsd
())
||
CommonConstants
.
ONE_STRING
.
equals
(
vo
.
getRosterAutoFlagYsd
());
if
(
rosterAutoFlagYsd
&&
!
huaListVo
.
isEmpty
())
{
// 判断是否不需要自动生成花名册
isAutoYsdHmc
=
Common
.
isEmpty
(
vo
.
getIsAutoYsdHmc
())
||
CommonConstants
.
ONE_STRING
.
equals
(
vo
.
getIsAutoYsdHmc
());
if
(
isAutoYsdHmc
&&
rosterAutoFlagYsd
&&
!
huaListVo
.
isEmpty
())
{
urlR
=
doExportRosterNew
(
vo
,
type
,
huaListVo
,
zhangMap
,
templateSrcMap
);
urlR
=
doExportRosterNew
(
vo
,
type
,
huaListVo
,
zhangMap
,
templateSrcMap
);
...
@@ -692,7 +707,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -692,7 +707,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
}
}
if
(
isSingle
&&
Common
.
isNotNull
(
vo
.
getDispatchId
()))
{
if
(
isSingle
&&
Common
.
isNotNull
(
vo
.
getDispatchId
()))
{
// 获取单个附件并推送税友,返回 imgList 到Vo里
// 获取单个附件并推送税友,返回 imgList 到Vo里
this
.
setImgList
(
vo
);
this
.
setImgList
(
vo
,
false
,
isAutoYsdHmc
,
isAutoLeaveDoc
);
}
}
i
=
0
;
i
=
0
;
nextFlag
=
false
;
nextFlag
=
false
;
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
a164cdbd
...
@@ -113,6 +113,8 @@
...
@@ -113,6 +113,8 @@
<result
property=
"rosterAutoFlagYsd"
column=
"ROSTER_AUTO_FLAG_YSD"
/>
<result
property=
"rosterAutoFlagYsd"
column=
"ROSTER_AUTO_FLAG_YSD"
/>
<result
property=
"dataFlagYgs"
column=
"DATA_FLAG_YGS"
/>
<result
property=
"dataFlagYgs"
column=
"DATA_FLAG_YGS"
/>
<result
property=
"dataFlagYsd"
column=
"DATA_FLAG_YSD"
/>
<result
property=
"dataFlagYsd"
column=
"DATA_FLAG_YSD"
/>
<result
property=
"isAutoYgsHmc"
column=
"IS_AUTO_YGS_HMC"
/>
<result
property=
"isAutoYsdHmc"
column=
"IS_AUTO_YSD_HMC"
/>
</resultMap>
</resultMap>
<resultMap
id=
"dispatchPageMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPageVo"
extends=
"tDispatchInfoMap"
>
<resultMap
id=
"dispatchPageMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPageVo"
extends=
"tDispatchInfoMap"
>
...
@@ -458,7 +460,7 @@
...
@@ -458,7 +460,7 @@
a.GRADUATION_TIME
a.GRADUATION_TIME
,a.AUTO_FLAG,a.IS_SINGLE,a.IS_AUTO_LEAVE_DOC
,a.AUTO_FLAG,a.IS_SINGLE,a.IS_AUTO_LEAVE_DOC
,a.AUTO_FLAG_YSD,a.IS_SINGLE_YSD,a.ROSTER_AUTO_FLAG_YGS,a.ROSTER_AUTO_FLAG_YSD
,a.AUTO_FLAG_YSD,a.IS_SINGLE_YSD,a.ROSTER_AUTO_FLAG_YGS,a.ROSTER_AUTO_FLAG_YSD
,a.DATA_FLAG_YGS,a.DATA_FLAG_YSD
,a.DATA_FLAG_YGS,a.DATA_FLAG_YSD
,a.IS_AUTO_YGS_HMC,a.IS_AUTO_YSD_HMC
</sql>
</sql>
<sql
id=
"tDispatchInfo_where"
>
<sql
id=
"tDispatchInfo_where"
>
...
@@ -1842,6 +1844,9 @@
...
@@ -1842,6 +1844,9 @@
,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,null) YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,null) YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,null) YSD_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,null) YSD_SOCIAL_START_DATE_NEXT
,a.BACK_FILE_FLAG
,a.BACK_FILE_FLAG
,a.IS_AUTO_LEAVE_DOC
,a.IS_AUTO_YGS_HMC
,a.IS_AUTO_YSD_HMC
FROM t_dispatch_info a
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFriendMapper.xml
View file @
a164cdbd
...
@@ -89,6 +89,8 @@
...
@@ -89,6 +89,8 @@
a.DATA_FLAG_YSD dataFlagYsd,
a.DATA_FLAG_YSD dataFlagYsd,
a.IS_AUTO_LEAVE_DOC isAutoLeaveDoc,
a.IS_AUTO_LEAVE_DOC isAutoLeaveDoc,
a.IS_AUTO_YGS_HMC isAutoYgsHmc,
a.IS_AUTO_YSD_HMC isAutoYsdHmc,
DATE_FORMAT(a.LEAVE_DATE,'%Y年%m月%d日') leaveDate,
DATE_FORMAT(a.LEAVE_DATE,'%Y年%m月%d日') leaveDate,
DATE_FORMAT(a.create_time,'%Y年%m月%d日') dispatchDate,
DATE_FORMAT(a.create_time,'%Y年%m月%d日') dispatchDate,
a.settle_domain deptId,
a.settle_domain deptId,
...
@@ -332,6 +334,8 @@
...
@@ -332,6 +334,8 @@
a.DATA_FLAG_YSD dataFlagYsd,
a.DATA_FLAG_YSD dataFlagYsd,
a.IS_AUTO_LEAVE_DOC isAutoLeaveDoc,
a.IS_AUTO_LEAVE_DOC isAutoLeaveDoc,
a.IS_AUTO_YGS_HMC isAutoYgsHmc,
a.IS_AUTO_YSD_HMC isAutoYsdHmc,
DATE_FORMAT(a.LEAVE_DATE,'%Y年%m月%d日') leaveDate,
DATE_FORMAT(a.LEAVE_DATE,'%Y年%m月%d日') leaveDate,
DATE_FORMAT(a.LEAVE_DATE,'%Y-%m-%d') leaveDay,
DATE_FORMAT(a.LEAVE_DATE,'%Y-%m-%d') leaveDay,
DATE_FORMAT(a.create_time,'%Y年%m月%d日') dispatchDate,
DATE_FORMAT(a.create_time,'%Y年%m月%d日') dispatchDate,
...
...
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