Commit f774e833 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.9-fxj' into MVP1.7.9-fxj

parents 5576d361 7087e084
...@@ -567,4 +567,17 @@ public class TSettleDomain extends BaseEntity { ...@@ -567,4 +567,17 @@ public class TSettleDomain extends BaseEntity {
@Schema(description ="登录账号") @Schema(description ="登录账号")
private String csLoginName; private String csLoginName;
/**
* 项目负责人
*/
@Schema(description = "项目负责人",name = "projectManager")
private String projectManager ;
/**
* 项目负责人
*/
@TableField(exist = false)
@Schema(description = "项目负责人姓名")
private String projectManagerName ;
} }
...@@ -463,4 +463,10 @@ public class TSettleDomainEkpVo implements Serializable { ...@@ -463,4 +463,10 @@ public class TSettleDomainEkpVo implements Serializable {
*/ */
@Schema(description = "事业部",name = "division") @Schema(description = "事业部",name = "division")
private String division ; private String division ;
/**
* 项目负责人
*/
@Schema(description = "项目负责人",name = "projectManager")
private String projectManager ;
} }
...@@ -25,4 +25,10 @@ public class TSettleDomainUpServerTeamVo implements Serializable { ...@@ -25,4 +25,10 @@ public class TSettleDomainUpServerTeamVo implements Serializable {
*/ */
@Schema(description = "EKP的服务团队", name = "serviceTeam") @Schema(description = "EKP的服务团队", name = "serviceTeam")
private String serviceTeam; private String serviceTeam;
/**
* 项目负责人
*/
@Schema(description = "项目负责人",name = "projectManager")
private String projectManager ;
} }
...@@ -132,7 +132,7 @@ public class TSettleDomainController { ...@@ -132,7 +132,7 @@ public class TSettleDomainController {
@Operation(summary = "通过id查询", description = "通过id查询") @Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/{id}") @GetMapping("/{id}")
public R<TSettleDomain> getById(@PathVariable("id") String id) { public R<TSettleDomain> getById(@PathVariable("id") String id) {
return R.ok(tSettleDomainService.getById(id)); return tSettleDomainService.getByIdAsso(id);
} }
/** /**
......
...@@ -140,4 +140,6 @@ public interface TSettleDomainService extends IService<TSettleDomain> { ...@@ -140,4 +140,6 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
R<Boolean> changeIssueStatus(ChangeIssueStatusVo changeIssueStatusVo); R<Boolean> changeIssueStatus(ChangeIssueStatusVo changeIssueStatusVo);
R<Boolean> updateProjectCsInfo(List<TDomainUpCsVo> list); R<Boolean> updateProjectCsInfo(List<TDomainUpCsVo> list);
R<TSettleDomain> getByIdAsso(String id);
} }
...@@ -518,9 +518,23 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T ...@@ -518,9 +518,23 @@ 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);
} }
/**
* @Author fxj
* @Description 同步 项目人员权限(服务团队、项目负责人)
* @Date 18:07 2025/3/31
**/
private void initServerTeamPermission(TSettleDomain domain) { private void initServerTeamPermission(TSettleDomain domain) {
R<SysUserListVo> res;
if (Common.isNotNull(domain.getServiceTeam())){ if (Common.isNotNull(domain.getServiceTeam())){
R<SysUserListVo> res = upmsDaprUtils.getUserIdsByUserNames(domain.getServiceTeam()); res = upmsDaprUtils.getUserIdsByUserNames(domain.getServiceTeam());
if (Common.isNotNull(res) && Common.isNotNull(res.getData()) && Common.isNotNull(res.getData().getUserList())){
// 先清理缓存
this.removeSettleCache(null, res.getData().getUserIds());
saveForEkp(res.getData().getUserList(), domain);
}
}
if (Common.isNotNull(domain.getProjectManager())){
res = upmsDaprUtils.getUserIdsByUserNames(domain.getProjectManager());
if (Common.isNotNull(res) && Common.isNotNull(res.getData()) && Common.isNotNull(res.getData().getUserList())){ if (Common.isNotNull(res) && Common.isNotNull(res.getData()) && Common.isNotNull(res.getData().getUserList())){
// 先清理缓存 // 先清理缓存
this.removeSettleCache(null, res.getData().getUserIds()); this.removeSettleCache(null, res.getData().getUserIds());
...@@ -564,6 +578,35 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T ...@@ -564,6 +578,35 @@ 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);
} }
/**
* @Author fxj
* @Description 获取项目基本信息,含项目负责人
* @Date 18:05 2025/3/31
**/
@Override
public R<TSettleDomain> getByIdAsso(String id) {
TSettleDomain domain = baseMapper.selectById(id);
if (Common.isNotNull(domain) && Common.isNotNull(domain.getProjectManager())){
if (Common.isNotNull(domain.getProjectManager())){
R<SysUserListVo> res = upmsDaprUtils.getUserIdsByUserNames(domain.getProjectManager());
if (Common.isNotNull(res) && Common.isNotNull(res.getData()) && Common.isNotNull(res.getData().getUserList())){
StringBuilder manager = new StringBuilder();
res.getData().getUserList().forEach(user->{
if (Common.isNotNull(user.getUserId())){
if (Common.isEmpty(manager.toString())){
manager.append(user.getNickname());
}else if (Common.isNotNull(user.getNickname())){
manager.append(",").append(user.getNickname());
}
}
});
domain.setProjectManager(manager.toString());
}
}
}
return R.ok(domain);
}
@Override @Override
public List<String> getAllDeptByCustomerLoginName(String userLoginName) { public List<String> getAllDeptByCustomerLoginName(String userLoginName) {
return baseMapper.getAllDeptByCustomerLoginName(userLoginName); return baseMapper.getAllDeptByCustomerLoginName(userLoginName);
......
...@@ -26,7 +26,7 @@ mybatis-plus: ...@@ -26,7 +26,7 @@ mybatis-plus:
logic-not-delete-value: 0 logic-not-delete-value: 0
configuration: configuration:
map-underscore-to-camel-case: true map-underscore-to-camel-case: true
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# spring security 配置 # spring security 配置
security: security:
......
...@@ -105,6 +105,9 @@ ...@@ -105,6 +105,9 @@
<result property="csName" column="cs_name"/> <result property="csName" column="cs_name"/>
<result property="csPhone" column="cs_phone"/> <result property="csPhone" column="cs_phone"/>
<result property="csLoginName" column="cs_login_name"/> <result property="csLoginName" column="cs_login_name"/>
<!-- 2025-03-31 FXJ V1.7.9 -->
<result property="projectManager" column="PROJECT_MANAGER"/>
</resultMap> </resultMap>
<resultMap id="tSettleDomainTwoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.SecondBelongVo"> <resultMap id="tSettleDomainTwoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.SecondBelongVo">
...@@ -194,7 +197,8 @@ ...@@ -194,7 +197,8 @@
a.DIVISION, a.DIVISION,
a.cs_name, a.cs_name,
a.cs_phone, a.cs_phone,
a.cs_login_name a.cs_login_name,
a.PROJECT_MANAGER
</sql> </sql>
<resultMap id="tSettleDomainSelectVoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo"> <resultMap id="tSettleDomainSelectVoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo">
...@@ -234,6 +238,9 @@ ...@@ -234,6 +238,9 @@
<result property="csName" column="cs_name"/> <result property="csName" column="cs_name"/>
<result property="csPhone" column="cs_phone"/> <result property="csPhone" column="cs_phone"/>
<result property="csLoginName" column="cs_login_name"/> <result property="csLoginName" column="cs_login_name"/>
<!-- 2025-03-31 FXJ V1.7.9 -->
<result property="projectManager" column="PROJECT_MANAGER"/>
</resultMap> </resultMap>
<select id="getPage" resultMap="tSettleDomainMap"> <select id="getPage" resultMap="tSettleDomainMap">
...@@ -434,7 +441,7 @@ ...@@ -434,7 +441,7 @@
a.DIVISION, a.DIVISION,
a.cs_name, a.cs_name,
a.cs_phone, a.cs_phone,
a.cs_login_name a.cs_login_name,a.PROJECT_MANAGER
FROM FROM
t_settle_domain a t_settle_domain a
<if test="userId != null and userId.trim() != '-999'"> <if test="userId != null and userId.trim() != '-999'">
......
...@@ -228,4 +228,8 @@ public class RefundExportListVo implements Serializable { ...@@ -228,4 +228,8 @@ public class RefundExportListVo implements Serializable {
*/ */
@Schema(description = "是否地市自购") @Schema(description = "是否地市自购")
private String isAdress; private String isAdress;
@Schema(description ="客户名称")
private String unitName;
} }
...@@ -1212,7 +1212,7 @@ ...@@ -1212,7 +1212,7 @@
refund.CREATE_NAME as createName, refund.CREATE_NAME as createName,
a.REDUCE_HANDLE_STATUS as reduceHandleStatus, a.REDUCE_HANDLE_STATUS as reduceHandleStatus,
refund.REMARK as remark, refund.REMARK as remark,
a.IS_ADRESS as isAdress a.IS_ADRESS as isAdress,a.UNIT_NAME as unitName
from from
t_insurance_detail a, t_insurance_detail a,
t_insurance_refund refund t_insurance_refund refund
...@@ -1250,7 +1250,7 @@ ...@@ -1250,7 +1250,7 @@
refund.CREATE_NAME as createName, refund.CREATE_NAME as createName,
a.POLICY_NO as policyNo, a.POLICY_NO as policyNo,
refund.REMARK as remark, refund.REMARK as remark,
a.IS_ADRESS as isAdress a.IS_ADRESS as isAdress,a.UNIT_NAME as unitName
from from
t_insurance_detail a, t_insurance_detail a,
t_insurance_refund refund t_insurance_refund refund
......
...@@ -407,6 +407,16 @@ ...@@ -407,6 +407,16 @@
LEFT JOIN sys_org_element e on e.fd_id = d.fd_3ae55447e30d62 LEFT JOIN sys_org_element e on e.fd_id = d.fd_3ae55447e30d62
JOIN sys_org_person p on e.fd_id=p.fd_id JOIN sys_org_person p on e.fd_id=p.fd_id
where d.fd_id = #{fdId} where d.fd_id = #{fdId}
union ALL
select
e.fd_name EMP_NAME,p.fd_login_name EMP_LOGIN_NAME,SUBSTRING_INDEX(SUBSTRING_INDEX(e.fd_ldap_dn,',ou', 2),',ou=', -1) EMP_DEPT
,'5' PERMISSION_TYPE,d.fd_3a829ae9bab760 NAME,d.fd_3a829aea0b84a4 CODE,0 SOURCE_TYPE
,'1' IS_CONTAINS,'0' PERMISSION_STATUS,'1' DELETE_FLAG,e.fd_id USER_ID,d.fd_id DOMAIN_ID
from ekp_fb3b8d0c8f148639b8e2 d
LEFT JOIN sys_org_element e on e.fd_id = d.fd_dept_manager
JOIN sys_org_person p on e.fd_id=p.fd_id
where d.fd_id = #{fdId}
) a GROUP BY a.USER_ID ) a GROUP BY a.USER_ID
</select> </select>
......
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