登录人信息API 优化，企业中心-显示常用的企业开票资料API 优化

src/main/java/cn/timer/api/aspect/BindingResultAspect.java

@@ -3,19 +3,16 @@ package cn.timer.api.aspect;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BeanPropertyBindingResult;
-import org.springframework.validation.BindingResult;
 import org.springframework.validation.ObjectError;
 
 import com.alibaba.fastjson.JSONObject;
@@ -23,7 +20,6 @@ import com.alibaba.fastjson.JSONObject;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.ClassUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.timer.api.aspect.lang.annotation.BindingResultCtrol;
 import cn.timer.api.aspect.lang.bean.ValidationError;
 import cn.timer.api.utils.ResultUtil;
@@ -43,7 +39,7 @@ public class BindingResultAspect {
     {
     }
     
-    // execution 配置织入点
+    // execution 配置织入点 -匹配 cn.timer.api.controller 包下的所有子包的类的方法
     @Pointcut("execution(* cn.timer.api.controller.*.*.*(..))")
     public void clazzPointCut()
     {
@@ -78,9 +74,9 @@ public class BindingResultAspect {
             		fieldString = fieldString.substring(fieldString.lastIndexOf(".") + 1);
 				}
             	
-            	for (String str : one.getCodes()) {
-            		System.err.println(str);
-				}
+//            	for (String str : one.getCodes()) {
+//            		System.err.println(str);
+//				}
             	
             	ve = ValidationError.builder().field(fieldString).msg(one.getDefaultMessage()).build();
             	listVe.add(ve);
@@ -93,26 +89,7 @@ public class BindingResultAspect {
         Console.log("返回内容 {}: " ,JSONObject.toJSONString(retVal));
         Long endtime = System.currentTimeMillis();
         Console.log("执行耗时为{}：" ,endtime-startTime + "ms");
-        
-        
-        
-        
-//        Object[] objs = joinPoint.getArgs();
-//        
-//        List<Object> listObj = CollectionUtil.toList(objs);
-//        BeanPropertyBindingResult optional = (BeanPropertyBindingResult)listObj.stream()
-//	        .filter(p -> "BeanPropertyBindingResult".equals(ClassUtil.getClassName(p, true)))
-//	        .findFirst()
-//	        .orElse(null);
-//        if (optional != null && optional.hasErrors()) {
-//        	System.err.println("Optional: "+ optional);
-//		}
-        
-        
-        
-        
-        
-        
+
         return retVal;
     }
 

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

@@ -229,13 +229,15 @@ public class QyzxController {
 	@GetMapping(value = "/invoiceusual")
 	@ApiOperation(value = "显示常用的企业开票资料", httpMethod = "GET", notes = "接口发布说明")
 	public Result<QyzxInvoiceUsual> invoiceusual(@CurrentUser UserBean userBean) {
-		QyzxInvoiceUsual one = new LambdaQueryChainWrapper<QyzxInvoiceUsual>(qyzxInvoiceUsualMapper)
-				.eq(QyzxInvoiceUsual::getOrgCode, userBean.getOrgCode()).one();
-		if (one.getShippingArea() == null) {
-			one.setShippingArea("");
-		}
-		if (one.getShippingAddress() == null) {
-			one.setShippingAddress("");
+		QyzxInvoiceUsual one = qyzxInvoiceUsualMapper.selectOne(new QueryWrapper<QyzxInvoiceUsual>().lambda()
+				.eq(QyzxInvoiceUsual::getOrgCode, userBean.getOrgCode()));
+		if (one != null) {
+			if (one.getShippingArea() == null) {
+				one.setShippingArea("");
+			}
+			if (one.getShippingAddress() == null) {
+				one.setShippingAddress("");
+			}
 		}
 		return ResultUtil.data(one, "显示常用的企业开票资料");
 	}

src/main/java/cn/timer/api/controller/spmk/SpmkServiceImpl.java

@@ -9,6 +9,7 @@ import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -30,6 +31,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.timer.api.aspect.lang.annotation.BindingResultCtrol;
+import cn.timer.api.aspect.lang.bean.ValidationError;
 import cn.timer.api.bean.spmk.SpmkApprovalG;
 import cn.timer.api.bean.spmk.SpmkApprovalTemplate;
 import cn.timer.api.bean.spmk.SpmkApprovalTemplateG;
@@ -246,17 +248,31 @@ public class SpmkServiceImpl {
 	}
 	
 	/**
-	 * 查询列表-审批组
+	 * 查询列表-审批组-审批管理
+	 */
+	@GetMapping(value = "/all_approval_g")
+	@ApiOperation(value = "11.查询列表-审批组-审批管理", httpMethod = "GET", notes = "查询列表-审批组-审批管理")
+	@ApiOperationSupport(order = 11)
+	public Result<Object> selectListAgByAdmin(@CurrentUser UserBean userBean){
+		
+		List<Integer> depts = zzglBmgwMService.empNumupGetDepts(userBean.getOrgCode(), userBean.getEmpNum());
+		System.out.println(depts);
+        return ResultUtil.data(spmkApprovalGMapper.selectListAgInCaByAdmin(userBean.getOrgCode(), userBean.getEmpNum(), depts),"操作成功!");
+	
+	}
+	
+	/**
+	 * 查询列表-审批组-个人审批
 	 */
 	@GetMapping(value = "/list_approval_g")
-	@ApiOperation(value = "11.查询列表-审批组", httpMethod = "GET", notes = "查询列表-审批组")
+	@ApiOperation(value = "11.查询列表-审批组-个人审批", httpMethod = "GET", notes = "查询列表-审批组-个人审批")
 	@ApiOperationSupport(order = 11)
 	public Result<Object> selectListAg(@CurrentUser UserBean userBean){
 		
 		List<Integer> depts = zzglBmgwMService.empNumupGetDepts(userBean.getOrgCode(), userBean.getEmpNum());
 		System.out.println(depts);
-        return ResultUtil.data(spmkApprovalGMapper.selectListAgInCa(userBean.getOrgCode(), userBean.getEmpNum(), depts),"操作成功!");
-	
+		return ResultUtil.data(spmkApprovalGMapper.selectListAgInCa(userBean.getOrgCode(), userBean.getEmpNum(), depts),"操作成功!");
+		
 	}
 	
 	/**
@@ -399,7 +415,6 @@ public class SpmkServiceImpl {
 	@Transactional(rollbackFor = Exception.class)
 //	@BindingResultCtrol(title = "发起审批")
 	public Result<Object> saveCa(@CurrentUser UserBean userBean,@Valid @RequestBody SpmkApproveSummaryDto spmkApproveSummaryDto,BindingResult bindingResult) throws Exception{
-			
 			YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>()
 					.lambda()
 					.select(YgglMainEmp::getHeadUrl,YgglMainEmp::getName)

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

@@ -8,7 +8,6 @@ package cn.timer.api.controller.yggl;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -23,9 +22,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import javax.transaction.Transactional;
-import javax.websocket.server.PathParam;
 
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -44,6 +41,7 @@ import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWra
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.util.StringUtil;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
@@ -79,13 +77,14 @@ import cn.timer.api.dao.yggl.YgMzDtoMapper;
 import cn.timer.api.dao.yggl.YgProDtoMapper;
 import cn.timer.api.dao.yggl.YgglMainEmpMapper;
 import cn.timer.api.dao.yggl.YgglMainLzbMapper;
-
 import cn.timer.api.dao.zzgl.ZzglBmgwMMapper;
 import cn.timer.api.dto.yggl.AddygdaDto;
+import cn.timer.api.dto.yggl.LoginInfoDto;
 import cn.timer.api.dto.yggl.LoginerChargeDto;
 import cn.timer.api.dto.yggl.LzbQueryDto;
 import cn.timer.api.dto.yggl.LzygQueryDto;
 import cn.timer.api.dto.yggl.YgAreaDto;
+import cn.timer.api.dto.yggl.YgCartogramDto;
 import cn.timer.api.dto.yggl.YgCityDto;
 import cn.timer.api.dto.yggl.YgDrjqbDto;
 import cn.timer.api.dto.yggl.YgDrsDto;
@@ -96,7 +95,6 @@ import cn.timer.api.dto.yggl.YgbintuDto;
 import cn.timer.api.dto.yggl.YgglCartogramDto;
 import cn.timer.api.dto.yggl.YgjgDto;
 import cn.timer.api.dto.yggl.YgmzDto;
-import cn.timer.api.dto.yggl.YgCartogramDto;
 import cn.timer.api.dto.yggl.YgzzDto;
 import cn.timer.api.utils.Md5;
 import cn.timer.api.utils.Result;
@@ -138,7 +136,7 @@ public class YgglController {
 	// weng(民族)
 	@Autowired
 	private YgMzDtoMapper ygMzDtoMapper;
-	
+
 	/**
 	 * 获取登录人的相关信息
 	 * 
@@ -148,17 +146,37 @@ public class YgglController {
 	@GetMapping(value = "/loginmessage")
 	@ApiOperation(value = " 获取登录人的相关信息", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 68)
-	public Result<YgglMainEmp> loginmessage(@CurrentUser UserBean userBean) {
+	public Result<LoginInfoDto> loginmessage(@CurrentUser UserBean userBean) {
 		Integer empNum = userBean.getEmpNum();
 		Integer orgCode = userBean.getOrgCode();
-		YgglMainEmp ygglMainEmp=new LambdaQueryChainWrapper<YgglMainEmp>(ygglMainEmpMapper)
-				.select(YgglMainEmp::getBmgwId,YgglMainEmp::getName,YgglMainEmp::getRzTime,YgglMainEmp::getEmpNum).
-				eq(YgglMainEmp::getEmpNum, empNum).eq(YgglMainEmp::getOrgCode, orgCode).one();
-		Integer gw = ygglMainEmp.getBmgwId();
-		ZzglBmgwM bmid = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper).select(ZzglBmgwM::getUpId).eq(ZzglBmgwM::getId, gw).eq(ZzglBmgwM::getOrgCode, orgCode).one();
-		ygglMainEmp.setUnionid(bmid.toString());
-		return ResultUtil.data(ygglMainEmp, "部门id返回字段为unionid");
+		LoginInfoDto loginInfo = LoginInfoDto.builder().build();
+		YgglMainEmp ygglMainEmp = new LambdaQueryChainWrapper<YgglMainEmp>(ygglMainEmpMapper)
+				.select(YgglMainEmp::getBmgwId,
+						YgglMainEmp::getName,
+						YgglMainEmp::getRzTime,
+						YgglMainEmp::getZzTime,
+						YgglMainEmp::getEmpNum)
+				.eq(YgglMainEmp::getEmpNum, empNum).eq(YgglMainEmp::getOrgCode, orgCode).one();
+		if (ygglMainEmp != null) {
+			Integer gw = ygglMainEmp.getBmgwId();
+			ZzglBmgwM gwObj = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper).select(ZzglBmgwM::getUpId,ZzglBmgwM::getName)
+					.eq(ZzglBmgwM::getId, gw).eq(ZzglBmgwM::getOrgCode, orgCode).one();
+			
+			ZzglBmgwM bmObj = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper).select(ZzglBmgwM::getId,ZzglBmgwM::getName)
+					.eq(ZzglBmgwM::getId, gwObj.getUpId()).eq(ZzglBmgwM::getOrgCode, orgCode).one();
+			loginInfo.setEmpNum(ygglMainEmp.getEmpNum());
+			loginInfo.setName(ygglMainEmp.getName());
+			loginInfo.setBmId(bmObj != null ? bmObj.getId() : null);
+			loginInfo.setBmName(bmObj != null ? bmObj.getName() : null);
+			loginInfo.setGwId(gw);
+			loginInfo.setGwName(gwObj != null ? gwObj.getName() : "");
+			loginInfo.setEntryTime(ygglMainEmp.getRzTime());
+			loginInfo.setRegularTime(ygglMainEmp.getRzTime());
+		}
+		
+		return ResultUtil.data(loginInfo, "操作成功！");
 	}
+
 	/**
 	 * 获取登录人和上级主管的empNum和名称
 	 * 
@@ -173,52 +191,57 @@ public class YgglController {
 		ArrayList<Integer> list = new ArrayList<Integer>();
 		Integer empNum = userBean.getEmpNum();
 		Integer gw = empNumConfirm(orgCode, empNum).getBmgwId();
-		List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper).eq(ZzglBmgwM::getOrgCode, orgCode).list();
-		//获取该员工的上级部门id 的数组list
+		List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
+				.eq(ZzglBmgwM::getOrgCode, orgCode).list();
+		// 获取该员工的上级部门id 的数组list
 		ZzglBmgwM.getUpDepts(list, gw, zzglBmgwMs);
 		List<Integer> leaderList = new ArrayList<Integer>();
 		for (Integer zzglId : list) {
 			for (ZzglBmgwM zzglBmgwM : zzglBmgwMs) {
-				if (zzglId.equals(zzglBmgwM.getId()) && zzglBmgwM.getLeader()!=null) {
-					
+				if (zzglId.equals(zzglBmgwM.getId()) && zzglBmgwM.getLeader() != null) {
+
 					leaderList.add(zzglBmgwM.getLeader());
 				}
 			}
 		}
 		List<YgglMainEmp> ygglMainEmps = empNumsConfirm(orgCode, leaderList);
-		List<LoginerChargeDto> loginerChargeDtos =new ArrayList<LoginerChargeDto>();
+		List<LoginerChargeDto> loginerChargeDtos = new ArrayList<LoginerChargeDto>();
 		for (YgglMainEmp m : ygglMainEmps) {
 			if (m.getHeadUrl() == null) {
 				m.setHeadUrl("");
 			}
-			loginerChargeDtos.add(new LoginerChargeDto(m.getEmpNum(),m.getName(),m.getHeadUrl()));
+			loginerChargeDtos.add(new LoginerChargeDto(m.getEmpNum(), m.getName(), m.getHeadUrl()));
 		}
 		Collections.reverse(loginerChargeDtos);
 		return ResultUtil.data(loginerChargeDtos, "获取上级部门的部门id");
 	}
-	//根据传来的empNum获取该人员信息，没有则传全部
-	public List<YgglMainEmp> empNumsConfirm(Integer orgCode,List<Integer> empNumList) {
-		List<YgglMainEmp> all = new LambdaQueryChainWrapper<YgglMainEmp>(ygglMainEmpMapper).eq(YgglMainEmp::getOrgCode, orgCode).list();
+
+	// 根据传来的empNum获取该人员信息，没有则传全部
+	public List<YgglMainEmp> empNumsConfirm(Integer orgCode, List<Integer> empNumList) {
+		List<YgglMainEmp> all = new LambdaQueryChainWrapper<YgglMainEmp>(ygglMainEmpMapper)
+				.eq(YgglMainEmp::getOrgCode, orgCode).list();
 		List<YgglMainEmp> ygglMainEmps = new ArrayList<YgglMainEmp>();
-		if (empNumList.size()!=0) {
+		if (empNumList.size() != 0) {
 			for (Integer empNum : empNumList) {
-				all.stream().filter(item -> empNum.equals(item.getEmpNum())).forEach(action ->{
+				all.stream().filter(item -> empNum.equals(item.getEmpNum())).forEach(action -> {
 					ygglMainEmps.add(action);
 				});
 			}
-		}else {
+		} else {
 			ygglMainEmps.addAll(all);
 		}
-		
+
 		return ygglMainEmps;
 	}
-	//根据传来的empNum获取该人员信息
-	public YgglMainEmp empNumConfirm(Integer orgCode,Integer empNum) {
-		YgglMainEmp one = new LambdaQueryChainWrapper<YgglMainEmp>(ygglMainEmpMapper).eq(YgglMainEmp::getOrgCode, orgCode).eq(YgglMainEmp::getEmpNum, empNum).one();
+
+	// 根据传来的empNum获取该人员信息
+	public YgglMainEmp empNumConfirm(Integer orgCode, Integer empNum) {
+		YgglMainEmp one = new LambdaQueryChainWrapper<YgglMainEmp>(ygglMainEmpMapper)
+				.eq(YgglMainEmp::getOrgCode, orgCode).eq(YgglMainEmp::getEmpNum, empNum).one();
 		return one;
 	}
 
-	
+
 	/**
 	 * 获取用户头像
 	 * 
@@ -229,11 +252,13 @@ public class YgglController {
 	@ApiOperation(value = "获取用户头像", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperationSupport(order = 70)
 	public Result<List<YgglMainEmp>> headphotos(@CurrentUser UserBean userBean, @RequestBody List<Integer> empNumList) {
-		if (empNumList.size()==0) {
+		if (empNumList.size() == 0) {
 			return ResultUtil.error("请输入empNum数组");
 		}
-		List<YgglMainEmp> yglList = YgglMainEmp.builder().build().selectList(new QueryWrapper<YgglMainEmp>().lambda()
-				.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).in(YgglMainEmp::getEmpNum, empNumList).select(YgglMainEmp::getEmpNum,YgglMainEmp::getName,YgglMainEmp::getHeadUrl));
+		List<YgglMainEmp> yglList = YgglMainEmp.builder().build()
+				.selectList(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())
+						.in(YgglMainEmp::getEmpNum, empNumList)
+						.select(YgglMainEmp::getEmpNum, YgglMainEmp::getName, YgglMainEmp::getHeadUrl));
 		for (YgglMainEmp yg : yglList) {
 			if (StringUtil.isEmpty(yg.getHeadUrl())) {
 				yg.setHeadUrl("");
@@ -241,6 +266,7 @@ public class YgglController {
 		}
 		return ResultUtil.data(yglList, "获取用户头像组成功");
 	}
+
 	/**
 	 * 获取员工档案
 	 * 
@@ -356,9 +382,13 @@ public class YgglController {
 					.build();
 
 			ygglMainEmp.insert();
-			new LambdaUpdateChainWrapper<YgglMainEmp>(ygglMainEmpMapper)
+			
+			if(addygdaDto.getBmgwId() != null) {
+				new LambdaUpdateChainWrapper<YgglMainEmp>(ygglMainEmpMapper)
 					.set(addygdaDto.getBmgwId() != null, YgglMainEmp::getBmgwId, addygdaDto.getBmgwId())
 					.eq(YgglMainEmp::getOrgCode, orgCode).eq(YgglMainEmp::getId, ygglMainEmp.getId()).update();
+			}
+			
 			return ResultUtil.data(ygglMainEmp, "新添加员工档案成功!");
 		} else {
 
@@ -430,9 +460,12 @@ public class YgglController {
 				ygQueryDto.getTotalPage() == null ? 10 : ygQueryDto.getTotalPage());
 		QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
 		queryWrapper.select("name", "emp_num", "bmgw_id", "rz_time", "job_type", "phone", "job_status")
-				.ne("job_status", YgEnumInterface.jobStatus.YILIZHI.getType()).eq("org_code", orgCode).eq(t != null && t > -1, "job_type", t)
-				.eq(j != null && j > -1, "job_status", j).in(!bList.isEmpty(), "bmgw_id", bList)
-				.and(!StrUtil.hasBlank(q), wq -> wq.like("name", q).or().like("phone", q)).orderByDesc("rz_time");
+				.ne("job_status", YgEnumInterface.jobStatus.YILIZHI.getType())
+				.eq("org_code", orgCode)
+				.eq(t != null && t > -1, "job_type", t).eq(j != null && j > -1, "job_status", j)
+				.in(!bList.isEmpty(), "bmgw_id", bList)
+				.and(!StrUtil.hasBlank(q), wq -> wq.like("name", q).or().like("phone", q));
+
 
 //		List<YgglMainEmp> lo = YgglMainEmp.builder().build().selectList(queryWrapper);
 		IPage<YgglMainEmp> ygglMainEmpPage = YgglMainEmp.builder().build().selectPage(page, queryWrapper);
@@ -1502,8 +1535,8 @@ public class YgglController {
 		UpdateWrapper<YgglMainLzb> updateWrapper1 = new UpdateWrapper<YgglMainLzb>();
 		updateWrapper1.eq("emp_num", lzygQueryDto.getEmpNum());
 		YgglMainEmp.builder().empNum(lzygQueryDto.getEmpNum()).jobStatus(3).build().update(updateWrapper);
-		YgglMainLzb.builder().jobStatus(YgEnumInterface.jobStatus.LIZHIZHONG.getType()).lzTime(lzygQueryDto.getLzTime()).lzyy(lzygQueryDto.getLzyy())
-				.lzbz(lzygQueryDto.getLzbz()).build().update(updateWrapper1);
+		YgglMainLzb.builder().jobStatus(YgEnumInterface.jobStatus.LIZHIZHONG.getType()).lzTime(lzygQueryDto.getLzTime())
+				.lzyy(lzygQueryDto.getLzyy()).lzbz(lzygQueryDto.getLzbz()).build().update(updateWrapper1);
 		// 删除员工表
 //		ygglMainEmp.deleteById();
 		// 删除员工登陆表
@@ -1528,9 +1561,10 @@ public class YgglController {
 		updateWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
 		UpdateWrapper<YgglMainLzb> updateWrapper1 = new UpdateWrapper<YgglMainLzb>();
 		updateWrapper1.eq("emp_num", lzygQueryDto.getEmpNum());
-		YgglMainEmp.builder().empNum(lzygQueryDto.getEmpNum()).jobStatus(YgEnumInterface.jobStatus.YILIZHI.getType()).build().update(updateWrapper);
-		YgglMainLzb.builder().empNum(lzygQueryDto.getEmpNum()).jobStatus(YgEnumInterface.jobStatus.YILIZHI.getType()).sjlzTime(new Date()).build()
-				.update(updateWrapper1);
+		YgglMainEmp.builder().empNum(lzygQueryDto.getEmpNum()).jobStatus(YgEnumInterface.jobStatus.YILIZHI.getType())
+				.build().update(updateWrapper);
+		YgglMainLzb.builder().empNum(lzygQueryDto.getEmpNum()).jobStatus(YgEnumInterface.jobStatus.YILIZHI.getType())
+				.sjlzTime(new Date()).build().update(updateWrapper1);
 		// 查询该员工的关联表
 		QueryWrapper<QyzxEmpEntAsso> queryWrapper1 = new QueryWrapper<QyzxEmpEntAsso>();
 		queryWrapper1.eq("emp_num", lzygQueryDto.getEmpNum());
@@ -1619,29 +1653,28 @@ public class YgglController {
 	 * @param
 	 * @return
 	 */
-	  @PostMapping(value = "/jg")
-	  @ApiOperation(value = "展示籍贯所有省市区", httpMethod = "POST", notes = "接口发布说明")
-	  @ApiOperationSupport(order = 60) 
-	  public Result<List<YgjgDto>> selectjgs(@CurrentUser UserBean userBean) {
-		  
-		  List<YgjgDto> oldfather = new ArrayList<YgjgDto>();//老父亲
-
-
-		  List<YgProDto> pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).list();//super继承人
-		  List<YgCityDto> city = new LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper).list();
-		  List<YgAreaDto> area = new LambdaQueryChainWrapper<YgAreaDto>(ygAreaDtoMapper).list();
-		  
-		  for (YgProDto p : pro) {
+	@PostMapping(value = "/jg")
+	@ApiOperation(value = "展示籍贯所有省市区", httpMethod = "POST", notes = "接口发布说明")
+	@ApiOperationSupport(order = 60)
+	public Result<List<YgjgDto>> selectjgs(@CurrentUser UserBean userBean) {
+
+		List<YgjgDto> oldfather = new ArrayList<YgjgDto>();// 老父亲
+
+		List<YgProDto> pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).list();// super继承人
+		List<YgCityDto> city = new LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper).list();
+		List<YgAreaDto> area = new LambdaQueryChainWrapper<YgAreaDto>(ygAreaDtoMapper).list();
+
+		for (YgProDto p : pro) {
 			Map<String, Object> map = BeanUtil.beanToMap(p);
-			//设置别名对应bean
+			// 设置别名对应bean
 			HashMap<String, String> mapping = CollUtil.newHashMap();
 			mapping.put("id", "jgid");
 			mapping.put("name", "jgname");
-			YgjgDto ygproDto = BeanUtil.mapToBean(map, YgjgDto.class,CopyOptions.create().setFieldMapping(mapping));
-			//添加cityList
-			//给一个upid	
-			List<YgCityDto> outcity= uptocityList(city,  ygproDto.getJgid());
-			//新建一个篮子
+			YgjgDto ygproDto = BeanUtil.mapToBean(map, YgjgDto.class, CopyOptions.create().setFieldMapping(mapping));
+			// 添加cityList
+			// 给一个upid
+			List<YgCityDto> outcity = uptocityList(city, ygproDto.getJgid());
+			// 新建一个篮子
 			List<YgjgDto> cityDtos = new ArrayList<YgjgDto>();
 			for (YgCityDto c : outcity) {
 				Map<String, Object> map2 = BeanUtil.beanToMap(c);
@@ -1649,11 +1682,12 @@ public class YgglController {
 				mapping2.put("id", "jgid");
 				mapping2.put("name", "jgname");
 				mapping2.put("province", "upid");
-				YgjgDto ygcityDto = BeanUtil.mapToBean(map2, YgjgDto.class,CopyOptions.create().setFieldMapping(mapping2));
-				//把果实收起来
+				YgjgDto ygcityDto = BeanUtil.mapToBean(map2, YgjgDto.class,
+						CopyOptions.create().setFieldMapping(mapping2));
+				// 把果实收起来
 				cityDtos.add(ygcityDto);
-				List<YgAreaDto> outarea = uptoareaList(area,  ygcityDto.getJgid());
-				
+				List<YgAreaDto> outarea = uptoareaList(area, ygcityDto.getJgid());
+
 				List<YgjgDto> areaDtos = new ArrayList<YgjgDto>();
 				for (YgAreaDto a : outarea) {
 					Map<String, Object> map3 = BeanUtil.beanToMap(a);
@@ -1661,42 +1695,44 @@ public class YgglController {
 					mapping3.put("id", "jgid");
 					mapping3.put("name", "jgname");
 					mapping3.put("city", "upid");
-					YgjgDto ygjgDto3 = BeanUtil.mapToBean(map3, YgjgDto.class,CopyOptions.create().setFieldMapping(mapping3));
+					YgjgDto ygjgDto3 = BeanUtil.mapToBean(map3, YgjgDto.class,
+							CopyOptions.create().setFieldMapping(mapping3));
 					areaDtos.add(ygjgDto3);
 
 				}
 				ygcityDto.setYgjgDtoList(areaDtos);
 				areaDtos.add(ygcityDto);
-				
+
 			}
 			ygproDto.setYgjgDtoList(cityDtos);
 			oldfather.add(ygproDto);
-		  }
-
-		  return ResultUtil.data(oldfather, "老父亲出来了");
-	  }
-	  //根据上级id抽取出list
-	  public List<YgCityDto> uptocityList(List<YgCityDto> city, Integer jgid) {
-		  List<YgCityDto> outcity = new ArrayList<YgCityDto>();
-			for (YgCityDto c : city) {
-				if (c.getProvince().equals(jgid)) {
-					outcity.add(c);
-				}
+		}
+
+		return ResultUtil.data(oldfather, "老父亲出来了");
+	}
+
+	// 根据上级id抽取出list
+	public List<YgCityDto> uptocityList(List<YgCityDto> city, Integer jgid) {
+		List<YgCityDto> outcity = new ArrayList<YgCityDto>();
+		for (YgCityDto c : city) {
+			if (c.getProvince().equals(jgid)) {
+				outcity.add(c);
 			}
-			city.removeAll(outcity);
-			return outcity;
-	  }
-	  public List<YgAreaDto> uptoareaList(List<YgAreaDto> area, Integer jgid) {
-		  List<YgAreaDto> outarea = new ArrayList<YgAreaDto>();
-			for (YgAreaDto a : area) {
-				if (a.getCity().equals(jgid)) {
-					outarea.add(a);
-				}
+		}
+		city.removeAll(outcity);
+		return outcity;
+	}
+
+	public List<YgAreaDto> uptoareaList(List<YgAreaDto> area, Integer jgid) {
+		List<YgAreaDto> outarea = new ArrayList<YgAreaDto>();
+		for (YgAreaDto a : area) {
+			if (a.getCity().equals(jgid)) {
+				outarea.add(a);
 			}
-			area.removeAll(outarea);
-			return outarea;
-	  }
-		 
+		}
+		area.removeAll(outarea);
+		return outarea;
+	}
 
 	/**
 	 * 展示籍贯/展示所有籍贯(威力增强版)
@@ -1734,7 +1770,6 @@ public class YgglController {
 		return ResultUtil.data(maps, "展示籍贯成功");
 	}
 
-
 	/**
 	 * 查询员工列表
 	 * 
@@ -1780,7 +1815,9 @@ public class YgglController {
 		List<YgglCartogramDto> ygglCartogramDto11 = ygglMainEmpMapper.queryWorkingAge(userBean);
 
 		map.put("positive", ygglCartogramDto1.getPositive());
-		map.put("avgAge", ygglCartogramDto2.getAvgAge());
+		if (ygglCartogramDto2 != null) {
+			map.put("avgAge", ygglCartogramDto2.getAvgAge());
+		}
 		map.put("induction", ygglCartogramDto3.getInduction());
 		map.put("probation", ygglCartogramDto4.getProbation());
 		map.put("regular", ygglCartogramDto4.getRegular());
@@ -1857,7 +1894,8 @@ public class YgglController {
 			ageList.add(new YgKVDto(entry.getKey().toString(), entry.getValue().toString()));
 		}
 		// 在职
-		Integer zaizhi = jobStatus.get(YgEnumInterface.jobStatus.ZHENSHI.getType()).intValue() + jobStatus.get(YgEnumInterface.jobStatus.SHIYONG.getType()).intValue();
+		Integer zaizhi = jobStatus.get(YgEnumInterface.jobStatus.ZHENSHI.getType()).intValue()
+				+ jobStatus.get(YgEnumInterface.jobStatus.SHIYONG.getType()).intValue();
 		// 本月新入职
 		Integer xinruzhi = workage.get("本月新入职").intValue();
 		// 本月离职

src/main/java/cn/timer/api/dao/spmk/SpmkApprovalGMapper.java

@@ -21,4 +21,6 @@ public interface SpmkApprovalGMapper extends BaseMapper<SpmkApprovalG> {
 
 	boolean updateListRandsById(List<SpmkApprovalG> list);
 
+	List<SpmkApprovalG> selectListAgInCaByAdmin(@Param("org_code") Integer org_code, @Param("emp_num") Integer emp_num, @Param("deptIds") List<Integer> deptIds);
+
 }

src/main/java/cn/timer/api/dto/spmk/SpmkApproveSummaryDto.java

@@ -2,12 +2,10 @@ package cn.timer.api.dto.spmk;
 
 import java.util.List;
 
-import javax.validation.Valid;
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 
 import cn.hutool.json.JSONObject;
 import io.swagger.annotations.ApiModelProperty;

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

+package cn.timer.api.dto.yggl;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class LoginInfoDto {
+
+	@ApiModelProperty(value = "员工id", example = "1")
+	private Integer empNum;
+	@ApiModelProperty(value = "员工姓名", example = "1")
+	private String name;
+	@ApiModelProperty(value = "部门id", example = "1")
+	private Integer bmId;
+	@ApiModelProperty(value = "部门名称", example = "1")
+	private String bmName;
+	@ApiModelProperty(value = "岗位id", example = "1")
+	private Integer gwId;
+	@ApiModelProperty(value = "岗位名称", example = "1")
+	private String gwName;
+	@ApiModelProperty(value = "入职日期", example = "1")
+	private Date entryTime;
+	@ApiModelProperty(value = "转正时间", example = "1")
+	private Date regularTime;
+
+}

src/main/resources/mapping/spmk/SpmkApprovalGMapper.xml

@@ -66,6 +66,18 @@
                 b.router SpmkCustomApproval_router -->
     </sql>      
     
+    <select id="selectListAgInCaByAdmin" resultMap="BaseResultMapDto">
+        SELECT 
+        	<include refid="Base_Column_List_Alias_a" />,
+        	<include refid="Base_Column_List_Alias_ca" />
+        FROM spmk_approval_g a
+         
+        LEFT JOIN spmk_custom_approval b 
+        ON a.id = b.approval_g_id 
+        WHERE a.org_code = #{org_code}  
+        ORDER BY a.ranks, b.ranks
+    </select>
+    
     <select id="selectListAgInCa" resultMap="BaseResultMapDto">
         SELECT 
         	<include refid="Base_Column_List_Alias_a" />,