diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index e9b759bb..7a425b15 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java @@ -641,6 +641,8 @@ public class SysUserController { public R updateCostExtUserByCostIds(@RequestBody SysFlowLeaveBo param){ if(param.getTargetTypeNum().equals(1)){ sysUserFlowApplication.updateCostExtUserByCostIds(param.getTargetIds(),param.getUserId()); + }else if (param.getTargetTypeNum().equals(2)){ + sysUserFlowApplication.updateCostExtUserByPolicyIds(param.getTargetIds(),param.getUserId()); } return R.ok(); } @@ -654,6 +656,8 @@ public class SysUserController { public R cancelCostExtUserByCostId(SysFlowCancelBo param){ if(param.getTargetTypeNum().equals(1)){ sysUserFlowApplication.cancelCostExtUserByCostIds(param.getTargetIds()); + }else if (param.getTargetTypeNum().equals(2)){ + sysUserFlowApplication.cancelCostExtUserByPolicyIds(param.getTargetIds()); } return R.ok(); } @@ -667,7 +671,9 @@ public class SysUserController { @Transactional(rollbackFor = Exception.class) public R extendTranData(SysFlowUserBo param){ if(param.getTargetTypeNum().equals(1)){ - sysUserFlowApplication.tranCostApplyAndVerification(param.getUserId(),param.getUserId()); + sysUserFlowApplication.tranCostApplyAndVerification(param.getUserId(),param.getExtendUserId()); + }else if (param.getTargetTypeNum().equals(2)){ + sysUserFlowApplication.tranPolicy(param.getUserId(), param.getExtendUserId()); } return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserFlowApplication.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserFlowApplication.java index 15585826..2d1a2682 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserFlowApplication.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserFlowApplication.java @@ -8,6 +8,7 @@ import com.qs.serve.modules.sys.mapper.SysUserMapper; import com.qs.serve.modules.tbs.entity.TbsCostApply; import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper; import com.qs.serve.modules.tbs.service.TbsCostApplyService; +import com.qs.serve.modules.tzc.mapper.TzcPolicyMapper; import com.qs.serve.modules.vtb.entity.VtbVerification; import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper; import lombok.AllArgsConstructor; @@ -30,6 +31,7 @@ public class SysUserFlowApplication { private final TbsCostApplyMapper tbsCostApplyMapper; private final VtbVerificationMapper verificationMapper; + private final TzcPolicyMapper tzcPolicyMapper; private final SysUserMapper sysUserMapper; /** @@ -62,10 +64,40 @@ public class SysUserFlowApplication { * 费用核销 取消继承人 * @param costIds */ + @Transactional(rollbackFor = Exception.class) public void cancelCostExtUserByCostIds(List costIds){ tbsCostApplyMapper.cancelCostExtUserByCostId(costIds); verificationMapper.cancelCostExtUserByCostIds(costIds); } + /** + * 政策 设置数据的继承人 + * @param policyIds + * @param targetUserId + * @return + */ + public void updateCostExtUserByPolicyIds(List policyIds,String targetUserId){ + SysUser sysUser = sysUserMapper.selectById(targetUserId); + tzcPolicyMapper.updateCostExtUserByPolicyIds(policyIds,sysUser); + } + + /** + * 政策 取消继承人 + * @param costIds + */ + public void cancelCostExtUserByPolicyIds(List costIds){ + tzcPolicyMapper.cancelCostExtUserByPolicyIds(costIds); + } + /** + * 政策 任务交付 + */ + @Transactional(rollbackFor = Exception.class) + public void tranPolicy(String sourUserId,String targetUserId){ + if(!StringUtils.hasText(targetUserId)){ + return; + } + SysUser sysUser = sysUserMapper.selectById(targetUserId); + tzcPolicyMapper.updatePolicyExtUser(sourUserId,sysUser); + } } diff --git a/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicy.java b/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicy.java index 8b21626b..3d063b57 100644 --- a/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicy.java +++ b/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicy.java @@ -141,6 +141,13 @@ public class TzcPolicy implements Serializable { @JsonProperty private String delFlag; + /** + * 业务继承人 + */ + private String extUserId; + private String extUserCode; + private String extUserName; + @TableField(exist = false) List policyItemList; diff --git a/src/main/java/com/qs/serve/modules/tzc/mapper/TzcPolicyMapper.java b/src/main/java/com/qs/serve/modules/tzc/mapper/TzcPolicyMapper.java index 2f928950..2951c7ee 100644 --- a/src/main/java/com/qs/serve/modules/tzc/mapper/TzcPolicyMapper.java +++ b/src/main/java/com/qs/serve/modules/tzc/mapper/TzcPolicyMapper.java @@ -1,7 +1,12 @@ package com.qs.serve.modules.tzc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.tzc.entity.TzcPolicy; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; + +import java.util.List; /** * 政策 Mapper @@ -10,5 +15,33 @@ import com.qs.serve.modules.tzc.entity.TzcPolicy; */ public interface TzcPolicyMapper extends BaseMapper { + /** + * 设置数据的继承人 + * @param policyIds + * @param sysUser + * @return + */ + int updateCostExtUserByPolicyIds(@Param("policyIds") List policyIds, @Param("obj") SysUser sysUser); + + /** + * 设空继承人 + * @param policyIds + * @return + */ + int cancelCostExtUserByPolicyIds(@Param("policyIds") List policyIds); + + /** + * 替换继承人 + * @param userId + * @param sysUser + * @return + */ + @Update( + "update tzc_policy " + + " set ext_user_id = #{obj.id},ext_user_id=#{obj.code},ext_user_name=#{obj.name}" + + " where policy_status!=0 and (user_id = #{userId} or ext_user_id = #{userId}) and del_flag=0" + ) + int updatePolicyExtUser(@Param("userId") String userId,@Param("obj") SysUser sysUser); + } diff --git a/src/main/resources/mapper/tzc/TzcPolicyMapper.xml b/src/main/resources/mapper/tzc/TzcPolicyMapper.xml new file mode 100644 index 00000000..1e321a4e --- /dev/null +++ b/src/main/resources/mapper/tzc/TzcPolicyMapper.xml @@ -0,0 +1,24 @@ + + + + + + + update tzc_policy + set ext_user_id = #{obj.id},ext_user_id=#{obj.code},ext_user_name=#{obj.name} + where del_flag=0 and id in + + #{selectId} + + + + + update vtb_verification set ext_user_id = null,ext_user_id=null,ext_user_name=null where cost_apply_id in + + #{selectId} + + + +