Commit 675377ff authored by 竹天卫's avatar 竹天卫
parents 18f5a84e 42a11c15
...@@ -145,7 +145,7 @@ public class NormProductionController { ...@@ -145,7 +145,7 @@ public class NormProductionController {
} }
@GetMapping("/export/statistics") @PostMapping("/export/statistics")
@ApiOperation("导出标准产值列表") @ApiOperation("导出标准产值列表")
public void exportNormProductionStatistics(String start, String end, String name, HttpServletResponse response) { public void exportNormProductionStatistics(String start, String end, String name, HttpServletResponse response) {
Long startTime = null; Long startTime = null;
...@@ -157,7 +157,7 @@ public class NormProductionController { ...@@ -157,7 +157,7 @@ public class NormProductionController {
iNormProductionService.exportNormProductionStatistics(startTime, endTime, name, response); iNormProductionService.exportNormProductionStatistics(startTime, endTime, name, response);
} }
@GetMapping("/export/statistics/detail") @PostMapping("/export/statistics/detail")
@ApiOperation("导出个人标准产值详情列表") @ApiOperation("导出个人标准产值详情列表")
public void exportNormProductionDetails(Integer userId, String start, public void exportNormProductionDetails(Integer userId, String start,
String end, HttpServletResponse response) { String end, HttpServletResponse response) {
...@@ -170,7 +170,7 @@ public class NormProductionController { ...@@ -170,7 +170,7 @@ public class NormProductionController {
iNormProductionService.exportNormProductionDetail(userId, startTime, endTime, response); iNormProductionService.exportNormProductionDetail(userId, startTime, endTime, response);
} }
@GetMapping("/export/total/production") @PostMapping("/export/total/production")
@ApiOperation("导出总产值") @ApiOperation("导出总产值")
public void exportProduction(String name, String start, String end, HttpServletResponse response) { public void exportProduction(String name, String start, String end, HttpServletResponse response) {
Long startTime = null; Long startTime = null;
......
package cn.wise.sc.cement.business.controller; package cn.wise.sc.cement.business.controller;
import cn.wise.sc.cement.business.entity.EntrustReport;
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;
import cn.wise.sc.cement.business.model.vo.EntrustVo; import cn.wise.sc.cement.business.model.vo.EntrustVo;
import cn.wise.sc.cement.business.model.vo.QualityDetailVo; import cn.wise.sc.cement.business.model.vo.QualityDetailVo;
import cn.wise.sc.cement.business.service.IEntrustService; import cn.wise.sc.cement.business.service.IEntrustService;
import cn.wise.sc.cement.business.util.PageUtil; import cn.wise.sc.cement.business.service.IQualityApplyService;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
...@@ -19,6 +17,7 @@ import org.springframework.web.bind.annotation.PathVariable; ...@@ -19,6 +17,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -34,9 +33,12 @@ public class QualityController { ...@@ -34,9 +33,12 @@ public class QualityController {
final final
IEntrustService iEntrustService; IEntrustService iEntrustService;
final
IQualityApplyService iQualityApplyService;
public QualityController(IEntrustService iEntrustService) { public QualityController(IEntrustService iEntrustService, IQualityApplyService iQualityApplyService) {
this.iEntrustService = iEntrustService; this.iEntrustService = iEntrustService;
this.iQualityApplyService = iQualityApplyService;
} }
@ApiOperation(value = "质量检测分页列表") @ApiOperation(value = "质量检测分页列表")
...@@ -50,13 +52,34 @@ public class QualityController { ...@@ -50,13 +52,34 @@ public class QualityController {
@GetMapping("/getPage") @GetMapping("/getPage")
public BaseResponse<IPage<EntrustVo>> page(PageQuery pageQuery, String startDate, String endDate, public BaseResponse<IPage<EntrustVo>> page(PageQuery pageQuery, String startDate, String endDate,
Integer clientId, String projectName, String projectCode) { Integer clientId, String projectName, String projectCode) {
return iEntrustService.getQualityPage(pageQuery, startDate, endDate, clientId, projectName, projectCode); BaseResponse<IPage<EntrustVo>> baseResponse = iEntrustService.getQualityPage(
pageQuery, startDate, endDate, clientId, projectName, projectCode);
//判断是否已经评审过
if (baseResponse.getCode() == 200) {
List<EntrustVo> records = baseResponse.getData().getRecords();
if (records.size() == 0) {
return BaseResponse.errorMsg("没找到相关数据!");
}
List<Integer> projectIds = records.stream().map(EntrustVo::getProjectId).collect(Collectors.toList());
Set<Integer> qualityApplyIds = iQualityApplyService.selectQualityApplyStatusByProIds(projectIds);
records.forEach(arg->{
if (qualityApplyIds.contains(arg.getProjectId())){
arg.setStatusValue("审核完成");
arg.setStatus(10);
}else {
arg.setStatusValue("待审核");
arg.setStatus(9);
}
});
}
return baseResponse;
} }
@GetMapping("/{entrustId}") @GetMapping("/{entrustId}")
@ApiOperation("获取质量详情") @ApiOperation("获取质量详情")
public BaseResponse<QualityDetailVo> getReportDetail(@PathVariable("entrustId") Integer entrustId) { public BaseResponse<QualityDetailVo> getReportDetail(@PathVariable("entrustId") Integer entrustId) {
return BaseResponse.okData(iEntrustService.getQualityDetail(entrustId)); return BaseResponse.okData(iEntrustService.getQualityDetail(entrustId));
} }
......
...@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiImplicitParam; ...@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
...@@ -30,6 +31,7 @@ import java.util.Set; ...@@ -30,6 +31,7 @@ import java.util.Set;
**/ **/
@Api(tags = "报告管理") @Api(tags = "报告管理")
@Slf4j @Slf4j
@CrossOrigin
@RestController @RestController
@RequestMapping("/business/report") @RequestMapping("/business/report")
public class ReportController { public class ReportController {
...@@ -73,8 +75,8 @@ public class ReportController { ...@@ -73,8 +75,8 @@ public class ReportController {
return iEntrustService.deleteById(id); return iEntrustService.deleteById(id);
} }
@GetMapping("/{entrustId}") @PostMapping("/{entrustId}")
@ApiOperation("获取报告详情") @ApiOperation("导出报告封面和首页")
public void getReportDetail(@PathVariable("entrustId") Integer entrustId, public void getReportDetail(@PathVariable("entrustId") Integer entrustId,
HttpServletResponse response) { HttpServletResponse response) {
......
...@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; ...@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate;
/** /**
* @description: 质量检测详情 * @description: 质量检测详情
...@@ -15,7 +16,6 @@ import java.io.Serializable; ...@@ -15,7 +16,6 @@ import java.io.Serializable;
public class QualityDetail implements Serializable { public class QualityDetail implements Serializable {
private static final long serialVersionUID = 42L; private static final long serialVersionUID = 42L;
@ApiModelProperty("样品名字") @ApiModelProperty("样品名字")
private String sampleName; private String sampleName;
@ApiModelProperty("检测数据") @ApiModelProperty("检测数据")
...@@ -40,8 +40,18 @@ public class QualityDetail implements Serializable { ...@@ -40,8 +40,18 @@ public class QualityDetail implements Serializable {
private Integer userId; private Integer userId;
@ApiModelProperty("样品数量") @ApiModelProperty("样品数量")
private Integer sampleNum; private Integer sampleNum;
@ApiModelProperty("送检单位id")
private Integer clientId; private Integer clientId;
@ApiModelProperty("用户名")
private String userName; private String userName;
@ApiModelProperty("送检单位名字")
private String clientName; private String clientName;
@ApiModelProperty("委托创建时间")
private LocalDate createTime;
@ApiModelProperty("来样编号")
private String sampleCode;
@ApiModelProperty("样品状态")
private String sampleForm;
@ApiModelProperty("本所编号")
private String cementCode;
} }
...@@ -254,15 +254,15 @@ ...@@ -254,15 +254,15 @@
</select> </select>
<select id="getQualityDetail" resultType="cn.wise.sc.cement.business.entity.QualityDetail"> <select id="getQualityDetail" resultType="cn.wise.sc.cement.business.entity.QualityDetail">
SELECT s.sample_name,esscct.* FROM (SELECT sscct.*,client_id,entrust_code,project_name,sample_num,send_name,send_phone FROM entrust e SELECT s.sample_name,s.cement_code,s.sample_form,s.sample_code,esscct.* FROM (SELECT sscct.*,client_id,entrust_code,project_name,sample_num,send_name,send_phone,create_time FROM entrust e
RIGHT JOIN RIGHT JOIN
(SELECT sct.input_result,sample_id,entrust_id,team_group_name,team_group_id,user_id FROM sample_check sc (SELECT count_result as input_result,sample_id,entrust_id,team_group_name,team_group_id,user_id FROM sample_check sc
RIGHT JOIN RIGHT JOIN
(SELECT * FROM sample_check_team) sct (SELECT * FROM sample_check_team) sct
ON sct.check_id = sc.id WHERE sc.entrust_id = #{entrustId}) sscct ON sct.check_id = sc.id WHERE sc.entrust_id = #{entrustId}) sscct
ON e.id = sscct.entrust_id) esscct ON e.id = sscct.entrust_id) esscct
LEFT JOIN LEFT JOIN
(SELECT name as sample_name,id FROM sample) s (SELECT name as sample_name,id,cement_code,sample_form,sample_code FROM sample) s
ON esscct.sample_id = s.id ON esscct.sample_id = s.id
</select> </select>
......
...@@ -20,18 +20,25 @@ public class QualityDetailVo implements Serializable { ...@@ -20,18 +20,25 @@ public class QualityDetailVo implements Serializable {
private Integer sampleNum; private Integer sampleNum;
private String sendName; private String sendName;
private String sendPhone; private String sendPhone;
private String createTime;
private String entrustId;
List<QualityTeamGroup> qualityTeamGroups = new ArrayList<>(); List<QualityTeamGroup> qualityTeamGroups = new ArrayList<>();
@Data @Data
public static class QualityTeamGroup { public static class QualityTeamGroup {
private String teamGroupName; private String teamGroupName;
private Integer teamGroupId;
private List<QualitySample> qualitySamples = new ArrayList<>(); private List<QualitySample> qualitySamples = new ArrayList<>();
} }
@Data @Data
public static class QualitySample { public static class QualitySample {
private String sampleName; private String sampleName;
private Integer sampleId;
private String sampleForm;
private String cementCode;
private String sampleCode;
private List<SampleOriginal> sampleOriginals = new ArrayList<>(); private List<SampleOriginal> sampleOriginals = new ArrayList<>();
} }
......
...@@ -162,27 +162,21 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper, ...@@ -162,27 +162,21 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
List<TeamGroup> finalTeamGroups = teamGroups; List<TeamGroup> finalTeamGroups = teamGroups;
List<Handle> finalHandles = handles; List<Handle> finalHandles = handles;
normProductions.forEach(arg -> { normProductions.forEach(arg -> {
NormProductionVo normProductionVo = new NormProductionVo();
BeanUtil.copyProperties(arg, normProductionVo);
normProductionVo.setAssessName("/");
if (arg.getType() == 1) { if (arg.getType() == 1) {
finalTeamGroups.stream() finalTeamGroups.stream()
.filter(opt -> opt.getId().intValue() == arg.getAssessId()) .filter(opt -> opt.getId().intValue() == arg.getAssessId())
.findFirst() .findFirst()
.ifPresent(opt -> { .ifPresent(opt -> normProductionVo.setAssessName(opt.getName()));
NormProductionVo normProductionVo = new NormProductionVo();
BeanUtil.copyProperties(arg, normProductionVo);
normProductionVo.setAssessName(opt.getName());
records.add(normProductionVo);
});
} else { } else {
finalHandles.stream() finalHandles.stream()
.filter(opt -> opt.getId().intValue() == arg.getAssessId()) .filter(opt -> opt.getId().intValue() == arg.getAssessId())
.findFirst() .findFirst()
.ifPresent(opt -> { .ifPresent(opt -> normProductionVo.setAssessName(opt.getName()));
NormProductionVo normProductionVo = new NormProductionVo();
BeanUtil.copyProperties(arg, normProductionVo);
normProductionVo.setAssessName(opt.getName());
records.add(normProductionVo);
});
} }
records.add(normProductionVo);
}); });
rts.setRecords(records); rts.setRecords(records);
return BaseResponse.okData(rts); return BaseResponse.okData(rts);
...@@ -219,6 +213,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper, ...@@ -219,6 +213,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
} else { } else {
return BaseResponse.errorMsg("修改失败!"); return BaseResponse.errorMsg("修改失败!");
} }
} }
@Override @Override
......
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