Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
43730761
You need to sign in or sign up before continuing.
Commit
43730761
authored
Aug 30, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
7d196336
63d7bff7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
284 additions
and
168 deletions
+284
-168
pom.xml
yifu-common/yifu-common-ekp/pom.xml
+6
-0
EkpSalaryProperties.java
...fu.cloud.plus.v1/yifu/ekp/config/EkpSalaryProperties.java
+12
-0
EKPInsuranceUtil.java
...om/yifu.cloud.plus.v1/yifu/ekp/util/EKPInsuranceUtil.java
+28
-65
EkpConstants.java
...om/yifu/cloud/plus/v1/yifu/ekp/constant/EkpConstants.java
+10
-0
EKPInsurancePushParam.java
...yifu/cloud/plus/v1/yifu/ekp/vo/EKPInsurancePushParam.java
+131
-0
spring.factories
...u-common-ekp/src/main/resources/META-INF/spring.factories
+1
-0
ekpSalaryConfig.properties
...-common-ekp/src/main/resources/ekpSalaryConfig.properties
+8
-0
TInsuranceEkp.java
...u/cloud/plus/v1/yifu/insurances/entity/TInsuranceEkp.java
+3
-0
TInsuranceRefund.java
...loud/plus/v1/yifu/insurances/entity/TInsuranceRefund.java
+6
-0
EKPInteractiveParam.java
...cloud/plus/v1/yifu/insurances/vo/EKPInteractiveParam.java
+5
-0
TInsuranceSettlePushParam.java
...plus/v1/yifu/insurances/vo/TInsuranceSettlePushParam.java
+6
-7
pom.xml
yifu-insurances/yifu-insurances-biz/pom.xml
+6
-0
TInsuranceDetailMapper.java
.../insurances/mapper/insurances/TInsuranceDetailMapper.java
+1
-11
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+37
-27
TInsuranceEkpServiceImpl.java
...nces/service/insurance/impl/TInsuranceEkpServiceImpl.java
+8
-4
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+7
-43
TStatisticsLaborMapper.java
...ud/plus/v1/yifu/salary/mapper/TStatisticsLaborMapper.java
+1
-1
TStatisticsRemunerationMapper.java
.../v1/yifu/salary/mapper/TStatisticsRemunerationMapper.java
+1
-1
TStatisticsLaborServiceImpl.java
...yifu/salary/service/impl/TStatisticsLaborServiceImpl.java
+1
-2
TStatisticsRemunerationServiceImpl.java
...lary/service/impl/TStatisticsRemunerationServiceImpl.java
+1
-2
TStatisticsBonusMapper.xml
...-biz/src/main/resources/mapper/TStatisticsBonusMapper.xml
+1
-1
TStatisticsLaborMapper.xml
...-biz/src/main/resources/mapper/TStatisticsLaborMapper.xml
+2
-2
TStatisticsRemunerationMapper.xml
...c/main/resources/mapper/TStatisticsRemunerationMapper.xml
+2
-2
No files found.
yifu-common/yifu-common-ekp/pom.xml
View file @
43730761
...
@@ -31,5 +31,11 @@
...
@@ -31,5 +31,11 @@
<version>
5.8.0
</version>
<version>
5.8.0
</version>
<scope>
compile
</scope>
<scope>
compile
</scope>
</dependency>
</dependency>
<dependency>
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu-insurances-api
</artifactId>
<version>
1.0.0
</version>
<scope>
compile
</scope>
</dependency>
</dependencies>
</dependencies>
</project>
</project>
yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/config/EkpSalaryProperties.java
View file @
43730761
...
@@ -29,4 +29,16 @@ public class EkpSalaryProperties {
...
@@ -29,4 +29,16 @@ public class EkpSalaryProperties {
String
LoginName
;
String
LoginName
;
String
docSubject
;
String
docSubject
;
String
insuranceUrl
;
String
insuranceFdModelId
;
String
insuranceFdFlowId
;
String
insuranceDocStatus
;
String
insuranceLoginName
;
String
insuranceFocSubject
;
}
}
yifu-
insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/EKP
Util.java
→
yifu-
common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/util/EKPInsurance
Util.java
View file @
43730761
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
util
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
ekp
.
util
;
import
cn.hutool.json.JSONObject
;
import
cn.hutool.json.JSONObject
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.ekp.config.EkpSalaryProperties
;
import
com.yifu.cloud.plus.v1.yifu.ekp.vo.EKPInsurancePushParam
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EKPInteractiveParam
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EKPInteractiveParam
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TInsuranceSettlePushParam
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TInsuranceSettlePushParam
;
import
lombok.Getter
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.b
eans.factory.annotation.Value
;
import
org.springframework.b
oot.context.properties.EnableConfigurationProperties
;
import
org.springframework.http.*
;
import
org.springframework.http.*
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
org.springframework.util.LinkedMultiValueMap
;
import
org.springframework.util.LinkedMultiValueMap
;
import
org.springframework.util.MultiValueMap
;
import
org.springframework.util.MultiValueMap
;
import
org.springframework.web.client.RestTemplate
;
import
org.springframework.web.client.RestTemplate
;
import
javax.annotation.Resource
;
import
java.time.LocalDate
;
import
java.time.LocalDate
;
import
java.time.format.DateTimeFormatter
;
import
java.time.format.DateTimeFormatter
;
...
@@ -26,82 +28,36 @@ import java.time.format.DateTimeFormatter;
...
@@ -26,82 +28,36 @@ import java.time.format.DateTimeFormatter;
* @date 2022-08-05 09:42:33
* @date 2022-08-05 09:42:33
*/
*/
@Slf4j
@Slf4j
@Component
@EnableConfigurationProperties
(
EkpSalaryProperties
.
class
)
public
class
EKPUtil
{
public
class
EKPInsuranceUtil
{
@Getter
public
static
String
url
;
@Getter
public
static
String
LoginName
;
@Getter
private
static
String
fdModelId
;
@Getter
private
static
String
fdFlowId
;
@Getter
private
static
String
docStatus
;
@Getter
private
static
String
docSubject
;
@Value
(
"${ekp.url}"
)
public
void
setUrl
(
String
db
)
{
url
=
db
;
}
@Value
(
"${ekp.LoginName}"
)
public
void
setLoginName
(
String
db
)
{
LoginName
=
db
;
}
@Value
(
"${ekp.fdModelId}"
)
public
void
setFdModelId
(
String
db
)
{
fdModelId
=
db
;
}
@Value
(
"${ekp.fdFlowId}"
)
public
void
setFdFlowId
(
String
db
)
{
fdFlowId
=
db
;
}
@Value
(
"${ekp.docStatus}"
)
public
void
setDocStatus
(
String
db
)
{
docStatus
=
db
;
}
@Value
(
"${ekp.docSubject}"
)
public
void
setDocSubject
(
String
db
)
{
docSubject
=
db
;
}
@Resource
private
EkpSalaryProperties
ekpProperties
;
/**
/**
* 多层级的VO对象,且包含上传功能的样例
* 多层级的VO对象,且包含上传功能的样例
* 注意key的书写格式,类似EL表达式的方式,属性关系用'.', 列表和数组关系用[],Map关系用["xxx"]
* 注意key的书写格式,类似EL表达式的方式,属性关系用'.', 列表和数组关系用[],Map关系用["xxx"]
*/
*/
public
static
String
sendToEKP
(
EKPInteractiveParam
param
){
public
String
sendToEKP
(
EKPInteractiveParam
param
){
log
.
info
(
"推送EKP开始"
);
log
.
info
(
"推送EKP开始"
);
RestTemplate
yourRestTemplate
=
new
RestTemplate
();
RestTemplate
yourRestTemplate
=
new
RestTemplate
();
TInsuranceSettl
ePushParam
pushParam
=
insuranceDetail2PushParam
(
param
);
EKPInsuranc
ePushParam
pushParam
=
insuranceDetail2PushParam
(
param
);
try
{
try
{
String
formValues
=
new
ObjectMapper
().
writeValueAsString
(
pushParam
);
String
formValues
=
new
ObjectMapper
().
writeValueAsString
(
pushParam
);
log
.
info
(
"formValues:"
+
formValues
);
log
.
info
(
"formValues:"
+
formValues
);
//指向EKP的接口url
//指向EKP的接口url
//把ModelingAppModelParameterAddForm转换成MultiValueMap
//把ModelingAppModelParameterAddForm转换成MultiValueMap
JSONObject
loginName
=
new
JSONObject
();
JSONObject
loginName
=
new
JSONObject
();
loginName
.
append
(
"LoginName"
,
LoginName
);
loginName
.
append
(
"LoginName"
,
ekpProperties
.
getInsuranceLoginName
()
);
String
loginData
=
new
ObjectMapper
().
writeValueAsString
(
loginName
);
String
loginData
=
new
ObjectMapper
().
writeValueAsString
(
loginName
);
MultiValueMap
<
String
,
Object
>
wholeForm
=
new
LinkedMultiValueMap
<>();
MultiValueMap
<
String
,
Object
>
wholeForm
=
new
LinkedMultiValueMap
<>();
//wholeForm.add("docSubject", new String(docSubject.getBytes("UTF-8"),"ISO-8859-1") );
//wholeForm.add("docSubject", new String(docSubject.getBytes("UTF-8"),"ISO-8859-1") );
wholeForm
.
add
(
"docSubject"
,
docSubject
);
wholeForm
.
add
(
"docSubject"
,
ekpProperties
.
getInsuranceFocSubject
()
);
wholeForm
.
add
(
"docCreator"
,
"{\"LoginName\":\"admin\"}"
);
wholeForm
.
add
(
"docCreator"
,
"{\"LoginName\":\"admin\"}"
);
//wholeForm.add("docCreator", loginData);
//wholeForm.add("docCreator", loginData);
wholeForm
.
add
(
"docStatus"
,
docStatus
);
wholeForm
.
add
(
"docStatus"
,
ekpProperties
.
getInsuranceDocStatus
()
);
wholeForm
.
add
(
"fdModelId"
,
fdModelId
);
wholeForm
.
add
(
"fdModelId"
,
ekpProperties
.
getInsuranceFdModelId
()
);
wholeForm
.
add
(
"fdFlowId"
,
fdFlowId
);
wholeForm
.
add
(
"fdFlowId"
,
ekpProperties
.
getInsuranceFdFlowId
()
);
//wholeForm.add("formValues", new String(formValues.getBytes("UTF-8"),"ISO-8859-1"));
//wholeForm.add("formValues", new String(formValues.getBytes("UTF-8"),"ISO-8859-1"));
wholeForm
.
add
(
"formValues"
,
formValues
);
wholeForm
.
add
(
"formValues"
,
formValues
);
//wholeForm.add("formValues", new String("{\"fd_3adfe6af71a1cc\":\"王五\", \"fd_3adfe658c6229e\":\"2019-03-26\", \"fd_3adfe6592b4158\":\"这里内容\"}".getBytes("UTF-8"),"ISO-8859-1") );
//wholeForm.add("formValues", new String("{\"fd_3adfe6af71a1cc\":\"王五\", \"fd_3adfe658c6229e\":\"2019-03-26\", \"fd_3adfe6592b4158\":\"这里内容\"}".getBytes("UTF-8"),"ISO-8859-1") );
...
@@ -113,17 +69,18 @@ public class EKPUtil {
...
@@ -113,17 +69,18 @@ public class EKPUtil {
//必须设置上传类型,如果入参是字符串,使用MediaType.TEXT_PLAIN;如果
//必须设置上传类型,如果入参是字符串,使用MediaType.TEXT_PLAIN;如果
HttpEntity
<
MultiValueMap
<
String
,
Object
>>
entity
=
new
HttpEntity
<
MultiValueMap
<
String
,
Object
>>(
wholeForm
,
headers
);
HttpEntity
<
MultiValueMap
<
String
,
Object
>>
entity
=
new
HttpEntity
<
MultiValueMap
<
String
,
Object
>>(
wholeForm
,
headers
);
//有返回值的情况 VO可以替换成具体的JavaBean
//有返回值的情况 VO可以替换成具体的JavaBean
ResponseEntity
<
String
>
obj
=
yourRestTemplate
.
exchange
(
url
,
HttpMethod
.
POST
,
entity
,
String
.
class
);
ResponseEntity
<
String
>
obj
=
yourRestTemplate
.
exchange
(
ekpProperties
.
getInsuranceUrl
(),
HttpMethod
.
POST
,
entity
,
String
.
class
);
log
.
info
(
"obj:"
+
obj
);
String
body
=
obj
.
getBody
();
String
body
=
obj
.
getBody
();
if
(
StringUtils
.
isBlank
(
body
)){
if
(
StringUtils
.
isBlank
(
body
)){
log
.
error
(
"交易失败"
);
log
.
error
(
"交易失败"
+
body
);
return
null
;
return
null
;
}
else
{
}
else
{
log
.
info
(
"交易成功:"
+
body
);
log
.
info
(
"交易成功:"
+
body
);
return
body
;
return
body
;
}
}
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
log
.
info
(
e
.
getMessage
()
);
log
.
error
(
"交易失败:"
,
e
);
return
null
;
return
null
;
}
}
}
}
...
@@ -135,9 +92,9 @@ public class EKPUtil {
...
@@ -135,9 +92,9 @@ public class EKPUtil {
* @param param 转换类
* @param param 转换类
* @return {@link TInsuranceSettlePushParam}
* @return {@link TInsuranceSettlePushParam}
*/
*/
public
static
TInsuranceSettl
ePushParam
insuranceDetail2PushParam
(
EKPInteractiveParam
param
){
public
static
EKPInsuranc
ePushParam
insuranceDetail2PushParam
(
EKPInteractiveParam
param
){
String
format
=
LocalDate
.
now
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd"
));
String
format
=
LocalDate
.
now
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd"
));
TInsuranceSettlePushParam
pushParam
=
new
TInsuranceSettl
ePushParam
();
EKPInsurancePushParam
pushParam
=
new
EKPInsuranc
ePushParam
();
param
.
setHappenDate
(
format
);
param
.
setHappenDate
(
format
);
//ekpId
//ekpId
if
(
null
!=
param
.
getDetailId
()
&&
null
!=
param
.
getDefaultSettleId
()){
if
(
null
!=
param
.
getDetailId
()
&&
null
!=
param
.
getDefaultSettleId
()){
...
@@ -276,6 +233,12 @@ public class EKPUtil {
...
@@ -276,6 +233,12 @@ public class EKPUtil {
pushParam
.
setFd_3af9197b31071c
(
CommonConstants
.
ZERO_INT
);
pushParam
.
setFd_3af9197b31071c
(
CommonConstants
.
ZERO_INT
);
}
}
//有无预估
if
(
null
!=
param
.
getEstimateStatus
()){
pushParam
.
setFd_3b0a5937928c8c
(
param
.
getEstimateStatus
());
}
else
{
pushParam
.
setFd_3b0a5937928c8c
(
CommonConstants
.
EMPTY_STRING
);
}
return
pushParam
;
return
pushParam
;
}
}
}
}
...
...
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/constant/EkpConstants.java
View file @
43730761
...
@@ -16,4 +16,14 @@ public interface EkpConstants {
...
@@ -16,4 +16,14 @@ public interface EkpConstants {
* 推送失败
* 推送失败
*/
*/
String
SEND_FAILED
=
"推送失败"
;
String
SEND_FAILED
=
"推送失败"
;
/**
* 有
*/
String
HAVE
=
"有"
;
/**
* 无
*/
String
NOTHING
=
"无"
;
}
}
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EKPInsurancePushParam.java
0 → 100644
View file @
43730761
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
ekp
.
vo
;
import
lombok.Data
;
/**
* @author zhaji
* @description 结算信息推送类
* @date 2022-08-05 10:32:16
*/
@Data
public
class
EKPInsurancePushParam
{
/**
* 单据类型 200 单选(1,预估单,2,实缴单,3,差异单)
*/
private
Integer
fd_3adfe6af71a1cc
;
/**
* 交易类型 交易类型 1新增结算单,2作废结算信息,3更新保单信息
*/
private
Integer
fd_3af9197b31071c
;
/**
* 项目编码 200
*/
private
String
fd_3adfe658c6229e
;
/**
* 项目名称 200
*/
private
String
fd_3adfe6592b4158
;
/**
* 客户编码 200
*/
private
String
fd_3adfe6598281e8
;
/**
* 客户名称 200
*/
private
String
fd_3adfe7a2688902
;
/**
* 发生日期 "xxxx--xx--xx"
*/
private
String
fd_3adfe67c24dace
;
/**
* 姓名 200
*/
private
String
fd_3adfe65d759650
;
/**
* 身份证号 200
*/
private
String
fd_3adfe65dbd9f68
;
/**
* 发票号 200
*/
private
String
fd_3adfe65e0cd094
;
/**
* 险种
*/
private
String
fd_3adfe65f6599e4
;
/**
* 保险公司
*/
private
String
fd_3adfe65ea04728
;
/**
* 保单号
*/
private
String
fd_3adfe65e60e110
;
/**
* 保险开始日期 "xxxx--xx--xx"
*/
private
String
fd_3adfe6b7e0ede8
;
/**
* 保险结束日期 "xxxx--xx--xx"
*/
private
String
fd_3adfe6b847bfe6
;
/**
* 购买标准
*/
private
String
fd_3adfe6d55384c6
;
/**
* 实际保费
*/
private
String
fd_3adfe6610c0d2c
;
/**
* 医保 精确到小数点后两位
*/
private
String
fd_3adfe66041a996
;
/**
* 事故或残疾 200
*/
private
String
fd_3adfe6609aa810
;
/**
* 预估保费(应收) 精确到小数点后两位
*/
private
String
fd_3adfe6e30f2a3c
;
/**
* 结算月份 200
*/
private
String
fd_3aea2f0180eccc
;
/**
* 商险ID(商险id_结算id)
*/
private
String
fd_3afa8a70006bea
;
/**
* 有无预估(有,无)
*/
private
String
fd_3b0a5937928c8c
;
}
yifu-common/yifu-common-ekp/src/main/resources/META-INF/spring.factories
View file @
43730761
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.yifu.cloud.plus.v1.yifu.ekp.util.EKPInsuranceUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSalaryUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSalaryUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSocialUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSocialUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil
\ No newline at end of file
yifu-common/yifu-common-ekp/src/main/resources/ekpSalaryConfig.properties
View file @
43730761
...
@@ -4,3 +4,11 @@ ekp.fdFlowId=182b40249c1bc940d7226b941c7a4183
...
@@ -4,3 +4,11 @@ ekp.fdFlowId=182b40249c1bc940d7226b941c7a4183
ekp.docStatus
=
20
ekp.docStatus
=
20
ekp.LoginName
=
admin
ekp.LoginName
=
admin
ekp.docSubject
=
\u
85AA
\u
8D44
\u
8BA2
\u5355\u
660E
\u
7EC6
\u6570\u
636E
\u
63A5
\u
53E3
ekp.docSubject
=
\u
85AA
\u
8D44
\u
8BA2
\u5355\u
660E
\u
7EC6
\u6570\u
636E
\u
63A5
\u
53E3
ekp.insuranceUrl
=
http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
ekp.insuranceFdModelId
=
181d73279372e5a55438a47d7436ab7e
ekp.insuranceFdFlowId
=
18267f206233f29cbd3c5ee425c9408a
ekp.insuranceDocStatus
=
20
ekp.insuranceLoginName
=
admin
ekp.insuranceFocSubject
=
'??????'
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceEkp.java
View file @
43730761
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
entity
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
entity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -20,6 +22,7 @@ public class TInsuranceEkp implements Serializable {
...
@@ -20,6 +22,7 @@ public class TInsuranceEkp implements Serializable {
/**
/**
* 主键id
* 主键id
*/
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
private
String
id
;
private
String
id
;
/**
/**
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceRefund.java
View file @
43730761
...
@@ -74,6 +74,12 @@ public class TInsuranceRefund extends BaseEntity {
...
@@ -74,6 +74,12 @@ public class TInsuranceRefund extends BaseEntity {
@Schema
(
description
=
"创建人所在部门名称"
)
@Schema
(
description
=
"创建人所在部门名称"
)
private
String
createUserDeptName
;
private
String
createUserDeptName
;
/**
* 派单类型
*/
@Schema
(
description
=
" 购买类型, 1新增、3批增、4替换,5减员"
)
private
Integer
buyType
;
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EKPInteractiveParam.java
View file @
43730761
...
@@ -171,4 +171,9 @@ public class EKPInteractiveParam implements Serializable {
...
@@ -171,4 +171,9 @@ public class EKPInteractiveParam implements Serializable {
@Schema
(
description
=
"1推送预估费用,2推送实缴费用,3变更结算月,4推送作废信息,5推送红冲信息,6投保退回红冲,7变更保单保费"
)
@Schema
(
description
=
"1推送预估费用,2推送实缴费用,3变更结算月,4推送作废信息,5推送红冲信息,6投保退回红冲,7变更保单保费"
)
private
Integer
pushType
;
private
Integer
pushType
;
/**
* 有无预估
*/
@Schema
(
description
=
"状态:有,无"
)
private
String
estimateStatus
;
}
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/TInsuranceSettlePushParam.java
View file @
43730761
...
@@ -23,6 +23,12 @@ public class TInsuranceSettlePushParam{
...
@@ -23,6 +23,12 @@ public class TInsuranceSettlePushParam{
@Schema
(
description
=
"单据类型"
)
@Schema
(
description
=
"单据类型"
)
private
Integer
fd_3adfe6af71a1cc
;
private
Integer
fd_3adfe6af71a1cc
;
/**
* 交易类型 200
*/
@Schema
(
description
=
"交易类型 1新增结算单,2作废结算信息,3更新保单信息"
)
private
Integer
fd_3af9197b31071c
;
/**
/**
* 项目编码 200
* 项目编码 200
*/
*/
...
@@ -134,19 +140,12 @@ public class TInsuranceSettlePushParam{
...
@@ -134,19 +140,12 @@ public class TInsuranceSettlePushParam{
@Schema
(
description
=
"预估保费"
)
@Schema
(
description
=
"预估保费"
)
private
String
fd_3adfe6e30f2a3c
;
private
String
fd_3adfe6e30f2a3c
;
/**
/**
* 结算月份 200
* 结算月份 200
*/
*/
@Schema
(
description
=
"结算月份"
)
@Schema
(
description
=
"结算月份"
)
private
String
fd_3aea2f0180eccc
;
private
String
fd_3aea2f0180eccc
;
/**
* 交易类型 200
*/
@Schema
(
description
=
"交易类型 1新增结算单,2作废结算信息,3更新保单信息"
)
private
Integer
fd_3af9197b31071c
;
/**
/**
* 商险ID 200
* 商险ID 200
*/
*/
...
...
yifu-insurances/yifu-insurances-biz/pom.xml
View file @
43730761
...
@@ -65,6 +65,12 @@
...
@@ -65,6 +65,12 @@
<artifactId>
commons-collections
</artifactId>
<artifactId>
commons-collections
</artifactId>
<version>
3.2.2
</version>
<version>
3.2.2
</version>
</dependency>
</dependency>
<dependency>
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu-common-ekp
</artifactId>
<version>
1.0.0
</version>
<scope>
compile
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceDetailMapper.java
View file @
43730761
...
@@ -216,16 +216,6 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
...
@@ -216,16 +216,6 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
*/
*/
TInsuranceDetail
selectByRegionSql
(
@Param
(
"regionSql"
)
String
regionSql
,
@Param
(
"id"
)
String
id
);
TInsuranceDetail
selectByRegionSql
(
@Param
(
"regionSql"
)
String
regionSql
,
@Param
(
"id"
)
String
id
);
/**
* 商险订单投保列表查询
*
* @author zhaji
* @param page
* @param param
* @return {@link IPage< InsuredOrderListVo>}
*/
IPage
<
InsuredOrderListVo
>
getOrderInsuredListPage
(
Page
<
InsuredOrderListVo
>
page
,
@Param
(
"param"
)
InsuredOrderParam
param
);
/**
/**
* 商险订单减员列表查询
* 商险订单减员列表查询
*
*
...
@@ -234,7 +224,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
...
@@ -234,7 +224,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
* @param param
* @param param
* @return {@link IPage< InsuredOrderListVo>}
* @return {@link IPage< InsuredOrderListVo>}
*/
*/
IPage
<
InsuredOrderListVo
>
getOrder
RefundInsuredListPage
(
Page
<
InsuredOrderListVo
>
page
,
@Param
(
"param"
)
InsuredOrderParam
param
);
IPage
<
InsuredOrderListVo
>
getOrder
InsuredListPage
(
Page
<
InsuredOrderListVo
>
page
,
@Param
(
"param"
)
InsuredOrderParam
param
);
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
43730761
This diff is collapsed.
Click to expand it.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceEkpServiceImpl.java
View file @
43730761
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.ekp.util.EKPInsuranceUtil
;
import
com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants
;
import
com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEkp
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEkp
;
...
@@ -16,12 +17,12 @@ import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEkpSer
...
@@ -16,12 +17,12 @@ import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEkpSer
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.BeanCopyUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.BeanCopyUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.BigDecimalUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.BigDecimalUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.EKPUtil
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EKPInteractiveParam
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EKPInteractiveParam
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.context.annotation.Lazy
;
import
org.springframework.context.annotation.Lazy
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -40,6 +41,9 @@ import java.util.List;
...
@@ -40,6 +41,9 @@ import java.util.List;
@Slf4j
@Slf4j
public
class
TInsuranceEkpServiceImpl
extends
ServiceImpl
<
TInsuranceEkpMapper
,
TInsuranceEkp
>
implements
TInsuranceEkpService
{
public
class
TInsuranceEkpServiceImpl
extends
ServiceImpl
<
TInsuranceEkpMapper
,
TInsuranceEkp
>
implements
TInsuranceEkpService
{
@Resource
EKPInsuranceUtil
eKPInsuranceUtil
;
@Resource
@Resource
TInsuranceSettleService
tInsuranceSettleService
;
TInsuranceSettleService
tInsuranceSettleService
;
@Resource
@Resource
...
@@ -83,7 +87,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
...
@@ -83,7 +87,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
EKPInteractiveParam
ekpParam
=
new
EKPInteractiveParam
();
EKPInteractiveParam
ekpParam
=
new
EKPInteractiveParam
();
BeanCopyUtils
.
copyProperties
(
tInsuranceEkp
,
ekpParam
);
BeanCopyUtils
.
copyProperties
(
tInsuranceEkp
,
ekpParam
);
if
(
actualStatus
.
equals
(
InsurancesConstants
.
SETTLE_ZERO
)){
if
(
actualStatus
.
equals
(
InsurancesConstants
.
SETTLE_ZERO
)){
String
s
=
EKP
Util
.
sendToEKP
(
ekpParam
);
String
s
=
eKPInsurance
Util
.
sendToEKP
(
ekpParam
);
//如果发送成功
//如果发送成功
if
(
StringUtils
.
isNotBlank
(
s
)){
if
(
StringUtils
.
isNotBlank
(
s
)){
//预估则更新预估保费
//预估则更新预估保费
...
@@ -130,7 +134,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
...
@@ -130,7 +134,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
ekpParam
.
setActualPremium
(
actualPremium
.
negate
());
ekpParam
.
setActualPremium
(
actualPremium
.
negate
());
}
}
ekpParam
.
setInteractiveType
(
CommonConstants
.
ONE_INT
);
ekpParam
.
setInteractiveType
(
CommonConstants
.
ONE_INT
);
String
s
=
EKP
Util
.
sendToEKP
(
ekpParam
);
String
s
=
eKPInsurance
Util
.
sendToEKP
(
ekpParam
);
if
(
StringUtils
.
isNotBlank
(
s
)){
if
(
StringUtils
.
isNotBlank
(
s
)){
tInsuranceEkp
.
setResendFlag
(
CommonConstants
.
ONE_INT
);
tInsuranceEkp
.
setResendFlag
(
CommonConstants
.
ONE_INT
);
successLit
.
add
(
tInsuranceEkp
);
successLit
.
add
(
tInsuranceEkp
);
...
@@ -139,7 +143,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
...
@@ -139,7 +143,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
}
}
//如果为红冲数据则正常发送
//如果为红冲数据则正常发送
}
else
if
(
CommonConstants
.
FIVE_INT
==
pushType
||
CommonConstants
.
SIX_INT
==
pushType
){
}
else
if
(
CommonConstants
.
FIVE_INT
==
pushType
||
CommonConstants
.
SIX_INT
==
pushType
){
String
s
=
EKP
Util
.
sendToEKP
(
ekpParam
);
String
s
=
eKPInsurance
Util
.
sendToEKP
(
ekpParam
);
if
(
StringUtils
.
isNotBlank
(
s
)){
if
(
StringUtils
.
isNotBlank
(
s
)){
tInsuranceEkp
.
setResendFlag
(
CommonConstants
.
ONE_INT
);
tInsuranceEkp
.
setResendFlag
(
CommonConstants
.
ONE_INT
);
successLit
.
add
(
tInsuranceEkp
);
successLit
.
add
(
tInsuranceEkp
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
43730761
...
@@ -258,6 +258,7 @@
...
@@ -258,6 +258,7 @@
</if>
</if>
ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
</select>
</select>
<!--通过id查询商险信息-->
<select
id=
"getInsuranceDetailById"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceDetailVO"
>
<select
id=
"getInsuranceDetailById"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceDetailVO"
>
select
select
detail.id as id,
detail.id as id,
...
@@ -305,7 +306,7 @@
...
@@ -305,7 +306,7 @@
left join t_insurance_settle tis on detail.DEFAULT_SETTLE_ID = tis.ID
left join t_insurance_settle tis on detail.DEFAULT_SETTLE_ID = tis.ID
where detail.ID = #{id}
where detail.ID = #{id}
</select>
</select>
<!--
导出办理勾选查询结果-->
<!--导出办理勾选查询结果-->
<select
id=
"getInsuranceExportListBySelect"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceExportListVO"
>
<select
id=
"getInsuranceExportListBySelect"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceExportListVO"
>
select detail.id as id,
select detail.id as id,
detail.DEPT_NO as deptNo,
detail.DEPT_NO as deptNo,
...
@@ -389,11 +390,13 @@
...
@@ -389,11 +390,13 @@
</if>
</if>
ORDER BY detail.CREATE_TIME DESC
ORDER BY detail.CREATE_TIME DESC
</select>
</select>
<!--批量更新保单号-->
<update
id=
"updatePolicyNoBatch"
>
<update
id=
"updatePolicyNoBatch"
>
<foreach
collection=
"details"
index=
"index"
item=
"item"
separator=
";"
>
<foreach
collection=
"details"
index=
"index"
item=
"item"
separator=
";"
>
update t_insurance_detail set POLICY_NO = #{item.policyNo} where ID = #{item.id}
update t_insurance_detail set POLICY_NO = #{item.policyNo} where ID = #{item.id}
</foreach>
</foreach>
</update>
</update>
<!--批量更新发票号-->
<update
id=
"updateInvoiceNoBatch"
>
<update
id=
"updateInvoiceNoBatch"
>
<foreach
collection=
"details"
index=
"index"
item=
"item"
separator=
";"
>
<foreach
collection=
"details"
index=
"index"
item=
"item"
separator=
";"
>
update t_insurance_detail set INVOICE_NO = #{item.invoiceNo} where ID = #{item.id}
update t_insurance_detail set INVOICE_NO = #{item.invoiceNo} where ID = #{item.id}
...
@@ -904,6 +907,7 @@
...
@@ -904,6 +907,7 @@
</where>
</where>
ORDER BY CREATE_TIME desc
ORDER BY CREATE_TIME desc
</select>
</select>
<!--查询所有在保,未出险,未过期,未失效,未减员的保单信息-->
<select
id=
"selectListByEmpIdcardNo"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail"
>
<select
id=
"selectListByEmpIdcardNo"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail"
>
SELECT
SELECT
<include
refid=
"Base_Column_List"
/>
<include
refid=
"Base_Column_List"
/>
...
@@ -934,8 +938,8 @@
...
@@ -934,8 +938,8 @@
</where>
</where>
ORDER BY CREATE_TIME desc
ORDER BY CREATE_TIME desc
</select>
</select>
<!--商险订单
减员
列表查询-->
<!--商险订单列表查询-->
<select
id=
"getOrder
Refund
InsuredListPage"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuredOrderListVo"
>
<select
id=
"getOrderInsuredListPage"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuredOrderListVo"
>
(
(
select
select
detail.id as id,
detail.id as id,
...
@@ -1021,45 +1025,5 @@
...
@@ -1021,45 +1025,5 @@
</if>
</if>
)order by createTime desc
)order by createTime desc
</select>
</select>
<select
id=
"getOrderInsuredListPage"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuredOrderListVo"
>
select
detail.id as id,
detail.BUY_TYPE as buyType,
detail.EMP_NAME as empName,
detail.EMP_IDCARD_NO as empIdcardNo,
detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
detail.INSURANCE_TYPE_NAME as insuranceTypeName,
detail.BUY_STANDARD as buyStandard,
detail.MEDICAL_QUOTA as medicalQuota,
detail.DIE_DISABLE_QUOTA as dieDisableQuota,
detail.CREATE_NAME as createName,
detail.CREATE_USER_DEPT_NAME as createUserDeptName,
detail.CREATE_TIME as createTime,
detail.BUY_HANDLE_STATUS as buyHandleStatus
from
t_insurance_detail detail
where
detail.DELETE_FLAG = 0
and
detail.ORDER_NO = #{param.orderNo}
<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.startDate != null and param.startDate.trim() != ''"
>
AND detail.CREATE_TIME
<![CDATA[ >= ]]>
concat(#{param.startDate}, '00:00:00')
</if>
<if
test=
"param.endDate != null and param.endDate.trim() != ''"
>
AND detail.CREATE_TIME
<![CDATA[ <= ]]>
concat(#{param.endDate}, '23:59:59')
</if>
<if
test=
"param.deptNoList != null"
>
and detail.DEPT_NO in
<foreach
collection=
"param.deptNoList"
index=
"index"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
</select>
</mapper>
</mapper>
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TStatisticsLaborMapper.java
View file @
43730761
...
@@ -46,5 +46,5 @@ public interface TStatisticsLaborMapper extends BaseMapper<TStatisticsLabor> {
...
@@ -46,5 +46,5 @@ public interface TStatisticsLaborMapper extends BaseMapper<TStatisticsLabor> {
* @Description: 统计
* @Description: 统计
* @return:
* @return:
**/
**/
List
<
TStatisticsLabor
>
doStatisticsLabor
(
@Param
(
"nowMonth"
)
String
nowMonth
,
@Param
(
"last
Year"
)
String
lastYear
);
List
<
TStatisticsLabor
>
doStatisticsLabor
(
@Param
(
"nowMonth"
)
String
nowMonth
,
@Param
(
"last
Month"
)
String
lastMonth
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TStatisticsRemunerationMapper.java
View file @
43730761
...
@@ -46,5 +46,5 @@ public interface TStatisticsRemunerationMapper extends BaseMapper<TStatisticsRem
...
@@ -46,5 +46,5 @@ public interface TStatisticsRemunerationMapper extends BaseMapper<TStatisticsRem
* @Description: 统计
* @Description: 统计
* @return:
* @return:
**/
**/
List
<
TStatisticsRemuneration
>
doStatisticsRemuneration
(
@Param
(
"nowMonth"
)
String
nowMonth
,
@Param
(
"last
Year"
)
String
lastYear
);
List
<
TStatisticsRemuneration
>
doStatisticsRemuneration
(
@Param
(
"nowMonth"
)
String
nowMonth
,
@Param
(
"last
Month"
)
String
lastMonth
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsLaborServiceImpl.java
View file @
43730761
...
@@ -254,8 +254,7 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
...
@@ -254,8 +254,7 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
return
R
.
failed
(
"上月数据已生成,不可重复生成!"
);
return
R
.
failed
(
"上月数据已生成,不可重复生成!"
);
}
else
{
}
else
{
String
lastMonth
=
DateUtil
.
addMonth
(-
1
);
//上月
String
lastMonth
=
DateUtil
.
addMonth
(-
1
);
//上月
String
lastYear
=
lastMonth
.
substring
(
0
,
4
);
List
<
TStatisticsLabor
>
stdvoList
=
baseMapper
.
doStatisticsLabor
(
nowMonth
,
lastMonth
);
List
<
TStatisticsLabor
>
stdvoList
=
baseMapper
.
doStatisticsLabor
(
nowMonth
,
lastYear
);
for
(
TStatisticsLabor
declarer
:
stdvoList
)
{
for
(
TStatisticsLabor
declarer
:
stdvoList
)
{
this
.
save
(
declarer
);
this
.
save
(
declarer
);
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsRemunerationServiceImpl.java
View file @
43730761
...
@@ -156,8 +156,7 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
...
@@ -156,8 +156,7 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
return
R
.
failed
(
"上月数据已生成,不可重复生成!"
);
return
R
.
failed
(
"上月数据已生成,不可重复生成!"
);
}
else
{
}
else
{
String
lastMonth
=
DateUtil
.
addMonth
(-
1
);
//上月
String
lastMonth
=
DateUtil
.
addMonth
(-
1
);
//上月
String
lastYear
=
lastMonth
.
substring
(
0
,
4
);
List
<
TStatisticsRemuneration
>
stdvoList
=
baseMapper
.
doStatisticsRemuneration
(
nowMonth
,
lastMonth
);
List
<
TStatisticsRemuneration
>
stdvoList
=
baseMapper
.
doStatisticsRemuneration
(
nowMonth
,
lastYear
);
for
(
TStatisticsRemuneration
remuneration
:
stdvoList
)
{
for
(
TStatisticsRemuneration
remuneration
:
stdvoList
)
{
this
.
save
(
remuneration
);
this
.
save
(
remuneration
);
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsBonusMapper.xml
View file @
43730761
...
@@ -113,7 +113,7 @@
...
@@ -113,7 +113,7 @@
left join t_salary_account_item annualbonus on annualbonus.SALARY_ACCOUNT_ID = a.id and annualbonus.CN_NAME='年终奖'
left join t_salary_account_item annualbonus on annualbonus.SALARY_ACCOUNT_ID = a.id and annualbonus.CN_NAME='年终奖'
left join t_salary_account_item tax on tax.SALARY_ACCOUNT_ID = a.id and tax.CN_NAME='年终奖单独扣税'
left join t_salary_account_item tax on tax.SALARY_ACCOUNT_ID = a.id and tax.CN_NAME='年终奖单独扣税'
left join t_salary_standard s ON s.id = a.SALARY_FORM_ID
left join t_salary_standard s ON s.id = a.SALARY_FORM_ID
where a.DELETE_FLAG =
'1'
and annualbonus.SALARY_MONEY > 0 and tax.SALARY_MONEY > 0 and s.SEND_MONTH like '${lastYear}%'
where a.DELETE_FLAG =
0
and annualbonus.SALARY_MONEY > 0 and tax.SALARY_MONEY > 0 and s.SEND_MONTH like '${lastYear}%'
GROUP BY a.EMP_IDCARD,a.EMP_NAME
GROUP BY a.EMP_IDCARD,a.EMP_NAME
</select>
</select>
</mapper>
</mapper>
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsLaborMapper.xml
View file @
43730761
...
@@ -94,7 +94,7 @@
...
@@ -94,7 +94,7 @@
#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX) PERSONAL_TAX,sum(a.ACTUAL_SALARY) INCOME,
#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX) PERSONAL_TAX,sum(a.ACTUAL_SALARY) INCOME,
a.INVOICE_TITLE DECLARE_UNIT,'一般劳务报酬所得' INCOME_ITEM,'居民身份证' CARD_TYPE
a.INVOICE_TITLE DECLARE_UNIT,'一般劳务报酬所得' INCOME_ITEM,'居民身份证' CARD_TYPE
from t_salary_account a
from t_salary_account a
where a.DELETE_FLAG =
'1' and a.SETTLEMENT_MONTH like '${lastYear}%'
and a.FORM_TYPE = '3'
where a.DELETE_FLAG =
0 and a.SETTLEMENT_MONTH = #{lastMonth}
and a.FORM_TYPE = '3'
GROUP BY a.EMP_IDCARD,
a.EMP_NAME
GROUP BY a.EMP_IDCARD,
DECLARE_UNIT
</select>
</select>
</mapper>
</mapper>
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsRemunerationMapper.xml
View file @
43730761
...
@@ -90,7 +90,7 @@
...
@@ -90,7 +90,7 @@
#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX) PERSONAL_TAX,
#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX) PERSONAL_TAX,
sum(a.ACTUAL_SALARY) INCOME,a.INVOICE_TITLE DECLARE_UNIT,'居民身份证' CARD_TYPE
sum(a.ACTUAL_SALARY) INCOME,a.INVOICE_TITLE DECLARE_UNIT,'居民身份证' CARD_TYPE
from t_salary_account a
from t_salary_account a
where a.DELETE_FLAG =
'1' and a.SETTLEMENT_MONTH like '${lastYear}%'
and a.FORM_TYPE = '4'
where a.DELETE_FLAG =
0 and a.SETTLEMENT_MONTH = #{lastMonth}
and a.FORM_TYPE = '4'
GROUP BY a.EMP_IDCARD,
a.EMP_NAME
GROUP BY a.EMP_IDCARD,
DECLARE_UNIT
</select>
</select>
</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