Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz

# Conflicts:
#	src/main/java/cn/timer/api/controller/yggl/YgglController.java

pom.xml

@@ -341,7 +341,7 @@
 	</repositories>
 
 	<build>
-		<finalName>yl8timer</finalName>
+		<finalName>8timer-api</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java

@@ -130,7 +130,7 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
 	@ApiModelProperty(value="工作性质 1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘",example="101")
     private Integer jobType;
     
-	@ApiModelProperty(value="员工状态 1正式、2试用、3离职中、4已离职",example="101")
+	@ApiModelProperty(value="员工状态 1试用、2正式、3离职中、4已离职",example="101")
     private Integer jobStatus;
     
 	@ApiModelProperty(value="入职日期 ",example="客户注册后的时间为入职时间")

src/main/java/cn/timer/api/config/quartz/SchedulerConfig.java

-package cn.timer.api.config.quartz;
-
-//@Configuration
-public class SchedulerConfig {
-	
-//	@Bean(name = "SchedulerFactory")
-//	public SchedulerFactoryBean schedulerFactoryBean() throws IOException {
-//		SchedulerFactoryBean factory = new SchedulerFactoryBean();
-//		factory.setQuartzProperties(quartzProperties());
-//		return factory;
-//	}
-//
-//	@Bean
-//	public Properties quartzProperties() throws IOException {
-//		PropertiesFactoryBean propertiesFactoryBean = new PropertiesFactoryBean();
-//		propertiesFactoryBean.setLocation(new ClassPathResource("/quartz.properties"));
-//		// 在quartz.properties中的属性被读取并注入后再初始化对象
-//		propertiesFactoryBean.afterPropertiesSet();
-//		return propertiesFactoryBean.getObject();
-//	}
-//
-//	/*
-//	 * quartz初始化监听器
-//	 */
-//	@Bean
-//	public QuartzInitializerListener executorListener() {
-//		return new QuartzInitializerListener();
-//	}
-//
-//	/*
-//	 * 通过SchedulerFactoryBean获取Scheduler的实例
-//	 */
-//	@Bean(name = "Scheduler")
-//	public Scheduler scheduler() throws IOException {
-//		return schedulerFactoryBean().getScheduler();
-//	}
-
-}

src/main/java/cn/timer/api/controller/zzgl/ZzglController.java

@@ -63,15 +63,6 @@ public class ZzglController {
 		return ResultUtil.data(zzglBmgwMs);
 	}
 
-	@GetMapping(value = "/deptlist2")
-	@ApiOperation(value = "获取部门岗位2", httpMethod = "GET", notes = "接口发布说明")
-	public Result<List<ZzglBmgwM>> selectlistdept2(@CurrentUser UserBean userBean) {
-		Integer orgCode = userBean.getOrgCode();
-		List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
-				.select(ZzglBmgwM::getName,ZzglBmgwM::getId,ZzglBmgwM::getUpId).eq(ZzglBmgwM::getOrgCode, orgCode).list();
-		return ResultUtil.data(zzglBmgwMs);
-	}
-
 	/**
 	 * 岗位成员
 	 * 

src/main/java/cn/timer/api/dao/htzz/HtzzAdminZzdaMapper.java

@@ -2,7 +2,7 @@ package cn.timer.api.dao.htzz;
 
 import org.springframework.stereotype.Repository;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import cn.timer.api.bean.htzz.HtzzAdminZzda;
 
@@ -12,6 +12,6 @@ import cn.timer.api.bean.htzz.HtzzAdminZzda;
  * @author Tang 2019-12-04
  */
 @Repository
