Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal

src/main/java/cn/timer/api/aspect/lang/annotation/Log.java

@@ -12,7 +12,7 @@ import cn.timer.api.aspect.lang.enums.OperatorType;
 /**
  * 自定义操作日志记录注解
  * 
- * @author ruoyi
+ * @author Tang
  *
  */
 @Target({ ElementType.PARAMETER, ElementType.METHOD })

src/main/java/cn/timer/api/aspect/lang/enums/BusinessStatus.java

@@ -3,7 +3,7 @@ package cn.timer.api.aspect.lang.enums;
 /**
  * 操作状态
  * 
- * @author ruoyi
+ * @author Tang
  *
  */
 public enum BusinessStatus

src/main/java/cn/timer/api/aspect/lang/enums/OperatorType.java

@@ -3,7 +3,7 @@ package cn.timer.api.aspect.lang.enums;
 /**
  * 操作人类别
  * 
- * @author ruoyi
+ * @author Tang
  */
 public enum OperatorType
 {

src/main/java/cn/timer/api/bean/spmk/SpmkApprovalG.java

@@ -3,6 +3,8 @@ package cn.timer.api.bean.spmk;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,7 +12,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
 import cn.timer.api.config.exception.ValidationMsg;
+import cn.timer.api.config.validation.Insert;
 import cn.timer.api.config.validation.Ranks;
+import cn.timer.api.config.validation.Update;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -44,6 +48,7 @@ public class SpmkApprovalG extends Model<SpmkApprovalG> {
 	@ApiModelProperty(value = "企业组织代码 企业组织代码", example = "101")
 	private Integer orgCode;
 
+	@NotBlank(groups = {Insert.class,Update.class},message = ValidationMsg.NOTBLANK)
 	@ApiModelProperty(value = "组名 ", example = "组名")
 	private String name;
 

src/main/java/cn/timer/api/bean/spmk/SpmkApprovalTemplateG.java

@@ -14,7 +14,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
 import cn.timer.api.config.exception.ValidationMsg;
+import cn.timer.api.config.validation.Insert;
 import cn.timer.api.config.validation.Ranks;
+import cn.timer.api.config.validation.Update;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -42,7 +44,7 @@ public class SpmkApprovalTemplateG extends Model<SpmkApprovalTemplateG> {
 	@GeneratedValue
 	@TableId(type = IdType.AUTO)
 	@ApiModelProperty(value = "编号 编号", example = "101")
-	@NotNull(groups = {Ranks.class},message = ValidationMsg.NOTNULL)
+	@NotNull(groups = {Ranks.class,Insert.class,Update.class},message = ValidationMsg.NOTNULL)
 	private Integer id;
 
 	@ApiModelProperty(value = "组名 ", example = "组名")

src/main/java/cn/timer/api/config/enums/HttpMethod.java

@@ -7,7 +7,7 @@ import org.springframework.lang.Nullable;
 /**
  * 请求方式
  *
- * @author ruoyi
+ * @author Tang
  */
 public enum HttpMethod
 {

src/main/java/cn/timer/api/config/exception/Regular.java

@@ -94,10 +94,11 @@ public class Regular {
 	/** 
 	 * 港澳通行证验证 
 	 * */
+//	public static final String HKMAKAO = "/^[a-zA-Z0-9]{6,10}$/";
 	public static final String HKMAKAO = "/^[HMhm]{1}([0-9]{10}|[0-9]{8})$/";
 	/** 
 	 * 台湾通行证验证 
 	 * */
-	public static final String TAIWAN1 = " /^[0-9]{8}$/";
+	public static final String TAIWAN1 = "/^[0-9]{8}$/";
 	public static final String TAIWAN2 = "/^[0-9]{10}$/";
 }

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

@@ -61,6 +61,9 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping(value = "/login", produces = { "application/json" })
 public class LoginController {
 
+	@Value(value = "${config-8timer.init-password}")
+	public String pwd; // 系统赠送时间
+	
 	@Value("${config-8timer.register-free-time}")
 	public Integer offset; // 系统赠送时间
 
@@ -136,6 +139,9 @@ public class LoginController {
 	private QyzxEmpEntAssoMapper qyzxEmpEntAssoMapper;
 	
 	@Autowired
+	private ZzglBmgwMMapper zzglBmgwMMapper;
+
+	@Autowired
 	private AliyunSMS aliyunSMS;
 
 	// @Autowired
@@ -406,7 +412,7 @@ public class LoginController {
 		if (qyzxEmpLogin1 != null) {
 
 			qyzxEmpLogin1.setPhone(phone);
-			qyzxEmpLogin1.setPw(Md5.md5("123456"));// 密码初始化
+			qyzxEmpLogin1.setPw(Md5.md5(pwd));// 密码初始化
 
 			qyzxEmpLogin1.updateById();
 
@@ -544,9 +550,6 @@ public class LoginController {
 		return loginhan(qyzxEmpLogin1, request);
 	}
 
-	@Autowired
-	ZzglBmgwMMapper zzglBmgwMMapper;
-
 	private Result<QyzxEmpLogin> loginhan(QyzxEmpLogin qyzxEmpLogin1, HttpServletRequest request) {
 		if (qyzxEmpLogin1 == null)
 			return ResultUtil.error("帐号不存在！");

src/main/java/cn/timer/api/controller/qyzx/service/QyzxOperLogService.java

@@ -10,7 +10,7 @@ import cn.timer.api.dto.qyzx.QyzxOperLogQuaryDto;
 /**
  * 操作日志 服务层
  * 
- * @author ruoyi
+ * @author Tang
  */
 public interface QyzxOperLogService
 {

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

@@ -49,9 +49,11 @@ import cn.timer.api.config.enuminterface.SpmkEnumInterface.ApproveSummarySts;
 import cn.timer.api.config.enuminterface.SpmkEnumInterface.ExecutorSts;
 import cn.timer.api.config.enums.CommonEnum;
 import cn.timer.api.config.exception.CustomException;
+import cn.timer.api.config.validation.Insert;
 import cn.timer.api.config.validation.Ranks;
+import cn.timer.api.config.validation.Update;
 import cn.timer.api.config.validation.ValidList;
-import cn.timer.api.controller.spmk.service.SpmkServiceImpl;
+import cn.timer.api.controller.spmk.service.SpmkService;
 import cn.timer.api.controller.zzgl.service.ZzglBmgwMService;
 import cn.timer.api.dao.spmk.SpmkApprovalGMapper;
 import cn.timer.api.dao.spmk.SpmkApprovalTemplateGMapper;
@@ -89,7 +91,9 @@ produces = { "application/json","multipart/form-data" })
 public class SpmkController {
 
 	@Autowired
-	SpmkServiceImpl spmkService;
+	private SpmkService spmkService;
+	@Autowired
+	private ZzglBmgwMService zzglBmgwMService;
 	@Autowired
     private SpmkApprovalTemplateGMapper spmkApprovalTemplateGMapper;
 	@Autowired
@@ -99,8 +103,6 @@ public class SpmkController {
 	@Autowired
     private SpmkCustomApprovalMapper spmkCustomApprovalMapper;
 	@Autowired
-	private ZzglBmgwMService zzglBmgwMService;
-	@Autowired
 	private SpmkApproveSummaryMapper spmkApproveSummaryMapper;
 	@Autowired
 	private SpmkApproveDetailMapper spmkApproveDetailMapper;
@@ -122,7 +124,7 @@ public class SpmkController {
 	@PostMapping(value = "/save_approval_template_g")
 	@ApiOperation(value = "1.新增或编辑-审批模板组", httpMethod = "POST", notes = "新增或编辑-审批模板组")
 	@ApiOperationSupport(order = 1)
-	public Result<Object> saveAtg(@RequestBody SpmkApprovalTemplateG spmkApprovalTemplateG){
+	public Result<Object> saveAtg(@Validated({Insert.class,Update.class}) @RequestBody SpmkApprovalTemplateG spmkApprovalTemplateG){
 		
 		if (spmkApprovalTemplateG.selectCount(new QueryWrapper<SpmkApprovalTemplateG>().lambda()
 				.ne(spmkApprovalTemplateG.getId() != null,SpmkApprovalTemplateG::getId, spmkApprovalTemplateG.getId())
@@ -131,7 +133,7 @@ public class SpmkController {
 		}
 		
         return spmkApprovalTemplateG.insertOrUpdate() ? 
-        		ResultUtil.data(spmkApprovalTemplateG, "操作成功!") : ResultUtil.error("操作失败!");
+        		ResultUtil.data(spmkApprovalTemplateG) : ResultUtil.error();
 
 	}
 	
@@ -148,7 +150,7 @@ public class SpmkController {
 		
 		
         return SpmkApprovalTemplateG.builder().id(id).build().deleteById() ? 
-        		ResultUtil.success("操作成功!") : ResultUtil.error("没有找到该对象");
+        		ResultUtil.success() : ResultUtil.error("没有找到该对象");
 		
 	}
 	
@@ -160,7 +162,7 @@ public class SpmkController {
 	@ApiOperationSupport(order = 3)
 	public Result<Object> selectListAtg(){
         
-        return ResultUtil.data(spmkApprovalTemplateGMapper.selectListAtInAtg(),"操作成功!");
+        return ResultUtil.data(spmkApprovalTemplateGMapper.selectListAtInAtg());
 	}
 	
 	/**
@@ -171,7 +173,10 @@ public class SpmkController {
 	@ApiOperationSupport(order = 4)
 	public Result<Object> ranksAtg(@Validated(Ranks.class) @RequestBody ValidList<SpmkApprovalTemplateG> list){
 		
-        return spmkApprovalTemplateGMapper.updateListRandsById(list) ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
+		if (list == null || (list != null && list.size() <= 0)) {
+			return ResultUtil.success();
+		}
+        return spmkApprovalTemplateGMapper.updateListRandsById(list) ? ResultUtil.success() : ResultUtil.error();
 	}
 	
 	//TODO 审批模板
@@ -185,7 +190,7 @@ public class SpmkController {
 		
 		Integer approvalTemplateGId = spmkApprovalTemplateDto.getApprovalTemplateGId();
 		if (ObjectUtil.isNull(approvalTemplateGId)) 
-			return ResultUtil.error("操作失败!-1");
+			return ResultUtil.error("审批模板ID不为空");
 
 		SpmkApprovalTemplate at = SpmkApprovalTemplate.builder().build();
 
@@ -202,12 +207,12 @@ public class SpmkController {
 		}
 		
 		if (!at.insertOrUpdate()) 
-			return ResultUtil.error("操作失败!-2");
+			return ResultUtil.error("数据库操作失败");
 		
 		// 清空前端不需要的字段再返回,节省流量
 		at.setFroms(null);
 		at.setRouter(null);
-		return  ResultUtil.data(at, "操作成功!");
+		return  ResultUtil.data(at);
 		
 	}
 	
@@ -219,7 +224,7 @@ public class SpmkController {
 	@ApiOperationSupport(order = 6)
 	public Result<Object> deleteAtById(@PathVariable int id){
 		
-        return SpmkApprovalTemplate.builder().id(id).build().deleteById() ? ResultUtil.success("操作成功!") : ResultUtil.error("没有找到该对象");
+        return SpmkApprovalTemplate.builder().id(id).build().deleteById() ? ResultUtil.success() : ResultUtil.error("没有找到该对象");
 		
 	}
 
@@ -236,7 +241,7 @@ public class SpmkController {
 		BeanUtil.copyProperties(at, atd,"froms","router");
 		atd.setFroms(ObjectUtil.deserialize(at.getFroms()));
 		atd.setRouter(ObjectUtil.deserialize(at.getRouter()));
-        return ResultUtil.data(atd,"操作成功!");
+        return ResultUtil.data(atd);
         
 	}
 	
@@ -248,7 +253,11 @@ public class SpmkController {
 	@ApiOperationSupport(order = 8)
 	public Result<Object> ranksAt(@Validated({Ranks.class})@RequestBody ValidList<SpmkApprovalTemplate> list){
 
-        return spmkApprovalTemplateMapper.updateListRandsById(list) ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
+		if (list == null || (list != null && list.size() <= 0)) {
+			return ResultUtil.success();
+		}
+		
+        return spmkApprovalTemplateMapper.updateListRandsById(list) ? ResultUtil.success() : ResultUtil.error();
 	
 	}
 	
@@ -261,7 +270,7 @@ public class SpmkController {
 	@PostMapping(value = "/save_approval_g")
 	@ApiOperation(value = "9.新增或编辑-审批组", httpMethod = "POST", notes = "新增或编辑-审批组")
 	@ApiOperationSupport(order = 9)
-	public Result<Object> saveAg(@CurrentUser UserBean userBean, @RequestBody SpmkApprovalG spmkApprovalG){
+	public Result<Object> saveAg(@CurrentUser UserBean userBean, @Validated({Insert.class,Update.class}) @RequestBody SpmkApprovalG spmkApprovalG){
 		
 		if (spmkApprovalG.selectCount(new QueryWrapper<SpmkApprovalG>().lambda()
 				.ne(spmkApprovalG.getId() != null, SpmkApprovalG::getId, spmkApprovalG.getId())
@@ -271,7 +280,7 @@ public class SpmkController {
 		}
 		
 		spmkApprovalG.setOrgCode(userBean.getOrgCode());
-		return spmkApprovalG.insertOrUpdate() ? ResultUtil.data(spmkApprovalG, "操作成功!") : ResultUtil.error("操作失败!");
+		return spmkApprovalG.insertOrUpdate() ? ResultUtil.data(spmkApprovalG, "操作成功!") : ResultUtil.error();
 		
 	}
 	
@@ -286,7 +295,7 @@ public class SpmkController {
 		if (spmkCustomApprovalMapper.selectCount(new QueryWrapper<SpmkCustomApproval>().lambda().eq(SpmkCustomApproval::getApprovalGId, id)) > 0 ) 
 			return ResultUtil.error("审批组存在 自定义审批，不可直接删除!");
 		
-        return SpmkApprovalG.builder().id(id).build().deleteById() ? ResultUtil.success("操作成功!") : ResultUtil.error("没有找到该对象");
+        return SpmkApprovalG.builder().id(id).build().deleteById() ? ResultUtil.success() : ResultUtil.error("没有找到该对象");
 		
 	}
 	
@@ -312,9 +321,7 @@ public class SpmkController {
 	@ApiOperationSupport(order = 11)
 	public Result<Object> selectListAg(@CurrentUser UserBean userBean){
 		
-		List<Integer> depts = zzglBmgwMService.empNumupGetDepts(userBean.getOrgCode(), userBean.getEmpNum());
-		return ResultUtil.data(spmkApprovalGMapper.selectListAgInCa(userBean.getOrgCode(), userBean.getEmpNum(), depts),"操作成功!");
-		
+		return ResultUtil.data(spmkService.selectListAg(userBean) ,"操作成功!");
 	}
 	
 	/**
@@ -324,7 +331,12 @@ public class SpmkController {
 	@ApiOperation(value = "12.排序-审批组", httpMethod = "PUT", notes = "排序-审批组")
 	@ApiOperationSupport(order = 12)
 	public Result<Object> ranksAg(@Validated({Ranks.class}) @RequestBody ValidList<SpmkApprovalG> list){
-        return spmkApprovalGMapper.updateListRandsById(list) ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
+		
+		if (list == null || (list != null && list.size() <= 0)) {
+			return ResultUtil.success();
+		}
+		
+        return spmkApprovalGMapper.updateListRandsById(list) ? ResultUtil.success() : ResultUtil.error();
 	}
 	
 	//TODO 自定义审批
@@ -336,10 +348,7 @@ public class SpmkController {
 	@ApiOperation(value = "13.新增或编辑-自定义审批", httpMethod = "POST", notes = "新增或编辑-自定义审批")
 	@ApiOperationSupport(order = 13)
 	@Transactional(rollbackFor = Exception.class)
-	public Result<Object> saveCa(@CurrentUser UserBean userBean, @RequestBody SpmkCustomApprovalDto spmkCustomApprovalDto) throws Exception{
-		Integer approvalGId = spmkCustomApprovalDto.getApprovalGId();
-		if (ObjectUtil.isNull(approvalGId)) 
-			return ResultUtil.error("操作失败!-1");
+	public Result<Object> saveCa(@CurrentUser UserBean userBean,@Validated @RequestBody SpmkCustomApprovalDto spmkCustomApprovalDto) throws Exception{
 
 		SpmkCustomApproval ca = SpmkCustomApproval.builder().build();
 
@@ -357,7 +366,7 @@ public class SpmkController {
 		
 		//1.新增 SpmkCustomApproval-自定义审批
 		if (!ca.insertOrUpdate())
-			return ResultUtil.error("操作失败!-2");
+			return ResultUtil.error("新增自定义审批 失败!");
 		
 		
 		Integer id = ca.getId();
@@ -408,7 +417,7 @@ public class SpmkController {
 			throw new Exception();
 		}
 		
-		return  ResultUtil.success("操作成功!");
+		return  ResultUtil.success();
 	}
 
 	/**
@@ -436,7 +445,12 @@ public class SpmkController {
 	@ApiOperation(value = "16.排序-自定义审批", httpMethod = "PUT", notes = "排序-自定义审批")
 	@ApiOperationSupport(order = 16)
 	public Result<Object> ranksCa(@Validated({Ranks.class}) @RequestBody ValidList<SpmkCustomApproval> list){
-        return spmkCustomApprovalMapper.updateListRandsById(list) ? ResultUtil.success("操作成功!") : ResultUtil.error("操作失败!");
+		
+		if (list == null || (list != null && list.size() <= 0)) {
+			return ResultUtil.success();
+		}
+		
+        return spmkCustomApprovalMapper.updateListRandsById(list) ? ResultUtil.success() : ResultUtil.error();
 	}
 	
 	// TODO 审批汇总(发起审批)
@@ -456,7 +470,9 @@ public class SpmkController {
 					.eq(YgglMainEmp::getEmpNum, userBean.getEmpNum()));
 			
 			if (ygglMainEmp == null) 
-				return ResultUtil.error("发起人异常!");
+				return ResultUtil.error("发起人不存在!");
+			
+//			List<SpmkApprovalG> saG = spmkService.selectListAg(userBean);
 			
 			List<Router> listRouter = new ArrayList<Router>();
 			listRouter.add(spmkApproveSummaryDto.getRouter());
@@ -502,7 +518,7 @@ public class SpmkController {
 			if (!ad.insert()) 
 				throw new CustomException("审批详情-新增异常");
 			
-			return ResultUtil.success("操作成功!");
+			return ResultUtil.success();
 			
 	}
 	
@@ -645,7 +661,7 @@ public class SpmkController {
 		}else {
 			return ResultUtil.error("该审批已结束!");
 		}
-		return ResultUtil.data(null, "操作成功!");
+		return ResultUtil.success();
 	}
 	
 	//TODO 我审批的/抄送我的
@@ -686,7 +702,7 @@ public class SpmkController {
 				.eq(SpmkApproveSummary::getId, id));
 		
 		return as != null && as.getSts() != ApproveSummarySts.FINISH.ordinal() ? (SpmkApproveSummary.builder().id(id).endTime(new Date()).sts(ApproveSummarySts.UNDONE.ordinal()).build().updateById() ? 
-				ResultUtil.success("操作成功!") : ResultUtil.error("操作失败_1!")) : ResultUtil.error("审批已结束，无法撤销!");
+				ResultUtil.success() : ResultUtil.error("撤销异常")) : ResultUtil.error("审批已结束，无法撤销!");
 	}
 	
 	/**
@@ -713,7 +729,7 @@ public class SpmkController {
 		
 		spmkApproveSummaryMapper.delete(new QueryWrapper<SpmkApproveSummary>().lambda().eq(SpmkApproveSummary::getId, id));
 		
-		return ResultUtil.data(null, "操作成功!");
+		return ResultUtil.success();
 	}
 	
 	/**
@@ -730,7 +746,7 @@ public class SpmkController {
 		spmkApproveExecuteRecordMapper.delete(null);
 		spmkExecutorMapper.delete(null);
 		System.out.println("删除-审批组、自定义审批、审批汇总、审批详情、审批执行记录、审批执行人记录 所有数据 完成！");
-		return ResultUtil.data(null, "操作成功!");
+		return ResultUtil.success();
 	}
 	
 	//TODO 审批图标列表

src/main/java/cn/timer/api/controller/spmk/service/SpmkService.java

 package cn.timer.api.controller.spmk.service;
 
+import java.util.List;
+
+import cn.timer.api.bean.spmk.SpmkApprovalG;
+import cn.timer.api.config.annotation.UserBean;
 import cn.timer.api.dto.spmk.SpmkApproveDetailDto;
 
 public interface SpmkService {
@@ -8,4 +12,6 @@ public interface SpmkService {
 	
 	SpmkApproveDetailDto selectApproveDetailByAsId(Integer asId);
 	
+	List<SpmkApprovalG> selectListAg(UserBean userBean);
+	
 }

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

@@ -17,21 +17,31 @@ import cn.timer.api.bean.spmk.SpmkApprovalTemplateG;
 import cn.timer.api.bean.spmk.SpmkApproveDetail;
 import cn.timer.api.bean.spmk.SpmkApproveExecuteRecord;
 import cn.timer.api.bean.spmk.SpmkCustomApproval;
+import cn.timer.api.config.annotation.UserBean;
+import cn.timer.api.controller.zzgl.service.ZzglBmgwMService;
+import cn.timer.api.dao.spmk.SpmkApprovalGMapper;
 import cn.timer.api.dao.spmk.SpmkApproveDetailMapper;
 import cn.timer.api.dao.spmk.SpmkApproveExecuteRecordMapper;
 import cn.timer.api.dao.spmk.SpmkCustomApprovalMapper;
 import cn.timer.api.dto.spmk.SpmkApproveDetailDto;
+import cn.timer.api.utils.ResultUtil;
 
 @Service
 public class SpmkServiceImpl implements SpmkService{
 	
 	@Autowired
+	private ZzglBmgwMService zzglBmgwMService;
+
+	@Autowired
 	private SpmkCustomApprovalMapper spmkCustomApprovalMapper;
 	
 	@Autowired
 	private SpmkApproveDetailMapper spmkApproveDetailMapper;
 	
 	@Autowired
+	private SpmkApprovalGMapper spmkApprovalGMapper;
+	
+	@Autowired
 	private SpmkApproveExecuteRecordMapper spmkApproveExecuteRecordMapper;
 	
 	/**
@@ -96,4 +106,11 @@ public class SpmkServiceImpl implements SpmkService{
 		return adD;
 	}
 
+	@Override
+	public List<SpmkApprovalG> selectListAg(UserBean userBean) {
+		// TODO Auto-generated method stub
+		List<Integer> depts = zzglBmgwMService.empNumupGetDepts(userBean.getOrgCode(), userBean.getEmpNum());
+		return spmkApprovalGMapper.selectListAgInCa(userBean.getOrgCode(), userBean.getEmpNum(), depts);
+	}
+
 }

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

@@ -48,6 +48,7 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNodeConfig;
 import cn.hutool.core.lang.tree.TreeUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
@@ -76,6 +77,7 @@ import cn.timer.api.bean.zzgl.ZzglBmgwM;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.UserBean;
 import cn.timer.api.config.enuminterface.YgEnumInterface;
+import cn.timer.api.config.enuminterface.YgEnumInterface.jobStatus;
 import cn.timer.api.config.enums.CommonEnum;
 import cn.timer.api.config.exception.Regular;
 import cn.timer.api.config.validation.ValidList;
@@ -98,6 +100,7 @@ import cn.timer.api.dto.yggl.YgbintuDto;
 import cn.timer.api.dto.yggl.YgglCartogramDto;
 import cn.timer.api.dto.yggl.YgmzDto;
 import cn.timer.api.dto.yggl.YgzzDto;
+import cn.timer.api.utils.DateFormatUtils;
 import cn.timer.api.utils.Md5;
 import cn.timer.api.utils.Result;
 import cn.timer.api.utils.ResultUtil;
@@ -296,14 +299,20 @@ public class YgglController {
 	public Result<Object> updateygda(@CurrentUser UserBean userBean, @RequestBody YgglMainEmp ygglMainEmp)
 			throws Exception {
 
+		if (ObjectUtil.isAllNotEmpty(ygglMainEmp.getRzTime(),ygglMainEmp.getZzTime()) && 
+			!DateFormatUtils.getCompareDate(ygglMainEmp.getRzTime(), ygglMainEmp.getZzTime())) {
+			ResultUtil.error("入职日期 不可以大于 转正日期");
+		}
+		
 		if (ygglMainEmp.getEmpNum() != null) {
-			UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
-			updateWrapper.eq("org_code", userBean.getOrgCode()).eq("emp_num", ygglMainEmp.getEmpNum());
-			ygglMainEmp.update(updateWrapper);
+			
+			ygglMainEmp.update(new UpdateWrapper<YgglMainEmp>().lambda()
+					.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())
+					.eq(YgglMainEmp::getEmpNum, ygglMainEmp.getEmpNum()));
 
 			return ResultUtil.data(ygglMainEmp, "修改成功");
 		}
-		return ResultUtil.error("请确认该员工是否存在！");
+		return ResultUtil.data(ygglMainEmp, "修改成功");
 	}
 	
 	
@@ -332,11 +341,12 @@ public class YgglController {
 				ygQueryDto.getCurrentPage() == null ? 1 : ygQueryDto.getCurrentPage(),
 				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));
+		queryWrapper.lambda()
+		.select(YgglMainEmp::getName, YgglMainEmp::getEmpNum, YgglMainEmp::getBmgwId, YgglMainEmp::getRzTime, YgglMainEmp::getJobType, YgglMainEmp::getPhone, YgglMainEmp::getJobStatus)
+				.ne(YgglMainEmp::getJobStatus, YgEnumInterface.jobStatus.YILIZHI.getType()).eq(YgglMainEmp::getOrgCode, orgCode)
+				.eq(t != null && t > -1, YgglMainEmp::getJobType, t).eq(j != null && j > -1, YgglMainEmp::getJobStatus, j)
+				.in(!bList.isEmpty(), YgglMainEmp::getBmgwId, bList)
+				.and(!StrUtil.hasBlank(q), wq -> wq.like(YgglMainEmp::getName, q).or().like(YgglMainEmp::getPhone, q));
 
 //		List<YgglMainEmp> lo = YgglMainEmp.builder().build().selectList(queryWrapper);
 		IPage<YgglMainEmp> ygglMainEmpPage = YgglMainEmp.builder().build().selectPage(page, queryWrapper);
@@ -440,6 +450,7 @@ public class YgglController {
 			if (yme.insert()) {
 				listYmp.add(yme);
 			}else {
+				// 存放 插入失败的 数据
 				insertErrors.add(yme);
 			}
 			
@@ -543,8 +554,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 10)
 	public Result<List<YgglAttaJyjlb>> selectjyjlb(@CurrentUser UserBean userBean) {
 		List<YgglAttaJyjlb> ygglAttaJyjlbss = YgglAttaJyjlb.builder().build()
-				.selectList(new QueryWrapper<YgglAttaJyjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
-						userBean.getEmpNum()));
+				.selectList(new QueryWrapper<YgglAttaJyjlb>().lambda()
+						.eq(YgglAttaJyjlb::getOrgCode, userBean.getOrgCode())
+						.eq(YgglAttaJyjlb::getEmpNum,userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaJyjlbss, "获取员工教育经历表成功");
 	}
 
@@ -554,7 +566,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 11)
 	public Result<List<YgglAttaJyjlb>> selectjyjlb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
 		List<YgglAttaJyjlb> ygglAttaJyjlbs = YgglAttaJyjlb.builder().build().selectList(
-				new QueryWrapper<YgglAttaJyjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
+				new QueryWrapper<YgglAttaJyjlb>().lambda()
+				.eq(YgglAttaJyjlb::getOrgCode, userBean.getOrgCode())
+				.eq(YgglAttaJyjlb::getEmpNum, empNum));
 		return ResultUtil.data(ygglAttaJyjlbs, "获取员工教育经历表成功");
 	}
 
@@ -586,7 +600,9 @@ public class YgglController {
 	public Result<Boolean> deljyjlb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
 		Integer orgCode = userBean.getOrgCode();
 		return ResultUtil.data(YgglAttaJyjlb.builder().build()
-				.delete(new QueryWrapper<YgglAttaJyjlb>().eq("org_code", orgCode).eq("id", id)), "删除员工教育经历表成功");
+				.delete(new QueryWrapper<YgglAttaJyjlb>().lambda()
+						.eq(YgglAttaJyjlb::getOrgCode, orgCode)
+						.eq(YgglAttaJyjlb::getId, id)), "删除员工教育经历表成功");
 	}
 
 	/**
@@ -600,8 +616,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 14)
 	public Result<List<YgglAttaPxjlxxb>> selectpxjlxxb(@CurrentUser UserBean userBean) {
 		List<YgglAttaPxjlxxb> ygglAttaPxjlxxbs = YgglAttaPxjlxxb.builder().build()
-				.selectList(new QueryWrapper<YgglAttaPxjlxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
-						userBean.getEmpNum()));
+				.selectList(new QueryWrapper<YgglAttaPxjlxxb>().lambda()
+						.eq(YgglAttaPxjlxxb::getOrgCode, userBean.getOrgCode())
+						.eq(YgglAttaPxjlxxb::getEmpNum, userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaPxjlxxbs, "获取员工培训经历信息表成功");
 	}
 
@@ -611,7 +628,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 15)
 	public Result<List<YgglAttaPxjlxxb>> selectpxjlxxb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
 		List<YgglAttaPxjlxxb> ygglAttaPxjlxxbs = YgglAttaPxjlxxb.builder().build().selectList(
-				new QueryWrapper<YgglAttaPxjlxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
+				new QueryWrapper<YgglAttaPxjlxxb>().lambda()
+				.eq(YgglAttaPxjlxxb::getOrgCode, userBean.getOrgCode())
+				.eq(YgglAttaPxjlxxb::getEmpNum, empNum));
 		return ResultUtil.data(ygglAttaPxjlxxbs, "获取员工培训经历信息表成功");
 	}
 
@@ -644,7 +663,9 @@ public class YgglController {
 	public Result<Boolean> delpxjlxxb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
 		Integer orgCode = userBean.getOrgCode();
 		return ResultUtil.data(YgglAttaPxjlxxb.builder().build()
-				.delete(new QueryWrapper<YgglAttaPxjlxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工培训经历信息表成功");
+				.delete(new QueryWrapper<YgglAttaPxjlxxb>().lambda()
+						.eq(YgglAttaPxjlxxb::getOrgCode, orgCode)
+						.eq(YgglAttaPxjlxxb::getId, id)), "删除员工培训经历信息表成功");
 	}
 
 	/**
@@ -658,8 +679,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 18)
 	public Result<List<YgglAttaGzjlb>> selectgzjlb(@CurrentUser UserBean userBean) {
 		List<YgglAttaGzjlb> ygglAttaGzjlbs = YgglAttaGzjlb.builder().build()
-				.selectList(new QueryWrapper<YgglAttaGzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
-						userBean.getEmpNum()));
+				.selectList(new QueryWrapper<YgglAttaGzjlb>().lambda()
+						.eq(YgglAttaGzjlb::getOrgCode, userBean.getOrgCode())
+						.eq(YgglAttaGzjlb::getEmpNum, userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaGzjlbs, "获取员工工作经历表成功");
 	}
 
@@ -669,7 +691,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 19)
 	public Result<List<YgglAttaGzjlb>> selectgzjlb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
 		List<YgglAttaGzjlb> ygglAttaGzjlbs = YgglAttaGzjlb.builder().build().selectList(
-				new QueryWrapper<YgglAttaGzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
+				new QueryWrapper<YgglAttaGzjlb>().lambda()
+				.eq(YgglAttaGzjlb::getOrgCode, userBean.getOrgCode())
+				.eq(YgglAttaGzjlb::getEmpNum, empNum));
 		return ResultUtil.data(ygglAttaGzjlbs, "获取员工工作经历表成功");
 	}
 
@@ -701,7 +725,9 @@ public class YgglController {
 	public Result<Boolean> delgzjlb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
 		Integer orgCode = userBean.getOrgCode();
 		return ResultUtil.data(YgglAttaGzjlb.builder().build()
-				.delete(new QueryWrapper<YgglAttaGzjlb>().eq("org_code", orgCode).eq("id", id)), "删除员工工作经历表成功");
+				.delete(new QueryWrapper<YgglAttaGzjlb>().lambda()
+						.eq(YgglAttaGzjlb::getOrgCode, orgCode)
+						.eq(YgglAttaGzjlb::getId, id)), "删除员工工作经历表成功");
 	}
 
 	/**
@@ -715,8 +741,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 22)
 	public Result<List<YgglAttaZcxxb>> selectzcxxb(@CurrentUser UserBean userBean) {
 		List<YgglAttaZcxxb> ygglAttaZcxxbs = YgglAttaZcxxb.builder().build()
-				.selectList(new QueryWrapper<YgglAttaZcxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
-						userBean.getEmpNum()));
+				.selectList(new QueryWrapper<YgglAttaZcxxb>().lambda()
+						.eq(YgglAttaZcxxb::getOrgCode, userBean.getOrgCode())
+						.eq(YgglAttaZcxxb::getEmpNum, userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaZcxxbs, "获取员工职称信息表成功");
 	}
 
@@ -726,7 +753,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 23)
 	public Result<List<YgglAttaZcxxb>> selectzcxxb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
 		List<YgglAttaZcxxb> ygglAttaZcxxbs = YgglAttaZcxxb.builder().build().selectList(
-				new QueryWrapper<YgglAttaZcxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
+				new QueryWrapper<YgglAttaZcxxb>().lambda()
+				.eq(YgglAttaZcxxb::getOrgCode, userBean.getOrgCode())
+				.eq(YgglAttaZcxxb::getEmpNum, empNum));
 		return ResultUtil.data(ygglAttaZcxxbs, "获取员工职称信息表成功");
 	}
 
@@ -758,7 +787,9 @@ public class YgglController {
 	public Result<Boolean> delzcxxb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
 		Integer orgCode = userBean.getOrgCode();
 		return ResultUtil.data(YgglAttaZcxxb.builder().build()
-				.delete(new QueryWrapper<YgglAttaZcxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工职称信息表成功");
+				.delete(new QueryWrapper<YgglAttaZcxxb>().lambda()
+						.eq(YgglAttaZcxxb::getOrgCode, orgCode)
+						.eq(YgglAttaZcxxb::getId, id)), "删除员工职称信息表成功");
 	}
 
 	/**
@@ -772,8 +803,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 26)
 	public Result<List<YgglAttaZszjb>> selectzszjb(@CurrentUser UserBean userBean) {
 		List<YgglAttaZszjb> ygglAttaZszjbs = YgglAttaZszjb.builder().build()
-				.selectList(new QueryWrapper<YgglAttaZszjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
-						userBean.getEmpNum()));
+				.selectList(new QueryWrapper<YgglAttaZszjb>().lambda()
+						.eq(YgglAttaZszjb::getOrgCode, userBean.getOrgCode())
+						.eq(YgglAttaZszjb::getEmpNum,userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaZszjbs, "获取员工证书证件表成功");
 	}
 
@@ -783,7 +815,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 27)
 	public Result<List<YgglAttaZszjb>> selectzszjb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
 		List<YgglAttaZszjb> ygglAttaZszjbs = YgglAttaZszjb.builder().build().selectList(
-				new QueryWrapper<YgglAttaZszjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
+				new QueryWrapper<YgglAttaZszjb>().lambda()
+				.eq(YgglAttaZszjb::getOrgCode, userBean.getOrgCode())
+				.eq(YgglAttaZszjb::getEmpNum, empNum));
 		return ResultUtil.data(ygglAttaZszjbs, "获取员工证书证件表成功");
 	}
 
@@ -815,7 +849,9 @@ public class YgglController {
 	public Result<Boolean> delzszjb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
 		Integer orgCode = userBean.getOrgCode();
 		return ResultUtil.data(YgglAttaZszjb.builder().build()
-				.delete(new QueryWrapper<YgglAttaZszjb>().eq("org_code", orgCode).eq("id", id)), "删除员工证书证件表成功");
+				.delete(new QueryWrapper<YgglAttaZszjb>().lambda()
+						.eq(YgglAttaZszjb::getOrgCode, orgCode)
+						.eq(YgglAttaZszjb::getId, id)), "删除员工证书证件表成功");
 	}
 
 	/**
@@ -829,8 +865,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 30)
 	public Result<List<YgglAttaLxxxb>> selectlxxxb(@CurrentUser UserBean userBean) {
 		List<YgglAttaLxxxb> ygglAttaLxxxbs = YgglAttaLxxxb.builder().build()
-				.selectList(new QueryWrapper<YgglAttaLxxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
-						userBean.getEmpNum()));
+				.selectList(new QueryWrapper<YgglAttaLxxxb>().lambda()
+						.eq(YgglAttaLxxxb::getOrgCode, userBean.getOrgCode())
+						.eq(YgglAttaLxxxb::getEmpNum, userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaLxxxbs, "获取员工联系信息表成功");
 	}
 
@@ -840,7 +877,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 31)
 	public Result<List<YgglAttaLxxxb>> selectlxxxb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
 		List<YgglAttaLxxxb> ygglAttaLxxxbs = YgglAttaLxxxb.builder().build().selectList(
-				new QueryWrapper<YgglAttaLxxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
+				new QueryWrapper<YgglAttaLxxxb>().lambda()
+				.eq(YgglAttaLxxxb::getOrgCode, userBean.getOrgCode())
+				.eq(YgglAttaLxxxb::getEmpNum, empNum));
 		return ResultUtil.data(ygglAttaLxxxbs, "获取员工联系信息表成功");
 	}
 
@@ -872,7 +911,9 @@ public class YgglController {
 	public Result<Boolean> dellxxxb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
 		Integer orgCode = userBean.getOrgCode();
 		return ResultUtil.data(YgglAttaLxxxb.builder().build()
-				.delete(new QueryWrapper<YgglAttaLxxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工联系信息表成功");
+				.delete(new QueryWrapper<YgglAttaLxxxb>().lambda()
+						.eq(YgglAttaLxxxb::getOrgCode, orgCode)
+						.eq(YgglAttaLxxxb::getId, id)), "删除员工联系信息表成功");
 	}
 
 	/**
@@ -886,8 +927,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 34)
 	public Result<List<YgglAttaJjlxr>> selectjjlxr(@CurrentUser UserBean userBean) {
 		List<YgglAttaJjlxr> ygglAttaJjlxrs = YgglAttaJjlxr.builder().build()
-				.selectList(new QueryWrapper<YgglAttaJjlxr>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
-						userBean.getEmpNum()));
+				.selectList(new QueryWrapper<YgglAttaJjlxr>().lambda()
+						.eq(YgglAttaJjlxr::getOrgCode, userBean.getOrgCode())
+						.eq(YgglAttaJjlxr::getEmpNum, userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaJjlxrs, "获取员工紧急联系人表成功");
 	}
 
@@ -897,7 +939,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 35)
 	public Result<List<YgglAttaJjlxr>> selectjjlxr(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
 		List<YgglAttaJjlxr> ygglAttaJjlxrs = YgglAttaJjlxr.builder().build().selectList(
-				new QueryWrapper<YgglAttaJjlxr>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
+				new QueryWrapper<YgglAttaJjlxr>().lambda()
+				.eq(YgglAttaJjlxr::getOrgCode, userBean.getOrgCode())
+				.eq(YgglAttaJjlxr::getEmpNum, empNum));
 		return ResultUtil.data(ygglAttaJjlxrs, "获取员工紧急联系人表成功");
 	}
 
@@ -929,7 +973,9 @@ public class YgglController {
 	public Result<Boolean> deljjlxr(@CurrentUser UserBean userBean, @PathVariable Integer id) {
 		Integer orgCode = userBean.getOrgCode();
 		return ResultUtil.data(YgglAttaJjlxr.builder().build()
-				.delete(new QueryWrapper<YgglAttaJjlxr>().eq("org_code", orgCode).eq("id", id)), "删除员工紧急联系人表成功");
+				.delete(new QueryWrapper<YgglAttaJjlxr>().lambda()
+						.eq(YgglAttaJjlxr::getOrgCode, orgCode)
+						.eq(YgglAttaJjlxr::getId, id)), "删除员工紧急联系人表成功");
 	}
 
 	// 获取工资卡信息
@@ -943,8 +989,10 @@ public class YgglController {
 	@ApiOperation(value = "38.获取员工工资卡信息", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 38)
 	public Result<List<YgglAttaGzk>> selectgzk(@CurrentUser UserBean userBean) {
-		List<YgglAttaGzk> ygglAttaGzks = YgglAttaGzk.builder().build().selectList(new QueryWrapper<YgglAttaGzk>()
-				.eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
+		List<YgglAttaGzk> ygglAttaGzks = YgglAttaGzk.builder().build()
+				.selectList(new QueryWrapper<YgglAttaGzk>().lambda()
+						.eq(YgglAttaGzk::getOrgCode, userBean.getOrgCode())
+						.eq(YgglAttaGzk::getEmpNum, userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaGzks, "获取工资卡信息成功");
 	}
 
@@ -954,7 +1002,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 39)
 	public Result<List<YgglAttaGzk>> selectgzk(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
 		List<YgglAttaGzk> ygglAttaGzks = YgglAttaGzk.builder().build().selectList(
-				new QueryWrapper<YgglAttaGzk>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
+				new QueryWrapper<YgglAttaGzk>().lambda()
+				.eq(YgglAttaGzk::getOrgCode, userBean.getOrgCode())
+				.eq(YgglAttaGzk::getEmpNum, empNum));
 		return ResultUtil.data(ygglAttaGzks, "获取工资卡信息成功");
 	}
 
@@ -986,7 +1036,9 @@ public class YgglController {
 	public Result<Boolean> delgzk(@CurrentUser UserBean userBean, @PathVariable Integer id) {
 		Integer orgCode = userBean.getOrgCode();
 		return ResultUtil.data(YgglAttaGzk.builder().build()
-				.delete(new QueryWrapper<YgglAttaGzk>().eq("org_code", orgCode).eq("id", id)), "删除工资卡信息成功");
+				.delete(new QueryWrapper<YgglAttaGzk>().lambda()
+						.eq(YgglAttaGzk::getOrgCode, orgCode)
+						.eq(YgglAttaGzk::getId, id)), "删除工资卡信息成功");
 	}
 
 	/**
@@ -1000,8 +1052,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 42)
 	public Result<List<YgglAttaHtxxb>> selecthtxxb(@CurrentUser UserBean userBean) {
 		List<YgglAttaHtxxb> ygglAttaHtxxbs = YgglAttaHtxxb.builder().build()
-				.selectList(new QueryWrapper<YgglAttaHtxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
-						userBean.getEmpNum()));
+				.selectList(new QueryWrapper<YgglAttaHtxxb>().lambda()
+						.eq(YgglAttaHtxxb::getOrgCode, userBean.getOrgCode())
+						.eq(YgglAttaHtxxb::getEmpNum, userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaHtxxbs, "获取员工合同信息表成功");
 	}
 
@@ -1011,7 +1064,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 43)
 	public Result<List<YgglAttaHtxxb>> selecthtxxb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
 		List<YgglAttaHtxxb> ygglAttaHtxxbs = YgglAttaHtxxb.builder().build().selectList(
-				new QueryWrapper<YgglAttaHtxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
+				new QueryWrapper<YgglAttaHtxxb>().lambda()
+				.eq(YgglAttaHtxxb::getOrgCode, userBean.getOrgCode())
+				.eq(YgglAttaHtxxb::getEmpNum, empNum));
 		return ResultUtil.data(ygglAttaHtxxbs, "获取员工合同信息表成功");
 	}
 
@@ -1043,7 +1098,9 @@ public class YgglController {
 	public Result<Boolean> delhtxxb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
 		Integer orgCode = userBean.getOrgCode();
 		return ResultUtil.data(YgglAttaHtxxb.builder().build()
-				.delete(new QueryWrapper<YgglAttaHtxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工合同信息表成功");
+				.delete(new QueryWrapper<YgglAttaHtxxb>().lambda()
+						.eq(YgglAttaHtxxb::getOrgCode, orgCode)
+						.eq(YgglAttaHtxxb::getId, id)), "删除员工合同信息表成功");
 	}
 
 	/**
@@ -1057,8 +1114,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 46)
 	public Result<List<YgglAttaClfjb>> selectclfjb(@CurrentUser UserBean userBean) {
 		List<YgglAttaClfjb> ygglAttaClfjbs = YgglAttaClfjb.builder().build()
-				.selectList(new QueryWrapper<YgglAttaClfjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
-						userBean.getEmpNum()));
+				.selectList(new QueryWrapper<YgglAttaClfjb>().lambda()
+						.eq(YgglAttaClfjb::getOrgCode, userBean.getOrgCode())
+						.eq(YgglAttaClfjb::getEmpNum, userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaClfjbs, "获取员工材料附件表成功");
 	}
 
@@ -1068,7 +1126,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 47)
 	public Result<List<YgglAttaClfjb>> selectclfjb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
 		List<YgglAttaClfjb> ygglAttaClfjbs = YgglAttaClfjb.builder().build().selectList(
-				new QueryWrapper<YgglAttaClfjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
+				new QueryWrapper<YgglAttaClfjb>().lambda()
+				.eq(YgglAttaClfjb::getOrgCode, userBean.getOrgCode())
+				.eq(YgglAttaClfjb::getEmpNum, empNum));
 		return ResultUtil.data(ygglAttaClfjbs, "获取员工材料附件表成功");
 	}
 
@@ -1100,7 +1160,9 @@ public class YgglController {
 	public Result<Boolean> delclfjb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
 		Integer orgCode = userBean.getOrgCode();
 		return ResultUtil.data(YgglAttaClfjb.builder().build()
-				.delete(new QueryWrapper<YgglAttaClfjb>().eq("org_code", orgCode).eq("id", id)), "删除员工材料附件表成功");
+				.delete(new QueryWrapper<YgglAttaClfjb>().lambda()
+						.eq(YgglAttaClfjb::getOrgCode, orgCode)
+						.eq(YgglAttaClfjb::getId, id)), "删除员工材料附件表成功");
 	}
 
 	/**
@@ -1114,8 +1176,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 50)
 	public Result<List<YgglAttaCzjlb>> selectczjlb(@CurrentUser UserBean userBean) {
 		List<YgglAttaCzjlb> ygglAttaCzjlbs = YgglAttaCzjlb.builder().build()
-				.selectList(new QueryWrapper<YgglAttaCzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num",
-						userBean.getEmpNum()));
+				.selectList(new QueryWrapper<YgglAttaCzjlb>().lambda()
+						.eq(YgglAttaCzjlb::getOrgCode, userBean.getOrgCode())
+						.eq(YgglAttaCzjlb::getEmpNum, userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaCzjlbs, "获取成长记录表成功");
 	}
 
@@ -1125,7 +1188,9 @@ public class YgglController {
 	@ApiOperationSupport(order = 51)
 	public Result<List<YgglAttaCzjlb>> selectczjlb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
 		List<YgglAttaCzjlb> ygglAttaCzjlbs = YgglAttaCzjlb.builder().build().selectList(
-				new QueryWrapper<YgglAttaCzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
+				new QueryWrapper<YgglAttaCzjlb>().lambda()
+				.eq(YgglAttaCzjlb::getOrgCode, userBean.getOrgCode())
+				.eq(YgglAttaCzjlb::getEmpNum, empNum));
 		return ResultUtil.data(ygglAttaCzjlbs, "获取员工成长记录表成功");
 	}
 
@@ -1170,10 +1235,10 @@ public class YgglController {
 	@ApiOperation(value = "54.员工转正", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperationSupport(order = 54)
 	public Result<Void> ygzz(@CurrentUser UserBean userBean, @RequestBody YgzzDto ygzzDto) {
-		UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
-		updateWrapper.eq("emp_num", ygzzDto.getEmpNum());
-		YgglMainEmp.builder().jobStatus(2).zzTime(ygzzDto.getZzTime()).sjzzTime(new Date())
-				.zzRemark(ygzzDto.getZzRemark()).build().update(updateWrapper);
+		
+		YgglMainEmp.builder().jobStatus(jobStatus.ZHENSHI.getType()).zzTime(ygzzDto.getZzTime()).sjzzTime(new Date())
+				.zzRemark(ygzzDto.getZzRemark()).build().update(new UpdateWrapper<YgglMainEmp>().lambda()
+						.eq(YgglMainEmp::getEmpNum, ygzzDto.getEmpNum()));
 		return ResultUtil.success("转正成功！");
 	}
 
@@ -1190,22 +1255,20 @@ public class YgglController {
 
 		Integer empNum = lzygQueryDto.getEmpNum();
 
-		QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<YgglMainEmp>();
-		queryWrapper.eq("emp_num", empNum).eq("org_code", userBean.getOrgCode());
-		YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build().selectOne(queryWrapper);
+		YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda()
+				.eq(YgglMainEmp::getEmpNum, empNum)
+				.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
 		YgglMainLzb ygglMainLzb = YgglMainLzb.builder().empNum(lzygQueryDto.getEmpNum()).build();
 		// 移动员工表数据到离职表
 		BeanUtil.copyProperties(ygglMainEmp, ygglMainLzb,"before_leaving_sts");
 		ygglMainLzb.insert();
 
-		UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
-		updateWrapper.eq("emp_num", empNum);
-		UpdateWrapper<YgglMainLzb> updateWrapper1 = new UpdateWrapper<YgglMainLzb>();
-		updateWrapper1.eq("emp_num", empNum);
+
+		
 		YgglMainEmp.builder().empNum(lzygQueryDto.getEmpNum()).jobStatus(YgEnumInterface.jobStatus.LIZHIZHONG.getType()).beforeLeavingSts(ygglMainEmp.getJobStatus())
-				.build().update(updateWrapper);
+				.build().update(new UpdateWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, empNum));
 		YgglMainLzb.builder().jobStatus(YgEnumInterface.jobStatus.LIZHIZHONG.getType()).lzTime(lzygQueryDto.getLzTime())
-				.lzyy(lzygQueryDto.getLzyy()).lzbz(lzygQueryDto.getLzbz()).build().update(updateWrapper1);
+				.lzyy(lzygQueryDto.getLzyy()).lzbz(lzygQueryDto.getLzbz()).build().update(new UpdateWrapper<YgglMainLzb>().lambda().eq(YgglMainLzb::getEmpNum, empNum));
 
 		return ResultUtil.data(ygglMainLzb, "添加待离职员工成功");
 	}
@@ -1255,13 +1318,12 @@ public class YgglController {
 				.eq(YgglMainEmp::getEmpNum, lzygQueryDto.getEmpNum())
 				.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
 		
-		UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
-		updateWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
-		YgglMainEmp.builder().jobStatus(ygglMainEmp.getBeforeLeavingSts()).build().update(updateWrapper);
-		QueryWrapper<YgglMainLzb> queryWrapper = new QueryWrapper<YgglMainLzb>();
-		queryWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
+		
+		YgglMainEmp.builder().jobStatus(ygglMainEmp.getBeforeLeavingSts()).build().update(new UpdateWrapper<YgglMainEmp>().lambda()
+				.eq(YgglMainEmp::getEmpNum, lzygQueryDto.getEmpNum()));
 		// 删除离职表
-		YgglMainLzb.builder().id(lzygQueryDto.getEmpNum()).build().delete(queryWrapper);
+		YgglMainLzb.builder().id(lzygQueryDto.getEmpNum()).build().delete(new QueryWrapper<YgglMainLzb>().lambda()
+				.eq(YgglMainLzb::getEmpNum, lzygQueryDto.getEmpNum()));
 
 		return ResultUtil.success("放弃成功");
 	}
@@ -1272,9 +1334,9 @@ public class YgglController {
 	public Result<YgglMainLzb> tzlzyy(@CurrentUser UserBean userBean, @RequestBody YgglMainLzb ygglMainLzb) {
 
 		if (ygglMainLzb.getEmpNum() != null) {
-			UpdateWrapper<YgglMainLzb> updateWrapper = new UpdateWrapper<YgglMainLzb>();
-			updateWrapper.eq("org_code", userBean.getOrgCode()).eq("emp_num", ygglMainLzb.getEmpNum());
-			ygglMainLzb.update(updateWrapper);
+			ygglMainLzb.update(new UpdateWrapper<YgglMainLzb>().lambda()
+					.eq(YgglMainLzb::getOrgCode, userBean.getOrgCode())
+					.eq(YgglMainLzb::getEmpNum, ygglMainLzb.getEmpNum()));
 			return ResultUtil.data(ygglMainLzb, "修改成功");
 		}
 		return ResultUtil.error("请确认该员工是否存在！");
@@ -1498,8 +1560,9 @@ public class YgglController {
 	@ApiOperation(value = "65.获取员工社保公积金", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 65)
 	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()));
+		List<YgglAttaSbgjj> ygglAttaSbgjj = YgglAttaSbgjj.builder().build().selectList(new QueryWrapper<YgglAttaSbgjj>().lambda()
+				.eq(YgglAttaSbgjj::getOrgCode, userBean.getOrgCode())
+				.eq(YgglAttaSbgjj::getEmpNum, userBean.getEmpNum()));
 		return ResultUtil.data(ygglAttaSbgjj, "获取员工社保公积金成功");
 	}
 
@@ -1515,7 +1578,7 @@ public class YgglController {
 	public Result<YgglAttaSbgjj> selectygsbgjj(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
 
 		YgglAttaSbgjj ygglAttaSbgjj = YgglAttaSbgjj.builder().build()
-				.selectOne(new QueryWrapper<YgglAttaSbgjj>().eq("emp_num", empNum));
+				.selectOne(new QueryWrapper<YgglAttaSbgjj>().lambda().eq(YgglAttaSbgjj::getEmpNum, empNum));
 
 		return ResultUtil.data(ygglAttaSbgjj, "获取员工社保公积金成功");
 	}
@@ -1535,9 +1598,9 @@ public class YgglController {
 			return ResultUtil.error();
 		}
 		YgglAttaSbgjj AttaSbgjj = YgglAttaSbgjj.builder().build()
-				.selectOne(new QueryWrapper<YgglAttaSbgjj>().eq("emp_num", empNum));
+				.selectOne(new QueryWrapper<YgglAttaSbgjj>().lambda().eq(YgglAttaSbgjj::getEmpNum, empNum));
 		if (AttaSbgjj != null) {
-			ygglAttaSbgjj.update(new UpdateWrapper<YgglAttaSbgjj>().eq("emp_num", empNum));
+			ygglAttaSbgjj.update(new UpdateWrapper<YgglAttaSbgjj>().lambda().eq(YgglAttaSbgjj::getEmpNum, empNum));
 		} else {
 			ygglAttaSbgjj.insert();
 		}
@@ -1557,7 +1620,9 @@ public class YgglController {
 	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)), "删除员工社保公积金成功");
+				.delete(new QueryWrapper<YgglAttaSbgjj>().lambda()
+						.eq(YgglAttaSbgjj::getOrgCode, orgCode)
+						.eq(YgglAttaSbgjj::getId, id)), "删除员工社保公积金成功");
 	}
 
 	@GetMapping(value = "/sysRegion")
@@ -1659,7 +1724,7 @@ public class YgglController {
 		List<LoginerChargeDto> loginerChargeDtos = new ArrayList<LoginerChargeDto>();
 		for (YgglMainEmp m : ygglMainEmps) {
 			if (m.getHeadUrl() == null) {
-				m.setHeadUrl("");
+				m.setHeadUrl(CommonEnum.NULL_STR.getDesc());
 			}
 			loginerChargeDtos.add(new LoginerChargeDto(m.getEmpNum(), m.getName(), m.getHeadUrl()));
 		}
@@ -1711,7 +1776,7 @@ public class YgglController {
 						.select(YgglMainEmp::getEmpNum, YgglMainEmp::getName, YgglMainEmp::getHeadUrl));
 		for (YgglMainEmp yg : yglList) {
 			if (StringUtil.isEmpty(yg.getHeadUrl())) {
-				yg.setHeadUrl("");
+				yg.setHeadUrl(CommonEnum.NULL_STR.getDesc());
 			}
 		}
 		return ResultUtil.data(yglList, "获取用户头像组成功");

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

@@ -29,6 +29,8 @@ import cn.hutool.core.lang.tree.TreeNode;
 import cn.hutool.core.lang.tree.TreeNodeConfig;
 import cn.hutool.core.lang.tree.TreeUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.timer.api.aspect.lang.annotation.Log;
+import cn.timer.api.aspect.lang.enums.BusinessType;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.zzgl.ZzglAuth;
 import cn.timer.api.bean.zzgl.ZzglBmgwM;
@@ -258,6 +260,7 @@ public class ZzglController {
 	 */
 	@DeleteMapping(value = "/dept")
 	@ApiOperation(value = "删除部门岗位", httpMethod = "DELETE", notes = "接口发布说明")
+	@Log(title = "删除岗位", businessType = BusinessType.DELETE)
 	public Result<Integer> deldepts(@CurrentUser UserBean userBean, @RequestBody List<Integer> ids) {
 		YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build();
 		UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();

src/main/java/cn/timer/api/dao/qyzx/QyzxOperLogMapper.java

@@ -11,7 +11,7 @@ import cn.timer.api.dto.qyzx.QyzxOperLogQuaryDto;
 /**
  * 操作日志 数据层
  * 
- * @author ruoyi
+ * @author Tang
  */
 public interface QyzxOperLogMapper extends BaseMapper<QyzxOperLog> {
 //	/**

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

@@ -11,6 +11,9 @@ import javax.validation.constraints.NotNull;
 
 import cn.hutool.json.JSONObject;
 import cn.timer.api.bean.spmk.SpmkInitiatorConfig;
+import cn.timer.api.config.exception.ValidationMsg;
+import cn.timer.api.config.validation.Insert;
+import cn.timer.api.config.validation.Update;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -29,15 +32,15 @@ public class SpmkCustomApprovalDto {
 	@ApiModelProperty(value = "企业组织代码 企业组织代码", example = "101")
 	private Integer orgCode;
 
-	@NotNull(message = "approvalGId为空")
+	@NotNull(message = "审批组id不能为空")
 	@ApiModelProperty(value = "审批组id 当前用户ID", example = "101")
 	private Integer approvalGId;
 
-	@NotBlank(message = "iconUrl为空")
+	@NotBlank(message = "审批图标不能为空")
 	@ApiModelProperty(value = "审批图标地址 ", example = "审批图标地址")
 	private String iconUrl;
 
-	@NotBlank(message = "name为空")
+	@NotBlank(message = "审批名称不能为空")
 	@ApiModelProperty(value = "审批名称 ", example = "审批名称")
 	private String name;
 

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

@@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory;
 /**
  * 通用http发送方法
  * 
- * @author ruoyi
+ * @author Tang
  */
 public class HttpUtils
 {

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

@@ -3,7 +3,7 @@ package cn.timer.api.utils;
 /**
  * 处理并记录日志文件
  * 
- * @author ruoyi
+ * @author Tang
  */
 public class LogUtils
 {

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

@@ -54,6 +54,7 @@ public class ResultUtil<T> {
 	public Result<T> setData(T t) {
 		this.result.setData(t);
 		this.result.setCode(STATUS_CODE_SUCCESS);
+		this.result.setMessage(MESSAGE_SUCCESS);
 		return this.result;
 	}
 

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

@@ -14,7 +14,7 @@ import cn.hutool.core.util.StrUtil;
 /**
  * 客户端工具类
  * 
- * @author ruoyi
+ * @author Tang
  */
 public class ServletUtils
 {

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

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
 /**
  * spring工具类 方便在非spring管理环境中获取bean
  * 
- * @author ruoyi
+ * @author Tang
  */
 @Component
 public final class SpringUtils implements BeanFactoryPostProcessor