修改职位信息

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/hik/ArtemisPostTest.java

@@ -93,12 +93,6 @@ public class ArtemisPostTest {
 		return ArtemisHttpUtil.doPostStringArtemis(config,path, body, null, null, "application/json");
 	}
 
-
-
-
-
-
-
 	public static String callPostApiGetDeptList() throws Exception {
 		/**
 		 * https://ip:port/artemis/api/resource/v1/org/orgList

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java

@@ -4,7 +4,6 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
 import com.mortals.xhx.base.framework.config.JsonUtils;
-import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.busiz.hik.ArtemisPostTest;
 import com.mortals.xhx.busiz.rsp.DeptHikData;
 import com.mortals.xhx.busiz.rsp.ListDept;

attendance-performance-manager/src/main/java/com/mortals/xhx/module/job/model/JobEntity.java

@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.job.model.vo.JobVo;
 /**
-* 职位信息实体对象
-*
-* @author zxfei
-* @date 2023-04-07
-*/
+ * 职位信息实体对象
+ *
+ * @author zxfei
+ * @date 2023-04-11
+ */
 
 public class JobEntity extends JobVo {
     private static final long serialVersionUID = 1L;
@@ -36,6 +36,10 @@ public class JobEntity extends JobVo {
      * 备注
      */
     private String remark;
+    /**
+     * 节点类型(1.分组,2.职位)
+     */
+    private Integer type;
 
 
 
@@ -110,6 +114,20 @@ public class JobEntity extends JobVo {
     public void setRemark(String remark){
         this.remark = remark;
     }
+    /**
+     * 获取 节点类型(1.分组,2.职位)
+     * @return Integer
+     */
+    public Integer getType(){
+        return type;
+    }
+    /**
+     * 设置 节点类型(1.分组,2.职位)
+     * @param type
+     */
+    public void setType(Integer type){
+        this.type = type;
+    }
 
 
 
@@ -137,6 +155,7 @@ public class JobEntity extends JobVo {
         sb.append(",jobCode:").append(getJobCode());
         sb.append(",jobName:").append(getJobName());
         sb.append(",remark:").append(getRemark());
+        sb.append(",type:").append(getType());
         return sb.toString();
     }
 
@@ -151,5 +170,7 @@ public class JobEntity extends JobVo {
         this.jobName = "";
 
         this.remark = "";
+
+        this.type = 1;
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/job/model/JobQuery.java

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.job.model;
 import java.util.List;
 import com.mortals.xhx.module.job.model.JobEntity;
 /**
-* 职位信息查询对象
-*
-* @author zxfei
-* @date 2023-04-07
-*/
+ * 职位信息查询对象
+ *
+ * @author zxfei
+ * @date 2023-04-11
+ */
 public class JobQuery extends JobEntity {
     /** 开始 主键，自增长 */
     private Long idStart;
@@ -101,6 +101,21 @@ public class JobQuery extends JobEntity {
     /** 结束 修改时间 */
     private String updateTimeEnd;
 
+    /** 开始 节点类型(1.分组,2.职位) */
+    private Integer typeStart;
+
+    /** 结束 节点类型(1.分组,2.职位) */
+    private Integer typeEnd;
+
+    /** 增加 节点类型(1.分组,2.职位) */
+    private Integer typeIncrement;
+
+    /** 节点类型(1.分组,2.职位)列表 */
+    private List <Integer> typeList;
+
+    /** 节点类型(1.分组,2.职位)排除列表 */
+    private List <Integer> typeNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<JobQuery> orConditionList;
 
@@ -625,6 +640,87 @@ public class JobQuery extends JobEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 开始 节点类型(1.分组,2.职位)
+     * @return typeStart
+     */
+    public Integer getTypeStart(){
+        return this.typeStart;
+    }
+
+    /**
+     * 设置 开始 节点类型(1.分组,2.职位)
+     * @param typeStart
+     */
+    public void setTypeStart(Integer typeStart){
+        this.typeStart = typeStart;
+    }
+
+    /**
+     * 获取 结束 节点类型(1.分组,2.职位)
+     * @return $typeEnd
+     */
+    public Integer getTypeEnd(){
+        return this.typeEnd;
+    }
+
+    /**
+     * 设置 结束 节点类型(1.分组,2.职位)
+     * @param typeEnd
+     */
+    public void setTypeEnd(Integer typeEnd){
+        this.typeEnd = typeEnd;
+    }
+
+    /**
+     * 获取 增加 节点类型(1.分组,2.职位)
+     * @return typeIncrement
+     */
+    public Integer getTypeIncrement(){
+        return this.typeIncrement;
+    }
+
+    /**
+     * 设置 增加 节点类型(1.分组,2.职位)
+     * @param typeIncrement
+     */
+    public void setTypeIncrement(Integer typeIncrement){
+        this.typeIncrement = typeIncrement;
+    }
+
+    /**
+     * 获取 节点类型(1.分组,2.职位)
+     * @return typeList
+     */
+    public List<Integer> getTypeList(){
+        return this.typeList;
+    }
+
+    /**
+     * 设置 节点类型(1.分组,2.职位)
+     * @param typeList
+     */
+    public void setTypeList(List<Integer> typeList){
+        this.typeList = typeList;
+    }
+
+    /**
+     * 获取 节点类型(1.分组,2.职位)
+     * @return typeNotList
+     */
+    public List<Integer> getTypeNotList(){
+        return this.typeNotList;
+    }
+
+    /**
+     * 设置 节点类型(1.分组,2.职位)
+     * @param typeNotList
+     */
+    public void setTypeNotList(List<Integer> typeNotList){
+        this.typeNotList = typeNotList;
+    }
+
+
     /**
      * 设置  主键，自增长
      * @param id
@@ -919,6 +1015,60 @@ public class JobQuery extends JobEntity {
     }
 
 
+    /**
+     * 设置  节点类型(1.分组,2.职位)
+     * @param type
+     */
+    public JobQuery type(Integer type){
+        setType(type);
+        return this;
+    }
+
+    /**
+     * 设置 开始 节点类型(1.分组,2.职位)
+     * @param typeStart
+     */
+    public JobQuery typeStart(Integer typeStart){
+        this.typeStart = typeStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 节点类型(1.分组,2.职位)
+     * @param typeEnd
+     */
+    public JobQuery typeEnd(Integer typeEnd){
+        this.typeEnd = typeEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 节点类型(1.分组,2.职位)
+     * @param typeIncrement
+     */
+    public JobQuery typeIncrement(Integer typeIncrement){
+        this.typeIncrement = typeIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 节点类型(1.分组,2.职位)
+     * @param typeList
+     */
+    public JobQuery typeList(List<Integer> typeList){
+        this.typeList = typeList;
+        return this;
+    }
+
+    /**
+     * 设置 节点类型(1.分组,2.职位)
+     * @param typeNotList
+     */
+    public JobQuery typeNotList(List<Integer> typeNotList){
+        this.typeNotList = typeNotList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

db/module.sql

@@ -113,9 +113,14 @@ CREATE TABLE mortals_xhx_job(
     `createUserId` bigint(20)      COMMENT '创建用户',
     `updateUserId` bigint(20)      COMMENT '更新用户',
     `updateTime` datetime      COMMENT '修改时间',
-                                PRIMARY KEY  (`id`)
+    `type` tinyint(2)    DEFAULT '1'  COMMENT '节点类型(1.分组,2.职位)',
+PRIMARY KEY  (`id`)
+,KEY `groupName` (`groupName`) USING BTREE
+,KEY `jobCode` (`jobCode`) USING BTREE
+,KEY `jobName` (`jobName`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='职位信息';
 
+
 -- ----------------------------
 -- 员工黑名单信息表
 -- ----------------------------

doc/api.md

@@ -3098,9 +3098,9 @@ jobName|String|否|职位名称,字段前后添加%%模糊查询
 **请求样例:**
 ```
   {
-        "groupName":"221sgc",
-        "jobCode":"buzhdj",
-        "jobName":"vduagu",
+        "groupName":"w4y1au",
+        "jobCode":"p48hfz",
+        "jobName":"tvhi3v",
         "page":1,
         "size":10
   }
@@ -3128,7 +3128,9 @@ data|object|数据对象
   createUserId|Long|创建用户
   updateUserId|Long|更新用户
   updateTime|Date|修改时间
+  type|Integer|节点类型(1.分组,2.职位)
 dict|object|字典对象
+ type|object|字典属性对象，详见附录
 
 **响应消息样例:**
 ```
@@ -3176,23 +3178,26 @@ data|object|数据对象
  createUserId|Long|创建用户
  updateUserId|Long|更新用户
  updateTime|Date|修改时间
+ type|Integer|节点类型(1.分组,2.职位)
 dict|object|字典对象
+ type|object|字典属性对象，详见附录
 
 **响应消息样例:**
 ```
 {
     "code": 1,
     "data": {
-            "id":3224,
-            "groupId":5192,
-            "groupName":"y8zckh",
-            "jobCode":"djdvg1",
-            "jobName":"k2657g",
-            "remark":"ajxdd3",
-            "createTime":"2023-04-07",
-            "createUserId":4686,
-            "updateUserId":8121,
-            "updateTime":"2023-04-07"
+            "id":6214,
+            "groupId":6910,
+            "groupName":"h3qmbp",
+            "jobCode":"ybsxab",
+            "jobName":"mwfwda",
+            "remark":"j454du",
+            "createTime":"2023-04-11",
+            "createUserId":3094,
+            "updateUserId":1149,
+            "updateTime":"2023-04-11",
+            "type":4950
         }
 }
 ```
@@ -3216,15 +3221,17 @@ groupName|String|否|分组名称
 jobCode|String|否|职位编码
 jobName|String|否|职位名称
 remark|String|否|备注
+type|Integer|否|节点类型(1.分组,2.职位)
 
 **请求样例:**
 ```
 {
-    "groupId":3140,
-    "groupName":"q8jukx",
-    "jobCode":"38mrsx",
-    "jobName":"fxtzka",
-    "remark":"owe9bs",
+    "groupId":4323,
+    "groupName":"0rvnhk",
+    "jobCode":"qlhfq6",
+    "jobName":"aw1orv",
+    "remark":"b3g5ig",
+    "type":5729
 }
 
 ```
@@ -3247,6 +3254,7 @@ data|object|数据对象
   createUserId|Long|创建用户
   updateUserId|Long|更新用户
   updateTime|Date|修改时间
+  type|Integer|节点类型(1.分组,2.职位)
 
 **响应消息样例:**
 ```

pom.xml

@@ -22,7 +22,6 @@
         <common-lib.version>0.0.1-SNAPSHOT</common-lib.version>
     </properties>
 
-
     <dependencyManagement>
         <dependencies>
             <dependency>