验收材料附件

zjugis-business/src/main/java/com/zjugis/business/controller/ProjectController.java

@@ -182,7 +182,11 @@ public class ProjectController{
     public CommonResult<List<zTree>> materialTree(@RequestParam("projectId") String projectId) {
        // Project project = projectService.selectDOById(projectId);
         ProjectStatusDO projectStatusDO=projectStatusService.findByProjectId(projectId);
-        return workflowClient.getTree(projectStatusDO!=null?projectStatusDO.getInstanceId():"");
+        if(projectStatusDO!=null){
+            return workflowClient.getTree(projectStatusDO.getInstanceId());
+        }else{
+            return workflowClient.getTree("");
+        }
     }
 
     @PostMapping("/project-material-upload")

zjugis-business/src/main/java/com/zjugis/business/flow/projectStatus/dao/ProjectStatusDao.java

@@ -16,7 +16,6 @@ public interface ProjectStatusDao extends BaseMapperX<ProjectStatusDO> {
         return selectOne(new LambdaQueryWrapperX<ProjectStatusDO>().eqIfPresent(ProjectStatusDO::getInstanceId, flowInstanceId).eqIfPresent(ProjectStatusDO::getIsvalid, "1"));
     }
 
-    default ProjectStatusDO findByProjectId(String projectId) {
-        return selectOne(new LambdaQueryWrapperX<ProjectStatusDO>().eqIfPresent(ProjectStatusDO::getProjectId, projectId).eqIfPresent(ProjectStatusDO::getIsvalid, "1"));
-    }
+
+    ProjectStatusDO findByProjectId(String projectId);
 }

zjugis-business/src/main/java/com/zjugis/business/flow/projectStatus/entity/ProjectStatusDO.java

@@ -77,7 +77,8 @@ public class ProjectStatusDO extends BaseEntity {
      */
     @TableField(exist = false)
     private BigDecimal contractAmount;
-
+    @TableField(exist = false)
+    private BigDecimal rownum;
     /**
      * 流程类型
      */

zjugis-business/src/main/resources/mapper/oracle/ProjectStatusMapper.xml

@@ -0,0 +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.zjugis.business.flow.projectStatus.dao.ProjectStatusDao">
+
+
+    <select id="findByProjectId" resultType="com.zjugis.business.flow.projectStatus.entity.ProjectStatusDO">
+        SELECT *
+         from  PROJECT_STATUS
+        <where>
+            ISVALID = 1  and type='ys'
+           AND project_id = #{projectId} and rownum=1
+        </where>
+        order  by
+        accept_time desc
+    </select>
+
+</mapper>
+

zjugis-workflow/src/main/java/com/zjugis/z_workflow/service/IFlowMaterialsTreeService.java

@@ -46,6 +46,8 @@ public class IFlowMaterialsTreeService {
 	private PersionKeyValueService persionKeyValueService;
 	@Autowired
 	private CallInterfaceService callInterfaceService;
+    @Autowired
+    private TFlowMaterialsCatalogService TFlowMaterialsCatalogService;
 
 	public List<zTree> getTree(String flowInstanceId, String activityInstanceId) throws Exception {
 		List<zTree> rtnList = null;
@@ -64,6 +66,9 @@ public class IFlowMaterialsTreeService {
 	}
 
     public List<zTree> getAllTree(String flowInstanceId) throws Exception {
+        if("".equals(flowInstanceId)){
+            return TFlowMaterialsCatalogService.GetTreeData("019023d16d51000196de8ff219e54853");
+        }
         List<zTree> rtnList = null;
         Comm comm = buildComm(flowInstanceId);
         buildCatalogNode(comm);