oaform添加增删改查方法

yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java

@@ -0,0 +1,55 @@
+package com.yxt.anrui.oa.api;
+
+import com.yxt.anrui.oa.biz.oaform.*;
+import com.yxt.anrui.oa.biz.oahireapply.OaHireApplyDetailsVo;
+import com.yxt.anrui.oa.biz.oamendapply.OaMendApplyQuery;
+import com.yxt.anrui.oa.biz.oamendapply.OaMendApplyVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @description: 基础表单
+ * @author: dimengzhe
+ * @date: 2025/1/7
+ **/
+@RestController
+@RequestMapping("v1/oaform")
+public class OaFormRest {
+
+    @Autowired
+    private OaFormService oaFormService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<OaFormVo>> listPage(@RequestBody PagerQuery<OaFormQuery> pq) {
+        ResultBean<PagerVo<OaFormVo>> rb = ResultBean.fireFail();
+        PagerVo<OaFormVo> pv = oaFormService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    ResultBean<String> save(@RequestBody OaFormDto dto) {
+        return oaFormService.saveOrUpdateForm(dto);
+    }
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<OaFormDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        return oaFormService.fetchDetailsBySid(sid);
+    }
+
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        oaFormService.delAll(sids);
+        return rb.success();
+    }
+
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java

@@ -8,14 +8,15 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * @description:
+ * @description: 基础表单
  * @author: dimengzhe
  * @date: 2025/1/3
  **/
 @Data
 public class OaForm extends BaseEntity {
     private static final long serialVersionUID = 2307297366703765992L;
-
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("创建人")
     private String createByName;
     @ApiModelProperty("公司sid")
@@ -26,7 +27,7 @@ public class OaForm extends BaseEntity {
     private String deptSid;
     @ApiModelProperty("部门名称")
     private String deptName;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("办结日期")
     private Date finishTime;
     @ApiModelProperty("实例id")

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDetailsVo.java

@@ -0,0 +1,46 @@
+package com.yxt.anrui.oa.biz.oaform;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/7
+ **/
+@Data
+public class OaFormDetailsVo implements Vo {
+    private static final long serialVersionUID = -3614379397154106001L;
+
+    private String sid;
+
+    @ApiModelProperty("创建人")
+    private String createByName;
+    @ApiModelProperty("公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("公司名称")
+    private String useOrgName;
+    @ApiModelProperty("部门sid")
+    private String deptSid;
+    @ApiModelProperty("部门名称")
+    private String deptName;
+    @ApiModelProperty("办结日期")
+    private String finishTime;
+    @ApiModelProperty("实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("环节id")
+    private String nodeId;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("创建组织")
+    private String createOrgName;
+    @ApiModelProperty("关联审批单")
+    private String linkFormSids;
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java

@@ -0,0 +1,47 @@
+package com.yxt.anrui.oa.biz.oaform;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/7
+ **/
+@Data
+public class OaFormDto {
+
+    private String sid;
+
+    @ApiModelProperty("创建人")
+    private String createByName;
+    @ApiModelProperty("公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("公司名称")
+    private String useOrgName;
+    @ApiModelProperty("部门sid")
+    private String deptSid;
+    @ApiModelProperty("部门名称")
+    private String deptName;
+    @ApiModelProperty("办结日期")
+    private String finishTime;
+    @ApiModelProperty("实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("环节id")
+    private String nodeId;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("创建组织")
+    private String createOrgName;
+    @ApiModelProperty("关联审批单")
+    private String linkFormSids;
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.java

@@ -1,7 +1,11 @@
 package com.yxt.anrui.oa.biz.oaform;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @description:
@@ -10,4 +14,7 @@ import org.apache.ibatis.annotations.Mapper;
  **/
 @Mapper
 public interface OaFormMapper extends BaseMapper<OaForm> {
+    OaFormDetailsVo fetchDetailsBySid(String sid);
+
+    IPage<OaFormVo> selectPageVo(IPage<OaForm> page, @Param(Constants.WRAPPER) QueryWrapper<OaForm> qw);
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.xml

@@ -1,4 +1,18 @@
 <?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.yxt.anrui.oa.biz.oaform.OaFormMapper">
+    <select id="fetchDetailsBySid" resultType="com.yxt.anrui.oa.biz.oaform.OaFormDetailsVo">
+        select *
+        from oa_form
+        where sid = #{sid}
+    </select>
+
+    <select id="selectPageVo" resultType="com.yxt.anrui.oa.biz.oaform.OaFormVo">
+        select *
+        from oa_form
+        <where>
+            1=1 and
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.oa.biz.oaform;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/7
+ **/
+@Data
+public class OaFormQuery implements Query {
+    private static final long serialVersionUID = 2329171644870505548L;
+
+    
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java

@@ -1,6 +1,19 @@
 package com.yxt.anrui.oa.biz.oaform;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.oa.biz.oahireapply.OaHireApplyDetailsVo;
+import com.yxt.anrui.oa.biz.oaleaveapply.OaLeaveApply;
+import com.yxt.anrui.oa.biz.oaleaveapply.OaLeaveApplyQuery;
+import com.yxt.anrui.oa.biz.oaleaveapply.OaLeaveApplyVo;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 
 /**
@@ -10,4 +23,43 @@ import org.springframework.stereotype.Service;
  **/
 @Service
 public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
+    public ResultBean<String> saveOrUpdateForm(OaFormDto dto) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        if (StringUtils.isBlank(sid)) {//新增
+            OaForm oaForm = new OaForm();
+            BeanUtil.copyProperties(dto, oaForm, "sid");
+            baseMapper.insert(oaForm);
+            sid = oaForm.getSid();
+        } else {
+            OaForm oaForm = fetchBySid(sid);
+            BeanUtil.copyProperties(dto, oaForm, "sid");
+            baseMapper.updateById(oaForm);
+        }
+        return rb.success().setData(sid);
+    }
+
+    public ResultBean<OaFormDetailsVo> fetchDetailsBySid(String sid) {
+        ResultBean<OaFormDetailsVo> rb = ResultBean.fireFail();
+        OaFormDetailsVo detailsVo = baseMapper.fetchDetailsBySid(sid);
+        if (detailsVo == null) {
+            return rb.setMsg("该表单不存在");
+        }
+        return rb.success().setData(detailsVo);
+    }
+
+    public PagerVo<OaFormVo> listPageVo(PagerQuery<OaFormQuery> pq) {
+        OaFormQuery query = pq.getParams();
+        QueryWrapper<OaForm> qw = new QueryWrapper<>();
+        IPage<OaForm> page = PagerUtil.queryToPage(pq);
+        IPage<OaFormVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<OaFormVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean delAll(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        delBySids(sids);
+        return rb.success();
+    }
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormVo.java

@@ -0,0 +1,44 @@
+package com.yxt.anrui.oa.biz.oaform;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/7
+ **/
+@Data
+public class OaFormVo {
+
+    private String sid;
+
+    @ApiModelProperty("创建人")
+    private String createByName;
+    @ApiModelProperty("公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("公司名称")
+    private String useOrgName;
+    @ApiModelProperty("部门sid")
+    private String deptSid;
+    @ApiModelProperty("部门名称")
+    private String deptName;
+    @ApiModelProperty("办结日期")
+    private String finishTime;
+    @ApiModelProperty("实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("环节id")
+    private String nodeId;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("创建组织")
+    private String createOrgName;
+    @ApiModelProperty("关联审批单")
+    private String linkFormSids;
+}