Merge branch 'fu-dev' of uskycloud/usky-modules into server-165

service-oa/service-oa-biz/src/main/java/com/usky/oa/controller/web/OaApprovalController.java

@@ -27,53 +27,14 @@ public class OaApprovalController {
     private OaApprovalService oaApprovalService;
 
     /**
-     * @description: 新增审批
-     * @author: fyc
-     * @email yuchuan.fu@chinausky.com
-     * @date: 2024/12/30 16:18
-     * @param: []
-     * @return: void
-     **/
-    @PostMapping("/add")
-    public void addApproval() {
-
-    }
-
-    /**
-     * @description: 修改审批
-     * @author: fyc
-     * @email yuchuan.fu@chinausky.com
-     * @date: 2024/12/30 16:19
-     * @param: []
-     * @return: void
-     **/
-    @PostMapping("/update")
-    public void updateApproval() {
-
-    }
-
-    /**
-     * @description: 删除审批
-     * @author: fyc
-     * @email yuchuan.fu@chinausky.com
-     * @date: 2024/12/30 16:19
-     * @param: []
-     * @return: void
-     **/
-    @DeleteMapping("/del")
-    public void delApproval() {
-
-    }
-
-    /**
-     * @description: 获取审批数量
+     * @description: 审批数量统计
      * @author: fyc
      * @email yuchuan.fu@chinausky.com
      * @date: 2024/12/30 16:19
      * @param: []
      * @return: void
      **/
-    @GetMapping("/approvalCount")
+    @GetMapping("/count")
     public OaApprovalCountVO approvalCount() {
         return oaApprovalService.approvalCount();
     }

service-oa/service-oa-biz/src/main/java/com/usky/oa/controller/web/OaDocumentController.java

@@ -2,10 +2,15 @@ package com.usky.oa.controller.web;
 
 
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.common.mybatis.core.CrudService;
 import com.usky.oa.domain.OaDocument;
 import com.usky.oa.service.OaDocumentService;
 import com.usky.oa.service.vo.OaApprovalCountVO;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
@@ -27,10 +32,11 @@ public class OaDocumentController {
     @Autowired
     private OaDocumentService oaDocumentService;
 
+    // 我的申请
     @GetMapping("/myApplication")
     public CommonPage<OaDocument> myApplication(@RequestParam(value = "docNo", required = false) String docNo,
                                                 @RequestParam(value = "type", required = false) String type,
-                                                @RequestParam(value = "status", required = false) Integer status,
+                                                @RequestParam(value = "docStatus", required = false) Integer status,
                                                 @RequestParam(value = "startTime", required = false) String startTime,
                                                 @RequestParam(value = "endTime", required = false) String endTime,
                                                 @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
@@ -38,16 +44,37 @@ public class OaDocumentController {
         return oaDocumentService.myApplication(docNo, type, status, startTime, endTime, pageNum, pageSize);
     }
 
+    @Log(title = "新增单据", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public void addDocument(@RequestBody Object oaDocument) {
+        oaDocumentService.addDoc(oaDocument);
+    }
+
+    // 删除单据
+    @Log(title = "删除单据", businessType = BusinessType.DELETE)
+    @DeleteMapping("/delDoc/{docNo}")
+    public void delDocument(@PathVariable(value = "docNo") String docNo) {
+        oaDocumentService.delDocument(docNo);
+    }
+
+    // 单据详情
     @GetMapping("/documentDetails")
-    public Object documentDetails(@RequestParam(value = "docNo") String docNo,
-                                  @RequestParam(value = "type") String type) {
-        return oaDocumentService.documentDetails(docNo, type);
+    public Object documentDetails(@RequestParam(value = "docNo") String docNo) {
+        return oaDocumentService.documentDetails(docNo);
+    }
+
+    @Log(title = "更新单据", businessType = BusinessType.UPDATE)
+    @GetMapping("/update")
+    public OaDocument approvalCount(@RequestBody OaDocument oaDocument) {
+        return oaDocumentService.updateDoc(oaDocument);
     }
 
-    @DeleteMapping("/delDocument")
-    public void delDocument(@RequestParam(value = "type") String type,
-                            @RequestParam(value = "docNo") String docNo) {
-        oaDocumentService.delDocument(type, docNo);
+    // 提交单据
+    @Log(title = "提交单据", businessType = BusinessType.UPDATE)
+    @PutMapping("/submit")
+    public void submit(@RequestParam(value = "docNo") String docNo,
+                       @RequestParam(value = "docStatus") Integer status){
+        oaDocumentService.submit(docNo, status);
     }
 
 }

service-oa/service-oa-biz/src/main/java/com/usky/oa/controller/web/OaFormDefinitionController.java

@@ -50,8 +50,8 @@ public class OaFormDefinitionController {
 
     // 删除表单
     @Log(title = "删除表单", businessType = BusinessType.DELETE)
-    @DeleteMapping("{delForm}")
-    public void delForm(@RequestParam Integer formId) {
+    @DeleteMapping("/delForm/{formId}")
+    public void delForm(@PathVariable Integer formId) {
         oaFormDefinitionService.delForm(formId);
     }
 
@@ -84,8 +84,10 @@ public class OaFormDefinitionController {
 
     // 表单名称列表
     @GetMapping("/getFormName")
-    public List<OaFormNameResponseVO> getFormName() {
-        return oaFormDefinitionService.getFormName();
+    public List<OaFormNameResponseVO> getFormName(@RequestParam(value = "formSign", required = false) String formSign,
+                                                  @RequestParam(value = "formName", required = false) String formName,
+                                                  @RequestParam(value = "formId", required = false) Integer formId) {
+        return oaFormDefinitionService.getFormName(formSign, formName, formId);
     }
 
 

service-oa/service-oa-biz/src/main/java/com/usky/oa/controller/web/OaQjdDocumentController.java

@@ -46,5 +46,4 @@ public class OaQjdDocumentController {
         oaQjdDocumentService.delQjDocument(docNo);
     }
 
-}
-
+}

service-oa/service-oa-biz/src/main/java/com/usky/oa/domain/OaApproval.java

@@ -30,19 +30,9 @@ public class OaApproval implements Serializable {
     private Integer id;
 
     /**
-     * 单据id
+     * 单据编号
      */
-    private Integer docId;
-
-    /**
-     * 流程id
-     */
-    private Integer flowId;
-
-    /**
-     * 审批节点id
-     */
-    private Integer nodeId;
+    private String docNo;
 
     /**
      * 审批人id
@@ -55,9 +45,9 @@ public class OaApproval implements Serializable {
     private Integer type;
 
     /**
-     * 审批状态(0:审批中, 1:审批通过, 2:审批不通过, 3:撤销)
+     * 审批状态(1:审批中, 2:审批通过, 3:审批不通过)
      */
-    private Integer status;
+    private Integer approvalStatus;
 
     /**
      * 审批意见

service-oa/service-oa-biz/src/main/java/com/usky/oa/domain/OaDocument.java

@@ -50,7 +50,7 @@ public class OaDocument implements Serializable {
     /**
      * 单据状态 (0:未提交可以修改,1:审批中,2:审批通过,3:审批不通过)
      */
-    private Integer status;
+    private Integer docStatus;
 
     /**
      * 创建者

service-oa/service-oa-biz/src/main/java/com/usky/oa/domain/OaJbdDocument.java

@@ -48,7 +48,7 @@ public class OaJbdDocument implements Serializable {
     /**
      * 单据状态 (0:未提交可以修改,1:审批中,2:审批通过,3:审批不通过,4:撤销)
      */
-    private Integer status;
+    private Integer docStatus;
 
     /**
      * 开始日期

service-oa/service-oa-biz/src/main/java/com/usky/oa/domain/OaQjdDocument.java

@@ -54,7 +54,7 @@ public class OaQjdDocument implements Serializable {
     /**
      * 单据状态 (0:未提交可以修改,1:审批中,2:审批通过,3:审批不通过,4:撤销)
      */
-    private Integer status;
+    private Integer docStatus;
 
     /**
      * 开始日期

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/OaDocumentService.java

@@ -35,7 +35,7 @@ public interface OaDocumentService extends CrudService<OaDocument> {
      * @param: []
      * @return: java.util.List<com.usky.oa.domain.OaDocument>
      **/
-    Object documentDetails(String docNo, String type);
+    Object documentDetails(String docNo);
 
     /**
      * @description: 删除单据
@@ -45,6 +45,35 @@ public interface OaDocumentService extends CrudService<OaDocument> {
      * @param: []
      * @return: java.util.List<com.usky.oa.domain.OaDocument>
      **/
-    void delDocument(String type, String docNo);
+    void delDocument(String docNo);
 
+    /**
+     * @description: 新增单据
+     * @author: fyc
+     * @email yuchuan.fu@chinausky.com
+     * @date: 2025/1/6 16:32
+     * @param: [oaDocument]
+     * @return: void
+     **/
+    void addDoc(Object oaDocument);
+
+    /**
+     * @description: 修改单据
+     * @author: fyc
+     * @email yuchuan.fu@chinausky.com
+     * @date: 2025/1/6 16:34
+     * @param: [oaDocument]
+     * @return: com.usky.oa.domain.OaDocument
+     **/
+    OaDocument updateDoc(OaDocument oaDocument);
+
+    /**
+     * @description: 提交单据
+     * @author: fyc
+     * @email yuchuan.fu@chinausky.com
+     * @date: 2025/1/6 16:34
+     * @param: [docNo]
+     * @return: void
+     **/
+    void submit(String docNo, Integer status);
 }

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/OaFormDefinitionService.java

@@ -67,6 +67,6 @@ public interface OaFormDefinitionService extends CrudService<OaFormDefinition> {
      * @param: []
      * @return: java.util.Map<java.lang.Integer,java.lang.String>
      **/
-    List<OaFormNameResponseVO> getFormName();
+    List<OaFormNameResponseVO> getFormName(String formSign, String formName, Integer formId);
 
 }

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/impl/OaApprovalServiceImpl.java

@@ -38,39 +38,53 @@ public class OaApprovalServiceImpl extends AbstractCrudService<OaApprovalMapper,
         Integer tenantId = SecurityUtils.getTenantId();
 
         OaApprovalCountVO oaApprovalCountVO = new OaApprovalCountVO();
-        oaApprovalCountVO.setPendingSum(getPendingSum().size());
+        // 待处理
+        oaApprovalCountVO.setPendingSum(getPendingSum(tenantId, userId).size());
+        // 已处理
+        oaApprovalCountVO.setAlreadySum(getAlreadySum(tenantId, userId).size());
+        // 我发起
+        oaApprovalCountVO.setMyInitiated(getMyInitiated(tenantId, username).size());
+        // 我收到
+        oaApprovalCountVO.setMyReceived(getMyReceived(tenantId, userId).size());
 
-        LambdaQueryWrapper<OaApproval> queryWrapper1 = Wrappers.lambdaQuery();
-        queryWrapper1.eq(OaApproval::getTenantId, tenantId)
+        return oaApprovalCountVO;
+    }
+
+    private List<OaApproval> getPendingSum(Integer tenantId, Long userId){
+        LambdaQueryWrapper<OaApproval> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(OaApproval::getTenantId, tenantId)
+                .eq(OaApproval::getApprovalUid, userId)
+                .eq(OaApproval::getApprovalStatus, 1);
+        List<OaApproval> oaApprovals = oaApprovalMapper.selectList(queryWrapper);
+        return oaApprovals == null ? Collections.emptyList() : oaApprovals;
+    }
+
+    private List<OaApproval> getAlreadySum(Integer tenantId, Long userId){
+        LambdaQueryWrapper<OaApproval> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(OaApproval::getTenantId, tenantId)
                 .eq(OaApproval::getApprovalUid, userId)
                 .and(wrapper -> wrapper
-                        .eq(OaApproval::getStatus, 1)
+                        .eq(OaApproval::getApprovalStatus, 2)
                         .or()
-                        .eq(OaApproval::getStatus, 2));
-        Integer count1 = oaApprovalMapper.selectCount(queryWrapper1);
-        oaApprovalCountVO.setAlreadySum(count1);
-
-        LambdaQueryWrapper<OaApproval> queryWrapper2 = Wrappers.lambdaQuery();
-        queryWrapper2.eq(OaApproval::getTenantId, tenantId).eq(OaApproval::getCreateBy, username);
-        Integer count2 = oaApprovalMapper.selectCount(queryWrapper2);
-        oaApprovalCountVO.setMyInitiated(count2);
-
-        LambdaQueryWrapper<OaApproval> queryWrapper3 = Wrappers.lambdaQuery();
-        queryWrapper3.eq(OaApproval::getTenantId, tenantId)
-                .eq(OaApproval::getApprovalUid, userId);
-        Integer count3 = oaApprovalMapper.selectCount(queryWrapper3);
-        oaApprovalCountVO.setMyReceived(count3);
-
-        return oaApprovalCountVO;
+                        .eq(OaApproval::getApprovalStatus, 3));
+        List<OaApproval> oaApprovals = oaApprovalMapper.selectList(queryWrapper);
+        return oaApprovals == null ? Collections.emptyList() : oaApprovals;
     }
 
-    private List<OaApproval> getPendingSum(){
+    private List<OaApproval> getMyInitiated(Integer tenantId, String username){
         LambdaQueryWrapper<OaApproval> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(OaApproval::getTenantId, SecurityUtils.getTenantId())
-                .eq(OaApproval::getApprovalUid, SecurityUtils.getUserId())
-                .eq(OaApproval::getStatus, 0);
+        queryWrapper.eq(OaApproval::getTenantId, tenantId)
+                .eq(OaApproval::getCreateBy, username);
         List<OaApproval> oaApprovals = oaApprovalMapper.selectList(queryWrapper);
         return oaApprovals == null ? Collections.emptyList() : oaApprovals;
     }
 
+    private List<OaApproval> getMyReceived(Integer tenantId, Long userId){
+        LambdaQueryWrapper<OaApproval> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(OaApproval::getTenantId, tenantId)
+                .eq(OaApproval::getApprovalUid, userId);
+        List<OaApproval> oaApprovals = oaApprovalMapper.selectList(queryWrapper);
+        return oaApprovals== null ? Collections.emptyList() : oaApprovals;
+    }
+
 }

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/impl/OaDocumentServiceImpl.java

@@ -52,7 +52,7 @@ public class OaDocumentServiceImpl extends AbstractCrudService<OaDocumentMapper,
         wrapper.eq(OaDocument::getTenantId, tenantId).eq(OaDocument::getProposer, userId)
                 .like(StringUtils.isNotBlank(docNo), OaDocument::getDocNo, docNo)
                 .eq(StringUtils.isNotBlank(type), OaDocument::getType, type)
-                .eq(status != null, OaDocument::getStatus, status)
+                .eq(status != null, OaDocument::getDocStatus, status)
                 .between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime), OaDocument::getCreateTime, startTime, endTime)
                 .orderByDesc(OaDocument::getId);
 
@@ -60,9 +60,10 @@ public class OaDocumentServiceImpl extends AbstractCrudService<OaDocumentMapper,
     }
 
     @Override
-    public Object documentDetails(String docNo, String type) {
-
+    public Object documentDetails(String docNo) {
         Object documentDetails = null;
+        String type = getFormSign(docNo);
+
         switch (type) {
             case "QJD":
                 documentDetails = oaQjdDocumentMapper.selectOne(Wrappers.lambdaQuery(OaQjdDocument.class).eq(OaQjdDocument::getDocNo, docNo));
@@ -76,8 +77,8 @@ public class OaDocumentServiceImpl extends AbstractCrudService<OaDocumentMapper,
     }
 
     @Override
-    public void delDocument(String type, String docNo) {
-
+    public void delDocument(String docNo) {
+        String type = getFormSign(docNo);
         switch (type) {
             case "QJD":
                 oaQjdDocumentMapper.delete(Wrappers.lambdaQuery(OaQjdDocument.class).eq(OaQjdDocument::getDocNo, docNo));
@@ -89,4 +90,42 @@ public class OaDocumentServiceImpl extends AbstractCrudService<OaDocumentMapper,
         oaDocumentMapper.delete(Wrappers.lambdaQuery(OaDocument.class).eq(OaDocument::getDocNo, docNo));
     }
 
+    @Override
+    public void addDoc(Object oaDocument) {
+
+    }
+
+    @Override
+    public OaDocument updateDoc(OaDocument oaDocument) {
+        return null;
+    }
+
+    @Override
+    public void submit(String docNo, Integer status) {
+        if (status != 1) {
+            throw new RuntimeException("单据提交异常，请联系管理员！");
+        }
+        String formSign = getFormSign(docNo);
+        switch (formSign) {
+            case "QJD":
+                oaQjdDocumentMapper.update(null, Wrappers.lambdaUpdate(OaQjdDocument.class).set(OaQjdDocument::getDocStatus, status).eq(OaQjdDocument::getDocNo, docNo));
+                break;
+            case "JBD":
+                oaJbdDocumentMapper.update(null, Wrappers.lambdaUpdate(OaJbdDocument.class).set(OaJbdDocument::getDocStatus, status).eq(OaJbdDocument::getDocNo, docNo));
+        }
+        oaDocumentMapper.update(null, Wrappers.lambdaUpdate(OaDocument.class).set(OaDocument::getDocStatus, status).eq(OaDocument::getDocNo, docNo));
+    }
+
+    private String getFormSign(String docNo) {
+        if (StringUtils.isBlank(docNo)) {
+            throw new RuntimeException("单据号不能为空！");
+        } else if (docNo.split("-").length != 2 ||
+                docNo.split("-")[0].length() > 4 ||
+                docNo.split("-")[0].length() < 3 ||
+                docNo.split("-")[1].length() != 14) {
+            throw new RuntimeException("单据号格式错误！");
+        }
+        return docNo.split("-")[0];
+    }
+
 }

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/impl/OaFormDefinitionServiceImpl.java

@@ -200,10 +200,23 @@ public class OaFormDefinitionServiceImpl extends AbstractCrudService<OaFormDefin
     }
 
     @Override
-    public List<OaFormNameResponseVO> getFormName() {
+    public List<OaFormNameResponseVO> getFormName(String formSign, String formName, Integer formId) {
+        Long userId = SecurityUtils.getUserId();
+        Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
+        Integer tenantId = SecurityUtils.getTenantId();
         LambdaQueryWrapper<OaFormDefinition> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(OaFormDefinition::getTenantId, SecurityUtils.getTenantId())
-                .select(OaFormDefinition::getId, OaFormDefinition::getFormName, OaFormDefinition::getFormSign);
+        queryWrapper.select(OaFormDefinition::getId, OaFormDefinition::getFormName, OaFormDefinition::getFormSign)
+                .eq(OaFormDefinition::getTenantId, tenantId)
+                .eq(StringUtils.isNotBlank(formSign), OaFormDefinition::getFormSign, formSign)
+                .eq(StringUtils.isNotBlank(formName), OaFormDefinition::getFormName, formName)
+                .eq(formId != null && formId > 0, OaFormDefinition::getId, formId)
+                .eq(OaFormDefinition::getFormStatus, 1)
+                .and(qw -> qw
+                        .eq(OaFormDefinition::getFormScope, 1)
+                        .or()
+                        .apply("FIND_IN_SET('" + deptId + "', dept_ids) > 0")
+                        .or()
+                        .apply("FIND_IN_SET('" + userId + "', user_ids) > 0"));
         List<OaFormDefinition> oaFormDefinitions = oaFormDefinitionMapper.selectList(queryWrapper);
 
         List<OaFormNameResponseVO> formNameList = new ArrayList<>();

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/impl/OaJbdDocumentServiceImpl.java

@@ -50,7 +50,6 @@ public class OaJbdDocumentServiceImpl extends AbstractCrudService<OaJbdDocumentM
         validateOaJbDocument(oaJbdDocument);
 
         oaJbdDocument.setDocNo(docNo);
-        oaJbdDocument.setStatus(0);
         oaJbdDocument.setAccountingMethod(0);
         oaJbdDocument.setProposer(userId);
         oaJbdDocument.setCreateBy(username);
@@ -64,7 +63,7 @@ public class OaJbdDocumentServiceImpl extends AbstractCrudService<OaJbdDocumentM
         oaDocument.setType(sign);
         oaDocument.setDocNo(docNo);
         oaDocument.setProposer(userId);
-        oaDocument.setStatus(oaJbdDocument.getStatus());
+        oaDocument.setDocStatus(oaJbdDocument.getDocStatus());
         oaDocument.setCreateBy(username);
         oaDocument.setCreateTime(oaJbdDocument.getCreateTime());
         oaDocument.setDeptId(deptId);
@@ -83,7 +82,7 @@ public class OaJbdDocumentServiceImpl extends AbstractCrudService<OaJbdDocumentM
         oaJbdDocumentMapper.updateById(oaJbdDocument);
 
         oaDocumentMapper.update(null, Wrappers.lambdaUpdate(OaDocument.class)
-                .set(OaDocument::getStatus, oaJbdDocument.getStatus())
+                .set(OaDocument::getDocStatus, oaJbdDocument.getDocStatus())
                 .set(OaDocument::getUpdateBy, oaJbdDocument.getCreateBy())
                 .set(OaDocument::getUpdateTime, oaJbdDocument.getUpdateTime())
         );

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/impl/OaQjdDocumentServiceImpl.java

@@ -55,7 +55,6 @@ public class OaQjdDocumentServiceImpl extends AbstractCrudService<OaQjdDocumentM
         // 插入请假表数据
         oaQjdDocument.setDocNo(docNo);
         oaQjdDocument.setProposer(userId);
-        oaQjdDocument.setStatus(0);
         oaQjdDocument.setCreateBy(username);
         oaQjdDocument.setCreateTime(now);
         oaQjdDocument.setDeptId(deptId);
@@ -68,7 +67,7 @@ public class OaQjdDocumentServiceImpl extends AbstractCrudService<OaQjdDocumentM
         oaDocument.setType(sign);
         oaDocument.setDocNo(docNo);
         oaDocument.setProposer(userId);
-        oaDocument.setStatus(oaQjdDocument.getStatus());
+        oaDocument.setDocStatus(oaQjdDocument.getDocStatus());
         oaDocument.setCreateBy(username);
         oaDocument.setCreateTime(oaQjdDocument.getCreateTime());
         oaDocument.setDeptId(deptId);
@@ -91,7 +90,7 @@ public class OaQjdDocumentServiceImpl extends AbstractCrudService<OaQjdDocumentM
         oaQjdDocumentMapper.updateById(oaQjdDocument);
 
         oaDocumentMapper.update(null, Wrappers.lambdaUpdate(OaDocument.class)
-                .set(OaDocument::getStatus, oaQjdDocument.getStatus())
+                .set(OaDocument::getDocStatus, oaQjdDocument.getDocStatus())
                 .set(OaDocument::getUpdateBy, username)
                 .set(OaDocument::getUpdateTime, oaQjdDocument.getUpdateTime())
         );

service-oa/service-oa-biz/src/main/resources/mapper/oa/OaApprovalMapper.xml

@@ -5,12 +5,10 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.usky.oa.domain.OaApproval">
         <id column="id" property="id" />
-        <result column="doc_id" property="docId" />
-        <result column="flow_id" property="flowId" />
-        <result column="node_id" property="nodeId" />
+        <result column="doc_no" property="docNo" />
         <result column="approval_uid" property="approvalUid" />
         <result column="type" property="type" />
-        <result column="status" property="status" />
+        <result column="approval_status" property="approvalStatus" />
         <result column="opinion" property="opinion" />
         <result column="submit_date" property="submitDate" />
         <result column="approval_date" property="approvalDate" />

service-oa/service-oa-biz/src/main/resources/mapper/oa/OaDocumentMapper.xml

@@ -9,7 +9,7 @@
         <result column="type" property="type" />
         <result column="doc_no" property="docNo" />
         <result column="proposer" property="proposer" />
-        <result column="status" property="status" />
+        <result column="doc_status" property="docStatus" />
         <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
         <result column="update_by" property="updateBy" />

service-oa/service-oa-biz/src/main/resources/mapper/oa/OaJbdDocumentMapper.xml

@@ -8,7 +8,7 @@
         <result column="form_id" property="formId" />
         <result column="doc_no" property="docNo" />
         <result column="proposer" property="proposer" />
-        <result column="status" property="status" />
+        <result column="doc_status" property="docStatus" />
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
         <result column="duration" property="duration" />

service-oa/service-oa-biz/src/main/resources/mapper/oa/OaQjdDocumentMapper.xml

@@ -6,10 +6,9 @@
     <resultMap id="BaseResultMap" type="com.usky.oa.domain.OaQjdDocument">
         <id column="id" property="id" />
         <result column="type" property="type" />
-        <result column="node_id" property="nodeId" />
         <result column="doc_no" property="docNo" />
         <result column="proposer" property="proposer" />
-        <result column="status" property="status" />
+        <result column="doc_status" property="docStatus" />
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
         <result column="duration" property="duration" />