From 1fc77da24c87d4e8035dd86f289037da2ef75e01 Mon Sep 17 00:00:00 2001 From: lucky Date: Wed, 29 Dec 2021 17:23:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E9=97=AE?= =?UTF-8?q?=E5=8D=B7=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/OrganizationDepartmentDao.java | 3 ++- .../service/AccountManageService.java | 4 ++-- .../service/QuestionnaireService.java | 22 +++++++++++-------- src/main/resources/application.yml | 4 ++-- .../mapper_dao/OrganizationDepartmentDao.xml | 11 ++++++++++ .../mapper_dao/QuestionnaireRecordDao.xml | 2 +- 6 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/ccsens/carbasics/persist/dao/OrganizationDepartmentDao.java b/src/main/java/com/ccsens/carbasics/persist/dao/OrganizationDepartmentDao.java index 7a48517..c71125d 100644 --- a/src/main/java/com/ccsens/carbasics/persist/dao/OrganizationDepartmentDao.java +++ b/src/main/java/com/ccsens/carbasics/persist/dao/OrganizationDepartmentDao.java @@ -19,9 +19,10 @@ public interface OrganizationDepartmentDao extends OrganizationDepartmentMapper /** * 查询部门的模板(一级部门) + * @param departmentCode 部门code * @return 部门的模板(一级部门) */ - List queryTemplate(); + List queryTemplate(@Param("departmentCode") String departmentCode); /** * 查询机构下所有一级部门 diff --git a/src/main/java/com/ccsens/carbasics/service/AccountManageService.java b/src/main/java/com/ccsens/carbasics/service/AccountManageService.java index 5be7389..c359b2d 100644 --- a/src/main/java/com/ccsens/carbasics/service/AccountManageService.java +++ b/src/main/java/com/ccsens/carbasics/service/AccountManageService.java @@ -109,8 +109,8 @@ public class AccountManageService implements IAccountManageService { //查询职位id Long positionId = positionDao.queryByCode(accountManageInfo.getPositionCode(),accountManageInfo.getHospitalName()); - questionnaireService.createOrganization(accountManageInfo.getHospitalName(),accountManageInfo.getDepartmentName(),userId, - accountManageInfo.getSubmitter(),accountManageInfo.getSubmitterPhone(),positionId,accountManage.getPositionName(),accountManage.getPositionCode()); + questionnaireService.createOrganization(accountManageInfo.getHospitalName(),accountManageInfo.getDepartmentName(),accountManageInfo.getSubmitterUserId(), + accountManageInfo.getSubmitter(),accountManageInfo.getSubmitterPhone(),positionId,accountManageInfo.getPositionName(),accountManageInfo.getPositionCode(),accountManageInfo.getDepartmentCode()); // questionnaireService.createHospitalAndProject(accountManageInfo.getSubmitterPhone(),accountManageInfo.getSubmitterUserId(),"", // accountManageInfo.getHospitalName(),accountManageInfo.getDepartmentName(),accountManageInfo.getSubmitter(),positionId,accountManageInfo.getDepartmentCode()); } diff --git a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java index d627ea9..6f3e9aa 100644 --- a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java +++ b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java @@ -193,9 +193,6 @@ public class QuestionnaireService implements IQuestionnaireService{ //2.校验是否已经有提交 Long currentTime = System.currentTimeMillis(); Long submitId = questionnaireDetailDao.queryIsSubmit(param.getName(),currentTime); - if (ObjectUtil.isNotNull(submitId)) { - return new QuestionnaireVo.SubmitInfo(); - } //查询用户是否此医院此角色此部门 Integer isExist = organizationDao.queryUserIsExist(param.getDepartmentName(),param.getPositionName(),param.getName(),userId); if (0 < isExist) { @@ -209,6 +206,9 @@ public class QuestionnaireService implements IQuestionnaireService{ } return new QuestionnaireVo.SubmitInfo(); } +// if (ObjectUtil.isNotNull(submitId)) { +// return new QuestionnaireVo.SubmitInfo(); +// } AccountManage accountManage = new AccountManage(); accountManage.setId(snowflake.nextId()); accountManage.setHospitalName(param.getName()); @@ -393,7 +393,7 @@ public class QuestionnaireService implements IQuestionnaireService{ // } public Long createOrganization(String organizationName,String departmentName,Long userId,String memberName,String memberPhone,Long positionId - ,String positionName,String positionCode) { + ,String positionName,String positionCode,String departmentCode) { //机构创建 boolean create = false; Organization organization = organizationDao.queryByName(organizationName); @@ -402,18 +402,18 @@ public class QuestionnaireService implements IQuestionnaireService{ create = true; Organization organizationNew = new Organization(); organizationNew.setId(snowflake.nextId()); - organization.setOrganizationType(Constant.OrganizationType.HOSPITAL.status); + organizationNew.setOrganizationType(Constant.OrganizationType.HOSPITAL.status); organizationNew.setName(organizationName); //TODO 医院等级 //organization.setLevelId(); - organizationDao.insertSelective(organization); + organizationDao.insertSelective(organizationNew); organization = organizationNew; } //部门创建 OrganizationDepartment department = departmentDao.queryByOrganization(organization.getId(),departmentName); if (ObjectUtil.isNull(department)) { log.info("创建一级部门:{},不存在的部门名:{}",organizationName,departmentName); - List departmentTemplateList = departmentDao.queryTemplate(); + List departmentTemplateList = departmentDao.queryTemplate(departmentCode); List departmentList = departmentDao.queryAllByOid(organization.getId()); List departmentNameList = departmentList.stream().map(OrganizationDepartment::getName).collect(Collectors.toList()); for (OrganizationDepartmentTemplate departmentTemplate : departmentTemplateList) { @@ -440,6 +440,7 @@ public class QuestionnaireService implements IQuestionnaireService{ positionNew.setRoleName(positionName); positionNew.setDepartmentId(department.getId()); positionDao.insertSelective(positionNew); + position = positionNew; //绑定职位类型 OrganizationPositionType positionType = positionTypeDao.queryByCode(positionCode); if (ObjectUtil.isNotNull(positionType)) { @@ -462,12 +463,12 @@ public class QuestionnaireService implements IQuestionnaireService{ organizationMemberDao.insertSelective(member); organizationMember = member; } - Long isExist = organizationMemberPositionDao.queryByExistByMember(organizationMember.getId(),positionId,department.getId()); + Long isExist = organizationMemberPositionDao.queryByExistByMember(organizationMember.getId(),position.getId(),department.getId()); if (isExist == 0) { log.info("添加成员职位:{}",organizationMember.getId()); OrganizationMemberPosition memberPosition = new OrganizationMemberPosition(); memberPosition.setId(snowflake.nextId()); - memberPosition.setPositionId(positionId); + memberPosition.setPositionId(position.getId()); memberPosition.setDepartmentId(department.getId()); memberPosition.setMemberId(organizationMember.getId()); organizationMemberPositionDao.insertSelective(memberPosition); @@ -481,9 +482,11 @@ public class QuestionnaireService implements IQuestionnaireService{ saveProjectDto.setStartTime(System.currentTimeMillis()); saveProjectDto.setEndTime(System.currentTimeMillis()+315360000000L); saveProjectDto.setUrl(PropUtil.domain); + saveProjectDto.setCode("carbasics"); Set userIds = new HashSet<>(); userIds.add(userId); saveProjectDto.setUserIdList(userIds); + log.info("调用feign新建项目:{}",saveProjectDto); tall3FeignClient.saveProjectList(saveProjectDto); }else { log.info("tall3添加成员:{}",organization.getId()); @@ -495,6 +498,7 @@ public class QuestionnaireService implements IQuestionnaireService{ userIds.add(userId); saveUserProject.setProjectId(projectIds); saveUserProject.setUserId(userIds); + log.info("调用feign添加成员:{}",saveUserProject); tall3FeignClient.saveUserProject(saveUserProject); } return organization.getId(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2fb38e5..b6d2d10 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev - include: common, util-dev + active: pre + include: common, util-pre diff --git a/src/main/resources/mapper_dao/OrganizationDepartmentDao.xml b/src/main/resources/mapper_dao/OrganizationDepartmentDao.xml index 97ebacf..bf6aba1 100644 --- a/src/main/resources/mapper_dao/OrganizationDepartmentDao.xml +++ b/src/main/resources/mapper_dao/OrganizationDepartmentDao.xml @@ -28,6 +28,17 @@ t_organization_department_template WHERE rec_status = 0; + + + AND code != 'ShenNei' + + + AND code != 'NeiKe' + + + AND code != 'NeiKe' + +