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
618ebc2a
Commit
618ebc2a
authored
Feb 23, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.1' into MVP1.5.1
parents
6ad2fff0
39cbb9d3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
9 deletions
+19
-9
InsuranceDetailVO.java
...u/cloud/plus/v1/yifu/insurances/vo/InsuranceDetailVO.java
+12
-0
TInsuranceDetailController.java
...ifu/insurances/controller/TInsuranceDetailController.java
+0
-1
TInsurancesWarnController.java
...yifu/insurances/controller/TInsurancesWarnController.java
+1
-1
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+6
-7
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceDetailVO.java
View file @
618ebc2a
...
@@ -394,4 +394,16 @@ public class InsuranceDetailVO implements Serializable {
...
@@ -394,4 +394,16 @@ public class InsuranceDetailVO implements Serializable {
*/
*/
@Schema
(
description
=
"操作记录列表"
)
@Schema
(
description
=
"操作记录列表"
)
List
<
TBusinessOperate
>
operateList
;
List
<
TBusinessOperate
>
operateList
;
/**
* 忽略提醒 0:忽略 1:不忽略
*/
@Schema
(
description
=
"有忽略提醒 0:忽略 1:不忽略"
)
private
String
expireIgnoreFlag
;
/**
* 消息提醒备注
*/
@Schema
(
description
=
"消息提醒备注"
)
private
String
expireRemark
;
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @
618ebc2a
...
@@ -17,7 +17,6 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptVo;
...
@@ -17,7 +17,6 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptVo;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
org.apache.commons.lang3.RandomStringUtils
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsurancesWarnController.java
View file @
618ebc2a
...
@@ -106,7 +106,7 @@ public class TInsurancesWarnController {
...
@@ -106,7 +106,7 @@ public class TInsurancesWarnController {
@SysLog
(
"到期提醒批量忽略"
)
@SysLog
(
"到期提醒批量忽略"
)
@PutMapping
(
"/batchexpireIgnore"
)
@PutMapping
(
"/batchexpireIgnore"
)
@PreAuthorize
(
"@pms.hasPermission('wxhr:insurance_expireignore')"
)
@PreAuthorize
(
"@pms.hasPermission('wxhr:insurance_expireignore')"
)
public
R
<
Object
>
batchexpireIgnore
(
@Request
Param
(
"ids"
)
String
ids
)
{
public
R
<
Object
>
batchexpireIgnore
(
@Request
Body
String
ids
)
{
return
insuranceDetailService
.
batchexpireIgnore
(
ids
);
return
insuranceDetailService
.
batchexpireIgnore
(
ids
);
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
618ebc2a
...
@@ -355,7 +355,9 @@
...
@@ -355,7 +355,9 @@
a.BILLING_TYPE as billingType,
a.BILLING_TYPE as billingType,
a.DEFAULT_SETTLE_ID as defaultSettleId,
a.DEFAULT_SETTLE_ID as defaultSettleId,
a.RATE as rate,
a.RATE as rate,
a.REFUND_ID as refundId
a.REFUND_ID as refundId,
a.EXPIRE_REMARK,
a.EXPIRE_IGNORE_FLAG
from t_insurance_detail a
from t_insurance_detail a
left join t_insurance_settle tis on a.DEFAULT_SETTLE_ID = tis.ID
left join t_insurance_settle tis on a.DEFAULT_SETTLE_ID = tis.ID
where a.ID = #{id}
where a.ID = #{id}
...
@@ -1720,17 +1722,14 @@
...
@@ -1720,17 +1722,14 @@
order by a.CREATE_TIME desc
order by a.CREATE_TIME desc
</select>
</select>
<update
id=
"batchexpireIgnore"
>
<update
id=
"batchexpireIgnore"
>
update t_insurance_detail a
set a.EXPIRE_IGNORE_FLAG = '0'
where
<if
test=
"idList != null and idList.size() > 0"
>
<if
test=
"idList != null and idList.size() > 0"
>
update t_insurance_detail a
set a.EXPIRE_IGNORE_FLAG = '0'
where
a.id in
a.id in
<foreach
collection=
"idList"
item=
"param"
index=
"index"
open=
"("
close=
")"
separator=
","
>
<foreach
collection=
"idList"
item=
"param"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{param}
#{param}
</foreach>
</foreach>
</if>
</if>
<if
test=
"idList == null or idList.size() = 0"
>
1=2
</if>
</update>
</update>
</mapper>
</mapper>
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