Merge branch 'tzq' into 'develop'

审批

See merge request 8timerv2/8timerapiv200!224

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

@@ -29,7 +29,7 @@ public class EvectionBusiness extends SpmkAssoBusiness {
 	public void handleApprove(JSONObject jsonObj) throws ParseException {
 		// TODO Auto-generated method stub
 		// 发起人企业id
-		String orgCode = ObjectUtil.isNull(jsonObj.get("orgCode",FromData.class)) ? null : jsonObj.get("orgCode",FromData.class).getValue();
+		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode")) ? null : Convert.toInt(jsonObj.get("orgCode"));
 		// 发起人id
 		String id = ObjectUtil.isNull(jsonObj.get("id",FromData.class)) ? null : jsonObj.get("id",FromData.class).getValue();
 		// 发起人名称

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

@@ -27,7 +27,7 @@ public class GoOutBusiness extends SpmkAssoBusiness {
 	public void handleApprove(JSONObject jsonObj) throws Exception {
 		// TODO Auto-generated method stub
 		// 发起人企业id
-		String orgCode = jsonObj.get("orgCode",FromData.class).getValue();
+		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode")) ? null : Convert.toInt(jsonObj.get("orgCode"));
 		// 发起人id
 		String id = jsonObj.get("id",FromData.class).getValue();
 		// 发起人名称

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

@@ -31,7 +31,7 @@ public class LeaveBusiness extends SpmkAssoBusiness {
 	public void handleApprove(JSONObject jsonObj) throws ParseException {
 		// TODO Auto-generated method stub
 		// 发起人企业id
-		String orgCode = ObjectUtil.isNull(jsonObj.get("orgCode",FromData.class)) ? null : jsonObj.get("orgCode",FromData.class).getValue();
+		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode")) ? null : Convert.toInt(jsonObj.get("orgCode"));
 		// 发起人id
 		String id = ObjectUtil.isNull(jsonObj.get("id",FromData.class)) ? null : jsonObj.get("id",FromData.class).getValue();
 		// 发起人名称

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

@@ -2,6 +2,7 @@ package cn.timer.api.utils.router.business;
 
 import org.springframework.stereotype.Service;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
 import cn.timer.api.dto.spmk.FromData;
@@ -20,7 +21,7 @@ public class RecruitBusiness extends SpmkAssoBusiness {
 	public void handleApprove(JSONObject jsonObj) {
 		// TODO Auto-generated method stub
 		// 发起人企业id
-		String orgCode = ObjectUtil.isNull(jsonObj.get("orgCode",FromData.class)) ? null : jsonObj.get("orgCode",FromData.class).getValue();
+		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode")) ? null : Convert.toInt(jsonObj.get("orgCode"));
 		// 发起人id
 		String id = ObjectUtil.isNull(jsonObj.get("id",FromData.class)) ? null : jsonObj.get("id",FromData.class).getValue();
 		// 发起人名称

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

@@ -29,7 +29,7 @@ public class ReissueACardBusiness extends SpmkAssoBusiness {
 	public void handleApprove(JSONObject jsonObj) throws ParseException {
 		// TODO Auto-generated method stub
 		// 发起人企业id
-		String orgCode = ObjectUtil.isNull(jsonObj.get("orgCode",FromData.class)) ? null : jsonObj.get("orgCode",FromData.class).getValue();
+		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode")) ? null : Convert.toInt(jsonObj.get("orgCode"));
 		// 发起人id
 		String id = ObjectUtil.isNull(jsonObj.get("id",FromData.class)) ? null : jsonObj.get("id",FromData.class).getValue();
 		// 发起人名称

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

@@ -5,6 +5,7 @@ import java.text.ParseException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
@@ -29,7 +30,7 @@ public class ResignationBusiness extends SpmkAssoBusiness {
 	public void handleApprove(JSONObject jsonObj) throws Exception {
 		// TODO Auto-generated method stub
 		// 发起人企业id
-		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode",FromData.class)) ? null : Integer.parseInt(jsonObj.get("orgCode",FromData.class).getValue());
+		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("",FromData.class).getValue());
 		// 发起人名称

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

@@ -3,6 +3,7 @@ package cn.timer.api.utils.router.business;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
 import cn.timer.api.controller.zzgl.service.ZzglBmgwMService;
@@ -26,7 +27,7 @@ public class TransferPositionBusiness extends SpmkAssoBusiness {
 	public void handleApprove(JSONObject jsonObj) {
 		// TODO Auto-generated method stub
 		// 发起人企业id
-		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode",FromData.class)) ? null : Integer.parseInt(jsonObj.get("orgCode",FromData.class).getValue());
+		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());
 		// 发起人名称

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

@@ -28,7 +28,7 @@ public class WorkOvertimeBusiness extends SpmkAssoBusiness {
 	public void handleApprove(JSONObject jsonObj) throws ParseException {
 		// TODO Auto-generated method stub
 		// 发起人企业id
-		String orgCode = ObjectUtil.isNull(jsonObj.get("orgCode",FromData.class)) ? null : jsonObj.get("orgCode",FromData.class).getValue();
+		Integer orgCode = ObjectUtil.isNull(jsonObj.get("orgCode")) ? null : Convert.toInt(jsonObj.get("orgCode"));
 		// 发起人id
 		String id = ObjectUtil.isNull(jsonObj.get("id",FromData.class)) ? null : jsonObj.get("id",FromData.class).getValue();
 		// 发起人名称