diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java index a8bd4ce..f49eb78 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java @@ -323,6 +323,10 @@ public class UdiContrastController { udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); udiInfoEntity.setDiType(1); + udiInfoEntity.setScbssfbhph("是"); + udiInfoEntity.setScbssfbhscrq("是"); + udiInfoEntity.setScbssfbhsxrq("是"); + udiInfoEntity.setScbssfbhxlh("否"); udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); udiInfoService.insertUdiInfo(udiInfoEntity); } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml index f6579ff..f6a000b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml @@ -29,7 +29,7 @@ AND tyshxydm = #{tyshxydm} - = DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S') ]]> + = DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S') ]]> @@ -64,7 +64,7 @@ AND tyshxydm = #{tyshxydm} - = DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S') ]]> + = DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S') ]]> GROUP BY uuid @@ -88,7 +88,7 @@ AND uuid = #{uuid} - = DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S') ]]> + = DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S') ]]> GROUP BY cpmctymc @@ -113,7 +113,7 @@ AND uuid = #{uuid} - = DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S') ]]> + = DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S') ]]> GROUP BY nameCode @@ -249,7 +249,7 @@ AND deviceRecordKey = #{deviceRecordKey} - = DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S') ]]> + = DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S') ]]> AND isNewest = #{isNewest} @@ -266,9 +266,10 @@ select * from productinfo where - = DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S') ]]> + = DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S') ]]> and - @@ -342,7 +343,7 @@ AND deviceRecordKey = #{deviceRecordKey} - = DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S') ]]> + = DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S') ]]> limit #{page},#{limit}