77

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/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/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;
+    }
 }