ccsens_zhengzhichuan
/
research
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改课题组用户新增 可多选课题组

master
ccsens_zhengzhichuan 3 weeks ago
parent
b57f3f6989
commit
3c926b4237
5 changed files with 76 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java
  2. 8
      research-generator/src/main/resources/mbg.xml
  3. 2
      research-system/src/main/java/com/research/system/domain/dto/GroupDto.java
  4. 2
      research-system/src/main/java/com/research/system/service/KtsGroupService.java
  5. 135
      research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java

2
research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java
View File

@ -125,7 +125,7 @@ public class GroupController {
@PostMapping("/member/add")
// @DataSource(DataSourceType.MASTER)
public JsonResponse<Integer> addMember(@RequestBody @Validated GroupDto.AddMember dto) throws Exception {
KtsKtGroupMember ktsKtGroupMember = ktsGroupService.addMember(dto);
ktsGroupService.addMember(dto);
return JsonResponse.ok();
}

8
research-generator/src/main/resources/mbg.xml
View File

@ -69,12 +69,12 @@
<!-- <table tableName="fud_fund_record" domainObjectName="FudFundRecord" enableDeleteByExample="false"/>-->
<!-- <table tableName="kts_kt_group" domainObjectName="KtsKtGroup" enableDeleteByExample="false"/>-->
<!-- <table tableName="kts_kt_group_member" domainObjectName="KtsKtGroupMember" enableDeleteByExample="false"/>-->
<!-- <table tableName="met_meeting_participant" domainObjectName="MetMeetingParticipant" enableDeleteByExample="false"/>-->
<!-- <table tableName="met_meeting_record" domainObjectName="MetMeetingRecord" enableDeleteByExample="false"/>-->
<table tableName="met_meeting_participant" domainObjectName="MetMeetingParticipant" enableDeleteByExample="false"/>
<table tableName="met_meeting_record" domainObjectName="MetMeetingRecord" enableDeleteByExample="false"/>
<!-- <table tableName="prj_proj_document" domainObjectName="PrjProjDocument" enableDeleteByExample="false"/>-->
<!-- <table tableName="prj_proj_info" domainObjectName="PrjProjInfo" enableDeleteByExample="false"/>-->
<!-- <table tableName="prj_proj_org" domainObjectName="PrjProjOrg" enableDeleteByExample="false"/>-->
<table tableName="kts_kt_group_member_aduit" domainObjectName="KtsKtGroupMemberAduit" enableDeleteByExample="false"/>
<!-- <table tableName="kts_kt_group_member_aduit" domainObjectName="KtsKtGroupMemberAduit" enableDeleteByExample="false"/>-->
<!-- <table tableName="srv_message" domainObjectName="SrvMessage" enableDeleteByExample="false"/>-->
<!-- <table tableName="shs_ckwx_category" domainObjectName="ShsCkwxCategory" enableDeleteByExample="false"/>-->
<!-- <table tableName="shs_ckwx_info" domainObjectName="ShsCkwxInfo" enableDeleteByExample="false"/>-->
@ -99,7 +99,7 @@
<!-- <table tableName="kt_research_content" domainObjectName="KtResearchContent" enableDeleteByExample="false"/>-->
<!-- <table tableName="kt_expected_outcomes" domainObjectName="KtExpectedOutcomes" enableDeleteByExample="false"/>-->
<!-- <table tableName="kt_config" domainObjectName="KtConfig" enableDeleteByExample="false"/>-->
<table tableName="tas_task" domainObjectName="TasTask" enableDeleteByExample="false"/>
<!-- <table tableName="tas_task" domainObjectName="TasTask" enableDeleteByExample="false"/>-->
<!-- <table tableName="tas_task_member" domainObjectName="TasTaskMember" enableDeleteByExample="false"/>-->
<!-- <table tableName="tas_deliverable" domainObjectName="TasDeliverable" enableDeleteByExample="false"/>-->
<!-- <table tableName="com_file" domainObjectName="ComFile" enableDeleteByExample="false"/>-->

2
research-system/src/main/java/com/research/system/domain/dto/GroupDto.java
View File

@ -106,7 +106,7 @@ public class GroupDto {
private List<Long> roleIdList;
private Long ktGroupId;
private List<Long> ktGroupId;
private String parentMemberId;

2
research-system/src/main/java/com/research/system/service/KtsGroupService.java
View File

@ -37,7 +37,7 @@ public interface KtsGroupService {
List<GroupVO.MemberResult> childList(GroupDto.MemberQuery query);
KtsKtGroupMember addMember(GroupDto.AddMember dto);
void addMember(GroupDto.AddMember dto);
void delMember(CommonDto.DelDto dto);

135
research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java
View File

@ -352,7 +352,7 @@ public class KtsGroupServiceImpl implements KtsGroupService {
}
@Override
public KtsKtGroupMember addMember(GroupDto.AddMember dto) {
public void addMember(GroupDto.AddMember dto) {
LoginUser loginUser = SecurityUtils.getLoginUser();
//检查添加的成员是否是当前用户所属的合作单位
Long projOrgId = ObjectUtil.isNull(dto.getProjOrgId()) ? dto.getOrgId() : dto.getProjOrgId();
@ -361,72 +361,73 @@ public class KtsGroupServiceImpl implements KtsGroupService {
}else if(!projOrgId.equals(loginUser.getUser().getOrgId())){
throw new BaseException("您无法在其他合作单位下添加或修改课题组成员");
}
//添加课题组成员
KtsKtGroupMember ktsKtGroupMember = BeanUtil.copyProperties(dto, KtsKtGroupMember.class);
ktsKtGroupMember.setEnrollTime(dto.getEnrollmentTime());
ktsKtGroupMember.setEnrollTime(dto.getEnrollmentTime());
if(dto.getType().contains("1")){
ktsKtGroupMember.setType("1");
}else {
ktsKtGroupMember.setType("2");
}
//id不为空则修改
if(ObjectUtil.isNotNull(dto.getId())){
//根据手机号查询课题组成员
KtsKtGroupMemberExample ktsKtGroupMemberExample = new KtsKtGroupMemberExample();
ktsKtGroupMemberExample.createCriteria()
.andMemberPhoneEqualTo(dto.getMemberPhone())
.andKtGroupIdEqualTo(dto.getKtGroupId())
.andIdNotEqualTo(dto.getId())
.andDelFlagEqualTo((byte) 0);
if(ktsKtGroupMemberMapper.countByExample(ktsKtGroupMemberExample) > 0){
throw new BaseException("该手机号已存在");
}
//根据手机号查询用户
SysUser sysUser = sysUserService.selectUserByPhone(dto.getMemberPhone());
if (sysUser != null && "0".equals(sysUser.getDelFlag())) {
//如果用户已存在，直接关联该用户
ktsKtGroupMember.setUserId(sysUser.getUserId());
}
ktsKtGroupMemberMapper.updateByPrimaryKeySelective(ktsKtGroupMember);
}else {
//检查课题组id，没有且课题组名称不为空，则创建课题组信息
if (dto.getKtGroupId() == null && StrUtil.isNotEmpty(dto.getKtGroupName())) {
GroupDto.Add add = new GroupDto.Add();
add.setKtGroupName(dto.getKtGroupName());
add.setProjId(dto.getProjId());
add.setProjOrgId(projOrgId);
add.setIntro(dto.getKtGroupIntro());
add.setName(dto.getMemberName());
add.setPhone(dto.getMemberPhone());
add.setParentKtId(dto.getParentKtId());
KtsKtGroup add1 = add(add);
ktsKtGroupMember.setKtGroupId(add1.getId());
for (Long ktGroupId : dto.getKtGroupId()) {
//添加课题组成员
KtsKtGroupMember ktsKtGroupMember = BeanUtil.copyProperties(dto, KtsKtGroupMember.class);
ktsKtGroupMember.setEnrollTime(dto.getEnrollmentTime());
ktsKtGroupMember.setEnrollTime(dto.getEnrollmentTime());
if (dto.getType().contains("1")) {
ktsKtGroupMember.setType("1");
} else {
ktsKtGroupMember.setType("2");
}
//id不为空则修改
if (ObjectUtil.isNotNull(dto.getId())) {
//根据手机号查询课题组成员
KtsKtGroupMemberExample ktsKtGroupMemberExample = new KtsKtGroupMemberExample();
ktsKtGroupMemberExample.createCriteria()
.andMemberPhoneEqualTo(dto.getMemberPhone())
.andKtGroupIdEqualTo(ktGroupId)
.andIdNotEqualTo(dto.getId())
.andDelFlagEqualTo((byte) 0);
if (ktsKtGroupMemberMapper.countByExample(ktsKtGroupMemberExample) > 0) {
throw new BaseException("该手机号已存在");
}
//根据手机号查询用户
SysUser sysUser = sysUserService.selectUserByPhone(dto.getMemberPhone());
if (sysUser != null && "0".equals(sysUser.getDelFlag())) {
//如果用户已存在，直接关联该用户
ktsKtGroupMember.setUserId(sysUser.getUserId());
}
ktsKtGroupMemberMapper.updateByPrimaryKeySelective(ktsKtGroupMember);
} else {
//检查课题组id，没有且课题组名称不为空，则创建课题组信息
if (dto.getKtGroupId() == null && StrUtil.isNotEmpty(dto.getKtGroupName())) {
GroupDto.Add add = new GroupDto.Add();
add.setKtGroupName(dto.getKtGroupName());
add.setProjId(dto.getProjId());
add.setProjOrgId(projOrgId);
add.setIntro(dto.getKtGroupIntro());
add.setName(dto.getMemberName());
add.setPhone(dto.getMemberPhone());
add.setParentKtId(dto.getParentKtId());
KtsKtGroup add1 = add(add);
ktsKtGroupMember.setKtGroupId(add1.getId());
}
//根据手机号查询课题组成员
KtsKtGroupMemberExample ktsKtGroupMemberExample = new KtsKtGroupMemberExample();
ktsKtGroupMemberExample.createCriteria().andMemberPhoneEqualTo(ktsKtGroupMember.getMemberPhone()).andKtGroupIdEqualTo(ktsKtGroupMember.getKtGroupId()).andDelFlagEqualTo((byte) 0);
List<KtsKtGroupMember> ktsKtGroupMembers = ktsKtGroupMemberMapper.selectByExample(ktsKtGroupMemberExample);
if (CollUtil.isNotEmpty(ktsKtGroupMembers)) {
throw new BaseException("该手机号已存在");
}
//根据手机号查询用户
SysUser sysUser = sysUserService.selectUserByPhone(ktsKtGroupMember.getMemberPhone());
if (sysUser != null && "0".equals(sysUser.getDelFlag())) {
//如果用户已存在，直接关联该用户
ktsKtGroupMember.setUserId(sysUser.getUserId());
//根据手机号查询课题组成员
KtsKtGroupMemberExample ktsKtGroupMemberExample = new KtsKtGroupMemberExample();
ktsKtGroupMemberExample.createCriteria().andMemberPhoneEqualTo(ktsKtGroupMember.getMemberPhone()).andKtGroupIdEqualTo(ktsKtGroupMember.getKtGroupId()).andDelFlagEqualTo((byte) 0);
List<KtsKtGroupMember> ktsKtGroupMembers = ktsKtGroupMemberMapper.selectByExample(ktsKtGroupMemberExample);
if (CollUtil.isNotEmpty(ktsKtGroupMembers)) {
throw new BaseException("该手机号已存在");
}
//根据手机号查询用户
SysUser sysUser = sysUserService.selectUserByPhone(ktsKtGroupMember.getMemberPhone());
if (sysUser != null && "0".equals(sysUser.getDelFlag())) {
//如果用户已存在，直接关联该用户
ktsKtGroupMember.setUserId(sysUser.getUserId());
}
ktsKtGroupMember.setId(IdUtil.getSnowflakeNextId());
ktsKtGroupMember.setCreateBy(SecurityUtils.getUsername());
ktsKtGroupMember.setMemberStatus((byte) 0);
ktsKtGroupMember.setAuditStatus((byte) 0);
ktsKtGroupMember.setCreateTime(new Date());
ktsKtGroupMember.setProjOrgId(dto.getProjOrgId());
ktsKtGroupMember.setDelFlag((byte) 0);
ktsKtGroupMemberMapper.insertSelective(ktsKtGroupMember);
}
ktsKtGroupMember.setId(IdUtil.getSnowflakeNextId());
ktsKtGroupMember.setCreateBy(SecurityUtils.getUsername());
ktsKtGroupMember.setMemberStatus((byte) 0);
ktsKtGroupMember.setAuditStatus((byte) 0);
ktsKtGroupMember.setCreateTime(new Date());
ktsKtGroupMember.setProjOrgId(dto.getProjOrgId());
ktsKtGroupMember.setDelFlag((byte) 0);
ktsKtGroupMemberMapper.insertSelective(ktsKtGroupMember);
}
return ktsKtGroupMember;
// //是否传了课题组ID，没传且课题组名称不为空，则添加课题组
@ -713,15 +714,17 @@ public class KtsGroupServiceImpl implements KtsGroupService {
continue;
}
if (memberResult.getTitle().contains("1") || memberResult.getTitle().contains("5") || memberResult.getTitle().contains("8") || memberResult.getTitle().contains("12")
|| memberResult.getTitle().contains("2") || memberResult.getTitle().contains("6") || memberResult.getTitle().contains("9") || memberResult.getTitle().contains("13")) {
|| memberResult.getTitle().contains("2") || memberResult.getTitle().contains("6") || memberResult.getTitle().contains("9") || memberResult.getTitle().contains("13")
|| memberResult.getTitle().contains("20") || memberResult.getTitle().contains("21")) {
title.setGj(title.getGj() + 1);
continue;
}
if (memberResult.getTitle().contains("3") || memberResult.getTitle().contains("10") || memberResult.getTitle().contains("14")) {
if (memberResult.getTitle().contains("3") || memberResult.getTitle().contains("10") || memberResult.getTitle().contains("14") || memberResult.getTitle().contains("19")) {
title.setZj(title.getZj() + 1);
continue;
}
if (memberResult.getTitle().contains("4") || memberResult.getTitle().contains("7") || memberResult.getTitle().contains("11") || memberResult.getTitle().contains("15") || memberResult.getTitle().contains("16")) {
if (memberResult.getTitle().contains("4") || memberResult.getTitle().contains("7") || memberResult.getTitle().contains("11") || memberResult.getTitle().contains("15")
|| memberResult.getTitle().contains("16") || memberResult.getTitle().contains("18")) {
title.setCj(title.getCj() + 1);
continue;
}

Write Preview
Loading…
Cancel
Save