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
487c9683
Commit
487c9683
authored
May 09, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.22' into MVP1.7.22
parents
89c12049
4a83504f
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
132 additions
and
95 deletions
+132
-95
FascUtil.java
.../com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
+3
-1
TDispatchInfoController.java
...us/v1/yifu/social/controller/TDispatchInfoController.java
+5
-2
TSocialInfoController.java
...plus/v1/yifu/social/controller/TSocialInfoController.java
+5
-2
TDispatchInfoService.java
...oud/plus/v1/yifu/social/service/TDispatchInfoService.java
+3
-2
TSocialInfoService.java
...cloud/plus/v1/yifu/social/service/TSocialInfoService.java
+1
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+14
-3
TSocialInfoServiceImpl.java
...s/v1/yifu/social/service/impl/TSocialInfoServiceImpl.java
+98
-84
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+3
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
View file @
487c9683
...
@@ -1164,7 +1164,9 @@ public class FascUtil {
...
@@ -1164,7 +1164,9 @@ public class FascUtil {
tFascPushLogService
.
updateById
(
pushLog
);
tFascPushLogService
.
updateById
(
pushLog
);
if
(
res
.
isSuccess
())
{
if
(
res
.
isSuccess
())
{
contract
.
setProcessStatus
(
CommonConstants
.
dingleDigitStrArray
[
1
]);
contract
.
setProcessStatus
(
CommonConstants
.
dingleDigitStrArray
[
1
]);
contract
.
setSignType
(
CommonConstants
.
dingleDigitStrArray
[
1
]);
// 撤销不做是否电子签的改动,2026-05-09倩倩与龙弟说只有自动的才变为电子签
// contract.setSignType(CommonConstants.dingleDigitStrArray[1]);
contract
.
setRequestMsg
(
""
);
contract
.
setRequestMsg
(
""
);
tEmployeeContractPreMapper
.
updateById
(
contract
);
tEmployeeContractPreMapper
.
updateById
(
contract
);
return
R
.
ok
();
return
R
.
ok
();
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @
487c9683
...
@@ -543,7 +543,10 @@ public class TDispatchInfoController {
...
@@ -543,7 +543,10 @@ public class TDispatchInfoController {
@RequestParam
(
name
=
"auditStatus"
,
required
=
true
)
String
auditStatus
,
@RequestParam
(
name
=
"auditStatus"
,
required
=
true
)
String
auditStatus
,
@RequestParam
(
name
=
"auditRemark"
,
required
=
false
)
String
auditRemark
,
@RequestParam
(
name
=
"auditRemark"
,
required
=
false
)
String
auditRemark
,
@RequestParam
(
name
=
"remark"
,
required
=
false
)
String
remark
,
@RequestParam
(
name
=
"remark"
,
required
=
false
)
String
remark
,
@RequestParam
(
name
=
"isSingleAudit"
,
required
=
false
)
String
isSingleAudit
)
{
@RequestParam
(
name
=
"isSingleAudit"
,
required
=
false
)
String
isSingleAudit
,
@RequestParam
(
name
=
"isAutoYgsHmc"
,
required
=
false
)
String
isAutoYgsHmc
,
@RequestParam
(
name
=
"isAutoYsdHmc"
,
required
=
false
)
String
isAutoYsdHmc
,
@RequestParam
(
name
=
"isAutoLeaveDoc"
,
required
=
false
)
String
isAutoLeaveDoc
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
Common
.
isEmpty
(
user
)){
if
(
Common
.
isEmpty
(
user
)){
return
R
.
failed
(
CommonConstants
.
USER_FAIL
);
return
R
.
failed
(
CommonConstants
.
USER_FAIL
);
...
@@ -562,7 +565,7 @@ public class TDispatchInfoController {
...
@@ -562,7 +565,7 @@ public class TDispatchInfoController {
List
<
String
>
friendIdList
=
new
ArrayList
<>();
List
<
String
>
friendIdList
=
new
ArrayList
<>();
List
<
String
>
soldierIdList
=
new
ArrayList
<>();
List
<
String
>
soldierIdList
=
new
ArrayList
<>();
R
<
List
<
ErrorMessage
>>
errorList
=
tDispatchInfoService
.
addApplyAudit
(
idList
,
auditStatus
,
auditRemark
R
<
List
<
ErrorMessage
>>
errorList
=
tDispatchInfoService
.
addApplyAudit
(
idList
,
auditStatus
,
auditRemark
,
remark
,
isSingleAudit
,
friendIdList
,
soldierIdList
);
,
remark
,
isSingleAudit
,
friendIdList
,
soldierIdList
,
isAutoYgsHmc
,
isAutoYsdHmc
,
isAutoLeaveDoc
);
//推送税友
//推送税友
if
(!
friendIdList
.
isEmpty
())
{
if
(!
friendIdList
.
isEmpty
())
{
socialTask
.
pushFriend
(
friendIdList
);
socialTask
.
pushFriend
(
friendIdList
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialInfoController.java
View file @
487c9683
...
@@ -235,12 +235,15 @@ public class TSocialInfoController {
...
@@ -235,12 +235,15 @@ public class TSocialInfoController {
@Operation
(
summary
=
"转自动化"
,
description
=
"转自动化"
)
@Operation
(
summary
=
"转自动化"
,
description
=
"转自动化"
)
@GetMapping
(
"/doAuto"
)
@GetMapping
(
"/doAuto"
)
public
R
<
String
>
doAuto
(
@RequestParam
String
id
,
@RequestParam
String
isSocial
public
R
<
String
>
doAuto
(
@RequestParam
String
id
,
@RequestParam
String
isSocial
,
@RequestParam
(
required
=
false
)
String
ybsfqzcb
)
{
,
@RequestParam
(
required
=
false
)
String
ybsfqzcb
,
@RequestParam
(
name
=
"isAutoYgsHmc"
,
required
=
false
)
String
isAutoYgsHmc
,
@RequestParam
(
name
=
"isAutoYsdHmc"
,
required
=
false
)
String
isAutoYsdHmc
,
@RequestParam
(
name
=
"isAutoLeaveDoc"
,
required
=
false
)
String
isAutoLeaveDoc
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
return
R
.
failed
(
"请登录!"
);
return
R
.
failed
(
"请登录!"
);
}
}
return
tSocialInfoService
.
doAuto
(
id
,
isSocial
,
ybsfqzcb
,
user
);
return
tSocialInfoService
.
doAuto
(
id
,
isSocial
,
ybsfqzcb
,
user
,
isAutoYgsHmc
,
isAutoYsdHmc
,
isAutoLeaveDoc
);
}
}
/**
/**
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java
View file @
487c9683
...
@@ -85,10 +85,11 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
...
@@ -85,10 +85,11 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
DispatchDetailVo
getSocialAndFundInfoById
(
String
id
);
DispatchDetailVo
getSocialAndFundInfoById
(
String
id
);
List
<
ErrorMessage
>
addBatchApplyAudit
(
List
<
String
>
idsList
,
YifuUser
user
,
int
flag
,
String
auditStatus
List
<
ErrorMessage
>
addBatchApplyAudit
(
List
<
String
>
idsList
,
YifuUser
user
,
int
flag
,
String
auditStatus
,
String
auditRemark
,
String
remark
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
);
,
String
auditRemark
,
String
remark
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
,
String
isAutoYgsHmc
,
String
isAutoYsdHmc
,
String
isAutoLeaveDoc
);
R
<
List
<
ErrorMessage
>>
addApplyAudit
(
List
<
String
>
ids
,
String
auditStatus
,
String
auditRemark
,
String
remark
R
<
List
<
ErrorMessage
>>
addApplyAudit
(
List
<
String
>
ids
,
String
auditStatus
,
String
auditRemark
,
String
remark
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
);
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
,
String
isAutoYgsHmc
,
String
isAutoYsdHmc
,
String
isAutoLeaveDoc
);
// isAutoFlag:是否社保士兵的自动办理,true :是
// isAutoFlag:是否社保士兵的自动办理,true :是
R
<
List
<
ErrorMessage
>>
addApplyHandle
(
List
<
String
>
ids
,
String
typeSub
,
String
handleStatus
,
String
handleRemark
,
String
socialType
,
String
remark
,
YifuUser
user
,
boolean
isAutoHandle
);
R
<
List
<
ErrorMessage
>>
addApplyHandle
(
List
<
String
>
ids
,
String
typeSub
,
String
handleStatus
,
String
handleRemark
,
String
socialType
,
String
remark
,
YifuUser
user
,
boolean
isAutoHandle
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialInfoService.java
View file @
487c9683
...
@@ -135,6 +135,6 @@ public interface TSocialInfoService extends IService<TSocialInfo> {
...
@@ -135,6 +135,6 @@ public interface TSocialInfoService extends IService<TSocialInfo> {
* @Date: 2025/4/25 17:24
* @Date: 2025/4/25 17:24
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
**/
R
<
String
>
doAuto
(
String
id
,
String
isSocial
,
String
ybsfqzcb
,
YifuUser
user
);
R
<
String
>
doAuto
(
String
id
,
String
isSocial
,
String
ybsfqzcb
,
YifuUser
user
,
String
isAutoYgsHmc
,
String
isAutoYsdHmc
,
String
isAutoLeaveDoc
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
487c9683
...
@@ -3791,7 +3791,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3791,7 +3791,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
**/
**/
@Override
@Override
public
List
<
ErrorMessage
>
addBatchApplyAudit
(
List
<
String
>
idsList
,
YifuUser
user
,
int
flag
,
String
auditStatus
public
List
<
ErrorMessage
>
addBatchApplyAudit
(
List
<
String
>
idsList
,
YifuUser
user
,
int
flag
,
String
auditStatus
,
String
auditRemark
,
String
remark
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
)
{
,
String
auditRemark
,
String
remark
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
,
String
isAutoYgsHmc
,
String
isAutoYsdHmc
,
String
isAutoLeaveDoc
)
{
List
<
ErrorMessage
>
errorList
=
new
ArrayList
<>();
List
<
ErrorMessage
>
errorList
=
new
ArrayList
<>();
if
(!
Common
.
isNotNull
(
idsList
))
{
if
(!
Common
.
isNotNull
(
idsList
))
{
errorList
.
add
(
new
ErrorMessage
(-
1
,
CommonConstants
.
PARAM_IS_NOT_ERROR
));
errorList
.
add
(
new
ErrorMessage
(-
1
,
CommonConstants
.
PARAM_IS_NOT_ERROR
));
...
@@ -4102,6 +4103,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -4102,6 +4103,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//记录处理意见到派单 最新的意见会覆盖之前的,详情 到流程中查询
//记录处理意见到派单 最新的意见会覆盖之前的,详情 到流程中查询
dis
.
setHandleRemark
(
ServiceUtil
.
ifNullToEmpty
(
auditRemark
));
dis
.
setHandleRemark
(
ServiceUtil
.
ifNullToEmpty
(
auditRemark
));
dis
.
setAuditRemark
(
ServiceUtil
.
ifNullToEmpty
(
auditRemark
));
dis
.
setAuditRemark
(
ServiceUtil
.
ifNullToEmpty
(
auditRemark
));
if
(
Common
.
isNotNull
(
isAutoYgsHmc
))
{
dis
.
setIsAutoYgsHmc
(
isAutoYgsHmc
);
}
if
(
Common
.
isNotNull
(
isAutoYsdHmc
))
{
dis
.
setIsAutoYsdHmc
(
isAutoYsdHmc
);
}
if
(
Common
.
isNotNull
(
isAutoLeaveDoc
))
{
dis
.
setIsAutoLeaveDoc
(
isAutoLeaveDoc
);
}
auditInfo
.
setDispatchInfoId
(
dis
.
getId
());
auditInfo
.
setDispatchInfoId
(
dis
.
getId
());
//更新派单状态
//更新派单状态
if
(
CommonConstants
.
ZERO_INT
==
flag
)
{
if
(
CommonConstants
.
ZERO_INT
==
flag
)
{
...
@@ -4473,7 +4484,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -4473,7 +4484,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
@ShardingTransactionType
(
TransactionType
.
BASE
)
@ShardingTransactionType
(
TransactionType
.
BASE
)
@Override
@Override
public
R
<
List
<
ErrorMessage
>>
addApplyAudit
(
List
<
String
>
ids
,
String
auditStatus
,
String
auditRemark
,
String
remark
public
R
<
List
<
ErrorMessage
>>
addApplyAudit
(
List
<
String
>
ids
,
String
auditStatus
,
String
auditRemark
,
String
remark
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
)
{
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
,
String
isAutoYgsHmc
,
String
isAutoYsdHmc
,
String
isAutoLeaveDoc
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
null
==
user
)
{
if
(
null
==
user
)
{
return
R
.
failed
(
CommonConstants
.
USER_FAIL
);
return
R
.
failed
(
CommonConstants
.
USER_FAIL
);
...
@@ -4493,7 +4504,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -4493,7 +4504,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return
R
.
failed
(
"派单审核状态参数异常:0待审核 1审核通过 2审核不通过"
);
return
R
.
failed
(
"派单审核状态参数异常:0待审核 1审核通过 2审核不通过"
);
}
}
List
<
ErrorMessage
>
errorInfo
=
addBatchApplyAudit
(
ids
,
user
,
flag
,
auditStatus
List
<
ErrorMessage
>
errorInfo
=
addBatchApplyAudit
(
ids
,
user
,
flag
,
auditStatus
,
Common
.
isNullToString
(
auditRemark
),
remark
,
isSingleAudit
,
friendIdList
,
soldierIdList
);
,
Common
.
isNullToString
(
auditRemark
),
remark
,
isSingleAudit
,
friendIdList
,
soldierIdList
,
isAutoYgsHmc
,
isAutoYsdHmc
,
isAutoLeaveDoc
);
return
R
.
ok
(
errorInfo
,
"派单审核结果:"
);
return
R
.
ok
(
errorInfo
,
"派单审核结果:"
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"派单审核异常:"
+
e
.
getMessage
());
log
.
error
(
"派单审核异常:"
+
e
.
getMessage
());
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialInfoServiceImpl.java
View file @
487c9683
...
@@ -609,7 +609,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
...
@@ -609,7 +609,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
@Override
@Override
public
R
<
String
>
doAutoBatch
(
List
<
String
>
idList
,
String
isSocial
,
String
ybsfqzcb
,
YifuUser
user
)
{
public
R
<
String
>
doAutoBatch
(
List
<
String
>
idList
,
String
isSocial
,
String
ybsfqzcb
,
YifuUser
user
)
{
for
(
String
id
:
idList
)
{
for
(
String
id
:
idList
)
{
doAuto
(
id
,
isSocial
,
ybsfqzcb
,
user
);
doAuto
(
id
,
isSocial
,
ybsfqzcb
,
user
,
null
,
null
,
null
);
}
}
return
R
.
ok
(
"成功!"
);
return
R
.
ok
(
"成功!"
);
}
}
...
@@ -625,7 +625,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
...
@@ -625,7 +625,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
**/
@Override
@Override
public
R
<
String
>
doAuto
(
String
id
,
String
isSocial
,
String
ybsfqzcb
,
YifuUser
user
)
{
public
R
<
String
>
doAuto
(
String
id
,
String
isSocial
,
String
ybsfqzcb
,
YifuUser
user
,
String
isAutoYgsHmc
,
String
isAutoYsdHmc
,
String
isAutoLeaveDoc
)
{
TSocialInfo
socialInfo
=
this
.
getById
(
id
);
TSocialInfo
socialInfo
=
this
.
getById
(
id
);
if
(
socialInfo
==
null
||
Common
.
isEmpty
(
socialInfo
.
getId
()))
{
if
(
socialInfo
==
null
||
Common
.
isEmpty
(
socialInfo
.
getId
()))
{
return
R
.
failed
(
"未找到社保"
);
return
R
.
failed
(
"未找到社保"
);
...
@@ -634,10 +634,11 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
...
@@ -634,10 +634,11 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
.
eq
(
TDispatchInfo:
:
getSocialId
,
id
)
.
eq
(
TDispatchInfo:
:
getSocialId
,
id
)
.
eq
(
TDispatchInfo:
:
getStatus
,
CommonConstants
.
TWO_STRING
)
.
eq
(
TDispatchInfo:
:
getStatus
,
CommonConstants
.
TWO_STRING
)
.
orderByDesc
(
TDispatchInfo:
:
getCreateTime
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
orderByDesc
(
TDispatchInfo:
:
getCreateTime
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
disExist
!=
null
)
{
String
handleRemark
=
"派增"
;
String
handleRemark
=
"派增"
;
// 有可以转的项目,则可以转
// 有可以转的项目,则可以转
boolean
canUpdate
=
false
;
boolean
canUpdate
=
false
;
if
(
disExist
!=
null
&&
CommonConstants
.
ONE_STRING
.
equals
(
disExist
.
getType
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
disExist
.
getType
()))
{
handleRemark
=
"派减"
;
handleRemark
=
"派减"
;
}
}
// 判断养工失转自动化
// 判断养工失转自动化
...
@@ -720,11 +721,24 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
...
@@ -720,11 +721,24 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
if
(
CommonConstants
.
ONE_STRING
.
equals
(
ybsfqzcb
))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
ybsfqzcb
))
{
newYbsfqzcbValue
=
"“是”"
;
newYbsfqzcbValue
=
"“是”"
;
}
}
handleRemark
+=
oldYbsfqzcbValue
+
"→"
+
newYbsfqzcbValue
;
handleRemark
+=
oldYbsfqzcbValue
+
"→"
+
newYbsfqzcbValue
;
}
if
(
Common
.
isNotNull
(
isAutoYgsHmc
))
{
disExist
.
setIsAutoYgsHmc
(
isAutoYgsHmc
);
}
}
if
(
Common
.
isNotNull
(
isAutoYsdHmc
))
{
disExist
.
setIsAutoYsdHmc
(
isAutoYsdHmc
);
}
if
(
Common
.
isNotNull
(
isAutoLeaveDoc
))
{
disExist
.
setIsAutoLeaveDoc
(
isAutoLeaveDoc
);
}
dispatchInfoMapper
.
updateById
(
disExist
);
// 更新社保和加日志
// 更新社保和加日志
return
doUpdateCoreAndLog
(
user
,
socialInfo
,
handleRemark
,
canUpdate
,
disExist
);
return
doUpdateCoreAndLog
(
user
,
socialInfo
,
handleRemark
,
canUpdate
,
disExist
);
}
}
return
R
.
failed
(
"未找到派单"
);
}
}
}
/**
/**
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
487c9683
...
@@ -1711,6 +1711,9 @@
...
@@ -1711,6 +1711,9 @@
a.ROSTER_AUTO_FLAG_YGS,
a.ROSTER_AUTO_FLAG_YGS,
a.ROSTER_AUTO_FLAG_YSD,
a.ROSTER_AUTO_FLAG_YSD,
s.YBSFQZCB
s.YBSFQZCB
,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
...
...
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