LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 安全中心，研究组和项目组新增成员时查询单位和联系人

Browse Source
This commit is contained in:
lijiarao
2024-07-02 10:33:03 +08:00
parent 93c6636c3e
commit 351b303f55
10 changed files with 133 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+48 -2
View File
@@ -26,6 +26,11 @@ import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayCompanyManagementService;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.company.vo.UpdateInvoicePram;
import com.jero.functionalsafetycenter.entity.SafetyCenter;
import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem;
import com.jero.functionalsafetycenter.service.SafetyCenterService;
import com.jero.functionalsafetycenter.service.SafetyCenterSubitemContactsService;
import com.jero.functionalsafetycenter.service.SafetyCenterSubitemService;
import com.jero.meeting.entity.PayMeetingSituation;
import com.jero.meeting.service.IPayMeetingSituationService;
import com.jero.member.entity.PayMemberProjectSubitem;
@@ -34,7 +39,6 @@ import com.jero.member.service.IPayMemberProjectSubitemService;
import com.jero.member.service.ITbMemberProjectSubitemService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.pack.entity.PayPackCompany;
import com.jero.project.entity.PayCommonProject;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.service.IPayCommonProjectService;
@@ -96,7 +100,8 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
private IPayMemberProjectSubitemService memberProjectSubitemService;
@Resource
private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
@Resource
private SafetyCenterService safetyCenterService;
/**
* 企业管理-分页列表查询
* (管理端查询dataSource = 1的数据；报名查询全部的数据)
@@ -255,6 +260,47 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
return Result.OK(pageList);
}
/**
* 分页列表查询 - 功能安全中心查询企业
* (管理端查询dataSource = 1的数据；报名查询全部的数据)
* @param payCompanyManagement 企业管理
* @param pageNo 页数
* @param pageSize 条数
* @param req
* @return
*/
@ApiOperation(value="功能安全中心查询企业", notes="功能安全中心查询企业")
@GetMapping(value = "/listSafetyCenter")
public Result<?> queryPageSafetyCenter(PayCompanyManagement payCompanyManagement,
@RequestParam(name="projectId") String projectId,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
if(!StringUtils.isBlank(payCompanyManagement.getCompanyName()) && payCompanyManagement.getCompanyName().length() > 50){
return Result.error("企业名称长度不能大于50个字符！");
}
SafetyCenter safetyCenter = safetyCenterService.getById(projectId);
QueryWrapper<PayCompanyManagement> queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap());
queryWrapper.eq("pfscs.project_id",safetyCenter.getParentId());
Page<PayCompanyManagement> page = new Page<>(pageNo, pageSize);
IPage<PayCompanyManagement> pageList = payCompanyManagementService.pageSafetyCenter(page, queryWrapper);
List<PayCompanyManagement> listPayCompanyManagement = pageList.getRecords();
if(!CollectionUtils.isEmpty(listPayCompanyManagement)){
try {
listPayCompanyManagement.forEach(p->{
if (!StringUtils.isBlank(p.getCompanyPhone())){
p.setCompanyPhone(PasswordUtil.decrypt(p.getCompanyPhone()));
}
});
pageList.setRecords(listPayCompanyManagement);
}catch (Exception e){
log.error("公司电话解密异常！",e);
}
}
return Result.OK(pageList);
}
/**
* 添加-会议对外开放接口
*
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+40 -1
View File
@@ -22,6 +22,8 @@ import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayCompanyManagementService;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.company.service.ProjectCountService;
import com.jero.functionalsafetycenter.entity.SafetyCenter;
import com.jero.functionalsafetycenter.service.SafetyCenterService;
import com.jero.meeting.entity.PayMeetingSituation;
import com.jero.meeting.service.IPayMeetingSituationService;
import com.jero.member.entity.PayMemberProjectSubitem;
@@ -96,7 +98,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
//private IMemberInfoService memberInfoService;
@Resource
private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
@Resource
private SafetyCenterService safetyCenterService;
@Value("${defaultPassword}")
private String defaultPassword;
@@ -818,6 +821,42 @@ public class PayContactsManagementController extends JeroController<PayContactsM
return Result.OK(list);
}
/**
* 通过企业id查询用户
*
* @param companyId 企业id
* @return
*/
@ApiOperation(value="功能安全中心查询企业查询用户", notes="功能安全中心查询企业查询用户")
@GetMapping(value = "/queryBySafetyCenter")
public Result<?> queryBySafetyCenter(@RequestParam(name="projectId") String projectId,
@RequestParam(name="companyId",required = false) String companyId,
@RequestParam(name="name",required = false) String name) {
if (StringUtils.isBlank(companyId)||StringUtils.isBlank(projectId)){
return Result.OK();
}
SafetyCenter safetyCenter = safetyCenterService.getById(projectId);
QueryWrapper<PayContactsManagement> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("pfscsc.project_id", safetyCenter.getParentId());
queryWrapper.eq("pfscsc.company_id", companyId);
if(!StringUtils.isEmpty(name)){
queryWrapper.like("pcm.name", name);
}
List<PayContactsManagement> list = payContactsManagementService.queryBySafetyCenter(queryWrapper);
if(!CollectionUtils.isEmpty(list)){
list.forEach(p->{
if(!StringUtils.isBlank(p.getPhone())){
p.setPhone(PasswordUtil.decrypt(p.getPhone()));
}
if(!StringUtils.isBlank(p.getEmail())){
p.setEmail(PasswordUtil.decrypt(p.getEmail()));
}
});
}
return Result.OK(list);
}
/**
* 导出excel
*
jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java
+6
View File
@@ -1,7 +1,11 @@
package com.jero.company.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.company.entity.PayCompanyManagement;
import org.apache.ibatis.annotations.Param;
@@ -27,4 +31,6 @@ public interface PayCompanyManagementMapper extends BaseMapper<PayCompanyManagem
void updateMemberCompanyName(@Param("memberId") String memberId, @Param("companyName") String companyName);
Integer checkMemberCompanyName(@Param("memberId") String memberId, @Param("companyName") String companyName);
IPage<PayCompanyManagement> pageSafetyCenter(Page<PayCompanyManagement> page, @Param(Constants.WRAPPER) QueryWrapper<PayCompanyManagement> queryWrapper);
}
jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java
+4
View File
@@ -1,8 +1,10 @@
package com.jero.company.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.company.entity.PayContactsManagement;
import com.jero.company.vo.CompanyLoginVO;
@@ -39,4 +41,6 @@ public interface PayContactsManagementMapper extends BaseMapper<PayContactsManag
List<PayContactsManagement> listPayContactsManagement(List<String> phoneList);
void forgetPassword(@Param("companyLoginVO") CompanyLoginVO companyLoginVO);
List<PayContactsManagement> queryBySafetyCenter(@Param(Constants.WRAPPER) QueryWrapper<PayContactsManagement> queryWrapper);
}
jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml
+7
View File
@@ -39,4 +39,11 @@
and member_id != #{memberId}
</if>
</select>
<select id="pageSafetyCenter" resultType="com.jero.company.entity.PayCompanyManagement">
select pcm.*
from pay_company_management pcm
left join pay_functional_safety_center_subitem pfscs on pcm.id = pfscs.company_id
${ew.customSqlSegment}
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml
+7
View File
@@ -69,4 +69,11 @@
phone = #{companyLoginVO.phone}
</where>
</update>
<select id="queryBySafetyCenter" resultType="com.jero.company.entity.PayContactsManagement">
select pcm.*
from pay_functional_safety_center_subitem_contacts pfscsc
left join pay_contacts_management pcm on pcm.id = pfscsc.contacts_id
${ew.customSqlSegment}
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java
+6
View File
@@ -1,6 +1,9 @@
package com.jero.company.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.company.entity.PayCompanyAndContactsManagement;
import com.jero.company.entity.PayCompanyManagement;
@@ -121,4 +124,7 @@ public interface IPayCompanyManagementService extends IService<PayCompanyManagem
void updateMemberCompanyName(String memberId, String companyName);
void checkMemberCompanyName(String memberId, String companyName);
IPage<PayCompanyManagement> pageSafetyCenter(Page<PayCompanyManagement> page, QueryWrapper<PayCompanyManagement> queryWrapper);
}
jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java
+3
View File
@@ -1,5 +1,6 @@
package com.jero.company.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -85,4 +86,6 @@ public interface IPayContactsManagementService extends IService<PayContactsManag
PayContactsManagement checkByCompanyIdAndId(String id, String companyId);
PayContactsManagement checkByCompanyIdAndName(String name, String companyId);
List<PayContactsManagement> queryBySafetyCenter(QueryWrapper<PayContactsManagement> queryWrapper);
}
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
+7 -2
View File
@@ -7,6 +7,8 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.common.ProjectCommon;
import com.jero.common.common.RoleCommon;
@@ -15,12 +17,10 @@ import com.jero.common.enums.ManagementMessageEnums;
import com.jero.common.exception.JeroBootException;
import com.jero.common.service.SendMessageService;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.AuthenticationUtils;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.ValidUtil;
import com.jero.company.common.PayCompanyManagementCommon;
import com.jero.company.common.PayContactsManagementCommon;
import com.jero.company.entity.MemberInfo;
import com.jero.company.entity.PayCompanyAndContactsManagement;
import com.jero.company.entity.PayCompanyManagement;
import com.jero.company.entity.PayContactsManagement;
@@ -710,6 +710,11 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
}
}
@Override
public IPage<PayCompanyManagement> pageSafetyCenter(Page<PayCompanyManagement> page, QueryWrapper<PayCompanyManagement> queryWrapper) {
return payCompanyManagementMapper.pageSafetyCenter(page, queryWrapper);
}
/**
* 校验企业名称和信用代码是否匹配
* @param payCompanyManagement
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+5
View File
@@ -455,4 +455,9 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
PayContactsManagement payContactsManagement = baseMapper.selectOne(query);
return payContactsManagement;
}
@Override
public List<PayContactsManagement> queryBySafetyCenter(QueryWrapper<PayContactsManagement> queryWrapper) {
return baseMapper.queryBySafetyCenter(queryWrapper);
}
}