Merge remote-tracking branch 'origin/master'

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/entity/Organization.java

@@ -35,9 +35,6 @@ public class Organization {
 	@ApiModelProperty(value = "分润金额",required = false)
 	private java.math.BigDecimal shareProfitAmount;
 
-	@ApiModelProperty(value = "补贴",required = false)
-	private java.math.BigDecimal subsidy;
-
 	@ApiModelProperty(value = "层级")
 	private Integer level;
 
@@ -61,14 +58,6 @@ public class Organization {
 
 	private SysUser sysUser;
 
-	public BigDecimal getSubsidy() {
-		return subsidy;
-	}
-
-	public void setSubsidy(BigDecimal subsidy) {
-		this.subsidy = subsidy;
-	}
-
 	public Integer getLockFlag() {
 		return lockFlag;
 	}

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/entity/Teacher.java

@@ -27,9 +27,6 @@ public class Teacher {
 	@ApiModelProperty(value = "薪酬",required = false)
 	private java.math.BigDecimal salary;
 
-	@ApiModelProperty(value = "补贴",required = false)
-	private java.math.BigDecimal subsidy;
-
 	@ApiModelProperty(value = "是否删除",required = false)
 	private Integer delFlag;
 
@@ -61,14 +58,6 @@ public class Teacher {
 	
 	private String certificateNo;
 
-	public BigDecimal getSubsidy() {
-		return subsidy;
-	}
-
-	public void setSubsidy(BigDecimal subsidy) {
-		this.subsidy = subsidy;
-	}
-
 	public Integer getOrganId() {
 		return organId;
 	}

edu-user/edu-user-biz/src/main/resources/config/mybatis/OrganizationMapper.xml

@@ -22,14 +22,13 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
 		<result column="lock_flag_" property="lockFlag" />
-		<result column="subsidy_" property="subsidy" />
 		<association property="sysUser" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
 	</resultMap>
 	<sql id="organizationColumn">
 		o.id_ organization_id_, o.user_id_, o.name_, o.contact_name_, o.contact_phone_,
 		o.settlement_type_, o.share_profit_amount_, o.level_, o.parent_organ_id_,
 		o.parent_organ_id_tag_, o.create_time_,
-		o.update_time_, o.del_flag_, o.tenant_id_,o.subsidy_
+		o.update_time_, o.del_flag_, o.tenant_id_
 	</sql>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -48,19 +47,16 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.Organization" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO organization (id_,user_id_,name_,contact_name_,contact_phone_,level_,parent_organ_id_,
-		parent_organ_id_tag_,settlement_type_,share_profit_amount_,create_time_,update_time_,tenant_id_,subsidy_)
+		parent_organ_id_tag_,settlement_type_,share_profit_amount_,create_time_,update_time_,tenant_id_)
 		VALUES(#{id},#{userId},#{name},#{contactName},#{contactPhone},#{level},#{parentOrganId},#{parentOrganIdTag},
 		#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
-		#{shareProfitAmount},NOW(),NOW(),#{tenantId},#{subsidy})
+		#{shareProfitAmount},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.keao.edu.user.entity.Organization">
 		UPDATE organization
 		<set>
-			<if test="subsidy != null">
-				subsidy_ = #{subsidy},
-			</if>
 			<if test="contactPhone != null">
 				contact_phone_ = #{contactPhone},
 			</if>

edu-user/edu-user-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -22,7 +22,6 @@
 		<result column="organ_id_" property="organId" />
 		<result column="city_" property="city" />
 		<result column="certificate_no_" property="certificateNo" />
-		<result column="subsidy_" property="subsidy" />
 		<association property="sysUser" columnPrefix="sys_user_" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
 	</resultMap>
 
@@ -46,9 +45,6 @@
 	<update id="update" parameterType="com.keao.edu.user.entity.Teacher">
 		UPDATE teacher
 		<set>
-			<if test="subsidy != null">
-				subsidy_ = #{subsidy},
-			</if>
 			<if test="title != null">
 				title_ = #{title},
 			</if>
@@ -116,8 +112,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.Teacher" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO teacher (user_id_,title_,subject_id_list_,salary_settlement_type_,salary_,create_time_,update_time_,tenant_id_,organ_id_,city_,certificate_no_,subsidy_)
-		VALUES(#{userId},#{title},#{subjectIdList},#{salarySettlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{salary},NOW(),NOW(),#{tenantId},#{organId},#{city},#{certificateNo},#{subsidy})
+		INSERT INTO teacher (user_id_,title_,subject_id_list_,salary_settlement_type_,salary_,create_time_,update_time_,tenant_id_,organ_id_,city_,certificate_no_)
+		VALUES(#{userId},#{title},#{subjectIdList},#{salarySettlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{salary},NOW(),NOW(),#{tenantId},#{organId},#{city},#{certificateNo})
 	</insert>
 
 	<update id="delete">

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

@@ -156,7 +156,6 @@ public class ExamRoomController extends BaseController {
 
     @ApiOperation("获取教室")
     @PostMapping(value = "/api/get")
-    @PreAuthorize("@pcs.hasPermissions('examRoom/api/get')")
     public ExamRoom getApiExamRoom(Long id){
         return examRoomService.get(id);
     }

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

@@ -111,14 +111,12 @@ public class ExamRoomStudentRelationController extends BaseController {
 
     @ApiOperation("获取推送消息内容")
     @PostMapping(value = "api/getPublishMessage")
-    @PreAuthorize("@pcs.hasPermissions('examRoomStudentRelation/api/getPublishMessage')")
     public PublishMessageDto getPublishMessage(Long examRegistrationId) {
         return examRoomStudentRelationService.getPublishMessage(examRegistrationId);
     }
 
     @ApiOperation("获取教室学员关联")
     @PostMapping(value = "api/getExamRoomStudentRelation")
-    @PreAuthorize("@pcs.hasPermissions('examRoomStudentRelation/api/getExamRoomStudentRelation')")
     public ExamRoomStudentRelation getExamRoomStudentRelation(Long registrationId) {
         return examRoomStudentRelationService.getExamRoomStudentRelation(registrationId);
     }

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

@@ -33,7 +33,6 @@ public class StudentAttendanceController extends BaseController {
 
 	@ApiOperation("更新学员考勤")
 	@PostMapping(value = "/api/upsetStudentAttendance")
-	@PreAuthorize("@pcs.hasPermissions('studentAttendance/api/upsetStudentAttendance')")
 	public HttpResponseResult upsetAttendance(Long examRegistrationId,Integer signFlag) {
 		studentAttendanceService.upsetAttendance(examRegistrationId,signFlag);
 		return succeed();

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

@@ -69,14 +69,12 @@ public class StudentExamResultController extends BaseController {
 
     @ApiOperation("修改考试状态")
     @PostMapping(value = "/api/updateFinishedExam")
-    @PreAuthorize("@pcs.hasPermissions('studentExamResult/api/updateFinishedExam')")
     public void updateFinishedExam(Long examRegistrationId,Integer finishedExam){
         studentExamResultService.updateFinishedExam(examRegistrationId,finishedExam);
     }
 
     @ApiOperation("获取考试结果")
     @PostMapping(value = "/api/get")
-    @PreAuthorize("@pcs.hasPermissions('studentExamResult/api/get')")
     public StudentExamResultApiDto get(Long id){
         return studentExamResultService.getStudentExamResultApiDto(id);
     }

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

@@ -89,7 +89,6 @@ public class SysConfigController extends BaseController {
 
 	@ApiOperation(value = "查询参数")
 	@PostMapping(value = "api/get")
-	@PreAuthorize("@pcs.hasPermissions('studentExamResult/api/get')")
 	public String apiGet(String paramName) {
 		String tenantId = TenantContextHolder.getTenantId();
 		return sysConfigService.findByParamName(paramName,tenantId).getParanValue();