update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysConfigDao.java

@@ -2,6 +2,9 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface SysConfigDao extends BaseDAO<Long, SysConfig> {
 
@@ -20,5 +23,6 @@ public interface SysConfigDao extends BaseDAO<Long, SysConfig> {
      * @return
      */
     String findConfigValue(String paramName);
-	
+
+    void batchUpdate(@Param("configList") List<SysConfig> configList);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -188,6 +188,16 @@ public class CourseSchedule {
 	//课程调整不的超过该时间限制
 	private Date validEndTime;
 
+	private Integer tenantId;
+
+	public Integer getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(Integer tenantId) {
+		this.tenantId = tenantId;
+	}
+
 	public Date getValidStartTime() {
 		return validStartTime;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java

@@ -3,6 +3,8 @@ package com.ym.mec.biz.service;
 import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+
 public interface SysConfigService extends BaseService<Long, SysConfig> {
     //乐团基础规则
 
@@ -32,6 +34,18 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     String OFFLINE_GPS_ERROR_CUT_SALARY_UNIT = "offline_gps_error_cut_salary_unit";
     //试用期老师课酬发放百分比
     String PROBATION_TEACHER_SALARY = "probation_teacher_salary";
+    //兼职老师考勤申诉时间限制
+    String PARP_TEACHER_SALARY = "probation_teacher_salary";
+    //兼职老师考勤申诉时间限制方式（1、固定时间、2、固定日期）
+    String PARP_TEACHER_SALARY_TYPE = "parp_teacher_salary_type";
+    //全职老师考勤申诉时间限制
+    String FULL_TEACHER_SALARY = "full_teacher_salary";
+    //全职老师考勤申诉时间限制方式（1、固定时间、2、固定日期）
+    String FULL_TEACHER_SALARY_TYPE = "full_teacher_salary_type";
+    //劳务考勤申诉时间限制
+    String LABOUR_TEACHER_SALARY = "labour_teacher_salary";
+    //劳务考勤申诉时间限制方式（1、固定时间、2、固定日期）
+    String LABOUR_TEACHER_SALARY_TYPE = "labour_teacher_salary_type";
 
     public static final String BASE_API_URL = "base_api_url";
 
@@ -278,4 +292,8 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
      * @describe 根据配置名称获取配置信息
      */
     SysConfig findByParamName(String paramName);
+
+    void batchUpdate(List<SysConfig> configList);
+
+    void updateConfig(SysConfig config);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentAttendanceServiceImpl.java

@@ -13,6 +13,7 @@ import java.util.stream.Collectors;
 import com.alibaba.fastjson.JSON;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.service.SysTenantConfigService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -89,6 +90,8 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
     @Autowired
     private SysConfigDao sysConfigDao;
     @Autowired
+    private SysTenantConfigService sysTenantConfigService;
+    @Autowired
     private SchoolDao schoolDao;
     @Autowired
     private SysConfigService sysConfigService;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysConfigServiceImpl.java

@@ -1,6 +1,9 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.biz.event.TenantConfigChangeEvent;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.stereotype.Service;
 
 import com.ym.mec.biz.dal.dao.SysConfigDao;
@@ -9,8 +12,10 @@ import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
+import java.util.List;
+
 @Service
-public class SysConfigServiceImpl extends BaseServiceImpl<Long, SysConfig>  implements SysConfigService {
+public class SysConfigServiceImpl extends BaseServiceImpl<Long, SysConfig>  implements SysConfigService, ApplicationEventPublisherAware {
 	
 	@Autowired
 	private SysConfigDao sysConfigDao;
@@ -20,8 +25,26 @@ public class SysConfigServiceImpl extends BaseServiceImpl<Long, SysConfig>  impl
 		return sysConfigDao;
 	}
 
+	private ApplicationEventPublisher applicationEventPublisher;
+
 	@Override
 	public SysConfig findByParamName(String paramName) {
 		return sysConfigDao.findByParamName(paramName);
 	}
+
+    @Override
+    public void batchUpdate(List<SysConfig> configList) {
+		sysConfigDao.batchUpdate(configList);
+    }
+
+	@Override
+	public void updateConfig(SysConfig config) {
+		sysConfigDao.update(config);
+		applicationEventPublisher.publishEvent(new TenantConfigChangeEvent(this));
+	}
+
+	@Override
+	public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
+		this.applicationEventPublisher = applicationEventPublisher;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysTenantConfigServiceImpl.java

@@ -35,7 +35,7 @@ public class SysTenantConfigServiceImpl extends BaseServiceImpl<Integer, SysTena
 	@Override
 	public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
 		this.applicationEventPublisher = applicationEventPublisher;
-		applicationEventPublisher.publishEvent(new TenantConfigChangeEvent(this,null));
+		applicationEventPublisher.publishEvent(new TenantConfigChangeEvent(this));
 	}
 
 	@Override

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherAttendanceServiceImpl.java

@@ -30,7 +30,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.ym.mec.biz.dal.enums.ComplaintsStatusEnum.REPEAL;
-import static com.ym.mec.biz.dal.enums.JobNatureEnum.PART_TIME;
+import static com.ym.mec.biz.dal.enums.JobNatureEnum.*;
 import static com.ym.mec.biz.dal.enums.SignInStatusEnum.*;
 
 @Service
@@ -753,13 +753,42 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		sysMessageService.batchSendMessage(MessageSender.JIGUANG,MessageTypeEnum.TEACHER_PUSH_EXCEPTION_ATTENDANCE,receivers,null,0,url,"TEACHER",format);
 	}
 
-	void checkComplaints(JobNatureEnum jobNatureEnum,Integer tenantId){
-//		String configValue = sysTenantConfigService.getConfigValue(SysConfigService.parp_teacher_salary, tenantId);
-//		String configValue1 = sysTenantConfigService.getConfigValue(SysConfigService.parp_teacher_salary_type, tenantId);
-//		String configValue = sysTenantConfigService.getConfigValue(SysConfigService.full_teacher_salary, tenantId);
-//		String configValue = sysTenantConfigService.getConfigValue(SysConfigService.full_teacher_salary_type, tenantId);
-//		String configValue = sysTenantConfigService.getConfigValue(SysConfigService.labour_teacher_salary, tenantId);
-//		String configValue = sysTenantConfigService.getConfigValue(SysConfigService.labour_teacher_salary_type, tenantId);
+	//校验考勤申诉
+	void checkComplaints(JobNatureEnum jobNatureEnum,Integer tenantId,Date classDate){
+		Map<String, String> tenantConfig = sysTenantConfigService.getTenantConfig(tenantId);
+		String salary = null;
+		String type = null;
+		if(jobNatureEnum == PART_TIME){
+			salary = tenantConfig.get(SysConfigService.PARP_TEACHER_SALARY);
+			type = tenantConfig.get(SysConfigService.PARP_TEACHER_SALARY_TYPE);
+		}else if (jobNatureEnum == FULL_TIME){
+			salary = tenantConfig.get(SysConfigService.FULL_TEACHER_SALARY);
+			type = tenantConfig.get(SysConfigService.FULL_TEACHER_SALARY_TYPE);
+		}else if (jobNatureEnum == LABOUR){
+			salary = tenantConfig.get(SysConfigService.LABOUR_TEACHER_SALARY);
+			type = tenantConfig.get(SysConfigService.LABOUR_TEACHER_SALARY_TYPE);
+		}
+		if(StringUtils.isNotEmpty(salary) && StringUtils.isNotEmpty(type)){
+			Integer day = Integer.parseInt(salary);
+			if(day <= 0){
+				return;
+			}
+			Date date = new Date();
+			if(type.equals("2")){
+				//获取上课时间下个月5号
+				date = DateUtil.addDays(DateUtil.getFirstDayOfMonth(DateUtil.addMonths(classDate, 1)), day);
+				int i = DateUtil.daysBetween(date,new Date());
+				if(i > 0){
+					throw new BizException("超出可申述时间");
+				}
+			}else {
+				//如果课程时间在两天前
+				int i = DateUtil.daysBetween(classDate, DateUtil.stringToDate(DateUtil.format(date,DateUtil.DEFAULT_PATTERN),DateUtil.DEFAULT_PATTERN));
+				if(i > --day){
+					throw new BizException("超出可申述时间");
+				}
+			}
+		}
 	}
 
 	@Override
@@ -785,21 +814,10 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			throw new BizException("考勤正常，无需提交申诉");
 		}
 		Teacher teacher = teacherDao.get(userId);
-		Date date = new Date();
-		if(teacher.getJobNature() == PART_TIME){
-			//获取上课时间下个月5号
-			date = DateUtil.addDays(DateUtil.getFirstDayOfMonth(DateUtil.addMonths(courseSchedule.getClassDate(), 1)), 5);
-			int i = DateUtil.daysBetween(date,new Date());
-			if(i > 0){
-				throw new BizException("超出可申述时间");
-			}
-		}else {
-			//如果课程时间在两天前
-			int i = DateUtil.daysBetween(courseSchedule.getClassDate(), DateUtil.stringToDate(DateUtil.format(date,DateUtil.DEFAULT_PATTERN),DateUtil.DEFAULT_PATTERN));
-			if(i > 1){
-				throw new BizException("超出可申述时间");
-			}
+		if(teacher.getTenantId() == null){
+			throw new BizException("用户机构信息异常");
 		}
+		checkComplaints(teacher.getJobNature(),teacher.getTenantId(),courseSchedule.getClassDate());
 		if(complaintsType == null){
 			complaintsType = UpdateAttendanceEnum.ALL;
 		}

mec-biz/src/main/resources/config/mybatis/SysConfigMapper.xml

@@ -59,8 +59,29 @@
 		</set>
 		WHERE id_ = #{id}
 	</update>
+    <update id="batchUpdate">
+		<foreach collection="configList" item="config" index="index" open="" close="" separator=";">
+			UPDATE sys_config
+			<set>
+				<if test="config.paranValue != null">
+					paran_value_ = #{config.paranValue},
+				</if>
+				<if test="config.description != null">
+					description_ = #{config.description},
+				</if>
+				<if test="config.paramName != null">
+					param_name_ = #{config.paramName},
+				</if>
+				<if test="config.group != null">
+					group_ = #{config.group},
+				</if>
+					modify_on_ = NOW()
+			</set>
+				WHERE id_ = #{config.id}
+		</foreach>
+	</update>
 
-	<!-- 根据主键删除一条记录 -->
+    <!-- 根据主键删除一条记录 -->
 	<delete id="delete">
 		DELETE FROM sys_config WHERE id_ = #{id}
 	</delete>

mec-biz/src/main/resources/config/mybatis/SysTenantConfigMapper.xml

@@ -81,10 +81,14 @@
   <select id="queryALl" resultMap="com.ym.mec.biz.dal.dao.SysConfigDao.SysConfig">
     SELECT sc.id_,sc.param_name_,sc.group_,CASE WHEN stc.id_ IS NULL THEN sc.paran_value_ ELSE stc.param_value_ END paran_value_ FROM sys_config sc
     LEFT JOIN sys_tenant_config stc ON sc.id_ = stc.sys_config_id_ AND stc.tenant_id_ = #{tenantId}
-    WHERE sc.group_ IS NOT NULL AND sc.group_ != ''
-    <if test="group != null">
-      AND sc.group_ = #{group}
-    </if>
+    <where>
+      <if test="group != null">
+        AND sc.group_ = #{group}
+      </if>
+      <if test="group == null or group == ''">
+        AND sc.group_ != 'DEFAULT'
+      </if>
+    </where>
     ORDER BY sc.group_
   </select>
   <select id="getConfigValue" resultType="java.lang.String">

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -56,6 +56,7 @@
         <result column="subject_name_" property="splitSubjectName"/>
         <result column="id_card_no_" property="idCardNo"/>
         <result column="is_settlement_salary_" property="isSettlementSalary"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.dto.TeacherDefaultSalaryDto" id="TeacherDefaultSalaryDto">
@@ -119,7 +120,7 @@
         su.real_name_,su.id_card_no_,su.password_,su.salt_,su.phone_,su.avatar_,
         su.lock_flag_,su.del_flag_,su.wx_openid_,su.qq_openid_,su.user_type_,
         su.gender_,su.nation_,su.birthdate_,su.email_,su.im_token_,su.username_,su.organ_id_,
-        t.is_settlement_salary_
+        t.is_settlement_salary_,su.tenant_id_
         FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
         WHERE t.id_ = #{id} AND su.del_flag_ = 0

mec-web/src/main/java/com/ym/mec/web/controller/SysConfigController.java

@@ -12,10 +12,7 @@ import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.biz.service.SysConfigService;
@@ -48,7 +45,7 @@ public class SysConfigController extends BaseController {
 	@AuditLogAnnotation(operateName = "修改参数")
 	public Object update(SysConfig config) {
 		config.setModifyOn(new Date());
-		sysConfigService.update(config);
+		sysConfigService.updateConfig(config);
 		return succeed();
 	}
 

mec-web/src/main/java/com/ym/mec/web/controller/SysTenantConfigController.java

@@ -48,40 +48,4 @@ public class SysTenantConfigController extends BaseController {
 		sysTenantConfigService.batchUpSet(sysConfigs,sysUser.getTenantId());
 		return succeed();
 	}
-
-//	@ApiOperation(value = "新增参数")
-//	@PostMapping(value = "add")
-//    @PreAuthorize("@pcs.hasPermissions('sysConfig/add')")
-//	public Object addConfig(SysConfig config) {
-//		if (config == null)
-//			return failed("参数无效");
-//		if (StringUtils.isBlank(config.getParamName())) {
-//			return failed("参数名称不能为空");
-//		}
-//		if (StringUtils.isBlank(config.getParanValue())) {
-//			return failed("参数值不能为空");
-//		}
-//		config.setCreateOn(new Date());
-//		config.setModifyOn(new Date());
-//		return sysConfigService.insert(config) > 0 ? succeed() : failed("添加失败");
-//	}
-
-//	@ApiOperation(value = "查询参数")
-//	@GetMapping(value = "get")
-//    @PreAuthorize("@pcs.hasPermissions('sysConfig/get')")
-//	public Object getConfig(Long id) {
-//		if (id == null || id <= 0)
-//			return failed("请检查输入的ID");
-//		return succeed(sysConfigService.get(id));
-//	}
-//
-//	@ApiOperation(value = "查询参数")
-//	@GetMapping(value = "queryByParamName")
-//    @PreAuthorize("@pcs.hasPermissions('sysConfig/queryByParamName')")
-//	public Object queryByParamName(String paramName) {
-//		if(StringUtils.isBlank(paramName)){
-//			return failed("参数不能为空");
-//		}
-//		return succeed(sysConfigService.findByParamName(paramName));
-//	}
 }