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
6315c89b
Commit
6315c89b
authored
Jan 16, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.5' into MVP1.7.5
parents
58e5629f
3b28938c
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
40 additions
and
20 deletions
+40
-20
WxLoginAuthenticationFilter.java
...plus/v1/yifu/auth/filter/WxLoginAuthenticationFilter.java
+1
-1
SecurityConstants.java
.../plus/v1/yifu/common/core/constant/SecurityConstants.java
+3
-2
ProcessDaprUtils.java
...cloud/plus/v1/yifu/common/dapr/util/ProcessDaprUtils.java
+1
-0
TNodeRoute.java
...om/yifu/cloud/plus/v1/yifu/process/entity/TNodeRoute.java
+2
-0
TProcessController.java
...d/plus/v1/yifu/process/controller/TProcessController.java
+4
-2
TAuditNodeProcess.java
...u/cloud/plus/v1/yifu/salary/entity/TAuditNodeProcess.java
+0
-3
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+16
-6
TInsuranceUnpurchaseApplyAuditProcess.java
...e/impl/process/TInsuranceUnpurchaseApplyAuditProcess.java
+7
-2
application-dev.yml
...ry/yifu-salary-biz/src/main/resources/application-dev.yml
+5
-3
application-test.yml
...y/yifu-salary-biz/src/main/resources/application-test.yml
+1
-1
No files found.
yifu-auth/src/main/java/com/yifu/cloud/plus/v1/yifu/auth/filter/WxLoginAuthenticationFilter.java
View file @
6315c89b
...
...
@@ -32,7 +32,7 @@ public class WxLoginAuthenticationFilter extends AbstractAuthenticationProcessin
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
();
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/SecurityConstants.java
View file @
6315c89b
...
...
@@ -147,8 +147,9 @@ public interface SecurityConstants {
* @Description: 企业微信发送消息授权路径
* @return:
* 下面链接中的state参数是和前端进行交互区分的重要参数,如果新增,请不要和以前的前缀相同
* 1,2,3,4 前缀为合同审批待处理、抄送和垫付审批中的待处理、抄送。 5 前缀为突发事件待处理页面的标识
* 1=垫付审批待处理,2=垫付审批抄送,3=合同审批待处理,4=合同审批抄送,5=事件审批待处理
* 第一位标识消息类型:0审批,1抄送
* 第二位标识实体标识:1不购买商险申请
* 01 : 不购买商险申请审批
**/
String
WX_GET_MESSAGE_AUTH_URL
=
"https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=snsapi_base&state=%s#wechat_redirect"
;
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ProcessDaprUtils.java
View file @
6315c89b
...
...
@@ -29,6 +29,7 @@ public class ProcessDaprUtils {
* @since mvp1.7.5
**/
public
R
<
ProcessVo
>
getProcessVoByType
(
String
processType
)
{
log
.
error
(
"流程类型>>processType>>{}"
,
processType
);
R
<
ProcessVo
>
processVoR
=
HttpDaprUtil
.
invokeMethodPost
(
daprProcessProperties
.
getAppUrl
(),
daprProcessProperties
.
getAppId
(),
"/tprocess/inner/getProcessVoByType"
,
processType
,
ProcessVo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
Common
.
isEmpty
(
processVoR
)){
return
R
.
failed
(
"根据流程类型查询ProcessVo失败!"
);
...
...
yifu-common/yifu-common-process/src/main/java/com/yifu/cloud/plus/v1/yifu/process/entity/TNodeRoute.java
View file @
6315c89b
...
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
...
...
@@ -68,6 +69,7 @@ public class TNodeRoute extends Model<TNodeRoute> {
private
String
createUser
;
@Schema
(
description
=
"创建时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
createDate
;
@Length
(
max
=
255
,
message
=
"更新人不能超过255个字符"
)
...
...
yifu-process/yifu-process-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/process/controller/TProcessController.java
View file @
6315c89b
...
...
@@ -17,6 +17,7 @@ import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.web.bind.annotation.*
;
import
javax.annotation.Resource
;
...
...
@@ -33,6 +34,7 @@ import java.time.LocalDateTime;
@RequiredArgsConstructor
@RequestMapping
(
"/tprocess"
)
@Tag
(
name
=
"主流程表"
)
@Log4j2
public
class
TProcessController
{
@Resource
...
...
@@ -96,7 +98,7 @@ public class TProcessController {
**/
@PostMapping
(
"/inner/getProcessVoByType"
)
@Inner
public
ProcessVo
getProcessVoByType
(
String
processType
)
{
public
ProcessVo
getProcessVoByType
(
@RequestBody
String
processType
)
{
return
tProcessService
.
getProcessVoByType
(
processType
);
}
...
...
@@ -108,7 +110,7 @@ public class TProcessController {
**/
@PostMapping
(
"/inner/getProcessVoByProcessId"
)
@Inner
public
ProcessVo
getProcessVoByProcessId
(
String
processId
)
{
public
ProcessVo
getProcessVoByProcessId
(
@RequestBody
String
processId
)
{
return
tProcessService
.
getProcessVoById
(
processId
);
}
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TAuditNodeProcess.java
View file @
6315c89b
...
...
@@ -45,9 +45,6 @@ public class TAuditNodeProcess extends BaseEntity {
@Schema
(
description
=
"节点类型"
)
private
String
nodeType
;
@Schema
(
description
=
"创建时间"
)
private
LocalDateTime
createTime
;
@Length
(
max
=
32
,
message
=
"实体id不能超过32个字符"
)
@Schema
(
description
=
"实体id"
)
private
String
domainId
;
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
6315c89b
...
...
@@ -1180,27 +1180,37 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
if
(!
updatePerSonSalaryList
.
isEmpty
())
{
tInsuranceUnpurchasePersonSalaryService
.
saveBatch
(
updatePerSonSalaryList
);
}
s
.
setIsCheckRisk
(
CommonConstants
.
ONE_INT
);
this
.
updateById
(
s
);
return
R
.
ok
();
return
getTrueR
(
s
,
"校验通过"
);
}
else
{
return
new
R
<>(
CommonConstants
.
TWO_INT
,
"校验商险不通过!"
,
returnList
);
}
}
else
{
return
R
.
ok
(
null
,
"均已购买商险"
);
return
getTrueR
(
s
,
"均已购买商险"
);
}
}
}
else
{
return
R
.
ok
(
null
,
"没有报账明细,无需拦截"
);
return
getTrueR
(
s
,
"没有报账明细,无需拦截"
);
}
}
else
{
return
R
.
ok
(
null
,
"项目不含风险 或 无商险"
);
return
getTrueR
(
s
,
"项目不含风险 或 无商险"
);
}
}
else
{
return
R
.
failed
(
"获取项目信息失败,请联管理员!"
);
}
}
/**
* @Description: 校验通过的返回
* @Author: hgw
* @Date: 2025/1/16 11:16
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskVo>>
**/
private
R
<
List
<
SalaryRiskVo
>>
getTrueR
(
TSalaryStandard
s
,
String
msg
)
{
s
.
setIsCheckRisk
(
CommonConstants
.
ONE_INT
);
this
.
updateById
(
s
);
return
R
.
ok
(
null
,
msg
);
}
/**
* @Description: 设置增加 不购买商险的相关信息
* @Author: hgw
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/process/TInsuranceUnpurchaseApplyAuditProcess.java
View file @
6315c89b
...
...
@@ -210,7 +210,7 @@ public class TInsuranceUnpurchaseApplyAuditProcess extends AbastractAuditProcess
Map
<
String
,
Object
>
textcard
=
new
HashMap
<>();
authUrl
=
String
.
format
(
SecurityConstants
.
WX_GET_MESSAGE_AUTH_URL
,
wxConfig
.
getCorpid
(),
wxConfig
.
getAuthUrl
(),
CommonConstants
.
SIX_STRING
+
insuranceUnpurchaseApply
.
getId
());
authUrl
=
String
.
format
(
SecurityConstants
.
WX_GET_MESSAGE_AUTH_URL
,
wxConfig
.
getCorpid
(),
wxConfig
.
getAuthUrl
(),
"01"
+
insuranceUnpurchaseApply
.
getId
());
textcard
.
put
(
"title"
,
"含风险项目不购买商险申请"
);
textcard
.
put
(
"url"
,
authUrl
);
...
...
@@ -228,7 +228,12 @@ public class TInsuranceUnpurchaseApplyAuditProcess extends AbastractAuditProcess
reasonTypeMap
.
put
(
"1"
,
"已购买社保"
);
reasonTypeMap
.
put
(
"2"
,
"人员已离职"
);
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
());
requestMap
.
put
(
"touser"
,
sendUser
);
...
...
yifu-salary/yifu-salary-biz/src/main/resources/application-dev.yml
View file @
6315c89b
...
...
@@ -15,8 +15,10 @@ spring:
username
:
root
password
:
yf_zsk
url
:
jdbc:mysql://192.168.1.65:43306/mvp_salary?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
wx
:
corpid
:
wwbcb090af0dfe50e5
corpsecret
:
16kqEL_eU-ARwYyqLgEBWHgxm8gXVnkzv_eJMLy9NpU
agentid
:
1000010
authUrl
:
https://test-wx.worfu.com/yifu-auth/method/oauth/wxLogin
yifu-salary/yifu-salary-biz/src/main/resources/application-test.yml
View file @
6315c89b
...
...
@@ -31,4 +31,4 @@ wx:
corpid
:
wwbcb090af0dfe50e5
corpsecret
:
16kqEL_eU-ARwYyqLgEBWHgxm8gXVnkzv_eJMLy9NpU
agentid
:
1000010
authUrl
:
https://test-worfu.com/yifu-auth/method/oauth/wxLogin
authUrl
:
https://test-w
x.w
orfu.com/yifu-auth/method/oauth/wxLogin
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