账户管理接口修改

src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java

@@ -1,5 +1,6 @@
 package com.ccsens.carbasics.bean.vo;
 
+import com.ccsens.util.DesensitizedUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -41,6 +42,8 @@ public class AccountVo {
     @Data
     @ApiModel("查询医院下的申请-返参")
     public static class ApplyOfHospital {
+        @ApiModelProperty("申请id")
+        private Long id;
         @ApiModelProperty("申请人名称")
         private String name;
         @ApiModelProperty("电话号")
@@ -57,5 +60,9 @@ public class AccountVo {
         private String positionCode;
         @ApiModelProperty("审核状态(0-未审核,1-审核通过,2-审核拒绝)")
         private Byte auditStatus;
+
+        public String getPhone() {
+            return DesensitizedUtils.mobilePhone(phone);
+        }
     }
 }

src/main/java/com/ccsens/carbasics/service/AccountManageService.java

@@ -72,6 +72,7 @@ public class AccountManageService implements IAccountManageService {
             accountManage.setAuditStatus(param.getStatus());
             accountManage.setAduitUserId(userId);
             accountManageDao.updateByPrimaryKeySelective(accountManage);
+            return;
         }
         accountManage.setAuditStatus(param.getStatus());
         accountManage.setAduitUserId(userId);
@@ -82,7 +83,7 @@ public class AccountManageService implements IAccountManageService {
         //查询职位id
         Long positionId = positionDao.queryByName(accountManageInfo.getPositionName());
         questionnaireService.createHospitalAndProject(accountManageInfo.getSubmitterPhone(),accountManageInfo.getSubmitterUserId(),"",
-                accountManage.getHospitalName(),accountManage.getDepartmentName(),accountManage.getSubmitter(),positionId,accountManage.getDepartmentCode());
+                accountManageInfo.getHospitalName(),accountManageInfo.getDepartmentName(),accountManageInfo.getSubmitter(),positionId,accountManageInfo.getDepartmentCode());
     }
 
 

src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java

@@ -482,6 +482,7 @@ public class QuestionnaireService implements IQuestionnaireService{
         if (ObjectUtil.isNull(project)) {
             //创建项目
             CProjectDto.CopyProject copyProject = new CProjectDto.CopyProject();
+            log.info("模板项目id:{}",redisUtil.get(Constant.TEMPLATE_PROJECT_KEY_ORGANIZATION));
             copyProject.setProjectId((Long) redisUtil.get(Constant.TEMPLATE_PROJECT_KEY_ORGANIZATION));
             copyProject.setProjectName(hospitalName);
             CProjectVo.CopyProjectInfo copyProjectInfo = projectService.copyProject(copyProject, userId);

src/main/resources/mapper_dao/AccountManageDao.xml

@@ -5,6 +5,7 @@
 
     <select id="queryApply" resultType="com.ccsens.carbasics.bean.vo.AccountVo$ApplyOfHospital">
         SELECT
+            id AS id,
             submitter AS NAME,
             submitter_phone AS phone,
             hospital_name,