2022考级报名

mec-student/src/main/java/com/ym/mec/student/controller/DegreeController.java

@@ -4,7 +4,11 @@ package com.ym.mec.student.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.OrganizationDao;
+import com.ym.mec.biz.dal.dao.SysAreaDao;
+import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dto.DegreeRegistrationActivityDto;
+import com.ym.mec.biz.dal.entity.Organization;
+import com.ym.mec.biz.dal.entity.SysArea;
 import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
 import com.ym.mec.biz.dal.page.SporadicChargeInfoQueryInfo;
 import com.ym.mec.biz.service.DegreeRegistrationService;
@@ -45,8 +49,14 @@ public class DegreeController extends BaseController {
     private SysTenantConfigService sysTenantConfigService;
 
     @Autowired
+    private SysConfigDao sysConfigDao;
+
+    @Autowired
     private OrganizationDao organizationDao;
 
+    @Autowired
+    private SysAreaDao sysAreaDao;
+
 	@Value("${message.debugMode: false}")
 	private boolean debugMode;
 
@@ -138,9 +148,21 @@ public class DegreeController extends BaseController {
         queryInfo.setOrder("ASC");
 
         Map<String, Object> result = new HashMap<>();
+        result.put("userInfo", user);
+        Organization organization = organizationDao.get(user.getOrganId());
+        if(!Objects.isNull(organization)){
+            SysArea area = sysAreaDao.get(organization.getAreaId());
+            if(Objects.nonNull(area)){
+                result.put("city", area.getName());
+                SysArea parentArea = sysAreaDao.getParentArea(area.getParentOrganId());
+                if(Objects.nonNull(parentArea)){
+                    result.put("province", parentArea.getName());
+                }
+            }
+        }
+        result.put("degreeTheoryAmountConfig", sysConfigDao.findConfigValue("degree_theory_amount_config"));
 
 //        Student student = studentDao.get(user.getId());
-        result.put("userInfo", user);
         //result.put("isNewUser", student.getIsNewUser());
 
         String configValue = sysTenantConfigService.getTenantConfigValue(SysConfigService.DEGREE_SUPPORT_ORGAN_LIST, user.getTenantId());