business/src/main/java/com/ycl/controller/ProgressPlanController.java
@@ -6,7 +6,7 @@ import com.ycl.common.group.Update; import com.ycl.domain.form.ProgressPlanForm; import com.ycl.domain.query.ProgressPlanQuery; import com.ycl.domain.vo.ProjectProgressFileListsRequest; import com.ycl.domain.form.ProjectProgressFileListsForm; import com.ycl.mapper.FileMapper; import com.ycl.service.ProgressPlanService; import io.swagger.annotations.Api; @@ -73,7 +73,7 @@ @GetMapping("/{id}") @ApiOperation(value = "详情", notes = "详情") // @PreAuthorize("hasAuthority('progressPlan:detail')") public Result detail(@PathVariable("id") Integer id) { public Result detail(@PathVariable("id") Long id) { return progressPlanService.detail(id); } @@ -85,12 +85,12 @@ } @PostMapping("/saveProjectProgressFileLists") public Result saveProjectProgressFileLists(@RequestBody ProjectProgressFileListsRequest request) { return progressPlanService.saveProjectProgressFileLists(request); public Result saveProjectProgressFileLists(@RequestBody ProjectProgressFileListsForm form) { return progressPlanService.saveProjectProgressFileLists(form); } @GetMapping("/getProjectProgressForm/{id}") public Result getProjectProgressForm(@PathVariable("id") Integer id) { public Result getProjectProgressForm(@PathVariable("id") Long id) { return progressPlanService.getProjectProgressForm(id); }
@@ -6,7 +6,7 @@ import com.ycl.common.group.Update; import com.ycl.domain.form.ProjectPlanExamineRecordForm; import com.ycl.domain.query.ProjectPlanExamineRecordQuery; import com.ycl.domain.vo.ProgressReportResponseVO; import com.ycl.domain.form.ProgressReportResponseForm; import com.ycl.service.ProjectPlanExamineRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -83,12 +83,12 @@ } @GetMapping("/departmentApproval/{id}") public Result departmentApproval(@PathVariable("id") Integer projectPlanRecordId) { public Result departmentApproval(@PathVariable("id") Long projectPlanRecordId) { return projectPlanExamineRecordService.departmentApproval(projectPlanRecordId); } @GetMapping("/planLog/{id}") public Result planLog(@PathVariable("id") Integer projectPlanRecordId) { public Result planLog(@PathVariable("id") Long projectPlanRecordId) { return projectPlanExamineRecordService.planLog(projectPlanRecordId); } @@ -110,7 +110,7 @@ } @PostMapping("/reply") public Result reply(@RequestBody ProgressReportResponseVO form) { public Result reply(@RequestBody ProgressReportResponseForm form) { return projectPlanExamineRecordService.reply(form); } } business/src/main/java/com/ycl/controller/ProjectPlanInfoController.java
@@ -4,10 +4,9 @@ import com.ycl.common.base.Result; import com.ycl.common.group.Add; import com.ycl.common.group.Update; import com.ycl.domain.entity.ProjectPlanInfo; import com.ycl.domain.form.ProjectPlanInfoForm; import com.ycl.domain.form.ProjectPlanInfoRequestForm; import com.ycl.domain.query.ProjectPlanInfoQuery; import com.ycl.domain.vo.ProjectPlanInfoRequest; import com.ycl.service.ProjectPlanInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -72,7 +71,7 @@ @GetMapping("/{id}") @ApiOperation(value = "详情", notes = "详情") // @PreAuthorize("hasAuthority('projectPlanInfo:detail')") public Result detail(@PathVariable("id") Integer id) { public Result detail(@PathVariable("id") Long id) { return projectPlanInfoService.detail(id); } @@ -85,8 +84,8 @@ @PostMapping("/addPlanInfo") public Result addPlanInfo(@RequestBody @Validated ProjectPlanInfoRequest request) { return projectPlanInfoService.addPlanInfo(request); public Result addPlanInfo(@RequestBody @Validated ProjectPlanInfoRequestForm form) { return projectPlanInfoService.addPlanInfo(form); } @PostMapping("/resubmitPlanInfo") @@ -95,7 +94,7 @@ } @PostMapping("/savePlanInfo/{planRecordId}") public Result savePlanInfo(@RequestBody ProjectPlanInfo item, @PathVariable("planRecordId") Integer planRecordId) { public Result savePlanInfo(@RequestBody ProjectPlanInfoForm item, @PathVariable("planRecordId") Long planRecordId) { return projectPlanInfoService.savePlanInfo(item, planRecordId); }
@@ -6,7 +6,7 @@ import com.ycl.common.group.Update; import com.ycl.domain.form.ProjectPlanProgressReportForm; import com.ycl.domain.query.ProjectPlanProgressReportQuery; import com.ycl.domain.vo.ProgressReportResponseVO; import com.ycl.domain.form.ProgressReportResponseForm; import com.ycl.service.ProjectPlanProgressReportService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -36,12 +36,12 @@ @PostMapping @ApiOperation(value = "添加", notes = "添加") // @PreAuthorize("hasAuthority('projectPlanProgressReport:add')") public Result add(@RequestBody @Validated(Add.class) ProgressReportResponseVO form) { public Result add(@RequestBody @Validated(Add.class) ProgressReportResponseForm form) { return projectPlanProgressReportService.add(form); } @PostMapping("/examine") public Result examine(@RequestBody @Validated(Add.class) ProgressReportResponseVO form) { public Result examine(@RequestBody @Validated(Add.class) ProgressReportResponseForm form) { return projectPlanProgressReportService.examine(form); } @@ -76,7 +76,7 @@ @GetMapping("/{id}") @ApiOperation(value = "详情", notes = "详情") // @PreAuthorize("hasAuthority('projectPlanProgressReport:detail')") public Result detail(@PathVariable("id") Integer id) { public Result detail(@PathVariable("id") Long id) { return projectPlanProgressReportService.detail(id); }
@@ -4,9 +4,9 @@ import com.ycl.common.base.Result; import com.ycl.common.group.Add; import com.ycl.common.group.Update; import com.ycl.domain.form.ProjectPlanRecordAddRequestForm; import com.ycl.domain.form.ProjectPlanRecordForm; import com.ycl.domain.query.ProjectPlanRecordQuery; import com.ycl.domain.vo.ProjectPlanRecordAddRequest; import com.ycl.service.ProjectPlanRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -36,7 +36,7 @@ @PostMapping @ApiOperation(value = "添加", notes = "添加") // @PreAuthorize("hasAuthority('projectPlanRecord:add')") public Result add(@RequestBody @Validated(Add.class) ProjectPlanRecordAddRequest form) { public Result add(@RequestBody @Validated(Add.class) ProjectPlanRecordAddRequestForm form) { return projectPlanRecordService.add(form); } @@ -50,7 +50,7 @@ @DeleteMapping("/{id}") @ApiOperation(value = "ID删除", notes = "ID删除") // @PreAuthorize("hasAuthority('projectPlanRecord:del')") public Result removeById(@PathVariable("id") String id) { public Result removeById(@PathVariable("id") Long id) { return projectPlanRecordService.removeById(id); }
File was renamed from business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java @@ -1,6 +1,5 @@ package com.ycl.domain.vo; package com.ycl.domain.form; import com.fasterxml.jackson.annotation.JsonFormat; import com.ycl.domain.entity.File; import lombok.AllArgsConstructor; import lombok.Data; @@ -13,13 +12,13 @@ @Data @AllArgsConstructor @NoArgsConstructor public class ProgressReportResponseVO { public class ProgressReportResponseForm { // 计划项id private Integer id; private Long id; // 进度上报id private Integer progressReportId; private Long progressReportId; // 审核记录id private Integer examineRecordId; private Long examineRecordId; private Integer planTime; private Integer PlanTimeFlag; private String title; business/src/main/java/com/ycl/domain/form/ProjectPlanInfoItem.java
File was renamed from business/src/main/java/com/ycl/domain/vo/ProjectPlanInfoItem.java @@ -1,4 +1,4 @@ package com.ycl.domain.vo; package com.ycl.domain.form; import com.fasterxml.jackson.annotation.JsonFormat; business/src/main/java/com/ycl/domain/form/ProjectPlanInfoRequestForm.java
File was renamed from business/src/main/java/com/ycl/domain/vo/ProjectPlanInfoRequest.java @@ -1,21 +1,21 @@ package com.ycl.domain.vo; package com.ycl.domain.form; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.validation.annotation.Validated; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.List; @Data @AllArgsConstructor @NoArgsConstructor public class ProjectPlanInfoRequest { public class ProjectPlanInfoRequestForm { private Long projectPlanRecordId; @NotNull(message = "请输入计划投资金额") private BigDecimal actualInvest; @NotEmpty(message = "请输入要添加的计划项") private List<ProjectPlanInfoItem> addList; } business/src/main/java/com/ycl/domain/form/ProjectPlanRecordAddRequestForm.java
File was renamed from business/src/main/java/com/ycl/domain/vo/ProjectPlanRecordAddRequest.java @@ -1,4 +1,4 @@ package com.ycl.domain.vo; package com.ycl.domain.form; import lombok.AllArgsConstructor; import lombok.Data; @@ -7,9 +7,9 @@ @Data @AllArgsConstructor @NoArgsConstructor public class ProjectPlanRecordAddRequest { public class ProjectPlanRecordAddRequestForm { // 项目计划记录ID private Integer id; private Long id; // 项目计划ID private Long projectInfoId; private Integer planTimeFlag; business/src/main/java/com/ycl/domain/form/ProjectProgressFileListsForm.java
File was renamed from business/src/main/java/com/ycl/domain/vo/ProjectProgressFileListsRequest.java @@ -1,4 +1,4 @@ package com.ycl.domain.vo; package com.ycl.domain.form; import com.ycl.domain.entity.File; import lombok.AllArgsConstructor; @@ -10,8 +10,8 @@ @Data @AllArgsConstructor @NoArgsConstructor public class ProjectProgressFileListsRequest { private Integer projectReportId; public class ProjectProgressFileListsForm { private Long projectReportId; private List<File> completedReportFileList; private List<File> situationDescriptionFileList; } business/src/main/java/com/ycl/domain/vo/DepartmentApprovalResponseVO.java
@@ -20,7 +20,6 @@ private Integer manageExamine; private String manageApproval; private String manageApprovalReply; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date gmtCreate; private Integer planStatus; } business/src/main/java/com/ycl/mapper/ProjectPlanExamineRecordMapper.java
@@ -36,9 +36,9 @@ void insertOne(ProjectPlanExamineRecord item); List<DepartmentApprovalResponseVO> selectInfo(Integer projectPlanRecordId); List<DepartmentApprovalResponseVO> selectInfo(Long projectPlanRecordId); List<DepartmentApprovalResponseVO> getPlanLog(Integer projectPlanRecordId); List<DepartmentApprovalResponseVO> getPlanLog(Long projectPlanRecordId); void updateByForm(@Param("form") ProjectPlanExamineRecordForm form);
@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.domain.query.ProjectPlanProgressReportQuery; import com.ycl.domain.vo.ProgressReportResponseVO; import com.ycl.domain.form.ProgressReportResponseForm; import com.ycl.domain.vo.ProjectPlanProgressReportVO; import com.ycl.domain.form.ProjectPlanProgressReportForm; import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -32,7 +30,7 @@ */ IPage getPage(IPage page, @Param("query") ProjectPlanProgressReportQuery query); ProgressReportResponseVO getDetail(Integer id); ProgressReportResponseForm getDetail(Long id); void insertOne(ProjectPlanProgressReport projectPlanProgressReport);
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.domain.form.ProgressPlanForm; import com.ycl.domain.query.ProgressPlanQuery; import com.ycl.domain.vo.ProjectProgressFileListsRequest; import com.ycl.domain.form.ProjectProgressFileListsForm; import java.util.List; @@ -57,7 +57,7 @@ * @param id * @return */ Result detail(Integer id); Result detail(Long id); /** * 列表 @@ -67,10 +67,10 @@ /** * 保存竣工报告、情况说明附件 * @param request * @param form * @return */ Result saveProjectProgressFileLists(ProjectProgressFileListsRequest request); Result saveProjectProgressFileLists(ProjectProgressFileListsForm form); Result getProjectProgressForm(Integer id); Result getProjectProgressForm(Long id); } business/src/main/java/com/ycl/service/ProjectPlanExamineRecordService.java
@@ -5,7 +5,7 @@ import com.ycl.common.base.Result; import com.ycl.domain.form.ProjectPlanExamineRecordForm; import com.ycl.domain.query.ProjectPlanExamineRecordQuery; import com.ycl.domain.vo.ProgressReportResponseVO; import com.ycl.domain.form.ProgressReportResponseForm; import java.util.List; @@ -70,14 +70,14 @@ * @param projectPlanRecordId * @return */ Result departmentApproval(Integer projectPlanRecordId); Result departmentApproval(Long projectPlanRecordId); /** * 计划日志 * @param projectPlanRecordId * @return */ Result planLog(Integer projectPlanRecordId); Result planLog(Long projectPlanRecordId); /** * 回复审批 @@ -95,5 +95,5 @@ Result todoList(Long userId,ProjectPlanExamineRecordQuery query); Result reply(ProgressReportResponseVO form); Result reply(ProgressReportResponseForm form); } business/src/main/java/com/ycl/service/ProjectPlanInfoService.java
@@ -4,8 +4,8 @@ import com.ycl.common.base.Result; import com.ycl.domain.entity.ProjectPlanInfo; import com.ycl.domain.form.ProjectPlanInfoForm; import com.ycl.domain.form.ProjectPlanInfoRequestForm; import com.ycl.domain.query.ProjectPlanInfoQuery; import com.ycl.domain.vo.ProjectPlanInfoRequest; import java.util.List; @@ -57,7 +57,7 @@ * @param id * @return */ Result detail(Integer id); Result detail(Long id); /** * 新增计划项 @@ -69,13 +69,13 @@ * 新增计划项 * @return */ Result addPlanInfo(ProjectPlanInfoRequest request); Result addPlanInfo(ProjectPlanInfoRequestForm form); /** * 保存计划项 * @return */ Result savePlanInfo(ProjectPlanInfo item, Integer planRecordId); Result savePlanInfo(ProjectPlanInfoForm item, Long planRecordId); /** * 延期 business/src/main/java/com/ycl/service/ProjectPlanProgressReportService.java
@@ -5,7 +5,7 @@ import com.ycl.domain.entity.ProjectPlanProgressReport; import com.ycl.domain.form.ProjectPlanProgressReportForm; import com.ycl.domain.query.ProjectPlanProgressReportQuery; import com.ycl.domain.vo.ProgressReportResponseVO; import com.ycl.domain.form.ProgressReportResponseForm; import java.util.List; @@ -22,7 +22,7 @@ * @param form * @return */ Result add(ProgressReportResponseVO form); Result add(ProgressReportResponseForm form); /** * 修改 @@ -57,7 +57,7 @@ * @param id * @return */ Result detail(Integer id); Result detail(Long id); /** * 列表 @@ -65,5 +65,5 @@ */ Result all(); Result examine(ProgressReportResponseVO form); Result examine(ProgressReportResponseForm form); } business/src/main/java/com/ycl/service/ProjectPlanRecordService.java
@@ -5,8 +5,7 @@ import com.ycl.domain.entity.ProjectPlanRecord; import com.ycl.domain.form.ProjectPlanRecordForm; import com.ycl.domain.query.ProjectPlanRecordQuery; import com.ycl.domain.vo.ProjectPlanRecordAddRequest; import com.ycl.domain.vo.ProjetPlanRecordItem; import com.ycl.domain.form.ProjectPlanRecordAddRequestForm; import java.util.List; @@ -20,10 +19,10 @@ /** * 添加 * @param request * @param form * @return */ Result add(ProjectPlanRecordAddRequest request); Result add(ProjectPlanRecordAddRequestForm form); /** * 修改 @@ -44,7 +43,7 @@ * @param id * @return */ Result removeById(String id); Result removeById(Long id); /** * 分页查询 business/src/main/java/com/ycl/service/impl/ProgressPlanServiceImpl.java
@@ -12,7 +12,7 @@ import com.ycl.domain.vo.ProgressPlanInfoFlag; import com.ycl.domain.vo.ProgressPlanInfoResponseVO; import com.ycl.domain.vo.ProgressPlanVO; import com.ycl.domain.vo.ProjectProgressFileListsRequest; import com.ycl.domain.form.ProjectProgressFileListsForm; import com.ycl.framework.utils.PageUtil; import com.ycl.mapper.*; import com.ycl.service.ProgressPlanService; @@ -111,7 +111,7 @@ * @return */ @Override public Result detail(Integer id) { public Result detail(Long id) { ProgressPlanInfoResponseVO vo = new ProgressPlanInfoResponseVO(); List<ProgressPlanInfoFlag> monthProgress = new ArrayList<>(); List<ProgressPlanInfoFlag> seasonProgress = new ArrayList<>(); @@ -119,70 +119,66 @@ // 查询月度计划项 new LambdaQueryChainWrapper<>(projectPlanRecordMapper) .eq(ProjectPlanRecord::getProjectInfoId, id) .eq(ProjectPlanRecord::getPlanTimeFlag, 0) .list() .stream().forEach(record -> { ProgressPlanInfoFlag progressPlanInfoFlag = new ProgressPlanInfoFlag(); progressPlanInfoFlag.setPlanTime(record.getPlanTime()); progressPlanInfoFlag.setPlanTimeFlag(record.getPlanTimeFlag()); progressPlanInfoFlag.setPlanInfoList( new LambdaQueryChainWrapper<>(projectPlanInfoMapper) .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId()) .eq(ProjectPlanInfo::getDeleted, 0) // 未删除 .eq(ProjectPlanInfo::getPlanStatus, 2) // 计划项审批通过 .list() ); monthProgress.add(progressPlanInfoFlag); }); .eq(ProjectPlanRecord::getProjectInfoId, id) .eq(ProjectPlanRecord::getPlanTimeFlag, 0) .list() .stream().forEach(record -> { ProgressPlanInfoFlag progressPlanInfoFlag = new ProgressPlanInfoFlag(); progressPlanInfoFlag.setPlanTime(record.getPlanTime()); progressPlanInfoFlag.setPlanTimeFlag(record.getPlanTimeFlag()); progressPlanInfoFlag.setPlanInfoList( new LambdaQueryChainWrapper<>(projectPlanInfoMapper) .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId()) .eq(ProjectPlanInfo::getDeleted, 0) // 未删除 .eq(ProjectPlanInfo::getPlanStatus, 2) // 计划项审批通过 .list() ); monthProgress.add(progressPlanInfoFlag); }); // 查询季度计划项 new LambdaQueryChainWrapper<>(projectPlanRecordMapper) .eq(ProjectPlanRecord::getProjectInfoId, id) .eq(ProjectPlanRecord::getPlanTimeFlag, 1) .list() .stream().forEach(record -> { ProgressPlanInfoFlag progressPlanInfoFlag = new ProgressPlanInfoFlag(); progressPlanInfoFlag.setPlanTime(record.getPlanTime()); progressPlanInfoFlag.setPlanTimeFlag(record.getPlanTimeFlag()); progressPlanInfoFlag.setPlanInfoList( new LambdaQueryChainWrapper<>(projectPlanInfoMapper) .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId()) .eq(ProjectPlanInfo::getDeleted, 0) // 未删除 .eq(ProjectPlanInfo::getPlanStatus, 2) // 计划项审批通过 .list() ); seasonProgress.add(progressPlanInfoFlag); }); .eq(ProjectPlanRecord::getProjectInfoId, id) .eq(ProjectPlanRecord::getPlanTimeFlag, 1) .list() .stream().forEach(record -> { ProgressPlanInfoFlag progressPlanInfoFlag = new ProgressPlanInfoFlag(); progressPlanInfoFlag.setPlanTime(record.getPlanTime()); progressPlanInfoFlag.setPlanTimeFlag(record.getPlanTimeFlag()); progressPlanInfoFlag.setPlanInfoList( new LambdaQueryChainWrapper<>(projectPlanInfoMapper) .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId()) .eq(ProjectPlanInfo::getDeleted, 0) // 未删除 .eq(ProjectPlanInfo::getPlanStatus, 2) // 计划项审批通过 .list() ); seasonProgress.add(progressPlanInfoFlag); }); // 查询年度计划项 new LambdaQueryChainWrapper<>(projectPlanRecordMapper) .eq(ProjectPlanRecord::getProjectInfoId, id) .eq(ProjectPlanRecord::getPlanTimeFlag, 2) .list() .stream().forEach(record -> { ProgressPlanInfoFlag progressPlanInfoFlag = new ProgressPlanInfoFlag(); progressPlanInfoFlag.setPlanTime(record.getPlanTime()); progressPlanInfoFlag.setPlanTimeFlag(record.getPlanTimeFlag()); progressPlanInfoFlag.setPlanInfoList( new LambdaQueryChainWrapper<>(projectPlanInfoMapper) .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId()) .eq(ProjectPlanInfo::getDeleted, 0) // 未删除 .eq(ProjectPlanInfo::getPlanStatus, 2) // 计划项审批通过 .list() ); yearProgress.add(progressPlanInfoFlag); }); .eq(ProjectPlanRecord::getProjectInfoId, id) .eq(ProjectPlanRecord::getPlanTimeFlag, 2) .list() .stream().forEach(record -> { ProgressPlanInfoFlag progressPlanInfoFlag = new ProgressPlanInfoFlag(); progressPlanInfoFlag.setPlanTime(record.getPlanTime()); progressPlanInfoFlag.setPlanTimeFlag(record.getPlanTimeFlag()); progressPlanInfoFlag.setPlanInfoList( new LambdaQueryChainWrapper<>(projectPlanInfoMapper) .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId()) .eq(ProjectPlanInfo::getDeleted, 0) // 未删除 .eq(ProjectPlanInfo::getPlanStatus, 2) // 计划项审批通过 .list() ); yearProgress.add(progressPlanInfoFlag); }); vo.setMonthProgress(monthProgress); vo.setSeasonProgress(seasonProgress); vo.setYearProgress(yearProgress); return Result.ok().data(vo); } /** * */ /** * 列表 @@ -199,57 +195,49 @@ @Override @Transactional(rollbackFor = Exception.class) public Result saveProjectProgressFileLists(ProjectProgressFileListsRequest request) { public Result saveProjectProgressFileLists(ProjectProgressFileListsForm form) { new LambdaUpdateChainWrapper<>(fileMapper) .eq(File::getBusId, request.getProjectReportId()) .eq(File::getBusId, form.getProjectReportId()) .eq(File::getType, FileTypeEnum.PROJECT_SITUATION_DESCRIPTION.getType()) .set(File::getDeleted,1) .update(); .remove(); request.getSituationDescriptionFileList().stream() form.getSituationDescriptionFileList().stream() .forEach(file -> { file.setId(null); file.setBusId(request.getProjectReportId().longValue()); file.setBusId(form.getProjectReportId()); file.setType(FileTypeEnum.PROJECT_SITUATION_DESCRIPTION); file.setGmtCreate(new Date()); file.setGmtUpdate(new Date()); file.setDeleted(0); fileMapper.insert(file); }); new LambdaUpdateChainWrapper<>(fileMapper) .eq(File::getBusId, request.getProjectReportId()) .eq(File::getBusId, form.getProjectReportId()) .eq(File::getType, FileTypeEnum.PROJECT_COMPLETE_REPORT.getType()) .set(File::getDeleted,1) .update(); .remove(); request.getCompletedReportFileList().stream() form.getCompletedReportFileList().stream() .forEach(file -> { file.setId(null); file.setBusId(request.getProjectReportId().longValue()); file.setBusId(form.getProjectReportId()); file.setType(FileTypeEnum.PROJECT_COMPLETE_REPORT); file.setGmtCreate(new Date()); file.setGmtUpdate(new Date()); file.setDeleted(0); fileMapper.insert(file); }); return Result.ok("保存成功"); } @Override public Result getProjectProgressForm(Integer id) { ProjectProgressFileListsRequest result = new ProjectProgressFileListsRequest(); public Result getProjectProgressForm(Long id) { ProjectProgressFileListsForm result = new ProjectProgressFileListsForm(); result.setProjectReportId(id); result.setCompletedReportFileList(new LambdaQueryChainWrapper<>(fileMapper) .eq(File::getBusId, id) .eq(File::getType, FileTypeEnum.PROJECT_COMPLETE_REPORT) .eq(File::getDeleted, 0) .list()); .eq(File::getBusId, id) .eq(File::getType, FileTypeEnum.PROJECT_COMPLETE_REPORT) .eq(File::getDeleted, 0) .list()); result.setSituationDescriptionFileList(new LambdaQueryChainWrapper<>(fileMapper) .eq(File::getBusId, id) .eq(File::getType, FileTypeEnum.PROJECT_SITUATION_DESCRIPTION) .eq(File::getDeleted, 0) .list()); .eq(File::getBusId, id) .eq(File::getType, FileTypeEnum.PROJECT_SITUATION_DESCRIPTION) .eq(File::getDeleted, 0) .list()); return Result.ok().data(result); } } business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
@@ -5,9 +5,7 @@ import com.ycl.common.utils.SecurityUtils; import com.ycl.domain.entity.ProjectPlanExamineRecord; import com.ycl.domain.entity.ProjectPlanInfo; import com.ycl.domain.entity.ProjectPlanRecord; import com.ycl.domain.vo.DepartmentApprovalResponseVO; import com.ycl.domain.vo.ProgressReportResponseVO; import com.ycl.domain.form.ProgressReportResponseForm; import com.ycl.domain.vo.ProjectProcessToDoVo; import com.ycl.mapper.ProjectPlanExamineRecordMapper; import com.ycl.mapper.ProjectPlanInfoMapper; @@ -22,9 +20,9 @@ import lombok.RequiredArgsConstructor; import com.ycl.framework.utils.PageUtil; import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -137,15 +135,13 @@ } @Override public Result departmentApproval(Integer projectPlanRecordId) { List<DepartmentApprovalResponseVO> vo = baseMapper.selectInfo(projectPlanRecordId); return Result.ok().data(vo); public Result departmentApproval(Long projectPlanRecordId) { return Result.ok().data(baseMapper.selectInfo(projectPlanRecordId)); } @Override public Result planLog(Integer projectPlanRecordId) { List<DepartmentApprovalResponseVO> vo = baseMapper.getPlanLog(projectPlanRecordId); return Result.ok().data(vo); public Result planLog(Long projectPlanRecordId) { return Result.ok().data(baseMapper.getPlanLog(projectPlanRecordId)); } /** @@ -157,22 +153,22 @@ @Override public Result replyExamine(ProjectPlanExamineRecordForm form) { ProjectPlanExamineRecord projectPlanExamineRecord = ProjectPlanExamineRecordForm.getEntityByForm(form, null); projectPlanExamineRecord.setId(form.getId().longValue()); projectPlanExamineRecord.setDepartmentUserId(SecurityUtils.getUserId()); projectPlanExamineRecord.setManagerUserId(SecurityUtils.getUserId()); projectPlanExamineRecord.setId(form.getId()); baseMapper.updateById(projectPlanExamineRecord); return Result.ok("回复成功"); } @Override @Transactional(rollbackFor = Exception.class) public Result saveExamine(ProjectPlanExamineRecordForm form) { // 更新审批记录 ProjectPlanExamineRecord item = ProjectPlanExamineRecordForm.getEntityByForm(form, null); item.setId(form.getId().longValue()); item.setDepartmentUserId(SecurityUtils.getUserId()); item.setManagerUserId(SecurityUtils.getUserId()); baseMapper.updateById(item); Long projectPlanRecordId = baseMapper.selectById(item.getId()).getProjectPlanRecordId(); ProjectPlanExamineRecord entity = new ProjectPlanExamineRecord(); BeanUtils.copyProperties(form, entity); entity.setId(form.getId()); entity.setDepartmentUserId(SecurityUtils.getUserId()); entity.setManagerUserId(SecurityUtils.getUserId()); baseMapper.updateById(entity); Long projectPlanRecordId = baseMapper.selectById(entity.getId()).getProjectPlanRecordId(); // 如果同意，计划项状态为已通过，并且新增一条项目进度审核记录，否则为已驳回 if (null != form.getDepartmentExamine() && null != form.getManageExamine() && form.getDepartmentExamine() == 0 && form.getManageExamine() == 0) { new LambdaUpdateChainWrapper<>(projectPlanInfoMapper) @@ -182,9 +178,8 @@ // 新增项目进度审核记录 ProjectPlanExamineRecord newItem = new ProjectPlanExamineRecord(); newItem.setProjectPlanRecordId(projectPlanRecordId); // 项目计划记录ID newItem.setProjectPlanInfoId(item.getProjectPlanInfoId()); // 项目计划项ID newItem.setProjectPlanInfoId(entity.getProjectPlanInfoId()); // 项目计划项ID newItem.setEventType(2); // 进度上报 newItem.setDeleted(0); // 未删除 baseMapper.insert(newItem); }else{ new LambdaUpdateChainWrapper<>(projectPlanInfoMapper) @@ -205,7 +200,7 @@ } @Override public Result reply(ProgressReportResponseVO form) { public Result reply(ProgressReportResponseForm form) { new LambdaUpdateChainWrapper<>(baseMapper) .eq(ProjectPlanExamineRecord::getId, form.getExamineRecordId()) .set(ProjectPlanExamineRecord::getDepartmentApprovalReply, form.getDepartmentApprovalReply()) business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java
@@ -9,8 +9,8 @@ import com.ycl.domain.entity.ProjectPlanInfo; import com.ycl.domain.entity.ProjectPlanRecord; import com.ycl.domain.form.ProjectPlanInfoForm; import com.ycl.domain.form.ProjectPlanInfoRequestForm; import com.ycl.domain.query.ProjectPlanInfoQuery; import com.ycl.domain.vo.ProjectPlanInfoRequest; import com.ycl.domain.vo.ProjectPlanInfoResponseVO; import com.ycl.domain.vo.ProjectPlanInfoVO; import com.ycl.framework.utils.PageUtil; @@ -20,11 +20,9 @@ import com.ycl.service.ProjectPlanInfoService; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.Date; @@ -113,7 +111,7 @@ * @return */ @Override public Result detail(Integer id) { public Result detail(Long id) { ProjectPlanInfoResponseVO vo = new ProjectPlanInfoResponseVO(); vo.setList(new LambdaQueryChainWrapper<>(baseMapper).eq(ProjectPlanInfo::getProjectPlanRecordId, id).list()); vo.setActualInvest(new LambdaQueryChainWrapper<>(projectPlanRecordMapper).eq(ProjectPlanRecord::getId, id).one().getActualInvest()); @@ -135,19 +133,16 @@ @Transactional(rollbackFor = Exception.class) @Override public Result addPlanInfo(ProjectPlanInfoRequest request) { if (CollectionUtils.isEmpty(request.getAddList())) {{ return Result.error("请选择要添加的计划项"); }} public Result addPlanInfo(ProjectPlanInfoRequestForm form) { // 删除原有记录 new LambdaUpdateChainWrapper<>(baseMapper) .eq(ProjectPlanInfo::getProjectPlanRecordId, request.getProjectPlanRecordId()) .eq(ProjectPlanInfo::getProjectPlanRecordId, form.getProjectPlanRecordId()) .remove(); // 批量插入新记录 List<ProjectPlanInfo> list = new ArrayList<>(); request.getAddList().forEach(item -> { form.getAddList().forEach(item -> { ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo(); projectPlanInfo.setProjectPlanRecordId(request.getProjectPlanRecordId().longValue()); projectPlanInfo.setProjectPlanRecordId(form.getProjectPlanRecordId()); projectPlanInfo.setTitle(item.getTitle()); // 计划项标题 projectPlanInfo.setPlanStatus(0); // 计划项状态为未开始 projectPlanInfo.setProgressStatus(0); // 计划项进度为未开始 @@ -158,36 +153,37 @@ this.saveBatch(list); // 更新计划记录的投资,以及上报状态 new LambdaUpdateChainWrapper<>(projectPlanRecordMapper) .eq(ProjectPlanRecord::getId, request.getProjectPlanRecordId()) .set(ProjectPlanRecord::getActualInvest, request.getActualInvest()) .eq(ProjectPlanRecord::getId, form.getProjectPlanRecordId()) .set(ProjectPlanRecord::getActualInvest, form.getActualInvest()) .set(ProjectPlanRecord::getReportStatus, 0) .update(); // 新增一条审核记录 ProjectPlanExamineRecord item = new ProjectPlanExamineRecord(); item.setProjectPlanRecordId(request.getProjectPlanRecordId()); item.setEventType(0); // 计划上报 list.stream().forEach(i -> { for (ProjectPlanInfo i : list){ ProjectPlanExamineRecord item = new ProjectPlanExamineRecord(); item.setProjectPlanRecordId(form.getProjectPlanRecordId()); item.setEventType(0); // 计划上报 item.setProjectPlanInfoId(i.getId()); projectPlanExamineRecordMapper.insert(item); }); } return Result.ok("添加成功"); } @Override public Result savePlanInfo(ProjectPlanInfo item, Integer planRecordId) { item.setProjectPlanRecordId(planRecordId.longValue()); // 项目计划记录id item.setProgressStatus(0); // 未开始 item.setDeleted(0); // 未删除 item.setPlanStatus(0); // 未审核 public Result savePlanInfo(ProjectPlanInfoForm form, Long planRecordId) { ProjectPlanInfo entity = new ProjectPlanInfo(); BeanUtils.copyProperties(form, entity); entity.setProjectPlanRecordId(planRecordId); // 项目计划记录id entity.setProgressStatus(0); // 未开始 entity.setPlanStatus(0); // 未审核 // 判断id是否存在，存在则更新，不存在则新增 if (item.getId() == null) { baseMapper.insert(item); if (entity.getId() == null) { baseMapper.insert(entity); } else { new LambdaUpdateChainWrapper<>(baseMapper).eq(ProjectPlanInfo::getId, item.getId()) .set(ProjectPlanInfo::getTitle, item.getTitle()) .set(ProjectPlanInfo::getStartTime, item.getStartTime()) .set(ProjectPlanInfo::getEndTime, item.getEndTime()) new LambdaUpdateChainWrapper<>(baseMapper).eq(ProjectPlanInfo::getId, entity.getId()) .set(ProjectPlanInfo::getTitle, entity.getTitle()) .set(ProjectPlanInfo::getStartTime, entity.getStartTime()) .set(ProjectPlanInfo::getEndTime, entity.getEndTime()) .update(); } return Result.ok("保存成功"); @@ -211,14 +207,6 @@ .orderByDesc(ProjectPlanExamineRecord::getGmtCreate) .last("LIMIT 1") .one(); // 新增一条审核记录 // item.setId(null); // item.setEventType(1); // item.setDelayStartTime(request.getStartTime()); // item.setDelayEndTime(request.getEndTime()); // item.setGmtCreate(null); // item.setGmtUpdate(null); // projectPlanExamineRecordMapper.insertOne(item); // 更新原来的审核记录 item.setEventType(1); item.setDelayStartTime(request.getStartTime()); @@ -228,6 +216,7 @@ } @Override @Transactional(rollbackFor = Exception.class) public Result resubmitPlanInfo(ProjectPlanInfoForm form) { // 更新重新上报后的内容 new LambdaUpdateChainWrapper<>(baseMapper) @@ -240,11 +229,10 @@ // 新增一条计划上报的审核记录 ProjectPlanExamineRecord item = new ProjectPlanExamineRecord(); item.setProjectPlanRecordId(form.getProjectPlanRecordId().longValue()); item.setProjectPlanInfoId(form.getId().longValue()); item.setProjectPlanRecordId(form.getProjectPlanRecordId()); item.setProjectPlanInfoId(form.getId()); item.setEventType(0); // 计划上报 item.setGmtCreate(new Date()); item.setDeleted(0); // 未删除 projectPlanExamineRecordMapper.insert(item); return Result.ok("重新上报成功"); } business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
@@ -10,7 +10,7 @@ import com.ycl.domain.entity.ProjectPlanExamineRecord; import com.ycl.domain.entity.ProjectPlanInfo; import com.ycl.domain.entity.ProjectPlanProgressReport; import com.ycl.domain.vo.ProgressReportResponseVO; import com.ycl.domain.form.ProgressReportResponseForm; import com.ycl.framework.utils.PageUtil; import com.ycl.mapper.FileMapper; import com.ycl.mapper.ProjectPlanExamineRecordMapper; @@ -28,8 +28,8 @@ import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -58,12 +58,11 @@ */ @Transactional(rollbackFor = Exception.class) @Override public Result add(ProgressReportResponseVO form) { public Result add(ProgressReportResponseForm form) { // 判断上报状态 if (form.getProgressStatusInt() == 0) { // 未开始 上报进度 ProjectPlanProgressReport projectPlanProgressReport = new ProjectPlanProgressReport(); projectPlanProgressReport.setProjectPlanInfoId(form.getId().longValue()); projectPlanProgressReport.setProjectPlanInfoId(form.getId()); projectPlanProgressReport.setStartTime(form.getActualStartTime()); projectPlanProgressReport.setEndTime(form.getActualEndTime()); projectPlanProgressReport.setProgressStatus(form.getProgressStatusStr()); @@ -72,7 +71,7 @@ baseMapper.insert(projectPlanProgressReport); }else if (form.getProgressStatusInt() == 2) { // 已驳回 重新上报 ProjectPlanProgressReport projectPlanProgressReport = baseMapper.selectById(form.getProgressReportId()); projectPlanProgressReport.setProjectPlanInfoId(form.getId().longValue()); projectPlanProgressReport.setProjectPlanInfoId(form.getId()); projectPlanProgressReport.setStartTime(form.getActualStartTime()); projectPlanProgressReport.setEndTime(form.getActualEndTime()); projectPlanProgressReport.setProgressStatus(form.getProgressStatusStr()); @@ -87,15 +86,12 @@ .eq(File::getType, FileTypeEnum.PROJECT_PROGRESS_INFO_REPORT.getType()) .set(File::getDeleted,1) .update(); if (form.getFileList() != null && form.getFileList().size() > 0) { if (!CollectionUtils.isEmpty(form.getFileList()) && form.getFileList().size() > 0) { form.getFileList().stream() .forEach(file -> { file.setId(null); file.setBusId(form.getId().longValue()); file.setBusId(form.getId()); file.setType(FileTypeEnum.PROJECT_PROGRESS_INFO_REPORT); file.setGmtCreate(new Date()); file.setGmtUpdate(new Date()); file.setDeleted(0); fileMapper.insert(file); }); } @@ -163,10 +159,13 @@ * @return */ @Override public Result detail(Integer id) { ProgressReportResponseVO vo = baseMapper.getDetail(id); public Result detail(Long id) { ProgressReportResponseForm vo = baseMapper.getDetail(id); if (vo != null) { vo.setFileList(new LambdaQueryChainWrapper<>(fileMapper).eq(File::getBusId, id).eq(File::getType, FileTypeEnum.PROJECT_PROGRESS_INFO_REPORT).list()); vo.setFileList(new LambdaQueryChainWrapper<>(fileMapper) .eq(File::getBusId, id) .eq(File::getType, FileTypeEnum.PROJECT_PROGRESS_INFO_REPORT) .list()); } return Result.ok().data(vo); } @@ -185,7 +184,7 @@ } @Override public Result examine(ProgressReportResponseVO form) { public Result examine(ProgressReportResponseForm form) { // 获得审批记录副本 ProjectPlanExamineRecord record = projectPlanExamineRecordMapper.selectById(form.getExamineRecordId()); @@ -200,7 +199,6 @@ newRecord.setManageExamine(form.getManageExamine()); newRecord.setManageApproval(form.getManageApproval()); newRecord.setEventType(2); newRecord.setDeleted(0); projectPlanExamineRecordMapper.insert(newRecord); // 判断审批结果 business/src/main/java/com/ycl/service/impl/ProjectPlanRecordServiceImpl.java
@@ -3,26 +3,25 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.common.base.Result; import com.ycl.common.utils.DateUtils; import com.ycl.domain.entity.Plan; import com.ycl.domain.entity.ProjectPlanInfo; import com.ycl.domain.entity.ProjectPlanRecord; import com.ycl.domain.vo.ProjectPlanRecordAddRequest; import com.ycl.domain.form.ProjectPlanRecordAddRequestForm; import com.ycl.domain.form.ProjectPlanRecordForm; import com.ycl.domain.query.ProjectPlanRecordQuery; import com.ycl.domain.vo.ProjectPlanRecordResponseVO; import com.ycl.domain.vo.ProjetPlanRecordItem; import com.ycl.domain.vo.ProjectPlanRecordVO; import com.ycl.framework.utils.PageUtil; import com.ycl.mapper.PlanMapper; import com.ycl.mapper.ProjectPlanInfoMapper; import com.ycl.mapper.ProjectPlanRecordMapper; import com.ycl.service.ProjectPlanRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.domain.form.ProjectPlanRecordForm; import com.ycl.domain.vo.ProjectPlanRecordVO; import com.ycl.domain.query.ProjectPlanRecordQuery; import org.springframework.stereotype.Service; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.Assert; import java.time.LocalDate; @@ -49,28 +48,27 @@ /** * 添加 * @param request * @param form * @return */ @Override public Result add(ProjectPlanRecordAddRequest request) { public Result add(ProjectPlanRecordAddRequestForm form) { ProjectPlanRecord item = new ProjectPlanRecord(); Plan one = new LambdaQueryChainWrapper<>(planMapper).eq(Plan::getProjectInfoId, request.getProjectInfoId()).one(); // 查询项目计划id item.setPlanId(new LambdaQueryChainWrapper<>(planMapper).eq(Plan::getProjectInfoId, request.getProjectInfoId()).one().getId()); item.setPlanId(new LambdaQueryChainWrapper<>(planMapper).eq(Plan::getProjectInfoId, form.getProjectInfoId()).one().getId()); // 判断标志位是否为0，如果为0，则为月度计划，1为季度计划，2为年度计划 if (request.getPlanTimeFlag() == MONTH_FLAG) { if (form.getPlanTimeFlag() == MONTH_FLAG) { // 判断id是否为0 if (request.getId() == 0) { if (form.getId() == 0) { // 新增月度计划 item.setProjectInfoId(request.getProjectInfoId()); item.setProjectInfoId(form.getProjectInfoId()); item.setPlanTime(LocalDate.now().getMonthValue()); item.setPlanTimeFlag(MONTH_FLAG); item.setCreateTime(DateUtils.getNowDate()); item.setReportStatus(1); } else { // 新增月度计划 item = baseMapper.selectById(request.getId()); item = baseMapper.selectById(form.getId()); item.setId(null); Integer planTime = item.getPlanTime(); item.setPlanTime(planTime == 12 ? 1 : planTime + 1); @@ -78,18 +76,18 @@ item.setReportStatus(1); item.setActualInvest(null); } } else if (request.getPlanTimeFlag() == SEASON_FLAG) { } else if (form.getPlanTimeFlag() == SEASON_FLAG) { // 判断id是否为0 if (request.getId() == 0) { if (form.getId() == 0) { // 新增季度计划 item.setProjectInfoId(request.getProjectInfoId()); item.setProjectInfoId(form.getProjectInfoId()); item.setPlanTime(1); item.setPlanTimeFlag(SEASON_FLAG); item.setCreateTime(DateUtils.getNowDate()); item.setReportStatus(1); } else { // 新增季度计划 item = baseMapper.selectById(request.getId()); item = baseMapper.selectById(form.getId()); item.setId(null); item.setPlanTime(item.getPlanTime() + 1); item.setCreateTime(DateUtils.getNowDate()); @@ -98,16 +96,16 @@ } }else { // 判断id是否为0 if (request.getId() == 0) { if (form.getId() == 0) { // 新增年度计划 item.setProjectInfoId(request.getProjectInfoId()); item.setProjectInfoId(form.getProjectInfoId()); item.setPlanTime(LocalDate.now().getYear()); item.setPlanTimeFlag(YEAR_FLAG); item.setCreateTime(DateUtils.getNowDate()); item.setReportStatus(1); } else { // 新增年计划 item = baseMapper.selectById(request.getId()); item = baseMapper.selectById(form.getId()); item.setId(null); item.setPlanTime(item.getPlanTime() + 1); item.setCreateTime(DateUtils.getNowDate()); @@ -152,7 +150,7 @@ * @return */ @Override public Result removeById(String id) { public Result removeById(Long id) { // 删除计划记录 baseMapper.deleteById(id); // 删除计划项 business/src/main/resources/mapper/ProjectPlanProgressReportMapper.xml
@@ -68,7 +68,7 @@ </select> <select id="getDetail" resultType="com.ycl.domain.vo.ProgressReportResponseVO"> <select id="getDetail" resultType="com.ycl.domain.form.ProgressReportResponseForm"> SELECT ppi.id, pppr.id AS progress_report_id, system/src/main/java/com/ycl/system/domain/base/AbsForm.java
@@ -15,6 +15,6 @@ @ApiModelProperty(value = "id,修改必传", required = false) @NotNull(message = "请选择数据", groups = {Update.class}) private Integer id; private Long id; }
