Merge remote-tracking branch 'origin/master'

# Conflicts:
#	edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/EmployeeController.java
#	edu-user/edu-user-server/src/main/resources/config/mybatis/EmployeeMapper.xml

edu-common/src/main/java/com/keao/edu/common/entity/SysConfig.java

@@ -22,6 +22,10 @@ public class SysConfig {
 	/** 描述 */
 	@ApiModelProperty(value = "描述", required = true)
 	private String description;
+
+	/** 描述 */
+	@ApiModelProperty(value = "备注", required = true)
+	private String annotation;
 	
 	/** 创建时间 */
 	private java.util.Date createOn;
@@ -34,6 +38,14 @@ public class SysConfig {
 
 	private String tenantId;
 
+	public String getAnnotation() {
+		return annotation;
+	}
+
+	public void setAnnotation(String annotation) {
+		this.annotation = annotation;
+	}
+
 	public String getTenantId() {
 		return tenantId;
 	}

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

@@ -40,10 +40,10 @@ public class EmployeeController extends BaseController {
 
 	@ApiOperation("新增员工")
 	@PostMapping(value = "/add")
-	public HttpResponseResult add(Employee employee) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		employee.setOrganId(sysUser.getId());
-		employeeService.add(employee);
+	public HttpResponseResult add(@RequestBody Employee employee) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        employee.setOrganId(sysUser.getId());
+	    employeeService.add(employee);
 		return succeed();
 	}
 

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

@@ -37,7 +37,7 @@ public class StudentController extends BaseController {
 	}
 
 	@ApiOperation(value = "学员报考列表")
-	@GetMapping(value = "applyList")
+	@PostMapping(value = "applyList")
     @PreAuthorize("@pcs.hasPermissions('student/applyList')")
 	public HttpResponseResult<PageInfo<StudentExamPaymentDto>> applyList(StudentApplyQueryInfo queryInfo) {
 		return succeed(studentService.queryApplyList(queryInfo));

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

@@ -67,7 +67,7 @@ public class Employee {
 	private String roleName;
 
 	@ApiModelProperty(value = "是否删除0否1是",required = false)
-	private Integer delFlag;
+	private boolean delFlag;
 
 	@ApiModelProperty(value = "员工信息",required = false)
 	private SysUser sysUser;
@@ -84,11 +84,11 @@ public class Employee {
 		this.tenantId = tenantId;
 	}
 
-	public Integer getDelFlag() {
+	public boolean getDelFlag() {
 		return delFlag;
 	}
 
-	public void setDelFlag(Integer delFlag) {
+	public void setDelFlag(boolean delFlag) {
 		this.delFlag = delFlag;
 	}
 

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

@@ -5,12 +5,14 @@ import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
+import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.ImResult;
 import com.keao.edu.im.api.entity.ImUserModel;
 import com.keao.edu.user.dao.EmployeeDao;
 import com.keao.edu.user.dao.SysUserDao;
 import com.keao.edu.user.entity.Employee;
+import com.keao.edu.user.enums.YesOrNoEnum;
 import com.keao.edu.user.service.EmployeeService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +38,10 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void add(Employee employee) {
+		String tenantId = TenantContextHolder.getTenantId().toString();
 		SysUser sysUser = employee.getSysUser();
+		sysUser.setTenantId(tenantId);
+		employee.setTenantId(tenantId);
 		SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
 		if(user != null && user.getId() != null){
 			Employee employee1 = employeeDao.get(user.getId());
@@ -50,10 +55,13 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 				sysUserDao.batchAddEmployeeRole(user.getId(),sysUser.getRoles());
 				user.setUserType(user.getUserType() + ",SYSTEM");
 				sysUserDao.update(user);
-				return;
+			}else if(employee1.getDelFlag()){
+				employee1.setDelFlag(false);
+				employeeDao.update(employee1);
 			}else{
 				throw new BizException("用户已存在");
 			}
+			return;
 		}
 		user = new SysUser();
 		user.setPassword(new BCryptPasswordEncoder().encode("123456"));

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

@@ -81,13 +81,13 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				user.setRealName(organ.getName());
 				user.setPhone(organ.getContactPhone());
 				sysUserDao.update(user);
-				return;
 			}else if(organization.getDelFlag() == YesOrNoEnum.YES){
 				organization.setDelFlag(YesOrNoEnum.NO);
 				organDao.update(organization);
 			}else{
 				throw new BizException("用户已存在");
 			}
+			return;
 		}
 		sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
 		sysUser.setUserType("ORGAN");

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

@@ -72,10 +72,10 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
                 sysUser.setId(user.getId());
                 sysUser.setUserType(user.getUserType() + ",STUDENT");
                 sysUserDao.update(sysUser);
-                return;
             }else{
                 throw new BizException("用户已存在");
             }
+            return;
         }
         Organization organization = organizationService.get(student.getOrganId());
         student.setTenantId(organization.getTenantId());
@@ -131,6 +131,15 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
             dataList = studentDao.queryApplyList(params);
+            List<Integer> basicIds = dataList.stream().map(e -> e.getExamRegistration().getExaminationBasicId()).collect(Collectors.toList());
+            Map<Integer, String> basicNameMap = this.getMap("examination_basic", "id_", "name_", basicIds, Integer.class, String.class);
+            Map<Integer, String> organNameMap = this.getMap("organization", "id_", "name_", basicIds, Integer.class, String.class);
+            Map<Integer, String> subjectNameMap = this.getMap("subject", "id_", "name_", basicIds, Integer.class, String.class);
+            dataList.forEach(e->{
+                e.setExamBaseName(basicNameMap.get(e.getExamRegistration().getExaminationBasicId()));
+                e.setOrganName(organNameMap.get(e.getExamRegistration().getOrganId()));
+                e.setOrganName(subjectNameMap.get(e.getExamRegistration().getSubjectId()));
+            });
         }
         if (count == 0) {
             dataList = new ArrayList<>();

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

@@ -50,59 +50,54 @@
 	<update id="update" parameterType="com.keao.edu.user.entity.Employee">
 		UPDATE employee
 		<set>
-			<if test="graduateSchool != null">
-				graduate_school_ = #{graduateSchool},
-			</if>
-			<if test="introduction != null">
-				introduction_ = #{introduction},
-			</if>
-			<if test="postalCode != null">
-				postal_code_ = #{postalCode},
-			</if>
-			<if test="technicalTitles != null">
-				technical_titles_ = #{technicalTitles},
-			</if>
-			<if test="entryDate != null">
-				entry_date_ = #{entryDate},
-			</if>
-			<if test="contactAddress != null">
-				contact_address_ = #{contactAddress},
-			</if>
-			<if test="jobNature != null">
-				job_nature_ = #{jobNature},
-			</if>
-			<if test="createTime != null">
-				create_time_ = #{createTime},
-			</if>
-			<if test="userId != null">
-				user_id_ = #{userId},
-			</if>
-			<if test="certificateType != null">
-				certificate_type_ = #{certificateType},
-			</if>
-			<if test="updateTime != null">
-				update_time_ = #{updateTime},
-			</if>
-			<if test="educationBackground != null">
-				education_background_ = #{educationBackground},
-			</if>
-			<if test="certificateNum != null">
-				certificate_num_ = #{certificateNum},
-			</if>
-			<if test="demissionDate != null">
-				demission_date_ = #{demissionDate},
-			</if>
-			<if test="tenantId != null">
-				tenant_id_=#{tenantId},
-			</if>
-			<if test="organId != null">
-				organ_id_=#{organId},
-			</if>
-		</set> WHERE user_id_ = #{userId}
+            <if test="graduateSchool != null">
+                graduate_school_ = #{graduateSchool},
+            </if>
+            <if test="introduction != null">
+                introduction_ = #{introduction},
+            </if>
+            <if test="postalCode != null">
+                postal_code_ = #{postalCode},
+            </if>
+            <if test="technicalTitles != null">
+                technical_titles_ = #{technicalTitles},
+            </if>
+            <if test="entryDate != null">
+                entry_date_ = #{entryDate},
+            </if>
+            <if test="contactAddress != null">
+                contact_address_ = #{contactAddress},
+            </if>
+            <if test="jobNature != null">
+                job_nature_ = #{jobNature},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="certificateType != null">
+                certificate_type_ = #{certificateType},
+            </if>
+            <if test="educationBackground != null">
+                education_background_ = #{educationBackground},
+            </if>
+            <if test="certificateNum != null">
+                certificate_num_ = #{certificateNum},
+            </if>
+            <if test="demissionDate != null">
+                demission_date_ = #{demissionDate},
+            </if>
+            <if test="tenantId != null">
+                tenant_id_=#{tenantId},
+            </if>
+            <if test="organId != null">
+                organ_id_=#{organId},
+            </if>
+            update_time_ = NOW()
+        </set> WHERE user_id_ = #{userId}
 	</update>
 	<!-- 根据主键删除一条记录 -->
 	<update id="delete" >
-		UPDATE employee SET del_flag_ = 0,update_time_ = NOW() WHERE user_id_ = #{userId}
+		UPDATE employee SET del_flag_ = 1,update_time_ = NOW() WHERE user_id_ = #{userId}
 	</update>
 	<sql id="employeeQueryPage">
 		<where>

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

@@ -8,6 +8,7 @@
 		<result column="param_name_" property="paramName" />
 		<result column="paran_value_" property="paranValue" />
 		<result column="description_" property="description" />
+		<result column="annotation_" property="annotation" />
 		<result column="create_on_" property="createOn" />
 		<result column="modify_on_" property="modifyOn" />
 		<result column="group_" property="group" />
@@ -34,8 +35,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO sys_config
-		(id_,param_name_,paran_value_,description_,create_on_,modify_on_,group_,tenant_id_)
-		VALUES(#{id},#{paramName},#{paranValue},#{description},#{createOn},#{modifyOn},#{group},#{tenantId})
+		(id_,param_name_,paran_value_,description_,create_on_,modify_on_,group_,tenant_id_,annotation_)
+		VALUES(#{id},#{paramName},#{paranValue},#{description},#{createOn},#{modifyOn},#{group},#{tenantId},#{annotation})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -51,6 +52,9 @@
 			<if test="description != null">
 				description_ = #{description},
 			</if>
+			<if test="annotation != null">
+				annotation_ = #{annotation},
+			</if>
 			<if test="paramName != null">
 				param_name_ = #{paramName},
 			</if>