Merge branch 'feature/1.0.0' of github.com:ab-inbev-apac/abi-cloud-qr-platform into feature/1.0.0

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/QrSingleCheckVO.java

@@ -27,7 +27,7 @@ public class QrSingleCheckVO implements Serializable {
 	@ApiModelProperty("物料名称")
 	private String materialName;
 
-	//603版 已废弃
+	//630版 已废弃
 	/*@ApiModelProperty(value = "sku名称")
 	private String skuName;*/
 
@@ -37,6 +37,9 @@ public class QrSingleCheckVO implements Serializable {
 	@ApiModelProperty("啤酒厂名称")
 	private String factoryBeerName;
 
+	@ApiModelProperty("二级包材厂名称")
+	private String factoryCoverLevelTwoName;
+
 	@ApiModelProperty("码包生成时间")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime generateTime;
@@ -50,9 +53,20 @@ public class QrSingleCheckVO implements Serializable {
 	@ApiModelProperty("活动域名")
 	private String activeUrl;
 
+	@ApiModelProperty(value = "活动类型 1-utc 2-bof 3-品质信息")
+	private Integer activeType;
+
 	@ApiModelProperty(value = "激活状态")
 	private Integer activeStatus;
 
+	@ApiModelProperty(value = "活动开始日期")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private LocalDateTime beginTime;
+
+	@ApiModelProperty(value = "活动结束日期")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private LocalDateTime endTime;
+
 	@ApiModelProperty("激活时间")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime activeTime;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetQrSingleCheckDetailRes.java

@@ -39,6 +39,9 @@ public class GetQrSingleCheckDetailRes {
     @ApiModelProperty("啤酒厂名称")
     private String factoryBeerName;
 
+    @ApiModelProperty("二级包材厂名称")
+    private String factoryCoverLevelTwoName;
+
     @ApiModelProperty("码包生成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime generateTime;
@@ -52,9 +55,20 @@ public class GetQrSingleCheckDetailRes {
     @ApiModelProperty("活动域名")
     private String activeUrl;
 
+    @ApiModelProperty(value = "活动类型 1-utc 2-bof 3-品质信息")
+    private Integer activeType;
+
     @ApiModelProperty(value = "激活状态")
     private Integer activeStatus;
 
+    @ApiModelProperty(value = "活动开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime beginTime;
+
+    @ApiModelProperty(value = "活动结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime endTime;
+
     @ApiModelProperty("激活时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime activeTime;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageServiceImpl.java

@@ -911,6 +911,9 @@ public class QrPackageServiceImpl implements QrPackageService {
             if (!ObjectUtils.isEmpty(packageActive)) {
                 qrSingleCheckVO.setActiveName(packageActive.getActiveName());
                 qrSingleCheckVO.setActiveUrl(packageActive.getActiveUrl());
+                qrSingleCheckVO.setActiveType(packageActive.getActiveType());
+                qrSingleCheckVO.setBeginTime(packageActive.getBeginTime());
+                qrSingleCheckVO.setEndTime(packageActive.getEndTime());
             }
         }
 

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageMapper.xml

@@ -179,12 +179,14 @@
         bm.material_name,
         bfa.factory_name AS factory_cover_name,
         bfb.factory_name AS factory_beer_name,
+        bfc.factory_name AS factory_cover_level_two_name,
         bm.active_id
         FROM
         qr_package qp
         LEFT JOIN base_material bm ON qp.material_id = bm.id
         LEFT JOIN base_factory bfa ON qp.factory_cover_id = bfa.id
         LEFT JOIN base_factory bfb ON qp.factory_beer_id = bfb.id
+        LEFT JOIN base_factory bfc ON qp.factory_cover_level_two_id = bfc.id
         WHERE
         qp.id = #{id}
     </select>