Commit 476d3454 authored by 曹盼盼's avatar 曹盼盼

修改

parent 746485ef
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
SELECT * FROM tz_ugp_project SELECT * FROM tz_ugp_project
<where> <where>
is_delete = 0 is_delete = 0
and status <![CDATA[<>]]>'流程结束!' and status <![CDATA[<>]]>'竣工流程结束!'
<if test="roleName == '建设单位'"> <if test="roleName == '建设单位'">
and construction_unit_id = #{companyId} and construction_unit_id = #{companyId}
</if> </if>
......
...@@ -303,7 +303,7 @@ public class ProjectResourceController extends BaseController { ...@@ -303,7 +303,7 @@ public class ProjectResourceController extends BaseController {
@ApiOperation(httpMethod = "get",value = "根据当前登录人获取登录人参与的项目列表", notes = "根据当前登录人获取登录人参与的项目列表") @ApiOperation(httpMethod = "get",value = "根据当前登录人获取登录人参与的项目列表", notes = "根据当前登录人获取登录人参与的项目列表")
public ResponseModel<List<Project>> selectByUserId(){ public ResponseModel<List<Project>> selectByUserId(){
List<Project> projectList = projectResourceServiceImpl.getProjectList(); List<Project> projectList = projectResourceServiceImpl.getProjectList();
projectList = projectList.stream().filter(r -> "竣工流程结束!".equals(r.getStatus())).collect(Collectors.toList()); projectList = projectList.stream().filter(r -> !"竣工流程结束!".equals(r.getStatus())).collect(Collectors.toList());
return ResponseHelper.buildResponse(projectList); return ResponseHelper.buildResponse(projectList);
} }
} }
...@@ -379,7 +379,8 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper ...@@ -379,7 +379,8 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
//从图片中获取管材编号materialId //从图片中获取管材编号materialId
//管材编号(暂时写死) //管材编号(暂时写死)
String url = photo; String url = photo;
String materialCode = getMaterialCodeByOcr(url); //String materialCode = getMaterialCodeByOcr(url);
String materialCode="GB/T911-1999";
verify.setStage(StageEnum.焊前管材质量.getStage()); verify.setStage(StageEnum.焊前管材质量.getStage());
/**校验*/ /**校验*/
Boolean flag =false; Boolean flag =false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment