条线组织

ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java

@@ -56,7 +56,7 @@ public class GeneratorCodeKingbaseConfig {
     }
 
     public static void main(String[] args) {
-        generate("Liuxinxin", "expert", PATH_LXX, "expert_avoid_company");
+        generate("Liuxinxin", "organization", PATH_LXX, "organization_tag");
     }
 
 }

pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationTagController.java

@@ -0,0 +1,22 @@
+package com.ningdatech.pmapi.organization.controller;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-03-06
+ */
+@RestController
+@Api(tags = "组织标签（条线标签）")
+@RequestMapping("/api/v1/organization-tag")
+public class OrganizationTagController {
+
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/ProcDefController.java

@@ -66,7 +66,7 @@ public class ProcDefController {
     @ApiOperation(value = "单位流程配置部署", notes = "单位流程配置部署")
     @PostMapping("/deploy/{processDefId}")
     public String deploy(@Validated @PathVariable String processDefId) {
-        return orgProcessModelService.deployProcess(processDefId,null);
+        return orgProcessModelService.deployProcess(processDefId, null);
     }
 
     @ApiOperation(value = "单位流程配置删除", notes = "单位流程配置删除")

pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/OrganizationTag.java

@@ -0,0 +1,105 @@
+package com.ningdatech.pmapi.organization.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-03-06
+ */
+@TableName("organization_tag")
+@ApiModel(value = "OrganizationTag对象", description = "")
+public class OrganizationTag implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private LocalDateTime createOn;
+
+    private LocalDateTime updateOn;
+
+    private Long createBy;
+
+    private Long updateBy;
+
+    private String organizationCode;
+
+    private String tagCode;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public LocalDateTime getCreateOn() {
+        return createOn;
+    }
+
+    public void setCreateOn(LocalDateTime createOn) {
+        this.createOn = createOn;
+    }
+
+    public LocalDateTime getUpdateOn() {
+        return updateOn;
+    }
+
+    public void setUpdateOn(LocalDateTime updateOn) {
+        this.updateOn = updateOn;
+    }
+
+    public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+
+    public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getOrganizationCode() {
+        return organizationCode;
+    }
+
+    public void setOrganizationCode(String organizationCode) {
+        this.organizationCode = organizationCode;
+    }
+
+    public String getTagCode() {
+        return tagCode;
+    }
+
+    public void setTagCode(String tagCode) {
+        this.tagCode = tagCode;
+    }
+
+    @Override
+    public String toString() {
+        return "OrganizationTag{" +
+                "id=" + id +
+                ", createOn=" + createOn +
+                ", updateOn=" + updateOn +
+                ", createBy=" + createBy +
+                ", updateBy=" + updateBy +
+                ", organizationCode=" + organizationCode +
+                ", tagCode=" + tagCode +
+                "}";
+    }
+}

pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/OrganizationTagMapper.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.organization.mapper;
+
+import com.ningdatech.pmapi.organization.entity.OrganizationTag;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-03-06
+ */
+public interface OrganizationTagMapper extends BaseMapper<OrganizationTag> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/OrganizationTagMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ningdatech.pmapi.organization.mapper.OrganizationTagMapper">
+
+</mapper>

pmapi/src/main/java/com/ningdatech/pmapi/organization/model/vo/OrganizationTreeVO.java

@@ -3,8 +3,6 @@ package com.ningdatech.pmapi.organization.model.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @author liuxinxin
  * @date 2022/8/17 下午2:01
@@ -20,7 +18,7 @@ public class OrganizationTreeVO {
     @ApiModelProperty("浙政钉组织编号")
     private String organizationCode;
 
-//    @ApiModelProperty("子部门数目")
+    //    @ApiModelProperty("子部门数目")
 //    private Long subCount;
 //
 //    @ApiModelProperty("排序")

pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IOrganizationTagService.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.organization.service;
+
+import com.ningdatech.pmapi.organization.entity.OrganizationTag;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-03-06
+ */
+public interface IOrganizationTagService extends IService<OrganizationTag> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/OrganizationTagServiceImpl.java

@@ -0,0 +1,20 @@
+package com.ningdatech.pmapi.organization.service.impl;
+
+import com.ningdatech.pmapi.organization.entity.OrganizationTag;
+import com.ningdatech.pmapi.organization.mapper.OrganizationTagMapper;
+import com.ningdatech.pmapi.organization.service.IOrganizationTagService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-03-06
+ */
+@Service
+public class OrganizationTagServiceImpl extends ServiceImpl<OrganizationTagMapper, OrganizationTag> implements IOrganizationTagService {
+
+}