Merge branch 'dsc' into 'develop'

Dsc

See merge request 8timerv2/8timerapiv200!7

src/main/java/cn/timer/api/controller/qyxx/CmsController.java

@@ -133,9 +133,12 @@ public class CmsController {
 	@GetMapping(value = "/getType")
 	@GetMapping(value = "/getType")
 	@ApiOperation(value = "分类内容获取", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperation(value = "分类内容获取", httpMethod = "GET", notes = "接口发布说明")
 	public Result<Object> getType(@CurrentUser UserBean userBean) {
 	public Result<Object> getType(@CurrentUser UserBean userBean) {
-		// 分类信息
+		// 分类模块信息
 		List<CmsContentModular> list = CmsContentModular.builder().build().selectList(
 		List<CmsContentModular> list = CmsContentModular.builder().build().selectList(
-				new QueryWrapper<CmsContentModular>().eq("organization_id", userBean.getOrgCode()).eq("is_open", 0));
+				new QueryWrapper<CmsContentModular>()
+				.eq("is_open", 0)   //是否开启
+//				.eq("organization_id", userBean.getOrgCode())
+				);
 		List<List<CmsContent>> o = new ArrayList<List<CmsContent>>();
 		List<List<CmsContent>> o = new ArrayList<List<CmsContent>>();
 		for (CmsContentModular cmsContentModular : list) {
 		for (CmsContentModular cmsContentModular : list) {
 			// 分类模块id
 			// 分类模块id

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -18,7 +18,6 @@ import java.util.regex.Pattern;
 
 
 import javax.transaction.Transactional;
 import javax.transaction.Transactional;
 
 
-import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -27,7 +26,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -36,7 +34,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper;
-import com.github.pagehelper.util.StringUtil;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
@@ -56,7 +53,6 @@ import cn.timer.api.bean.yggl.YgglAttaZcxxb;
 import cn.timer.api.bean.yggl.YgglAttaZszjb;
 import cn.timer.api.bean.yggl.YgglAttaZszjb;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.yggl.YgglMainLzb;
 import cn.timer.api.bean.yggl.YgglMainLzb;
-import cn.timer.api.dto.yggl.YgmzDto;
 import cn.timer.api.bean.zzgl.ZzglBmgwM;
 import cn.timer.api.bean.zzgl.ZzglBmgwM;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.UserBean;
 import cn.timer.api.config.annotation.UserBean;
@@ -71,18 +67,17 @@ import cn.timer.api.dao.yggl.YgglMainEmpMapper;
 import cn.timer.api.dao.yggl.YgglMainLzbMapper;
 import cn.timer.api.dao.yggl.YgglMainLzbMapper;
 import cn.timer.api.dao.zzgl.ZzglBmgwMMapper;
 import cn.timer.api.dao.zzgl.ZzglBmgwMMapper;
 import cn.timer.api.dto.yggl.AddygdaDto;
 import cn.timer.api.dto.yggl.AddygdaDto;
-import cn.timer.api.dto.yggl.IYgjgDto;
 import cn.timer.api.dto.yggl.LzbQueryDto;
 import cn.timer.api.dto.yggl.LzbQueryDto;
 import cn.timer.api.dto.yggl.LzygQueryDto;
 import cn.timer.api.dto.yggl.LzygQueryDto;
-import cn.timer.api.dto.yggl.PunishFactory;
 import cn.timer.api.dto.yggl.YgAreaDto;
 import cn.timer.api.dto.yggl.YgAreaDto;
 import cn.timer.api.dto.yggl.YgCityDto;
 import cn.timer.api.dto.yggl.YgCityDto;
 import cn.timer.api.dto.yggl.YgDrjqbDto;
 import cn.timer.api.dto.yggl.YgDrjqbDto;
 import cn.timer.api.dto.yggl.YgDrsDto;
 import cn.timer.api.dto.yggl.YgDrsDto;
+import cn.timer.api.dto.yggl.YgProDto;
 import cn.timer.api.dto.yggl.YgQueryDto;
 import cn.timer.api.dto.yggl.YgQueryDto;
 import cn.timer.api.dto.yggl.YgglCartogramDto;
 import cn.timer.api.dto.yggl.YgglCartogramDto;
 import cn.timer.api.dto.yggl.YgjgDto;
 import cn.timer.api.dto.yggl.YgjgDto;
-import cn.timer.api.dto.yggl.YgProDto;
+import cn.timer.api.dto.yggl.YgmzDto;
 import cn.timer.api.dto.yggl.YgzzDto;
 import cn.timer.api.dto.yggl.YgzzDto;
 import cn.timer.api.utils.Md5;
 import cn.timer.api.utils.Md5;
 import cn.timer.api.utils.Result;
 import cn.timer.api.utils.Result;

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

@@ -60,7 +60,15 @@ public class ZzglController {
 		Integer orgCode = userBean.getOrgCode();
 		Integer orgCode = userBean.getOrgCode();
 		List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
 		List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
 				.eq(ZzglBmgwM::getOrgCode, orgCode).list();
 				.eq(ZzglBmgwM::getOrgCode, orgCode).list();
-		// TODO Auto-generated method stub
+		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);
 		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 org.springframework.stereotype.Repository;
 
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 
 import cn.timer.api.bean.htzz.HtzzAdminZzda;
 import cn.timer.api.bean.htzz.HtzzAdminZzda;
 
 
@@ -12,6 +12,6 @@ import cn.timer.api.bean.htzz.HtzzAdminZzda;
  * @author Tang 2019-12-04
  * @author Tang 2019-12-04
  */
  */
 @Repository
 @Repository
-public interface HtzzAdminZzdaMapper extends BaseMapper<HtzzAdminZzda> {
+public interface HtzzAdminZzdaMapper extends IService<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 org.springframework.stereotype.Repository;
 
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 
 import cn.timer.api.bean.htzz.HtzzAssoHtgx;
 import cn.timer.api.bean.htzz.HtzzAssoHtgx;
 
 
@@ -12,6 +12,6 @@ import cn.timer.api.bean.htzz.HtzzAssoHtgx;
  * @author Tang 2019-12-18
  * @author Tang 2019-12-18
  */
  */
 @Repository
 @Repository
-public interface HtzzAssoHtgxMapper extends BaseMapper<HtzzAssoHtgx> {
+public interface HtzzAssoHtgxMapper extends IService<HtzzAssoHtgx> {
 
 
 }
 }

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

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

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

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

src/main/resources/mapping/yggl/YgglMainEmpMapper.xml

@@ -257,7 +257,7 @@
 	<!-- 学历及人数查询 -->
 	<!-- 学历及人数查询 -->
 	<select id="queryEducation" resultType="cn.timer.api.dto.yggl.YgglCartogramDto">
 	<select id="queryEducation" resultType="cn.timer.api.dto.yggl.YgglCartogramDto">
 		SELECT
 		SELECT
-			e.name education,count(y.edu) educationNum
+			IFNULL(e.name,'null') education,count(y.edu) educationNum
 		FROM
 		FROM
 			yggl_main_emp y
 			yggl_main_emp y
 		LEFT JOIN
 		LEFT JOIN
@@ -268,6 +268,8 @@
 			org_code = #{orgCode}
 			org_code = #{orgCode}
 		GROUP BY
 		GROUP BY
 			e.name
 			e.name
+		ORDER BY
+			e.id ASC
 	</select>
 	</select>
 	
 	
 	<!-- 员工年龄分布查询 -->
 	<!-- 员工年龄分布查询 -->
@@ -290,7 +292,7 @@
 	<!-- 籍贯统计（省份）查询 -->
 	<!-- 籍贯统计（省份）查询 -->
 	<select id="queryNativeplace" resultType="cn.timer.api.dto.yggl.YgglCartogramDto">
 	<select id="queryNativeplace" resultType="cn.timer.api.dto.yggl.YgglCartogramDto">
 		SELECT
 		SELECT
-			c.name province,count(y.jg) provinceNum
+			IFNULL(c.name,'null') province,count(y.jg) provinceNum
 		FROM
 		FROM
 			yggl_main_emp y
 			yggl_main_emp y
 		LEFT JOIN
 		LEFT JOIN