更改过期方法lambdaqueryChainwrapper的导入包

src/main/java/cn/timer/api/controller/LoginController.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 
 import cn.hutool.core.date.DateUtil;

src/main/java/cn/timer/api/controller/jxgl/AchievementsController.java

@@ -18,8 +18,9 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 
 import cn.hutool.core.util.StrUtil;

src/main/java/cn/timer/api/controller/qyzx/QyzxController.java

 package cn.timer.api.controller.qyzx;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -8,23 +7,22 @@ import java.util.stream.Stream;
 
 import javax.servlet.http.HttpSession;
 
-import org.apache.ibatis.annotations.Param;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 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.multipart.MultipartFile;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 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.update.impl.LambdaUpdateChainWrapper;
+
+
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
@@ -132,8 +130,11 @@ public class QyzxController {
 	@ApiOperation(value = "添加/修改企业信息", httpMethod = "POST", notes = "接口发布说明")
 	public Result<QyzxEntInfoM> addent(@CurrentUser UserBean userBean, @RequestBody QyzxEntInfoM qyzxEntInfoM) {
 		qyzxEntInfoM.setId(userBean.getOrgCode());
+		
 		QyzxEntInfoM q = new LambdaQueryChainWrapper<QyzxEntInfoM>(qyzxEntInfoMMapper)
 				.eq(QyzxEntInfoM::getId, userBean.getOrgCode()).one();
+		
+		
 		qyzxEntInfoM.setRegisterTime(q.getRegisterTime());
 		qyzxEntInfoM.insertOrUpdate();
 

src/main/java/cn/timer/api/controller/sbgjj/SocialSecurityFundController.java

@@ -17,8 +17,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 
 import cn.hutool.core.util.StrUtil;

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 
 import cn.timer.api.bean.kqgl.AttendanceGroup;
 import cn.timer.api.bean.kqgl.AttendanceReport;

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

@@ -8,7 +8,7 @@ package cn.timer.api.controller.yggl;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
+
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -35,13 +35,12 @@ import org.springframework.web.bind.annotation.RestController;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 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.update.impl.LambdaUpdateChainWrapper;
-import com.github.pagehelper.util.StringUtil;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 
-import cn.hutool.Hutool;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.BetweenFormater.Level;
 import cn.hutool.core.date.DateUtil;
@@ -69,7 +68,6 @@ import cn.timer.api.config.enuminterface.YgEnumInterface;
 import cn.timer.api.config.enums.CommonEnum;
 import cn.timer.api.dao.qyzx.QyzxEmpLoginMapper;
 import cn.timer.api.dao.yggl.YgAreaDtoMapper;
-import cn.timer.api.dao.yggl.YgCartogramDtoMapper;
 import cn.timer.api.dao.yggl.YgCityDtoMapper;
 import cn.timer.api.dao.yggl.YgMzDtoMapper;
 import cn.timer.api.dao.yggl.YgProDtoMapper;
@@ -168,7 +166,6 @@ public class YgglController {
 		Integer orgCode = userBean.getOrgCode();
 		ArrayList<Integer> list = new ArrayList<Integer>();
 		Integer empNum = userBean.getEmpNum();
-		List<LoginerChargeDto> loginerCharges = new ArrayList<LoginerChargeDto>();
 		Integer gw = empNumConfirm(orgCode, empNum).getBmgwId();
 		List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper).eq(ZzglBmgwM::getOrgCode, orgCode).list();
 		//获取该员工的上级部门id 的数组list

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

@@ -18,8 +18,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+
 
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.zzgl.ZzglAuth;
@@ -46,7 +47,7 @@ public class ZzglController {
 	ZzglBmgwMMapper zzglBmgwMMapper;
 
 	@Autowired
-	ZzglLogDgjlMapper zzglLogDgjlMapper; 
+	ZzglLogDgjlMapper zzglLogDgjlMapper;
 
 	/**
 	 * 架构树/架构图/导出
@@ -71,7 +72,7 @@ public class ZzglController {
 	 */
 	@GetMapping(value = "/otherlistent/{id}")
 	@ApiOperation(value = "获取岗位成员列表", httpMethod = "GET", notes = "接口发布说明")
-	public Result<List<YgglMainEmp>> selectOtherlistent(@CurrentUser UserBean userBean, @PathVariable Integer id){
+	public Result<List<YgglMainEmp>> selectOtherlistent(@CurrentUser UserBean userBean, @PathVariable Integer id) {
 		Integer orgCode = userBean.getOrgCode();
 		ArrayList<Integer> list = new ArrayList<Integer>();
 		List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
@@ -79,6 +80,9 @@ public class ZzglController {
 		list.add(id);
 		ZzglBmgwM.getDepts(list, id, zzglBmgwMs);
 
+		ZzglBmgwM messsage = ZzglBmgwM.builder().build().selectOne(new QueryWrapper<ZzglBmgwM>().eq("id", id));
+		Integer lead = messsage.getLeader(); // 获取部门或岗位领导id
+
 		if (list == null || list.size() == 0) {
 			return ResultUtil.error("部门信息不存在，请先添加部门！");
 		} else {
@@ -86,11 +90,11 @@ public class ZzglController {
 			ygglMainEmpsLambdaQueryWrapper
 					.select(YgglMainEmp::getId, YgglMainEmp::getEmpNum, YgglMainEmp::getName, YgglMainEmp::getPhone,
 							YgglMainEmp::getBmgwId)
-					.eq(YgglMainEmp::getOrgCode, orgCode).and(i -> i.in(YgglMainEmp::getBmgwId, list.toArray()));
+					.eq(YgglMainEmp::getOrgCode, orgCode).and(i -> i.in(YgglMainEmp::getBmgwId, list.toArray()))
+					.last(lead != null, "order by if (emp_num='" + lead + "',0,1)");
 			List<YgglMainEmp> ygglMainEmps = YgglMainEmp.builder().build().selectList(ygglMainEmpsLambdaQueryWrapper);
 			return ResultUtil.data(ygglMainEmps);
 		}
-
 	}
 
 	/**
@@ -101,7 +105,8 @@ public class ZzglController {
 	 */
 	@PostMapping(value = "/listdgjl")
 	@ApiOperation(value = "获取调岗记录(weng)", httpMethod = "POST", notes = "接口发布说明")
-	public Result<Object> selectlistdgjl(@CurrentUser UserBean userBean, @RequestBody LogDgjlsQueryDto logDgjlsQueryDto){
+	public Result<Object> selectlistdgjl(@CurrentUser UserBean userBean,
+			@RequestBody LogDgjlsQueryDto logDgjlsQueryDto) {
 		Integer orgCode = userBean.getOrgCode();
 		ArrayList<Integer> list = new ArrayList<Integer>();
 		List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
@@ -112,10 +117,10 @@ public class ZzglController {
 		if (list == null || list.size() == 0) {
 			return ResultUtil.error("部门信息不存在，请先添加部门！");
 		} else {
-			
+
 			logDgjlsQueryDto.setDeptIdList(list);
 			logDgjlsQueryDto.setOrgCode(orgCode);
-	
+
 			IPage<LogDgjlsDto> page = new Page<LogDgjlsDto>(
 					logDgjlsQueryDto.getCurrentPage() == null ? 1 : logDgjlsQueryDto.getCurrentPage(),
 					logDgjlsQueryDto.getTotalPage() == null ? 10 : logDgjlsQueryDto.getTotalPage());
@@ -155,7 +160,7 @@ public class ZzglController {
 	 */
 	@PostMapping(value = "/dept")
 	@ApiOperation(value = "添加/修改部门", httpMethod = "POST", notes = "接口发布说明")
-	public Result<ZzglBmgwM> adddept(@CurrentUser UserBean userBean, @RequestBody ZzglBmgwM zzglBmgwM){
+	public Result<ZzglBmgwM> adddept(@CurrentUser UserBean userBean, @RequestBody ZzglBmgwM zzglBmgwM) {
 		Boolean a = zzglBmgwM.getId() == null;
 		if (a && zzglBmgwM.getType() == null)
 			zzglBmgwM.setType((Integer) 0);
@@ -164,7 +169,6 @@ public class ZzglController {
 		if (a)
 			return ResultUtil.data(zzglBmgwM);
 		return ResultUtil.success();
-
 	}
 
 	/**

src/main/java/cn/timer/api/dto/yggl/YgAreaDto.java

@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 
 import cn.timer.api.dao.yggl.YgAreaDtoMapper;
 import io.swagger.annotations.ApiModel;

src/main/java/cn/timer/api/dto/yggl/YgCityDto.java

@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 
 import cn.timer.api.dao.yggl.YgCityDtoMapper;
 import io.swagger.annotations.ApiModel;

src/main/java/cn/timer/api/dto/yggl/YgProDto.java

@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 
 import cn.timer.api.dao.yggl.YgProDtoMapper;
 import io.swagger.annotations.ApiModel;