Merge branch 'tzq' into 'develop'

审批

See merge request 8timerv2/8timerapiv200!241

src/main/java/cn/timer/api/controller/jxgl/JxglController.java

 package cn.timer.api.controller.jxgl;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -23,10 +22,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.sun.jndi.url.iiopname.iiopnameURLContextFactory;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -115,6 +112,15 @@ import io.swagger.annotations.ApiOperation;
 public class JxglController {
 
 	@Autowired
+	private YgglService ygglService;
+	
+	@Autowired
+	private JxglService jxglService;
+	
+	@Autowired
+	private ZzglBmgwMService zzglBmgwMService;
+	
+	@Autowired
 	private ZzglBmgwMMapper zzglBmgwMMapper;
 
 	@Autowired
@@ -139,12 +145,6 @@ public class JxglController {
 	private JxglAppraisalIndicatorsAssessmentMapper jxglAppraisalIndicatorsAssessmentMapper;
 
 	@Autowired
-	private ZzglBmgwMService zzglBmgwMService;
-
-	@Autowired
-	private YgglService ygglService;
-
-	@Autowired
 	private JxglPerformanceAppraisalMapper jxglPerformanceAppraisalMapper;
 
 	@Autowired
@@ -212,9 +212,6 @@ public class JxglController {
 
 	}
 	
-	@Autowired
-	private JxglService jxglService;
-	
 	/**
 	 * 查询-基础设置
 	 */

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

@@ -33,7 +33,7 @@ public class EvectionBusiness extends SpmkAssoBusiness {
 		// 发起人企业id
 		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode")) ? null : Convert.toInt(jsonObj.get("orgCode"));
 		// 发起人id
-		Integer id = ObjectUtil.isNull(jsonObj.get("id",FromData.class)) ? null : Integer.parseInt(jsonObj.get("id",FromData.class).getValue());
+		Integer id = jsonObj.getInt("id");
 		
 		// 审批汇总id
 		String approveId = ObjectUtil.isNull(jsonObj.get("approveId",FromData.class)) ? null : jsonObj.get("approveId",FromData.class).getValue();

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

@@ -29,7 +29,7 @@ public class GoOutBusiness extends SpmkAssoBusiness {
 		// 发起人企业id
 		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode")) ? null : Convert.toInt(jsonObj.get("orgCode"));
 		// 发起人id
-		Integer id = ObjectUtil.isNull(jsonObj.get("id",FromData.class)) ? null : Integer.parseInt(jsonObj.get("id",FromData.class).getValue());
+		Integer id = jsonObj.getInt("id");
 		
 		// 审批汇总id
 		String approveId = ObjectUtil.isNull(jsonObj.get("approveId",FromData.class)) ? null : jsonObj.get("approveId",FromData.class).getValue();

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

@@ -33,7 +33,7 @@ public class LeaveBusiness extends SpmkAssoBusiness {
 		// 发起人企业id
 		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode")) ? null : Convert.toInt(jsonObj.get("orgCode"));
 		// 发起人id
-		Integer id = ObjectUtil.isNull(jsonObj.get("id",FromData.class)) ? null : Integer.parseInt(jsonObj.get("id",FromData.class).getValue());
+		Integer id = jsonObj.getInt("id");
 		
 		// 审批汇总id
 		String approveId = ObjectUtil.isNull(jsonObj.get("approveId",FromData.class)) ? null : jsonObj.get("approveId",FromData.class).getValue();

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

@@ -23,7 +23,7 @@ public class RecruitBusiness extends SpmkAssoBusiness {
 		// 发起人企业id
 		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode")) ? null : Convert.toInt(jsonObj.get("orgCode"));
 		// 发起人id
-		Integer id = ObjectUtil.isNull(jsonObj.get("id",FromData.class)) ? null : Integer.parseInt(jsonObj.get("id",FromData.class).getValue());
+		Integer id = jsonObj.getInt("id");
 		
 		// 招聘部门
 		String RecruitmentDept = ObjectUtil.isNull(jsonObj.get("__RecruitmentDept",FromData.class)) ? null : jsonObj.get("__RecruitmentDept",FromData.class).getValue();

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

@@ -47,7 +47,7 @@ public class RegularizationBusiness extends SpmkAssoBusiness {
 		
 		
 		// 发起人id
-		Integer id = ObjectUtil.isNull(jsonObj.get("id",FromData.class)) ? null : Integer.parseInt(jsonObj.get("id",FromData.class).getValue());
+		Integer id = jsonObj.getInt("id");
 		// 企业id
 		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode")) ? null : Convert.toInt(jsonObj.get("orgCode"));
 		// 计划转正时间

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

@@ -31,7 +31,7 @@ public class ReissueACardBusiness extends SpmkAssoBusiness {
 		// 发起人企业id
 		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode")) ? null : Convert.toInt(jsonObj.get("orgCode"));
 		// 发起人id
-		Integer id = ObjectUtil.isNull(jsonObj.get("id",FromData.class)) ? null : Integer.parseInt(jsonObj.get("id",FromData.class).getValue());
+		Integer id = jsonObj.getInt("id");
 		
 		// 审批汇总id
 		String approveId = ObjectUtil.isNull(jsonObj.get("approveId",FromData.class)) ? null : jsonObj.get("approveId",FromData.class).getValue();

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

@@ -32,7 +32,7 @@ public class ResignationBusiness extends SpmkAssoBusiness {
 		// 发起人企业id
 		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode")) ? null : Convert.toInt(jsonObj.get("orgCode"));
 		// 发起人id
-		Integer id = ObjectUtil.isNull(jsonObj.get("id",FromData.class)) ? null : Integer.parseInt(jsonObj.get("id",FromData.class).getValue());
+		Integer id = jsonObj.getInt("id");
 		
 		// 申请人
 		String applicant = ObjectUtil.isNull(jsonObj.get("__applicant",FromData.class)) ? null : jsonObj.get("__applicant",FromData.class).getValue();

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

@@ -30,7 +30,7 @@ public class TransferPositionBusiness extends SpmkAssoBusiness {
 		// 发起人企业id
 		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode")) ? null : Convert.toInt(jsonObj.get("orgCode"));
 		// 发起人id
-		Integer id = ObjectUtil.isNull(jsonObj.get("id",FromData.class)) ? null : Integer.parseInt(jsonObj.get("id",FromData.class).getValue());
+		Integer id = jsonObj.getInt("id");
 		
 		// 申请人
 		String applicant = ObjectUtil.isNull(jsonObj.get("__applicant",FromData.class)) ? null : jsonObj.get("__applicant",FromData.class).getValue();

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

@@ -30,7 +30,7 @@ public class WorkOvertimeBusiness extends SpmkAssoBusiness {
 		// 发起人企业id
 		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode")) ? null : Convert.toInt(jsonObj.get("orgCode"));
 		// 发起人id
-		Integer id = ObjectUtil.isNull(jsonObj.get("id",FromData.class)) ? null : Integer.parseInt(jsonObj.get("id",FromData.class).getValue());
+		Integer id = jsonObj.getInt("id");
 		
 		// 审批汇总id
 		String approveId = ObjectUtil.isNull(jsonObj.get("approveId",FromData.class)) ? null : jsonObj.get("approveId",FromData.class).getValue();