Merge remote-tracking branch 'origin/master'

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

@@ -20,4 +20,6 @@ public class loginUser implements Serializable {
     private String projType;
     /** 信息是否完整 */
     private boolean complete;
+    /** 信息是否完整 */
+    private boolean unitComplete;
 }

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

@@ -15,7 +15,9 @@ import com.yiboshi.science.config.verification.VerificationCodeEnum;
 import com.yiboshi.science.config.verification.VerificationCodeProperties;
 import com.yiboshi.science.entity.AuthUser;
 import com.yiboshi.science.entity.ComPerson;
+import com.yiboshi.science.entity.ComUnit;
 import com.yiboshi.science.entity.SystemUser;
+import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.CheckUserDTO;
 import com.yiboshi.science.param.dto.SMSParameterDTO;
 import com.yiboshi.science.param.dto.UserDTO;
@@ -72,6 +74,9 @@ public class AuthorizationController {
     @Autowired
     private ComPersonService comPersonService;
 
+    @Autowired
+    private ComUnitService comUnitService;
+
     @Autowired
     private TokenEndpoint tokenEndpoint;
 
@@ -169,8 +174,14 @@ public class AuthorizationController {
         if(!user.getType().equals("3")){
             user.setProjType(systemSetService.getByKey(SystemSetKey.SysProjectType));
         }
-        ComPerson  person = comPersonService.getById(SecurityUserHolder.getPersonId());
-        user.setComplete(comPersonService.isComplete(person));
+        if (SecurityUserHolder.getRoles().contains(CommonEnum.systemRole.personal.getCode().toString())) {
+            ComPerson  person = comPersonService.getById(SecurityUserHolder.getPersonId());
+            user.setComplete(comPersonService.isComplete(person));
+        }
+        if (SecurityUserHolder.getRoles().contains(CommonEnum.systemRole.unit.getCode().toString())) {
+            ComUnit comUnit = comUnitService.getById(SecurityUserHolder.getUnitId());
+            user.setUnitComplete(comUnitService.isComplete(comUnit));
+        }
         List<UserMenuDTO> menuList = systemMenuService.findByRoleId(SecurityUserHolder.getRoles());
         Map<String, Object> userInfo = new HashMap<String, Object>(3) {
             {

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

@@ -175,7 +175,6 @@ public class ComPersonController extends BaseController<ComPersonService, ComPer
     @GetMapping
     @RequestMapping("/getAppPersonInfo")
     public ResponseDataModel<Map<String, Object>> getAppPersonInfo() {
-        boolean isComplete = true;
         ComPerson comPerson = comPersonService.entityById(SecurityUserHolder.getPersonId());
         boolean finalComplete = comPersonService.isComplete(comPerson);
         Map<String, Object> data = new HashMap<String, Object>(3) {

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

@@ -6,6 +6,7 @@ import com.yiboshi.science.config.annotation.Anonymous;
 import com.yiboshi.science.config.annotation.Logs;
 import com.yiboshi.science.config.bean.SystemProperties;
 import com.yiboshi.science.config.security.SecurityUserHolder;
+import com.yiboshi.science.entity.ComPerson;
 import com.yiboshi.science.entity.ComUnit;
 import com.yiboshi.science.entity.SelectListItem;
 import com.yiboshi.science.enumeration.CommonEnum;
@@ -226,12 +227,25 @@ public class ComUnitController extends BaseController<ComUnitService, ComUnitQue
         return ResponseDataModel.ok(info);
     }
 
+    @ApiOperation(value = "获取单位信息", httpMethod = "GET", notes = "获取单位信息")
+    @GetMapping
+    @RequestMapping("/getAppUnitInfo")
+    public ResponseDataModel<Map<String, Object>> getAppUnitInfo() {
+        ComUnit comUnit = comUnitService.entityById(SecurityUserHolder.getUnitId());
+        boolean finalComplete = comUnitService.isComplete(comUnit);
+        Map<String, Object> data = new HashMap<String, Object>(2) {
+            {
+                put("unit", comUnit);
+                put("isComplete", finalComplete);
+            }
+        };
+        return ResponseDataModel.ok(data);
+    }
 
     @ApiOperation(value = "获取当前操作人员的单位信息", httpMethod = "GET", notes = "获取当前操作人员的单位信息")
     @GetMapping
     @RequestMapping("/getCurrentUnitInfo")
     public ResponseDataModel<ComUnitDTO> getCurrentUnitInfo() {
-        String UnitID = SecurityUserHolder.getUnitId();
-        return ResponseDataModel.ok(comUnitService.getUnitById(UnitID));
+        return ResponseDataModel.ok(comUnitService.getUnitById(SecurityUserHolder.getUnitId()));
     }
 }

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

@@ -138,4 +138,25 @@ public class SystemParameterController extends BaseController<SystemParameterSer
     public ResponseDataModel<String> refreshSystemParameter() {
         return ResponseDataModel.ok(systemParameterService.refreshSystemParameter());
     }
+
+    @ApiOperation(value = "根据参数获取参数列表", httpMethod = "GET", notes = "根据参数获取参数列表")
+    @GetMapping
+    @RequestMapping("/getParameterListBySystemCode")
+    public ResponseDataModel<List<SelectListItem>> getParameterListBySystemCode(String SystemCodeOrName) {
+        List<SelectListItem> list = new ArrayList<>();
+        List<SystemParameter> paraList = systemParameterService.getParameterListBySystemCode(SystemCodeOrName);
+        paraList.forEach((e) -> {
+            SelectListItem selectListItem = new SelectListItem(e.getName(), e.getId(),"",true, true, null);
+            list.add(selectListItem);
+        });
+        return ResponseDataModel.ok(list);
+    }
+
+    @ApiOperation(value = "获取学科代码树列表", httpMethod = "GET", notes = "获取学科代码树列表")
+    @GetMapping
+    @RequestMapping("/getKnowledgeParameterTreeList")
+    public ResponseDataModel<List<SelectListItem>> getKnowledgeParameterTreeList() {
+        List<SelectListItem> list = systemParameterService.getKnowledgeInfoList();
+        return ResponseDataModel.ok(list);
+    }
 }

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

 package com.yiboshi.science.service;
 import com.yiboshi.science.base.BaseService;
+import com.yiboshi.science.entity.ComPerson;
 import com.yiboshi.science.entity.ComUnit;
 import com.yiboshi.science.param.dto.ComUnitDTO;
 import com.yiboshi.science.param.dto.DataStatisticsDTO;
@@ -116,6 +117,10 @@ public interface ComUnitService extends BaseService<ComUnitQueryVO, ComUnitDTO,
      * @return
      */
     String getNewCode(String fatherCode);
+
     DataStatisticsDTO getRegisterUnitCount(ComUnitQueryVO v);
+
     DataStatisticsDTO getRegisterUnitCountByDay(ComUnitQueryVO v);
+
+    boolean isComplete(ComUnit comUnit);
 }

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

@@ -89,4 +89,17 @@ public interface SystemParameterService extends BaseService<SystemParameterQuery
     String refreshSystemParameter();
 
     String judgmentTitleLevel(String titleId);
+
+    /**
+     * 根据systemCodeOrName获取学科列表
+     * @param SystemCodeOrName
+     * @return
+     */
+    List<SystemParameter> getParameterListBySystemCode(String SystemCodeOrName);
+
+    /**
+     * 获取学科代码树列表
+     * @return
+     */
+    List<SelectListItem> getKnowledgeInfoList();
 }

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

@@ -20,6 +20,7 @@ import com.yiboshi.science.utils.RedisKey;
 import com.yiboshi.science.utils.RedisUtils;
 import com.yiboshi.yac.model.OrgInfo;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -137,7 +138,7 @@ public class ComUnitServiceImpl extends BaseServiceImpl<ComUnitDAO, ComUnitQuery
                 upTreeCode = dto.getTreeCode().substring(0, dto.getTreeCode().length() - properties.getDefaultCodeLength());
             }
         }
