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
c640743e
Commit
c640743e
authored
Aug 24, 2022
by
查济
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-zhaji' into 'develop'
Feature zhaji See merge request fangxinjiang/yifu!182
parents
051f18ff
275fc81d
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
11 additions
and
121 deletions
+11
-121
TInsuranceDetailController.java
...ifu/insurances/controller/TInsuranceDetailController.java
+0
-13
TInsuranceEnclosureController.java
.../insurances/controller/TInsuranceEnclosureController.java
+1
-1
TInsuranceDetailMapper.java
...lus/v1/yifu/insurances/mapper/TInsuranceDetailMapper.java
+0
-9
TInsuranceDetailService.java
...s/v1/yifu/insurances/service/TInsuranceDetailService.java
+0
-9
TInsuranceEkpService.java
...plus/v1/yifu/insurances/service/TInsuranceEkpService.java
+3
-2
TInsuranceDetailServiceImpl.java
.../insurances/service/impl/TInsuranceDetailServiceImpl.java
+0
-25
TInsuranceEkpServiceImpl.java
...ifu/insurances/service/impl/TInsuranceEkpServiceImpl.java
+6
-1
TInsuranceEnclosureServiceImpl.java
...surances/service/impl/TInsuranceEnclosureServiceImpl.java
+1
-1
TInsuranceDetailMapper.xml
...-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml
+0
-60
No files found.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @
c640743e
...
...
@@ -81,19 +81,6 @@ public class TInsuranceDetailController {
return
R
.
ok
(
tInsuranceDetailService
.
getInsuranceHandleListPage
(
page
,
param
));
}
/**
* 投保办理不分页查询
*
* @author licancan
* @param param
* @return {@link R<List<InsuranceListVO>>}
*/
@Operation
(
summary
=
"投保办理不分页查询"
,
description
=
"投保办理不分页查询"
)
@PostMapping
(
"/getInsuranceHandleList"
)
public
R
<
List
<
InsuranceListVO
>>
getInsuranceHandleList
(
@RequestBody
InsuranceListParam
param
)
{
return
R
.
ok
(
tInsuranceDetailService
.
getInsuranceHandleList
(
param
));
}
/**
* 投保分页查询
*
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceEnclosureController.java
View file @
c640743e
...
...
@@ -99,7 +99,7 @@ public class TInsuranceEnclosureController {
**/
@Schema
(
description
=
"商险附件列表分页查询"
)
@SysLog
(
"商险附件列表分页查询"
)
@
Ge
tMapping
(
"/getInsuranceEnclosurePage"
)
@
Pos
tMapping
(
"/getInsuranceEnclosurePage"
)
public
R
getInsuranceEnclosurePage
(
Page
<
InsuranceEnclosureParam
>
page
,
@RequestBody
InsuranceEnclosureParam
param
)
{
return
tInsuranceEnclosureService
.
getInsuranceEnclosurePage
(
page
,
param
);
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceDetailMapper.java
View file @
c640743e
...
...
@@ -48,15 +48,6 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
*/
IPage
<
InsuranceListVO
>
getInsuranceHandleListPage
(
Page
<
InsuranceListVO
>
page
,
@Param
(
"param"
)
InsuranceListParam
param
);
/**
* 投保办理不分页查询
*
* @author licancan
* @param param
* @return {@link List<InsuranceListVO>}
*/
List
<
InsuranceListVO
>
getInsuranceHandleList
(
@Param
(
"param"
)
InsuranceListParam
param
);
/**
* 通过id查询
*
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceDetailService.java
View file @
c640743e
...
...
@@ -69,15 +69,6 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
*/
List
<
InsuranceListVO
>
getInsuranceList
(
InsuranceListParam
param
);
/**
* 投保办理不分页查询
*
* @author licancan
* @param param
* @return {@link List<InsuranceListVO>}
*/
List
<
InsuranceListVO
>
getInsuranceHandleList
(
InsuranceListParam
param
);
/**
* 商险新增
*
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceEkpService.java
View file @
c640743e
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
service
;
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.insurances.entity.TInsuranceEkp
;
/**
...
...
@@ -14,8 +15,8 @@ public interface TInsuranceEkpService extends IService<TInsuranceEkp> {
*
* @author zhaji
* @param
* @return {@link
Object
}
* @return {@link
R
}
*/
Object
resend
();
R
resend
();
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java
View file @
c640743e
...
...
@@ -256,31 +256,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return
insuranceList
;
}
/**
* 投保办理不分页查询
*
* @param param
* @return {@link List<InsuranceListVO>}
* @author licancan
*/
@Override
public
List
<
InsuranceListVO
>
getInsuranceHandleList
(
InsuranceListParam
param
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
String
regionSQL
=
getRegionSQL
(
user
);
param
.
setRegionSql
(
regionSQL
);
//todo 根据登录人获取数据权限
List
<
InsuranceListVO
>
insuranceList
=
baseMapper
.
getInsuranceHandleList
(
param
);
//根据项目编码获取项目名称
setProjectNameByDeptNo
(
insuranceList
);
// 购买月数
if
(
CollectionUtils
.
isNotEmpty
(
insuranceList
)){
insuranceList
.
stream
().
forEach
(
e
->{
e
.
setBuyMonth
(
LocalDateUtil
.
betweenMonth
(
e
.
getPolicyStart
().
toString
(),
e
.
getPolicyEnd
().
toString
()));
});
}
return
insuranceList
;
}
/**
* 商险新增
*
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceEkpServiceImpl.java
View file @
c640743e
...
...
@@ -23,7 +23,7 @@ import java.util.List;
public
class
TInsuranceEkpServiceImpl
extends
ServiceImpl
<
TInsuranceEkpMapper
,
TInsuranceEkp
>
implements
TInsuranceEkpService
{
@Override
public
Object
resend
()
{
public
R
resend
()
{
LambdaQueryWrapper
<
TInsuranceEkp
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
queryWrapper
.
eq
(
TInsuranceEkp
::
getResendFlag
,
CommonConstants
.
ZERO_INT
);
queryWrapper
.
orderByDesc
(
TInsuranceEkp:
:
getDetailId
);
...
...
@@ -35,6 +35,11 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
BeanCopyUtils
.
copyProperties
(
tInsuranceEkp
,
ekpParam
);
String
detailId
=
ekpParam
.
getDetailId
();
String
defaultSettleId
=
ekpParam
.
getDefaultSettleId
();
//查询当前结算状态
String
status
=
CommonConstants
.
ONE_STRING
;
if
(
status
.
equals
(
CommonConstants
.
ONE_STRING
)){
}
}
return
R
.
ok
(
"发送成功"
);
}
else
{
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceEnclosureServiceImpl.java
View file @
c640743e
...
...
@@ -50,8 +50,8 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
*/
@Override
public
R
uploadInsuranceEnclosure
(
MultipartFile
file
,
String
filePath
,
String
remark
)
throws
IOException
{
String
enclosureName
=
file
.
getOriginalFilename
().
substring
(
0
,
file
.
getOriginalFilename
().
lastIndexOf
(
"."
));
String
fileName
=
System
.
currentTimeMillis
()
+
"_"
+
file
.
getOriginalFilename
();
String
enclosureName
=
fileName
.
substring
(
0
,
fileName
.
lastIndexOf
(
"."
));
//filePath不传默认存储空间的根目录
//jpg,jpeg,png,bmp
String
key
=
""
;
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml
View file @
c640743e
...
...
@@ -254,66 +254,6 @@
ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
</select>
<!--投保办理不分页查询-->
<select
id=
"getInsuranceHandleList"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO"
>
select detail.id as id,
detail.EMP_NAME as empName,
detail.EMP_IDCARD_NO as empIdcardNo,
detail.BUY_TYPE as buyType,
detail.POST as post,
detail.DEPT_NO as deptNo,
detail.POLICY_START as policyStart,
detail.POLICY_END as policyEnd,
detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
detail.INSURANCE_TYPE_NAME as insuranceTypeName,
detail.BUY_STANDARD as buyStandard,
detail.CREATE_NAME as createName,
detail.BUY_HANDLE_STATUS as buyHandleStatus,
detail.SETTLE_TYPE as settleType,
detail.SETTLE_MONTH as settleMonth
from t_insurance_detail detail
where detail.DELETE_FLAG = 0
<if
test=
"param.deptNo != null and param.deptNo.trim() != ''"
>
and detail.DEPT_NO = #{param.deptNo}
</if>
<if
test=
"param.deptNo == null or param.deptNo.trim() == ''"
>
and detail.DEPT_NO in
<foreach
collection=
"param.deptNoList"
index=
"index"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
<if
test=
"param.buyHandleStatus != null"
>
and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
</if>
<if
test=
"param.empName != null and param.empName.trim() != ''"
>
and detail.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
</if>
<if
test=
"param.empIdcardNo != null and param.empIdcardNo.trim() != ''"
>
and detail.EMP_IDCARD_NO like concat('%',replace(replace(#{param.empIdcardNo},'_','\_'),'%','\%'),'%')
</if>
<if
test=
"param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''"
>
and detail.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
</if>
<if
test=
"param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''"
>
and detail.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
</if>
<if
test=
"param.buyHandleStatusList != null and param.buyHandleStatusList.size > 0"
>
and detail.BUY_HANDLE_STATUS in
<foreach
collection=
"param.buyHandleStatusList"
index=
"index"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
<if
test=
"param.buyType != null"
>
and detail.BUY_TYPE = #{param.buyType}
</if>
<if
test=
"param.createName != null and param.createName.trim() != ''"
>
and detail.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
</if>
<if
test=
"param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''"
>
and detail.CREATE_TIME
<![CDATA[ >= ]]>
concat(#{param.startDate}, ' 00:00:00') and detail.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.endDate}, ' 23:59:59')
</if>
ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
</select>
<select
id=
"getInsuranceDetailById"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceDetailVO"
>
select
detail.id as id,
...
...
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