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
2f98d330
Commit
2f98d330
authored
Jan 16, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.5' into MVP1.7.5
parents
cead8fd9
1d58b319
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
56 additions
and
64 deletions
+56
-64
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+3
-2
WxLoginAuthenticationFilter.java
...plus/v1/yifu/auth/filter/WxLoginAuthenticationFilter.java
+1
-1
TInsuranceUnpurchaseApply.java
...plus/v1/yifu/salary/entity/TInsuranceUnpurchaseApply.java
+1
-1
WxConfig.java
...a/com/yifu/cloud/plus/v1/yifu/salary/config/WxConfig.java
+2
-37
TInsuranceUnpurchaseApplyServiceImpl.java
...ry/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java
+28
-15
TInsuranceUnpurchaseApplyAuditProcess.java
...e/impl/process/TInsuranceUnpurchaseApplyAuditProcess.java
+7
-2
application-dev.yml
...ry/yifu-salary-biz/src/main/resources/application-dev.yml
+1
-3
application-test.yml
...y/yifu-salary-biz/src/main/resources/application-test.yml
+2
-2
logback-spring.xml
...ary/yifu-salary-biz/src/main/resources/logback-spring.xml
+1
-1
TInsuranceUnpurchaseApplyMapper.xml
...main/resources/mapper/TInsuranceUnpurchaseApplyMapper.xml
+5
-0
TInsuranceUnpurchasePersonMapper.xml
...ain/resources/mapper/TInsuranceUnpurchasePersonMapper.xml
+5
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
2f98d330
...
@@ -1948,8 +1948,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -1948,8 +1948,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
long
count
=
baseMapper
.
selectCount
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
long
count
=
baseMapper
.
selectCount
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getDeptNo
,
cardVo
.
getDeptNo
())
.
eq
(
TEmployeeProject:
:
getDeptNo
,
cardVo
.
getDeptNo
())
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
cardVo
.
getEmpIdcardNo
())
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
cardVo
.
getEmpIdcardNo
()));
.
eq
(
TEmployeeProject:
:
getEmpName
,
cardVo
.
getEmpName
())
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
));
return
count
>
0
;
return
count
>
0
;
}
}
...
...
yifu-auth/src/main/java/com/yifu/cloud/plus/v1/yifu/auth/filter/WxLoginAuthenticationFilter.java
View file @
2f98d330
...
@@ -32,7 +32,7 @@ public class WxLoginAuthenticationFilter extends AbstractAuthenticationProcessin
...
@@ -32,7 +32,7 @@ public class WxLoginAuthenticationFilter extends AbstractAuthenticationProcessin
private
static
final
String
SPRING_SECURITY_RESTFUL_LOGIN_URL
=
"/oauth/wxLogin"
;
private
static
final
String
SPRING_SECURITY_RESTFUL_LOGIN_URL
=
"/oauth/wxLogin"
;
private
boolean
postOnly
=
fals
e
;
private
boolean
postOnly
=
tru
e
;
private
RestTemplate
restTemplate
=
new
RestTemplate
();
private
RestTemplate
restTemplate
=
new
RestTemplate
();
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TInsuranceUnpurchaseApply.java
View file @
2f98d330
...
@@ -81,7 +81,7 @@ public class TInsuranceUnpurchaseApply extends BaseEntity {
...
@@ -81,7 +81,7 @@ public class TInsuranceUnpurchaseApply extends BaseEntity {
@Schema
(
description
=
"当前审核人ID"
)
@Schema
(
description
=
"当前审核人ID"
)
private
String
auditUserId
;
private
String
auditUserId
;
@Schema
(
description
=
"
当前审核人ID
"
)
@Schema
(
description
=
"
不购买人数
"
)
private
String
unbuyNum
;
private
String
unbuyNum
;
@Schema
(
description
=
"明细数据集"
)
@Schema
(
description
=
"明细数据集"
)
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/config/WxConfig.java
View file @
2f98d330
...
@@ -120,49 +120,13 @@ public class WxConfig {
...
@@ -120,49 +120,13 @@ public class WxConfig {
* @return: java.lang.String
* @return: java.lang.String
**/
**/
public
boolean
sendTextCard
(
RestTemplate
restTemplate
,
Map
<
String
,
Object
>
requestMap
)
{
public
boolean
sendTextCard
(
RestTemplate
restTemplate
,
Map
<
String
,
Object
>
requestMap
)
{
// 必须加上header说明
HttpHeaders
headers
=
new
HttpHeaders
();
headers
.
setContentType
(
MediaType
.
APPLICATION_JSON_UTF8
);
Gson
gson
=
new
Gson
();
log
.
info
(
gson
.
toJson
(
requestMap
));
HttpEntity
<
String
>
requestEntity
=
new
HttpEntity
<>(
gson
.
toJson
(
requestMap
),
headers
);
String
accessToken
=
getAccessToken
(
restTemplate
);
ResponseEntity
<
String
>
responseEntity
=
restTemplate
.
postForEntity
(
String
.
format
(
SecurityConstants
.
WX_SEND_MESSAGE
,
accessToken
),
requestEntity
,
String
.
class
);
log
.
info
(
JSON
.
toJSONString
(
responseEntity
));
JSONObject
jsonObject
=
JSON
.
parseObject
(
JSON
.
toJSONString
(
responseEntity
));
JSONObject
jsonBody
=
jsonObject
.
getJSONObject
(
"body"
);
if
(
jsonBody
!=
null
)
{
String
errcode
=
jsonBody
.
getString
(
"errcode"
);
if
(
accossTokenInvliad
.
equals
(
errcode
))
{
//删除accossToken缓存
removeAccessToken
();
return
false
;
}
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
errcode
))
{
//非正常,则打印错误日志
log
.
info
(
jsonObject
.
toJSONString
());
}
}
else
{
log
.
info
(
jsonObject
.
toJSONString
());
}
return
true
;
}
/**
* @param restTemplate
* @param requestMap 请求内容
* @Author: huyc
* @Date: 2023/7/28 14:50
* @Description: 发送卡片消息
* @return: java.lang.String
**/
public
boolean
sendAppTextCard
(
RestTemplate
restTemplate
,
Map
<
String
,
Object
>
requestMap
)
{
// 必须加上header说明
// 必须加上header说明
HttpHeaders
headers
=
new
HttpHeaders
();
HttpHeaders
headers
=
new
HttpHeaders
();
headers
.
setContentType
(
MediaType
.
APPLICATION_JSON_UTF8
);
headers
.
setContentType
(
MediaType
.
APPLICATION_JSON_UTF8
);
Gson
gson
=
new
Gson
();
Gson
gson
=
new
Gson
();
log
.
info
(
"发企业微信===请求:{}"
,
gson
.
toJson
(
requestMap
));
log
.
info
(
"发企业微信===请求:{}"
,
gson
.
toJson
(
requestMap
));
HttpEntity
<
String
>
requestEntity
=
new
HttpEntity
<>(
gson
.
toJson
(
requestMap
),
headers
);
HttpEntity
<
String
>
requestEntity
=
new
HttpEntity
<>(
gson
.
toJson
(
requestMap
),
headers
);
String
accessToken
=
getA
ppA
ccessToken
(
restTemplate
);
String
accessToken
=
getAccessToken
(
restTemplate
);
ResponseEntity
<
String
>
responseEntity
=
restTemplate
.
postForEntity
(
String
.
format
(
SecurityConstants
.
WX_SEND_MESSAGE
,
accessToken
),
requestEntity
,
String
.
class
);
ResponseEntity
<
String
>
responseEntity
=
restTemplate
.
postForEntity
(
String
.
format
(
SecurityConstants
.
WX_SEND_MESSAGE
,
accessToken
),
requestEntity
,
String
.
class
);
log
.
info
(
"发企业微信===返回:{}"
,
JSON
.
toJSONString
(
responseEntity
));
log
.
info
(
"发企业微信===返回:{}"
,
JSON
.
toJSONString
(
responseEntity
));
JSONObject
jsonObject
=
JSON
.
parseObject
(
JSON
.
toJSONString
(
responseEntity
));
JSONObject
jsonObject
=
JSON
.
parseObject
(
JSON
.
toJSONString
(
responseEntity
));
...
@@ -182,6 +146,7 @@ public class WxConfig {
...
@@ -182,6 +146,7 @@ public class WxConfig {
}
}
return
true
;
return
true
;
}
}
/**
/**
* 功能描述: 获取微信accos_token
* 功能描述: 获取微信accos_token
* @Author: huyc
* @Author: huyc
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java
View file @
2f98d330
...
@@ -4,6 +4,7 @@ import com.alibaba.excel.EasyExcel;
...
@@ -4,6 +4,7 @@ import com.alibaba.excel.EasyExcel;
import
com.alibaba.excel.ExcelWriter
;
import
com.alibaba.excel.ExcelWriter
;
import
com.alibaba.excel.write.metadata.WriteSheet
;
import
com.alibaba.excel.write.metadata.WriteSheet
;
import
com.baomidou.lock.annotation.Lock4j
;
import
com.baomidou.lock.annotation.Lock4j
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
...
@@ -163,21 +164,6 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
...
@@ -163,21 +164,6 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
String
applyNo
=
getCode
();
String
applyNo
=
getCode
();
//获取明细当日最大申请编号
//获取明细当日最大申请编号
String
applyDetail
=
baseMapper
.
getMaxInusuranceDetailCode
();
String
applyDetail
=
baseMapper
.
getMaxInusuranceDetailCode
();
//申请人是否属于子分公司和该项目是否有审批通过记录赋值
if
(
Common
.
isNotNull
(
tInsuranceUnpurchaseApply
.
getDeptNo
()))
{
List
<
String
>
deptList
=
CommonConstants
.
deptList
;
tInsuranceUnpurchaseApply
.
setCompanyFlag
(
deptList
.
stream
().
noneMatch
(
e
->
e
.
equals
(
user
.
getDeptName
()))
?
CommonConstants
.
ZERO_STRING
:
CommonConstants
.
ONE_STRING
);
if
(
CommonConstants
.
ONE_STRING
.
equals
(
tInsuranceUnpurchaseApply
.
getReasonType
()))
{
long
count
=
baseMapper
.
selectCount
(
Wrappers
.<
TInsuranceUnpurchaseApply
>
query
().
lambda
()
.
eq
(
TInsuranceUnpurchaseApply:
:
getDeptNo
,
tInsuranceUnpurchaseApply
.
getDeptNo
())
.
eq
(
TInsuranceUnpurchaseApply:
:
getReasonType
,
tInsuranceUnpurchaseApply
.
getReasonType
())
.
eq
(
TInsuranceUnpurchaseApply:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
tInsuranceUnpurchaseApply
.
setAuditFlag
(
count
>
0
?
CommonConstants
.
ZERO_STRING
:
CommonConstants
.
ONE_STRING
);
tInsuranceUnpurchaseApply
.
setStatus
(
count
>
0
?
CommonConstants
.
THREE_STRING
:
tInsuranceUnpurchaseApply
.
getStatus
());
}
}
//暂存不做校验
//暂存不做校验
if
(
CommonConstants
.
ONE_STRING
.
equals
(
tInsuranceUnpurchaseApply
.
getSaveFlag
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
tInsuranceUnpurchaseApply
.
getSaveFlag
()))
{
tInsuranceUnpurchaseApply
.
setCreateTime
(
null
);
tInsuranceUnpurchaseApply
.
setCreateTime
(
null
);
...
@@ -219,10 +205,15 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
...
@@ -219,10 +205,15 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
List
<
TInsuranceUnpurchasePersonAddVo
>
personList
=
addAndUpdCheck
(
tInsuranceUnpurchaseApply
);
List
<
TInsuranceUnpurchasePersonAddVo
>
personList
=
addAndUpdCheck
(
tInsuranceUnpurchaseApply
);
if
(
Common
.
isNotNull
(
personList
)
&&
!
personList
.
isEmpty
()
&&
if
(
Common
.
isNotNull
(
personList
)
&&
!
personList
.
isEmpty
()
&&
personList
.
stream
().
noneMatch
(
e
->
CommonConstants
.
ONE_STRING
.
equals
(
e
.
getCode
())))
{
personList
.
stream
().
noneMatch
(
e
->
CommonConstants
.
ONE_STRING
.
equals
(
e
.
getCode
())))
{
tInsuranceUnpurchaseApply
.
setUnbuyNum
(
String
.
valueOf
(
personList
.
size
()));
//申请人是否属于子分公司和该项目是否有审批通过记录赋值
setValue
(
tInsuranceUnpurchaseApply
,
user
);
if
(
Common
.
isNotNull
(
tInsuranceUnpurchaseApply
.
getId
()))
{
if
(
Common
.
isNotNull
(
tInsuranceUnpurchaseApply
.
getId
()))
{
//同倩倩确认申请时间实时更新
//同倩倩确认申请时间实时更新
tInsuranceUnpurchaseApply
.
setCreateTime
(
LocalDateTime
.
now
());
tInsuranceUnpurchaseApply
.
setCreateTime
(
LocalDateTime
.
now
());
baseMapper
.
updateById
(
tInsuranceUnpurchaseApply
);
baseMapper
.
updateById
(
tInsuranceUnpurchaseApply
);
//更新附件
updateFileId
(
tInsuranceUnpurchaseApply
);
//先删除明细表数据再重新生成
//先删除明细表数据再重新生成
personService
.
remove
(
Wrappers
.<
TInsuranceUnpurchasePerson
>
lambdaQuery
()
personService
.
remove
(
Wrappers
.<
TInsuranceUnpurchasePerson
>
lambdaQuery
()
.
eq
(
TInsuranceUnpurchasePerson:
:
getParnetId
,
tInsuranceUnpurchaseApply
.
getId
()));
.
eq
(
TInsuranceUnpurchasePerson:
:
getParnetId
,
tInsuranceUnpurchaseApply
.
getId
()));
...
@@ -354,6 +345,24 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
...
@@ -354,6 +345,24 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
return
personList
;
return
personList
;
}
}
//申请人是否属于子分公司和该项目是否有审批通过记录赋值
private
void
setValue
(
TInsuranceUnpurchaseApply
tInsuranceUnpurchaseApply
,
YifuUser
user
)
{
if
(
Common
.
isNotNull
(
tInsuranceUnpurchaseApply
.
getDeptNo
()))
{
List
<
String
>
deptList
=
CommonConstants
.
deptList
;
tInsuranceUnpurchaseApply
.
setCompanyFlag
(
deptList
.
stream
().
noneMatch
(
e
->
e
.
equals
(
user
.
getDeptName
()))
?
CommonConstants
.
ZERO_STRING
:
CommonConstants
.
ONE_STRING
);
if
(
CommonConstants
.
ONE_STRING
.
equals
(
tInsuranceUnpurchaseApply
.
getReasonType
()))
{
long
count
=
baseMapper
.
selectCount
(
Wrappers
.<
TInsuranceUnpurchaseApply
>
query
().
lambda
()
.
eq
(
TInsuranceUnpurchaseApply:
:
getDeptNo
,
tInsuranceUnpurchaseApply
.
getDeptNo
())
.
eq
(
TInsuranceUnpurchaseApply:
:
getReasonType
,
tInsuranceUnpurchaseApply
.
getReasonType
())
.
eq
(
TInsuranceUnpurchaseApply:
:
getStatus
,
CommonConstants
.
THREE_STRING
)
.
eq
(
TInsuranceUnpurchaseApply:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
tInsuranceUnpurchaseApply
.
setAuditFlag
(
count
>
0
?
CommonConstants
.
ZERO_STRING
:
CommonConstants
.
ONE_STRING
);
tInsuranceUnpurchaseApply
.
setStatus
(
count
>
0
?
CommonConstants
.
THREE_STRING
:
tInsuranceUnpurchaseApply
.
getStatus
());
}
}
}
private
void
initValue
(
TInsuranceUnpurchaseApply
tInsuranceUnpurchaseApply
,
TInsuranceUnpurchasePerson
person
)
{
private
void
initValue
(
TInsuranceUnpurchaseApply
tInsuranceUnpurchaseApply
,
TInsuranceUnpurchasePerson
person
)
{
person
.
setParnetId
(
tInsuranceUnpurchaseApply
.
getId
());
person
.
setParnetId
(
tInsuranceUnpurchaseApply
.
getId
());
person
.
setApplyNo
(
tInsuranceUnpurchaseApply
.
getApplyNo
());
person
.
setApplyNo
(
tInsuranceUnpurchaseApply
.
getApplyNo
());
...
@@ -373,6 +382,10 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
...
@@ -373,6 +382,10 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
private
void
updateFileId
(
TInsuranceUnpurchaseApply
tInsuranceUnpurchaseApply
)
{
private
void
updateFileId
(
TInsuranceUnpurchaseApply
tInsuranceUnpurchaseApply
)
{
if
(
Common
.
isNotNull
(
tInsuranceUnpurchaseApply
.
getAttaIdList
()))
{
if
(
Common
.
isNotNull
(
tInsuranceUnpurchaseApply
.
getAttaIdList
()))
{
LambdaUpdateWrapper
<
TSalaryAtta
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TSalaryAtta:
:
getLinkId
,
tInsuranceUnpurchaseApply
.
getId
())
.
set
(
TSalaryAtta:
:
getLinkId
,
CommonConstants
.
EMPTY_STRING
);
tSalaryAttaService
.
update
(
updateWrapper
);
TSalaryAtta
atta
;
TSalaryAtta
atta
;
for
(
String
id
:
tInsuranceUnpurchaseApply
.
getAttaIdList
())
{
for
(
String
id
:
tInsuranceUnpurchaseApply
.
getAttaIdList
())
{
atta
=
tSalaryAttaService
.
getById
(
id
);
atta
=
tSalaryAttaService
.
getById
(
id
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/process/TInsuranceUnpurchaseApplyAuditProcess.java
View file @
2f98d330
...
@@ -210,7 +210,7 @@ public class TInsuranceUnpurchaseApplyAuditProcess extends AbastractAuditProcess
...
@@ -210,7 +210,7 @@ public class TInsuranceUnpurchaseApplyAuditProcess extends AbastractAuditProcess
Map
<
String
,
Object
>
textcard
=
new
HashMap
<>();
Map
<
String
,
Object
>
textcard
=
new
HashMap
<>();
authUrl
=
String
.
format
(
SecurityConstants
.
WX_GET_MESSAGE_AUTH_URL
,
wxConfig
.
getCorpid
(),
wxConfig
.
getAuthUrl
()
,
"01"
+
insuranceUnpurchaseApply
.
getId
());
authUrl
=
String
.
format
(
SecurityConstants
.
WX_GET_MESSAGE_AUTH_URL
,
wxConfig
.
getCorpid
(),
"https://test-wx.worfu.com/auth/oauth/wxLogin"
,
"01"
+
insuranceUnpurchaseApply
.
getId
());
textcard
.
put
(
"title"
,
"含风险项目不购买商险申请"
);
textcard
.
put
(
"title"
,
"含风险项目不购买商险申请"
);
textcard
.
put
(
"url"
,
authUrl
);
textcard
.
put
(
"url"
,
authUrl
);
...
@@ -228,7 +228,12 @@ public class TInsuranceUnpurchaseApplyAuditProcess extends AbastractAuditProcess
...
@@ -228,7 +228,12 @@ public class TInsuranceUnpurchaseApplyAuditProcess extends AbastractAuditProcess
reasonTypeMap
.
put
(
"1"
,
"已购买社保"
);
reasonTypeMap
.
put
(
"1"
,
"已购买社保"
);
reasonTypeMap
.
put
(
"2"
,
"人员已离职"
);
reasonTypeMap
.
put
(
"2"
,
"人员已离职"
);
description
.
append
(
"不购买原因:"
).
append
(
reasonTypeMap
.
get
(
insuranceUnpurchaseApply
.
getReasonType
())).
append
(
"<br>"
);
description
.
append
(
"不购买原因:"
).
append
(
reasonTypeMap
.
get
(
insuranceUnpurchaseApply
.
getReasonType
())).
append
(
"<br>"
);
description
.
append
(
"不购买人数:"
).
append
(
insuranceUnpurchaseApply
.
getUnbuyNum
()).
append
(
"<br>"
);
String
unbuyNum
=
CommonConstants
.
ZERO_STRING
;
if
(
Common
.
isNotNull
(
insuranceUnpurchaseApply
.
getUnbuyNum
())){
unbuyNum
=
insuranceUnpurchaseApply
.
getUnbuyNum
();
}
description
.
append
(
"不购买人数:"
).
append
(
unbuyNum
).
append
(
"<br>"
);
textcard
.
put
(
"description"
,
description
.
toString
());
textcard
.
put
(
"description"
,
description
.
toString
());
requestMap
.
put
(
"touser"
,
sendUser
);
requestMap
.
put
(
"touser"
,
sendUser
);
...
...
yifu-salary/yifu-salary-biz/src/main/resources/application-dev.yml
View file @
2f98d330
...
@@ -19,8 +19,6 @@ wx:
...
@@ -19,8 +19,6 @@ wx:
corpid
:
wwbcb090af0dfe50e5
corpid
:
wwbcb090af0dfe50e5
corpsecret
:
16kqEL_eU-ARwYyqLgEBWHgxm8gXVnkzv_eJMLy9NpU
corpsecret
:
16kqEL_eU-ARwYyqLgEBWHgxm8gXVnkzv_eJMLy9NpU
agentid
:
1000010
agentid
:
1000010
authUrl
:
https://test-worfu.com/yifu-auth/method/oauth/wxLogin
authUrl
:
https://test-wx.worfu.com/yifu-auth/method/oauth/wxLogin
yifu-salary/yifu-salary-biz/src/main/resources/application-test.yml
View file @
2f98d330
...
@@ -30,5 +30,5 @@ spring:
...
@@ -30,5 +30,5 @@ spring:
wx
:
wx
:
corpid
:
wwbcb090af0dfe50e5
corpid
:
wwbcb090af0dfe50e5
corpsecret
:
16kqEL_eU-ARwYyqLgEBWHgxm8gXVnkzv_eJMLy9NpU
corpsecret
:
16kqEL_eU-ARwYyqLgEBWHgxm8gXVnkzv_eJMLy9NpU
agentid
:
10000
10
agentid
:
10000
09
authUrl
:
https://test-worfu.com/yifu-auth/method/oauth/wxLogin
authUrl
:
https://test-w
x.w
orfu.com/yifu-auth/method/oauth/wxLogin
yifu-salary/yifu-salary-biz/src/main/resources/logback-spring.xml
View file @
2f98d330
...
@@ -93,7 +93,7 @@
...
@@ -93,7 +93,7 @@
</springProfile>
</springProfile>
<springProfile
name=
"test"
>
<springProfile
name=
"test"
>
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root
level=
"
error
"
>
<root
level=
"
debug
"
>
<appender-ref
ref=
"console"
/>
<appender-ref
ref=
"console"
/>
<appender-ref
ref=
"debug"
/>
<appender-ref
ref=
"debug"
/>
<appender-ref
ref=
"error"
/>
<appender-ref
ref=
"error"
/>
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TInsuranceUnpurchaseApplyMapper.xml
View file @
2f98d330
...
@@ -101,6 +101,7 @@
...
@@ -101,6 +101,7 @@
1=1 and a.DELETE_FLAG = '0'
1=1 and a.DELETE_FLAG = '0'
<include
refid=
"tInsuranceUnpurchaseApply_where"
/>
<include
refid=
"tInsuranceUnpurchaseApply_where"
/>
</where>
</where>
order by a.CREATE_TIME desc
</select>
</select>
<!-- tInsuranceUnpurchaseApply简单分页查询 -->
<!-- tInsuranceUnpurchaseApply简单分页查询 -->
...
@@ -136,6 +137,10 @@
...
@@ -136,6 +137,10 @@
a.DELETE_FLAG = '0'
a.DELETE_FLAG = '0'
<include
refid=
"tInsuranceUnpurchaseApply_where"
/>
<include
refid=
"tInsuranceUnpurchaseApply_where"
/>
</where>
</where>
order by a.CREATE_TIME desc
<if
test=
"tInsuranceUnpurchaseApply.limitStart != null"
>
limit #{tInsuranceUnpurchaseApply.limitStart},#{tInsuranceUnpurchaseApply.limitEnd}
</if>
</select>
</select>
<select
id=
"getAuditPage"
resultMap=
"tInsuranceUnpurchaseApplyMap"
>
<select
id=
"getAuditPage"
resultMap=
"tInsuranceUnpurchaseApplyMap"
>
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TInsuranceUnpurchasePersonMapper.xml
View file @
2f98d330
...
@@ -136,6 +136,7 @@
...
@@ -136,6 +136,7 @@
1=1 and STATUS = '3'
1=1 and STATUS = '3'
<include
refid=
"tInsuranceUnpurchasePerson_where"
/>
<include
refid=
"tInsuranceUnpurchasePerson_where"
/>
</where>
</where>
order by a.CREATE_TIME desc
</select>
</select>
<!--tInsuranceUnpurchasePerson导出条数查询-->
<!--tInsuranceUnpurchasePerson导出条数查询-->
...
@@ -170,6 +171,10 @@
...
@@ -170,6 +171,10 @@
1=1 and STATUS = '3'
1=1 and STATUS = '3'
<include
refid=
"tInsuranceUnpurchasePerson_where"
/>
<include
refid=
"tInsuranceUnpurchasePerson_where"
/>
</where>
</where>
order by a.CREATE_TIME desc
<if
test=
"tInsuranceUnpurchasePerson.limitStart != null"
>
limit #{tInsuranceUnpurchasePerson.limitStart},#{tInsuranceUnpurchasePerson.limitEnd}
</if>
</select>
</select>
<select
id=
"getTInsuranceUnpurchasePersonList"
resultType=
"com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonAddVo"
>
<select
id=
"getTInsuranceUnpurchasePersonList"
resultType=
"com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonAddVo"
>
...
...
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