Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-common/src/main/java/com/keao/edu/common/service/impl/BaseServiceImpl.java

@@ -23,10 +23,7 @@ import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * SERVICE操作基类
@@ -121,6 +118,9 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 
 	@Override
 	public <K extends List, Y, Z> Map<Y,Z> getMap(String tableName, String columnKey, String columnValue, K ids, Class<Y> keyType, Class<Z> valueType){
+		if(CollectionUtils.isEmpty(ids)){
+			return Collections.emptyMap();
+		}
 		StringBuffer sql=new StringBuffer();
 		Map<Y,Z> result=new HashMap();
 		try {
@@ -226,6 +226,9 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 
 	@Override
 	public <K extends List> Map<String, String> getMap(String tableName, String columnKey, String columnValue, K ids) {
+		if(CollectionUtils.isEmpty(ids)){
+			return Collections.emptyMap();
+		}
 		StringBuffer sql=new StringBuffer();
 		Map<String, String> result=new HashMap();
 		try {

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExaminationBasicController.java

@@ -1,11 +1,15 @@
 package com.keao.edu.user.controller;
 
+import com.keao.edu.auth.api.client.SysUserFeignService;
+import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.user.dto.ExaminationBasicDto;
+import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.ExaminationBasic;
 import com.keao.edu.user.page.ExaminationQueryInfo;
+import com.keao.edu.user.service.EmployeeService;
 import com.keao.edu.user.service.ExaminationBasicService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,6 +27,10 @@ public class ExaminationBasicController extends BaseController {
 
     @Autowired
     private ExaminationBasicService examinationBasicService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeService employeeService;
 
     @ApiOperation("查询指定考级项目")
     @GetMapping(value = "/getExaminationBasic")
@@ -39,6 +47,9 @@ public class ExaminationBasicController extends BaseController {
     @ApiOperation("创建考级项目")
     @PostMapping(value = "/addExaminationBasic")
     public HttpResponseResult<ExaminationBasic> addExaminationBasic(@RequestBody ExaminationBasic examinationBasic){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        Employee employee = employeeService.get(sysUser.getId());
+
         return succeed(examinationBasicService.addExaminationBasic(examinationBasic));
     }
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamRegistration.java

@@ -17,6 +17,9 @@ public class ExamRegistration {
 	
 	@ApiModelProperty(value = "考级项目编号")
 	private Integer examinationBasicId;
+
+	@ApiModelProperty(value = "考级项目详情")
+	private ExaminationBasic examinationBasic;
 	
 	@ApiModelProperty(value = "学员编号")
 	private Integer studentId;
@@ -137,7 +140,15 @@ public class ExamRegistration {
 	public Integer getExaminationBasicId(){
 		return this.examinationBasicId;
 	}
-			
+
+	public ExaminationBasic getExaminationBasic() {
+		return examinationBasic;
+	}
+
+	public void setExaminationBasic(ExaminationBasic examinationBasic) {
+		this.examinationBasic = examinationBasic;
+	}
+
 	public void setStudentId(Integer studentId){
 		this.studentId = studentId;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExaminationBasic.java

@@ -55,6 +55,14 @@ public class ExaminationBasic {
 
 	private String tenantId;
 
+	public ExaminationBasic() {
+	}
+
+	public ExaminationBasic(Integer id, String name) {
+		this.id = id;
+		this.name = name;
+	}
+
 	public String getMemo() {
 		return memo;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/enums/StudentRegistrationStatusEnum.java

@@ -24,7 +24,7 @@ public enum  StudentRegistrationStatusEnum implements BaseEnum<String, StudentRe
 
     @Override
     public String getCode() {
-        return null;
+        return code;
     }
 
     public void setCode(String code) {

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamOrganizationRelationServiceImpl.java

@@ -157,7 +157,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			if(YesOrNoEnum.YES.equals(examOrgan.getSendUrlFlag())){
 				continue;
 			}
-			String registrationUrl = baseUrl + "examId=" + examOrgan.getExaminationBasicId();
+			String registrationUrl = baseUrl + "examId=" + examOrgan.getExaminationBasicId() + "&organId=" + examOrgan.getOrganId();
 			String registShortUrl = shortUrlService.createShortUrl(registrationUrl);
 
 			examOrgan.setUrl(registShortUrl);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -149,13 +149,18 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
             dataList = this.getDAO().queryPage(params);
-            List<Integer> organIds = dataList.stream().map(ExamRegistration::getOrganId).collect(Collectors.toList());
+            List<Integer> examIds = dataList.stream().filter(e->Objects.nonNull(e.getOrganId())).map(ExamRegistration::getExaminationBasicId).collect(Collectors.toList());
+            Map<Integer, String> examIdNameMap = this.getMap("examination_basic", "id_", "name_", examIds, Integer.class, String.class);
+
+            List<Integer> organIds = dataList.stream().filter(e->Objects.nonNull(e.getOrganId())).map(ExamRegistration::getOrganId).collect(Collectors.toList());
             Map<Integer, String> organIdNameMap = this.getMap("organization", "id_", "name_", organIds, Integer.class, String.class);
+
             List<Integer> subjectIds = dataList.stream().map(ExamRegistration::getSubjectId).collect(Collectors.toList());
             Map<Integer, String> subjectIdNameMap = this.getMap("subject", "id_", "name_", subjectIds, Integer.class, String.class);
             for (ExamRegistration examRegistration : dataList) {
-                examRegistration.getOrganization().setName(organIdNameMap.get(examRegistration.getOrganId()));
-                examRegistration.getSubject().setName(subjectIdNameMap.get(examRegistration.getStudentId()));
+                examRegistration.setOrganization(new Organization(examRegistration.getOrganId(), organIdNameMap.get(examRegistration.getOrganId())));
+                examRegistration.getSubject().setName(subjectIdNameMap.get(examRegistration.getSubjectId()));
+                examRegistration.setExaminationBasic(new ExaminationBasic(examRegistration.getExaminationBasicId(), examIdNameMap.get(examRegistration.getExaminationBasicId())));
             }
         }
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/TenantInfoServiceImpl.java

@@ -63,6 +63,7 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 		sysUserDao.insert(sysUser);
 
 		Organization organ=new Organization();
+		organ.setUserId(sysUser.getId());
 		organ.setTenantId(tenantInfo.getId().toString());
 		organ.setParentOrganId(sysUser.getId());
 		organ.setLevel(0);

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -141,14 +141,19 @@
 	<select id="queryPage" resultMap="ExamRegistration" parameterType="map">
 		SELECT
 			er.id_,
+			er.examination_basic_id_,
+			er.exam_music_theory_level_,
 			er.card_no_,
 			er.student_id_,
 			su.real_name_ sys_user_real_name_,
+			er.level_fee_,
+			er.theory_level_fee_,
 			er.organ_id_,
 			er.subject_id_,
 			er.level_,
 			erp.trans_amount_,
-			er.status_
+			er.status_,
+			er.create_time_
 		FROM
 			exam_registration er
 			LEFT JOIN sys_user su ON er.student_id_ = su.id_

edu-user/edu-user-server/src/main/resources/config/mybatis/TenantInfoMapper.xml

@@ -82,7 +82,7 @@
 	<select id="queryPage" resultMap="TenantInfo" parameterType="map">
 		SELECT * FROM tenant_info
 		<include refid="queryPageCondition"/>
-		ORDER BY update_time_ DESC
+		ORDER BY id_ DESC
 		<include refid="global.limit"/>
 	</select>