修改后端显示问题

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzsJgProduceInfoDto.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tzs.api.dto;
 import java.util.Date;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzsJgFile;
 
@@ -60,6 +61,11 @@ public class TzsJgProduceInfoDto extends BaseDto {
 	 * 制造日期
 	 */
 	private Date produceDate;
+	@ApiModelProperty(value = "制造日期")
+	/**
+	 * 制造日期
+	 */
+	private String produceDateStr;
 	@ApiModelProperty(value = "是否进口(是、否)")
 	/**
 	 * 是否进口(是、否)

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzsJgProduceInfo.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzsJgServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 import org.springframework.beans.BeanUtils;
@@ -123,30 +125,30 @@ public class TzsJgServiceImpl implements ITzsJgService {
 //							tzsJgBasicInfoDto.getEquCategory()));
 //			if (equipmentCategory != null) {
 //				tzsJgBasicInfoDto.setEquCategory(equipmentCategory.getCode().toString().replaceAll("0+$", ""));
-			getCategoryCodes(tzsJgBasicInfoDto.getEquDefine(),categoryCodes);
+			getCategoryCodes(tzsJgBasicInfoDto.getEquDefine(), categoryCodes);
 //			}
 		}
 
 		Page<TzsJgBasicInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
 		tzsJgMapper.page(page, tzsJgBasicInfoDto, categoryCodes);
-		for (TzsJgBasicInfoDto basicInfoDto:page.getRecords()){
-			if(ValidationUtil.isEmpty(basicInfoDto.getEquDefine())){
+		for (TzsJgBasicInfoDto basicInfoDto : page.getRecords()) {
+			if (ValidationUtil.isEmpty(basicInfoDto.getEquDefine())) {
 				LambdaQueryWrapper<EquipmentCategory> wrapper = new LambdaQueryWrapper<>();
-				wrapper.eq(EquipmentCategory :: getCode,basicInfoDto.getEquCategory());
+				wrapper.eq(EquipmentCategory::getCode, basicInfoDto.getEquCategory());
 				basicInfoDto.setEquDefine(equipmentCategoryServiceImpl.getOne(wrapper).getName());
 			}
 		}
 		return page;
 	}
 
-	public Set<String> getCategoryCodes(String id,Set<String> categoryCodes){
+	public Set<String> getCategoryCodes(String id, Set<String> categoryCodes) {
 		categoryCodes.add(equipmentCategoryServiceImpl.getById(id).getCode());
 		LambdaQueryWrapper<EquipmentCategory> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(EquipmentCategory :: getParentId,id);
+		wrapper.eq(EquipmentCategory::getParentId, id);
 		List<EquipmentCategory> equipmentCategoryList = equipmentCategoryServiceImpl.list(wrapper);
 		Iterator<EquipmentCategory> iterator = equipmentCategoryList.iterator();
 		while (iterator.hasNext()) {
-			getCategoryCodes(String.valueOf(iterator.next().getId()),categoryCodes);
+			getCategoryCodes(String.valueOf(iterator.next().getId()), categoryCodes);
 		}
 		return null;
 	}
@@ -183,6 +185,8 @@ public class TzsJgServiceImpl implements ITzsJgService {
 		TzsJgProduceInfoDto produceInfoDto = new TzsJgProduceInfoDto();
 		if (produceInfo != null) {
 			BeanUtils.copyProperties(produceInfo, produceInfoDto);
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			produceInfoDto.setProduceDateStr(sdf.format(produceInfoDto.getProduceDate()));
 			List<TzsJgFile> produceStandard = iTzsJgFileService
 					.list(new LambdaQueryWrapper<TzsJgFile>().eq(TzsJgFile::getSquNbr, produceInfo.getSequenceNbr())
 							.eq(TzsJgFile::getObjectType, JgFileObjectEnum.PRODUCE_INFO.getObject())
@@ -218,6 +222,12 @@ public class TzsJgServiceImpl implements ITzsJgService {
 				new LambdaQueryWrapper<TzsJgRegistrationInfo>().eq(TzsJgRegistrationInfo::getSequenceCode, code));
 		TzsJgRegistrationInfoDto registrationInfoDto = new TzsJgRegistrationInfoDto();
 		if (registrationInfo != null) {
+			EquipmentCategory define = equipmentCategoryServiceImpl.getOne(new LambdaQueryWrapper<EquipmentCategory>()
+					.eq(EquipmentCategory::getCode, registrationInfo.getEquDefine()));
+			registrationInfo.setEquDefine(define != null ? define.getName() : null);
+			EquipmentCategory category = equipmentCategoryServiceImpl.getOne(new LambdaQueryWrapper<EquipmentCategory>()
+					.eq(EquipmentCategory::getCode, registrationInfo.getEquCategory()));
+			registrationInfo.setEquCategory(category != null ? category.getName() : null);
 			BeanUtils.copyProperties(registrationInfo, registrationInfoDto);
 			List<TzsJgFile> useRegistCertificate = iTzsJgFileService.list(new LambdaQueryWrapper<TzsJgFile>()
 					.eq(TzsJgFile::getSquNbr, registrationInfo.getSequenceNbr())