Commit bb485650 authored by qinhu's avatar qinhu

质量管理bug修改

parent 27032be5
package cn.wise.sc.cement.business.controller; package cn.wise.sc.cement.business.controller;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.wise.sc.cement.business.entity.QualityApply; import cn.wise.sc.cement.business.entity.QualityApply;
...@@ -24,6 +25,8 @@ import java.time.LocalDate; ...@@ -24,6 +25,8 @@ import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/** /**
* <p> * <p>
...@@ -40,37 +43,51 @@ import java.util.List; ...@@ -40,37 +43,51 @@ import java.util.List;
@RequestMapping("/business/qualityApply") @RequestMapping("/business/qualityApply")
public class QualityApplyController { public class QualityApplyController {
final final
IQualityApplyService iQualityApplyService; IQualityApplyService iQualityApplyService;
public QualityApplyController(IQualityApplyService iQualityApplyService) { public QualityApplyController(IQualityApplyService iQualityApplyService) {
this.iQualityApplyService = iQualityApplyService; this.iQualityApplyService = iQualityApplyService;
} }
@PostMapping("/apply") @PostMapping("/apply")
@ApiOperation("质量详情审核") @ApiOperation("质量详情审核")
public BaseResponse<Boolean> applyQuality(@RequestBody List<QualityApply> qualityApply) { public BaseResponse<Boolean> applyQuality(@RequestBody List<QualityApply> qualityApply) {
boolean save = iQualityApplyService.saveBatch(qualityApply);
if (save) {
return BaseResponse.okData(true);
} else {
return BaseResponse.errorMsg("添加失败!");
}
}
@PostMapping("/export") Set<Integer> groupIds = qualityApply
@ApiOperation("导出质量监控") .stream().map(QualityApply::getTeamGroupId).collect(Collectors.toSet());
public void exportQuality(String startDate, String endDate, HttpServletResponse response) { QueryWrapper<QualityApply> qw = new QueryWrapper<>();
Set<Integer> projectIds = qualityApply
.stream().map(QualityApply::getProjectId).collect(Collectors.toSet());
if (CollectionUtil.isEmpty(qualityApply) && CollectionUtil.isEmpty(groupIds)
&& CollectionUtil.isEmpty(projectIds)) {
return BaseResponse.okData(true);
}
Date startParse = null; qw.eq("project_id", projectIds.iterator().next());
if (StrUtil.isNotBlank(startDate)) { qw.in("team_group_id", groupIds);
startParse = DateUtil.parse(startDate); iQualityApplyService.remove(qw);
} boolean save = iQualityApplyService.saveBatch(qualityApply);
Date endParse = null; if (save) {
if (StrUtil.isNotBlank(endDate)) { return BaseResponse.okData(true);
endParse = DateUtil.parse(endDate); } else {
} return BaseResponse.errorMsg("添加失败!");
iQualityApplyService.exportQuality(startParse, endParse, response); }
} }
@PostMapping("/export")
@ApiOperation("导出质量监控")
public void exportQuality(String startDate, String endDate, HttpServletResponse response) {
Date startParse = null;
if (StrUtil.isNotBlank(startDate)) {
startParse = DateUtil.parse(startDate);
}
Date endParse = null;
if (StrUtil.isNotBlank(endDate)) {
endParse = DateUtil.parse(endDate);
}
iQualityApplyService.exportQuality(startParse, endParse, response);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment