| src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/quality/pojo/RawMaterial.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/static/report-template.docx | 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
@@ -55,4 +55,7 @@ @ApiModelProperty("单位") private String unit; @ApiModelProperty("检验日期") private String checkTimeText; } src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; import org.springframework.format.annotation.DateTimeFormat; /** * <p> @@ -59,6 +60,7 @@ @ApiModelProperty("检验日期") @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @Excel(name = "检测日期", width = 30, dateFormat = "yyyy-MM-dd") private Date checkTime; src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
@@ -44,6 +44,8 @@ import java.util.*; import java.util.stream.Collectors; import static com.ruoyi.home.service.impl.HomeServiceImpl.formatDate; /** * <p> @@ -311,6 +313,7 @@ inspect.setProductName(product.getProductName()); inspect.setCheckTypeText(RawMaterialCheckType.fromValue(rawMaterial.getCheckType()) == null ? "" : RawMaterialCheckType.fromValue(rawMaterial.getCheckType()).getValue()); inspect.setCheckResultText(RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()) == null ? "" : RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()).getValue()); inspect.setCheckTimeText(formatDate(rawMaterial.getCheckTime())); List<RawMaterialQualityInspectItem> paramList = rawMaterialQualityInspectItemService.list( new LambdaQueryWrapper<RawMaterialQualityInspectItem>() src/main/resources/static/report-template.docxBinary files differ