diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 565dfc36c..aa74b4365 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -98,6 +98,12 @@ public class UdiRelevanceResponse { private String basicPrductRemak6; private String basicPrductRemak7; private String basicPrductRemak8; + private String basicPrductRemak9; + private String basicPrductRemak10; + private String basicPrductRemak11; + private String basicPrductRemak12; + private String basicPrductRemak13; + private BigDecimal price; private String PRId; @@ -166,6 +172,7 @@ public class UdiRelevanceResponse { private Long relIdFk; + /** * 一级分类名称(学科,品名) */ diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index 0a3f2e00e..e2b91372e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -42,6 +42,10 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.Collections; import java.util.Date; import java.util.List; diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 2a0345479..01d0a417b 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -325,6 +325,11 @@ basic_products.basicPrductRemak6, basic_products.basicPrductRemak7, basic_products.basicPrductRemak8, + basic_products.basicPrductRemak9, + basic_products.basicPrductRemak10, + basic_products.basicPrductRemak11, + basic_products.basicPrductRemak12, + basic_products.basicPrductRemak13, basic_products.sfwblztlcp, basic_products.cgzmraqxgxx, basic_products.sfbjwycxsy,