diff --git a/evo-admin/pom.xml b/evo-admin/pom.xml
index 3cc7edd..ae54177 100644
--- a/evo-admin/pom.xml
+++ b/evo-admin/pom.xml
@@ -236,7 +236,6 @@
system
${project.basedir}/src/main/resources/lib/k3cloud-webapi-sdk-java11-v8.2.0.jar
-
com.google.code.gson
gson
diff --git a/evo-admin/src/main/java/com/evo/common/controller/TestController.java b/evo-admin/src/main/java/com/evo/common/controller/TestController.java
index b96c18d..ea5bfda 100644
--- a/evo-admin/src/main/java/com/evo/common/controller/TestController.java
+++ b/evo-admin/src/main/java/com/evo/common/controller/TestController.java
@@ -11,7 +11,9 @@ import com.evo.common.config.Global;
import com.evo.common.constant.Constants;
import com.evo.common.core.domain.AjaxResult;
import com.evo.common.utils.Collections;
+import com.evo.common.utils.http.HttpUtils;
import com.evo.ding.DingUtils;
+import com.evo.kingdeeUtils.kenum.KingdeeParamsEnum;
import com.evo.personnelMatters.mapper.RzOverTimeDetailMapper;
import com.evo.personnelMatters.mapper.RzOverTimeMapper;
import com.evo.restaurant.service.IRzRestaurantStatisticsService;
@@ -114,6 +116,16 @@ public class TestController {
+ /**
+ * 清洗加班
+ */
+ @GetMapping("/testAdapterSend")
+ public AjaxResult testSend() throws ParseException {
+ String data = "{\"FormId\":\"BD_Empinfo\",\"FieldKeys\":\"FID\",\"FilterString\":[{\"Left\":\"\",\"FieldName\":\"FStaffNumber\",\"Compare\":\"17\",\"Value\":\"00046\",\"Right\":\"\",\"Logic\":0}],\"OrderString\":\"\",\"TopRowCount\":0,\"StartRow\":0,\"Limit\":2000,\"SubSystemId\":\"\"}";
+ return AjaxResult.success(HttpUtils.sendPost("http://localhost:8089/distribution/kingdee/send", JSONObject.toJSONString(Collections.asMap("fromId","BD_Empinfo", "month","executeBillQuery", "data",data))));
+ }
+
+
/**
* 清洗加班
*/
diff --git a/evo-admin/src/main/java/com/evo/common/utils/http/HttpUtils.java b/evo-admin/src/main/java/com/evo/common/utils/http/HttpUtils.java
index 93935e1..6d6eba0 100644
--- a/evo-admin/src/main/java/com/evo/common/utils/http/HttpUtils.java
+++ b/evo-admin/src/main/java/com/evo/common/utils/http/HttpUtils.java
@@ -138,7 +138,9 @@ public class HttpUtils
conn.setRequestProperty("connection", "Keep-Alive");
conn.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)");
conn.setRequestProperty("Accept-Charset", "UTF-8");
- conn.setRequestProperty("contentType", "UTF-8");
+ //conn.setRequestProperty("contentType", "UTF-8");
+ conn.setRequestProperty("Content-Type", "application/json;charset=utf-8");
+
conn.setDoOutput(true);
conn.setDoInput(true);
out = new PrintWriter(conn.getOutputStream());
diff --git a/evo-admin/src/main/java/com/evo/ding/processor/callback/DingCallBackExchangeProcessor.java b/evo-admin/src/main/java/com/evo/ding/processor/callback/DingCallBackExchangeProcessor.java
index 54c85af..ca7ab11 100644
--- a/evo-admin/src/main/java/com/evo/ding/processor/callback/DingCallBackExchangeProcessor.java
+++ b/evo-admin/src/main/java/com/evo/ding/processor/callback/DingCallBackExchangeProcessor.java
@@ -16,7 +16,6 @@ public interface DingCallBackExchangeProcessor {
static final String EVENT_TYPE_USER_ADD_ORG = "user_add_org";
//离职
static final String EVENT_TYPE_USER_LEAVE_ORG = "user_leave_org";
-
//打卡
static final String EVENT_TYPE_CHECK_RECORD = "attendance_check_record";
//审批实例订阅-> 补卡
diff --git a/evo-admin/src/main/java/com/evo/ding/processor/callback/impl/DingCallBackApproveStatusChangeExchangeProcessor.java b/evo-admin/src/main/java/com/evo/ding/processor/callback/impl/DingCallBackApproveStatusChangeExchangeProcessor.java
index 4af732b..3fe2417 100644
--- a/evo-admin/src/main/java/com/evo/ding/processor/callback/impl/DingCallBackApproveStatusChangeExchangeProcessor.java
+++ b/evo-admin/src/main/java/com/evo/ding/processor/callback/impl/DingCallBackApproveStatusChangeExchangeProcessor.java
@@ -39,6 +39,7 @@ public class DingCallBackApproveStatusChangeExchangeProcessor implements DingCal
//获取审批示例id
String processInstanceId = json.getString("processInstanceId");
GetProcessInstanceResponseBody.GetProcessInstanceResponseBodyResult result = DingUtils.getProcessInstanceInfo(processInstanceId);
+ System.out.println(JSONObject.toJSONString(result));
for (AttendanceApproveStatusChangeExchangeProcessor processor : approveStatusChangeExchangeProcessorList) {
if (processor.accept(json.getString("approveType"), result.getResult(), result.getStatus())) {
processor.exchange(processInstanceId, result);
diff --git a/evo-admin/src/main/java/com/evo/personnelMatters/domain/RzOverTime.java b/evo-admin/src/main/java/com/evo/personnelMatters/domain/RzOverTime.java
index 49c8eca..7a15037 100644
--- a/evo-admin/src/main/java/com/evo/personnelMatters/domain/RzOverTime.java
+++ b/evo-admin/src/main/java/com/evo/personnelMatters/domain/RzOverTime.java
@@ -29,6 +29,7 @@ public class RzOverTime extends BaseEntity
/** 部门ID */
private Long deptId;
@Excel(name = "部门")
+ @TableField(exist = false)
private String deptName;
private Long userId;
@@ -46,6 +47,7 @@ public class RzOverTime extends BaseEntity
@Excel(name = "加班总时长")
private BigDecimal overHours;
@Excel(name = "调休总时长")
+ @TableField(exist = false)
private BigDecimal taskHours;
/** 删除标识 */