-public interface HtzzAdminZzdaMapper extends IService<HtzzAdminZzda> {
+public interface HtzzAdminZzdaMapper extends BaseMapper<HtzzAdminZzda> {
 
 }

src/main/java/cn/timer/api/dao/htzz/HtzzAssoHtgxMapper.java

@@ -2,7 +2,7 @@ package cn.timer.api.dao.htzz;
 
 import org.springframework.stereotype.Repository;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import cn.timer.api.bean.htzz.HtzzAssoHtgx;
 
@@ -12,6 +12,6 @@ import cn.timer.api.bean.htzz.HtzzAssoHtgx;
  * @author Tang 2019-12-18
  */
 @Repository
-public interface HtzzAssoHtgxMapper extends IService<HtzzAssoHtgx> {
+public interface HtzzAssoHtgxMapper extends BaseMapper<HtzzAssoHtgx> {
 
 }

src/main/java/cn/timer/api/dao/htzz/HtzzAssoZztxMapper.java

 package cn.timer.api.dao.htzz;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import org.springframework.stereotype.Repository;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import cn.timer.api.bean.htzz.HtzzAssoZztx;
 
@@ -12,6 +16,11 @@ import cn.timer.api.bean.htzz.HtzzAssoZztx;
  * @author Tang 2019-12-04
  */
 @Repository
-public interface HtzzAssoZztxMapper extends IService<HtzzAssoZztx> {
+public interface HtzzAssoZztxMapper extends BaseMapper<HtzzAssoZztx> {
+	public static void main(String[] args) {
+		DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
+		String a = format1.format(new Date());
+		System.err.println(a);
+	}
 
 }

src/main/java/cn/timer/api/dao/quartz/JobAndTriggerMapper.java

-package cn.timer.api.dao.quartz;
-
-import org.springframework.stereotype.Repository;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.pagehelper.PageInfo;
-
-import cn.timer.api.bean.quartz.JobAndTrigger;
-
-@Repository
-public interface JobAndTriggerMapper extends BaseMapper<JobAndTrigger> {
-
-	public PageInfo<JobAndTrigger> getJobAndTriggerDetails(@RequestParam(value = "pageNum") Integer pageNum,
-			@RequestParam(value = "pageSize") Integer pageSize);
-
-}
\ No newline at end of file

src/main/java/cn/timer/api/utils/RemindUtil.java

@@ -40,8 +40,8 @@ public class RemindUtil {
 	/**
 	 * 每天固定时间提醒
 	 */
-//	@Scheduled(cron = "0 0 8 * * ?") // 每天8点扫一下看有没要提醒的，有就发一个
-	@Scheduled(cron = "0 8 15 * * ?") // 测试合同提醒 
+	@Scheduled(cron = "0 0 8 * * ?") // 每天8点扫一下看有没要提醒的，有就发一个
+//	@Scheduled(cron = "0 8 15 * * ?") // 测试合同提醒 
 	public static void reportCurrentTime() {
 
 		List<HtzzAssoHtgx> htgxs = HtzzAssoHtgx.builder().build().selectAll();

src/main/resources/application-pro.yml

@@ -12,9 +12,9 @@ spring:
       max-request-size: 20MB
   jpa:
     # 配置生成表 存储引擎InnoDB
-    # database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
       # database: 
-      # open-in-view: false
+    open-in-view: false
       # naming: 
       # spring boot jpa hibernate 根据实体类生成表以及字段的命名策略
       # 无修改命名 org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
@@ -116,7 +116,7 @@ pagehelper:
 #showSql
 logging:
   level:
-    root: DEBUG
+    root: info
     cn.timer.api.dao: error
   pattern:
     console: '--%p--%m%n'

src/main/resources/mapping/quartz/JobAndTriggerMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.timer.api.dao.quartz.JobAndTriggerMapper">
-	<select id="getJobAndTriggerDetails"
-		resultType="cn.timer.api.bean.quartz.JobAndTrigger">
-		SELECT
-			qrtz_job_details.JOB_NAME,
-			qrtz_job_details.JOB_GROUP,
-			qrtz_job_details.JOB_CLASS_NAME,
-			qrtz_triggers.TRIGGER_NAME,
-			qrtz_triggers.TRIGGER_GROUP,
-			qrtz_cron_triggers.CRON_EXPRESSION,
-			qrtz_cron_triggers.TIME_ZONE_ID
-		FROM
-			qrtz_job_details
-		JOIN qrtz_triggers
-		JOIN qrtz_cron_triggers ON
-			qrtz_job_details.JOB_NAME =
-			qrtz_triggers.JOB_NAME
-		AND
-			qrtz_triggers.TRIGGER_NAME = qrtz_cron_triggers.TRIGGER_NAME
-		AND
-			qrtz_triggers.TRIGGER_GROUP = qrtz_cron_triggers.TRIGGER_GROUP
-	</select>
-
-</mapper>
\ No newline at end of file