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
363cb77b
Commit
363cb77b
authored
Jan 15, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.5' into MVP1.7.5
parents
675871dc
8278fb86
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
38 changed files
with
911 additions
and
64 deletions
+911
-64
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+35
-1
TInsuranceDetailController.java
...ifu/insurances/controller/TInsuranceDetailController.java
+17
-1
TInsuranceDetailMapper.java
.../insurances/mapper/insurances/TInsuranceDetailMapper.java
+9
-0
TInsuranceDetailService.java
...insurances/service/insurance/TInsuranceDetailService.java
+12
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+42
-0
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+21
-1
TInsuranceUnpurchaseApply.java
...plus/v1/yifu/salary/entity/TInsuranceUnpurchaseApply.java
+13
-6
TInsuranceUnpurchasePersonSalary.java
.../yifu/salary/entity/TInsuranceUnpurchasePersonSalary.java
+42
-0
TSalaryStandard.java
...ifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java
+8
-0
SalaryRiskListVo.java
...m/yifu/cloud/plus/v1/yifu/salary/vo/SalaryRiskListVo.java
+18
-0
SalaryRiskVo.java
...a/com/yifu/cloud/plus/v1/yifu/salary/vo/SalaryRiskVo.java
+21
-0
TInsuranceUnpurchaseApplyVo.java
...d/plus/v1/yifu/salary/vo/TInsuranceUnpurchaseApplyVo.java
+8
-6
TInsuranceUnpurchasePersonVo.java
.../plus/v1/yifu/salary/vo/TInsuranceUnpurchasePersonVo.java
+2
-0
TSalaryEmpMapVo.java
...om/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryEmpMapVo.java
+19
-0
TInsuranceUnpurchaseApplyController.java
...alary/controller/TInsuranceUnpurchaseApplyController.java
+12
-14
TInsuranceUnpurchasePersonController.java
...lary/controller/TInsuranceUnpurchasePersonController.java
+14
-0
TSalaryEmployeeController.java
.../v1/yifu/salary/controller/TSalaryEmployeeController.java
+10
-0
TSalaryStandardController.java
.../v1/yifu/salary/controller/TSalaryStandardController.java
+37
-3
TInsuranceUnpurchasePersonMapper.java
.../yifu/salary/mapper/TInsuranceUnpurchasePersonMapper.java
+11
-0
TInsuranceUnpurchasePersonSalaryMapper.java
...salary/mapper/TInsuranceUnpurchasePersonSalaryMapper.java
+32
-0
TSalaryAccountMapper.java
...loud/plus/v1/yifu/salary/mapper/TSalaryAccountMapper.java
+9
-0
TInsuranceUnpurchasePersonSalaryService.java
...lary/service/TInsuranceUnpurchasePersonSalaryService.java
+25
-0
TInsuranceUnpurchasePersonService.java
...ifu/salary/service/TInsuranceUnpurchasePersonService.java
+17
-0
TSalaryAccountService.java
...ud/plus/v1/yifu/salary/service/TSalaryAccountService.java
+10
-0
TSalaryEmployeeService.java
...d/plus/v1/yifu/salary/service/TSalaryEmployeeService.java
+9
-0
TSalaryStandardService.java
...d/plus/v1/yifu/salary/service/TSalaryStandardService.java
+11
-1
TInsuranceUnpurchaseApplyServiceImpl.java
...ry/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java
+50
-10
TInsuranceUnpurchasePersonSalaryServiceImpl.java
...ice/impl/TInsuranceUnpurchasePersonSalaryServiceImpl.java
+46
-0
TInsuranceUnpurchasePersonServiceImpl.java
...y/service/impl/TInsuranceUnpurchasePersonServiceImpl.java
+46
-0
TSalaryAccountServiceImpl.java
...1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
+6
-0
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+12
-0
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+160
-18
application.yml
...salary/yifu-salary-biz/src/main/resources/application.yml
+5
-1
TInsuranceUnpurchasePersonMapper.xml
...ain/resources/mapper/TInsuranceUnpurchasePersonMapper.xml
+28
-0
TInsuranceUnpurchasePersonSalaryMapper.xml
...sources/mapper/TInsuranceUnpurchasePersonSalaryMapper.xml
+76
-0
TSalaryAccountMapper.xml
...ry-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
+10
-0
TSalaryStandardMapper.xml
...y-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
+6
-1
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+2
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
363cb77b
...
...
@@ -59,6 +59,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryEmployee;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.ExportErrorVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.ListStringVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TBankNameMapVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmpMapVo
;
import
lombok.AllArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
org.apache.commons.compress.archivers.zip.ZipArchiveEntry
;
...
...
@@ -3696,6 +3697,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
String
empId
=
null
;
// 组装1 预入职 档案
List
<
TPreEmployeeInfo
>
preEmployeeInfoList
=
new
ArrayList
<>();
List
<
TPreEmployeeInfo
>
preEmployeeInfoNeedSalaryList
=
new
ArrayList
<>();
List
<
String
>
needSalaryList
=
new
ArrayList
<>();
List
<
TPreEmployeeProject
>
preEmployeeProjectList
=
new
ArrayList
<>();
List
<
TPreEmpBadRecord
>
preEmpBadRecordList
=
new
ArrayList
<>();
List
<
TPreEmpContactInfo
>
preEmpContactInfoList
=
new
ArrayList
<>();
...
...
@@ -3812,7 +3815,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeInfo
.
setBankNo
(
info
.
getBankNo
());
tPreEmployeeInfo
.
setTaxMonth
(
info
.
getTaxMonthValue
());
}
else
{
preEmployeeInfoNeedSalaryList
.
add
(
tPreEmployeeInfo
);
needSalaryList
.
add
(
empIdCard
);
}
tPreEmployeeInfo
.
setTaxMonthFlag
(
CommonConstants
.
ONE_STRING
);
tPreEmployeeInfo
.
setContactProvince
(
info
.
getContactProvinceValue
());
...
...
@@ -3997,6 +4001,36 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
if
(!
preEmployeeInfoList
.
isEmpty
())
{
if
(!
preEmployeeInfoNeedSalaryList
.
isEmpty
())
{
if
(!
needSalaryList
.
isEmpty
())
{
// 查薪资服务的卡号
R
<
TSalaryEmpMapVo
>
salaryEmpBankRes
=
HttpDaprUtil
.
invokeMethodPost
(
salaryProperties
.
getAppUrl
()
,
salaryProperties
.
getAppId
(),
"/tsalaryemployee/inner/getSalaryEmpMap"
,
needSalaryList
,
TSalaryEmpMapVo
.
class
,
SecurityConstants
.
FROM_IN
);
Map
<
String
,
TSalaryEmployee
>
salaryEmpBankMap
;
if
(
Common
.
isEmpty
(
salaryEmpBankRes
)
||
Common
.
isEmpty
(
salaryEmpBankRes
.
getCode
())
||
salaryEmpBankRes
.
getCode
()
!=
CommonConstants
.
SUCCESS
){
return
R
.
failed
(
"获取薪资服务开户行信息失败!"
);
}
else
{
if
(
salaryEmpBankRes
.
getData
()
!=
null
&&
salaryEmpBankRes
.
getData
().
getSalaryEmpMap
()
!=
null
&&
!
salaryEmpBankRes
.
getData
().
getSalaryEmpMap
().
isEmpty
())
{
salaryEmpBankMap
=
salaryEmpBankRes
.
getData
().
getSalaryEmpMap
();
TSalaryEmployee
info
;
for
(
TPreEmployeeInfo
emp
:
preEmployeeInfoNeedSalaryList
)
{
info
=
salaryEmpBankMap
.
get
(
emp
.
getEmpIdcard
());
if
(
info
!=
null
)
{
emp
.
setBankName
(
info
.
getBankName
());
emp
.
setBankProvince
(
info
.
getBankProvince
());
emp
.
setBankCity
(
info
.
getBankCity
());
emp
.
setBankSubName
(
info
.
getBankSubName
());
emp
.
setBankNo
(
info
.
getBankNo
());
emp
.
setTaxMonth
(
info
.
getTaxMonth
());
}
}
}
}
}
}
tPreEmployeeInfoService
.
saveBatch
(
preEmployeeInfoList
);
}
if
(!
preEmployeeProjectList
.
isEmpty
())
{
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @
363cb77b
...
...
@@ -16,6 +16,8 @@ import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskListVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptVo
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
...
...
@@ -162,7 +164,7 @@ public class TInsuranceDetailController {
/**
* 通过id删除
*
*
* @author licancan
* @param id
* @return {@link R<String>}
...
...
@@ -811,4 +813,18 @@ public class TInsuranceDetailController {
public
void
updateSettleStatus
()
{
tInsuranceDetailService
.
updateSettleStatus
();
}
/**
* 重新更新结算状态同步失败的数据
*
* @author licancan
* @param
* @return void
*/
@SysLog
(
"重新更新结算状态同步失败的数据"
)
@Inner
@PostMapping
(
"/inner/getRiskByIdCard"
)
public
SalaryRiskListVo
getRiskByIdCard
(
@RequestBody
List
<
TSalaryAccount
>
idCardList
)
{
return
tInsuranceDetailService
.
getRiskByIdCard
(
idCardList
);
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceDetailMapper.java
View file @
363cb77b
...
...
@@ -284,6 +284,15 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
List
<
TInsuranceDetail
>
selectByIdCardList
(
@Param
(
"idCardList"
)
List
<
String
>
idCardList
,
@Param
(
"idList"
)
List
<
String
>
idList
);
/**
* @param idCardList
* @Description: 根据身份证列表,查找所有商险
* @Author: hgw
* @Date: 2022/11/23 15:17
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail>
**/
List
<
TInsuranceDetail
>
selectInUseByIdCardList
(
@Param
(
"idCardList"
)
List
<
String
>
idCardList
);
/**
* @param ids
* @Description: 根据id查找所有商险
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceDetailService.java
View file @
363cb77b
...
...
@@ -10,6 +10,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskListVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptVo
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -540,4 +542,14 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
void
exportInsurancesWarn
(
InsuranceSearchVo
vo
,
HttpServletResponse
response
,
List
<
String
>
exportFields
,
String
idstr
);
R
<
Object
>
expireRemark
(
TBusinessInsuranceVo
vo
);
/**
* @param idCardList 身份证
* @Description: 获取商险是否在保
* @Author: hgw
* @Date: 2025/1/14 16:00
* @return: com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskListVo
**/
SalaryRiskListVo
getRiskByIdCard
(
List
<
TSalaryAccount
>
idCardList
);
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
363cb77b
...
...
@@ -42,6 +42,9 @@ import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.*;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.BigDecimalUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.*
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskListVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskVo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptDetailVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptVo
;
...
...
@@ -8195,4 +8198,43 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
return
false
;
}
/**
* @param idCardList 身份证
* @Description: 获取商险是否在保
* @Author: hgw
* @Date: 2025/1/15 9:25
* @return: com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskListVo
**/
@Override
public
SalaryRiskListVo
getRiskByIdCard
(
List
<
TSalaryAccount
>
idCardList
)
{
SalaryRiskListVo
returnVo
=
new
SalaryRiskListVo
();
if
(
idCardList
!=
null
&&
!
idCardList
.
isEmpty
())
{
List
<
String
>
cardList
=
new
ArrayList
<>();
for
(
TSalaryAccount
a
:
idCardList
)
{
cardList
.
add
(
a
.
getEmpIdcard
());
}
List
<
TInsuranceDetail
>
detailList
=
baseMapper
.
selectInUseByIdCardList
(
cardList
);
List
<
SalaryRiskVo
>
list
=
new
ArrayList
<>();
SalaryRiskVo
riskVo
;
Map
<
String
,
String
>
idMap
=
new
HashMap
<>();
if
(
detailList
!=
null
)
{
for
(
TInsuranceDetail
d
:
detailList
)
{
idMap
.
put
(
d
.
getEmpIdcardNo
(),
d
.
getEmpName
());
}
}
for
(
TSalaryAccount
s
:
idCardList
)
{
if
(
idMap
.
get
(
s
.
getEmpIdcard
())
==
null
)
{
riskVo
=
new
SalaryRiskVo
();
riskVo
.
setEmpIdCard
(
s
.
getEmpIdcard
());
riskVo
.
setEmpName
(
s
.
getEmpName
());
riskVo
.
setMsg
(
"不存在商险"
);
list
.
add
(
riskVo
);
}
}
returnVo
.
setList
(
list
);
}
return
returnVo
;
}
}
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
363cb77b
...
...
@@ -1447,7 +1447,6 @@
</foreach>
</update>
<!--查询所有商险,如果idList 不为空,则不含被替换的本身。 用来改变档案状态-->
<select
id=
"selectByIdCardList"
resultMap=
"BaseResultMap"
>
SELECT
...
...
@@ -1470,6 +1469,27 @@
</if>
</select>
<!--查询所有在途商险,判断是否买了商险:【1待投保 2投保中】 或 【3已投保 且 有效】-->
<select
id=
"selectInUseByIdCardList"
resultMap=
"BaseResultMap"
>
SELECT
ID,
EMP_NAME,
EMP_IDCARD_NO
FROM t_insurance_detail
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()
<if
test=
"idCardList != null and idCardList.size > 0"
>
AND EMP_IDCARD_NO in
<foreach
item=
"item"
index=
"index"
collection=
"idCardList"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
<if
test=
"idCardList == null"
>
and 1=2
</if>
</select>
<select
id=
"selectByIds"
resultMap=
"UpdateMap"
>
SELECT
a.ID,
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TInsuranceUnpurchaseApply.java
View file @
363cb77b
...
...
@@ -8,6 +8,7 @@ import lombok.Data;
import
lombok.EqualsAndHashCode
;
import
java.util.List
;
import
java.util.Map
;
/**
* 含风险项目不购买申请表
...
...
@@ -62,7 +63,7 @@ public class TInsuranceUnpurchaseApply extends BaseEntity {
@Schema
(
description
=
"申请状态 0 草稿 1待提交 2 待审核 3 审核通过 4 审核不通过"
)
private
String
status
;
@Schema
(
description
=
"是否含风险"
)
@Schema
(
description
=
"是否含风险
0 是 1 否
"
)
private
String
hasContainRisks
;
@Schema
(
description
=
"事业部条线"
)
...
...
@@ -99,9 +100,15 @@ public class TInsuranceUnpurchaseApply extends BaseEntity {
@TableField
(
exist
=
false
)
private
String
saveFlag
;
// /**
// * 印章附件
// */
// @TableField(exist = false)
// private List<TAttaInfo> attaInfoList;
/**
* 详情就职岗位和人数
*/
@TableField
(
exist
=
false
)
private
Map
<
String
,
Long
>
personMap
;
/**
* 印章附件
*/
@TableField
(
exist
=
false
)
private
List
<
TSalaryAtta
>
attaInfoList
;
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TInsuranceUnpurchasePersonSalary.java
0 → 100644
View file @
363cb77b
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
entity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
/**
* 含风险项目不购买申请明细表-与薪资关联表
*
* @author hgw
* @date 2025-1-15 11:52:24
*/
@Data
@TableName
(
"t_insurance_unpurchase_person_salary"
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Schema
(
description
=
"含风险项目不购买申请明细表-与薪资关联表"
)
public
class
TInsuranceUnpurchasePersonSalary
extends
BaseEntity
{
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@Schema
(
description
=
"id"
)
private
String
id
;
@Schema
(
description
=
"父级id(明细表ID)"
)
private
String
parentId
;
@Schema
(
description
=
"薪资主表ID"
)
private
String
salaryId
;
@Schema
(
description
=
"薪酬单号"
)
private
String
applyNo
;
@Schema
(
description
=
"薪酬月份"
)
private
String
salaryMonth
;
@Schema
(
description
=
"是否未删除:0未删除;1已删除"
)
private
Integer
deleteFlag
;
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java
View file @
363cb77b
...
...
@@ -498,6 +498,14 @@ public class TSalaryStandard extends BaseEntity {
@ExcelProperty
(
"是否固定列"
)
private
Integer
isFixedColumn
;
/**
* 是否校验商险:0未校验商险;1校验通过
*/
@ExcelAttribute
(
name
=
"是否校验商险"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否校验商险"
)
private
Integer
isCheckRisk
;
/**
* 工资月份-起
*/
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/SalaryRiskListVo.java
0 → 100644
View file @
363cb77b
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
vo
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.util.List
;
/**
* @author hgw
* @description 薪资提交判断商险listVo
* @date 2025-1-14 15:54:17
*/
@Getter
@Setter
public
class
SalaryRiskListVo
{
// list
private
List
<
SalaryRiskVo
>
list
;
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/SalaryRiskVo.java
0 → 100644
View file @
363cb77b
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
vo
;
import
lombok.Getter
;
import
lombok.Setter
;
/**
* @author hgw
* @description 薪资提交判断商险Vo
* @date 2025-1-14 11:03:40
*/
@Getter
@Setter
public
class
SalaryRiskVo
{
// 姓名
private
String
empName
;
// 身份证
private
String
empIdCard
;
// 信息
private
String
msg
;
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TInsuranceUnpurchaseApplyVo.java
View file @
363cb77b
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -16,6 +17,7 @@ import java.time.LocalDateTime;
* @date 2025-01-10 11:24:38
*/
@Data
@ColumnWidth
(
25
)
public
class
TInsuranceUnpurchaseApplyVo
implements
Serializable
{
/**
...
...
@@ -67,9 +69,9 @@ public class TInsuranceUnpurchaseApplyVo implements Serializable {
@ExcelProperty
(
"申请时间"
)
private
LocalDateTime
createTime
;
@ExcelAttribute
(
name
=
"当前
审核
人"
)
@Schema
(
description
=
"当前
审核
人"
)
@ExcelProperty
(
"当前
审核
人"
)
@ExcelAttribute
(
name
=
"当前
处理
人"
)
@Schema
(
description
=
"当前
处理
人"
)
@ExcelProperty
(
"当前
处理
人"
)
private
String
auditUser
;
/**
...
...
@@ -83,9 +85,9 @@ public class TInsuranceUnpurchaseApplyVo implements Serializable {
/**
* 申请状态 0 草稿 1待提交 2 待审核 3 审核通过 4 审核不通过
*/
@ExcelAttribute
(
name
=
"审
核
状态"
)
@Schema
(
description
=
"审
核
状态"
)
@ExcelProperty
(
"审
核
状态"
)
@ExcelAttribute
(
name
=
"审
批
状态"
)
@Schema
(
description
=
"审
批
状态"
)
@ExcelProperty
(
"审
批
状态"
)
private
String
status
;
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TInsuranceUnpurchasePersonVo.java
View file @
363cb77b
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -16,6 +17,7 @@ import java.time.LocalDateTime;
* @date 2025-01-10 11:23:21
*/
@Data
@ColumnWidth
(
25
)
public
class
TInsuranceUnpurchasePersonVo
implements
Serializable
{
/**
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryEmpMapVo.java
0 → 100644
View file @
363cb77b
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
vo
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryEmployee
;
import
lombok.Data
;
import
java.util.Map
;
/**
* @Description: 薪资人员map
* @Author: hgw
* @Date: 2025-1-13 17:31:10
* @return:
**/
@Data
public
class
TSalaryEmpMapVo
{
private
Map
<
String
,
TSalaryEmployee
>
salaryEmpMap
;
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TInsuranceUnpurchaseApplyController.java
View file @
363cb77b
...
...
@@ -59,6 +59,18 @@ public class TInsuranceUnpurchaseApplyController {
return
new
R
<>(
tInsuranceUnpurchaseApplyService
.
getTInsuranceUnpurchaseApplyPage
(
page
,
searchVo
));
}
/**
* 通过id查询含风险项目不购买申请表
*
* @param id id
* @return R
*/
@Operation
(
summary
=
"移动端通过id查询"
,
description
=
"移动端通过id查询"
)
@GetMapping
(
"/temp/{id}"
)
public
R
<
TInsuranceUnpurchaseApply
>
getTempById
(
@PathVariable
(
"id"
)
String
id
)
{
return
tInsuranceUnpurchaseApplyService
.
getDetailInfoById
(
id
);
}
/**
* 通过id查询含风险项目不购买申请表
*
...
...
@@ -84,20 +96,6 @@ public class TInsuranceUnpurchaseApplyController {
return
new
R
<>(
tInsuranceUnpurchaseApplyService
.
addApply
(
tInsuranceUnpurchaseApply
));
}
/**
* 修改含风险项目不购买申请表
*
* @param tInsuranceUnpurchaseApply 含风险项目不购买申请表
* @return R
*/
@Operation
(
summary
=
"修改含风险项目不购买申请表"
,
description
=
"修改含风险项目不购买申请表:hasPermission('insurances_tinsuranceunpurchaseapply_edit')"
)
@SysLog
(
"修改含风险项目不购买申请表"
)
@PutMapping
@PreAuthorize
(
"@pms.hasPermission('insurances_tinsuranceunpurchaseapply_edit')"
)
public
R
<
Boolean
>
updateById
(
@RequestBody
TInsuranceUnpurchaseApply
tInsuranceUnpurchaseApply
)
{
return
R
.
ok
(
tInsuranceUnpurchaseApplyService
.
updateById
(
tInsuranceUnpurchaseApply
));
}
/**
* 通过id删除含风险项目不购买申请表
*
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TInsuranceUnpurchasePersonController.java
View file @
363cb77b
...
...
@@ -70,4 +70,18 @@ public class TInsuranceUnpurchasePersonController {
menuUtil
.
setAuthSql
(
user
,
searchVo
);
tInsuranceUnpurchasePersonService
.
listExport
(
response
,
searchVo
);
}
/**
* @param id 明细id
* @Description: 刷新社保状态
* @Author: hgw
* @Date: 2025/1/15 13:10
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Operation
(
description
=
"刷新社保状态"
)
@GetMapping
(
"/getSocialWorkInjuryHandleById"
)
public
R
<
String
>
getSocialWorkInjuryHandleById
(
@RequestParam
String
id
)
{
return
tInsuranceUnpurchasePersonService
.
getSocialWorkInjuryHandleById
(
id
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryEmployeeController.java
View file @
363cb77b
...
...
@@ -263,4 +263,14 @@ public class TSalaryEmployeeController {
return
tSalaryEmployeeService
.
savePreNewEmpInfo
(
newEmp
);
}
@Operation
(
description
=
"获取薪资人员开户行等信息"
)
@SysLog
(
"获取薪资人员开户行等信息"
)
@Inner
@PostMapping
(
"/inner/getSalaryEmpMap"
)
public
TSalaryEmpMapVo
getSalaryEmpMap
(
@RequestBody
List
<
String
>
empIdCardList
)
{
TSalaryEmpMapVo
vo
=
new
TSalaryEmpMapVo
();
vo
.
setSalaryEmpMap
(
tSalaryEmployeeService
.
getSalaryEmpMap
(
empIdCardList
));
return
vo
;
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java
View file @
363cb77b
...
...
@@ -17,7 +17,6 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
controller
;
import
com.alibaba.fastjson.JSON
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
...
...
@@ -27,11 +26,11 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardService
;
import
com.yifu.cloud.plus.v1.yifu.salary.util.SalaryConstants
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.AccountByEkpDiffVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSearchVo
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
...
...
@@ -39,7 +38,6 @@ import lombok.RequiredArgsConstructor;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.web.bind.annotation.*
;
import
javax.json.Json
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.Date
;
import
java.util.List
;
...
...
@@ -178,6 +176,37 @@ public class TSalaryStandardController {
return
tSalaryStandardService
.
salaryStandardAudit
(
auditFlag
,
auditRemark
,
id
);
}
/**
* 保存并提交
* @return
*/
@SysLog
(
"校验商险"
)
@Operation
(
description
=
"校验商险"
)
@GetMapping
(
"/doCheckRisk"
)
public
R
<
List
<
SalaryRiskVo
>>
doCheckRisk
(
@RequestParam
String
salaryId
)
{
TSalaryStandard
s
=
tSalaryStandardService
.
getById
(
salaryId
);
if
(
s
==
null
)
{
return
R
.
failed
(
"未找到工资表"
);
}
else
if
(
s
.
getStatus
()
==
SalaryConstants
.
STATUS
[
0
]
||
s
.
getStatus
()
==
SalaryConstants
.
STATUS
[
5
]
||
s
.
getStatus
()
==
SalaryConstants
.
STATUS
[
6
]
||
s
.
getStatus
()
==
SalaryConstants
.
STATUS
[
7
])
{
// 已校验过了:
if
(
Common
.
isNotNull
(
s
.
getIsCheckRisk
())
&&
CommonConstants
.
ONE_INT
==
s
.
getIsCheckRisk
())
{
return
R
.
ok
();
}
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
!=
null
)
{
// 2025-1-14 10:59:37 提交前拦截:
return
tSalaryStandardService
.
judegRisk
(
s
,
user
);
}
else
{
return
R
.
failed
(
"请登录!"
);
}
}
else
{
return
R
.
failed
(
"请刷新后检查薪资表状态!"
);
}
}
/**
* 保存并提交
* @return
...
...
@@ -194,8 +223,13 @@ public class TSalaryStandardController {
||
s
.
getStatus
()
==
SalaryConstants
.
STATUS
[
5
]
||
s
.
getStatus
()
==
SalaryConstants
.
STATUS
[
6
]
||
s
.
getStatus
()
==
SalaryConstants
.
STATUS
[
7
])
{
if
(
Common
.
isEmpty
(
s
.
getIsCheckRisk
())
||
CommonConstants
.
ZERO_INT
==
s
.
getIsCheckRisk
())
{
return
R
.
failed
(
"请先校验商险信息!"
);
}
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
!=
null
)
{
// 添加流程进展明细
tSalaryStandardService
.
saveRecordLog
(
s
,
user
,
CommonConstants
.
TWO_STRING
,
"提交,并自动生成收入"
);
tSalaryStandard
.
setSubmitTime
(
new
Date
());
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TInsuranceUnpurchasePersonMapper.java
View file @
363cb77b
...
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TInsuranceUnpurchasePerson
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonAddVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonVo
;
import
org.apache.ibatis.annotations.Mapper
;
...
...
@@ -40,4 +41,14 @@ public interface TInsuranceUnpurchasePersonMapper extends BaseMapper<TInsuranceU
* @return
*/
List
<
TInsuranceUnpurchasePersonVo
>
getTInsuranceUnpurchaseInfoExportList
(
@Param
(
"tInsuranceUnpurchasePerson"
)
TInsuranceUnpurchasePersonSearchVo
tInsuranceUnpurchasePerson
);
/**
* 含风险项目不购买申请表简单导出查询
* @param id 含风险项目不购买申请表id
* @return
*/
List
<
TInsuranceUnpurchasePersonAddVo
>
getTInsuranceUnpurchasePersonList
(
@Param
(
"id"
)
String
id
);
List
<
TInsuranceUnpurchasePerson
>
getBuyList
(
@Param
(
"deptId"
)
String
deptId
,
@Param
(
"idCardList"
)
List
<
String
>
idCardList
);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TInsuranceUnpurchasePersonSalaryMapper.java
0 → 100644
View file @
363cb77b
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TInsuranceUnpurchasePersonSalary
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
/**
* 含风险项目不购买申请明细表-薪资关联表
*
* @author hgw
* @date 2025-1-15 11:54:52
*/
@Mapper
public
interface
TInsuranceUnpurchasePersonSalaryMapper
extends
BaseMapper
<
TInsuranceUnpurchasePersonSalary
>
{
/**
* 含风险项目不购买申请明细表简单分页查询-薪资关联
*
* @param tInsuranceUnpurchasePersonSalary 含风险项目不购买申请明细表-薪资关联
* @return
*/
IPage
<
TInsuranceUnpurchasePersonSalary
>
getTInsuranceUnpurchasePersonSalaryPage
(
Page
<
TInsuranceUnpurchasePersonSalary
>
page
,
@Param
(
"tInsuranceUnpurchasePersonSalary"
)
TInsuranceUnpurchasePersonSalary
tInsuranceUnpurchasePersonSalary
);
// 删除关联项
void
deletePersonSalaryBySalaryId
(
@Param
(
"salaryId"
)
String
salaryId
);
// 更新次数-1
void
updatePersonSalaryNumBySalaryId
(
@Param
(
"salaryId"
)
String
salaryId
);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryAccountMapper.java
View file @
363cb77b
...
...
@@ -237,4 +237,13 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
**/
int
getAccountIdByIdCard
(
@Param
(
"empIdCard"
)
String
empIdCard
);
/**
* @param salaryId 主表id
* @Description: 获取报账明细身份证
* @Author: hgw
* @Date: 2025/1/14 15:28
* @return: java.util.List<java.lang.String>
**/
List
<
TSalaryAccount
>
getIdCardListBySalaryId
(
@Param
(
"salaryId"
)
String
salaryId
);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TInsuranceUnpurchasePersonSalaryService.java
0 → 100644
View file @
363cb77b
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
service
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TInsuranceUnpurchasePersonSalary
;
/**
* 含风险项目不购买申请明细表-薪资关联
*
* @author hgw
* @date 2025-1-15 12:00:57
*/
public
interface
TInsuranceUnpurchasePersonSalaryService
extends
IService
<
TInsuranceUnpurchasePersonSalary
>
{
/**
* 含风险项目不购买申请明细表简单分页查询-薪资关联
*
* @param tInsuranceUnpurchasePerson 含风险项目不购买申请明细表-薪资关联
* @return
*/
IPage
<
TInsuranceUnpurchasePersonSalary
>
getTInsuranceUnpurchasePersonSalaryPage
(
Page
<
TInsuranceUnpurchasePersonSalary
>
page
,
TInsuranceUnpurchasePersonSalary
tInsuranceUnpurchasePerson
);
void
deletePersonSalaryBySalaryId
(
String
salaryId
);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TInsuranceUnpurchasePersonService.java
View file @
363cb77b
...
...
@@ -3,10 +3,13 @@ package com.yifu.cloud.plus.v1.yifu.salary.service;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
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.salary.entity.TInsuranceUnpurchasePerson
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonAddVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonSearchVo
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
/**
* 含风险项目不购买申请明细表
...
...
@@ -23,4 +26,18 @@ public interface TInsuranceUnpurchasePersonService extends IService<TInsuranceUn
IPage
<
TInsuranceUnpurchasePerson
>
getTInsuranceUnpurchasePersonPage
(
Page
<
TInsuranceUnpurchasePerson
>
page
,
TInsuranceUnpurchasePersonSearchVo
tInsuranceUnpurchasePerson
);
void
listExport
(
HttpServletResponse
response
,
TInsuranceUnpurchasePersonSearchVo
searchVo
);
List
<
TInsuranceUnpurchasePersonAddVo
>
getTInsuranceUnpurchasePersonList
(
String
id
);
List
<
TInsuranceUnpurchasePerson
>
getBuyList
(
String
deptId
,
List
<
String
>
idCardList
);
/**
* @param id 明细id
* @Description: 刷新社保状态
* @Author: hgw
* @Date: 2025/1/15 13:13
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R
<
String
>
getSocialWorkInjuryHandleById
(
String
id
);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryAccountService.java
View file @
363cb77b
...
...
@@ -229,4 +229,14 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> {
List
<
TSalaryTypeThreeExportEkpVo
>
getAccountThreeListByApplyNo
(
String
applyNo
);
List
<
TSalaryTypeFourExportEkpVo
>
getAccountFourListByApplyNo
(
String
applyNo
);
/**
* @param salaryId 主表id
* @Description: 获取报账身份证——提交校验使用
* @Author: hgw
* @Date: 2025/1/14 15:30
* @return: java.util.List<java.lang.String>
**/
List
<
TSalaryAccount
>
getIdCardListBySalaryId
(
String
salaryId
);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryEmployeeService.java
View file @
363cb77b
...
...
@@ -160,4 +160,13 @@ public interface TSalaryEmployeeService extends IService<TSalaryEmployee> {
**/
String
savePreNewEmpInfo
(
TSalaryEmployee
newEmp
);
/**
* @param empIdCardList 身份证
* @Description: 获取薪资人员信息
* @Author: hgw
* @Date: 2025/1/13 17:33
* @return: java.util.Map<java.lang.String, com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryEmployee>
**/
Map
<
String
,
TSalaryEmployee
>
getSalaryEmpMap
(
List
<
String
>
empIdCardList
);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryStandardService.java
View file @
363cb77b
...
...
@@ -22,9 +22,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.AccountByEkpDiffVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardExportVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSearchVo
;
...
...
@@ -144,4 +144,14 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> {
**/
int
getNum
(
String
deptId
,
String
setId
,
String
settleMonth
,
String
nowYear
);
/**
* @param s 工资
* @param user 登录人
* @Description: 判断薪资是否购买商险
* @Author: hgw
* @Date: 2025/1/14 11:01
* @return: java.lang.String
**/
R
<
List
<
SalaryRiskVo
>>
judegRisk
(
TSalaryStandard
s
,
YifuUser
user
);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java
View file @
363cb77b
...
...
@@ -13,15 +13,18 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ResultConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TInsuranceUnpurchaseApply
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TInsuranceUnpurchasePerson
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAtta
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TInsuranceUnpurchaseApplyMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TInsuranceUnpurchaseApplyService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TInsuranceUnpurchasePersonService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryAttaService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.impl.process.TInsuranceUnpurchaseApplyAuditProcess
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchaseApplySearchVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchaseApplyVo
;
...
...
@@ -40,12 +43,14 @@ import org.springframework.transaction.annotation.Transactional;
import
javax.annotation.Resource
;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.http.HttpServletResponse
;
import
java.net.URL
;
import
java.net.URLEncoder
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
* 含风险项目不购买申请表
...
...
@@ -59,13 +64,14 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
@Resource
private
TInsuranceUnpurchasePersonService
personService
;
@Resource
private
SocialDaprUtils
socialDaprUtil
;
@Resource
private
CacheManager
cacheManager
;
@Resource
private
TSalaryAttaService
tSalaryAttaService
;
@Resource
private
OSSUtil
ossUtil
;
@Resource
@Lazy
private
TInsuranceUnpurchaseApplyAuditProcess
tInsuranceUnpurchaseApplyAuditProcess
;
...
...
@@ -87,6 +93,7 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
if
(
Common
.
isNotNull
(
apply
))
{
apply
.
setDeleteFlag
(
CommonConstants
.
ONE_STRING
);
baseMapper
.
updateById
(
apply
);
personService
.
remove
(
Wrappers
.<
TInsuranceUnpurchasePerson
>
query
().
lambda
().
eq
(
TInsuranceUnpurchasePerson:
:
getParnetId
,
id
));
return
R
.
ok
();
}
else
{
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
...
...
@@ -154,15 +161,21 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
String
applyDetail
=
baseMapper
.
getMaxInusuranceDetailCode
();
//暂存不做校验
if
(
CommonConstants
.
ONE_STRING
.
equals
(
tInsuranceUnpurchaseApply
.
getSaveFlag
()))
{
tInsuranceUnpurchaseApply
.
setApplyNo
(
applyNo
);
tInsuranceUnpurchaseApply
.
setCreateBy
(
user
.
getId
());
tInsuranceUnpurchaseApply
.
setCreateName
(
user
.
getNickname
());
tInsuranceUnpurchaseApply
.
setCreateUserDeptName
(
user
.
getDeptName
());
tInsuranceUnpurchaseApply
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
tInsuranceUnpurchaseApply
.
setCreateTime
(
null
);
tInsuranceUnpurchaseApply
.
setUpdateTime
(
null
);
if
(
Common
.
isEmpty
(
tInsuranceUnpurchaseApply
.
getId
()))
{
tInsuranceUnpurchaseApply
.
setApplyNo
(
applyNo
);
tInsuranceUnpurchaseApply
.
setCreateBy
(
user
.
getId
());
tInsuranceUnpurchaseApply
.
setCreateName
(
user
.
getNickname
());
tInsuranceUnpurchaseApply
.
setCreateUserDeptName
(
user
.
getDeptName
());
tInsuranceUnpurchaseApply
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
baseMapper
.
insert
(
tInsuranceUnpurchaseApply
);
}
else
{
baseMapper
.
updateById
(
tInsuranceUnpurchaseApply
);
}
//更新附件
updateFileId
(
tInsuranceUnpurchaseApply
);
baseMapper
.
insert
(
tInsuranceUnpurchaseApply
);
List
<
TInsuranceUnpurchasePerson
>
personList
=
new
ArrayList
<>();
if
(
Common
.
isNotNull
(
tInsuranceUnpurchaseApply
.
getPersonList
()))
{
for
(
TInsuranceUnpurchasePersonAddVo
vo
:
tInsuranceUnpurchaseApply
.
getPersonList
())
{
...
...
@@ -188,6 +201,8 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
tInsuranceUnpurchaseApply
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
tInsuranceUnpurchaseApply
.
setApplyNo
(
applyNo
);
baseMapper
.
insert
(
tInsuranceUnpurchaseApply
);
//更新附件
updateFileId
(
tInsuranceUnpurchaseApply
);
List
<
TInsuranceUnpurchasePerson
>
personInfoList
=
new
ArrayList
<>();
for
(
TInsuranceUnpurchasePersonAddVo
vo
:
personList
)
{
TInsuranceUnpurchasePerson
person
=
new
TInsuranceUnpurchasePerson
();
...
...
@@ -242,7 +257,22 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
if
(
Common
.
isEmpty
(
apply
))
{
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
}
return
R
.
ok
();
List
<
TInsuranceUnpurchasePersonAddVo
>
personList
=
personService
.
getTInsuranceUnpurchasePersonList
(
id
);
apply
.
setPersonList
(
personList
);
//查询就职岗位和人数
if
(
Common
.
isNotNull
(
personList
)
&&
!
personList
.
isEmpty
())
{
Map
<
String
,
Long
>
map
=
personList
.
stream
().
collect
(
Collectors
.
groupingBy
(
TInsuranceUnpurchasePersonAddVo:
:
getPost
,
Collectors
.
counting
()));
apply
.
setPersonMap
(
map
);
}
List
<
TSalaryAtta
>
attaInfo
=
tSalaryAttaService
.
list
(
Wrappers
.<
TSalaryAtta
>
query
().
lambda
().
eq
(
TSalaryAtta:
:
getLinkId
,
id
));
if
(
attaInfo
!=
null
&&
!
attaInfo
.
isEmpty
())
{
URL
url
;
for
(
TSalaryAtta
a:
attaInfo
)
{
url
=
ossUtil
.
getObjectUrl
(
null
,
a
.
getAttaSrc
());
a
.
setAttaUrl
(
url
.
toString
());
}
}
return
R
.
ok
(
apply
);
}
public
List
<
TInsuranceUnpurchasePersonAddVo
>
addAndUpdCheck
(
TInsuranceUnpurchaseApply
tInsuranceUnpurchaseApply
)
{
...
...
@@ -299,6 +329,16 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
person
.
setCreateUserDeptId
(
tInsuranceUnpurchaseApply
.
getCreateUserDeptId
());
}
private
void
updateFileId
(
TInsuranceUnpurchaseApply
tInsuranceUnpurchaseApply
)
{
if
(
Common
.
isNotNull
(
tInsuranceUnpurchaseApply
.
getAttaIdList
()))
{
for
(
String
id
:
tInsuranceUnpurchaseApply
.
getAttaIdList
())
{
TSalaryAtta
atta
=
tSalaryAttaService
.
getById
(
id
);
atta
.
setLinkId
(
tInsuranceUnpurchaseApply
.
getId
());
tSalaryAttaService
.
updateById
(
atta
);
}
}
}
//获取申请编码
@Lock4j
(
expire
=
60000
,
acquireTimeout
=
1000
)
public
String
getCode
()
{
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchasePersonSalaryServiceImpl.java
0 → 100644
View file @
363cb77b
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
service
.
impl
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TInsuranceUnpurchasePersonSalary
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TInsuranceUnpurchasePersonSalaryMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TInsuranceUnpurchasePersonSalaryService
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.stereotype.Service
;
/**
* 含风险项目不购买申请明细表
*
* @author huych
* @date 2025-01-10 11:23:21
*/
@Log4j2
@Service
public
class
TInsuranceUnpurchasePersonSalaryServiceImpl
extends
ServiceImpl
<
TInsuranceUnpurchasePersonSalaryMapper
,
TInsuranceUnpurchasePersonSalary
>
implements
TInsuranceUnpurchasePersonSalaryService
{
/**
* 含风险项目不购买申请明细表简单分页查询-薪资关联
*
* @param tInsuranceUnpurchasePerson 含风险项目不购买申请明细表-薪资关联
* @return
*/
@Override
public
IPage
<
TInsuranceUnpurchasePersonSalary
>
getTInsuranceUnpurchasePersonSalaryPage
(
Page
<
TInsuranceUnpurchasePersonSalary
>
page
,
TInsuranceUnpurchasePersonSalary
tInsuranceUnpurchasePerson
)
{
return
baseMapper
.
getTInsuranceUnpurchasePersonSalaryPage
(
page
,
tInsuranceUnpurchasePerson
);
}
/**
* @param salaryId
* @Description: 删除薪资后,清除关联项与次数
* @Author: hgw
* @Date: 2025/1/15 13:04
* @return: void
**/
@Override
public
void
deletePersonSalaryBySalaryId
(
String
salaryId
)
{
baseMapper
.
deletePersonSalaryBySalaryId
(
salaryId
);
baseMapper
.
updatePersonSalaryNumBySalaryId
(
salaryId
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchasePersonServiceImpl.java
View file @
363cb77b
...
...
@@ -9,14 +9,19 @@ 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.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TInsuranceUnpurchasePerson
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TInsuranceUnpurchasePersonMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TInsuranceUnpurchasePersonService
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonAddVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonCardVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonVo
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.stereotype.Service
;
import
javax.annotation.Resource
;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.http.HttpServletResponse
;
import
java.net.URLEncoder
;
...
...
@@ -31,6 +36,10 @@ import java.util.List;
@Log4j2
@Service
public
class
TInsuranceUnpurchasePersonServiceImpl
extends
ServiceImpl
<
TInsuranceUnpurchasePersonMapper
,
TInsuranceUnpurchasePerson
>
implements
TInsuranceUnpurchasePersonService
{
@Resource
private
SocialDaprUtils
socialDaprUtil
;
/**
* 含风险项目不购买申请明细表简单分页查询
* @param tInsuranceUnpurchasePerson 含风险项目不购买申请明细表
...
...
@@ -87,4 +96,41 @@ public class TInsuranceUnpurchasePersonServiceImpl extends ServiceImpl<TInsuranc
}
}
@Override
public
List
<
TInsuranceUnpurchasePersonAddVo
>
getTInsuranceUnpurchasePersonList
(
String
id
)
{
return
baseMapper
.
getTInsuranceUnpurchasePersonList
(
id
);
}
@Override
public
List
<
TInsuranceUnpurchasePerson
>
getBuyList
(
String
deptId
,
List
<
String
>
idCardList
)
{
return
baseMapper
.
getBuyList
(
deptId
,
idCardList
);
}
/**
* @param id 明细id
* @Description: 刷新社保状态
* @Author: hgw
* @Date: 2025/1/15 13:22
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Override
public
R
<
String
>
getSocialWorkInjuryHandleById
(
String
id
)
{
TInsuranceUnpurchasePerson
person
=
this
.
getById
(
id
);
if
(
person
==
null
||
Common
.
isEmpty
(
person
.
getEmpIdcardNo
())||
Common
.
isEmpty
(
person
.
getEmpName
()))
{
return
R
.
failed
(
"未找到数据"
);
}
TInsuranceUnpurchasePersonCardVo
cardVo
=
new
TInsuranceUnpurchasePersonCardVo
();
cardVo
.
setEmpIdcardNo
(
person
.
getEmpIdcardNo
());
cardVo
.
setEmpName
(
person
.
getEmpName
());
R
<
Boolean
>
flag
=
socialDaprUtil
.
selectExitSocialInjury
(
cardVo
);
if
(
Common
.
isEmpty
(
flag
)
||
Boolean
.
FALSE
.
equals
(
flag
.
getData
()))
{
person
.
setSocialStatus
(
CommonConstants
.
ONE_STRING
);
}
else
{
person
.
setSocialStatus
(
CommonConstants
.
ZERO_STRING
);
}
this
.
updateById
(
person
);
return
R
.
ok
(
"成功"
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
View file @
363cb77b
...
...
@@ -642,4 +642,10 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
}
}
}
@Override
public
List
<
TSalaryAccount
>
getIdCardListBySalaryId
(
String
salaryId
)
{
return
baseMapper
.
getIdCardListBySalaryId
(
salaryId
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
363cb77b
...
...
@@ -1306,4 +1306,16 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
return
CommonConstants
.
SAVE_SUCCESS
;
}
@Override
public
Map
<
String
,
TSalaryEmployee
>
getSalaryEmpMap
(
List
<
String
>
empIdCardList
)
{
List
<
TSalaryEmployee
>
list
=
baseMapper
.
getListByIdCard
(
empIdCardList
);
Map
<
String
,
TSalaryEmployee
>
salaryEmpMap
=
new
HashMap
<>();
if
(
list
!=
null
&&
!
list
.
isEmpty
())
{
for
(
TSalaryEmployee
s
:
list
)
{
salaryEmpMap
.
put
(
s
.
getEmpIdcard
(),
s
);
}
}
return
salaryEmpMap
;
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
363cb77b
This diff is collapsed.
Click to expand it.
yifu-salary/yifu-salary-biz/src/main/resources/application.yml
View file @
363cb77b
...
...
@@ -50,7 +50,11 @@ security:
-
/salaryEmployeeSelect/getSalaryAccount
# 工资条查询明细通过openId控制
-
/tsalaryatta/ossUploadFile
# 工资条查询附件上传 无token
-
/tsalaryatta/ossFileDelete/**
# 工资条查询附件上传删除 无token
-
/tinsuranceunpurchaseapply/getAuditPageTemp
# 临时调试
-
/tinsuranceunpurchaseapply/getAuditCount
# 临时调试
-
/tinsuranceunpurchaseapply/auditTemp
# 临时调试
-
/tauditrecord/getAuditInfoByDomainIdAndAuditType
# 临时调试
-
/tinsuranceunpurchaseapply/temp/{id}
# 临时调试
# 文件上传相关 支持阿里云、华为云、腾讯、minio
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TInsuranceUnpurchasePersonMapper.xml
View file @
363cb77b
...
...
@@ -171,4 +171,32 @@
<include
refid=
"tInsuranceUnpurchasePerson_where"
/>
</where>
</select>
<select
id=
"getTInsuranceUnpurchasePersonList"
resultType=
"com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonAddVo"
>
SELECT
a.ID,
a.EMP_NAME empName,
a.EMP_IDCARD_NO empIdcardNo,
if(a.POST = '--','',post) post
FROM t_insurance_unpurchase_person a
where a.PARNET_ID = #{id}
</select>
<!--不购买商险,薪资使用 hgw-->
<select
id=
"getBuyList"
resultMap=
"tInsuranceUnpurchasePersonMap"
>
SELECT
ID,
EMP_NAME,
EMP_IDCARD_NO,
REASON_TYPE,
SOCIAL_STATUS,
SALARY_NUM
FROM t_insurance_unpurchase_person a
where STATUS = '3' AND (REASON_TYPE = '1' or (REASON_TYPE = '2' AND SALARY_NUM = 0) ) AND DEPT_ID = #{deptId} AND EMP_IDCARD_NO in
<foreach
item=
"idStr"
index=
"index"
collection=
"idCardList"
open=
"("
separator=
","
close=
")"
>
#{idStr}
</foreach>
</select>
</mapper>
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TInsuranceUnpurchasePersonSalaryMapper.xml
0 → 100644
View file @
363cb77b
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.yifu.cloud.plus.v1.yifu.salary.mapper.TInsuranceUnpurchasePersonSalaryMapper"
>
<resultMap
id=
"tInsuranceUnpurchasePersonSalaryMap"
type=
"com.yifu.cloud.plus.v1.yifu.salary.entity.TInsuranceUnpurchasePersonSalary"
>
<id
property=
"id"
column=
"ID"
/>
<result
property=
"parentId"
column=
"PARENT_ID"
/>
<result
property=
"salaryId"
column=
"SALARY_ID"
/>
<result
property=
"applyNo"
column=
"APPLY_NO"
/>
<result
property=
"salaryMonth"
column=
"SALARY_MONTH"
/>
<result
property=
"deleteFlag"
column=
"DELETE_FLAG"
/>
<result
property=
"createBy"
column=
"CREATE_BY"
/>
<result
property=
"createName"
column=
"CREATE_NAME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"updateBy"
column=
"UPDATE_BY"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
a.PARENT_ID,
a.SALARY_ID,
a.APPLY_NO,
a.SALARY_MONTH,
a.DELETE_FLAG,
a.CREATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_TIME
</sql>
<sql
id=
"tInsuranceUnpurchasePerson_where"
>
<if
test=
"tInsuranceUnpurchasePerson != null"
>
<if
test=
"tInsuranceUnpurchasePerson.id != null and tInsuranceUnpurchasePerson.id.trim() != ''"
>
AND a.ID = #{tInsuranceUnpurchasePerson.id}
</if>
<if
test=
"tInsuranceUnpurchasePerson.parentId != null and tInsuranceUnpurchasePerson.parentId.trim() != ''"
>
AND a.PARENT_ID = #{tInsuranceUnpurchasePerson.parentId}
</if>
<if
test=
"tInsuranceUnpurchasePerson.salaryId != null and tInsuranceUnpurchasePerson.salaryId.trim() != ''"
>
AND a.SALARY_ID = #{tInsuranceUnpurchasePerson.salaryId}
</if>
<if
test=
"tInsuranceUnpurchasePerson.applyNo != null and tInsuranceUnpurchasePerson.applyNo.trim() != ''"
>
AND a.APPLY_NO = #{tInsuranceUnpurchasePerson.applyNo}
</if>
<if
test=
"tInsuranceUnpurchasePerson.salaryMonth != null and tInsuranceUnpurchasePerson.salaryMonth.trim() != ''"
>
AND a.SALARY_MONTH = #{tInsuranceUnpurchasePerson.salaryMonth}
</if>
</if>
</sql>
<!--tInsuranceUnpurchasePerson简单分页查询-->
<select
id=
"getTInsuranceUnpurchasePersonSalaryPage"
resultMap=
"tInsuranceUnpurchasePersonSalaryMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_insurance_unpurchase_person_salary a
where DELETE_FLAG = 0
<include
refid=
"tInsuranceUnpurchasePerson_where"
/>
</select>
<!--删除关联项-->
<update
id=
"deletePersonSalaryBySalaryId"
>
update t_insurance_unpurchase_person_salary a
set a.DELETE_FLAG = 1
where a.SALARY_ID = #{salaryId}
</update>
<!--更新次数-1-->
<update
id=
"updatePersonSalaryNumBySalaryId"
>
update t_insurance_unpurchase_person a
left join t_insurance_unpurchase_person_salary b on a.id=b.PARENT_ID
set a.SALARY_NUM = (if(a.SALARY_NUM is null or a.SALARY_NUM = 0,1,a.SALARY_NUM) - 1)
where b.SALARY_ID = #{salaryId}
</update>
</mapper>
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @
363cb77b
...
...
@@ -1737,4 +1737,14 @@
<include
refid=
"where_export"
/>
</where>
</select>
<!-- 获取报账明细的身份证 -->
<select
id=
"getIdCardListBySalaryId"
resultMap=
"tSalaryAccountMap"
>
SELECT
a.EMP_NAME,
a.EMP_IDCARD
FROM t_salary_account a
where a.DELETE_FLAG = 0 and a.SALARY_FORM_ID = #{salaryId}
</select>
</mapper>
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @
363cb77b
...
...
@@ -89,6 +89,7 @@
<result
property=
"originalSetName"
column=
"ORIGINAL_SET_NAME"
/>
<result
property=
"newEmpUpdateFlag"
column=
"NEW_EMP_UPDATE_FLAG"
/>
<result
property=
"isFixedColumn"
column=
"IS_FIXED_COLUMN"
/>
<result
property=
"isCheckRisk"
column=
"IS_CHECK_RISK"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
...
...
@@ -155,7 +156,8 @@
a.SET_NAME,
a.ORIGINAL_SET_NAME,
a.NEW_EMP_UPDATE_FLAG,
a.IS_FIXED_COLUMN
a.IS_FIXED_COLUMN,
a.IS_CHECK_RISK
</sql>
<sql
id=
"tSalaryStandard_where"
>
<if
test=
"tSalaryStandard != null"
>
...
...
@@ -312,6 +314,9 @@
<if
test=
"tSalaryStandard.originalSetName != null and tSalaryStandard.originalSetName.trim() != ''"
>
AND a.ORIGINAL_SET_NAME = #{tSalaryStandard.originalSetName}
</if>
<if
test=
"tSalaryStandard.isCheckRisk != null "
>
AND a.IS_CHECK_RISK = #{tSalaryStandard.isCheckRisk}
</if>
</if>
</sql>
<!--tSalaryStandard简单分页查询-->
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
363cb77b
...
...
@@ -285,7 +285,8 @@ public class SocialFriendConfig {
// 户口所在地地址
cbrymdOne
.
put
(
"hkszddz"
,
areaName
);
// 户口性质
cbrymdOne
.
put
(
"hkxz"
,
"居民户口(含农业户口、非农业户口)"
);
//cbrymdOne.put("hkxz", "居民户口(含农业户口、非农业户口)")
cbrymdOne
.
put
(
"hkxz"
,
"本地居民户口"
);
// 居住地址
cbrymdOne
.
put
(
"jzdz"
,
areaName
);
// 居住地行政区
...
...
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