xh/kehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.增加项目结项api路由

Browse Source 
2.增加查询项目结项列表方法
3.项目立项监控器taskName修改
4.删除无用注释
This commit is contained in:
zty 2024-07-22 16:58:25 +08:00
parent ece2d8098f
commit 7d7758747a
8 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/xqopen/kehui/Api.java
View File

@ -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";
/***
* 周报填报管理
*/

3
src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java
View File

@ -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());//当前委托人
//判断项目负责人是否是办公室部门的

1
src/main/java/com/xqopen/kehui/mapper/ProjectInfoDao.java
View File

@ -41,4 +41,5 @@ public interface ProjectInfoDao extends BaseMapper<ProjectInfo> {
ProjectInfo getInfoByProName(@Param("projectName") String projectName);
String getProId(@Param("projectName") String projectName);
List<ProjectInfoListItemResp> conclusionList(Page<ProjectInfo> page, @Param("userId") Long userId);
}

12
src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml
View File

@ -165,6 +165,18 @@
from project_info
where project_name = #{projectName}
</select>
<select id="conclusionList" resultMap="ProjectInfoList">
select pm.person_name as projectManagerData,pi.* from project_info pi
LEFT JOIN system_user_login ui on CAST(pi.created_by AS bigint)=ui.id_
LEFT JOIN personal_member pm on ui.userinfo_id=pm.id_
WHERE pi.is_deleted=false and pi.created_by=#{userId} and pi.ext_->>'taskName' !='结项完成'
<!-- select * from project_info-->
<!-- <where>-->
<!-- is_deleted=false-->
<!-- and created_by=#{userId}-->
<!-- and ext_->>'taskName' !='结项完成'-->
<!-- </where>-->
</select>
<sql id="com">
AND (

20
src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
View File

@ -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<ProjectInfo> page = new Page<>(pageNoUtil.getPageNo(),pageNoUtil.getPageSize());
List<ProjectInfoListItemResp> list = infoService.conclusionList(page, userId);
return ApiResponse.fillSuccess(new ResultListReqUtil<ProjectInfoListItemResp>(list,page.getTotal(),page.getPages()));
}catch (Exception e){
log.error("ProjectInitController.conclusionList", e);
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
}
}
}

7
src/main/java/com/xqopen/kehui/project/api/ProjectInitApi.java
View File

@ -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;
}

8
src/main/java/com/xqopen/kehui/project/service/IProjectInfoService.java
View File

@ -28,4 +28,12 @@ public interface IProjectInfoService extends IService<ProjectInfo> {
ProjectInfo getInfoByProName(String projectName);
String getProId(String projectName);
/**
* 根据创建id拿到结项列表，其实也就是立项人是谁，谁就能结项
* @param page
* @param userId
* @return
*/
List<ProjectInfoListItemResp> conclusionList(Page<ProjectInfo> page, Long userId);
}

5
src/main/java/com/xqopen/kehui/project/service/impl/ProjectInfoServiceImpl.java
View File

@ -53,4 +53,9 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoDao, ProjectI
public String getProId(String projectName) {
return infoDao.getProId(projectName);
}
@Override
public List<ProjectInfoListItemResp> conclusionList(Page<ProjectInfo> page, Long userId) {
return infoDao.conclusionList(page,userId);
}
}