-        ComUnitDTO unit=this.getByTreeCode(upTreeCode);
+        ComUnitDTO unit = this.getByTreeCode(upTreeCode);
         return dto;
     }
 
@@ -380,7 +381,6 @@ public class ComUnitServiceImpl extends BaseServiceImpl<ComUnitDAO, ComUnitQuery
     }
 
 
-
     public List<ComUnitDTO> getList() {
         List<ComUnitDTO> list = null;
         Object obj = redisUtils.get(RedisKey.UnitList);
@@ -418,11 +418,37 @@ public class ComUnitServiceImpl extends BaseServiceImpl<ComUnitDAO, ComUnitQuery
     }
 
 
-
     /**
      * 刷新Redis单位信息
      */
     public void refreshRedis() {
         redisUtils.del(RedisKey.UnitList);
     }
+
+    public boolean isComplete(ComUnit unit) {
+        if (null == unit)
+            return false;
+        if (StringUtils.isEmpty(unit.getUnitName())
+                || Objects.isNull(unit.getUnitType())
+                || StringUtils.isEmpty(unit.getUnitAddress())
+                || StringUtils.isEmpty(unit.getLinkName())
+                || StringUtils.isEmpty(unit.getTelephone())
+                || StringUtils.isEmpty(unit.getEmail())
+//                || StringUtils.isEmpty(unit.getFax())
+                || StringUtils.isEmpty(unit.getOrganizationCode())
+                || StringUtils.isEmpty(unit.getRegisteredAddress())
+                || StringUtils.isEmpty(unit.getPostCode())
+                || StringUtils.isEmpty(unit.getLegalPerson())
+                || Objects.isNull(unit.getWorkforce())
+                || Objects.isNull(unit.getSpecializedPersonnel())
+                || Objects.isNull(unit.getResearchPersonnel())
+//                || StringUtils.isEmpty(unit.getDepositBank())
+//                || StringUtils.isEmpty(unit.getBankAccount())
+//                || StringUtils.isEmpty(unit.getDepositBankAddress())
+//                || StringUtils.isEmpty(unit.getInterbankNumber())
+        ) {
+            return false;
+        }
+        return true;
+    }
 }

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

