Skip to content

Y
yifu-mvp
Commit d33fcb27 authored by hongguangwu's avatar hongguangwu
Browse files
Options

Merge remote-tracking branch 'origin/MVP1.6.4' into MVP1.6.4

parents f823efe4 f5719ccd
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 21 deletions
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml
View file @ d33fcb27
...@@ -144,22 +144,24 @@ ...@@ -144,22 +144,24 @@
<!-- 根据结算单编码获取视图信息 --> <!-- 根据结算单编码获取视图信息 -->
<select id="selectSalarylViewBySettleNo" resultMap="BaseResultSocialStatusMap"> <select id="selectSalarylViewBySettleNo" resultMap="BaseResultSocialStatusMap">
select SELECT
a.detailsId, gongzi.fd_3b10afe8c70742 AS detailsId,
if(a.earningStatus = '已结算','0',if(a.earningStatus = '结算中','1',if(a.earningStatus = '已冻结','3','2'))) earningStatus, if(gongzi.fd_3adfee4ba5ad36 = '已结算','0',if(gongzi.fd_3adfee4ba5ad36 = '结算中','1',if(gongzi.fd_3adfee4ba5ad36 = '已冻结','3','2'))) earningStatus,
if(a.receiptStatus = '已收','0',if(a.receiptStatus = '垫付','2','1')) receiptStatus, if(jiesuandan.fd_3b46bb64c5a172 = '已收','0',if(jiesuandan.fd_3b46bb64c5a172 = '垫付','2','1')) receiptStatus,
if(a.zhichuEarningStatus = '已结算','0',if(a.zhichuEarningStatus = '结算中','1','2')) zhichuEarningStatus, if(gongzi.fd_3adfeef9440ab2 = '已结算','0',if(gongzi.fd_3adfeef9440ab2 = '结算中','1','2')) zhichuEarningStatus,
if(a.payStatus = '已付','0','1') payStatus if(fukuan.fd_3b148bc0c28e48 = '已付','0','1') payStatus
from FROM
view_salary_info a ekp_salary_info gongzi
LEFT JOIN ekp_39864c6f16e8f4f9ebc3 jiesuandan ON gongzi.fd_3adfee5dd14866 = jiesuandan.fd_3adff6ff7f48e4
LEFT JOIN ekp_db4ed54e25543f4b7a9a fukuan ON gongzi.fd_id = fukuan.fd_3b1fe00b0f5dde
where where
1 = 1 1 = 1
<if test="payFlag != null and payFlag != '' and payFlag == 0"> <if test="payFlag != null and payFlag != '' and payFlag == 0">
and a.earningNo = #{settleNo} and gongzi.fd_3adfee5dd14866 = #{settleNo}
</if> </if>
<if test="payFlag != null and payFlag != '' and payFlag == 1"> <if test="payFlag != null and payFlag != '' and payFlag == 1">
and a.zhichuEarningNo = #{settleNo} and gongzi.fd_3aeadf17522642 = #{settleNo}
</if> </if>
</select> </select>
</mapper> </mapper>
......
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java
View file @ d33fcb27
...@@ -501,7 +501,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl ...@@ -501,7 +501,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
List<PersonVo> list = ldapUtil.getAllPersons(); List<PersonVo> list = ldapUtil.getAllPersons();
if (null != list) { if (null != list) {
List<SysUser> listUser = this.list(Wrappers.<SysUser>query().lambda() List<SysUser> listUser = this.list(Wrappers.<SysUser>query().lambda()
.eq(SysUser::getType, CommonConstants.STATUS_NORMAL) .eq(SysUser::getType, CommonConstants.ZERO_STRING)
.eq(SysUser::getSystemFlag, CommonConstants.ONE_STRING)
.eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL)); .eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL));
List<String> list1 = listUser.stream().map(SysUser::getUsername).collect(Collectors.toList()); List<String> list1 = listUser.stream().map(SysUser::getUsername).collect(Collectors.toList());
//筛选出不存在的用户重置为不可用 //筛选出不存在的用户重置为不可用
...@@ -509,10 +510,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl ...@@ -509,10 +510,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
List<String> collect = list1.stream().filter(s -> !list2.contains(s) List<String> collect = list1.stream().filter(s -> !list2.contains(s)
).collect(Collectors.toList()); ).collect(Collectors.toList());
log.info("要重置为不可用的用户列表：" + collect); log.info("要重置为不可用的用户列表：" + collect);
LambdaUpdateWrapper<SysUser> settleUpdate = new LambdaUpdateWrapper<>(); if (!collect.isEmpty()) {
settleUpdate.set(SysUser::getDelFlag,CommonConstants.ONE_STRING); LambdaUpdateWrapper<SysUser> settleUpdate = new LambdaUpdateWrapper<>();
settleUpdate.in(SysUser::getUsername,collect); settleUpdate.in(SysUser::getUsername, collect)
this.update(settleUpdate); .set(SysUser::getDelFlag, CommonConstants.ONE_STRING);
this.update(settleUpdate);
}
List<PersonVo> updateList = new ArrayList<>(); List<PersonVo> updateList = new ArrayList<>();
List<PersonVo> insertList = new ArrayList<>(); List<PersonVo> insertList = new ArrayList<>();
...@@ -775,7 +778,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl ...@@ -775,7 +778,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* @return * @return
*/ */
private void updateOrSaveUser(JSONArray updateParamsArr) { private void updateOrSaveUser(JSONArray updateParamsArr) {
List<SysUser> listUser = this.list(Wrappers.<SysUser>query().lambda().eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL)); List<SysUser> listUser = this.list(Wrappers.<SysUser>query().lambda()
.eq(SysUser::getType, CommonConstants.STATUS_NORMAL)
.eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL));
List<String> list1 = listUser.stream().map(SysUser::getUsername).collect(Collectors.toList()); List<String> list1 = listUser.stream().map(SysUser::getUsername).collect(Collectors.toList());
List<PersonVo> updateList = new ArrayList<>(); List<PersonVo> updateList = new ArrayList<>();
List<PersonVo> insertList = new ArrayList<>(); List<PersonVo> insertList = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment