项目库根据id查询审批情况

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.poi.ProjectExcelUtil;
 import com.ruoyi.common.utils.poi.ProjectValueUtil;
+import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo;
 import com.ruoyi.jjh.ent.entity.JProject;
 import com.ruoyi.jjh.ent.entity.request.JProjectExcel;
 import com.ruoyi.jjh.ent.service.JProjectService;
@@ -70,9 +71,22 @@ public class JProjectController extends BaseController {
     @ApiOperation(value = "通过主键查询单条项目", response = JProject.class)
     @GetMapping("{id}")
     public AjaxResult selectOne(@PathVariable Serializable id) {
-        return success(this.jProjectService.getById(id));
+        return success(jProjectService.getById(id));
     }
 
+    /**
+     * 通过主键查询该项目的在线流程
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @ApiOperation(value = "通过主键查询该项目的在线流程", response = BmsApprovalInfoQueryVo.class)
+    @GetMapping("/declarationRecordsId/{id}")
+    public AjaxResult getApprovalInfoList(@PathVariable Serializable id) {
+        return success(jProjectService.getApprovalInfoList(id));
+    }
+
+
     /**
      * 新增数据
      *
@@ -82,7 +96,7 @@ public class JProjectController extends BaseController {
     @ApiOperation(value = "新增项目")
     @PostMapping
     public AjaxResult insert(@RequestBody JProject jProject) {
-        return success(this.jProjectService.save(jProject));
+        return success(jProjectService.save(jProject));
     }
 
     /**
@@ -94,7 +108,7 @@ public class JProjectController extends BaseController {
     @ApiOperation(value = "修改项目")
     @PutMapping
     public AjaxResult update(@RequestBody JProject jProject) {
-        return success(this.jProjectService.updateById(jProject));
+        return success(jProjectService.updateById(jProject));
     }
 
     /**
@@ -106,7 +120,7 @@ public class JProjectController extends BaseController {
     @ApiOperation(value = "删除项目")
     @DeleteMapping
     public AjaxResult delete(@RequestParam("id") Long id) {
-        return success(this.jProjectService.removeById(id));
+        return success(jProjectService.removeById(id));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectMapper.java

@@ -2,9 +2,13 @@ package com.ruoyi.jjh.ent.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo;
 import com.ruoyi.jjh.ent.entity.JProject;
 import org.apache.ibatis.annotations.Param;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * 项目表(JProject)表数据库访问层
  *
@@ -21,5 +25,13 @@ public interface JProjectMapper extends BaseMapper<JProject> {
      * @return 所有数据
      */
     Page<JProject> page(Page<JProject> page,@Param("req") JProject jProject);
+
+    /**
+     * 通过主键查询该项目的在线流程
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    List<BmsApprovalInfoQueryVo> getApprovalInfoList(@Param("id") Serializable id);
 }
 

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java

@@ -2,8 +2,12 @@ package com.ruoyi.jjh.ent.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo;
 import com.ruoyi.jjh.ent.entity.JProject;
 
+import java.io.Serializable;
+import java.util.List;
+
 
 /**
  * 项目表(JProject)表服务接口
@@ -22,5 +26,12 @@ public interface JProjectService extends IService<JProject> {
      */
     Page<JProject> page(Page<JProject> page, JProject jProject);
 
+    /**
+     * 通过主键查询该项目的在线流程
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    List<BmsApprovalInfoQueryVo> getApprovalInfoList(Serializable id);
 }
 

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java

@@ -2,11 +2,13 @@ package com.ruoyi.jjh.ent.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo;
 import com.ruoyi.jjh.ent.mapper.JProjectMapper;
 import com.ruoyi.jjh.ent.entity.JProject;
 import com.ruoyi.jjh.ent.service.JProjectService;
 import org.springframework.stereotype.Service;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -30,5 +32,16 @@ public class JProjectServiceImpl extends ServiceImpl<JProjectMapper, JProject> i
         return baseMapper.page(page,jProject);
     }
 
+    /**
+     * 通过主键查询该项目的在线流程
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @Override
+    public List<BmsApprovalInfoQueryVo> getApprovalInfoList(Serializable id) {
+        return baseMapper.getApprovalInfoList(id);
+    }
+
 }
 

ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml

@@ -25,4 +25,24 @@
         </where>
         order by create_time desc ,project_year desc
     </select>
+    <select id="getApprovalInfoList" resultType="com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo">
+        select
+        c.id,
+        c.approval_by_id,
+        d.nick_name AS approvalByName,
+        c.approval_status,
+        c.approval_opinions,
+        c.approval_attachment,
+        c.approval_time,
+        c.is_before_data,
+        c.sort
+        from j_project a
+        left join bms_declaration_records b on a.id = b.jjh_project_id
+        left join  bms_approval_info c on b.id = c.declaration_records_id
+        left join sys_user d on c.approval_by_id = d.user_id
+        <where>
+            a.id=#{id}
+        </where>
+        order by c.sort asc
+    </select>
 </mapper>