添加类型

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/eum/OrgTypeEnum.java → epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/OrgTypeEnum.java

@@ -1,4 +1,4 @@
-package com.epmet.datareport.eum;
+package com.epmet.commons.tools.enums;
 
 /**
  * 需要组织类型枚举类
@@ -8,6 +8,7 @@ package com.epmet.datareport.eum;
  **/
 public enum OrgTypeEnum {
     DEPARTMENT("department", "部门"),
+    DEPT("dept", "部门"),
     AGENCY("agency", "组织"),
     GRID("grid", "网格"),
     ;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoCache.java

@@ -56,6 +56,12 @@ public class CustomerStaffInfoCache implements Serializable {
      */
     private Map<String,String> roleMap;
 
+    /**
+     * 工作人员是从哪中组织类型添加的 3个值：agency，grid，dept
+     * @see com.epmet.commons.tools.enums.OrgTypeEnum
+     */
+    private String fromOrgType;
+
     /**
      * 所属组织的上级组织
      */

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java

@@ -51,6 +51,12 @@ public class CustomerStaffResultDTO implements Serializable {
      */
     private String headPhoto;
 
+    /**
+     * 工作人员是从哪中组织类型添加的 3个值：agency，grid，dept
+     * @see com.epmet.commons.tools.enums.OrgTypeEnum
+     */
+    private String fromOrgType;
+
     /**
      * 角色map key为角色key value 为角色名称
      */

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java

@@ -43,7 +43,7 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
     List<AgencyGridResultDTO> selectAllSubAgency(@Param("subPids") String subPids);
 
     /**
-     * @Description  根据userId查询组织ID
+     * @Description 根据userId查询组织ID
      * @Param userId
      * @author zxc
      * @date 2020/12/25 下午4:55
@@ -53,7 +53,7 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
     List<String> selectUsedAreaCodeList(@Param("parentAreaCode") String parentAreaCode);
 
 
-    List<CustomerAgencyEntity> selectNextAgency(@Param("customerId")String customerId, @Param("pid")String pid);
+    List<CustomerAgencyEntity> selectNextAgency(@Param("customerId") String customerId, @Param("pid") String pid);
 
     /**
      * @Author sun
@@ -66,4 +66,11 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @author sun
      */
     List<StaffOrgNameResultDTO> selelctStaffOrg(@Param("staffIdList") List<String> staffIdList);
-}
+
+    /**
+     * desc:获取工作人员是怎么添加的
+     * @param staffId
+     * @return
+     */
+    String getStaffFromOrgType(@Param("staffId") String staffId);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -9,7 +9,6 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.BadgeConstant;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmetuser.*;
-import com.epmet.dataaggre.dao.govorg.CustomerAgencyDao;
 import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO;
 import com.epmet.dataaggre.dto.epmetuser.StaffPatrolDetailDTO;
 import com.epmet.dataaggre.dto.epmetuser.StaffPatrolRecordDTO;
@@ -70,8 +69,6 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     private GovProjectService govProjectService;
     @Resource
     private GovStaffRoleDao govStaffRoleDao;
-    @Autowired
-    private CustomerAgencyDao customerAgencyDao;
 
     /**
      * @Description  根据UserIds查询
@@ -534,6 +531,8 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             return null;
         }
         result.setAgencyName(agencyDTO.getOrganizationName());
+        String fromOrgType = govOrgService.getStaffFromOrgType(staffId);
+        result.setFromOrgType(fromOrgType);
 
         List<StaffRoleResultDTO> roleList = govStaffRoleDao.getStaffRoleList(staffId);
         Map<String, String> roleMap = roleList.stream().collect(Collectors.toMap(StaffRoleResultDTO::getRoleKey, StaffRoleResultDTO::getRoleName));

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java

@@ -129,4 +129,10 @@ public interface GovOrgService {
      */
     List<CustomerDepartmentDTO> getStaffDeptList(String staffId);
 
+    /**
+     * desc：获取工作人员是由哪个类型添加进来的
+     * @param staffId
+     * @return
+     */
+    String getStaffFromOrgType(String staffId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -425,4 +425,9 @@ public class GovOrgServiceImpl implements GovOrgService {
         return customerStaffDepartmentDao.getStaffDeptList(staffId);
     }
 
+    @Override
+    public String getStaffFromOrgType(String staffId) {
+        return customerAgencyDao.getStaffFromOrgType(staffId);
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml

@@ -146,5 +146,8 @@
             )
         </if>
     </select>
+    <select id="getStaffFromOrgType" resultType="java.lang.String">
+        SELECT ORG_TYPE FROM staff_org_relation WHERE del_flag = '0' AND staff_id = #{staffId}
+    </select>
 
-</mapper>
+</mapper>

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java

@@ -1,8 +1,8 @@
 package com.epmet.datareport.controller.screen;
 
+import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.datareport.eum.OrgTypeEnum;
 import com.epmet.datareport.service.evaluationindex.screen.IndexService;
 import com.epmet.evaluationindex.screen.dto.form.*;
 import com.epmet.evaluationindex.screen.dto.result.*;