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
6ce47bda
Commit
6ce47bda
authored
Dec 13, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP-1.7.3-shuiyou' into MVP-1.7.3-shuiyou
parents
d645b308
8481e20c
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
421 additions
and
197 deletions
+421
-197
TCompleteMonitorMapper.xml
...-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
+2
-1
IcbcTransactionFlowQueryController.java
...v1/ekp/controller/IcbcTransactionFlowQueryController.java
+26
-1
IcbcTransactionFlowQueryService.java
.../plus/v1/ekp/service/IcbcTransactionFlowQueryService.java
+16
-1
IcbcTransactionFlowQueryServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
+83
-9
TSocialFriendBackLog.java
...loud/plus/v1/yifu/social/entity/TSocialFriendBackLog.java
+6
-0
SocialSoldierYsdAddVo.java
...u/cloud/plus/v1/yifu/social/vo/SocialSoldierYsdAddVo.java
+1
-1
TSocialHouseholdInsertVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdInsertVo.java
+0
-8
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+7
-2
HouseConfigConstants.java
...d/plus/v1/yifu/social/constants/HouseConfigConstants.java
+2
-0
TSocialFriendPushService.java
...plus/v1/yifu/social/service/TSocialFriendPushService.java
+1
-2
TSocialFriendService.java
...oud/plus/v1/yifu/social/service/TSocialFriendService.java
+1
-4
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+70
-31
TSocialFriendPushServiceImpl.java
...ifu/social/service/impl/TSocialFriendPushServiceImpl.java
+37
-29
TSocialFriendServiceImpl.java
...v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
+57
-50
TSocialSoldierPushServiceImpl.java
...fu/social/service/impl/TSocialSoldierPushServiceImpl.java
+75
-50
TSocialSoldierServiceImpl.java
...1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
+33
-7
TSocialFriendBackLogMapper.xml
.../src/main/resources/mapper/TSocialFriendBackLogMapper.xml
+1
-0
TSocialFriendMapper.xml
...ial-biz/src/main/resources/mapper/TSocialFriendMapper.xml
+1
-1
TSocialInfoMapper.xml
...ocial-biz/src/main/resources/mapper/TSocialInfoMapper.xml
+2
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
View file @
6ce47bda
...
@@ -364,7 +364,8 @@
...
@@ -364,7 +364,8 @@
FROM t_complete_monitor a
FROM t_complete_monitor a
left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
left join t_employee_info e on p.EMP_ID=e.id
left join t_employee_info e on p.EMP_ID=e.id
left join t_emp_contact_info ec on e.id=ec.EMP_ID
left join (select contact.EMP_NAME ,contact.RELATION_TYPE,contact.ADDRESS,contact.TEL,contact.EMP_ID from
t_emp_contact_info contact group by contact.EMP_ID) ec on e.id=ec.EMP_ID
<where>
<where>
p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0
p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0
<include
refid=
"tCompleteMonitor_where"
/>
<include
refid=
"tCompleteMonitor_where"
/>
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/IcbcTransactionFlowQueryController.java
View file @
6ce47bda
package
com
.
yifu
.
cloud
.
plus
.
v1
.
ekp
.
controller
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
ekp
.
controller
;
import
com.icbc.api.IcbcApiException
;
import
com.icbc.api.IcbcApiException
;
import
com.icbc.api.response.MybankEnterpriseAccountQuerybankinfoResponseV1
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet
;
import
com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowQueryService
;
import
com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowQueryService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
...
@@ -109,4 +108,30 @@ public class IcbcTransactionFlowQueryController {
...
@@ -109,4 +108,30 @@ public class IcbcTransactionFlowQueryController {
}
}
return
icbcTransactionFlowQueryService
.
querybankinfo
(
cardNo
);
return
icbcTransactionFlowQueryService
.
querybankinfo
(
cardNo
);
}
}
/**
* 指令对账单明细下载
*
* @param
* @param
* @return
*/
@Operation
(
summary
=
"指令对账单明细下载"
,
description
=
"指令对账单明细下载"
)
@PostMapping
(
"/enterprisePayDowninstr"
)
public
R
getEnterprisePayDowninstr
()
{
return
icbcTransactionFlowQueryService
.
getEnterprisePayDowninstr
();
}
/**
* 电子回单下载功能
*
* @param
* @param
* @return
*/
@Operation
(
summary
=
"电子回单下载功能"
,
description
=
"电子回单下载功能"
)
@PostMapping
(
"/entermeatebillreceive"
)
public
R
getMeatebillreceive
()
{
return
icbcTransactionFlowQueryService
.
getMeatebillreceive
();
}
}
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/IcbcTransactionFlowQueryService.java
View file @
6ce47bda
...
@@ -2,7 +2,6 @@ package com.yifu.cloud.plus.v1.ekp.service;
...
@@ -2,7 +2,6 @@ package com.yifu.cloud.plus.v1.ekp.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.icbc.api.IcbcApiException
;
import
com.icbc.api.IcbcApiException
;
import
com.icbc.api.response.MybankEnterpriseAccountQuerybankinfoResponseV1
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
@@ -31,4 +30,20 @@ public interface IcbcTransactionFlowQueryService extends IService<EkpSocialInfo>
...
@@ -31,4 +30,20 @@ public interface IcbcTransactionFlowQueryService extends IService<EkpSocialInfo>
**/
**/
R
<
EkpBankCodeSet
>
querybankinfo
(
String
cardNo
);
R
<
EkpBankCodeSet
>
querybankinfo
(
String
cardNo
);
/**
* @Description: 查询账单明细文件名
* @Author: huyc
* @Date: 2024-12-12
* @return: R
**/
R
getEnterprisePayDowninstr
();
/**
* @Description: 电子回单下载功能
* @Author: huyc
* @Date: 2024-12-13
* @return: R
**/
R
getMeatebillreceive
();
}
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
View file @
6ce47bda
...
@@ -6,14 +6,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
...
@@ -6,14 +6,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import
com.icbc.api.DefaultIcbcClient
;
import
com.icbc.api.DefaultIcbcClient
;
import
com.icbc.api.IcbcApiException
;
import
com.icbc.api.IcbcApiException
;
import
com.icbc.api.IcbcConstants
;
import
com.icbc.api.IcbcConstants
;
import
com.icbc.api.request.JftApiB2bpayTransqueryRequestV1
;
import
com.icbc.api.request.*
;
import
com.icbc.api.request.JftApiPayB2bpayGenpreorderRequestV1
;
import
com.icbc.api.response.*
;
import
com.icbc.api.request.MybankEnterpriseAccountQuerybankinfoRequestV1
;
import
com.icbc.api.request.MybankEnterpriseTradeQhisdRequestV1
;
import
com.icbc.api.response.JftApiB2bpayTransqueryResponseV1
;
import
com.icbc.api.response.JftApiPayB2bpayGenpreorderResponseV1
;
import
com.icbc.api.response.MybankEnterpriseAccountQuerybankinfoResponseV1
;
import
com.icbc.api.response.MybankEnterpriseTradeQhisdResponseV1
;
import
com.yifu.cloud.plus.v1.ekp.config.EkpEntryProperties
;
import
com.yifu.cloud.plus.v1.ekp.config.EkpEntryProperties
;
import
com.yifu.cloud.plus.v1.ekp.config.IcbcConfigProperties
;
import
com.yifu.cloud.plus.v1.ekp.config.IcbcConfigProperties
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet
;
...
@@ -22,7 +16,6 @@ import com.yifu.cloud.plus.v1.ekp.mapper.EkpSocialInfoMapper;
...
@@ -22,7 +16,6 @@ import com.yifu.cloud.plus.v1.ekp.mapper.EkpSocialInfoMapper;
import
com.yifu.cloud.plus.v1.ekp.service.EkpBankCodeSetService
;
import
com.yifu.cloud.plus.v1.ekp.service.EkpBankCodeSetService
;
import
com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowQueryService
;
import
com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowQueryService
;
import
com.yifu.cloud.plus.v1.ekp.vo.EKPEntryPushParam
;
import
com.yifu.cloud.plus.v1.ekp.vo.EKPEntryPushParam
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
io.micrometer.core.instrument.util.StringUtils
;
import
io.micrometer.core.instrument.util.StringUtils
;
...
@@ -498,6 +491,87 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -498,6 +491,87 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
}
}
}
}
@Override
public
R
getEnterprisePayDowninstr
()
{
DefaultIcbcClient
client
=
new
DefaultIcbcClient
(
icbcConfigProperties
.
getAppId
(),
IcbcConstants
.
SIGN_TYPE_CA_SM_ICBC
,
icbcConfigProperties
.
getAppPrivateKey
(),
IcbcConstants
.
CHARSET_UTF8
,
IcbcConstants
.
FORMAT_JSON
,
null
,
null
,
null
,
icbcConfigProperties
.
getCaSm
(),
null
);
client
.
setIcbc_ca
(
icbcConfigProperties
.
getCaSmIcbc
());
try
{
MybankEnterprisePayDowninstrRequestV1
.
MybankEnterprisePayDowninstrRequestBizV1
bizContent
=
new
MybankEnterprisePayDowninstrRequestV1
.
MybankEnterprisePayDowninstrRequestBizV1
();
MybankEnterprisePayDowninstrRequestV1
request
=
new
MybankEnterprisePayDowninstrRequestV1
();
// 请对照接口文档用bizContent.setxxx()方法对业务上送数据进行赋值
bizContent
.
setTransCode
(
"DOWNINSTR"
);
bizContent
.
setTranDate
(
"20241204"
);
bizContent
.
setTranTime
(
"103231001"
);
bizContent
.
setBeginDate
(
"20241204"
);
bizContent
.
setEndDate
(
"20241204"
);
bizContent
.
setPayeeAccNo
(
"6222623470001851928"
);
bizContent
.
setLanguage
(
"zh_CN"
);
bizContent
.
setfSeqNo
(
"WX1733276761404"
);
bizContent
.
setServiceCode
(
"PAYENT"
);
// bizContent.setQryfSeqno("PAYENT411erji17023");
request
.
setServiceUrl
(
"https://gw.open.icbc.com.cn/api/mybank/enterprise/pay/downinstr/V1"
);
request
.
setBizContent
(
bizContent
);
MybankEnterprisePayDowninstrResponseV1
response
=
client
.
execute
(
request
);
if
(
response
.
isSuccess
())
{
// 业务成功处理
return
R
.
ok
();
}
else
{
return
R
.
failed
();
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
return
R
.
ok
();
}
@Override
public
R
getMeatebillreceive
()
{
DefaultIcbcClient
client
=
new
DefaultIcbcClient
(
icbcConfigProperties
.
getAppId
(),
IcbcConstants
.
SIGN_TYPE_CA_SM_ICBC
,
icbcConfigProperties
.
getAppPrivateKey
(),
IcbcConstants
.
CHARSET_UTF8
,
IcbcConstants
.
FORMAT_JSON
,
null
,
null
,
null
,
icbcConfigProperties
.
getCaSm
(),
null
);
client
.
setIcbc_ca
(
icbcConfigProperties
.
getCaSmIcbc
());
try
{
MybankEnterpriseAccountTradeinfoMeatebillreceiveRequestV1
.
MybankEnterpriseAccountDownebillRequesBizV1
bizContent
=
new
MybankEnterpriseAccountTradeinfoMeatebillreceiveRequestV1
.
MybankEnterpriseAccountDownebillRequesBizV1
();
MybankEnterpriseAccountTradeinfoMeatebillreceiveRequestV1
request
=
new
MybankEnterpriseAccountTradeinfoMeatebillreceiveRequestV1
();
bizContent
.
setTransCode
(
"DownEBill "
);
bizContent
.
setBankCode
(
"102"
);
bizContent
.
setCis
(
""
);
bizContent
.
setLoginId
(
""
);
bizContent
.
setTranDate
(
""
);
bizContent
.
setTranTime
(
""
);
bizContent
.
setfSeqno
(
""
);
bizContent
.
setAreaCode
(
""
);
bizContent
.
setNetCode
(
""
);
bizContent
.
setTellerNo
(
""
);
bizContent
.
setWorkDate
(
""
);
bizContent
.
setTranSerialNo
(
""
);
bizContent
.
setAcctNo
(
""
);
bizContent
.
setCurrencyType
(
""
);
bizContent
.
setReqReserved1
(
""
);
bizContent
.
setReqReserved2
(
""
);
bizContent
.
setReqReserved3
(
""
);
bizContent
.
setReqReserved4
(
""
);
bizContent
.
setfSeqno
(
""
);
request
.
setServiceUrl
(
"https://gw.open.icbc.com.cn/api/mybank/enterprise/account/tradeinfo/meatebillreceive/V1"
);
request
.
setBizContent
(
bizContent
);
MybankEnterpriseAccountTradeinfoMeatebillreceiveResponseV1
response
=
client
.
execute
(
request
);
if
(
response
.
isSuccess
())
{
return
R
.
ok
();
}
else
{
return
R
.
failed
();
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
return
R
.
ok
();
}
private
void
initValue
(
MybankEnterpriseTradeQhisdResponseV1
.
MybankEnterpriseTradeQhisdResponseRdV1
entry
,
private
void
initValue
(
MybankEnterpriseTradeQhisdResponseV1
.
MybankEnterpriseTradeQhisdResponseRdV1
entry
,
EKPEntryPushParam
pushParam
,
String
bankName
,
String
bankNo
)
throws
ParseException
{
EKPEntryPushParam
pushParam
,
String
bankName
,
String
bankNo
)
throws
ParseException
{
pushParam
.
setFd_recipName
(
entry
.
getRecipName
());
pushParam
.
setFd_recipName
(
entry
.
getRecipName
());
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFriendBackLog.java
View file @
6ce47bda
...
@@ -62,6 +62,12 @@ public class TSocialFriendBackLog {
...
@@ -62,6 +62,12 @@ public class TSocialFriendBackLog {
@ExcelProperty
(
"请求ID"
)
@ExcelProperty
(
"请求ID"
)
@Schema
(
description
=
"请求ID"
)
@Schema
(
description
=
"请求ID"
)
private
String
requestId
;
private
String
requestId
;
@ExcelAttribute
(
name
=
"类型"
)
@ExcelProperty
(
"类型"
)
@Schema
(
description
=
"类型"
)
private
Integer
type
;
/**
/**
* 日志
* 日志
*/
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierYsdAddVo.java
View file @
6ce47bda
...
@@ -84,7 +84,7 @@ public class SocialSoldierYsdAddVo implements Serializable {
...
@@ -84,7 +84,7 @@ public class SocialSoldierYsdAddVo implements Serializable {
private
String
socialTown
;
private
String
socialTown
;
@ExcelProperty
(
"养老起缴日期"
)
@ExcelProperty
(
"养老起缴日期"
)
private
String
pensionStart
;
private
String
pensionStart
;
;
@ExcelProperty
(
"养老基数"
)
@ExcelProperty
(
"养老基数"
)
private
BigDecimal
unitPensionCardinal
;
private
BigDecimal
unitPensionCardinal
;
@ExcelProperty
(
"医疗起缴日期"
)
@ExcelProperty
(
"医疗起缴日期"
)
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdInsertVo.java
View file @
6ce47bda
...
@@ -35,10 +35,6 @@ import java.io.Serializable;
...
@@ -35,10 +35,6 @@ import java.io.Serializable;
@Data
@Data
public
class
TSocialHouseholdInsertVo
extends
RowIndex
implements
Serializable
{
public
class
TSocialHouseholdInsertVo
extends
RowIndex
implements
Serializable
{
@Schema
(
description
=
"账户性质"
)
@ExcelAttribute
(
name
=
"账户性质"
,
isExport
=
false
)
private
String
type
;
/**
/**
* 员工姓名
* 员工姓名
*/
*/
...
@@ -187,8 +183,4 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
...
@@ -187,8 +183,4 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
@ExcelProperty
(
"是否自动办理"
)
@ExcelProperty
(
"是否自动办理"
)
private
String
autoStatus
;
private
String
autoStatus
;
@Schema
(
description
=
"是否配置公章"
)
@ExcelAttribute
(
name
=
"是否配置公章"
,
isExport
=
false
)
private
String
isSign
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
6ce47bda
...
@@ -333,8 +333,9 @@ public class SocialFriendConfig {
...
@@ -333,8 +333,9 @@ public class SocialFriendConfig {
tszdxx
.
put
(
"qyzgshbxzyhmc"
,
vo
.
getQyzgshbxzyhmc
());
tszdxx
.
put
(
"qyzgshbxzyhmc"
,
vo
.
getQyzgshbxzyhmc
());
}
else
{
}
else
{
// 企业职工基本医疗保险参保登记表 安徽非必填! 数组
// 企业职工基本医疗保险参保登记表 安徽非必填! 数组
String
[]
arr
=
{
vo
.
getQyzgjbylbxcbdjb
()};
// 增员、减员必填
// 增员、减员必填
tszdxx
.
put
(
"qyzgjbylbxcbdjb"
,
vo
.
getQyzgjbylbxcbdjb
()
);
tszdxx
.
put
(
"qyzgjbylbxcbdjb"
,
arr
);
}
}
cbrymdOne
.
put
(
"tszdxx"
,
tszdxx
);
cbrymdOne
.
put
(
"tszdxx"
,
tszdxx
);
...
@@ -399,7 +400,8 @@ public class SocialFriendConfig {
...
@@ -399,7 +400,8 @@ public class SocialFriendConfig {
// tszdxx.put("zgshbxjshmc", )
// tszdxx.put("zgshbxjshmc", )
if
(
type
>
2
)
{
if
(
type
>
2
)
{
// 职工基本医疗保险参保登记表
// 职工基本医疗保险参保登记表
tszdxx
.
put
(
"zgjbylbxcbdjb"
,
vo
.
getQyzgjbylbxcbdjb
());
String
[]
arr
=
{
vo
.
getQyzgjbylbxcbdjb
()};
tszdxx
.
put
(
"zgjbylbxcbdjb"
,
arr
);
}
}
cbrymdOne
.
put
(
"tszdxx"
,
tszdxx
);
cbrymdOne
.
put
(
"tszdxx"
,
tszdxx
);
cbrymdArr
.
add
(
cbrymdOne
);
cbrymdArr
.
add
(
cbrymdOne
);
...
@@ -498,6 +500,9 @@ public class SocialFriendConfig {
...
@@ -498,6 +500,9 @@ public class SocialFriendConfig {
//String mxzt = blxmjglb.getString("mxzt")
//String mxzt = blxmjglb.getString("mxzt")
// 提示或者错误信息 SUCCESS
// 提示或者错误信息 SUCCESS
String
cwxx
=
blxmjglb
.
getString
(
"cwxx"
);
String
cwxx
=
blxmjglb
.
getString
(
"cwxx"
);
if
(
Common
.
isNotNull
(
cwxx
)
&&
cwxx
.
length
()>
100
)
{
cwxx
=
cwxx
.
substring
(
0
,
100
);
}
result
.
setCwxx
(
cwxx
);
result
.
setCwxx
(
cwxx
);
}
}
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/HouseConfigConstants.java
View file @
6ce47bda
...
@@ -31,5 +31,7 @@ public class HouseConfigConstants {
...
@@ -31,5 +31,7 @@ public class HouseConfigConstants {
public
static
final
String
SUCESS
=
"成功"
;
public
static
final
String
SUCESS
=
"成功"
;
public
static
final
String
ERROR_TEMPLATE_SEVEN
=
"未找到模板中填写的所属机构"
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialFriendPushService.java
View file @
6ce47bda
...
@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
...
@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo
;
import
java.net.URL
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -41,5 +40,5 @@ public interface TSocialFriendPushService extends IService<TSocialInfo> {
...
@@ -41,5 +40,5 @@ public interface TSocialFriendPushService extends IService<TSocialInfo> {
**/
**/
R
<
String
>
pushFriend
(
List
<
String
>
dispatchIdList
);
R
<
String
>
pushFriend
(
List
<
String
>
dispatchIdList
);
R
<
String
>
doExportRoster
(
String
socialId
,
String
type
,
String
unitCreditCode
);
R
<
String
>
doExportRoster
(
String
socialId
,
String
type
,
String
unitCreditCode
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialFriendService.java
View file @
6ce47bda
...
@@ -20,9 +20,6 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
...
@@ -20,9 +20,6 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.FriendResult
;
import
java.util.List
;
/**
/**
* 社保士兵
* 社保士兵
...
@@ -33,7 +30,7 @@ import java.util.List;
...
@@ -33,7 +30,7 @@ import java.util.List;
public
interface
TSocialFriendService
extends
IService
<
TSocialInfo
>
{
public
interface
TSocialFriendService
extends
IService
<
TSocialInfo
>
{
/**
/**
* @Description: 查看
社保士兵
反馈情况
* @Description: 查看
税友
反馈情况
* @Author: hgw
* @Author: hgw
* @Date: 2024/5/11 14:45
* @Date: 2024/5/11 14:45
* @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>
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
6ce47bda
...
@@ -32,6 +32,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
...
@@ -32,6 +32,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.AllUserNaVo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.AllUserNaVo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
...
@@ -289,9 +290,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -289,9 +290,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
ReadRowHolder
readRowHolder
=
context
.
readRowHolder
();
ReadRowHolder
readRowHolder
=
context
.
readRowHolder
();
Integer
rowIndex
=
readRowHolder
.
getRowIndex
();
Integer
rowIndex
=
readRowHolder
.
getRowIndex
();
data
.
setRowIndex
(
rowIndex
+
1
);
data
.
setRowIndex
(
rowIndex
+
1
);
TSocialHouseholdInsertVo
dataReturn
=
new
TSocialHouseholdInsertVo
();
BeanCopyUtils
.
copyProperties
(
data
,
dataReturn
);
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
if
(
Common
.
isNotNull
(
errorMessage
)){
if
(
Common
.
isNotNull
(
errorMessage
)){
errorMessage
.
setData
(
data
);
errorMessage
.
setData
(
data
Return
);
errorMessageList
.
add
(
errorMessage
);
errorMessageList
.
add
(
errorMessage
);
}
else
{
}
else
{
cachedDataList
.
add
(
data
);
cachedDataList
.
add
(
data
);
...
@@ -348,9 +351,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -348,9 +351,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
ReadRowHolder
readRowHolder
=
context
.
readRowHolder
();
ReadRowHolder
readRowHolder
=
context
.
readRowHolder
();
Integer
rowIndex
=
readRowHolder
.
getRowIndex
();
Integer
rowIndex
=
readRowHolder
.
getRowIndex
();
data
.
setRowIndex
(
rowIndex
+
1
);
data
.
setRowIndex
(
rowIndex
+
1
);
TSocialHouseholdInsertVo
dataReturn
=
new
TSocialHouseholdInsertVo
();
BeanCopyUtils
.
copyProperties
(
data
,
dataReturn
);
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
if
(
Common
.
isNotNull
(
errorMessage
)){
if
(
Common
.
isNotNull
(
errorMessage
)){
errorMessage
.
setData
(
data
);
errorMessage
.
setData
(
data
Return
);
errorMessageList
.
add
(
errorMessage
);
errorMessageList
.
add
(
errorMessage
);
}
else
{
}
else
{
cachedDataList
.
add
(
data
);
cachedDataList
.
add
(
data
);
...
@@ -421,6 +426,18 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -421,6 +426,18 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if
(!
Common
.
isNotNull
(
excelVOList
)){
if
(!
Common
.
isNotNull
(
excelVOList
)){
return
;
return
;
}
}
Map
<
String
,
String
>
dicMap
=
new
HashMap
<>();
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
()
.
get
(
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"dept_config_type"
);
if
(
Common
.
isNotNull
(
dicObj
))
{
for
(
Map
.
Entry
<
String
,
String
>
entry
:
dicObj
.
entrySet
())
{
String
key
=
entry
.
getKey
();
String
Label
=
entry
.
getValue
();
dicMap
.
put
(
Label
,
key
);
}
}
//获取所有区域数据
//获取所有区域数据
HashMap
<
String
,
SysArea
>
areaMap
=
initAreaMap
();
HashMap
<
String
,
SysArea
>
areaMap
=
initAreaMap
();
if
(
Common
.
isEmpty
(
areaMap
))
{
if
(
Common
.
isEmpty
(
areaMap
))
{
...
@@ -439,7 +456,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -439,7 +456,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
}
Map
<
String
,
String
>
exitNameMap
=
new
HashMap
<>();
Map
<
String
,
String
>
exitNameMap
=
new
HashMap
<>();
String
errorMsg
;
SysHouseHoldInfo
info
;
SysHouseHoldInfo
info
;
SysUser
auditUser
;
SysUser
auditUser
;
SysUser
handlerUser
;
SysUser
handlerUser
;
...
@@ -448,7 +464,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -448,7 +464,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
TSocialHouseholdInsertVo
excel
=
excelVOList
.
get
(
i
);
TSocialHouseholdInsertVo
excel
=
excelVOList
.
get
(
i
);
//所属机构去空
//所属机构去空
excel
.
setOrganName
(
excel
.
getOrganName
().
trim
(
));
excel
.
setOrganName
(
excel
.
getOrganName
().
replace
(
" "
,
""
));
SysHouseHoldInfo
household
=
new
SysHouseHoldInfo
();
SysHouseHoldInfo
household
=
new
SysHouseHoldInfo
();
BeanCopyUtils
.
copyProperties
(
excel
,
household
);
BeanCopyUtils
.
copyProperties
(
excel
,
household
);
excel
.
setProvince
(
areaMap
.
get
(
excel
.
getProvince
()).
getAreaName
());
excel
.
setProvince
(
areaMap
.
get
(
excel
.
getProvince
()).
getAreaName
());
...
@@ -456,6 +472,12 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -456,6 +472,12 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if
(
Common
.
isNotNull
(
excel
.
getTown
()))
{
if
(
Common
.
isNotNull
(
excel
.
getTown
()))
{
excel
.
setTown
(
areaMap
.
get
(
excel
.
getTown
()).
getAreaName
());
excel
.
setTown
(
areaMap
.
get
(
excel
.
getTown
()).
getAreaName
());
}
}
//判断所属机构是否填写正确
if
(
Common
.
isNotNull
(
dicMap
)
&&
Common
.
isEmpty
(
dicMap
.
get
(
excel
.
getOrganName
())))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_SEVEN
,
excel
));
continue
;
}
//判断模板中是否有户重复的数据
//判断模板中是否有户重复的数据
if
(
null
==
exitNameMap
.
get
(
excel
.
getName
()))
{
if
(
null
==
exitNameMap
.
get
(
excel
.
getName
()))
{
exitNameMap
.
put
(
excel
.
getName
(),
"1"
);
exitNameMap
.
put
(
excel
.
getName
(),
"1"
);
...
@@ -502,20 +524,19 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -502,20 +524,19 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
continue
;
continue
;
}
}
//校验手机号准确性
//校验手机号准确性
errorMsg
=
checkMobile
(
String
.
valueOf
(
excel
.
getPhone
()));
//
errorMsg = checkMobile(String.valueOf(excel.getPhone()));
if
(!
errorMsg
.
contains
(
HouseConfigConstants
.
SUCESS
))
{
//
if (!errorMsg.contains(HouseConfigConstants.SUCESS)) {
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
errorMsg
,
excel
));
//
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMsg,excel));
continue
;
//
continue;
}
//
}
//封装和插入数据
//封装和插入数据
household
.
setAreaCode
(
areaMap
.
get
(
household
.
getCity
()).
getAreaCode
());
household
.
setAreaCode
(
areaMap
.
get
(
household
.
getCity
()).
getAreaCode
());
household
.
setAutoStatus
(
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"0"
:
"1"
);
household
.
setAutoStatus
(
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"0"
:
"1"
);
household
.
setType
(
"0"
);
household
.
setType
(
"0"
);
household
.
setHouseType
(
excel
.
getHouseType
().
equals
(
HouseConfigConstants
.
HOUSE_TYPE_ONE
)
?
"
0"
:
"1
"
);
household
.
setHouseType
(
excel
.
getHouseType
().
equals
(
HouseConfigConstants
.
HOUSE_TYPE_ONE
)
?
"
1"
:
"0
"
);
household
.
setAuditUser
(
null
==
auditUser
.
getUserId
()
?
""
:
auditUser
.
getUserId
());
household
.
setAuditUser
(
null
==
auditUser
.
getUserId
()
?
""
:
auditUser
.
getUserId
());
household
.
setAuditUserDeptName
(
null
==
auditUser
.
getDeptName
()
?
""
:
auditUser
.
getDeptName
());
household
.
setHandleUser
(
null
==
handlerUser
.
getUserId
()
?
""
:
handlerUser
.
getUserId
());
household
.
setHandleUser
(
null
==
handlerUser
.
getUserId
()
?
""
:
handlerUser
.
getUserId
());
household
.
set
HandleUserDeptName
(
null
==
handlerUser
.
getDeptName
()
?
""
:
handlerUser
.
getDeptName
(
));
household
.
set
OrganId
(
dicMap
.
get
(
household
.
getOrganName
()
));
baseMapper
.
insert
(
household
);
baseMapper
.
insert
(
household
);
// 同步审核权限、办理权限
// 同步审核权限、办理权限
this
.
saveAuditUserOrHandleUser
(
household
,
CommonConstants
.
ZERO_STRING
);
this
.
saveAuditUserOrHandleUser
(
household
,
CommonConstants
.
ZERO_STRING
);
...
@@ -529,6 +550,18 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -529,6 +550,18 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if
(!
Common
.
isNotNull
(
excelVOList
)){
if
(!
Common
.
isNotNull
(
excelVOList
)){
return
;
return
;
}
}
Map
<
String
,
String
>
dicMap
=
new
HashMap
<>();
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
()
.
get
(
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"dept_config_type"
);
if
(
Common
.
isNotNull
(
dicObj
))
{
for
(
Map
.
Entry
<
String
,
String
>
entry
:
dicObj
.
entrySet
())
{
String
key
=
entry
.
getKey
();
String
Label
=
entry
.
getValue
();
dicMap
.
put
(
Label
,
key
);
}
}
//获取所有区域数据
//获取所有区域数据
HashMap
<
String
,
SysArea
>
areaMap
=
initAreaMap
();
HashMap
<
String
,
SysArea
>
areaMap
=
initAreaMap
();
if
(
Common
.
isEmpty
(
areaMap
))
{
if
(
Common
.
isEmpty
(
areaMap
))
{
...
@@ -546,17 +579,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -546,17 +579,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList
.
add
(
new
ErrorMessage
(
1
,
"获取人员信息数据失败"
));
errorMessageList
.
add
(
new
ErrorMessage
(
1
,
"获取人员信息数据失败"
));
}
}
Map
<
String
,
String
>
exitNameMap
=
new
HashMap
<>();
Map
<
String
,
String
>
exitNameMap
=
new
HashMap
<>();
String
errorMsg
;
SysHouseHoldInfo
info
;
SysHouseHoldInfo
info
;
// 个性化校验逻辑
// 个性化校验逻辑
// 执行数据插入操作 组装
// 执行数据插入操作 组装
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
TSocialHouseholdUpdateVo
excel
=
excelVOList
.
get
(
i
);
TSocialHouseholdUpdateVo
excel
=
excelVOList
.
get
(
i
);
//校验省市县
if
(
Common
.
isNotNull
(
excel
.
getProvince
())
&&
Common
.
isEmpty
(
excel
.
getProvince
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_SIX
,
excel
));
continue
;
}
info
=
this
.
getOne
(
Wrappers
.<
SysHouseHoldInfo
>
query
().
lambda
()
info
=
this
.
getOne
(
Wrappers
.<
SysHouseHoldInfo
>
query
().
lambda
()
.
eq
(
SysHouseHoldInfo:
:
getType
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
SysHouseHoldInfo:
:
getType
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
SysHouseHoldInfo:
:
getName
,
excel
.
getName
())
.
eq
(
SysHouseHoldInfo:
:
getName
,
excel
.
getName
())
...
@@ -584,6 +611,20 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -584,6 +611,20 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_NOT_EXIT
,
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_NOT_EXIT
,
excel
));
continue
;
continue
;
}
}
if
(
Common
.
isNotNull
(
excel
.
getOrganName
()))
{
excel
.
setOrganName
(
excel
.
getOrganName
().
replace
(
" "
,
""
));
if
(
Common
.
isNotNull
(
dicMap
)
&&
Common
.
isEmpty
(
dicMap
.
get
(
excel
.
getOrganName
())))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_SEVEN
,
excel
));
continue
;
}
else
{
info
.
setOrganId
(
dicMap
.
get
(
excel
.
getOrganName
()));
}
}
//校验省市县
if
(
Common
.
isNotNull
(
excel
.
getProvince
())
&&
Common
.
isEmpty
(
excel
.
getProvince
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_SIX
,
excel
));
continue
;
}
//判断模板中是否有户重复的数据
//判断模板中是否有户重复的数据
if
(
null
==
exitNameMap
.
get
(
excel
.
getName
()))
{
if
(
null
==
exitNameMap
.
get
(
excel
.
getName
()))
{
exitNameMap
.
put
(
excel
.
getName
(),
"1"
);
exitNameMap
.
put
(
excel
.
getName
(),
"1"
);
...
@@ -622,13 +663,13 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -622,13 +663,13 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
}
//校验手机号准确性
//校验手机号准确性
if
(
Common
.
isNotNull
(
excel
.
getPhone
()))
{
//
if (Common.isNotNull(excel.getPhone())) {
errorMsg
=
checkMobile
(
String
.
valueOf
(
excel
.
getPhone
()));
//
errorMsg = checkMobile(String.valueOf(excel.getPhone()));
if
(!
errorMsg
.
contains
(
HouseConfigConstants
.
SUCESS
))
{
//
if (!errorMsg.contains(HouseConfigConstants.SUCESS)) {
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
errorMsg
,
excel
));
//
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMsg, excel));
continue
;
//
continue;
}
//
}
}
//
}
// 新老数据审核人办理人不同,先删除,再添加
// 新老数据审核人办理人不同,先删除,再添加
if
(
Common
.
isNotNull
(
excel
.
getAuditUserName
())
&&
!
excel
.
getAuditUserName
().
equals
(
info
.
getAuditUserName
()))
{
if
(
Common
.
isNotNull
(
excel
.
getAuditUserName
())
&&
!
excel
.
getAuditUserName
().
equals
(
info
.
getAuditUserName
()))
{
tSocialfundHouseResService
.
deleteAuditUser
(
info
);
tSocialfundHouseResService
.
deleteAuditUser
(
info
);
...
@@ -642,7 +683,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -642,7 +683,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
}
//更新数据
//更新数据
updateHouseInfo
(
excel
,
info
,
userMap
);
updateHouseInfo
(
excel
,
info
,
userMap
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
UPDATE_SUCCESS
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
UPDATE_SUCCESS
,
excel
));
}
}
}
}
...
@@ -670,13 +711,13 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -670,13 +711,13 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
private
void
updateHouseInfo
(
TSocialHouseholdUpdateVo
excel
,
SysHouseHoldInfo
info
,
private
void
updateHouseInfo
(
TSocialHouseholdUpdateVo
excel
,
SysHouseHoldInfo
info
,
Map
<
String
,
SysUser
>
userMap
)
{
Map
<
String
,
SysUser
>
userMap
)
{
if
(
Common
.
isNotNull
(
excel
.
getHouseType
()))
{
if
(
Common
.
isNotNull
(
excel
.
getHouseType
()))
{
info
.
setHouseType
(
excel
.
getHouseType
().
equals
(
HouseConfigConstants
.
HOUSE_TYPE_ONE
)
?
"
0"
:
"1
"
);
info
.
setHouseType
(
excel
.
getHouseType
().
equals
(
HouseConfigConstants
.
HOUSE_TYPE_ONE
)
?
"
1"
:
"0
"
);
}
}
if
(
Common
.
isNotNull
(
excel
.
getAutoStatus
()))
{
if
(
Common
.
isNotNull
(
excel
.
getAutoStatus
()))
{
info
.
setAutoStatus
(
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"0"
:
"1"
);
info
.
setAutoStatus
(
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"0"
:
"1"
);
}
}
if
(
Common
.
isNotNull
(
excel
.
getOrganName
()))
{
if
(
Common
.
isNotNull
(
excel
.
getOrganName
()))
{
info
.
setOrganName
(
excel
.
getOrganName
()
.
trim
()
);
info
.
setOrganName
(
excel
.
getOrganName
());
}
}
if
(
Common
.
isNotNull
(
excel
.
getPhone
()))
{
if
(
Common
.
isNotNull
(
excel
.
getPhone
()))
{
info
.
setPhone
(
String
.
valueOf
(
excel
.
getPhone
()));
info
.
setPhone
(
String
.
valueOf
(
excel
.
getPhone
()));
...
@@ -703,13 +744,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -703,13 +744,11 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
SysUser
auditUser
=
userMap
.
get
(
excel
.
getAuditUserName
());
SysUser
auditUser
=
userMap
.
get
(
excel
.
getAuditUserName
());
info
.
setAuditUser
(
auditUser
.
getUserId
());
info
.
setAuditUser
(
auditUser
.
getUserId
());
info
.
setAuditUserName
(
excel
.
getAuditUserName
());
info
.
setAuditUserName
(
excel
.
getAuditUserName
());
info
.
setAuditUserDeptName
(
auditUser
.
getDeptName
());
}
}
if
(
Common
.
isNotNull
(
excel
.
getHandleUserName
()))
{
if
(
Common
.
isNotNull
(
excel
.
getHandleUserName
()))
{
SysUser
handlerUser
=
userMap
.
get
(
excel
.
getHandleUserName
());
SysUser
handlerUser
=
userMap
.
get
(
excel
.
getHandleUserName
());
info
.
setHandleUser
(
handlerUser
.
getUserId
());
info
.
setHandleUser
(
handlerUser
.
getUserId
());
info
.
setHandleUserName
(
excel
.
getAuditUserName
());
info
.
setHandleUserName
(
excel
.
getHandleUserName
());
info
.
setHandleUserDeptName
(
handlerUser
.
getDeptName
());
}
}
baseMapper
.
updateById
(
info
);
baseMapper
.
updateById
(
info
);
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendPushServiceImpl.java
View file @
6ce47bda
...
@@ -64,6 +64,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -64,6 +64,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
private
final
TSocialDeadlineInfoService
tSocialDeadlineInfoService
;
private
final
TSocialDeadlineInfoService
tSocialDeadlineInfoService
;
private
final
TSocialSoldierLogService
tSocialSoldierLogService
;
private
final
TSocialSoldierLogService
tSocialSoldierLogService
;
private
final
TSocialFriendBackLogService
tSocialFriendBackLogService
;
private
final
TSocialFriendBackLogService
tSocialFriendBackLogService
;
private
final
TSocialFreindSetService
tSocialFreindSetService
;
private
final
TSocialInfoMapper
socialMapper
;
private
final
TSocialInfoMapper
socialMapper
;
@Autowired
@Autowired
private
ExcelMergeImage
excelMergeImage
;
private
ExcelMergeImage
excelMergeImage
;
...
@@ -88,38 +89,41 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -88,38 +89,41 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
**/
**/
@Override
@Override
public
R
<
String
>
pushFriend
(
List
<
String
>
dispatchIdList
)
{
public
R
<
String
>
pushFriend
(
List
<
String
>
dispatchIdList
)
{
TSocialFreindSet
set
=
tSocialFreindSetService
.
getById
(
"1"
);
if
(
set
!=
null
&&
Common
.
isNotNull
(
set
.
getType
())
&&
1
==
set
.
getType
())
{
// 获取时间限制配置(获取 当月启用 的配置)
// 获取时间限制配置(获取 当月启用 的配置)
Map
<
String
,
TSocialDeadlineInfo
>
socialSetMap
=
tSocialDeadlineInfoService
.
getSocialSetByAreaId
();
Map
<
String
,
TSocialDeadlineInfo
>
socialSetMap
=
tSocialDeadlineInfoService
.
getSocialSetByAreaId
();
// 社保增员、社保减员、医保增员、医保减员
// 社保增员、社保减员、医保增员、医保减员
// 养工失新增列表
// 养工失新增列表
List
<
SociaFriendYgsAddVo
>
ygsAddlist
=
baseMapper
.
getSocialSoldierYgsAddVoList
(
dispatchIdList
);
List
<
SociaFriendYgsAddVo
>
ygsAddlist
=
baseMapper
.
getSocialSoldierYgsAddVoList
(
dispatchIdList
);
if
(
ygsAddlist
!=
null
&&
!
ygsAddlist
.
isEmpty
())
{
if
(
ygsAddlist
!=
null
&&
!
ygsAddlist
.
isEmpty
())
{
this
.
doPushSocialAndLogYgs
(
socialSetMap
,
ygsAddlist
,
1
);
this
.
doPushSocialAndLogYgs
(
socialSetMap
,
ygsAddlist
,
1
);
}
}
// 养工失减少列表
// 养工失减少列表
List
<
SociaFriendYgsAddVo
>
ygsReducelist
=
baseMapper
.
getSocialSoldierYgsReduceVoList
(
dispatchIdList
);
List
<
SociaFriendYgsAddVo
>
ygsReducelist
=
baseMapper
.
getSocialSoldierYgsReduceVoList
(
dispatchIdList
);
if
(
ygsReducelist
!=
null
&&
!
ygsReducelist
.
isEmpty
())
{
if
(
ygsReducelist
!=
null
&&
!
ygsReducelist
.
isEmpty
())
{
this
.
doPushSocialAndLogYgs
(
socialSetMap
,
ygsReducelist
,
2
);
this
.
doPushSocialAndLogYgs
(
socialSetMap
,
ygsReducelist
,
2
);
}
}
// 医生大新增列表
// 医生大新增列表
List
<
SociaFriendYgsAddVo
>
ysdAddlist
=
baseMapper
.
getSocialSoldierYsdAddVoList
(
dispatchIdList
);
List
<
SociaFriendYgsAddVo
>
ysdAddlist
=
baseMapper
.
getSocialSoldierYsdAddVoList
(
dispatchIdList
);
if
(
ysdAddlist
!=
null
&&
!
ysdAddlist
.
isEmpty
())
{
if
(
ysdAddlist
!=
null
&&
!
ysdAddlist
.
isEmpty
())
{
this
.
doPushSocialAndLogYsd
(
socialSetMap
,
ysdAddlist
,
3
);
this
.
doPushSocialAndLogYsd
(
socialSetMap
,
ysdAddlist
,
3
);
}
}
// 医生大减少列表
// 医生大减少列表
List
<
SociaFriendYgsAddVo
>
ysdReducelist
=
baseMapper
.
getSocialSoldierYsdReduceVoList
(
dispatchIdList
);
List
<
SociaFriendYgsAddVo
>
ysdReducelist
=
baseMapper
.
getSocialSoldierYsdReduceVoList
(
dispatchIdList
);
if
(
ysdReducelist
!=
null
&&
!
ysdReducelist
.
isEmpty
())
{
if
(
ysdReducelist
!=
null
&&
!
ysdReducelist
.
isEmpty
())
{
this
.
doPushSocialAndLogYsd
(
socialSetMap
,
ysdReducelist
,
4
);
this
.
doPushSocialAndLogYsd
(
socialSetMap
,
ysdReducelist
,
4
);
}
}
if
((
ygsAddlist
==
null
||
ygsAddlist
.
isEmpty
())
if
((
ygsAddlist
==
null
||
ygsAddlist
.
isEmpty
())
&&
(
ygsReducelist
==
null
||
ygsReducelist
.
isEmpty
())
&&
(
ygsReducelist
==
null
||
ygsReducelist
.
isEmpty
())
&&
(
ysdAddlist
==
null
||
ysdAddlist
.
isEmpty
())
&&
(
ysdAddlist
==
null
||
ysdAddlist
.
isEmpty
())
&&
(
ysdReducelist
==
null
||
ysdReducelist
.
isEmpty
())
&&
(
ysdReducelist
==
null
||
ysdReducelist
.
isEmpty
())
)
{
)
{
return
R
.
failed
(
"无数据,推送结束!"
);
return
R
.
failed
(
"无数据,推送结束!"
);
}
}
}
return
R
.
ok
(
"推送成功!!"
);
return
R
.
ok
(
"推送成功!!"
);
}
}
...
@@ -153,6 +157,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -153,6 +157,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setId
(
vo
.
getSocialId
());
backLog
=
new
TSocialFriendBackLog
();
backLog
=
new
TSocialFriendBackLog
();
backLog
.
setSocialId
(
vo
.
getSocialId
());
backLog
.
setSocialId
(
vo
.
getSocialId
());
backLog
.
setType
(
type
);
// 房工接口,获取 企业职工社会保险增员花名册 url
// 房工接口,获取 企业职工社会保险增员花名册 url
urlR
=
doExportRoster
(
vo
.
getSocialId
(),
String
.
valueOf
(
type
),
vo
.
getUnitCreditCode
());
urlR
=
doExportRoster
(
vo
.
getSocialId
(),
String
.
valueOf
(
type
),
vo
.
getUnitCreditCode
());
if
(
urlR
!=
null
&&
urlR
.
getCode
()==
200
&&
Common
.
isNotNull
(
urlR
.
getData
()))
{
if
(
urlR
!=
null
&&
urlR
.
getCode
()==
200
&&
Common
.
isNotNull
(
urlR
.
getData
()))
{
...
@@ -231,6 +236,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -231,6 +236,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setId
(
vo
.
getSocialId
());
backLog
=
new
TSocialFriendBackLog
();
backLog
=
new
TSocialFriendBackLog
();
backLog
.
setSocialId
(
vo
.
getSocialId
());
backLog
.
setSocialId
(
vo
.
getSocialId
());
backLog
.
setType
(
type
);
// 房工接口,获取 企业职工基本医疗保险参保登记表 url
// 房工接口,获取 企业职工基本医疗保险参保登记表 url
urlR
=
doExportRoster
(
vo
.
getSocialId
(),
String
.
valueOf
(
type
),
vo
.
getUnitCreditCode
());
urlR
=
doExportRoster
(
vo
.
getSocialId
(),
String
.
valueOf
(
type
),
vo
.
getUnitCreditCode
());
if
(
urlR
!=
null
&&
urlR
.
getCode
()==
200
&&
Common
.
isNotNull
(
urlR
.
getData
()))
{
if
(
urlR
!=
null
&&
urlR
.
getCode
()==
200
&&
Common
.
isNotNull
(
urlR
.
getData
()))
{
...
@@ -625,6 +631,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -625,6 +631,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
inputStreamOut
=
new
FileInputStream
(
outFile
);
inputStreamOut
=
new
FileInputStream
(
outFile
);
// 转换成图片 完成后清理流
// 转换成图片 完成后清理流
TSocialFriendBackLog
backLog
=
new
TSocialFriendBackLog
();
TSocialFriendBackLog
backLog
=
new
TSocialFriendBackLog
();
backLog
.
setType
(
Integer
.
parseInt
(
type
));
R
<
String
>
ulrR
=
excelToImage
.
excelToImg
(
inputStreamOut
,
socialFriendConfig
,
restTemplate
,
backLog
);
R
<
String
>
ulrR
=
excelToImage
.
excelToImg
(
inputStreamOut
,
socialFriendConfig
,
restTemplate
,
backLog
);
tSocialFriendBackLogService
.
save
(
backLog
);
tSocialFriendBackLogService
.
save
(
backLog
);
return
ulrR
;
return
ulrR
;
...
@@ -888,6 +895,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -888,6 +895,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
inputStreamOut
=
new
FileInputStream
(
outFile
);
inputStreamOut
=
new
FileInputStream
(
outFile
);
// 转换成图片 完成后清理流
// 转换成图片 完成后清理流
TSocialFriendBackLog
backLog
=
new
TSocialFriendBackLog
();
TSocialFriendBackLog
backLog
=
new
TSocialFriendBackLog
();
backLog
.
setType
(
Integer
.
parseInt
(
type
));
R
<
String
>
ulrR
=
excelToImage
.
excelToImg
(
inputStreamOut
,
socialFriendConfig
,
restTemplate
,
backLog
);
R
<
String
>
ulrR
=
excelToImage
.
excelToImg
(
inputStreamOut
,
socialFriendConfig
,
restTemplate
,
backLog
);
tSocialFriendBackLogService
.
save
(
backLog
);
tSocialFriendBackLogService
.
save
(
backLog
);
return
ulrR
;
return
ulrR
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
View file @
6ce47bda
...
@@ -57,6 +57,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
...
@@ -57,6 +57,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
private
final
TAuditInfoService
tAuditInfoService
;
private
final
TAuditInfoService
tAuditInfoService
;
private
final
TSocialSoldierLogService
tSocialSoldierLogService
;
private
final
TSocialSoldierLogService
tSocialSoldierLogService
;
private
final
TSocialFriendBackLogService
tSocialFriendBackLogService
;
private
final
TSocialFriendBackLogService
tSocialFriendBackLogService
;
private
final
TSocialFreindSetService
tSocialFreindSetService
;
/**
/**
* @Description: 5 查看任务进度
* @Description: 5 查看任务进度
...
@@ -66,59 +67,62 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
...
@@ -66,59 +67,62 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
**/
**/
@Override
@Override
public
R
<
String
>
getInfoByRequestId
()
{
public
R
<
String
>
getInfoByRequestId
()
{
// true养工失 false 医生大
TSocialFreindSet
set
=
tSocialFreindSetService
.
getById
(
"1"
);
boolean
typeFlag
=
true
;
if
(
set
!=
null
&&
Common
.
isNotNull
(
set
.
getType
())
&&
1
==
set
.
getType
())
{
Set
<
String
>
dbAuthsSet
=
new
HashSet
<>();
// true养工失 false 医生大
Collection
<?
extends
GrantedAuthority
>
authorities
=
AuthorityUtils
boolean
typeFlag
=
true
;
.
createAuthorityList
(
dbAuthsSet
.
toArray
(
new
String
[
0
]));
Set
<
String
>
dbAuthsSet
=
new
HashSet
<>();
YifuUser
user
=
new
YifuUser
(
"1"
,
1L
,
""
,
"税友"
,
Collection
<?
extends
GrantedAuthority
>
authorities
=
AuthorityUtils
"税友"
,
"0"
,
SecurityConstants
.
BCRYPT
+
"123456"
,
.
createAuthorityList
(
dbAuthsSet
.
toArray
(
new
String
[
0
]));
"12345678911"
,
true
,
true
,
true
,
YifuUser
user
=
new
YifuUser
(
"1"
,
1L
,
""
,
"税友"
,
true
,
"税友"
,
"0"
,
SecurityConstants
.
BCRYPT
+
"123456"
,
"1"
,
authorities
,
"1"
,
"12345678911"
,
true
,
true
,
true
,
null
,
null
,
true
,
null
);
"1"
,
authorities
,
"1"
,
// 失败原因配置
null
,
null
,
Map
<
String
,
FailReasonConfig
>
errorMap
=
failReasonConfigService
.
getFailReasonMap
();
null
);
// 获取所有需要反馈的任务id
// 失败原因配置
List
<
TSocialInfo
>
socialList
=
tSocialInfoService
.
getSocialFriendYgsAll
();
Map
<
String
,
FailReasonConfig
>
errorMap
=
failReasonConfigService
.
getFailReasonMap
();
List
<
TSocialFriendBackLog
>
logList
;
// 获取所有需要反馈的任务id
TSocialFriendBackLog
backLog
;
List
<
TSocialInfo
>
socialList
=
tSocialInfoService
.
getSocialFriendYgsAll
();
if
(
socialList
!=
null
&&
!
socialList
.
isEmpty
())
{
List
<
TSocialFriendBackLog
>
logList
;
FriendResult
info
;
TSocialFriendBackLog
backLog
;
logList
=
new
ArrayList
<>();
if
(
socialList
!=
null
&&
!
socialList
.
isEmpty
())
{
for
(
TSocialInfo
socialInfo
:
socialList
)
{
FriendResult
info
;
backLog
=
new
TSocialFriendBackLog
();
logList
=
new
ArrayList
<>();
backLog
.
setSocialId
(
socialInfo
.
getId
());
for
(
TSocialInfo
socialInfo
:
socialList
)
{
backLog
.
setRequestId
(
socialInfo
.
getYgsRequestId
());
backLog
=
new
TSocialFriendBackLog
();
info
=
socialFriendConfig
.
getFriendByRequestId
(
restTemplate
,
socialInfo
.
getYgsRequestId
(),
backLog
);
backLog
.
setSocialId
(
socialInfo
.
getId
());
logList
.
add
(
backLog
);
backLog
.
setRequestId
(
socialInfo
.
getYgsRequestId
());
if
(
info
!=
null
&&
Common
.
isNotNull
(
info
.
getZt
()))
{
info
=
socialFriendConfig
.
getFriendByRequestId
(
restTemplate
,
socialInfo
.
getYgsRequestId
(),
backLog
);
doCore
(
info
,
socialInfo
,
typeFlag
,
user
,
errorMap
);
logList
.
add
(
backLog
);
if
(
info
!=
null
&&
Common
.
isNotNull
(
info
.
getZt
()))
{
doCore
(
info
,
socialInfo
,
typeFlag
,
user
,
errorMap
);
}
}
}
}
if
(!
logList
.
isEmpty
())
{
if
(!
logList
.
isEmpty
())
{
tSocialFriendBackLogService
.
saveBatch
(
logList
);
tSocialFriendBackLogService
.
saveBatch
(
logList
);
}
}
// 医保
typeFlag
=
false
;
List
<
TSocialInfo
>
socialYsdList
=
tSocialInfoService
.
getSocialFriendYsdAll
();
if
(
socialYsdList
!=
null
&&
!
socialYsdList
.
isEmpty
())
{
FriendResult
info
;
logList
=
new
ArrayList
<>();
for
(
TSocialInfo
socialInfo
:
socialYsdList
)
{
backLog
=
new
TSocialFriendBackLog
();
backLog
.
setSocialId
(
socialInfo
.
getId
());
backLog
.
setRequestId
(
socialInfo
.
getYsdRequestId
());
info
=
socialFriendConfig
.
getFriendByRequestId
(
restTemplate
,
socialInfo
.
getYsdRequestId
(),
backLog
);
logList
.
add
(
backLog
);
if
(
info
!=
null
&&
Common
.
isNotNull
(
info
.
getZt
()))
{
doCore
(
info
,
socialInfo
,
typeFlag
,
user
,
errorMap
);
}
}
}
}
if
(!
logList
.
isEmpty
())
{
// 医保
tSocialFriendBackLogService
.
saveBatch
(
logList
);
typeFlag
=
false
;
List
<
TSocialInfo
>
socialYsdList
=
tSocialInfoService
.
getSocialFriendYsdAll
();
if
(
socialYsdList
!=
null
&&
!
socialYsdList
.
isEmpty
())
{
FriendResult
info
;
logList
=
new
ArrayList
<>();
for
(
TSocialInfo
socialInfo
:
socialYsdList
)
{
backLog
=
new
TSocialFriendBackLog
();
backLog
.
setSocialId
(
socialInfo
.
getId
());
backLog
.
setRequestId
(
socialInfo
.
getYsdRequestId
());
info
=
socialFriendConfig
.
getFriendByRequestId
(
restTemplate
,
socialInfo
.
getYsdRequestId
(),
backLog
);
logList
.
add
(
backLog
);
if
(
info
!=
null
&&
Common
.
isNotNull
(
info
.
getZt
()))
{
doCore
(
info
,
socialInfo
,
typeFlag
,
user
,
errorMap
);
}
}
if
(!
logList
.
isEmpty
())
{
tSocialFriendBackLogService
.
saveBatch
(
logList
);
}
}
}
}
}
return
R
.
ok
();
return
R
.
ok
();
...
@@ -428,6 +432,9 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
...
@@ -428,6 +432,9 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
auditInfo
.
setId
(
null
);
auditInfo
.
setId
(
null
);
auditInfo
.
setAuditStatus
(
CommonConstants
.
TWO_STRING
);
auditInfo
.
setAuditStatus
(
CommonConstants
.
TWO_STRING
);
auditInfo
.
setAuditRemark
(
handleRemark
);
auditInfo
.
setAuditRemark
(
handleRemark
);
if
(
Common
.
isNotNull
(
title
)
&&
title
.
length
()
>
255
)
{
title
=
title
.
substring
(
0
,
255
);
}
auditInfo
.
setTitle
(
title
);
auditInfo
.
setTitle
(
title
);
auditInfo
.
setOrganName
(
user
.
getDeptName
());
auditInfo
.
setOrganName
(
user
.
getDeptName
());
auditInfo
.
setAuditUser
(
user
.
getNickname
());
auditInfo
.
setAuditUser
(
user
.
getNickname
());
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierPushServiceImpl.java
View file @
6ce47bda
...
@@ -25,10 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
...
@@ -25,10 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.social.config.SocialConfig
;
import
com.yifu.cloud.plus.v1.yifu.social.config.SocialConfig
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialDeadlineInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialSoldierLog
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialSoldierShenBaoTask
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialSoldierMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialSoldierMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.*
;
import
com.yifu.cloud.plus.v1.yifu.social.service.*
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.*
;
...
@@ -69,6 +66,9 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
...
@@ -69,6 +66,9 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
private
final
TAutoPaymentDetailService
tAutoPaymentDetailService
;
private
final
TAutoPaymentDetailService
tAutoPaymentDetailService
;
private
final
TSocialDeadlineInfoService
tSocialDeadlineInfoService
;
private
final
TSocialDeadlineInfoService
tSocialDeadlineInfoService
;
private
final
TSocialSoldierLogService
tSocialSoldierLogService
;
private
final
TSocialSoldierLogService
tSocialSoldierLogService
;
private
final
TSocialFreindSetService
tSocialFreindSetService
;
// 安徽省之外的,默认社保士兵
private
static
final
String
SOCIAL_PROVINCE
=
"安徽省"
;
/**
/**
* @param socialList
* @param socialList
...
@@ -162,6 +162,21 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
...
@@ -162,6 +162,21 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
return
new
CommonsMultipartFile
(
item
);
return
new
CommonsMultipartFile
(
item
);
}
}
/**
* @param
* @Description: 查询配置开关是否为社保士兵 true:开 false 关(不是安徽省,也可以处理)
* @Author: hgw
* @Date: 2024/12/13 15:29
* @return: boolean
**/
private
boolean
getFriendSet
()
{
TSocialFreindSet
set
=
tSocialFreindSetService
.
getById
(
"1"
);
boolean
setFlag
=
false
;
if
(
set
==
null
||
Common
.
isEmpty
(
set
.
getType
())
||
0
==
set
.
getType
())
{
setFlag
=
true
;
}
return
setFlag
;
}
/**
/**
* @Description: 推送到社保士兵
* @Description: 推送到社保士兵
* @Author: hgw
* @Author: hgw
...
@@ -171,6 +186,9 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
...
@@ -171,6 +186,9 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
@Override
@Override
public
R
<
String
>
pushSoldier
(
List
<
String
>
dispatchIdList
)
{
public
R
<
String
>
pushSoldier
(
List
<
String
>
dispatchIdList
)
{
// 查询配置开关是否为社保士兵 true:开 false 关(不是安徽省,也可以处理)
boolean
setFlag
=
getFriendSet
();
// 获取时间限制配置(获取 当月启用 的配置)
// 获取时间限制配置(获取 当月启用 的配置)
Map
<
String
,
TSocialDeadlineInfo
>
socialsetMap
=
tSocialDeadlineInfoService
.
getSocialSet
();
Map
<
String
,
TSocialDeadlineInfo
>
socialsetMap
=
tSocialDeadlineInfoService
.
getSocialSet
();
...
@@ -178,23 +196,23 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
...
@@ -178,23 +196,23 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
// 养工失新增列表
// 养工失新增列表
List
<
SocialSoldierYgsAddVo
>
ygsAddlist
=
baseMapper
.
getSocialSoldierYgsAddVoList
(
dispatchIdList
);
List
<
SocialSoldierYgsAddVo
>
ygsAddlist
=
baseMapper
.
getSocialSoldierYgsAddVoList
(
dispatchIdList
);
if
(
ygsAddlist
!=
null
&&
!
ygsAddlist
.
isEmpty
())
{
if
(
ygsAddlist
!=
null
&&
!
ygsAddlist
.
isEmpty
())
{
this
.
doPushSocialAndLogYgs
(
socialsetMap
,
ygsAddlist
,
"社保增员"
);
this
.
doPushSocialAndLogYgs
(
socialsetMap
,
ygsAddlist
,
"社保增员"
,
setFlag
);
}
}
// 养工失减少列表
// 养工失减少列表
List
<
SocialSoldierYgsAddVo
>
ygsReducelist
=
baseMapper
.
getSocialSoldierYgsReduceVoList
(
dispatchIdList
);
List
<
SocialSoldierYgsAddVo
>
ygsReducelist
=
baseMapper
.
getSocialSoldierYgsReduceVoList
(
dispatchIdList
);
if
(
ygsReducelist
!=
null
&&
!
ygsReducelist
.
isEmpty
())
{
if
(
ygsReducelist
!=
null
&&
!
ygsReducelist
.
isEmpty
())
{
this
.
doPushSocialAndLogYgs
(
socialsetMap
,
ygsReducelist
,
"社保减员"
);
this
.
doPushSocialAndLogYgs
(
socialsetMap
,
ygsReducelist
,
"社保减员"
,
setFlag
);
}
}
// 医生大新增列表
// 医生大新增列表
List
<
SocialSoldierYsdAddVo
>
ysdAddlist
=
baseMapper
.
getSocialSoldierYsdAddVoList
(
dispatchIdList
);
List
<
SocialSoldierYsdAddVo
>
ysdAddlist
=
baseMapper
.
getSocialSoldierYsdAddVoList
(
dispatchIdList
);
if
(
ysdAddlist
!=
null
&&
!
ysdAddlist
.
isEmpty
())
{
if
(
ysdAddlist
!=
null
&&
!
ysdAddlist
.
isEmpty
())
{
this
.
doPushSocialAndLogYsd
(
socialsetMap
,
ysdAddlist
,
"医保增员"
);
this
.
doPushSocialAndLogYsd
(
socialsetMap
,
ysdAddlist
,
"医保增员"
,
setFlag
);
}
}
// 医生大减少列表
// 医生大减少列表
List
<
SocialSoldierYsdAddVo
>
ysdReducelist
=
baseMapper
.
getSocialSoldierYsdReduceVoList
(
dispatchIdList
);
List
<
SocialSoldierYsdAddVo
>
ysdReducelist
=
baseMapper
.
getSocialSoldierYsdReduceVoList
(
dispatchIdList
);
if
(
ysdReducelist
!=
null
&&
!
ysdReducelist
.
isEmpty
())
{
if
(
ysdReducelist
!=
null
&&
!
ysdReducelist
.
isEmpty
())
{
this
.
doPushSocialAndLogYsd
(
socialsetMap
,
ysdReducelist
,
"医保减员"
);
this
.
doPushSocialAndLogYsd
(
socialsetMap
,
ysdReducelist
,
"医保减员"
,
setFlag
);
}
}
if
((
ygsAddlist
==
null
||
ygsAddlist
.
isEmpty
())
if
((
ygsAddlist
==
null
||
ygsAddlist
.
isEmpty
())
&&
(
ygsReducelist
==
null
||
ygsReducelist
.
isEmpty
())
&&
(
ygsReducelist
==
null
||
ygsReducelist
.
isEmpty
())
...
@@ -203,6 +221,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
...
@@ -203,6 +221,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
)
{
)
{
return
R
.
failed
(
"无数据,推送结束!"
);
return
R
.
failed
(
"无数据,推送结束!"
);
}
}
return
R
.
ok
(
"推送成功!!"
);
return
R
.
ok
(
"推送成功!!"
);
}
}
...
@@ -213,7 +232,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
...
@@ -213,7 +232,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
* @return: void
* @return: void
**/
**/
private
void
doPushSocialAndLogYgs
(
Map
<
String
,
TSocialDeadlineInfo
>
socialsetMap
private
void
doPushSocialAndLogYgs
(
Map
<
String
,
TSocialDeadlineInfo
>
socialsetMap
,
List
<
SocialSoldierYgsAddVo
>
ygsAddlist
,
String
socialType
)
{
,
List
<
SocialSoldierYgsAddVo
>
ygsAddlist
,
String
socialType
,
boolean
setFlag
)
{
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
int
canPushType
;
int
canPushType
;
TSocialInfo
socialInfo
;
TSocialInfo
socialInfo
;
...
@@ -224,29 +243,32 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
...
@@ -224,29 +243,32 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
String
remark
;
String
remark
;
List
<
TSocialInfo
>
renGongList
=
new
ArrayList
<>();
List
<
TSocialInfo
>
renGongList
=
new
ArrayList
<>();
for
(
SocialSoldierYgsAddVo
vo
:
ygsAddlist
)
{
for
(
SocialSoldierYgsAddVo
vo
:
ygsAddlist
)
{
// 0:未到时间不动; 1:推送; 2:转人工
canPushType
=
this
.
getCanPushType
(
socialsetMap
,
vo
);
if
(
setFlag
||
!
SOCIAL_PROVINCE
.
equals
(
vo
.
getSocialProvince
()))
{
// 0:未到时间不动; 1:推送; 2:转人工
if
(
1
==
canPushType
)
{
canPushType
=
this
.
getCanPushType
(
socialsetMap
,
vo
);
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
if
(
1
==
canPushType
)
{
socialIdList
.
add
(
socialInfo
);
ygsAddlistCopy
.
add
(
vo
);
remark
=
"已推送提交任务!"
;
}
else
{
if
(
0
==
canPushType
)
{
remark
=
"未到时间,不推送!"
;
}
else
{
remark
=
"无时间配置或超出办理截止时间,转人工!"
;
socialInfo
=
new
TSocialInfo
();
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setYgsHandleStatus
(
CommonConstants
.
FIVE_STRING
);
socialIdList
.
add
(
socialInfo
);
renGongList
.
add
(
socialInfo
);
ygsAddlistCopy
.
add
(
vo
);
remark
=
"已推送提交任务!"
;
}
else
{
if
(
0
==
canPushType
)
{
remark
=
"未到时间,不推送!"
;
}
else
{
remark
=
"无时间配置或超出办理截止时间,转人工!"
;
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setYgsHandleStatus
(
CommonConstants
.
FIVE_STRING
);
renGongList
.
add
(
socialInfo
);
}
}
socialLog
=
tSocialSoldierLogService
.
getYgsSoldierLog
(
vo
,
type
,
remark
);
if
(
socialLog
!=
null
)
{
logList
.
add
(
socialLog
);
}
}
}
socialLog
=
tSocialSoldierLogService
.
getYgsSoldierLog
(
vo
,
type
,
remark
);
if
(
socialLog
!=
null
)
{
logList
.
add
(
socialLog
);
}
}
}
}
if
(!
renGongList
.
isEmpty
())
{
if
(!
renGongList
.
isEmpty
())
{
...
@@ -281,7 +303,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
...
@@ -281,7 +303,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
* @return: void
* @return: void
**/
**/
private
void
doPushSocialAndLogYsd
(
Map
<
String
,
TSocialDeadlineInfo
>
socialsetMap
private
void
doPushSocialAndLogYsd
(
Map
<
String
,
TSocialDeadlineInfo
>
socialsetMap
,
List
<
SocialSoldierYsdAddVo
>
ysdAddlist
,
String
socialType
)
{
,
List
<
SocialSoldierYsdAddVo
>
ysdAddlist
,
String
socialType
,
boolean
setFlag
)
{
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
int
canPushType
;
int
canPushType
;
TSocialInfo
socialInfo
;
TSocialInfo
socialInfo
;
...
@@ -292,29 +314,31 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
...
@@ -292,29 +314,31 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
List
<
TSocialInfo
>
renGongList
=
new
ArrayList
<>();
List
<
TSocialInfo
>
renGongList
=
new
ArrayList
<>();
String
remark
;
String
remark
;
for
(
SocialSoldierYsdAddVo
vo
:
ysdAddlist
)
{
for
(
SocialSoldierYsdAddVo
vo
:
ysdAddlist
)
{
// 0:未到时间不动; 1:推送; 2:转人工
if
(
setFlag
||
!
SOCIAL_PROVINCE
.
equals
(
vo
.
getSocialProvince
()))
{
canPushType
=
this
.
getCanPushTypeYsd
(
socialsetMap
,
vo
);
// 0:未到时间不动; 1:推送; 2:转人工
canPushType
=
this
.
getCanPushTypeYsd
(
socialsetMap
,
vo
);
if
(
1
==
canPushType
)
{
socialInfo
=
new
TSocialInfo
();
if
(
1
==
canPushType
)
{
socialInfo
.
setId
(
vo
.
getSocialId
());
socialIdList
.
add
(
socialInfo
);
ysdAddlistCopy
.
add
(
vo
);
remark
=
"已推送提交任务!"
;
}
else
{
if
(
0
==
canPushType
)
{
remark
=
"未到时间,不推送!"
;
}
else
{
remark
=
"无时间配置或超出办理截止时间,转人工!"
;
socialInfo
=
new
TSocialInfo
();
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setYsdHandleStatus
(
CommonConstants
.
FIVE_STRING
);
socialIdList
.
add
(
socialInfo
);
renGongList
.
add
(
socialInfo
);
ysdAddlistCopy
.
add
(
vo
);
remark
=
"已推送提交任务!"
;
}
else
{
if
(
0
==
canPushType
)
{
remark
=
"未到时间,不推送!"
;
}
else
{
remark
=
"无时间配置或超出办理截止时间,转人工!"
;
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setYsdHandleStatus
(
CommonConstants
.
FIVE_STRING
);
renGongList
.
add
(
socialInfo
);
}
}
socialLog
=
tSocialSoldierLogService
.
getYsdSoldierLog
(
vo
,
type
,
remark
);
if
(
socialLog
!=
null
)
{
logList
.
add
(
socialLog
);
}
}
}
socialLog
=
tSocialSoldierLogService
.
getYsdSoldierLog
(
vo
,
type
,
remark
);
if
(
socialLog
!=
null
)
{
logList
.
add
(
socialLog
);
}
}
}
}
if
(!
renGongList
.
isEmpty
())
{
if
(!
renGongList
.
isEmpty
())
{
...
@@ -464,6 +488,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
...
@@ -464,6 +488,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
**/
**/
@Override
@Override
public
R
<
String
>
pushSoldierByAudit
()
{
public
R
<
String
>
pushSoldierByAudit
()
{
// 养工失待审核列表
// 养工失待审核列表
List
<
SocialSoldierYgsAuditVo
>
ygsAddlist
=
baseMapper
.
getSocialSoldierYgsAuditVoList
();
List
<
SocialSoldierYgsAuditVo
>
ygsAddlist
=
baseMapper
.
getSocialSoldierYgsAuditVoList
();
List
<
SocialSoldierYgsAuditVo
>
ygsAddByGroupBylist
=
baseMapper
.
getSocialSoldierYgsAuditVoListByGroupBy
();
List
<
SocialSoldierYgsAuditVo
>
ygsAddByGroupBylist
=
baseMapper
.
getSocialSoldierYgsAuditVoListByGroupBy
();
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
View file @
6ce47bda
...
@@ -89,6 +89,10 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -89,6 +89,10 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
// 附件
// 附件
private
final
String
RESULT_ANNEX
=
"resultAnnex"
;
private
final
String
RESULT_ANNEX
=
"resultAnnex"
;
private
final
TSocialFreindSetService
tSocialFreindSetService
;
// 安徽省之外的,默认社保士兵
private
static
final
String
SOCIAL_PROVINCE
=
"安徽省"
;
/**
/**
* @Description: 6每月6号定时任务获取社保士兵实缴3张表
* @Description: 6每月6号定时任务获取社保士兵实缴3张表
* @Author: hgw
* @Author: hgw
...
@@ -1476,6 +1480,22 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -1476,6 +1480,22 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
return
R
.
ok
(
voList
);
return
R
.
ok
(
voList
);
}
}
/**
* @param
* @Description: 查询配置开关是否为社保士兵 true:开 false 关(不是安徽省,也可以处理)
* @Author: hgw
* @Date: 2024/12/13 15:29
* @return: boolean
**/
private
boolean
getFriendSet
()
{
TSocialFreindSet
set
=
tSocialFreindSetService
.
getById
(
"1"
);
boolean
setFlag
=
false
;
if
(
set
==
null
||
Common
.
isEmpty
(
set
.
getType
())
||
0
==
set
.
getType
())
{
setFlag
=
true
;
}
return
setFlag
;
}
/**
/**
* @param addId
* @param addId
* @Description: 5 查看任务进度
* @Description: 5 查看任务进度
...
@@ -1503,14 +1523,20 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -1503,14 +1523,20 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
if
(
socialList
!=
null
&&
!
socialList
.
isEmpty
())
{
if
(
socialList
!=
null
&&
!
socialList
.
isEmpty
())
{
Map
<
String
,
TSocialInfo
>
idCardMap
=
new
HashMap
<>();
Map
<
String
,
TSocialInfo
>
idCardMap
=
new
HashMap
<>();
Set
<
String
>
addIdSet
=
new
HashSet
<>();
Set
<
String
>
addIdSet
=
new
HashSet
<>();
// 查询配置开关是否为社保士兵 true:开 false 关(不是安徽省,也可以处理)
boolean
setFlag
=
getFriendSet
();
for
(
TSocialInfo
socialInfo
:
socialList
)
{
for
(
TSocialInfo
socialInfo
:
socialList
)
{
if
(
Common
.
isNotNull
(
socialInfo
.
getYgsAddId
()))
{
if
(
setFlag
||
!
SOCIAL_PROVINCE
.
equals
(
socialInfo
.
getSocialProvince
()))
{
addIdSet
.
add
(
socialInfo
.
getYgsAddId
());
if
(
Common
.
isNotNull
(
socialInfo
.
getYgsAddId
()))
{
idCardMap
.
put
(
socialInfo
.
getYgsAddId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getEmpIdcard
(),
socialInfo
);
addIdSet
.
add
(
socialInfo
.
getYgsAddId
());
}
idCardMap
.
put
(
socialInfo
.
getYgsAddId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getEmpIdcard
(),
socialInfo
);
if
(
Common
.
isNotNull
(
socialInfo
.
getYsdAddId
()))
{
}
addIdSet
.
add
(
socialInfo
.
getYsdAddId
());
if
(
Common
.
isNotNull
(
socialInfo
.
getYsdAddId
()))
{
idCardMap
.
put
(
socialInfo
.
getYsdAddId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getEmpIdcard
(),
socialInfo
);
addIdSet
.
add
(
socialInfo
.
getYsdAddId
());
idCardMap
.
put
(
socialInfo
.
getYsdAddId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getEmpIdcard
(),
socialInfo
);
}
}
}
}
}
HttpURLConnection
conn
;
HttpURLConnection
conn
;
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFriendBackLogMapper.xml
View file @
6ce47bda
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
<result
property=
"socialId"
column=
"SOCIAL_ID"
/>
<result
property=
"socialId"
column=
"SOCIAL_ID"
/>
<result
property=
"requestId"
column=
"REQUEST_ID"
/>
<result
property=
"requestId"
column=
"REQUEST_ID"
/>
<result
property=
"logInfo"
column=
"LOG_INFO"
/>
<result
property=
"logInfo"
column=
"LOG_INFO"
/>
<result
property=
"type"
column=
"TYPE"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
</resultMap>
</resultMap>
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFriendMapper.xml
View file @
6ce47bda
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
<sql
id=
"where_getSocialSoldier_base_handler"
>
<sql
id=
"where_getSocialSoldier_base_handler"
>
<where>
<where>
a.DELETE_FLAG = '0'
a.DELETE_FLAG = '0'
and a.SOCIAL_PROVINCE = '12'
<if
test=
"idsStr != null and idsStr.size > 0"
>
<if
test=
"idsStr != null and idsStr.size > 0"
>
AND a.ID in
AND a.ID in
<foreach
item=
"items"
index=
"index"
collection=
"idsStr"
open=
"("
separator=
","
close=
")"
>
<foreach
item=
"items"
index=
"index"
collection=
"idsStr"
open=
"("
separator=
","
close=
")"
>
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialInfoMapper.xml
View file @
6ce47bda
...
@@ -595,6 +595,7 @@
...
@@ -595,6 +595,7 @@
<select
id=
"getSocialSoldierYgsAll"
resultMap=
"tSocialInfoMap"
>
<select
id=
"getSocialSoldierYgsAll"
resultMap=
"tSocialInfoMap"
>
SELECT
SELECT
a.ID,
a.ID,
a.SOCIAL_PROVINCE,
a.EMP_NAME,
a.EMP_NAME,
a.SOCIAL_HOUSEHOLD_NAME,
a.SOCIAL_HOUSEHOLD_NAME,
a.EMP_IDCARD,
a.EMP_IDCARD,
...
@@ -618,6 +619,7 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id
...
@@ -618,6 +619,7 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id
<select
id=
"getSocialSoldierYsdAll"
resultMap=
"tSocialInfoMap"
>
<select
id=
"getSocialSoldierYsdAll"
resultMap=
"tSocialInfoMap"
>
SELECT
SELECT
a.ID,
a.ID,
a.SOCIAL_PROVINCE,
a.EMP_NAME,
a.EMP_NAME,
a.SOCIAL_HOUSEHOLD_NAME,
a.SOCIAL_HOUSEHOLD_NAME,
a.EMP_IDCARD,
a.EMP_IDCARD,
...
...
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