Bläddra i källkod

增加列表查询

周箭河 5 år sedan
förälder
incheckning
b15cac89e1

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/DegreeRegistrationMapper.xml

@@ -93,7 +93,7 @@
     </select>
 
     <select id="getTotalAmount" parameterType="map" resultMap="DegreeRegistration">
-        SELECT SUM(money_) ,SUM(theory_money_) FROM degree_registration
+        SELECT SUM(money_) money_ ,SUM(theory_money_) theory_money_ FROM degree_registration
         <include refid="queryPageSql"/>
     </select>
 

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

@@ -26,7 +26,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 	public void configure(HttpSecurity http) throws Exception {
 		http.csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler).authenticationEntryPoint(baseAuthenticationEntryPoint).and()
 				.authorizeRequests().antMatchers("/task/**").hasIpAddress("0.0.0.0/0")
-				.antMatchers("/v2/api-docs", "/classGroup/highClassGroups", "/code/*", "/api/*", "/appVersionInfo/queryByPlatform","/degree/*").permitAll().anyRequest()
+				.antMatchers("/v2/api-docs", "/classGroup/highClassGroups", "/code/*", "/api/*", "/appVersionInfo/queryByPlatform","/eduDegree/*").permitAll().anyRequest()
 				.authenticated().and().httpBasic();
 	}
 

+ 2 - 2
mec-web/src/main/java/com/ym/mec/web/controller/education/DegreeController.java → mec-web/src/main/java/com/ym/mec/web/controller/education/EduDegreeController.java

@@ -29,10 +29,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
 
-@RequestMapping("degree")
+@RequestMapping("eduDegree")
 @Api(tags = "级报名服务")
 @RestController
-public class DegreeController extends BaseController {
+public class EduDegreeController extends BaseController {
 
     @Autowired
     private StudentPaymentOrderService studentPaymentOrderService;