Merge branch 'wdz' into 'develop'

Wdz See merge request 8timerv2/8timerapiv200!8

Merge branch 'wdz' into 'develop'
Wdz See merge request 8timerv2/8timerapiv200!8
7352dec9 · Administrator · ad41a9a4 · b72577be · 7352dec9 · 7352dec9
Commit 7352dec9 authored Mar 28, 2020 by Administrator
7 changed files
--- a/src/main/java/cn/timer/api/bean/yggl/YgglAttaSbgjj.java
+++ b/src/main/java/cn/timer/api/bean/yggl/YgglAttaSbgjj.java
@@ -51,5 +51,6 @@ public class YgglAttaSbgjj extends Model<YgglAttaSbgjj> {
 	@ApiModelProperty(value="个人公积金帐号 ",example="OH81889257")
    private String grgjjzh;
+	@ApiModelProperty(value="组织机构代码 ",example="117")
+    private Integer orgCode;
 }
\ No newline at end of file
--- a/src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
+++ b/src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
@@ -8,10 +8,14 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -130,7 +134,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="客户注册后的时间为入职时间")

--- a/src/main/java/cn/timer/api/controller/yggl/YgglController.java
+++ b/src/main/java/cn/timer/api/controller/yggl/YgglController.java
@@ -73,11 +73,11 @@ import cn.timer.api.dto.yggl.YgAreaDto;
 import cn.timer.api.dto.yggl.YgCityDto;
 import cn.timer.api.dto.yggl.YgDrjqbDto;
 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.YgglCartogramDto;
 import cn.timer.api.dto.yggl.YgjgDto;
 import cn.timer.api.dto.yggl.YgmzDto;
+import cn.timer.api.dto.yggl.YgProDto;
 import cn.timer.api.dto.yggl.YgzzDto;
 import cn.timer.api.utils.Md5;
 import cn.timer.api.utils.Result;
