diff --git a/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java b/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java index 287e667..9ab87ff 100644 --- a/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java +++ b/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"); } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationTagController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationTagController.java new file mode 100644 index 0000000..9e219e0 --- /dev/null +++ b/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; + +/** + *
+ * 前端控制器 + *
+ * + * @author Liuxinxin + * @since 2023-03-06 + */ +@RestController +@Api(tags = "组织标签(条线标签)") +@RequestMapping("/api/v1/organization-tag") +public class OrganizationTagController { + + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/ProcDefController.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/ProcDefController.java index 27ed7ca..af0c6cc 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/ProcDefController.java +++ b/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 = "单位流程配置删除") diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/OrganizationTag.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/OrganizationTag.java new file mode 100644 index 0000000..b9fe690 --- /dev/null +++ b/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; + +/** + *+ * + *
+ * + * @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 + + "}"; + } +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/OrganizationTagMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/OrganizationTagMapper.java new file mode 100644 index 0000000..5804384 --- /dev/null +++ b/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; + +/** + *+ * Mapper 接口 + *
+ * + * @author Liuxinxin + * @since 2023-03-06 + */ +public interface OrganizationTagMapper extends BaseMapper+ * 服务类 + *
+ * + * @author Liuxinxin + * @since 2023-03-06 + */ +public interface IOrganizationTagService extends IService+ * 服务实现类 + *
+ * + * @author Liuxinxin + * @since 2023-03-06 + */ +@Service +public class OrganizationTagServiceImpl extends ServiceImpl