Merge branch 'tzq' into 'develop'

审批bug修复

See merge request 8timerv2/8timerapiv200!220

src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java

@@ -139,7 +139,7 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
 	@ApiModelProperty(value="转正备注 ",example="转正备注")
 	@ApiModelProperty(value="转正备注 ",example="转正备注")
     private String zzRemark;
     private String zzRemark;
     
     
-	@ApiModelProperty(value="工作性质 0全职、1实习生、2兼职、3劳务派遣、4劳务、5派遣、6外包、7退休返聘",example="101")
+	@ApiModelProperty(value="工作性质 0全职、1实习、2兼职、3劳务派遣、4劳务、5派遣、6外包、7退休返聘",example="101")
     private Integer jobType;
     private Integer jobType;
     
     
 	@ApiModelProperty(value="员工状态 0试用、1正式、2离职中、3已离职",example="101")
 	@ApiModelProperty(value="员工状态 0试用、1正式、2离职中、3已离职",example="101")

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

@@ -1256,6 +1256,11 @@ public class YgglController {
 		YgglMainEmp ygglMainEmp = ygglMainEmpMapper.selectOne(new QueryWrapper<YgglMainEmp>().lambda()
 		YgglMainEmp ygglMainEmp = ygglMainEmpMapper.selectOne(new QueryWrapper<YgglMainEmp>().lambda()
 				.eq(YgglMainEmp::getEmpNum, empNum)
 				.eq(YgglMainEmp::getEmpNum, empNum)
 				.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
 				.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
+		
+		if (ygglMainEmp.getJobStatus() == jobStatus.LIZHIZHONG.getType()) {
+			return ResultUtil.success("你已在离职中");
+		}
+		
 		YgglMainLzb ygglMainLzb = YgglMainLzb.builder().empNum(lzygQueryDto.getEmpNum()).build();
 		YgglMainLzb ygglMainLzb = YgglMainLzb.builder().empNum(lzygQueryDto.getEmpNum()).build();
 		// 移动员工表数据到离职表
 		// 移动员工表数据到离职表
 		BeanUtil.copyProperties(ygglMainEmp, ygglMainLzb, "before_leaving_sts");
 		BeanUtil.copyProperties(ygglMainEmp, ygglMainLzb, "before_leaving_sts");

src/main/java/cn/timer/api/utils/router/business/EvectionBusiness.java

@@ -3,6 +3,7 @@ package cn.timer.api.utils.router.business;
 import java.text.ParseException;
 import java.text.ParseException;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -18,7 +19,7 @@ import lombok.Builder;
  * @author Tang
  * @author Tang
  *
  *
  */
  */
-@Builder
+@Service
 public class EvectionBusiness extends SpmkAssoBusiness {
 public class EvectionBusiness extends SpmkAssoBusiness {
 
 
 	@Autowired
 	@Autowired

src/main/java/cn/timer/api/utils/router/business/GoOutBusiness.java

 package cn.timer.api.utils.router.business;
 package cn.timer.api.utils.router.business;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -16,7 +17,7 @@ import lombok.Builder;
  * @author Tang
  * @author Tang
  *
  *
  */
  */
-@Builder
+@Service
 public class GoOutBusiness extends SpmkAssoBusiness {
 public class GoOutBusiness extends SpmkAssoBusiness {
 
 
 	@Autowired
 	@Autowired

src/main/java/cn/timer/api/utils/router/business/LeaveBusiness.java

@@ -3,6 +3,7 @@ package cn.timer.api.utils.router.business;
 import java.text.ParseException;
 import java.text.ParseException;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -20,7 +21,7 @@ import lombok.Builder;
  * @author Tang
  * @author Tang
  *
  *
  */
  */
-@Builder
+@Service
 public class LeaveBusiness extends SpmkAssoBusiness {
 public class LeaveBusiness extends SpmkAssoBusiness {
 
 
 	@Autowired
 	@Autowired

src/main/java/cn/timer/api/utils/router/business/RecruitBusiness.java

 package cn.timer.api.utils.router.business;
 package cn.timer.api.utils.router.business;
 
 
+import org.springframework.stereotype.Service;
+
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONObject;
 import cn.timer.api.dto.spmk.FromData;
 import cn.timer.api.dto.spmk.FromData;
@@ -11,7 +13,7 @@ import lombok.Builder;
  * @author Tang
  * @author Tang
  *
  *
  */
  */
-@Builder
+@Service
 public class RecruitBusiness extends SpmkAssoBusiness {
 public class RecruitBusiness extends SpmkAssoBusiness {
 
 
 	@Override
 	@Override

src/main/java/cn/timer/api/utils/router/business/RegularizationBusiness.java

@@ -3,6 +3,7 @@ package cn.timer.api.utils.router.business;
 import java.util.Date;
 import java.util.Date;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 
 
@@ -20,7 +21,7 @@ import lombok.Builder;
  * @author Tang
  * @author Tang
  *
  *
  */
  */
-@Builder
+@Service
 public class RegularizationBusiness extends SpmkAssoBusiness {
 public class RegularizationBusiness extends SpmkAssoBusiness {
 
 
 	@Autowired
 	@Autowired
@@ -63,13 +64,13 @@ public class RegularizationBusiness extends SpmkAssoBusiness {
 				.build();
 				.build();
 		
 		
 		// 调 员工管理 业务
 		// 调 员工管理 业务
-		YgglMainEmp.builder()
-		.jobStatus(2)
-		.zzTime(ygzzDto.getZzTime())
-		.sjzzTime(new Date())
-		.zzRemark(ygzzDto.getZzRemark())
-		.build().update(new UpdateWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, ygzzDto.getEmpNum()));
-//		ygglService.applicationRegularization(ygzzDto);
+//		YgglMainEmp.builder()
+//		.jobStatus(2)
+//		.zzTime(ygzzDto.getZzTime())
+//		.sjzzTime(new Date())
+//		.zzRemark(ygzzDto.getZzRemark())
+//		.build().update(new UpdateWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, ygzzDto.getEmpNum()));
+		ygglService.applicationRegularization(ygzzDto);
 	}
 	}
 
 
 }
 }

src/main/java/cn/timer/api/utils/router/business/ReissueACardBusiness.java

@@ -3,6 +3,7 @@ package cn.timer.api.utils.router.business;
 import java.text.ParseException;
 import java.text.ParseException;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -18,7 +19,7 @@ import lombok.Builder;
  * @author Tang
  * @author Tang
  *
  *
  */
  */
-@Builder
+@Service
 public class ReissueACardBusiness extends SpmkAssoBusiness {
 public class ReissueACardBusiness extends SpmkAssoBusiness {
 
 
 	@Autowired
 	@Autowired

src/main/java/cn/timer/api/utils/router/business/ResignationBusiness.java

@@ -2,7 +2,10 @@ package cn.timer.api.utils.router.business;
 
 
 import java.text.ParseException;
 import java.text.ParseException;
 
 
-import org.springframework.beans.factory.annotation.Autowired;import cn.hutool.core.date.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONObject;
 import cn.timer.api.controller.yggl.service.YgglService;
 import cn.timer.api.controller.yggl.service.YgglService;
@@ -16,7 +19,7 @@ import lombok.Builder;
  * @author Tang
  * @author Tang
  *
  *
  */
  */
-@Builder
+@Service
 public class ResignationBusiness extends SpmkAssoBusiness {
 public class ResignationBusiness extends SpmkAssoBusiness {
 
 
 	@Autowired
 	@Autowired

src/main/java/cn/timer/api/utils/router/business/SpmkAssoBusinessFactory.java

 package cn.timer.api.utils.router.business;
 package cn.timer.api.utils.router.business;
 
 
+import org.springframework.beans.factory.annotation.Autowired;
+
 import cn.timer.api.utils.router.enums.ApproveEnum;
 import cn.timer.api.utils.router.enums.ApproveEnum;
 
 
 /**
 /**
@@ -9,6 +11,25 @@ import cn.timer.api.utils.router.enums.ApproveEnum;
  */
  */
 public class SpmkAssoBusinessFactory {
 public class SpmkAssoBusinessFactory {
 	
 	
+	@Autowired
+	private RegularizationBusiness regularizationBusiness;
+	@Autowired
+	private TransferPositionBusiness transferPositionBusiness;
+	@Autowired
+	private ResignationBusiness resignationBusiness;
+	@Autowired
+	private RecruitBusiness recruitBusiness;
+	@Autowired
+	private WorkOvertimeBusiness workOvertimeBusiness;
+	@Autowired
+	private LeaveBusiness leaveBusiness;
+	@Autowired
+	private EvectionBusiness evectionBusiness;
+	@Autowired
+	private GoOutBusiness goOutBusiness;
+	@Autowired
+	private ReissueACardBusiness reissueACardBusiness;
+	
 	static SpmkAssoBusinessFactory factory;
 	static SpmkAssoBusinessFactory factory;
 	
 	
 	public static SpmkAssoBusinessFactory getFactory() {
 	public static SpmkAssoBusinessFactory getFactory() {
@@ -23,31 +44,31 @@ public class SpmkAssoBusinessFactory {
 		case DEFAULT:
 		case DEFAULT:
 			break;
 			break;
 		case REGULARIZATION:
 		case REGULARIZATION:
-			sat = RegularizationBusiness.builder().build();
+			sat = regularizationBusiness;
 			break;
 			break;
 		case RESIGNATION:
 		case RESIGNATION:
-			sat = ResignationBusiness.builder().build();
+			sat = resignationBusiness;
 			break;
 			break;
 		case TRANSFER_POSITION:
 		case TRANSFER_POSITION:
-			sat = TransferPositionBusiness.builder().build();
+			sat = transferPositionBusiness;
 			break;
 			break;
 		case RECRUIT:
 		case RECRUIT:
-			sat = RecruitBusiness.builder().build();
+			sat = recruitBusiness;
 			break;
 			break;
 		case WORK_OVERTIME:
 		case WORK_OVERTIME:
-			sat = WorkOvertimeBusiness.builder().build();
+			sat = workOvertimeBusiness;
 			break;
 			break;
 		case LEAVE:
 		case LEAVE:
-			sat = LeaveBusiness.builder().build();
+			sat = leaveBusiness;
 			break;
 			break;
 		case EVECTION:
 		case EVECTION:
-			sat = EvectionBusiness.builder().build();
+			sat = evectionBusiness;
 			break;
 			break;
 		case GO_OUT:
 		case GO_OUT:
-			sat = GoOutBusiness.builder().build();
+			sat = goOutBusiness;
 			break;
 			break;
 		case REISSUE_A_CARD:
 		case REISSUE_A_CARD:
-			sat = ReissueACardBusiness.builder().build();
+			sat = reissueACardBusiness;
 			break;
 			break;
 		default:
 		default:
 			break;
 			break;

src/main/java/cn/timer/api/utils/router/business/TransferPositionBusiness.java

 package cn.timer.api.utils.router.business;
 package cn.timer.api.utils.router.business;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONObject;
@@ -14,7 +15,8 @@ import lombok.Builder;
  * @author Tang
  * @author Tang
  *
  *
  */
  */
-@Builder
+
+@Service
 public class TransferPositionBusiness extends SpmkAssoBusiness {
 public class TransferPositionBusiness extends SpmkAssoBusiness {
 
 
 	@Autowired
 	@Autowired

src/main/java/cn/timer/api/utils/router/business/WorkOvertimeBusiness.java

@@ -3,6 +3,7 @@ package cn.timer.api.utils.router.business;
 import java.text.ParseException;
 import java.text.ParseException;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -18,7 +19,7 @@ import lombok.Builder;
  * @author Tang
  * @author Tang
  *
  *
  */
  */
-@Builder
+@Service
 public class WorkOvertimeBusiness extends SpmkAssoBusiness {
 public class WorkOvertimeBusiness extends SpmkAssoBusiness {
 
 
 	@Autowired
 	@Autowired