@@ -325,4 +325,54 @@ public class SystemParameterServiceImpl extends BaseServiceImpl<SystemParameterD
             }
         }
     }
+
+    public List<SystemParameter> getParameterListBySystemCode(String SystemCodeOrName) {
+        List<SystemParameter> list = getListByType(68);
+        List<SystemParameter> findList = list.stream().filter(e -> e.getSystemCode().contains(SystemCodeOrName) || e.getName().contains(SystemCodeOrName)).collect(Collectors.toList());
+        return findList;
+    }
+
+    public List<SelectListItem> getKnowledgeInfoList() {
+        List<SelectListItem> list = null;
+        Object obj = redisUtils.get(RedisKey.KnowledgeCodeList);
+        if (null != obj)
+            list = (List<SelectListItem>) redisUtils.get(RedisKey.KnowledgeCodeList);
+        if (null == list || list.size() == 0) {
+            list = getKnowledgeParameterTreeList();
+            redisUtils.set(RedisKey.KnowledgeCodeList, list, 7, TimeUnit.DAYS);
+        }
+        return list;
+    }
+
+    private List<SelectListItem> getKnowledgeParameterTreeList() {
+        List<SystemParameter> parentList = this.getListByType(68);
+
+        List<SelectListItem> list = new ArrayList<>();
+        List<SystemParameter> FirstList = parentList.stream().filter(e -> e.getSystemCode().equals("C") || e.getSystemCode().equals("G") || e.getSystemCode().equals("H")).collect(Collectors.toList());
+        FirstList.forEach(e -> {
+            SelectListItem treeListItem = new SelectListItem(e.getName(), e.getId(), e.getSystemCode(), false, false, new ArrayList<>());
+            list.add(treeListItem);
+        });
+
+        list.forEach(e -> {
+            List<SelectListItem> SecondList = AddChildList(parentList, e, 3);
+            e.setChildren(SecondList);
+            SecondList.forEach(f -> {
+                List<SelectListItem> ThirdList = AddChildList(parentList, f, 5);
+                f.setChildren(ThirdList);
+            });
+        });
+
+        return list;
+    }
+
+    private List<SelectListItem> AddChildList(List<SystemParameter> parentList, SelectListItem s, int CodeLenght) {
+        List<SelectListItem> SelectList = new ArrayList<>();
+        List<SystemParameter> itemList = parentList.stream().filter(f -> f.getSystemCode().contains(s.getDescription()) && f.getSystemCode().length() == CodeLenght).collect(Collectors.toList());
+        itemList.forEach(e -> {
+            SelectListItem treeListItem = new SelectListItem(e.getName(), e.getId(), e.getSystemCode(), false, false, new ArrayList<>());
+            SelectList.add(treeListItem);
+        });
+        return SelectList;
+    }
 }

science-admin/src/main/java/com/yiboshi/science/utils/RedisKey.java

@@ -18,4 +18,6 @@ public class RedisKey {
     public final static String RoleList = "role-list";
     //项目KPI绩效指标
     public final static String ProjectKPIList = "project-kpi-list";
+    //学科代码列表
+    public final static String KnowledgeCodeList = "knowledge-code-list";
 }

science-admin/src/main/resources/mapper/ComProjectDAO.xml

@@ -40,7 +40,7 @@
 
     <select id="getById" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectDTO">
         SELECT a.*,b.name knowledge_name,
-               ic.proj_id,ic.job_time,ic.main_research_areas,ic.address
+               ic.proj_id,ic.job_time,ic.main_research_areas,ic.address,
                ic.unit_link_name,ic.unit_link_mobile,ic.unit_link_email,ic.unit_link_fax,ic.subject_scope,ic.proj_abstract,ic.proj_keywords,
                ic.total_funding,ic.gov_funding,ic.unit_funding,ic.self_funding,ic.other_funding,
                ic.proj_content,
@@ -48,7 +48,7 @@
                c.id download_id,c.download_url,c.file_name
         from com_project a
         left join com_project_basic ic on a.id=ic.proj_id
-        left join system_parameter b on a.knowledge_id=b.id
+        left join system_parameter b on a.knowledge_id=b.id and b.type_id=68
         left join com_download c on ic.file_id=c.id
         where a.id = #{id}
     </select>

science-base/src/main/java/com/yiboshi/science/entity/SelectCodeListItem.java

+package com.yiboshi.science.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class SelectCodeListItem implements Serializable {
+    /** 获取或设置选定项的文本 */
+    private String title ;
+    /** 获取或设置选定项的值 */
+    private String key;
+    private String pkey;
+    private String ppkey;
+    /** description */
+    private String description ;
+    /** 获取或设置选定项的文本 */
+    private boolean selected ;
+    /** 获取或设置一个值，该值指示是否禁用 */
+    private boolean disabled ;
+    /** 子选项 */
+    private List<SelectListItem> children ;
+}