xuj 4 år sedan
förälder
incheckning
aad45ca8f3

+ 25 - 7
src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunAskForLeaveDo.java

@@ -13,7 +13,9 @@ import org.springframework.beans.BeanUtils;
 import javax.persistence.Entity;
 import java.nio.file.LinkOption;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -29,6 +31,11 @@ import java.util.UUID;
 public class ChuanyunAskForLeaveDo extends BasicDO {
 
     /**
+     * 表名
+     */
+    public static final String SCHEMA_CODE ="c490c2213711480d8b2c3eee7099e39d";
+
+    /**
      * 标题
      */
     @JsonProperty("title")
@@ -37,8 +44,8 @@ public class ChuanyunAskForLeaveDo extends BasicDO {
     /**
      * 抄送人
      */
-    @JsonProperty("cc_userids")
-    private String ccUserids;
+    @JsonProperty("cs_userids")
+    private String csUserids;
 
     /**
      * 操作
@@ -83,7 +90,7 @@ public class ChuanyunAskForLeaveDo extends BasicDO {
     /**
      * 审批结果: 同意 和 不同意
      */
-    @JsonProperty("result")
+    @JsonProperty("approvalResult")
     private String approvalResult;
 
     /**
@@ -99,16 +106,16 @@ public class ChuanyunAskForLeaveDo extends BasicDO {
     private String originatorDeptName;
 
     /**
-     * 请假类型
+     * 请假事由
      */
     @JsonProperty("leave_type")
     private String leaveType;
 
     /**
-     * 请假事由
+     * 劳动合同所属公司
      */
-    @JsonProperty("leave_reason")
-    private String leaveReason;
+    @JsonProperty("contract_owner_ltd")
+    private String contractOwnerLtd;
 
     @JsonProperty("result")
     private String result;
@@ -121,6 +128,17 @@ public class ChuanyunAskForLeaveDo extends BasicDO {
     public static ChuanyunAskForLeaveDo fromAskForLeaveDTO(OapiProcessinstanceGetResponse.ProcessInstanceTopVo processInstanceTopVo){
         ChuanyunAskForLeaveDo chuanyunAskForLeaveDo =new ChuanyunAskForLeaveDo();
         BeanUtils.copyProperties(processInstanceTopVo, chuanyunAskForLeaveDo);
+        List<OapiProcessinstanceGetResponse.FormComponentValueVo> formComponetList = processInstanceTopVo.getFormComponentValues();
+        if(formComponetList != null && formComponetList.size() > 0) {
+            for(int i = 0; i < formComponetList.size(); i++) {
+                if(formComponetList.get(i).getName().equals("请假事由")) {
+                    chuanyunAskForLeaveDo.setLeaveType(formComponetList.get(i).getValue());
+                }
+                if(formComponetList.get(i).getName().equals("劳动合同所属公司")) {
+                    chuanyunAskForLeaveDo.setContractOwnerLtd(formComponetList.get(i).getValue());
+                }
+            }
+        }
         chuanyunAskForLeaveDo.setObjectId(UUID.randomUUID().toString());
         return chuanyunAskForLeaveDo;
     }

+ 43 - 0
src/main/java/com/galaxis/manatee/entity/chuanyun/dto/ChuanyunAskForLeaveDTO.java

@@ -0,0 +1,43 @@
+package com.galaxis.manatee.entity.chuanyun.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: xuj
+ * Date: 2020/7/26
+ */
+@Data
+public class ChuanyunAskForLeaveDTO {
+
+    /**
+     * title("xx的请假")
+     */
+    private String title;
+
+    /**
+     * 发起部门
+     */
+    @JsonProperty("originator_dept_name")
+    private String originatorDeptName;
+
+    /**
+     * 请假事由
+     */
+    @JsonProperty("leave_type")
+    private String leaveType;
+
+    /**
+     * 劳动合同所属公司
+     */
+    @JsonProperty("contract_owner_ltd")
+    private String contractOwnerLtd;
+
+    /**
+     * 同意、不同意
+     */
+    @JsonProperty("result")
+    private String result;
+
+}

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 50 - 5
src/main/java/com/galaxis/manatee/task/ChuanyunBasicDataScheduledTask.java