From 7d7758747ad44c0be21f3f90b6401d1035b1bfac Mon Sep 17 00:00:00 2001 From: zty <1048209592@qq.com> Date: Mon, 22 Jul 2024 16:58:25 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E9=A1=B9api=E8=B7=AF=E7=94=B1=202.=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=A1=B9=E7=9B=AE=E7=BB=93=E9=A1=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=96=B9=E6=B3=95=203.=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=99=A8taskName=E4=BF=AE=E6=94=B9=204.?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/xqopen/kehui/Api.java | 5 +++++ .../kehui/flows/util/ProjectInitListener.java | 3 ++- .../xqopen/kehui/mapper/ProjectInfoDao.java | 1 + .../kehui/mapper/xml/ProjectInfoDao.xml | 12 +++++++++++ .../project/action/ProjectInitComtroller.java | 20 +++++++++++++++++++ .../kehui/project/api/ProjectInitApi.java | 7 +++++++ .../project/service/IProjectInfoService.java | 8 ++++++++ .../service/impl/ProjectInfoServiceImpl.java | 5 +++++ 8 files changed, 60 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/xqopen/kehui/Api.java b/src/main/java/com/xqopen/kehui/Api.java index 440e16c..907fa2c 100644 --- a/src/main/java/com/xqopen/kehui/Api.java +++ b/src/main/java/com/xqopen/kehui/Api.java @@ -368,6 +368,11 @@ public class Api { public static final String PROJECT_INIT_ADD = PROJECT_INIT+"/add"; public static final String PROJECT_INIT_LIST= PROJECT_INIT+"/list"; public static final String PROJECT_INIT_EDIT= PROJECT_INIT+"/{id}"; + /** + * 项目结项管理 + */ + public static final String PROJECT_INIT_CONCLUSION= PROJECT_INIT+"/conclusion"; + public static final String PROJECT_INIT_CONCLUSION_LIST= PROJECT_INIT_CONCLUSION+"/list"; /*** * 周报填报管理 */ diff --git a/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java b/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java index db1720d..58cf31a 100644 --- a/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java +++ b/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java @@ -142,7 +142,8 @@ public class ProjectInitListener implements ExecutionListener { projectQuarterlyEvaluationService.insert(quarterlyEvaluation); //添加季度审核的状态 JSONObject infoExt = projectInfo.getExt(); - infoExt.put("taskName","季度审核填报");//任务节点 + infoExt.put("taskName","季度审核");//任务节点 +// infoExt.put("executor",executor); infoExt.put("executor",executor); // infoExt.put("executor",getSystemUserLogin(projectManager).getId());//当前委托人 //判断项目负责人是否是办公室部门的 diff --git a/src/main/java/com/xqopen/kehui/mapper/ProjectInfoDao.java b/src/main/java/com/xqopen/kehui/mapper/ProjectInfoDao.java index d898d1d..2d5cbf1 100644 --- a/src/main/java/com/xqopen/kehui/mapper/ProjectInfoDao.java +++ b/src/main/java/com/xqopen/kehui/mapper/ProjectInfoDao.java @@ -41,4 +41,5 @@ public interface ProjectInfoDao extends BaseMapper { ProjectInfo getInfoByProName(@Param("projectName") String projectName); String getProId(@Param("projectName") String projectName); + List conclusionList(Page page, @Param("userId") Long userId); } diff --git a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml index 9f80e91..a855503 100644 --- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml +++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml @@ -165,6 +165,18 @@ from project_info where project_name = #{projectName} + AND ( diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java b/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java index 49f72a3..8873800 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java @@ -27,6 +27,8 @@ import com.xqopen.kehui.project.service.IProjectAssessmentIndicatorsService; import com.xqopen.kehui.project.service.IProjectInfoService; import com.xqopen.kehui.util.ApiResponse; import com.xqopen.kehui.util.JacksonUtil; +import com.xqopen.kehui.util.PageNoUtil; +import com.xqopen.kehui.util.ResultListReqUtil; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.FormService; import org.activiti.engine.IdentityService; @@ -322,5 +324,23 @@ public class ProjectInitComtroller implements ProjectInitApi { } } + /** + * 根据当前当前id获取结项列表 + * @param userId + * @return + */ + @Override + @PostMapping(Api.PROJECT_INIT_CONCLUSION_LIST) + public String conclusionList(@RequestHeader Long userId, @RequestBody PageNoUtil pageNoUtil)throws XQException { + try { + Page page = new Page<>(pageNoUtil.getPageNo(),pageNoUtil.getPageSize()); + List list = infoService.conclusionList(page, userId); + return ApiResponse.fillSuccess(new ResultListReqUtil(list,page.getTotal(),page.getPages())); + }catch (Exception e){ + log.error("ProjectInitController.conclusionList", e); + throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null); + } + } + } diff --git a/src/main/java/com/xqopen/kehui/project/api/ProjectInitApi.java b/src/main/java/com/xqopen/kehui/project/api/ProjectInitApi.java index 82ca09b..49e2075 100644 --- a/src/main/java/com/xqopen/kehui/project/api/ProjectInitApi.java +++ b/src/main/java/com/xqopen/kehui/project/api/ProjectInitApi.java @@ -6,6 +6,7 @@ import com.xqopen.kehui.project.dto.ProjectInfoInitDto; import com.xqopen.kehui.project.dto.ProjectInfoListResp; import com.xqopen.kehui.util.ApiResponse; import com.xqopen.kehui.util.Constants; +import com.xqopen.kehui.util.PageNoUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -32,4 +33,10 @@ public interface ProjectInitApi { @ApiImplicitParam(name = "userId", value = "用户id", required = true, paramType = "header", dataType = "Long"), }) String edit(Long userId, ProjectInfoInitDto initDto, Long id) throws XQException; + @ApiOperation(value = "获取结项列表", notes = "获取结项列表", response = ApiResponse.class) + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "登录标识符", required = true, paramType = "header", dataType = "String"), + @ApiImplicitParam(name = "userId", value = "用户id", required = true, paramType = "header", dataType = "Long"), + }) + String conclusionList(Long userId, PageNoUtil pageNoUtil) throws XQException; } diff --git a/src/main/java/com/xqopen/kehui/project/service/IProjectInfoService.java b/src/main/java/com/xqopen/kehui/project/service/IProjectInfoService.java index b0670b1..4cf7ae9 100644 --- a/src/main/java/com/xqopen/kehui/project/service/IProjectInfoService.java +++ b/src/main/java/com/xqopen/kehui/project/service/IProjectInfoService.java @@ -28,4 +28,12 @@ public interface IProjectInfoService extends IService { ProjectInfo getInfoByProName(String projectName); String getProId(String projectName); + + /** + * 根据创建id拿到结项列表，其实也就是立项人是谁，谁就能结项 + * @param page + * @param userId + * @return + */ + List conclusionList(Page page, Long userId); } diff --git a/src/main/java/com/xqopen/kehui/project/service/impl/ProjectInfoServiceImpl.java b/src/main/java/com/xqopen/kehui/project/service/impl/ProjectInfoServiceImpl.java index e2b3414..3043ec4 100644 --- a/src/main/java/com/xqopen/kehui/project/service/impl/ProjectInfoServiceImpl.java +++ b/src/main/java/com/xqopen/kehui/project/service/impl/ProjectInfoServiceImpl.java @@ -53,4 +53,9 @@ public class ProjectInfoServiceImpl extends ServiceImpl conclusionList(Page page, Long userId) { + return infoDao.conclusionList(page,userId); + } }