部门周报填报三层结构+Api
This commit is contained in:
parent
f229e8120c
commit
191191eae2
@ -686,7 +686,12 @@ public class Api {
|
||||
|
||||
public static final String EDIT_ADMIN_INVOICE_MANAGEMENT_STATUS = ADMIN_INVOICE_MANAGEMENT_PREFIX_STATUS + "/{id}";
|
||||
|
||||
|
||||
/***
|
||||
* 部门周报填报管理
|
||||
*/
|
||||
public static final String PROJECT_DEPARTMENT = PROJECT_PREFIX + "/departmentWeekly";
|
||||
public static final String PROJECT_DEPARTMENT_EDIT= PROJECT_DEPARTMENT+"/{id}";
|
||||
public static final String PROJECT_DEPARTMENT_SHOW= PROJECT_DEPARTMENT+"showById/{id}";
|
||||
|
||||
|
||||
|
||||
|
||||
@ -9,4 +9,6 @@ import java.util.List;
|
||||
|
||||
public interface ProjectWeeklyDao extends BaseMapper<ProjectWeekly> {
|
||||
List<ProjectWeeklyDto> getList(Page<ProjectWeekly> page, @Param("projectWeekly") ProjectWeekly projectWeekly);
|
||||
|
||||
List<ProjectWeeklyDto> getListByProId(@Param("page") Page<ProjectWeekly> page, @Param("projectWeekly") ProjectWeekly projectWeekly);
|
||||
}
|
||||
|
||||
@ -48,4 +48,7 @@
|
||||
and pw.dept_id=#{projectWeekly.deptId}
|
||||
</if>
|
||||
</select>
|
||||
<select id="getListByProId" resultType="com.xqopen.kehui.project.dto.ProjectWeeklyDto">
|
||||
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@ -0,0 +1,67 @@
|
||||
package com.xqopen.kehui.project.action;
|
||||
|
||||
import com.alibaba.fastjson.support.spring.FastJsonJsonView;
|
||||
import com.baomidou.mybatisplus.plugins.Page;
|
||||
import com.xqopen.kehui.Api;
|
||||
import com.xqopen.kehui.exception.XQException;
|
||||
import com.xqopen.kehui.project.api.ProjectDepartmentApi;
|
||||
import com.xqopen.kehui.project.api.ProjectWeeklyApi;
|
||||
import com.xqopen.kehui.project.dto.ProjectInfoInitDto;
|
||||
import com.xqopen.kehui.project.dto.ProjectWeeklyAddReq;
|
||||
import com.xqopen.kehui.project.dto.ProjectWeeklyDto;
|
||||
import com.xqopen.kehui.project.dto.ProjectWeeklyFindReq;
|
||||
import com.xqopen.kehui.project.entity.ProjectWeekly;
|
||||
import com.xqopen.kehui.project.service.IProjectDepartmentService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.util.ObjectUtils;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping(produces = FastJsonJsonView.DEFAULT_CONTENT_TYPE)
|
||||
public class ProjectDepartmentController implements ProjectDepartmentApi {
|
||||
|
||||
@Autowired
|
||||
private IProjectDepartmentService projectDepartmentService;
|
||||
|
||||
|
||||
@Override
|
||||
@GetMapping(Api.PROJECT_DEPARTMENT_SHOW)
|
||||
public String showById(Long userId, Long id) throws XQException {
|
||||
//1.根据userid获取部门id
|
||||
//2.根据部门id获取用户名和工作量
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
@PostMapping(Api.PROJECT_DEPARTMENT)
|
||||
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) {
|
||||
projectWeeklyFindReq.setPageNo(1);
|
||||
}
|
||||
if (projectWeeklyFindReq.getPageSize() == null || projectWeeklyFindReq.getPageSize() == 0) {
|
||||
projectWeeklyFindReq.setPageSize(10);
|
||||
}
|
||||
//根据用户id拿到部门信息
|
||||
|
||||
Page<ProjectWeekly> page = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
|
||||
ProjectWeekly projectWeekly = new ProjectWeekly();
|
||||
projectWeekly.setIsDeleted("0");
|
||||
projectWeekly.setUserId(String.valueOf(userId));
|
||||
projectWeekly.setWeeklyType("0");
|
||||
List<ProjectWeeklyDto> list = projectDepartmentService.getListByProId(page, projectWeekly);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
@PutMapping(Api.PROJECT_DEPARTMENT_EDIT)
|
||||
public String edit(Long userId, ProjectInfoInitDto initDto, Long id) throws XQException {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
package com.xqopen.kehui.project.api;
|
||||
|
||||
import com.xqopen.kehui.exception.XQException;
|
||||
import com.xqopen.kehui.project.dto.*;
|
||||
import com.xqopen.kehui.util.ApiResponse;
|
||||
import com.xqopen.kehui.util.Constants;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiImplicitParams;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
@Api(value = "部门周报填报管理", tags = Constants.MODULE_PROJECT, description = "项目模块")
|
||||
public interface ProjectDepartmentApi {
|
||||
@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 showById(Long userId, 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 list(Long userId, ProjectWeeklyFindReq projectWeeklyFindReq) 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 edit(Long userId, ProjectInfoInitDto initDto, Long id) throws XQException;
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
package com.xqopen.kehui.project.service;
|
||||
|
||||
import com.baomidou.mybatisplus.plugins.Page;
|
||||
import com.baomidou.mybatisplus.service.IService;
|
||||
import com.xqopen.kehui.project.dto.ProjectWeeklyDto;
|
||||
import com.xqopen.kehui.project.entity.ProjectWeekly;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IProjectDepartmentService extends IService<ProjectWeekly> {
|
||||
List<ProjectWeeklyDto> getListByProId(Page<ProjectWeekly> page, ProjectWeekly projectWeekly);
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package com.xqopen.kehui.project.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.plugins.Page;
|
||||
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
|
||||
import com.xqopen.kehui.mapper.ProjectWeeklyDao;
|
||||
import com.xqopen.kehui.project.dto.ProjectWeeklyDto;
|
||||
import com.xqopen.kehui.project.entity.ProjectWeekly;
|
||||
import com.xqopen.kehui.project.service.IProjectDepartmentService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class IProjectDepartmentServiceImpl extends ServiceImpl<ProjectWeeklyDao, ProjectWeekly>
|
||||
implements IProjectDepartmentService {
|
||||
|
||||
@Autowired
|
||||
private ProjectWeeklyDao projectWeeklyDao;
|
||||
|
||||
@Override
|
||||
public List<ProjectWeeklyDto> getListByProId(Page<ProjectWeekly> page, ProjectWeekly projectWeekly) {
|
||||
return projectWeeklyDao.getListByProId(page,projectWeekly);
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user