sunsail-platform-admin.git

			@@ -101,7 +101,7 @@
			@FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
			@TableField("dimissionType")
			// @ExcelField(value = "离职类型",writeConverterExp = "1=正常离职,2=自动离职,3=公司劝退,4=公司辞退,5=试用期内" )
			private String dimissionType = "1";
			private String dimissionType;

			//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
			@TableField("createTime")

			@@ -67,6 +67,12 @@
			if (StringUtils.isNotBlank(empDimissionlog.getAllDeptName())) {
			queryWrapper.like("c.allDeptName", empDimissionlog.getDeptName());
			}
			if (StringUtils.isNotBlank(empDimissionlog.getEmpName())) {
			queryWrapper.like("b.empName", empDimissionlog.getEmpName());
			}
			if (StringUtils.isNotBlank(empDimissionlog.getEmpNumb())) {
			queryWrapper.like("b.empNumb", empDimissionlog.getEmpNumb());
			}
			Page<Map<String, Object>> page = new Page<>(request.getPageNum(), request.getPageSize());
			SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
			queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));

	febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史