Browse Source

经营报表需求,新增分部查询接口

zouxuan 2 năm trước cách đây
mục cha
commit
b4c02dfe71

+ 2 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/OrganizationService.java

@@ -86,4 +86,6 @@ public interface OrganizationService extends BaseService<Integer, Organization>
     boolean updateBasicInfo(Organization organization);
     boolean updateBasicInfo(Organization organization);
 
 
     Long add(Organization organization);
     Long add(Organization organization);
+
+    List<Organization> queryAll();
 }
 }

+ 5 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/OrganizationServiceImpl.java

@@ -215,6 +215,11 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		return insert;
 		return insert;
     }
     }
 
 
+	@Override
+	public List<Organization> queryAll() {
+		return organizationDao.queryEmployeeOrgan(null);
+	}
+
 	@Transactional(rollbackFor = Exception.class)
 	@Transactional(rollbackFor = Exception.class)
     public void updateOrganId(Integer userId,Integer organId){
     public void updateOrganId(Integer userId,Integer organId){
 		Employee employee = employeeDao.get(userId);
 		Employee employee = employeeDao.get(userId);

+ 1 - 1
mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -42,7 +42,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                         "/questionnaireTopic/getDetail", "/questionnaireUserResult/add",
                         "/questionnaireTopic/getDetail", "/questionnaireUserResult/add",
                         "/tenantInfo/info/*", "/tenantInfo/checkInfo/*", "/tenantInfo/pay/*","/tenantInfo/testCheck", "/tenantInfo/getContract/*",
                         "/tenantInfo/info/*", "/tenantInfo/checkInfo/*", "/tenantInfo/pay/*","/tenantInfo/testCheck", "/tenantInfo/getContract/*",
                         "/tenantPreJoin/add","/imLiveBroadcastRoom/queryRoomInfo","/imLiveBroadcastRoom/test",
                         "/tenantPreJoin/add","/imLiveBroadcastRoom/queryRoomInfo","/imLiveBroadcastRoom/test",
-                        "/eduOrganization/queryAllOrgan","/eduOrganization/getOrganCooperation","/import/oaUploadFile",
+                        "/eduOrganization/queryAllOrgan","/eduOrganization/queryAll","/eduOrganization/getOrganCooperation","/import/oaUploadFile",
                         "/tenantInfo/callback","/adapay/callback","/temp/*"
                         "/tenantInfo/callback","/adapay/callback","/temp/*"
                 )
                 )
                 .permitAll().anyRequest().authenticated().and().httpBasic();
                 .permitAll().anyRequest().authenticated().and().httpBasic();

+ 6 - 0
mec-web/src/main/java/com/ym/mec/web/controller/education/EduOrganizationController.java

@@ -45,6 +45,12 @@ public class EduOrganizationController extends BaseController {
     	
     	
     }
     }
 
 
+    @ApiOperation(value = "获取管乐迷分部列表")
+    @GetMapping("/queryAll")
+    public HttpResponseResult<List<Organization>> queryAll() {
+        return succeed(organizationService.queryAll());
+    }
+
     @ApiOperation(value = "获取员工所在分部列表")
     @ApiOperation(value = "获取员工所在分部列表")
     @GetMapping("/queryEmployeeOrgan")
     @GetMapping("/queryEmployeeOrgan")
     public HttpResponseResult<List<Organization>> queryEmployeeOrgan() throws Exception {
     public HttpResponseResult<List<Organization>> queryEmployeeOrgan() throws Exception {