Selaa lähdekoodia

调整了部分代码拼写,并增加了氚云请假信息信息属性

verguenza 4 vuotta sitten
vanhempi
commit
11698cc0e3

+ 4 - 4
src/main/java/com/galaxis/manatee/dao/ChuanyunAskForLeaveDao.java

@@ -1,7 +1,7 @@
 package com.galaxis.manatee.dao;
 
 import com.galaxis.capsule.util.GalaxisRepository;
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunAskForLeaveDo;
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunAskForLeaveDO;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * Date: 2020/7/24
  */
 @Repository
-public interface ChuanyunAskForLeaveDao extends GalaxisRepository<ChuanyunAskForLeaveDo,String> {
+public interface ChuanyunAskForLeaveDao extends GalaxisRepository<ChuanyunAskForLeaveDO,String> {
 
     /**
      * SQL 查询是否存在请假信息,避免重复提交
@@ -21,12 +21,12 @@ public interface ChuanyunAskForLeaveDao extends GalaxisRepository<ChuanyunAskFor
      * @return
      */
     @Query(value = "SELECT * FROM chuanyun_askforleave WHERE title = ?1", nativeQuery = true)
-    List<ChuanyunAskForLeaveDo> findByTitleSQL(String title);
+    List<ChuanyunAskForLeaveDO> findByTitleSQL(String title);
 
     /**
      * SQL 查询请假信息
      * @return
      */
     @Query(value = "SELECT t.* FROM chuanyun_askforleave t GROUP BY t.title", nativeQuery = true )
-    List<ChuanyunAskForLeaveDo> findAllAskForLeave();
+    List<ChuanyunAskForLeaveDO> findAllAskForLeave();
 }

+ 7 - 0
src/main/java/com/galaxis/manatee/dao/ChuanyunUserDao.java

@@ -17,4 +17,11 @@ public interface ChuanyunUserDao extends GalaxisRepository<ChuanyunUserDO,String
      * @return  对象
      */
     ChuanyunUserDO findByName(String name);
+
+    /**
+     * 根据钉钉号获取用户对象
+     * @param dingTalkAccount   钉钉号
+     * @return  氚云对象
+     */
+    ChuanyunUserDO findByDingTalkAccountContaining(String dingTalkAccount);
 }

+ 9 - 4
src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunAskForLeaveDo.java

@@ -13,7 +13,6 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
-import net.sf.json.JSONArray;
 
 /**
  * Created by IntelliJ IDEA.
@@ -26,7 +25,7 @@ import net.sf.json.JSONArray;
 @Data
 @Entity(name = "CHUANYUN_ASKFORLEAVE")
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ChuanyunAskForLeaveDo extends BasicDO {
+public class ChuanyunAskForLeaveDO extends BasicDO {
 
     /**
      * 表名
@@ -136,12 +135,18 @@ public class ChuanyunAskForLeaveDo extends BasicDO {
     private BigDecimal totalDay;
 
     /**
+     * 请假人Id
+     */
+    @JsonProperty("F0000018")
+    private String askForLeaveUserId;
+
+    /**
      * 根据ProcessInstanceTopVo获得chuanyunAskForLeaveDo
      * @param processInstanceTopVo   传输数据
      * @return  保存数据
      */
-    public static ChuanyunAskForLeaveDo fromAskForLeaveDTO(OapiProcessinstanceGetResponse.ProcessInstanceTopVo processInstanceTopVo){
-        ChuanyunAskForLeaveDo chuanyunAskForLeaveDo = new ChuanyunAskForLeaveDo();
+    public static ChuanyunAskForLeaveDO fromAskForLeaveDTO(OapiProcessinstanceGetResponse.ProcessInstanceTopVo processInstanceTopVo){
+        ChuanyunAskForLeaveDO chuanyunAskForLeaveDo = new ChuanyunAskForLeaveDO();
         BeanUtils.copyProperties(processInstanceTopVo, chuanyunAskForLeaveDo);
         List<OapiProcessinstanceGetResponse.FormComponentValueVo> formComponentList = processInstanceTopVo.getFormComponentValues();
         if(formComponentList != null && formComponentList.size() > 0) {