@@ -117,7 +117,7 @@ public class YgglController {
 	@Autowired
 	private YgProDtoMapper ygProDtoMapper;
-	//weng
+	//weng(民族)
 	@Autowired
 	private YgMzDtoMapper ygMzDtoMapper;
 	/**
@@ -136,9 +136,7 @@ public class YgglController {
 		YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build().selectOne(queryWrapper);
 		return ResultUtil.data(ygglMainEmp, "获取员工档案成功");
 	}
-	/**
-	 * 展示员工所有单表(管理员)
-	 */
 	// 获取员工档案
 	@GetMapping(value = "/ygda/{empNum}")
 	@ApiOperation(value = "获取员工档案(管)", httpMethod = "GET", notes = "接口发布说明")
@@ -148,13 +146,11 @@ public class YgglController {
 		QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("org_code", orgCode).eq("emp_num", empNum);
 		YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build().selectOne(queryWrapper);
-		Integer bmgwId = ygglMainEmp.getBmgwId();
 		return ResultUtil.data(ygglMainEmp, "获取员工档案成功");
 	}
 	/**
 	 * 根据岗位id获取员工档案部门岗位名称
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -178,7 +174,7 @@ public class YgglController {
 	}
 	/**
-	 * 添加/修改员工档案(weng)
+	 * 添加员工档案(weng)
 	 * 
 	 * @param
 	 * @return
@@ -236,10 +232,8 @@ public class YgglController {
 			}
 		}
 	}
 	/**
 	 * 修改员工档案
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -252,7 +246,6 @@ public class YgglController {
 			UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
 			updateWrapper.eq("org_code", userBean.getOrgCode()).eq("emp_num", ygglMainEmp.getEmpNum());
 			ygglMainEmp.update(updateWrapper);
 			return ResultUtil.data(ygglMainEmp, "修改成功");
 		}
 		return ResultUtil.error("请确认该员工是否存在！");
@@ -283,21 +276,20 @@ public class YgglController {
 		queryWrapper.
 		select("name","emp_num","bmgw_id","rz_time","job_type","phone","job_status")
 		.eq("org_code", orgCode).eq(t != null && t > -1, "job_type", t)
-			.eq(j != null && j > -1, "job_status", j).in(!bList.isEmpty(), "id", bList)
+			.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);
 		// List<YgglMainEmp> ygglMainEmps = ygglMainEmpPage.getRecords();
-		ygglMainEmpPage.getCurrent();
-		ygglMainEmpPage.getPages();
-		ygglMainEmpPage.getTotal();
-		ygglMainEmpPage.getSize();
 		return ResultUtil.data(ygglMainEmpPage, "员工搜索成功");
 		// return ResultUtil.data(ygglMainEmpPage, ygglMainEmps, "员工搜索成功");
 	}
+	/**
+	 * 导入威力加强版
-	//威力加强版
+	 * @param
+	 * @return
+	 */
 	@PostMapping(value = "/ygdas")
 	@ApiOperation(value = "导入威力加强版", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperationSupport(order = 7)
@@ -332,7 +324,6 @@ public class YgglController {
 					continue;
 				}
 			}
 			//判断是否已有员工登录表
 			if (login==null) {// 添加三张表
 				QyzxEmpLogin qyzxEmpLogin = QyzxEmpLogin.builder().phone(e.getPhone()).pw(Md5.md5("123456"))
@@ -354,7 +345,7 @@ public class YgglController {
 					.sex(sex).jobNum(jobNum).bmgwId(gw)
 					.empNum(qyzxEmpLogin.getId()).orgCode(userBean.getOrgCode()).build();
 				emp.insert();
-				boolean wanshan = new LambdaUpdateChainWrapper<YgglMainEmp>(ygglMainEmpMapper)
+				new LambdaUpdateChainWrapper<YgglMainEmp>(ygglMainEmpMapper)
 					.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())
 					.eq(YgglMainEmp::getId, emp.getId())
 					.set(birthday!=null, YgglMainEmp::getBirthday, birthday)
@@ -376,12 +367,11 @@ public class YgglController {
 						.syq(syq).sex(sex)
 						.jobNum(jobNum).empNum(login.getId()).orgCode(userBean.getOrgCode()).build();
 					emp.insert();
-					boolean wanshan = new LambdaUpdateChainWrapper<YgglMainEmp>(ygglMainEmpMapper)
+					new LambdaUpdateChainWrapper<YgglMainEmp>(ygglMainEmpMapper)
 						.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())
 						.eq(YgglMainEmp::getId, emp.getId())
 						.set(birthday!=null, YgglMainEmp::getBirthday, birthday)
 						.set(jg!=null && jg!=0, YgglMainEmp::getJg, jg).update();
-					//return ResultUtil.data(emp, "添加员工档案成功!");
 				} else {
 					e.setError("该手机号码已被使用");
 					errorList.add(e);
@@ -406,7 +396,7 @@ public class YgglController {
 		Iterator<YgDrjqbDto> itDr = drList.iterator();
 		YgDrjqbDto a = drList.get(0);//一个员工导入
        Integer size = drList.size();
-		for (Integer i=0; i<size;) {//
+		for (Integer i=0; i<size;i++) {//
 			YgDrjqbDto d = newList.get(i);//计数器
 			if (itDr.hasNext()) {
 				 a=itDr.next();
@@ -420,7 +410,6 @@ public class YgglController {
 				|| StrUtil.hasBlank(sex) 
 				|| StrUtil.hasBlank(zj)) {
 				d.setError("请填写必填项");
 				errorList.add(d);itDr.remove();i++;continue;
 			}
 			//手机号码格式不对
@@ -508,7 +497,6 @@ public class YgglController {
 	        		&& StrUtil.hasBlank(fourb)) { //没填写岗位，通过~ //
 	        }else {
 	        	//填写了部门岗位,办他！
 		        Integer  isHaveBmgw = isHavebmgw(bms,gw,orgCode);
 		        if (isHaveBmgw == 0) {
 		        	d.setError("部门岗位有误");
@@ -519,7 +507,6 @@ public class YgglController {
 				}
 			}
-	        i++;
 		}//for循环完毕！
 		YgDrsDto tofList = new YgDrsDto(drList, errorList, orgCode);
 		return  tofList;
@@ -548,7 +535,7 @@ public class YgglController {
 			String zy = d.getZy();String address = d.getAddress();
 			String hjAddress = d.getHkAddress();String qq = d.getQq();
 			String weixin =d.getWeixin(); String email = d.getEmail();
-			String[] bathroom = {ygnbgh,jobType,jobStatus,rzTime,syq,zy,address,hjAddress,qq,weixin,email};
+			String[] bathroom = {ygnbgh,sex,jobType,jobStatus,rzTime,syq,zy,address,hjAddress,qq,weixin,email};
 			boolean child=takeshower(bathroom);
 			if (child == false) {
 				d.setError("填写内容不要大于50字数");
@@ -562,16 +549,15 @@ public class YgglController {
 				String bh = format.format(new Date())+orgCode+i+System.currentTimeMillis();
 				d.setYgnbgh(bh);
 			}
 			//男女(最大优化)
 			d.setSex(YgEnumInterface.sex.isMan(sex));
 			//工作性质(最大优化)
 			d.setJobType(YgEnumInterface.YgJobType.choose(jobType));
 			//员工状态(最大优化)
 			d.setJobStatus(YgEnumInterface.jobStatus.isZhen(jobStatus));
-			//入职日期(已优化)
+			//入职日期(最大优化)
 			d.setRzTime(YgEnumInterface.rzTime.tranTime2(YgEnumInterface.rzTime.tranTime(rzTime)));
-			//试用期(已优化)
+			//试用期(最大优化)
 			d.setSyq(YgEnumInterface.syq.choose(syq));
 		}
 		 YgDrsDto clear = new YgDrsDto(drList, errorList, orgCode);
@@ -602,7 +588,6 @@ public class YgglController {
 				break;
 			}
 		}
 		Integer qiantao = qiantao(gwList,gw,0,orgCode);
 		if (qiantao!=0) {
 			return qiantao;//组织部门成立！
@@ -635,21 +620,18 @@ public class YgglController {
 		Integer q = qiantao(gwList,gw,upid,orgCode);
 		return q;
 	};
 	/**
 	 * 导出员工
 	 * @param
 	 * @return
 	 */
 	@GetMapping(value = "/ygdas")
-	@ApiOperation(value = "导出/批量添加/修改员工", httpMethod = "GET", notes = "接口发布说明")
+	@ApiOperation(value = "导出", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 8)
 	public Result<List<YgglMainEmp>> selectygdas(@CurrentUser UserBean userBean) {
-		Integer orgCode = userBean.getOrgCode();
+		int[] jList = {1,2,3};
-		QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
+		List<YgglMainEmp> list = new LambdaQueryChainWrapper<YgglMainEmp>(ygglMainEmpMapper).eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).in(YgglMainEmp::getJobStatus, jList).list();
-		queryWrapper.eq("org_code", orgCode);
+		return ResultUtil.data(list, "导出员工成功");
-		List<YgglMainEmp> ygglMainEmpList = YgglMainEmp.builder().build().selectList(queryWrapper);
-		return ResultUtil.data(ygglMainEmpList, "导出员工成功");
 	}
 	/**
@@ -661,9 +643,8 @@ public class YgglController {
 	@ApiOperation(value = "获取员工教育经历表", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 9)
 	public Result<List<YgglAttaJyjlb>> selectjyjlb(@CurrentUser UserBean userBean) {
-		List<YgglAttaJyjlb> ygglAttaJyjlbss = YgglAttaJyjlb.builder().build()
+		List<YgglAttaJyjlb> ygglAttaJyjlbss = YgglAttaJyjlb.builder().build().selectList(new QueryWrapper<YgglAttaJyjlb>()
-				.selectList(new QueryWrapper<YgglAttaJyjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
+				.eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
-						userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaJyjlbss, "获取员工教育经历表成功");
 	}
@@ -708,7 +689,6 @@ public class YgglController {
 	/**
 	 * 获取员工培训经历信息表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -716,12 +696,10 @@ public class YgglController {
 	@ApiOperation(value = "获取员工培训经历信息表", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 13)
 	public Result<List<YgglAttaPxjlxxb>> selectpxjlxxb(@CurrentUser UserBean userBean) {
-		List<YgglAttaPxjlxxb> ygglAttaPxjlxxbs = YgglAttaPxjlxxb.builder().build()
+		List<YgglAttaPxjlxxb> ygglAttaPxjlxxbs = YgglAttaPxjlxxb.builder().build().selectList(new QueryWrapper<YgglAttaPxjlxxb>()
-				.selectList(new QueryWrapper<YgglAttaPxjlxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
+				.eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
-						userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaPxjlxxbs, "获取员工培训经历信息表成功");
 	}
 	// 获取员工培训经历信息表
 	@GetMapping(value = "/pxjlxxb/{empNum}")
 	@ApiOperation(value = "获取员工培训经历信息表(管)", httpMethod = "GET", notes = "接口发布说明")
@@ -731,10 +709,8 @@ public class YgglController {
 				new QueryWrapper<YgglAttaPxjlxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
 		return ResultUtil.data(ygglAttaPxjlxxbs, "获取员工培训经历信息表成功");
 	}
 	/**
 	 * 添加/修改员工培训经历信息表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -748,10 +724,8 @@ public class YgglController {
 		ygglAttaPxjlxxb.insertOrUpdate();
 		return ResultUtil.data(ygglAttaPxjlxxb, "添加/修改员工培训经历信息表成功");
 	}
 	/**
 	 * 删除员工培训经历信息表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -763,10 +737,8 @@ public class YgglController {
 		return ResultUtil.data(YgglAttaPxjlxxb.builder().build()
 				.delete(new QueryWrapper<YgglAttaPxjlxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工培训经历信息表成功");
 	}
 	/**
 	 * 获取员工工作经历表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -774,9 +746,8 @@ public class YgglController {
 	@ApiOperation(value = "获取员工工作经历表", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 17)
 	public Result<List<YgglAttaGzjlb>> selectgzjlb(@CurrentUser UserBean userBean) {
-		List<YgglAttaGzjlb> ygglAttaGzjlbs = YgglAttaGzjlb.builder().build()
+		List<YgglAttaGzjlb> ygglAttaGzjlbs = YgglAttaGzjlb.builder().build().selectList(new QueryWrapper<YgglAttaGzjlb>()
-				.selectList(new QueryWrapper<YgglAttaGzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
+				.eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
-						userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaGzjlbs, "获取员工工作经历表成功");
 	}
 	// 获取员工工作经历表
@@ -788,10 +759,8 @@ public class YgglController {
 				new QueryWrapper<YgglAttaGzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
 		return ResultUtil.data(ygglAttaGzjlbs, "获取员工工作经历表成功");
 	}
 	/**
 	 * 添加/修改员工工作经历表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -804,10 +773,8 @@ public class YgglController {
 		ygglAttaGzjlb.insertOrUpdate();
 		return ResultUtil.data(ygglAttaGzjlb, "添加/修改员工工作经历表成功");
 	}
 	/**
 	 * 删除员工工作经历表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -819,11 +786,8 @@ public class YgglController {
 		return ResultUtil.data(YgglAttaGzjlb.builder().build()
 			.delete(new QueryWrapper<YgglAttaGzjlb>().eq("org_code", orgCode).eq("id", id)), "删除员工工作经历表成功");
 	}
 	/**
 	 * 获取员工职称信息表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -831,12 +795,10 @@ public class YgglController {
 	@ApiOperation(value = "获取员工职称信息表", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 21)
 	public Result<List<YgglAttaZcxxb>> selectzcxxb(@CurrentUser UserBean userBean) {
-		List<YgglAttaZcxxb> ygglAttaZcxxbs = YgglAttaZcxxb.builder().build()
+		List<YgglAttaZcxxb> ygglAttaZcxxbs = YgglAttaZcxxb.builder().build().selectList(new QueryWrapper<YgglAttaZcxxb>()
-				.selectList(new QueryWrapper<YgglAttaZcxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
+				.eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
-						userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaZcxxbs, "获取员工职称信息表成功");
 	}
 	// 获取员工职称信息表
 	@GetMapping(value = "/zcxxb/{empNum}")
 	@ApiOperation(value = "获取员工职称信息表(管)", httpMethod = "GET", notes = "接口发布说明")
@@ -846,10 +808,8 @@ public class YgglController {
 				new QueryWrapper<YgglAttaZcxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
 		return ResultUtil.data(ygglAttaZcxxbs, "获取员工职称信息表成功");
 	}
 	/**
 	 * 添加/修改员工职称信息表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -862,11 +822,8 @@ public class YgglController {
 		ygglAttaZcxxb.insertOrUpdate();
 		return ResultUtil.data(ygglAttaZcxxb, "添加/修改员工职称信息表成功");
 	}
 	/**
 	 * 删除员工职称信息表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -878,15 +835,8 @@ public class YgglController {
 		return ResultUtil.data(YgglAttaZcxxb.builder().build()
 				.delete(new QueryWrapper<YgglAttaZcxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工职称信息表成功");
 	}
 	/**
 	 * 获取员工证书证件表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -894,12 +844,10 @@ public class YgglController {
 	@ApiOperation(value = "获取员工证书证件表", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 25)
 	public Result<List<YgglAttaZszjb>> selectzszjb(@CurrentUser UserBean userBean) {
-		List<YgglAttaZszjb> ygglAttaZszjbs = YgglAttaZszjb.builder().build()
+		List<YgglAttaZszjb> ygglAttaZszjbs = YgglAttaZszjb.builder().build().selectList(new QueryWrapper<YgglAttaZszjb>()
-				.selectList(new QueryWrapper<YgglAttaZszjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
+				.eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
-						userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaZszjbs, "获取员工证书证件表成功");
 	}
 	// 获取员工证书证件表
 	@GetMapping(value = "/zszjb/{empNum}")
 	@ApiOperation(value = "获取员工证书证件表(管)", httpMethod = "GET", notes = "接口发布说明")
@@ -909,11 +857,8 @@ public class YgglController {
 			new QueryWrapper<YgglAttaZszjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
 		return ResultUtil.data(ygglAttaZszjbs, "获取员工证书证件表成功");
 	}
 	/**
 	 * 添加/修改员工证书证件表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -926,10 +871,8 @@ public class YgglController {
 		ygglAttaZszjb.insertOrUpdate();
 		return ResultUtil.data(ygglAttaZszjb, "添加/修改员工证书证件表成功");
 	}
 	/**
 	 * 删除员工证书证件表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -943,7 +886,6 @@ public class YgglController {
 	}
 	/**
 	 * 获取员工联系信息表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -951,9 +893,8 @@ public class YgglController {
 	@ApiOperation(value = "获取员工联系信息表", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 29)
 	public Result<List<YgglAttaLxxxb>> selectlxxxb(@CurrentUser UserBean userBean) {
-		List<YgglAttaLxxxb> ygglAttaLxxxbs = YgglAttaLxxxb.builder().build()
+		List<YgglAttaLxxxb> ygglAttaLxxxbs = YgglAttaLxxxb.builder().build().selectList(new QueryWrapper<YgglAttaLxxxb>()
-				.selectList(new QueryWrapper<YgglAttaLxxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
+				.eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
-						userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaLxxxbs, "获取员工联系信息表成功");
 	}
 	// 获取员工联系信息表
@@ -967,7 +908,6 @@ public class YgglController {
 	}
 	/**
 	 * 添加/修改员工联系信息表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -982,7 +922,6 @@ public class YgglController {
 	}
 	/**
 	 * 删除员工联系信息表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -994,10 +933,8 @@ public class YgglController {
 		return ResultUtil.data(YgglAttaLxxxb.builder().build()
 				.delete(new QueryWrapper<YgglAttaLxxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工联系信息表成功");
 	}
 	/**
 	 * 获取员工紧急联系人表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1005,12 +942,10 @@ public class YgglController {
 	@ApiOperation(value = "获取员工紧急联系人表", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 33)
 	public Result<List<YgglAttaJjlxr>> selectjjlxr(@CurrentUser UserBean userBean) {
-		List<YgglAttaJjlxr> ygglAttaJjlxrs = YgglAttaJjlxr.builder().build()
+		List<YgglAttaJjlxr> ygglAttaJjlxrs = YgglAttaJjlxr.builder().build().selectList(new QueryWrapper<YgglAttaJjlxr>()
-				.selectList(new QueryWrapper<YgglAttaJjlxr>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
+				.eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
-						userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaJjlxrs, "获取员工紧急联系人表成功");
 	}
 	// 获取员工紧急联系人表
 	@GetMapping(value = "/jjlxr/{empNum}")
 	@ApiOperation(value = "获取员工紧急联系人表(管)", httpMethod = "GET", notes = "接口发布说明")
@@ -1022,7 +957,6 @@ public class YgglController {
 	}
 	/**
 	 * 添加/修改员工紧急联系人表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1037,7 +971,6 @@ public class YgglController {
 	}
 	/**
 	 * 删除员工紧急联系人表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1049,11 +982,9 @@ public class YgglController {
 		return ResultUtil.data(YgglAttaJjlxr.builder().build()
 				.delete(new QueryWrapper<YgglAttaJjlxr>().eq("org_code", orgCode).eq("id", id)), "删除员工紧急联系人表成功");
 	}
 	// 获取工资卡信息
 	/**
 	 * 获取员工工资卡信息
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1076,7 +1007,6 @@ public class YgglController {
 	}
 	/**
 	 * 添加/修改工资卡信息
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1091,7 +1021,6 @@ public class YgglController {
 	}
 	/**
 	 * 删除工资卡信息
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1103,10 +1032,8 @@ public class YgglController {
 		return ResultUtil.data(YgglAttaGzk.builder().build()
 				.delete(new QueryWrapper<YgglAttaGzk>().eq("org_code", orgCode).eq("id", id)), "删除工资卡信息成功");
 	}
 	/**
 	 * 获取员工合同信息表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1114,9 +1041,8 @@ public class YgglController {
 	@ApiOperation(value = "获取员工合同信息表", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 41)
 	public Result<List<YgglAttaHtxxb>> selecthtxxb(@CurrentUser UserBean userBean) {
-		List<YgglAttaHtxxb> ygglAttaHtxxbs = YgglAttaHtxxb.builder().build()
+		List<YgglAttaHtxxb> ygglAttaHtxxbs = YgglAttaHtxxb.builder().build().selectList(new QueryWrapper<YgglAttaHtxxb>()
-				.selectList(new QueryWrapper<YgglAttaHtxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
+				.eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
-						userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaHtxxbs, "获取员工合同信息表成功");
 	}
 	// 获取员工合同信息表
@@ -1130,7 +1056,6 @@ public class YgglController {
 	}
 	/**
 	 * 添加/修改员工合同信息表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1145,7 +1070,6 @@ public class YgglController {
 	}
 	/**
 	 * 删除员工合同信息表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1167,9 +1091,8 @@ public class YgglController {
 	@ApiOperation(value = "获取员工材料附件表", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 45)
 	public Result<List<YgglAttaClfjb>> selectclfjb(@CurrentUser UserBean userBean) {
-		List<YgglAttaClfjb> ygglAttaClfjbs = YgglAttaClfjb.builder().build()
+		List<YgglAttaClfjb> ygglAttaClfjbs = YgglAttaClfjb.builder().build().selectList(new QueryWrapper<YgglAttaClfjb>()
-				.selectList(new QueryWrapper<YgglAttaClfjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
+				.eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
-						userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaClfjbs, "获取员工材料附件表成功");
 	}
 	// 获取员工材料附件表
@@ -1183,7 +1106,6 @@ public class YgglController {
 	}
 	/**
 	 * 添加/修改员工材料附件表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1198,7 +1120,6 @@ public class YgglController {
 	}
 	/**
 	 * 删除员工材料附件表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1213,7 +1134,6 @@ public class YgglController {
 	/**
 	 * 获取成长记录表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1221,9 +1141,8 @@ public class YgglController {
 	@ApiOperation(value = "获取成长记录表", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 49)
 	public Result<List<YgglAttaCzjlb>> selectczjlb(@CurrentUser UserBean userBean) {
-		List<YgglAttaCzjlb> ygglAttaCzjlbs = YgglAttaCzjlb.builder().build()
+		List<YgglAttaCzjlb> ygglAttaCzjlbs = YgglAttaCzjlb.builder().build().selectList(new QueryWrapper<YgglAttaCzjlb>()
-				.selectList(new QueryWrapper<YgglAttaCzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
+				.eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
-						userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaCzjlbs, "获取成长记录表成功");
 	}
 	// 获取成长记录表
@@ -1237,7 +1156,6 @@ public class YgglController {
 	}
 	/**
 	 * 添加/修改成长记录表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1250,24 +1168,21 @@ public class YgglController {
 		ygglAttaCzjlb.insertOrUpdate();
 		return ResultUtil.data(ygglAttaCzjlb, "添加/修改成长记录表成功");
 	}
+	/**
+	 * 获取单个离职员工信息(管)
-	// 获取员工离职表
+	 * @param
+	 * @return
+	 */
 	@GetMapping(value = "/lzb/{empNum}")
-	@ApiOperation(value = "获取员工离职表(管)", httpMethod = "GET", notes = "接口发布说明")
+	@ApiOperation(value = "获取单个离职员工信息(管)", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 52)
-	public Result<List<YgglMainLzb>> selectlzb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
+	public Result<YgglMainLzb> selectlzb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
-		Integer orgCode = userBean.getOrgCode();
+		YgglMainLzb lzyg = new LambdaQueryChainWrapper<YgglMainLzb>(ygglMainLzbMapper)
-		QueryWrapper<YgglMainLzb> queryWrapper = new QueryWrapper<>();
+				.eq(YgglMainLzb::getOrgCode, userBean.getOrgCode()).eq(YgglMainLzb::getEmpNum, empNum).one();
-		queryWrapper.eq("org_code", orgCode);
+		return ResultUtil.data(lzyg, "获取单个离职员工信息(管)成功");
-		List<YgglMainLzb> ygglMainLzbs = YgglMainLzb.builder().build().selectList(queryWrapper);
-		return ResultUtil.data(ygglMainLzbs, "获取员工离职表成功");
 	}
 	/**
 	 * 员工转正
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1281,10 +1196,8 @@ public class YgglController {
 				.zzRemark(ygzzDto.getZzRemark()).build().update(updateWrapper);
 		return ResultUtil.success("转正成功！");
 	}
 	/**
 	 * 计划离职 type2-3
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1292,41 +1205,30 @@ public class YgglController {
 	@ApiOperation(value = "添加离职计划", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperationSupport(order = 54)
 	public Result<YgglMainLzb> addjhlz(@CurrentUser UserBean userBean, @RequestBody LzygQueryDto lzygQueryDto) {
 		QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<YgglMainEmp>();
 		queryWrapper.eq("emp_num", lzygQueryDto.getEmpNum()).eq("org_code", userBean.getOrgCode());
 		YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build().selectOne(queryWrapper);
 		YgglMainLzb ygglMainLzb = YgglMainLzb.builder().empNum(lzygQueryDto.getEmpNum()).build();
 		// 移动员工表数据到离职表
 		BeanUtil.copyProperties(ygglMainEmp, ygglMainLzb);
 		ygglMainLzb.insert();
 		UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
 		updateWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
 		UpdateWrapper<YgglMainLzb> updateWrapper1 = new UpdateWrapper<YgglMainLzb>();
-		updateWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
+		updateWrapper1.eq("emp_num", lzygQueryDto.getEmpNum());
 		YgglMainEmp.builder().empNum(lzygQueryDto.getEmpNum()).jobStatus(3).build().update(updateWrapper);
 		YgglMainLzb.builder().jobStatus(3).lzTime(lzygQueryDto.getLzTime()).lzyy(lzygQueryDto.getLzyy())
 				.lzbz(lzygQueryDto.getLzbz()).build().update(updateWrapper1);
 		// 删除员工表
 //		ygglMainEmp.deleteById();
 		// 删除员工登陆表
 //		QyzxEmpLogin qyzxEmpLogin = QyzxEmpLogin.builder().id(ygglMainLzb.getEmpNum()).build();
 //		qyzxEmpLogin.deleteById();
 		return ResultUtil.data(ygglMainLzb, "添加待离职员工成功");
 	}
 	/**
 	 * 确认离职 type3-4
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1336,32 +1238,23 @@ public class YgglController {
 	public Result<Void> addlzb(@CurrentUser UserBean userBean, @RequestBody LzygQueryDto lzygQueryDto) {
 		QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<YgglMainEmp>();
 		queryWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
 		UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
 		updateWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
 		UpdateWrapper<YgglMainLzb> updateWrapper1 = new UpdateWrapper<YgglMainLzb>();
-		updateWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
+		updateWrapper1.eq("emp_num", lzygQueryDto.getEmpNum());
 		YgglMainEmp.builder().empNum(lzygQueryDto.getEmpNum()).jobStatus(4).build().update(updateWrapper);
 		YgglMainLzb.builder().empNum(lzygQueryDto.getEmpNum()).jobStatus(4).sjlzTime(new Date()).build()
 				.update(updateWrapper1);
 		// 查询该员工的关联表
 		QueryWrapper<QyzxEmpEntAsso> queryWrapper1 = new QueryWrapper<QyzxEmpEntAsso>();
 		queryWrapper1.eq("emp_num", lzygQueryDto.getEmpNum());
 		// 确认离职 删除员工关联表
 		QyzxEmpEntAsso qyzxEmpEntAsso = QyzxEmpEntAsso.builder().empNum(lzygQueryDto.getEmpNum()).build();
 		qyzxEmpEntAsso.delete(queryWrapper1);
 		return ResultUtil.success("确认离职员工成功");
 	}
 	/**
 	 * 放弃离职 type3-2
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1369,24 +1262,18 @@ public class YgglController {
 	@ApiOperation(value = "放弃离职", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperationSupport(order = 56)
 	public Result<Void> fqlz(@CurrentUser UserBean userBean, @RequestBody LzygQueryDto lzygQueryDto) {
 		UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
 		updateWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
 		YgglMainEmp.builder().jobStatus(2).build().update(updateWrapper);
 		QueryWrapper<YgglMainLzb> queryWrapper = new QueryWrapper<YgglMainLzb>();
 		queryWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
 		// 删除离职表
 		YgglMainLzb.builder().id(lzygQueryDto.getEmpNum()).build().delete(queryWrapper);
 		return ResultUtil.success("放弃成功");
 	}
 	/**
 	 * 查询离职员工列表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1395,24 +1282,13 @@ public class YgglController {
 	@ApiOperationSupport(order = 57)
 	public Result<Object> querylzyg(@CurrentUser UserBean userBean, @RequestBody LzbQueryDto lzygQueryDto) {
 		lzygQueryDto.setOrgCode(userBean.getOrgCode());
 		IPage<YgglMainLzb> page = new Page<YgglMainLzb>(
 				lzygQueryDto.getCurrentPage() == null ? 1 : lzygQueryDto.getCurrentPage(),
 				lzygQueryDto.getTotalPage() == null ? 10 : lzygQueryDto.getTotalPage());
 		List<YgglMainLzb> lzb = ygglMainLzbMapper.queryLzb(page, lzygQueryDto);
 		return ResultUtil.data(page, lzb, "离职员工搜索成功");
 	}
-	/**
-	 * 部门导入(未完成)
-	 * @param
-	 * @return
-	 */	
-	@PostMapping(value = "/ygbmdr")
-	@ApiOperation(value = "员工部门导入未完成", httpMethod = "POST", notes = "接口发布说明")
-	@ApiOperationSupport(order = 58)
-	public Result<List<YgglMainEmp>> ygbmdr(UserBean userBean, List<YgglMainEmp> EmpList) {
-		return ResultUtil.success("员工导入成功！");
-	}
 	/**
 	 * 展示民族/展示所有民族
 	 * @param
@@ -1446,17 +1322,17 @@ public class YgglController {
 		if (type == 1) { //省份
 			List<YgProDto> list = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getProvince,YgProDto::getName).orderByAsc(YgProDto::getProvince).list();
 		    for (YgProDto pro : list) {
-		    	maps.add(new YgjgDto(pro.getId(), pro.getProvince(), pro.getName()));
+		    	maps.add(new YgjgDto(pro.getId(), pro.getProvince(), pro.getName(),null));
 		    }}
 		if (type == 2) { //城市
 			List<YgCityDto> list = new LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper).select(YgCityDto::getId,YgCityDto::getCity,YgCityDto::getName).eq(YgCityDto::getProvince, upId).orderByAsc(YgCityDto::getProvince).orderByAsc(YgCityDto::getCity).list();
 			for (YgCityDto city : list) {
-				maps.add(new YgjgDto(city.getId(), city.getCity(), city.getName()));
+				maps.add(new YgjgDto(city.getId(), city.getCity(), city.getName(),null));
 			}}	
        if (type == 3) { //地区
 			List<YgAreaDto> list = new LambdaQueryChainWrapper<YgAreaDto>(ygAreaDtoMapper).select(YgAreaDto::getId,YgAreaDto::getName).eq(YgAreaDto::getCity, upId).orderByAsc(YgAreaDto::getProvince).orderByAsc(YgAreaDto::getCity).list();
 		    for (YgAreaDto area : list) { 
-		    	maps.add(new YgjgDto(area.getId(), area.getId(), area.getName()));
+		    	maps.add(new YgjgDto(area.getId(), area.getId(), area.getName(),null));
 		    }}
 		 //IYgjgDto iYgjgDto = PunishFactory.getPunish(type);
 		 //List<String> strings = iYgjgDto.exePunish();
@@ -1464,28 +1340,55 @@ public class YgglController {
        if (!maps.isEmpty()) return ResultUtil.data(maps, "展示籍贯成功"); 
        return ResultUtil.success(null);
 	}
+	/**
+	 * 根据籍贯id显示籍贯名
+	 * @param
+	 * @return
+	 */
 	@PostMapping(value = "/jgp/{id}")
-	@ApiOperation(value = "显示籍贯省市区", httpMethod = "POST", notes = "接口发布说明")
+	@ApiOperation(value = "根据籍贯id显示籍贯城市名", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperationSupport(order = 61)
-	public Result<String> selectjg(@CurrentUser UserBean userBean, @PathVariable Integer id) {
+	public Result<YgjgDto> selectjg(@CurrentUser UserBean userBean, @RequestBody YgjgDto jgcity) {
-		String isPro =id.toString().substring(2,4);
+		Integer jgid = jgcity.getJgid();
-		String isCity =id.toString().substring(4,6);
+		Integer cid = jgcity.getType();
+		if (jgid!=null) {
+			String top = jgid.toString().substring(0,2);
+			String isPro =jgid.toString().substring(2,4);
+			String isCity =jgid.toString().substring(4,6);
 			if ("00".equals(isPro)) {
-			YgProDto pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getName).eq(YgProDto::getId, id).one();
+				YgProDto pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getName).eq(YgProDto::getId, jgid).one();
-			if (pro!=null) { return ResultUtil.data(pro.getName(),"显示所在籍贯"); }}
+				if (pro!=null) jgcity.setJgname(pro.getName());
-		if ("00".equals(isCity)) {
+			} else if ("00".equals(isCity)) {
-			YgCityDto city = new LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper).select(YgCityDto::getId,YgCityDto::getName).eq(YgCityDto::getId, id).one();
+				YgProDto pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getName).eq(YgProDto::getProvince, top).one();
-			if (city!=null ) { return ResultUtil.data(city.getName(),"显示所在籍贯"); }}
+				YgCityDto city = new LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper).select(YgCityDto::getId,YgCityDto::getName).eq(YgCityDto::getId, jgid).one();
-		YgAreaDto area = new LambdaQueryChainWrapper<YgAreaDto>(ygAreaDtoMapper).select(YgAreaDto::getId,YgAreaDto::getName).eq(YgAreaDto::getId, id).one();
+				if (city!=null ) jgcity.setJgname(pro.getName()+city.getName());
-		if (area!=null ) { return ResultUtil.data(area.getName(),"显示所在籍贯");}
+				} 
-		return ResultUtil.error("编码有误，显示不到所在籍贯");
+			YgProDto pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getName).eq(YgProDto::getProvince, top).one();
+			YgCityDto city = new LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper).select(YgCityDto::getId,YgCityDto::getName).eq(YgCityDto::getId, Integer.parseInt(top+isPro)).one();
+			YgAreaDto area = new LambdaQueryChainWrapper<YgAreaDto>(ygAreaDtoMapper).select(YgAreaDto::getId,YgAreaDto::getName).eq(YgAreaDto::getId, jgid).one();
+			if (area!=null ) jgcity.setJgname(pro.getName()+city.getName()+area.getName());
+		}
+		if (cid!=null) {
+			String top = cid.toString().substring(0,2);
+			String isPro =cid.toString().substring(2,4);
+			String isCity =cid.toString().substring(4,6);
+			if ("00".equals(isPro)) {
+				YgProDto pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getName).eq(YgProDto::getId, cid).one();
+				if (pro!=null) jgcity.setCityname(pro.getName());
+			} else if ("00".equals(isCity)) {
+				YgProDto pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getName).eq(YgProDto::getProvince, top).one();
+				YgCityDto city = new LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper).select(YgCityDto::getId,YgCityDto::getName).eq(YgCityDto::getId, cid).one();
+				if (city!=null ) jgcity.setCityname(pro.getName()+city.getName());
+				} 
+			YgProDto pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getName).eq(YgProDto::getProvince, top).one();
+			YgCityDto city = new LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper).select(YgCityDto::getId,YgCityDto::getName).eq(YgCityDto::getId, Integer.parseInt(top+isPro)).one();
+			YgAreaDto area = new LambdaQueryChainWrapper<YgAreaDto>(ygAreaDtoMapper).select(YgAreaDto::getId,YgAreaDto::getName).eq(YgAreaDto::getId, cid).one();
+			if (area!=null ) jgcity.setCityname(pro.getName()+city.getName()+area.getName());
+		}
+		return ResultUtil.data(jgcity);
 	}
 	/**
 	 * 查询员工列表
-	 * 
 	 * @param
 	 * @return
 	 */
