Commit c01b0003 authored by huyuchen's avatar huyuchen

huych-入离职登记提交

parent be7c56a2
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
import java.util.List;
@Data
public class TSettleDomainRegistListVo {
/**
* 合同主体项目编码
*/
private List<String> deptNos;
}
...@@ -483,4 +483,21 @@ public class TSettleDomainController { ...@@ -483,4 +483,21 @@ public class TSettleDomainController {
List<TDomainUpCsVo> list= JSONObject.parseArray(jsonStr, TDomainUpCsVo.class); List<TDomainUpCsVo> list= JSONObject.parseArray(jsonStr, TDomainUpCsVo.class);
return tSettleDomainService.updateProjectCsInfo(list); return tSettleDomainService.updateProjectCsInfo(list);
} }
/**
* 获取登录用户拥有的项目前端客服数据
*
* @param
* @return
* @Author huych
* @Date 2025-03-13
**/
@Operation(description = "获取登录用户拥有的项目前端客服数据)")
@Inner
@PostMapping("/getAllDeptByCustomerLoginName")
public TSettleDomainRegistListVo getAllDeptByCustomerLoginName(@RequestBody String userLoginName) {
TSettleDomainRegistListVo vo = new TSettleDomainRegistListVo();
vo.setDeptNos(tSettleDomainService.getAllDeptByCustomerLoginName(userLoginName));
return vo;
}
} }
...@@ -23,12 +23,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -23,12 +23,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain; import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*; import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.HashMap;
import java.util.List; import java.util.List;
/** /**
...@@ -115,4 +112,6 @@ public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> { ...@@ -115,4 +112,6 @@ public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
List<TSettleDomain> getAllInfoMap(); List<TSettleDomain> getAllInfoMap();
List<String> getAllDeptByCustomerLoginName(@Param(value = "userLoginName") String userLoginName);
} }
...@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpDisabilityInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain; import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*; import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
...@@ -88,6 +87,8 @@ public interface TSettleDomainService extends IService<TSettleDomain> { ...@@ -88,6 +87,8 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
List<String> getSettleDomainIdsByUserId(String id); List<String> getSettleDomainIdsByUserId(String id);
List<String> getAllDeptByCustomerLoginName(String userLoginName);
/** /**
* 获取用户所拥有的项目编码 * 获取用户所拥有的项目编码
*/ */
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
package com.yifu.cloud.plus.v1.yifu.archives.service.impl; package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...@@ -542,4 +541,9 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T ...@@ -542,4 +541,9 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
} }
return R.ok(Boolean.TRUE,CommonConstants.RESULT_DATA_SUCESS); return R.ok(Boolean.TRUE,CommonConstants.RESULT_DATA_SUCESS);
} }
@Override
public List<String> getAllDeptByCustomerLoginName(String userLoginName) {
return baseMapper.getAllDeptByCustomerLoginName(userLoginName);
}
} }
...@@ -638,4 +638,12 @@ ...@@ -638,4 +638,12 @@
t_settle_domain a t_settle_domain a
where a.DELETE_FLAG = '0' where a.DELETE_FLAG = '0'
</select> </select>
<select id="getAllDeptByCustomerLoginName" resultType="java.lang.String">
SELECT
distinct(a.DEPART_NO) as DEPART_NO
FROM
t_settle_domain a
where a.DELETE_FLAG = '0' and a.CS_LOGIN_NAME = #{userLoginName}
</select>
</mapper> </mapper>
...@@ -530,4 +530,19 @@ public class ArchivesDaprUtil { ...@@ -530,4 +530,19 @@ public class ArchivesDaprUtil {
public R<Boolean> saveOrDeleteDeptRelation(SysCspDeptVo vo) { public R<Boolean> saveOrDeleteDeptRelation(SysCspDeptVo vo) {
return HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/temployeeprojectbelongdept/inner/saveOrDeleteDeptRelation", JSON.toJSONString(vo), Boolean.class, SecurityConstants.FROM_IN); return HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/temployeeprojectbelongdept/inner/saveOrDeleteDeptRelation", JSON.toJSONString(vo), Boolean.class, SecurityConstants.FROM_IN);
} }
/**
* @Author huych
* @Description 获取登录人所有的项目对应的前端客服权限
* @Date 15:58 2025/3/13
* @Param
* @return
**/
public R<TSettleDomainRegistListVo> getAllDeptByCustomerLoginName(String userLoginName){
R<TSettleDomainRegistListVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/getAllDeptByCustomerLoginName",userLoginName, TSettleDomainRegistListVo.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
return R.failed("获取项目信息失败!");
}
return res;
}
} }
...@@ -44,7 +44,7 @@ public class EmployeeRegistrationPre extends BaseEntity { ...@@ -44,7 +44,7 @@ public class EmployeeRegistrationPre extends BaseEntity {
@Schema(description = "入职日期") @Schema(description = "入职日期")
private Date joinLeaveDate; private Date joinLeaveDate;
@Schema(description = "状态,0短信待发送,1信息待填写,2信息待审核,3拒绝入职") @Schema(description = "状态,0短信待发送,1信息待填写,2信息待审核,3拒绝入职,4已完成")
private String processStatus; private String processStatus;
@Schema(description = "前端客服") @Schema(description = "前端客服")
......
...@@ -81,6 +81,6 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration { ...@@ -81,6 +81,6 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration {
@Schema(description = "项目权限数组") @Schema(description = "项目权限数组")
@TableField(exist = false) @TableField(exist = false)
private Set<String> deptIdSet; private List<String> deptNoList;
} }
...@@ -28,6 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo; ...@@ -28,6 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpProjectStatusVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpProjectStatusVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeProjectBelongDeptSearchCspVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainRegistListVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
...@@ -124,8 +125,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -124,8 +125,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
long roleId = 1839501715787390978L; long roleId = 1839501715787390978L;
boolean isSsc = this.haveRole(user, roleId); boolean isSsc = this.haveRole(user, roleId);
if (isSsc) { if (!isSsc && !CommonConstants.ZERO_STRING.equals(user.getSystemFlag())) {
employeeRegistration.setCustomerUserLoginname(null); //获取项目信息
R<TSettleDomainRegistListVo> domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername());
if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos()) {
employeeRegistration.setDeptNoList(domainR.getData().getDeptNos());
} else {
employeeRegistration.setId(CommonConstants.ONE_STRING_NEGATE);
}
} }
return baseMapper.getEmployeeRegistrationPage(page, employeeRegistration); return baseMapper.getEmployeeRegistrationPage(page, employeeRegistration);
} }
......
...@@ -180,6 +180,13 @@ ...@@ -180,6 +180,13 @@
#{idStr} #{idStr}
</foreach> </foreach>
</if> </if>
<if test="employeeRegistration.deptNoList != null and employeeRegistration.deptNoList.size > 0">
AND a.dept_no in
<foreach item="idStr" index="index" collection="employeeRegistration.deptNoList" open="(" separator=","
close=")">
#{idStr}
</foreach>
</if>
<if test="employeeRegistration.authSql != null and employeeRegistration.authSql.trim() != ''"> <if test="employeeRegistration.authSql != null and employeeRegistration.authSql.trim() != ''">
${employeeRegistration.authSql} ${employeeRegistration.authSql}
</if> </if>
......
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