修改职位信息

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,116 +7,134 @@ 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;
 
     /**
-    * 分组id
-    */
+     * 分组id
+     */
     private Long groupId;
     /**
-    * 分组名称
-    */
+     * 分组名称
+     */
     private String groupName;
     /**
-    * 职位编码
-    */
+     * 职位编码
+     */
     private String jobCode;
     /**
-    * 职位名称
-    */
+     * 职位名称
+     */
     private String jobName;
     /**
-    * 备注
-    */
+     * 备注
+     */
     private String remark;
+    /**
+     * 节点类型(1.分组,2.职位)
+     */
+    private Integer type;
 
 
 
     public JobEntity(){}
     /**
-    * 获取 分组id
-    * @return Long
-    */
+     * 获取 分组id
+     * @return Long
+     */
     public Long getGroupId(){
         return groupId;
     }
     /**
-    * 设置 分组id
-    * @param groupId
-    */
+     * 设置 分组id
+     * @param groupId
+     */
     public void setGroupId(Long groupId){
         this.groupId = groupId;
     }
     /**
-    * 获取 分组名称
-    * @return String
-    */
+     * 获取 分组名称
+     * @return String
+     */
     public String getGroupName(){
         return groupName;
     }
     /**
-    * 设置 分组名称
-    * @param groupName
-    */
+     * 设置 分组名称
+     * @param groupName
+     */
     public void setGroupName(String groupName){
         this.groupName = groupName;
     }
     /**
-    * 获取 职位编码
-    * @return String
-    */
+     * 获取 职位编码
+     * @return String
+     */
     public String getJobCode(){
         return jobCode;
     }
     /**
-    * 设置 职位编码
-    * @param jobCode
-    */
+     * 设置 职位编码
+     * @param jobCode
+     */
     public void setJobCode(String jobCode){
         this.jobCode = jobCode;
     }
     /**
-    * 获取 职位名称
-    * @return String
-    */
+     * 获取 职位名称
+     * @return String
+     */
     public String getJobName(){
         return jobName;
     }
     /**
-    * 设置 职位名称
-    * @param jobName
-    */
+     * 设置 职位名称
+     * @param jobName
+     */
     public void setJobName(String jobName){
         this.jobName = jobName;
     }
     /**
-    * 获取 备注
-    * @return String
-    */
+     * 获取 备注
+     * @return String
+     */
     public String getRemark(){
         return remark;
     }
     /**
-    * 设置 备注
-    * @param remark
-    */
+     * 设置 备注
+     * @param remark
+     */
     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;
+    }
 
 
 
 
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -124,7 +142,7 @@ public class JobEntity extends JobVo {
         if (obj instanceof JobEntity) {
             JobEntity tmp = (JobEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
@@ -137,19 +155,22 @@ 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();
     }
 
     public void initAttrValue(){
 
-            this.groupId = null;
+        this.groupId = null;
+
+        this.groupName = "";
 
-            this.groupName = "";
+        this.jobCode = "";
 
-            this.jobCode = "";
+        this.jobName = "";
 
-            this.jobName = "";
+        this.remark = "";
 
-            this.remark = "";
+        this.type = 1;
     }
 }
\ No newline at end of file

db/module.sql

@@ -103,19 +103,24 @@ CREATE TABLE mortals_xhx_care_template(
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_xhx_job`;
 CREATE TABLE mortals_xhx_job(
-                                `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键，自增长',
-                                `groupId` bigint(20)      COMMENT '分组id',
-                                `groupName` varchar(128)      COMMENT '分组名称',
-                                `jobCode` varchar(128)      COMMENT '职位编码',
-                                `jobName` varchar(128)      COMMENT '职位名称',
-                                `remark` varchar(512)      COMMENT '备注',
-                                `createTime` datetime      COMMENT '创建时间',
-                                `createUserId` bigint(20)      COMMENT '创建用户',
-                                `updateUserId` bigint(20)      COMMENT '更新用户',
-                                `updateTime` datetime      COMMENT '修改时间',
-                                PRIMARY KEY  (`id`)
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键，自增长',
+    `groupId` bigint(20)      COMMENT '分组id',
+    `groupName` varchar(128)      COMMENT '分组名称',
+    `jobCode` varchar(128)      COMMENT '职位编码',
+    `jobName` varchar(128)      COMMENT '职位名称',
+    `remark` varchar(512)      COMMENT '备注',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateTime` datetime      COMMENT '修改时间',
+    `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>