修改提交问卷的bug

src/main/java/com/ccsens/carbasics/persist/dao/OrganizationDepartmentDao.java

@@ -19,9 +19,10 @@ public interface OrganizationDepartmentDao extends OrganizationDepartmentMapper
 
     /**
      * 查询部门的模板(一级部门)
+     * @param departmentCode  部门code
      * @return 部门的模板(一级部门)
      */
-    List<OrganizationDepartmentTemplate> queryTemplate();
+    List<OrganizationDepartmentTemplate> queryTemplate(@Param("departmentCode") String departmentCode);
 
     /**
      * 查询机构下所有一级部门

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());
     }

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<OrganizationDepartmentTemplate> departmentTemplateList = departmentDao.queryTemplate();
+            List<OrganizationDepartmentTemplate> departmentTemplateList = departmentDao.queryTemplate(departmentCode);
             List<OrganizationDepartment> departmentList = departmentDao.queryAllByOid(organization.getId());
             List<String> 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<Long> 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();

src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: pre
+    include: common, util-pre

src/main/resources/mapper_dao/OrganizationDepartmentDao.xml

@@ -28,6 +28,17 @@
             t_organization_department_template
         WHERE
             rec_status = 0;
+        <choose>
+            <when test="departmentCode == 'NeiKe'.toString()">
+                AND code != 'ShenNei'
+            </when>
+            <when test="departmentCode == 'ShenNei'.toString()">
+                AND code != 'NeiKe'
+            </when>
+            <otherwise>
+                AND code != 'NeiKe'
+            </otherwise>
+        </choose>
     </select>
 
     <select id="queryAllByOid" resultType="com.ccsens.carbasics.bean.po.OrganizationDepartment">

src/main/resources/mapper_dao/QuestionnaireRecordDao.xml

@@ -62,7 +62,7 @@
         AND qd.rec_status = 0 AND qr.rec_status = 0
         AND qd.submit_status = 1 AND qd.user_id = #{userId}
         AND qr.question_code = 'HOS-NAME'
-        ORDER BY qd.create_at DESC
+        ORDER BY qd.created_at DESC
         LIMIT 1
     </select>