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

部门bug修改+全所功能实现

Browse Source
This commit is contained in:
chen 2024-07-17 16:56:01 +08:00
parent 0b235118c5
commit 29739bd262
10 changed files with 103 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,6 +349,7 @@ public class Api {
*/
public static final String PROJECT_PREFIX = PREFIX + "/project";
/**
* 项目信息管理
*/
@ -371,6 +372,7 @@ public class Api {
* 周报填报管理
*/
public static final String PROJECT_WEEKLY = PROJECT_PREFIX + "/weekly";
public static final String PROJECT_WEEKLYBYID = PROJECT_PREFIX + "/weeklyById";
public static final String PROJECT_WEEKLY_ADD = PROJECT_WEEKLY + "/add";
public static final String PROJECT_WEEKLY_BUDGET = PROJECT_PREFIX + "/weekly/budget";
public static final String PROJECT_WEEKLY_BUDGET_ADD = PROJECT_WEEKLY_BUDGET + "/add";
@ -704,7 +706,10 @@ public class Api {
public static final String PROJECT_DEPARTMENT_UPDATE= PROJECT_DEPARTMENT_SHOW+"/{id}";
public static final String PROJECT_DEPARTMENT_INSERTPERMISSION= PROJECT_DEPARTMENT_PERMISSION+"/{id}";
/***
* 部门周报填报管理
*/
public static final String PROJECT_WHOLEFIRM = PROJECT_PREFIX + "/wholeFirmWeekly";
/**

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

@ -18,4 +18,5 @@ public interface ProjectWeeklyDao extends BaseMapper<ProjectWeekly> {
List<ProjectWeeklyDto> showById(@Param("week") String week, @Param("proId") String proId);
List<ProjectWeeklyDto> getListById(@Param("page") Page<ProjectWeekly> page, @Param("projectWeekly") ProjectWeekly projectWeekly);
}

24
src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
View File

@ -84,5 +84,29 @@
left join personal_member pm on pm.id_ =sl.userinfo_id
where pw.week=#{week} and pw.project_id = #{proId} and pw.weekly_type = '0'
</select>
<select id="getListById" resultType="com.xqopen.kehui.project.dto.ProjectWeeklyDto">
select pw.*,pm.person_name as userName ,pi.project_name as projectName,pi.project_no as projectNo
from project_weekly pw
left join system_user_login sl on cast(pw.user_id as BIGINT)=sl.id_
left join personal_member pm on pm.id_ =sl.userinfo_id
left join project_info pi on pi.id_=cast(pw.project_id as BIGINT)
where
pw.is_complete='0'
<if test="projectWeekly.isDeleted!=null">
and pw.is_deleted=#{projectWeekly.isDeleted}
</if>
<if test="projectWeekly.Id!=null">
and pw.id_=#{projectWeekly.id}
</if>
<if test="projectWeekly.weeklyType!=null">
and pw.weekly_type=#{projectWeekly.weeklyType}
</if>
<if test="projectWeekly.projectId!=null">
and pw.project_id=#{projectWeekly.projectId}
</if>
<if test="projectWeekly.deptId!=null">
and pw.dept_id=#{projectWeekly.deptId}
</if>
</select>
</mapper>

3
src/main/java/com/xqopen/kehui/mapper/xml/ProjectWholeFirmWeeklyDao.xml
View File

@ -37,6 +37,9 @@
<if test="projectWeekly.week!=null">
and pw.week=#{projectWeekly.week}
</if>
<if test="projectWeekly.deptId!=null">
and pw.ext_->>'deptName'=#{projectWeekly.deptId}
</if>
and pw.weekly_type = '1'
</select>

45
src/main/java/com/xqopen/kehui/project/action/ProjectDepartmentController.java
View File

@ -113,7 +113,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
return ApiResponse.fillSuccess(listResp);
}
} catch (Exception e) {
log.error("ProjectWeeklyController.list", e);
log.error("ProjectDepartmentController.list", e);
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
}
return null;
@ -139,4 +139,47 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
projectWeeklyService.update(weekly,Wrapper);
}
}
// 根据id获取list 用于当前用户与表中userid不同的情况
@Override
@PostMapping(Api.PROJECT_WEEKLYBYID)
public String listById(@RequestBody ProjectWeeklyFindReq projectWeeklyFindReq) throws XQException {
try {
if (!ObjectUtils.isEmpty(projectWeeklyFindReq)) {
if (projectWeeklyFindReq.getPageNo() == null || projectWeeklyFindReq.getPageNo() == 0) {
projectWeeklyFindReq.setPageNo(1);
}
if (projectWeeklyFindReq.getPageSize() == null || projectWeeklyFindReq.getPageSize() == 0) {
projectWeeklyFindReq.setPageSize(10);
}
Page<ProjectWeekly> page = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
ProjectWeekly projectWeekly = new ProjectWeekly();
projectWeekly.setIsDeleted("0");
projectWeekly.setWeeklyType("0");
if (!StringUtils.isEmpty(projectWeeklyFindReq.getId() != null))
projectWeekly.setId(projectWeeklyFindReq.getId());
if (!StringUtils.isEmpty(projectWeeklyFindReq.getDeptId() != null))
projectWeekly.setDeptId(projectWeeklyFindReq.getDeptId());
List<ProjectWeeklyDto> list = projectDepartmentService.getList(page, projectWeekly);
for (ProjectWeeklyDto weeklyDto : list) {
Long userId = Long.parseLong(weeklyDto.getUserId());
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
userLoginEntityWrapper.eq("id_", userId);
SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
weeklyDto.setUserId(String.valueOf(systemUserLogin.getUserinfoId()));
}
//组装结果集
ProjectWeeklyListResp listResp = new ProjectWeeklyListResp();
listResp.setLs(list);
listResp.setPages(page.getPages());
listResp.setTotal(page.getTotal());
return ApiResponse.fillSuccess(listResp);
}
} catch (Exception e) {
log.error("ProjectDepartmentController.list", e);
throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
}
return null;
}
}

9
src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java
View File

@ -23,9 +23,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -44,7 +42,8 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi {
ISystemUserLoginService systemUserLoginService;
@Override
public String list(Long userId, ProjectWeeklyFindReq projectWeeklyFindReq) throws XQException {
@PostMapping(Api.PROJECT_WHOLEFIRM)
public String list(@RequestHeader("userId") Long userId,@RequestBody ProjectWeeklyFindReq projectWeeklyFindReq) throws XQException {
if (!ObjectUtils.isEmpty(projectWeeklyFindReq)) {
if (!ObjectUtils.isEmpty(userId)) projectWeeklyFindReq.setUserId(String.valueOf(userId));
if (projectWeeklyFindReq.getPageNo() == null || projectWeeklyFindReq.getPageNo() == 0) {
@ -65,6 +64,8 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi {
projectWeekly.setProjectId(projectInfoService.getProId(projectWeeklyFindReq.getProjectName()));
if (!StringUtils.isEmpty(projectWeeklyFindReq.getWeek() != null))
projectWeekly.setWeek(projectWeeklyFindReq.getWeek());
if (!StringUtils.isEmpty(projectWeeklyFindReq.getDeptName() != null))
projectWeekly.setDeptId(projectWeeklyFindReq.getDeptName());
List<ProjectWeeklyDto> list = projectWholeFirmService.getList(page, projectWeekly);
//判断当前账号是否是项目专员/负责人
//因为json里面存的是人事id，通过账号找不到，先把账号id转为人事id

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

@ -37,4 +37,11 @@ public interface ProjectDepartmentApi {
@ApiImplicitParam(name = "userId", value = "用户id", required = true, paramType = "header", dataType = "Long"),
})
void insertPermission(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 listById(ProjectWeeklyFindReq projectWeeklyFindReq) throws XQException;
}

6
src/main/java/com/xqopen/kehui/project/dto/ProjectWeeklyFindReq.java
View File

@ -3,9 +3,13 @@ package com.xqopen.kehui.project.dto;
import com.xqopen.kehui.project.entity.ProjectWeekly;
import lombok.Data;
@Data
import java.io.Serializable;
@Data
public class ProjectWeeklyFindReq extends ProjectWeekly {
private Integer pageNo;
private Integer pageSize;
private String projectName;
private String deptName;
}

3
src/main/java/com/xqopen/kehui/project/service/IProjectDepartmentService.java
View File

@ -16,4 +16,7 @@ public interface IProjectDepartmentService extends IService<ProjectWeekly> {
List<ProjectWeeklyDto> showById(String week,String proId);
List<ProjectWeeklyDto> getList(Page<ProjectWeekly> page, ProjectWeekly projectWeekly);
}

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

@ -38,4 +38,9 @@ public class IProjectDepartmentServiceImpl extends ServiceImpl<ProjectWeeklyDao,
return projectWeeklyDao.showById(week,proId);
}
@Override
public List<ProjectWeeklyDto> getList(Page<ProjectWeekly> page, ProjectWeekly projectWeekly) {
return projectWeeklyDao.getListById(page,projectWeekly);
}
}