Skip to content

T
tianjin-cement
Commit f87b3e8c authored by 竹天卫's avatar 竹天卫
Browse files
Options

Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement

parents aeb95803 cbb1a805
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 41 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/controller/NonStandardValueController.java
View file @ f87b3e8c
......@@ -53,7 +53,7 @@ public class NonStandardValueController {
@GetMapping("/user_id")
@ApiOperation("非标产值统计")
public BaseResponse nonValue(PageQuery pageQuery, String start, String end, Integer groups) {
public BaseResponse nonValue(PageQuery pageQuery, String start, String end, Integer groups,String name) {
Date startParse = null;
if (StrUtil.isNotBlank(start)) {
startParse = DateUtil.parse(start);
......@@ -63,7 +63,7 @@ public class NonStandardValueController {
endParse = DateUtil.parse(end);
}
//将list拆分成分页
BaseResponse<List<NonStandardValue>> baseResponse = inonStandardValueService.nonValue(startParse, endParse, groups);
BaseResponse<List<NonStandardValue>> baseResponse = inonStandardValueService.nonValue(startParse, endParse, groups,name);
List<NonStandardValue> data = baseResponse.getData();
if (data.size() != 0) {
Page<NonStandardValue> rts = PageUtil.listConvertToPage(data, pageQuery);
......@@ -74,7 +74,7 @@ public class NonStandardValueController {
@ApiOperation(value = "获取所有已通过的非标产值")
@GetMapping("/getList")
public BaseResponse getList(String start, String end, Integer groups) {
public BaseResponse getList(String start, String end, Integer groups,String name) {
Date startParse = null;
if (StrUtil.isNotBlank(start)) {
startParse = DateUtil.parse(start);
......@@ -84,7 +84,7 @@ public class NonStandardValueController {
endParse = DateUtil.parse(end);
}
try {
return inonStandardValueService.getList(startParse, endParse, groups);
return inonStandardValueService.getList(startParse, endParse, groups,name);
} catch (Exception e) {
log.debug("获取所有已通过的非标产值{}", e);
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/NormProductionController.java
View file @ f87b3e8c
......@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
......@@ -30,7 +29,6 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Date;
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/QualityApplyController.java
View file @ f87b3e8c
package cn.wise.sc.cement.business.controller;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.wise.sc.cement.business.entity.QualityApply;
......@@ -24,6 +25,8 @@ import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
* <p>
......@@ -40,37 +43,51 @@ import java.util.List;
@RequestMapping("/business/qualityApply")
public class QualityApplyController {
final
IQualityApplyService iQualityApplyService;
final
IQualityApplyService iQualityApplyService;
public QualityApplyController(IQualityApplyService iQualityApplyService) {
this.iQualityApplyService = iQualityApplyService;
}
public QualityApplyController(IQualityApplyService iQualityApplyService) {
this.iQualityApplyService = iQualityApplyService;
}
@PostMapping("/apply")
@ApiOperation("质量详情审核")
public BaseResponse<Boolean> applyQuality(@RequestBody List<QualityApply> qualityApply) {
boolean save = iQualityApplyService.saveBatch(qualityApply);
if (save) {
return BaseResponse.okData(true);
} else {
return BaseResponse.errorMsg("添加失败!");
}
}
@PostMapping("/apply")
@ApiOperation("质量详情审核")
public BaseResponse<Boolean> applyQuality(@RequestBody List<QualityApply> qualityApply) {
@PostMapping("/export")
@ApiOperation("导出质量监控")
public void exportQuality(String startDate, String endDate, HttpServletResponse response) {
Set<Integer> groupIds = qualityApply
.stream().map(QualityApply::getTeamGroupId).collect(Collectors.toSet());
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;
if (StrUtil.isNotBlank(startDate)) {
startParse = DateUtil.parse(startDate);
}
Date endParse = null;
if (StrUtil.isNotBlank(endDate)) {
endParse = DateUtil.parse(endDate);
}
iQualityApplyService.exportQuality(startParse, endParse, response);
}
qw.eq("project_id", projectIds.iterator().next());
qw.in("team_group_id", groupIds);
iQualityApplyService.remove(qw);
boolean save = iQualityApplyService.saveBatch(qualityApply);
if (save) {
return BaseResponse.okData(true);
} else {
return BaseResponse.errorMsg("添加失败!");
}
}
@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);
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/INonStandardValueService.java
View file @ f87b3e8c
......@@ -34,7 +34,7 @@ public interface INonStandardValueService extends IService<NonStandardValue> {
BaseResponse<List<NonStandardValue>> nonValue(Integer userId);*/
//计算每个用户提交的非标产值
BaseResponse<List<NonStandardValue>> nonValue(Date start, Date end, Integer groups);
BaseResponse<List<NonStandardValue>> nonValue(Date start, Date end, Integer groups,String name);
// /**
// * 通过用户id查询非标产值信息
......@@ -48,7 +48,7 @@ public interface INonStandardValueService extends IService<NonStandardValue> {
*
* @return List
*/
BaseResponse<List<NonStandardValueVo>> getList(Date start, Date end, Integer groups);
BaseResponse<List<NonStandardValueVo>> getList(Date start, Date end, Integer groups,String name);
/**
* 非标产值列表导出
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardValueServiceImpl.java
View file @ f87b3e8c
......@@ -38,6 +38,7 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
Map<String, Object> params = new HashMap<>();
params.put("userId", userId);
params.put("name", name);
params.put("status",2);
Page<NonStandardValueVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
IPage<NonStandardValueVo> pages = nonStandardValueMapper.getPage(page, params);
return BaseResponse.okData(pages);
......@@ -58,8 +59,8 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
@Override
//计算每个用户提交的非标产值
public BaseResponse<List<NonStandardValue>> nonValue(Date start, Date end, Integer groups) {
List<NonStandardValueVo> data = getList(start, end, groups).getData();
public BaseResponse<List<NonStandardValue>> nonValue(Date start, Date end, Integer groups,String name) {
List<NonStandardValueVo> data = getList(start, end, groups,name).getData();
//userId去重
Set<Integer> ids = new HashSet<>();
//循环所有NonStandardValue的集合data,找到每个NonStandardValue.getuserId放到set
......@@ -128,12 +129,13 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
// }
@Override
public BaseResponse<List<NonStandardValueVo>> getList(Date start, Date end, Integer groups) {
public BaseResponse<List<NonStandardValueVo>> getList(Date start, Date end, Integer groups,String name) {
Map<String, Object> params = new HashMap<>();
params.put("start", start);
params.put("end", end);
params.put("status", 2);
params.put("groups", groups);
params.put("name",name);
List<NonStandardValueVo> list = nonStandardValueMapper.getList(params);
return BaseResponse.okData(list);
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NormProductionServiceImpl.java
View file @ f87b3e8c
......@@ -407,7 +407,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
}
//非标准产值
List<NonStandardValue> nonStandardValues = iNonStandardValueService.nonValue(startDate, endDate, groupId).getData();
List<NonStandardValue> nonStandardValues = iNonStandardValueService.nonValue(startDate, endDate, groupId,name).getData();
//标准产值
List<NormProductionStatistics> productionStatistics = this.normProductionStatistics(start, end, name, groupId).getData();
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PrecipriceServiceImpl.java
View file @ f87b3e8c
......@@ -349,7 +349,7 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
}
//非标准产值
List<NonStandardValue> nonStandardValues = iNonStandardValueService.nonValue(startDate, endDate, groupId).getData();
List<NonStandardValue> nonStandardValues = iNonStandardValueService.nonValue(startDate, endDate, groupId,name).getData();
//标准产值
List<NormProductionStatistics> productionStatistics = this.normProductionStatistics(start, end, name, groupId).getData();
//以userId找关系
......
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