@@ -1496,11 +1399,9 @@ public class YgglController {
 		List<YgQueryDto> ygQueryDto = ygglMainEmpMapper.queryEmpMessage(userBean);
 		return ResultUtil.data(ygQueryDto, "查询成功");
 	}
 	/*************** 统计图 ***************/
 	/**
 	 * 查询统计图
-	 * 
 	 * @return 成功信息
 	 */
 	@GetMapping("/yggl")
@@ -1538,32 +1439,41 @@ public class YgglController {
 		return ResultUtil.data(map, "查询成功");
 	}
+	/**
+	 * 获取成长记录表
+	 * @param
+	 * @return
+	 */
+	@GetMapping(value = "/ygsbgjj")
+	@ApiOperation(value = "获取员工社保公积金", httpMethod = "GET", notes = "接口发布说明")
+	@ApiOperationSupport(order = 64)
+	public Result<List<YgglAttaSbgjj>> selectygsbgjj(@CurrentUser UserBean userBean) {
+		List<YgglAttaSbgjj> ygglAttaSbgjj = YgglAttaSbgjj.builder().build().selectList(new QueryWrapper<YgglAttaSbgjj>()
+				.eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
+		return ResultUtil.data(ygglAttaSbgjj, "获取员工社保公积金成功");
+	}
 	/**
 	 * 获取员工社保公积金
-	 * 
 	 * @param
 	 * @return
 	 */
 	@GetMapping(value = "/ygsbgjj/{empNum}")
 	@ApiOperation(value = "获取员工社保公积金", httpMethod = "GET", notes = "接口发布说明")
-	@ApiOperationSupport(order = 64)
+	@ApiOperationSupport(order = 65)
 	public Result<YgglAttaSbgjj> selectygsbgjj(@CurrentUser UserBean userBean,@PathVariable Integer empNum) {
 		YgglAttaSbgjj ygglAttaSbgjj = YgglAttaSbgjj.builder().build().selectOne(new QueryWrapper<YgglAttaSbgjj>().eq("emp_num", empNum));
 		return ResultUtil.data(ygglAttaSbgjj, "获取员工社保公积金成功");
 	}
 	/**
 	 * 添加/修改员工社保公积金
-	 * 
 	 * @param
 	 * @return
 	 */
 	@PostMapping(value = "/ygsbgjj")
 	@ApiOperation(value = "添加/修改员工社保公积金", httpMethod = "POST", notes = "接口发布说明")
-	@ApiOperationSupport(order = 65)
+	@ApiOperationSupport(order = 66)
 	public Result<YgglAttaSbgjj> addygsbgjj(@CurrentUser UserBean userBean,@RequestBody YgglAttaSbgjj ygglAttaSbgjj) {
 		Integer empNum = ygglAttaSbgjj.getEmpNum();
 		if (empNum == null) {
@@ -1579,4 +1489,18 @@ public class YgglController {
 		return ResultUtil.data(ygglAttaSbgjj, "添加/修改员工社保公积金成功");
 	}
+	/**
+	 * 删除员工社保公积金
+	 * @param
+	 * @return
+	 */
+	@DeleteMapping(value = "/ygsbgjj/{id}")
+	@ApiOperation(value = "删除员工社保公积金", httpMethod = "DELETE", notes = "接口发布说明")
+	@ApiOperationSupport(order = 67)
+	public Result<Boolean> delygsbgjj(@CurrentUser UserBean userBean, @PathVariable Integer id) {
+		Integer orgCode = userBean.getOrgCode();
+		return ResultUtil.data(YgglAttaSbgjj.builder().build()
+				.delete(new QueryWrapper<YgglAttaSbgjj>().eq("org_code", orgCode).eq("id", id)), "删除员工社保公积金成功");
+	}
 }
--- a/src/main/java/cn/timer/api/controller/yggl/YgglController.java.rej
+++ b/src/main/java/cn/timer/api/controller/yggl/YgglController.java.rej
+diff a/src/main/java/cn/timer/api/controller/yggl/YgglController.java b/src/main/java/cn/timer/api/controller/yggl/YgglController.java	(rejected hunks)
+@@ -76,6 +76,7 @@
+ import cn.timer.api.dto.yggl.YgQueryDto;
+ 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.YgProDto;
+ import cn.timer.api.dto.yggl.YgzzDto;
+ import cn.timer.api.utils.Md5;
--- a/src/main/java/cn/timer/api/dto/yggl/AddygdaDto.java
+++ b/src/main/java/cn/timer/api/dto/yggl/AddygdaDto.java
@@ -51,4 +51,8 @@ public class AddygdaDto extends Page implements Serializable{
 	@ApiModelProperty(value="性别 0：男；1：女",example="0")
    private Integer sex;
 }
--- a/src/main/java/cn/timer/api/dto/yggl/YgQueryDto.java
+++ b/src/main/java/cn/timer/api/dto/yggl/YgQueryDto.java
@@ -8,6 +8,8 @@ package cn.timer.api.dto.yggl;
 import java.io.Serializable;
 import java.util.Date;
+import com.alibaba.fastjson.annotation.JSONField;
 import cn.timer.api.utils.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -55,7 +57,7 @@ public class YgQueryDto extends Page implements Serializable{
 	@ApiModelProperty(value="部门id",example="101")
 	private Integer bmgwid;
-	@ApiModelProperty(value="员工状态1试用、2正式、3离职中、4已离职",example="2")
+	@ApiModelProperty(value="员工状态1正式、2试用、3离职中、4已离职",example="2")
 	private Integer jobStatus;
 	@ApiModelProperty(value="手机号、姓名",example="1388888888 or 张三")

--- a/src/main/java/cn/timer/api/dto/yggl/YgjgDto.java
+++ b/src/main/java/cn/timer/api/dto/yggl/YgjgDto.java
@@ -38,6 +38,10 @@ public class YgjgDto implements Serializable {
 	@Transient
 	@TableField(exist = false)
+	private String cityname;
+	@Transient
+	@TableField(exist = false)
 	private String jgname;
 }