mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
mx 2024-11-13 12:08:09 +08:00
parent 2fc23fe47a
commit 066ad475cd
12 changed files with 74 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pusong-admin/src/main/java/com/pusong/web/controller/AuthController.java
View File

@ -125,6 +125,7 @@ public class AuthController {
dto = new WebSocketMessageDto();
// dto.setMessage(sysNotice.getNoticeContent());
SysNoticeVo vo = MapstructUtils.convert(sysNotice, SysNoticeVo.class);
vo.setLogin(true);
dto.setMessage(JsonUtils.toJsonString(vo));
dto.setSessionKeys(List.of(userId));
WebSocketUtils.publishMessage(dto);

4
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/FreeApproverServiceImpl.java
View File

@ -78,7 +78,7 @@ public class FreeApproverServiceImpl extends ApproverAbstractServiceImpl {
// contractInfoService.updateByCode(info);
// }
noticeService.sendNotice(SysNoticeBo.getFreeTaskInstance(psApproverRecord.getCreateBy(), psCompanyInfoVo.getCompanyName()));
noticeService.sendNotice(SysNoticeBo.getFreeTaskToRoleInstance(psCompanyInfoVo.getCompanyName()));
// noticeService.sendNotice(SysNoticeBo.getFreeTaskToRoleInstance(psCompanyInfoVo.getCompanyName()));
}
@ -91,7 +91,7 @@ public class FreeApproverServiceImpl extends ApproverAbstractServiceImpl {
public void fail(PsApproverRecord psApproverRecord) {
PsCompanyInfoVo psCompanyInfoVo = companyInfoService.queryById(Long.valueOf(psApproverRecord.getBusinessId()));
noticeService.sendNotice(SysNoticeBo.getFreeTaskErrorToUidInstance(psApproverRecord.getCreateBy(), psCompanyInfoVo.getCompanyName(), psApproverRecord.getApproverDesc()));
noticeService.sendNotice(SysNoticeBo.getFreeTaskErrorToRoleInstance(psCompanyInfoVo.getCompanyName(), psApproverRecord.getApproverDesc()));
// noticeService.sendNotice(SysNoticeBo.getFreeTaskErrorToRoleInstance(psCompanyInfoVo.getCompanyName(), psApproverRecord.getApproverDesc()));
}
/**

5
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java
View File

@ -46,6 +46,7 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl
public void success(PsApproverRecord psApproverRecord) {
//查询合同信息
PsContractInfoVo info = psContractInfoService.queryContractByCode(psApproverRecord.getContractCode());
psContractInfoService.fillMoney(info);
//修改回款记录状态
PsContractPay update = new PsContractPay();
// if(StringUtils.isNotBlank(psApproverRecord.getUpdateData())){
@ -60,9 +61,11 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl
updateInfo.setContractCode(info.getContractCode());
if("1".equals(info.getIsDue())){
if(StringUtils.equals(ContractStatusEnum.CREATE.getCode(), info.getContractStatus())){
if (info.getResidualMoney().doubleValue() <= 0){
updateInfo.setContractStatus(ContractStatusEnum.SUCCESS.getCode());
psContractInfoService.updateByCode(updateInfo);
}
}
}else{
if(StringUtils.equals(ContractStatusEnum.CREATE.getCode(), info.getContractStatus())){
updateInfo.setContractStatus(ContractStatusEnum.RETURN.getCode());
@ -93,7 +96,7 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl
taskMainService.insertBatch(psTaskMainList);
}
psContractInfoService.fillMoney(info);
if (ContractStatusEnum.CREATE.getCode().equals(info.getContractStatus())){
noticeService.sendNotice(SysNoticeBo.getFirstPayInstance(info.getCustomManager(), info.getPsCustomInfoVo().getCustomName()));
}else{

14
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java
View File

@ -38,6 +38,7 @@ import jakarta.annotation.Resource;
import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
@ -66,8 +67,9 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService {
private final PsCompanyFollowMapper psCompanyFollowMapper;
@Resource
@Autowired
private PsApproverRecordMapper recordMapper;
@Autowired
private SysUserMapper sysUserMapper;
private final ISysNoticeService noticeService;
@ -225,13 +227,21 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService {
psCompanyFollowMapper.delete(lqw);
PsCompanyInfoVo psCompanyInfoVo = queryById(bo.getCompanyId());
List<PsCompanyFollow> listInsert = new ArrayList<>();
QueryWrapper<SysUser> userQuery = new QueryWrapper<>();
userQuery.select("nick_name");
userQuery.in("user_id", bo.getListUserId());
List<SysUserVo> sysUserVos = sysUserMapper.selectUserList2(userQuery);
String followNames = sysUserVos.stream().map(SysUserVo::getNickName).collect(Collectors.joining(","));
for (Long followUser : bo.getListUserId()) {
PsCompanyFollow psCompanyFollow = new PsCompanyFollow();
psCompanyFollow.setCompanyId(bo.getCompanyId());
psCompanyFollow.setUserId(followUser);
listInsert.add(psCompanyFollow);
noticeService.sendNotice(SysNoticeBo.getFollowInstance(followUser, psCompanyInfoVo.getCompanyName()));
noticeService.sendNotice(SysNoticeBo.getFollowInstance(followUser, psCompanyInfoVo.getCompanyName(), followNames));
}
psCompanyFollowMapper.insertBatch(listInsert);
}

1
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java
View File

@ -522,6 +522,7 @@ public class PsTaskServiceImpl implements IPsTaskService {
QueryWrapper<PsTaskAppoint> removeParam = new QueryWrapper<>();
removeParam.eq("task_id", id);
removeParam.eq("appoint_type", appointType);
removeParam.in("executor", remove);
appointMapper.delete(removeParam);

6
pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysNoticeBo.java
View File

@ -370,12 +370,12 @@ public class SysNoticeBo extends BaseEntity {
noticeBo.setJumpType(0);
return noticeBo;
}
public static SysNoticeBo getFollowInstance(long uid, String serviceCompanyName){
public static SysNoticeBo getFollowInstance(long uid, String serviceCompanyName, String followNames){
SysNoticeBo noticeBo = new SysNoticeBo();
noticeBo.setNoticeType("1");
noticeBo.setNoticeTitle("通知");
noticeBo.setStatus("0");
noticeBo.setNoticeContent("【"+ serviceCompanyName +"】的跟进人员分配成功，跟进服务人员：财务人员1、财务人员2");
noticeBo.setNoticeContent("【"+ serviceCompanyName +"】的跟进人员分配成功，跟进服务人员：" + followNames);
noticeBo.setRecUid(uid);
noticeBo.setJumpType(0);
return noticeBo;
@ -478,7 +478,7 @@ public class SysNoticeBo extends BaseEntity {
noticeBo.setNoticeType("1");
noticeBo.setNoticeTitle("通知");
noticeBo.setStatus("0");
noticeBo.setNoticeContent("外勤人员【"+ executeName +"】已完成【"+ serviceCompanyName +"】的外勤任务");
noticeBo.setNoticeContent("特勤人员【"+ executeName +"】已完成【"+ serviceCompanyName +"】的特勤任务");
noticeBo.setRecRole(Arrays.asList(RoleEnum.zxzg.getCode()));
noticeBo.setJumpType(0);
return noticeBo;

5
pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysNoticeVo.java
View File

@ -80,4 +80,9 @@ public class SysNoticeVo implements Serializable {
*/
private int readed;
/**
* 是否为登录时的推送，前端用来判断最大弹窗数
*/
private boolean login;
}

3
pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysUserMapper.java
View File

@ -32,6 +32,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
})
List<SysUserVo> selectUserList(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
List<SysUserVo> selectUserList2(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
/**
* 根据条件分页查询用户列表
*
@ -55,6 +57,7 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
@DataColumn(key = "userName", value = "u.user_id")
})
Page<SysUserVo> selectAllocatedList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
Page<SysUserVo> selectAllocatedListIgnorePermission(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
/**
* 根据条件分页查询未分配用户角色列表

1
pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysUserService.java
View File

@ -33,6 +33,7 @@ public interface ISysUserService {
* @return 用户信息集合信息
*/
TableDataInfo<SysUserVo> selectAllocatedList(SysUserBo user, PageQuery pageQuery);
TableDataInfo<SysUserVo> selectAllocatedListIgnorePermission(SysUserBo user, PageQuery pageQuery);
/**
* 根据条件分页查询未分配用户角色列表

2
pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysNoticeServiceImpl.java
View File

@ -130,7 +130,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService {
query.setRoleKey(bo.getRecRole());
PageQuery pageQuery = new PageQuery();
pageQuery.setPageSize(999);
TableDataInfo<SysUserVo> sysUserVoTableDataInfo = userService.selectAllocatedList(query, pageQuery);
TableDataInfo<SysUserVo> sysUserVoTableDataInfo = userService.selectAllocatedListIgnorePermission(query, pageQuery);
for (SysUserVo row : sysUserVoTableDataInfo.getRows()) {
uids.add(row.getUserId());
SysNotice sysNoticeBo = MapstructUtils.convert(bo, SysNotice.class);

19
pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysUserServiceImpl.java
View File

@ -138,6 +138,25 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
Page<SysUserVo> page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper);
return TableDataInfo.build(page);
}
/**
* 根据条件分页查询已分配用户角色列表
*
* @param user 用户信息
* @return 用户信息集合信息
*/
@Override
public TableDataInfo<SysUserVo> selectAllocatedListIgnorePermission(SysUserBo user, PageQuery pageQuery) {
QueryWrapper<SysUser> wrapper = Wrappers.query();
wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
.eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId())
.in(ObjectUtil.isNotNull(user.getRoleKey()), "r.role_key", user.getRoleKey())
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
.eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
.like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
.orderByAsc("u.user_id");
Page<SysUserVo> page = baseMapper.selectAllocatedListIgnorePermission(pageQuery.build(), wrapper);
return TableDataInfo.build(page);
}
/**
* 根据条件分页查询未分配用户角色列表

20
pusong-modules/pusong-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -36,6 +36,18 @@
from sys_user u
${ew.getCustomSqlSegment}
</select>
<select id="selectUserList2" resultMap="SysUserResult">
select
<if test="ew.getSqlSelect != null">
${ew.getSqlSelect}
</if>
<if test="ew.getSqlSelect == null">
u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
</if>
from sys_user u
${ew.getCustomSqlSegment}
</select>
<select id="selectUserExportList" resultMap="SysUserExportResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
@ -55,6 +67,14 @@
left join sys_role r on r.role_id = sur.role_id
${ew.getCustomSqlSegment}
</select>
<select id="selectAllocatedListIgnorePermission" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = sur.role_id
${ew.getCustomSqlSegment}
</select>
<select id="selectUnallocatedList" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time