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
93fea044
Commit
93fea044
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
7102bb74
d549434f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
74 deletions
+26
-74
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+4
-2
TSalaryStandard.java
...ifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java
+8
-0
TInsuranceUnpurchaseApplyController.java
...alary/controller/TInsuranceUnpurchaseApplyController.java
+6
-63
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+5
-4
application.yml
...salary/yifu-salary-biz/src/main/resources/application.yml
+0
-4
TSalaryStandardMapper.xml
...y-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
+3
-1
No files found.
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
93fea044
...
...
@@ -1477,8 +1477,10 @@
EMP_IDCARD_NO
FROM t_insurance_detail d
where DELETE_FLAG = 0
and (d.BUY_HANDLE_STATUS in (1,2) or (d.BUY_HANDLE_STATUS = 3 and d.IS_EFFECT = 0))
and d.POLICY_EFFECT
<![CDATA[ <= ]]>
NOW() and d.POLICY_END >= NOW()
and (d.BUY_HANDLE_STATUS in (1,2) or (d.BUY_HANDLE_STATUS = 3 and d.IS_EFFECT = 0
and d.POLICY_EFFECT
<![CDATA[ <= ]]>
NOW() and d.POLICY_END >= NOW()
))
<if
test=
"idCardList != null and idCardList.size > 0"
>
AND EMP_IDCARD_NO in
<foreach
item=
"item"
index=
"index"
collection=
"idCardList"
open=
"("
separator=
","
close=
")"
>
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java
View file @
93fea044
...
...
@@ -506,6 +506,14 @@ public class TSalaryStandard extends BaseEntity {
@ExcelProperty
(
"是否校验商险"
)
private
Integer
isCheckRisk
;
/**
* 校验商险通过的原因
*/
@ExcelAttribute
(
name
=
"校验商险通过的原因"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"校验商险通过的原因"
)
private
String
checkRiskRemark
;
/**
* 工资月份-起
*/
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TInsuranceUnpurchaseApplyController.java
View file @
93fea044
...
...
@@ -145,23 +145,6 @@ public class TInsuranceUnpurchaseApplyController {
return
R
.
ok
(
tInsuranceUnpurchaseApplyService
.
getAuditPage
(
page
,
unpurchaseApplySearchVo
,
userId
,
type
));
}
/**
* 审核分页查询(小程序)
*
* @param page 分页对象
* @param unpurchaseApplySearchVo 不购买申请查询信息
* @param type 0待审核、1已处理、2抄送我
*
* @return R
*/
@Operation
(
description
=
"审核分页查询(小程序临时)"
)
@GetMapping
(
"/getAuditPageTemp"
)
public
R
<
IPage
<
TInsuranceUnpurchaseApply
>>
getAuditPageTemp
(
Page
<
TInsuranceUnpurchaseApply
>
page
,
TInsuranceUnpurchaseApplySearchVo
unpurchaseApplySearchVo
,
String
type
,
String
userId
)
{
return
R
.
ok
(
tInsuranceUnpurchaseApplyService
.
getAuditPage
(
page
,
unpurchaseApplySearchVo
,
userId
,
type
));
}
/**
* 审核数量
*
...
...
@@ -169,12 +152,12 @@ public class TInsuranceUnpurchaseApplyController {
*/
@Operation
(
description
=
"审核数量查询"
)
@GetMapping
(
"/getAuditCount"
)
public
R
<
Map
<
String
,
Integer
>>
getAuditCount
(
String
userId
)
{
//
YifuUser user = SecurityUtils.getUser();
//
if(null == user){
//
return R.failed(ResultConstants.NO_USER);
//
}
//
String userId = String.valueOf(user.getId());
public
R
<
Map
<
String
,
Integer
>>
getAuditCount
()
{
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
null
==
user
){
return
R
.
failed
(
ResultConstants
.
NO_USER
);
}
String
userId
=
String
.
valueOf
(
user
.
getId
());
return
R
.
ok
(
tInsuranceUnpurchaseApplyService
.
getAuditCount
(
userId
));
}
...
...
@@ -254,44 +237,4 @@ public class TInsuranceUnpurchaseApplyController {
return
R
.
failed
(
ResultConstants
.
REQUEST_LOCK_FAIL
);
}
/**
* 审核(小程序临时)
* @param tAuditRecord 审批信息
* @return R<String>
**/
@Operation
(
description
=
"审核(小程序临时)"
)
@SysLog
(
"审核(小程序临时)"
)
@PostMapping
(
"/auditTemp"
)
public
R
<
String
>
auditTemp
(
@RequestBody
TAuditRecord
tAuditRecord
)
{
if
(
Common
.
isEmpty
(
tAuditRecord
.
getApprovalResult
()))
{
return
R
.
failed
(
"审核结果不能为空!"
);
}
if
(
Common
.
isNotNull
(
tAuditRecord
.
getApprovalOpinion
())
&&
tAuditRecord
.
getApprovalOpinion
().
length
()>
100
)
{
return
R
.
failed
(
"审核意见不能超过100个字"
);
}
if
(
Common
.
isEmpty
(
tAuditRecord
.
getDomainId
()))
{
return
R
.
failed
(
"id不能为空!"
);
}
// YifuUser user = SecurityUtils.getUser();
// if (Common.isEmpty(user)){
// return R.failed(CommonConstants.USER_FAIL);
// }
TInsuranceUnpurchaseApply
insuranceUnpurchaseApply
=
tInsuranceUnpurchaseApplyService
.
getById
(
tAuditRecord
.
getDomainId
());
if
(
Common
.
isEmpty
(
insuranceUnpurchaseApply
)){
return
R
.
failed
(
"该实体信息不存在!"
);
}
String
requestId
;
String
redisKey
=
CacheConstants
.
INSURANCEUNPURCHASE_PROCESS_CACHE
.
concat
(
tAuditRecord
.
getDomainId
());
try
{
requestId
=
RedisDistributedLock
.
tryLockAndTime
(
redisKey
,
"10"
);
}
catch
(
Exception
e
)
{
return
R
.
failed
(
ResultConstants
.
REQUEST_LOCK_FAIL
);
}
if
(
Common
.
isNotKong
(
requestId
))
{
return
R
.
ok
(
"审核完毕"
);
}
return
R
.
failed
(
ResultConstants
.
REQUEST_LOCK_FAIL
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
93fea044
...
...
@@ -1180,19 +1180,19 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
if
(!
updatePerSonSalaryList
.
isEmpty
())
{
tInsuranceUnpurchasePersonSalaryService
.
saveBatch
(
updatePerSonSalaryList
);
}
return
getTrueR
(
s
,
"校验通过"
);
return
getTrueR
(
s
,
"校验
【商险不购买】
通过"
);
}
else
{
return
new
R
<>(
CommonConstants
.
TWO_INT
,
"校验
商险
不通过!"
,
returnList
);
return
new
R
<>(
CommonConstants
.
TWO_INT
,
"校验
【商险不购买】
不通过!"
,
returnList
);
}
}
else
{
return
getTrueR
(
s
,
"均已购买
商险
"
);
return
getTrueR
(
s
,
"均已购买
【商险】
"
);
}
}
}
else
{
return
getTrueR
(
s
,
"没有报账明细,无需拦截"
);
}
}
else
{
return
getTrueR
(
s
,
"项目不含风险
或
无商险"
);
return
getTrueR
(
s
,
"项目不含风险
或
无商险"
);
}
}
else
{
return
R
.
failed
(
"获取项目信息失败,请联管理员!"
);
...
...
@@ -1207,6 +1207,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
**/
private
R
<
List
<
SalaryRiskVo
>>
getTrueR
(
TSalaryStandard
s
,
String
msg
)
{
s
.
setIsCheckRisk
(
CommonConstants
.
ONE_INT
);
s
.
setCheckRiskRemark
(
msg
);
this
.
updateById
(
s
);
return
R
.
ok
(
null
,
msg
);
}
...
...
yifu-salary/yifu-salary-biz/src/main/resources/application.yml
View file @
93fea044
...
...
@@ -50,10 +50,6 @@ security:
-
/salaryEmployeeSelect/getSalaryAccount
# 工资条查询明细通过openId控制
-
/tsalaryatta/ossUploadFile
# 工资条查询附件上传 无token
-
/tsalaryatta/ossFileDelete/**
# 工资条查询附件上传删除 无token
-
/tinsuranceunpurchaseapply/getAuditPageTemp
# 临时调试
-
/tinsuranceunpurchaseapply/getAuditCount
# 临时调试
-
/tinsuranceunpurchaseapply/auditTemp
# 临时调试
-
/tauditrecord/getAuditInfoByDomainIdAndAuditType
# 临时调试
-
/tinsuranceunpurchaseapply/temp/{id}
# 临时调试
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @
93fea044
...
...
@@ -90,6 +90,7 @@
<result
property=
"newEmpUpdateFlag"
column=
"NEW_EMP_UPDATE_FLAG"
/>
<result
property=
"isFixedColumn"
column=
"IS_FIXED_COLUMN"
/>
<result
property=
"isCheckRisk"
column=
"IS_CHECK_RISK"
/>
<result
property=
"checkRiskRemark"
column=
"CHECK_RISK_REMARK"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
...
...
@@ -157,7 +158,8 @@
a.ORIGINAL_SET_NAME,
a.NEW_EMP_UPDATE_FLAG,
a.IS_FIXED_COLUMN,
a.IS_CHECK_RISK
a.IS_CHECK_RISK,
a.CHECK_RISK_REMARK
</sql>
<sql
id=
"tSalaryStandard_where"
>
<if
test=
"tSalaryStandard != null"
>
...
...
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