Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-health-science

science-admin/src/main/java/com/yiboshi/science/config/security/loginUser.java

@@ -18,4 +18,6 @@ public class loginUser implements Serializable {
     private String type;
     /** 项目类型  1 申报科研项目  2申报重点学科项目 */
     private String projType;
+    /** 信息是否完整 */
+    private boolean complete;
 }

science-admin/src/main/java/com/yiboshi/science/rest/v1/AuthorizationController.java

@@ -178,27 +178,18 @@ public class AuthorizationController {
     @RequestMapping(value = "/getUser")
     @GetMapping
     public ResponseDataModel<Map<String, Object>> getUser() {
-        ComPerson person = comPersonService.entityById(SecurityUserHolder.getPersonId());
-        boolean isComplete = true;
-        if (null != person) {
-            if (Objects.isNull(person.getNation()) || Objects.isNull(person.getTitle()) || Objects.isNull(person.getEducation()) || Objects.isNull(person.getSpec()) || Objects.isNull(person.getEmail())) {
-                isComplete = false;
-            }
-        }
         loginUser user = new loginUser();
         StringUtil.copyObj2Obj(SecurityUserHolder.getCurrentUser(), user);
         user.setType(systemSetService.getByKey(SystemSetKey.SysProjectType));
         if(!user.getType().equals("3")){
             user.setProjType(systemSetService.getByKey(SystemSetKey.SysProjectType));
         }
-        boolean finalIsComplete = isComplete;
-
+        user.setComplete(comPersonService.isComplete(SecurityUserHolder.getPersonId()));
         List<UserMenuDTO> menuList = systemMenuService.findByRoleId(SecurityUserHolder.getRoles());
         Map<String, Object> userInfo = new HashMap<String, Object>(3) {
             {
                 put("userInfo", user);
                 put("menuList", menuList);
-                put("isComplete", finalIsComplete);
             }
         };
         return ResponseDataModel.ok(userInfo);

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComPersonController.java

@@ -15,6 +15,7 @@ import com.yiboshi.science.service.ComPersonService;
 import com.yiboshi.science.service.ComUnitService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.BindingResult;
@@ -176,10 +177,15 @@ public class ComPersonController extends BaseController<ComPersonService, ComPer
     public ResponseDataModel<Map<String, Object>> getAppPersonInfo() {
         boolean isComplete = true;
         ComPerson comPerson = comPersonService.entityById(SecurityUserHolder.getPersonId());
-        if (null != comPerson) {
-            if (Objects.isNull(comPerson.getNation()) || Objects.isNull(comPerson.getTitle()) || Objects.isNull(comPerson.getEducation()) || Objects.isNull(comPerson.getSpec()) || Objects.isNull(comPerson.getEmail())) {
-                isComplete = false;
-            }
+        if (null == comPerson)
+            isComplete= false;
+        if (StringUtils.isEmpty(comPerson.getNation()) ||
+                StringUtils.isEmpty(comPerson.getTitle()) ||
+                StringUtils.isEmpty(comPerson.getDegree()) ||
+                StringUtils.isEmpty(comPerson.getEducation()) ||
+                StringUtils.isEmpty(comPerson.getSpec()) ||
+                StringUtils.isEmpty(comPerson.getEmail())) {
+            isComplete= false;
         }
         boolean finalComplete = isComplete;
         Map<String, Object> data = new HashMap<String, Object>(3) {

science-admin/src/main/java/com/yiboshi/science/service/ComPersonService.java

@@ -8,6 +8,7 @@ import com.yiboshi.science.param.dto.DataStatisticsDTO;
 import com.yiboshi.science.param.dto.UserImportDTO;
 import com.yiboshi.science.param.query.ComPersonQueryVO;
 import com.yiboshi.science.param.query.ComUnitQueryVO;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.IOException;
 import java.util.List;
@@ -107,4 +108,6 @@ public interface ComPersonService extends BaseService<ComPersonQueryVO, ComPerso
     List<UserImportDTO> userImport(List<UserImportDTO> list) throws IOException;
     DataStatisticsDTO getRegisterPersonCount(ComPersonQueryVO v);
     DataStatisticsDTO getRegisterPersonCountByDay(ComPersonQueryVO v);
+
+    boolean isComplete(String id);
 }

science-admin/src/main/java/com/yiboshi/science/service/impl/ComPersonServiceImpl.java

@@ -205,13 +205,13 @@ public class ComPersonServiceImpl extends BaseServiceImpl<ComPersonDAO, ComPerso
             comPerson.setAuditResult(10);
             comPerson.setPersonState(1);
             if (person.getAuditResult().equals(1)) {
-                this.SMSSending(person.getMobile(), person.getPersonName(), properties.getSystemName(),"用户", "已审核通过", "请使用注册账户登录系统");
+                this.SMSSending(person.getMobile(), person.getPersonName(), properties.getSystemName(), "用户", "已审核通过", "请使用注册账户登录系统");
             }
         } else {
             comPerson.setAuditResult(20);
             comPerson.setPersonState(2);
             if (person.getAuditResult().equals(1)) {
-                this.SMSSending(person.getMobile(), person.getPersonName(), properties.getSystemName(),"用户", "审核不通过" + "(" + dto.getAuditContent() + ")", "请联系单位处理");
+                this.SMSSending(person.getMobile(), person.getPersonName(), properties.getSystemName(), "用户", "审核不通过" + "(" + dto.getAuditContent() + ")", "请联系单位处理");
             }
         }
         ComPersonDTO d = this.getPersonById(dto.getId());
@@ -327,6 +327,21 @@ public class ComPersonServiceImpl extends BaseServiceImpl<ComPersonDAO, ComPerso
         return state;
     }
 
+    public boolean isComplete(String id) {
+        ComPerson person = this.getById(id);
+        if (null == person)
+            return false;
+        if (StringUtils.isEmpty(person.getNation()) ||
+                StringUtils.isEmpty(person.getTitle()) ||
+                StringUtils.isEmpty(person.getDegree()) ||
+                StringUtils.isEmpty(person.getEducation()) ||
+                StringUtils.isEmpty(person.getSpec()) ||
+                StringUtils.isEmpty(person.getEmail())) {
+            return false;
+        }
+        return true;
+    }
+
     public List<ComPersonDTO> getManagerListByUnitId(String unitId) {
         List<ComPersonDTO> list = comPersonDAO.getManagerListByUnitId(unitId);
         if (null != list && !SecurityUserHolder.getRoles().contains(CommonEnum.systemRole.sys.getCode().toString())) {

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

 package com.yiboshi.science.service.impl;
 
-import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.itextpdf.html2pdf.html.HtmlUtils;
 import com.yiboshi.arch.exception.BusinessException;
-import com.yiboshi.science.Constants;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.config.bean.SystemProperties;
@@ -25,17 +22,13 @@ import org.springframework.web.bind.annotation.PathVariable;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
-import static com.yiboshi.science.utils.HtmlBuilder.loop;
-
 /**
  * 项目表 Service 实现类
  *
@@ -271,7 +264,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         NewProjectKPIInfo(dto);
 
         // 附件
-        List<ComFileDTO> fileList = processAttachmentList(projType);
+        List<ComFileDTO> fileList = configureFileList(projType);
         dto.setFileList(fileList);
 
         dto.setReportYear(comBatchService.getReportYear(projType));
@@ -309,13 +302,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         if (null != comUnitDTO) {
             dto.setAppUnitName(comUnitDTO.getUnitName());
             dto.setUnitTypeName(comUnitDTO.getUnitTypeName());
-//            dto.setOrganizationCode(comUnitDTO.getOrganizationCode());
-//            dto.setAddress(comUnitDTO.getUnitAddress());
-//            dto.setLegalPerson(null);
-//            dto.setDepositBank(null);
-//            dto.setBankAccount(null);
-//            dto.setDepositBankAddress(null);
-//            dto.setInterbankNumber(null);
         }
 
         // 项目合作单位
@@ -380,11 +366,14 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         //附件列表
         List<ComFileDTO> fileList = ComFileService.getListByObjectId(dto.getId(), CommonEnum.fileType.project.getCode());
         if (null == fileList || fileList.size() == 0)
-            fileList = processAttachmentList(dto.getProjType());
+            fileList = configureFileList(dto.getProjType());
         else
             fileList = checkNecessaryAttachmentFile(dto.getProjType(), fileList);
         dto.setFileList(fileList);
 
+
+
+
         //审核记录列表
         List<ComProjectAuditNoteDTO> auditList = comProjectAuditNoteService.getListByObjectId(dto.getId());
         dto.setAuditList(auditList);
@@ -449,6 +438,33 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         dto.setProjectKPI(kpiDTO);
     }
 
+    private List<ComFileDTO> configureFileList(Integer projType) {
+        List<ComFileDTO> fileList = new ArrayList<>();
+        List<SystemParameter> parameterList;
+        //健康领域科技项目
+        if (projType == CommonEnum.projType.num.getCode())
+            parameterList = systemParameterService.getListByType(61);
+        else//临床科技项目
+            parameterList = systemParameterService.getListByType(13);
+        parameterList.forEach(e -> {
+            fileList.add(configureFile(e.getName(), e.getDisplayOrder(),e.getIsRequired()));
+        });
+        return fileList;
+    }
+
+    private ComFileDTO configureFile(String FileExplain, int showIndex, Boolean isRequired) {
+        ComFileDTO file = new ComFileDTO();
+        file.setFileType(CommonEnum.fileType.project.getCode());
+        file.setFileExplain(FileExplain);
+        file.setShowIndex(showIndex);
+        file.setRequired(true);
+        if (!isRequired.equals(null))
+            file.setIsRequired(isRequired);
+        else
+            file.setIsRequired(false);
+        return file;
+    }
+
     public List<ComFileDTO> checkNecessaryAttachmentFile(Integer projType, List<ComFileDTO> fileList) {
         List<SystemParameter> parameterList;
         //健康领域科技项目
@@ -456,6 +472,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             parameterList = systemParameterService.getListByType(61);
         else//临床科技项目
             parameterList = systemParameterService.getListByType(13);
+
         AtomicInteger allCount = new AtomicInteger(parameterList.size() + 1);
         fileList.forEach(e -> {
             AtomicInteger num = new AtomicInteger(1);
@@ -477,8 +494,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         parameterList.forEach(p -> {
             List<ComFileDTO> findList = fileList.stream().filter(e -> null != e.getFileExplain() && e.getFileExplain().equals(p.getName())).collect(Collectors.toList());
             if (findList.size() == 0) {
-                ComFileDTO fileDTO = processAttachmentFile(p.getName(), p.getDisplayOrder());
-                fileList.add(0, fileDTO);
+                ComFileDTO fileDTO = configureFile(p.getName(), p.getDisplayOrder(),p.getIsRequired());
+                fileList.add( fileDTO);
             }
         });
 
@@ -488,38 +505,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
     }
 
 
-
-    private List<ComFileDTO> processAttachmentList(Integer projType) {
-        List<ComFileDTO> fileList = new ArrayList<>();
-
-        List<SystemParameter> parameterList;
-
-        //健康领域科技项目
-        if (projType == CommonEnum.projType.num.getCode())
-            parameterList = systemParameterService.getListByType(61);
-        else//临床科技项目
-            parameterList = systemParameterService.getListByType(13);
-
-        parameterList.forEach(e -> {
-            ComFileDTO AttachentFile = processAttachmentFile(e.getName(), e.getDisplayOrder());
-            if (null != e.getIsRequired() && e.getIsRequired().equals(true))
-                AttachentFile.setIsRequired(true);
-            else
-                AttachentFile.setIsRequired(false);
-            fileList.add(AttachentFile);
-        });
-        return fileList;
-    }
-
-    private ComFileDTO processAttachmentFile(String FileExplain, int showIndex) {
-        ComFileDTO fileDTO = new ComFileDTO();
-        fileDTO.setFileType(CommonEnum.fileType.project.getCode());
-        fileDTO.setFileExplain(FileExplain);
-        fileDTO.setShowIndex(showIndex);
-        fileDTO.setRequired(true);
-        return fileDTO;
-    }
-
     private void loadPersonInfo(ComProjectDTO dto, ComPersonDTO comPersonDTO) {
         dto.setAppPersonName(comPersonDTO.getPersonName());
         dto.setSex(comPersonDTO.getSex());