更新项目立项档案

src/main/java/org/jeecg/common/dto/basedata/ArchivesPostListRespDTO.java

@@ -11,6 +11,8 @@ import java.util.List;
    * @desc 职务档案参数返回
    */
 public class ArchivesPostListRespDTO {
+    @ApiModelProperty("id")
+    private String id;
     @ApiModelProperty("key")
     private String key;
     @ApiModelProperty("父节点id")
@@ -28,6 +30,7 @@ public class ArchivesPostListRespDTO {
     }
 
     public ArchivesPostListRespDTO(BaseArchivesPost baseArchivesPost) {
+        this.id = baseArchivesPost.getId();
         this.key = baseArchivesPost.getId();
         this.parentId = baseArchivesPost.getParentId();
         this.code = baseArchivesPost.getCode();

src/main/java/org/jeecg/common/dto/basedata/ArchivesPostReqDTO.java

@@ -0,0 +1,17 @@
+package org.jeecg.common.dto.basedata;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+ * @Author jihaosen
+ * @date 2021/2/23
+ * @desc 职务档案请求参数
+ */
+@Data
+public class ArchivesPostReqDTO {
+    @ApiModelProperty("id")
+    private String id;
+
+    public ArchivesPostReqDTO() {
+    }
+}

src/main/java/org/jeecg/common/dto/basedata/BaseArchivesProjectApprovalReqDTO.java

@@ -0,0 +1,15 @@
+package org.jeecg.common.dto.basedata;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BaseArchivesProjectApprovalReqDTO {
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("状态（0：未启用， 1：启用）")
+    private Integer status;
+
+    public BaseArchivesProjectApprovalReqDTO() {
+    }
+}

src/main/java/org/jeecg/common/dto/basedata/BaseArchivesProjectApprovalRespDTO.java

@@ -0,0 +1,123 @@
+package org.jeecg.common.dto.basedata;
+
+import io.swagger.annotations.ApiModelProperty;
+import org.jeecg.modules.basedata.entity.BaseArchivesProjectApproval;
+import java.util.List;
+
+/**
+   * @Author jihaosen
+   * @date 2021/2/24
+   * @desc 项目立项list返回参数
+   */
+public class BaseArchivesProjectApprovalRespDTO {
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("key")
+    private String key;
+    @ApiModelProperty("title")
+    private String title;
+    @ApiModelProperty("父节点id")
+    private String parentId;
+    @ApiModelProperty("项目编码")
+    private String code;
+    @ApiModelProperty("项目名称")
+    private String name;
+    @ApiModelProperty("状态（0：未启用， 1：启用）")
+    private Integer status;
+    @ApiModelProperty("子节点数据")
+    private List<BaseArchivesProjectApprovalRespDTO> children;
+    @ApiModelProperty(" 是否叶子节点: 1:是 0:不是")
+    private boolean isLeaf;
+
+
+    private static final long serialVersionUID = 1L;
+
+    public BaseArchivesProjectApprovalRespDTO() {
+    }
+
+    public BaseArchivesProjectApprovalRespDTO(BaseArchivesProjectApproval baseArchivesProjectApproval) {
+        this.id = baseArchivesProjectApproval.getId();
+        this.key = baseArchivesProjectApproval.getId();
+        this.title = baseArchivesProjectApproval.getName();
+        this.parentId = baseArchivesProjectApproval.getParentId();
+        this.code = baseArchivesProjectApproval.getCode();
+        this.status = baseArchivesProjectApproval.getStatus();
+        this.isLeaf = false;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public List<BaseArchivesProjectApprovalRespDTO> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<BaseArchivesProjectApprovalRespDTO> children) {
+        this.children = children;
+    }
+
+    public boolean getIsLeaf() {
+        return isLeaf;
+    }
+
+    public void setIsLeaf(boolean leaf) {
+        isLeaf = leaf;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+}

src/main/java/org/jeecg/modules/basedata/controller/BaseArchivesPostController.java

@@ -8,25 +8,22 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.Logical;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.NotDuplicate;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.dto.basedata.ArchivesPostListRespDTO;
+import org.jeecg.common.dto.basedata.ArchivesPostReqDTO;
 import org.jeecg.modules.basedata.entity.BaseArchivesPost;
 import org.jeecg.modules.basedata.entity.FdContractClass;
 import org.jeecg.modules.basedata.service.BaseArchivesPostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
 import java.util.List;
@@ -46,16 +43,19 @@ public class BaseArchivesPostController {
     @Autowired
     private BaseArchivesPostService baseArchivesPostService;
 
-    /**
-     * @desc 职务档案列表查询
-     */
     @ApiOperation(value = "职务档案列表查询", notes = "职务档案列表查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="pkOrg", value="组织",required=false, dataType="String"),
+    })
     @GetMapping(value = "/list")
-    public Result<List<ArchivesPostListRespDTO>> queryList() {
+    public Result<List<ArchivesPostListRespDTO>> queryList(String pkOrg) {
         Result<List<ArchivesPostListRespDTO>> result = new Result<List<ArchivesPostListRespDTO>>();
         QueryWrapper<BaseArchivesPost> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("del_flag", CommonConstant.STATUS_NORMAL.toString());
         queryWrapper.orderByDesc("create_time");
+        if(StringUtils.isNotBlank(pkOrg)){
+            queryWrapper.eq("pk_org", pkOrg);
+        }
         List<BaseArchivesPost> list = baseArchivesPostService.list(queryWrapper);
         List<ArchivesPostListRespDTO> respDTOS = getTreeList(list);
         result.setSuccess(true);
@@ -63,9 +63,6 @@ public class BaseArchivesPostController {
         return result;
     }
 
-    /**
-     * @desc  添加职务档案
-     */
     @ApiOperation(value = "新增职务档案", notes = "新增职务档案")
     @ApiImplicitParams({
             @ApiImplicitParam(name="parentId", value="父节点",required=true, dataType="String"),
@@ -110,6 +107,13 @@ public class BaseArchivesPostController {
      *  @desc 编辑职务档案
      */
     @ApiOperation(value = "编辑职务档案", notes = "编辑职务档案")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="id", value="id",required=true, dataType="String"),
+            @ApiImplicitParam(name="parentId", value="父节点",required=true, dataType="String"),
+            @ApiImplicitParam(name="code", value="职务编码",required=true, dataType="String"),
+            @ApiImplicitParam(name="name", value="职务名称",required=true, dataType="String"),
+            @ApiImplicitParam(name="pkOrg", value="组织",required=false, dataType="String"),
+    })
     @PostMapping(value = "/edit")
     @NotDuplicate
 //    @RequiresPermissions("contract-class:update")
@@ -139,10 +143,13 @@ public class BaseArchivesPostController {
      * @desc 通过id删除
      */
     @ApiOperation(value = "通过id删除", notes = "通过id删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="id", value="id",required=true, dataType="String"),
+    })
     @PostMapping(value = "/delete")
     @NotDuplicate
 //    @RequiresPermissions("contract-class:delete")
-    public Result<FdContractClass> delete(@RequestBody @Valid BaseArchivesPost baseArchivesPost) {
+    public Result<FdContractClass> delete(@RequestBody ArchivesPostReqDTO baseArchivesPost) {
         Result<FdContractClass> result = new Result<FdContractClass>();
         BaseArchivesPost baseArchivesPostEntity = baseArchivesPostService.getById(baseArchivesPost.getId());
         if(baseArchivesPostEntity == null) {

src/main/java/org/jeecg/modules/basedata/controller/BaseArchivesProjectApprovalController.java

@@ -0,0 +1,236 @@
+package org.jeecg.modules.basedata.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.common.collect.Lists;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.NotDuplicate;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.dto.basedata.BaseArchivesProjectApprovalReqDTO;
+import org.jeecg.common.dto.basedata.BaseArchivesProjectApprovalRespDTO;
+import org.jeecg.modules.basedata.entity.BaseArchivesProjectApproval;
+import org.jeecg.modules.basedata.service.BaseArchivesProjectApprovalService;
+import org.jeecg.modules.system.service.ISysSerialPatternService;
+import org.jeecg.modules.system.vo.CallResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@ApiModel("项目立项接口")
+@RestController
+@RequestMapping("/basedata/projectApproval")
+@Slf4j
+public class BaseArchivesProjectApprovalController {
+
+    @Autowired
+    private BaseArchivesProjectApprovalService baseArchivesProjectApprovalService;
+
+    @Autowired
+    private ISysSerialPatternService sysSerialPatternService;
+
+    @ApiOperation(value = "项目立项列表查询接口", notes = "项目立项列表查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="pkOrg", value="组织",required=false, dataType="String"),
+    })
+    @GetMapping(value = "/list")
+    public Result<List<BaseArchivesProjectApprovalRespDTO>> queryList(String pkOrg) {
+        Result<List<BaseArchivesProjectApprovalRespDTO>> result = new Result<List<BaseArchivesProjectApprovalRespDTO>>();
+        QueryWrapper<BaseArchivesProjectApproval> queryWrapper = new QueryWrapper<BaseArchivesProjectApproval>();
+        queryWrapper.eq("del_flag", CommonConstant.STATUS_NORMAL.toString());
+        queryWrapper.orderByDesc("create_time");
+        if(StringUtils.isNotBlank(pkOrg)){
+            queryWrapper.eq("pk_org", pkOrg);
+        }
+        List<BaseArchivesProjectApproval> list = baseArchivesProjectApprovalService.list(queryWrapper);
+        List<BaseArchivesProjectApprovalRespDTO> respDTOS = getTreeList(list);
+        result.setSuccess(true);
+        result.setResult(respDTOS);
+        return result;
+    }
+
+    @ApiOperation(value = "新增项目立项接口", notes = "新增项目立项")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="parentId", value="父节点",required=true, dataType="String"),
+            @ApiImplicitParam(name="name", value="项目名称",required=true, dataType="String"),
+            @ApiImplicitParam(name="pkOrg", value="组织",required=false, dataType="String"),
+    })
+    @PostMapping(value = "/add")
+    @NotDuplicate
+//    @RequiresPermissions(value = {"contract-class:add","contract-class-parent:add"},logical = Logical.OR)
+    public Result<BaseArchivesProjectApproval> add(@RequestBody @Valid BaseArchivesProjectApproval baseArchivesProjectApproval, BindingResult bindingResult) {
+        Result<BaseArchivesProjectApproval> result = new Result<BaseArchivesProjectApproval>();
+        try {
+            StringBuilder sb = new StringBuilder();
+            if (bindingResult.hasErrors()){
+                //记录错误信息
+                bindingResult.getAllErrors().stream().forEach(error -> sb.append(error.getDefaultMessage() + "<br/>"));
+                result.error500(sb.toString());
+                return result;
+            }
+            // 设置编码
+            CallResult<String> nextSerial = sysSerialPatternService.getNextSerial(baseArchivesProjectApproval, "base_archives_project_approval", "code", true);
+            if(!nextSerial.isSucceed()){
+                throw new RuntimeException("获取编号失败");
+            }
+            baseArchivesProjectApproval.setCode(nextSerial.getContent());
+            baseArchivesProjectApproval.setStatus(CommonConstant.DEL_FLAG_0);
+            baseArchivesProjectApproval.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
+            baseArchivesProjectApprovalService.save(baseArchivesProjectApproval);
+            result.success("添加成功！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info(e.getMessage());
+            result.error500("操作失败:"+e.getMessage());
+
+        }
+        return result;
+    }
+
+    @ApiOperation(value = "编辑项目立项接口", notes = "编辑项目立项")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="id", value="id",required=true, dataType="String"),
+            @ApiImplicitParam(name="parentId", value="父节点",required=true, dataType="String"),
+//            @ApiImplicitParam(name="code", value="项目编码",required=true, dataType="String"),
+            @ApiImplicitParam(name="name", value="项目名称",required=true, dataType="String"),
+            @ApiImplicitParam(name="pkOrg", value="组织",required=false, dataType="String"),
+    })
+    @PostMapping(value = "/edit")
+    @NotDuplicate
+//    @RequiresPermissions("contract-class:update")
+    public Result<BaseArchivesProjectApproval> edit(@RequestBody @Valid BaseArchivesProjectApproval baseArchivesProjectApproval, BindingResult bindingResult) {
+        Result<BaseArchivesProjectApproval> result = new Result<BaseArchivesProjectApproval>();
+        BaseArchivesProjectApproval baseArchivesPostEntity = baseArchivesProjectApprovalService.getById(baseArchivesProjectApproval.getId());
+        if(baseArchivesPostEntity == null) {
+            result.error500("未找到对应实体");
+        }else {
+            StringBuilder sb = new StringBuilder();
+            if (bindingResult.hasErrors()){
+                //记录错误信息
+                bindingResult.getAllErrors().stream().forEach(error -> sb.append(error.getDefaultMessage() + "<br/>"));
+                result.error500(sb.toString());
+                return result;
+            }
+
+            // 设置编码
+            CallResult<String> nextSerial = sysSerialPatternService.getNextSerial(baseArchivesProjectApproval, "base_archives_project_approval", "code", true);
+            if(!nextSerial.isSucceed()){
+                throw new RuntimeException("获取编号失败");
+            }
+            baseArchivesProjectApproval.setCode(nextSerial.getContent());
+            boolean ok = baseArchivesProjectApprovalService.updateById(baseArchivesProjectApproval);
+            if(ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    @ApiOperation(value = "通过id删除接口", notes = "通过id删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="id", value="id",required=true, dataType="String"),
+    })
+    @PostMapping(value = "/delete")
+    @NotDuplicate
+//    @RequiresPermissions("contract-class:delete")
+    public Result<BaseArchivesProjectApproval> delete(@RequestBody BaseArchivesProjectApprovalReqDTO baseArchivesProjectApproval) {
+        Result<BaseArchivesProjectApproval> result = new Result<BaseArchivesProjectApproval>();
+        BaseArchivesProjectApproval baseArchivesPostEntity = baseArchivesProjectApprovalService.getById(baseArchivesProjectApproval.getId());
+        if(baseArchivesPostEntity == null) {
+            result.error500("未找到对应实体");
+        }else {
+            baseArchivesPostEntity.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
+            boolean ok = baseArchivesProjectApprovalService.updateById(baseArchivesPostEntity);
+            if(ok) {
+                result.success("删除成功!");
+            }
+        }
+
+        return result;
+    }
+
+
+    @ApiOperation(value = "修改状态接口", notes = "通过id修改状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="id", value="id",required=true, dataType="String"),
+            @ApiImplicitParam(name="status", value="状态（0：未启用， 1：启用）",required=true, dataType="Interget"),
+    })
+    @PostMapping(value = "/updateStauts")
+    @NotDuplicate
+//    @RequiresPermissions("contract-class:delete")
+    public Result<BaseArchivesProjectApproval> updateStatus(@RequestBody  BaseArchivesProjectApprovalReqDTO baseArchivesProjectApproval) {
+        Result<BaseArchivesProjectApproval> result = new Result<BaseArchivesProjectApproval>();
+        BaseArchivesProjectApproval baseArchivesPostEntity = baseArchivesProjectApprovalService.getById(baseArchivesProjectApproval.getId());
+        if(baseArchivesPostEntity == null) {
+            result.error500("未找到对应实体");
+        }else {
+            baseArchivesPostEntity.setStatus(baseArchivesProjectApproval.getStatus());
+            boolean ok = baseArchivesProjectApprovalService.updateById(baseArchivesPostEntity);
+            if(ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+
+
+    /**
+     * @desc 获取职务档案的数据
+     */
+    private List<BaseArchivesProjectApprovalRespDTO> getTreeList(List<BaseArchivesProjectApproval> list) {
+        List<BaseArchivesProjectApprovalRespDTO> resp = Lists.newArrayList();
+        //根据parentId分组
+        Map<String, List<BaseArchivesProjectApproval>> postMap = list.stream().collect(Collectors.groupingBy(BaseArchivesProjectApproval :: getParentId));
+        List<BaseArchivesProjectApproval>  baseArchivesProjectApprovals = postMap.get("0");
+        if(CollectionUtils.isEmpty(baseArchivesProjectApprovals)){
+            return null;
+        }
+        for(BaseArchivesProjectApproval baseArchivesProjectApproval : baseArchivesProjectApprovals){
+            BaseArchivesProjectApprovalRespDTO baseArchivesProjectApprovalRespDTO = new BaseArchivesProjectApprovalRespDTO(baseArchivesProjectApproval);
+            baseArchivesProjectApprovalRespDTO.setChildren(getChildes(list, baseArchivesProjectApprovalRespDTO.getKey(), postMap));
+            //判断是否为末节点
+            List<BaseArchivesProjectApproval> posts = postMap.get(baseArchivesProjectApprovalRespDTO.getKey());
+            if(CollectionUtils.isEmpty(posts)){
+                baseArchivesProjectApprovalRespDTO.setIsLeaf(true);
+            }
+            resp.add(baseArchivesProjectApprovalRespDTO);
+        }
+        return resp;
+    }
+
+    /**
+     * @desc 获取子节点数据
+     */
+    private List<BaseArchivesProjectApprovalRespDTO> getChildes(List<BaseArchivesProjectApproval> list, String key, Map<String, List<BaseArchivesProjectApproval>> postMap) {
+        List<BaseArchivesProjectApprovalRespDTO> resp = Lists.newArrayList();
+        for(BaseArchivesProjectApproval baseArchivesProjectApproval : list){
+            if(baseArchivesProjectApproval.getParentId().equals(key)){
+                BaseArchivesProjectApprovalRespDTO baseArchivesProjectApprovalRespDTO = new BaseArchivesProjectApprovalRespDTO(baseArchivesProjectApproval);
+                baseArchivesProjectApprovalRespDTO.setChildren(getChildes(list, baseArchivesProjectApprovalRespDTO.getKey(), postMap));
+                //判断是否为末节点
+                List<BaseArchivesProjectApproval> posts = postMap.get(baseArchivesProjectApprovalRespDTO.getKey());
+                if(CollectionUtils.isEmpty(posts)){
+                    baseArchivesProjectApprovalRespDTO.setIsLeaf(true);
+                }
+                resp.add(baseArchivesProjectApprovalRespDTO);
+            }
+        }
+        return resp;
+    }
+}

src/main/java/org/jeecg/modules/basedata/entity/BaseArchivesProjectApproval.java

@@ -0,0 +1,74 @@
+package org.jeecg.modules.basedata.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.Table;
+import javax.validation.constraints.NotEmpty;
+
+/**
+   * @Author jihaosen
+   * @date 2021/2/24
+   * @desc 项目立项档案
+   */
+@Data
+@ApiModel("项目立项档案")
+@Table(name = "base_archives_project_approval")
+public class BaseArchivesProjectApproval implements Serializable {
+    @ApiModelProperty("id")
+    @TableId(type = IdType.UUID)
+    private String id;
+    @ApiModelProperty("父节点id")
+    @NotEmpty(message = "父节点id不为空")
+    private String parentId;
+    @ApiModelProperty("项目编码")
+    private String code;
+    @NotEmpty(message = "项目名称不为空")
+    @ApiModelProperty("项目名称")
+    private String name;
+    @ApiModelProperty("状态（0：未启用， 1：启用）")
+    private Integer status;
+    @ApiModelProperty("删除状态（0，正常，1已删除）")
+    private String delFlag;
+    @ApiModelProperty("创建时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    @ApiModelProperty("创建人")
+    private String createBy;
+    @ApiModelProperty("修改时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    @ApiModelProperty("修改人")
+    private String updateBy;
+    @ApiModelProperty("组织")
+    private String pkOrg;
+
+    private static final long serialVersionUID = 1L;
+
+    public BaseArchivesProjectApproval() {
+    }
+
+    public BaseArchivesProjectApproval(String id, String parentId, String code, String name, Integer status,
+       String delFlag, Date createTime, String createBy, Date updateTime, String updateBy, String pkOrg) {
+        this.id = id;
+        this.parentId = parentId;
+        this.code = code;
+        this.name = name;
+        this.status = status;
+        this.delFlag = delFlag;
+        this.createTime = createTime;
+        this.createBy = createBy;
+        this.updateTime = updateTime;
+        this.updateBy = updateBy;
+        this.pkOrg = pkOrg;
+    }
+}

src/main/java/org/jeecg/modules/basedata/mapper/BaseArchivesProjectApprovalMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.basedata.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.basedata.entity.BaseArchivesProjectApproval;
+
+ /**
+   * @Author jihaosen
+   * @date 2021/2/24
+   * @desc 项目立项Mapper
+   */
+@Mapper
+public interface BaseArchivesProjectApprovalMapper extends BaseMapper<BaseArchivesProjectApproval> {
+}

src/main/java/org/jeecg/modules/basedata/mapper/xml/BaseArchivesProjectApprovalMapper.xml

@@ -0,0 +1,16 @@
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.basedata.mapper.BaseArchivesProjectApprovalMapper">
+  <resultMap id="BaseResultMap" type="org.jeecg.modules.basedata.entity.BaseArchivesProjectApproval">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="parent_id" property="parentId" />
+    <result column="code" property="code" />
+    <result column="name" property="name" />
+    <result column="status" property="status" />
+    <result column="del_flag" property="delFlag" />
+    <result column="create_time" property="createTime" />
+    <result column="create_by" property="createBy" />
+    <result column="update_time" property="updateTime" />
+    <result column="update_by" property="updateBy" />
+    <result column="pk_org" property="pkOrg" />
+  </resultMap>
+</mapper>

src/main/java/org/jeecg/modules/basedata/service/BaseArchivesProjectApprovalService.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.basedata.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.basedata.entity.BaseArchivesProjectApproval;
+
+ /** 
+   * @Author jihaosen
+   * @date 2021/2/24 
+   */
+public interface BaseArchivesProjectApprovalService extends IService<BaseArchivesProjectApproval> {
+}

src/main/java/org/jeecg/modules/basedata/service/impl/BaseArchivesProjectApprovalServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.basedata.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.basedata.entity.BaseArchivesProjectApproval;
+import org.jeecg.modules.basedata.mapper.BaseArchivesProjectApprovalMapper;
+import org.jeecg.modules.basedata.service.BaseArchivesProjectApprovalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+   * @Author jihaosen
+   * @date 2021/2/24
+   * @desc 项目立项Service
+   */
+@Service
+public class BaseArchivesProjectApprovalServiceImpl extends ServiceImpl<BaseArchivesProjectApprovalMapper, BaseArchivesProjectApproval> implements BaseArchivesProjectApprovalService {
+ @Autowired
+ private BaseArchivesProjectApprovalMapper baseArchivesProjectApprovalMapper;
+}