Commit 8d2df675 authored by mengbali153's avatar mengbali153

Merge remote-tracking branch 'origin/master' into master

parents 19d624d5 9327a7c0
...@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.controller; ...@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.controller;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.wise.sc.cement.business.entity.NonStandardValue; import cn.wise.sc.cement.business.entity.NonStandardValue;
import cn.wise.sc.cement.business.model.BaseResponse; import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery; import cn.wise.sc.cement.business.model.PageQuery;
...@@ -54,8 +55,14 @@ public class NonStandardValueController { ...@@ -54,8 +55,14 @@ public class NonStandardValueController {
@GetMapping("/user_id") @GetMapping("/user_id")
@ApiOperation("非标产值统计") @ApiOperation("非标产值统计")
public BaseResponse nonValue(PageQuery pageQuery, String start, String end) { public BaseResponse nonValue(PageQuery pageQuery, String start, String end) {
Date startParse = DateUtil.parse(start); Date startParse = null;
Date endParse = DateUtil.parse(end); if (StrUtil.isNotBlank(start)) {
startParse = DateUtil.parse(start);
}
Date endParse = null;
if (StrUtil.isNotBlank(end)) {
endParse = DateUtil.parse(end);
}
//将list拆分成分页 //将list拆分成分页
BaseResponse<List<NonStandardValue>> baseResponse = inonStandardValueService.nonValue(startParse, endParse); BaseResponse<List<NonStandardValue>> baseResponse = inonStandardValueService.nonValue(startParse, endParse);
List<NonStandardValue> data = baseResponse.getData(); List<NonStandardValue> data = baseResponse.getData();
...@@ -69,9 +76,15 @@ public class NonStandardValueController { ...@@ -69,9 +76,15 @@ public class NonStandardValueController {
@ApiOperation(value = "获取所有已通过的非标产值") @ApiOperation(value = "获取所有已通过的非标产值")
@GetMapping("/getList") @GetMapping("/getList")
public BaseResponse getList(String start, String end) { public BaseResponse getList(String start, String end) {
Date startParse = null;
if (StrUtil.isNotBlank(start)) {
startParse = DateUtil.parse(start);
}
Date endParse = null;
if (StrUtil.isNotBlank(end)) {
endParse = DateUtil.parse(end);
}
try { try {
Date startParse = DateUtil.parse(start);
Date endParse = DateUtil.parse(end);
return inonStandardValueService.getList(startParse, endParse); return inonStandardValueService.getList(startParse, endParse);
} catch (Exception e) { } catch (Exception e) {
log.debug("获取所有已通过的非标产值{}", e); log.debug("获取所有已通过的非标产值{}", e);
......
...@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.controller; ...@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.controller;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.wise.sc.cement.business.entity.QualityApply; import cn.wise.sc.cement.business.entity.QualityApply;
import cn.wise.sc.cement.business.model.BaseResponse; import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.service.IQualityApplyService; import cn.wise.sc.cement.business.service.IQualityApplyService;
...@@ -58,51 +59,19 @@ public class QualityApplyController { ...@@ -58,51 +59,19 @@ public class QualityApplyController {
} }
} }
public static void main(String[] args) {
List<QualityApply> list = new ArrayList<>();
QualityApply qualityApply = new QualityApply();
qualityApply.setCementCode("test");
qualityApply.setCreateTime(LocalDate.now());
qualityApply.setInputResult("[1,2,3,4]");
qualityApply.setProjectId(1);
qualityApply.setProjectName("test");
qualityApply.setUserName("检测人");
qualityApply.setSampleCode("001");
qualityApply.setSampleForm("粉末");
qualityApply.setSampleName("样品A");
qualityApply.setTeams("[S,CO3,LiO2,H2Co3]");
qualityApply.setTeamGroupId(1);
QualityApply qualityApply1 = new QualityApply();
qualityApply1.setCementCode("test");
qualityApply1.setCreateTime(LocalDate.now());
qualityApply1.setInputResult("[1,2,3,4]");
qualityApply1.setProjectId(1);
qualityApply1.setProjectName("test");
qualityApply1.setUserName("检测人");
qualityApply1.setSampleCode("001");
qualityApply1.setSampleForm("粉末");
qualityApply1.setSampleName("样品A");
qualityApply1.setTeams("[S,CO3,LiO2,H2Co3]");
qualityApply1.setTeamGroupId(1);
list.add(qualityApply1);
String ss = "[\"S\",\"CO3\",\"LiO2\",\"H2Co3\"]";
list.add(qualityApply);
List<String> a = new ArrayList<>();
a.add("S");
a.add("CO3");
a.add("LiO2");
a.add("H2Co3");
System.out.println(JSON.toJSONString(a));
System.out.println(JSON.toJSONString(list));
}
@PostMapping("/export") @PostMapping("/export")
@ApiOperation("导出质量监控") @ApiOperation("导出质量监控")
public void exportQuality(String startDate, String endDate, HttpServletResponse response) { public void exportQuality(String startDate, String endDate, HttpServletResponse response) {
Date startParse = DateUtil.parse(startDate); Date startParse = null;
Date endParse = DateUtil.parse(endDate); if (StrUtil.isNotBlank(startDate)) {
startParse = DateUtil.parse(startDate);
}
Date endParse = null;
if (StrUtil.isNotBlank(endDate)) {
endParse = DateUtil.parse(endDate);
}
iQualityApplyService.exportQuality(startParse, endParse, response); iQualityApplyService.exportQuality(startParse, endParse, response);
} }
} }
......
...@@ -62,10 +62,10 @@ public class QualityController { ...@@ -62,10 +62,10 @@ public class QualityController {
if (records.size() == 0) { if (records.size() == 0) {
return BaseResponse.errorMsg("没找到相关数据!"); return BaseResponse.errorMsg("没找到相关数据!");
} }
List<Integer> projectIds = records.stream().map(EntrustVo::getProjectId).collect(Collectors.toList()); List<Integer> projectIds = records.stream().map(EntrustVo::getId).collect(Collectors.toList());
Set<Integer> qualityApplyIds = iQualityApplyService.selectQualityApplyStatusByProIds(projectIds); Set<Integer> qualityApplyIds = iQualityApplyService.selectQualityApplyStatusByProIds(projectIds);
records.forEach(arg->{ records.forEach(arg->{
if (qualityApplyIds.contains(arg.getProjectId())){ if (qualityApplyIds.contains(arg.getId())){
arg.setStatusValue("审核完成"); arg.setStatusValue("审核完成");
arg.setStatus(10); arg.setStatus(10);
}else { }else {
......
...@@ -3,7 +3,6 @@ package cn.wise.sc.cement.business.util; ...@@ -3,7 +3,6 @@ package cn.wise.sc.cement.business.util;
import freemarker.template.Configuration; import freemarker.template.Configuration;
import freemarker.template.Template; import freemarker.template.Template;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
...@@ -61,7 +60,6 @@ public class WordUtil { ...@@ -61,7 +60,6 @@ public class WordUtil {
out = new OutputStreamWriter(fos, StandardCharsets.UTF_8); out = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
//变量替换 //变量替换
template.process(beanParams, out); template.process(beanParams, out);
FileInputStream in = new FileInputStream(file); FileInputStream in = new FileInputStream(file);
byte[] buffer = new byte[in.available()]; byte[] buffer = new byte[in.available()];
......
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