码包详情字段添加

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

@@ -131,4 +131,27 @@ public class QrPackageVO implements Serializable {
     @ApiModelProperty("SAP采购数量")
     private Long purchaseCount;
 
+    @ApiModelProperty("活动ID")
+    private Long activeId;
+
+    @ApiModelProperty(value = "活动code（即页面上的手输的活动id）")
+    private String activeCode;
+
+    @ApiModelProperty("活动名称")
+    private String activeName;
+
+    @ApiModelProperty("活动域名")
+    private String activeUrl;
+
+    @ApiModelProperty(value = "活动类型 1-utc 2-bof 3-品质信息")
+    private Integer activeType;
+
+    @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;
+
 }

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

@@ -130,4 +130,24 @@ public class GetQrPackageDetailRes implements Serializable {
 
 	@ApiModelProperty(value = "码包批次列表")
 	private List<QrPackageBatchVO> qrPackageBatchVOList;
+
+	@ApiModelProperty(value = "活动code（即页面上的手输的活动id）")
+	private String activeCode;
+
+	@ApiModelProperty("活动名称")
+	private String activeName;
+
+	@ApiModelProperty("活动域名")
+	private String activeUrl;
+
+	@ApiModelProperty(value = "活动类型 1-utc 2-bof 3-品质信息")
+	private Integer activeType;
+
+	@ApiModelProperty(value = "活动开始日期")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private LocalDateTime beginTime;
+
+	@ApiModelProperty(value = "活动结束日期")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private LocalDateTime endTime;
 }

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

@@ -925,6 +925,11 @@ public class QrPackageServiceImpl implements QrPackageService {
         return true;
     }
 
+    /**
+     * 单码查询详情
+     * @param req
+     * @return
+     */
     @Override
     public GetQrSingleCheckDetailRes getQrSingleCheckDetail(GetQrSingleCheckDetailCodeReq req) {
 

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

@@ -122,6 +122,13 @@
             qp.update_by,
             qp.qr_type,
             qp.file_verify_md5,
+            ba.id as active_id,
+            ba.active_code,
+            ba.active_name,
+            ba.active_url,
+            ba.active_type,
+            ba.begin_time,
+            ba.end_time,
             bcf.name as box_code_format_name,
             f_cover.factory_name as factory_cover_name,
             f_cover.is_first_factory,
@@ -138,6 +145,7 @@
         LEFT JOIN qr_box_code_format bcf ON qp.box_code_format_id = bcf.id
         LEFT JOIN qr_repertory qr ON bcf.qr_repertory_id = qr.id
         LEFT JOIN base_material material ON qp.material_id = material.id
+        LEFT JOIN base_active ba ON material.active_id = ba.id
         LEFT JOIN base_factory f_cover ON qp.factory_cover_id = f_cover.id
         LEFT JOIN base_factory f_beer ON qp.factory_beer_id = f_beer.id
         LEFT JOIN base_factory f_cover_l2 ON qp.factory_cover_level_two_id = f_cover_l2.id and f_cover_l2.factory_type=3