添加 查询活动明细(重新提交申请单审核页面) 的接口

添加 分页查询关联的码包列表(重新提交申请单审核页面) 的接口

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/ActiveController.java

@@ -85,7 +85,7 @@ public class ActiveController {
         return BaseResponse.create(result);
     }
 
-    @ApiOperation("查询活动明细")
+    @ApiOperation("查询活动明细(编辑审核页面)")
     @GetMapping("getActive")
     public BaseResponse<GetActiveRes> getActive(@Validated GetActiveReq getActiveReq) throws Exception{
         //查询活动明细

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/QrPackageMapper.java

@@ -1,10 +1,7 @@
 package com.abi.qms.platform.dao.mapper;
 
 import com.abi.qms.platform.dao.entity.QrPackage;
-import com.abi.qms.platform.dao.vo.result.ActivePackageVO;
-import com.abi.qms.platform.dao.vo.result.PackageActiveSearchVO;
-import com.abi.qms.platform.dao.vo.result.QrPackageVO;
-import com.abi.qms.platform.dao.vo.result.QrSingleCheckVO;
+import com.abi.qms.platform.dao.vo.result.*;
 import com.abi.qms.platform.dto.req.ListActivePackageAddReq;
 import com.abi.qms.platform.dto.req.ListQrPackageReq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -49,4 +46,11 @@ public interface QrPackageMapper extends BaseMapper<QrPackage> {
 	 * 单码查询详细信息
 	 */
 	QrSingleCheckVO getQrSingleCheckDetailById(@Param("id") Long id);
+
+	/**
+	 * 通过码活动id查询关联码包列表(关联码活动申请表)
+	 * @param page
+	 * @return
+	 */
+	IPage<ActiveModifyApplyPackageVO> listPackageByActiveApplyId(IPage page, @Param("activeId") Long activeId);
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/GetActiveModifyApplyReq.java

@@ -0,0 +1,23 @@
+package com.abi.qms.platform.dto.req;
+
+import com.abi.task.common.api.base.PageReq;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author Eurus
+ * @date 2021/6/1 10:07
+ * @Description: 分页查询关联的码包列表(重新提交申请单审核页面) 入参
+ */
+@Data
+@ApiModel
+public class GetActiveModifyApplyReq extends PageReq implements Serializable {
+
+    @NotNull(message = "码活动ID为空")
+    @ApiModelProperty(value = "码活动id")
+    private Long id;
+}

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

@@ -0,0 +1,107 @@
+package com.abi.qms.platform.dto.res;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author Eurus
+ * @date 2021/6/1 10:20
+ * @Description: 查询活动明细(重新提交申请单审核页面) 出参
+ */
+@Data
+@ApiModel
+public class GetActiveModifyApplyRes implements Serializable {
+
+    @ApiModelProperty(value = "码活动")
+    private Active active;
+
+    @ApiModelProperty(value = "码活动申请单")
+    private ActiveModifyApply activeModifyApply;
+
+    @ApiModelProperty(value = "码包列表")
+    private ListActiveModifyApplyPackageRes listActiveModifyApplyPackageRes;
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "GetActiveModifyApplyRes_Active")
+    public static class Active implements Serializable {
+        @ApiModelProperty(value = "码活动id")
+        private Long id;
+
+        @ApiModelProperty(value = "活动code（即页面上的手输的活动id）")
+        private String activeCode;
+
+        @ApiModelProperty(value = "活动名称")
+        private String activeName;
+
+        @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;
+
+        @ApiModelProperty(value = "品牌code")
+        private List<String> brandCodeList;
+
+        @ApiModelProperty(value = "品牌名称")
+        private List<String> brandNameList;
+
+        @ApiModelProperty(value = "活动域名")
+        private String activeUrl;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "GetActiveModifyApplyRes_ActiveModifyApply")
+    public static class ActiveModifyApply implements Serializable {
+        @ApiModelProperty(value = "码活动申请单id")
+        private Long id;
+
+        @ApiModelProperty(value = "码活动id")
+        private Long activeId;
+
+        @ApiModelProperty(value = "活动code（即页面上的手输的活动id）")
+        private String activeCode;
+
+        @ApiModelProperty(value = "活动名称")
+        private String activeName;
+
+        @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;
+
+        @ApiModelProperty(value = "品牌code")
+        private List<String> brandCodeList;
+
+        @ApiModelProperty(value = "品牌名称")
+        private List<String> brandNameList;
+
+        @ApiModelProperty(value = "活动域名")
+        private String activeUrl;
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.abi.qms.platform.dto.res;
+
+import com.abi.task.common.api.base.PageResp;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Eurus
+ * @date 2021/6/1 10:09
+ * @Description: 分页查询关联的码包列表(重新提交申请单审核页面) 出参
+ */
+@Data
+@ApiModel
+public class ListActiveModifyApplyPackageRes extends PageResp implements Serializable {
+
+    @ApiModelProperty("码包列表")
+    private List<PackageBean> packageBeanList;
+
+    /**
+     * 码包bean
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "ListActiveModifyApplyPackageRes_Package")
+    public static class PackageBean implements Serializable {
+
+        @ApiModelProperty("码包id")
+        private Long packageId;
+
+        @ApiModelProperty("码类型 1-箱码 2-盖码")
+        private Integer qrType;
+
+        @ApiModelProperty("sku名称")
+        private String skuName;
+
+        @ApiModelProperty("品牌名称")
+        private String brandName;
+
+        @ApiModelProperty("上级品牌名称")
+        private String parentBrandName;
+
+        @ApiModelProperty("码数量")
+        private Long qrNumber;
+
+        @ApiModelProperty("修改类型: 1-新增 2-删除")
+        private Integer modifyType;
+    }
+}

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

@@ -14,7 +14,7 @@ import java.util.List;
 /**
  * @author Eurus
  * @date 2021/5/26 18:41
- * @Description:
+ * @Description: 分页查询关联的码包列表(编辑审核页面) 出参
  */
 @Data
 @ApiModel

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

@@ -2,10 +2,7 @@ package com.abi.qms.platform.service;
 
 
 import com.abi.qms.platform.dto.req.*;
-import com.abi.qms.platform.dto.res.GetActiveRes;
-import com.abi.qms.platform.dto.res.ListActivePackageAddRes;
-import com.abi.qms.platform.dto.res.ListActivePackageRes;
-import com.abi.qms.platform.dto.res.ListActiveRes;
+import com.abi.qms.platform.dto.res.*;
 
 /**
  * <p>
@@ -44,7 +41,7 @@ public interface ActiveService{
     ListActiveRes listActive(ListActiveReq listActiveReq);
 
     /**
-     * 查询活动明细
+     * 查询活动明细(编辑审核页面)
      * @param getActiveReq
      * @return
      */
@@ -57,6 +54,20 @@ public interface ActiveService{
      */
     ListActivePackageRes listActivePackage(GetActiveReq getActiveReq);
 
+    /**
+     * 查询活动明细(重新提交申请单审核页面)
+     * @param getActiveModifyApplyReq
+     * @return
+     */
+    GetActiveModifyApplyRes getActiveModifyApplyRes(GetActiveModifyApplyReq getActiveModifyApplyReq);
+
+    /**
+     * 分页查询关联的码包列表(重新提交申请单审核页面)
+     * @param getActiveModifyApplyReq
+     * @return
+     */
+    ListActiveModifyApplyPackageRes listActiveModifyApplyPackage(GetActiveModifyApplyReq getActiveModifyApplyReq);
+
     /**
      * 分页查询码活动未关联的码包列表(新增修改页面)
      * @param listActivePackageAddReq

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

@@ -7,13 +7,11 @@ import com.abi.qms.platform.dao.enums.ActiveModifyTypeEnum;
 import com.abi.qms.platform.dao.enums.QrPackageApplyStatusEnum;
 import com.abi.qms.platform.dao.enums.ValidEnum;
 import com.abi.qms.platform.dao.mapper.*;
+import com.abi.qms.platform.dao.vo.result.ActiveModifyApplyPackageVO;
 import com.abi.qms.platform.dao.vo.result.ActivePackageVO;
 import com.abi.qms.platform.dao.vo.result.PackageActiveSearchVO;
 import com.abi.qms.platform.dto.req.*;
-import com.abi.qms.platform.dto.res.GetActiveRes;
-import com.abi.qms.platform.dto.res.ListActivePackageAddRes;
-import com.abi.qms.platform.dto.res.ListActivePackageRes;
-import com.abi.qms.platform.dto.res.ListActiveRes;
+import com.abi.qms.platform.dto.res.*;
 import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.infrastructure.util.PageUtil;
 import com.abi.qms.platform.infrastructure.util.UserUtil;
@@ -246,6 +244,64 @@ public class ActiveServiceImpl implements ActiveService {
         return listActivePackageRes;
     }
 
+    @Override
+    public GetActiveModifyApplyRes getActiveModifyApplyRes(GetActiveModifyApplyReq req) {
+        //1-查询活动对象
+        BaseActive active = baseActiveMapper.selectById(req.getId());
+        AssertUtil.isNull(active, "活动不存在");
+
+        //查询码活动申请单
+        QueryWrapper<BaseActiveModifyApply> activeModifyApplyQW = new QueryWrapper<>();
+        activeModifyApplyQW.eq("active_id", req.getId());
+        activeModifyApplyQW.eq("is_delete", 0);
+        BaseActiveModifyApply activeModifyApply = baseActiveModifyApplyMapper.selectOne(activeModifyApplyQW);
+        AssertUtil.isNull(activeModifyApply,"码活动申请单不存在");
+
+        GetActiveModifyApplyRes res = new GetActiveModifyApplyRes();
+
+        //转化出参
+        GetActiveModifyApplyRes.Active resActive = PojoConverterUtils.copy(active, GetActiveModifyApplyRes.Active.class);
+        GetActiveModifyApplyRes.ActiveModifyApply resActiveModifyApply = PojoConverterUtils.copy(activeModifyApply, GetActiveModifyApplyRes.ActiveModifyApply.class);
+        //处理品牌code，品牌名称
+        if(Objects.nonNull(active.getBrandCode())){
+            String[] brandSplit = active.getBrandCode().trim().split(",");
+            resActive.setBrandCodeList(Arrays.asList(brandSplit));
+            QueryWrapper<BaseBrand> baseBrandQW = new QueryWrapper<>();
+            baseBrandQW.in("brand_code", brandSplit);
+            List<BaseBrand> baseBrands = baseBrandMapper.selectList(baseBrandQW);
+            List<String> baseBrandNameList = baseBrands.stream().map(BaseBrand::getBrandName).collect(Collectors.toList());
+            resActive.setBrandNameList(baseBrandNameList);
+        }
+
+        if(Objects.nonNull(activeModifyApply.getBrandCode())){
+            String[] brandSplit = activeModifyApply.getBrandCode().trim().split(",");
+            resActiveModifyApply.setBrandCodeList(Arrays.asList(brandSplit));
+            QueryWrapper<BaseBrand> baseBrandQW = new QueryWrapper<>();
+            baseBrandQW.in("brand_code", brandSplit);
+            List<BaseBrand> baseBrands = baseBrandMapper.selectList(baseBrandQW);
+            List<String> baseBrandNameList = baseBrands.stream().map(BaseBrand::getBrandName).collect(Collectors.toList());
+            resActiveModifyApply.setBrandNameList(baseBrandNameList);
+        }
+
+        res.setActive(resActive);
+        res.setActiveModifyApply(resActiveModifyApply);
+        //查询码活动关联的码包列表
+        res.setListActiveModifyApplyPackageRes(listActiveModifyApplyPackage(req));
+        return res;
+    }
+
+    @Override
+    public ListActiveModifyApplyPackageRes listActiveModifyApplyPackage(GetActiveModifyApplyReq req) {
+        //查询码活动关联的码包列表
+        IPage<ActiveModifyApplyPackageVO> activeModifyApplyPackageVOIPage = qrPackageMapper.listPackageByActiveApplyId(PageUtil.createPage(req), req.getId());
+        List<ActiveModifyApplyPackageVO> records = activeModifyApplyPackageVOIPage.getRecords();
+        ListActiveModifyApplyPackageRes listActiveModifyApplyPackageRes = new ListActiveModifyApplyPackageRes();
+        PageUtil.copyPageInfo(listActiveModifyApplyPackageRes, activeModifyApplyPackageVOIPage);
+        List<ListActiveModifyApplyPackageRes.PackageBean> packageBeans = PojoConverterUtils.copyList(records, ListActiveModifyApplyPackageRes.PackageBean.class);
+        listActiveModifyApplyPackageRes.setPackageBeanList(packageBeans);
+        return listActiveModifyApplyPackageRes;
+    }
+
     @Override
     public ListActivePackageAddRes listActivePackageAdd(ListActivePackageAddReq req) {
         //查询码活动关联的码包列表

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

@@ -240,8 +240,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         qp.id = #{id}
     </select>
 
-    <!--通过码活动申请id查询关联码包列表-->
+    <!--通过码活动id查询关联码包列表-->
     <select id="listPackageByActiveApplyId" resultType="com.abi.qms.platform.dao.vo.result.ActiveModifyApplyPackageVO">
-
+        select
+        qp.id as packageId,
+        qp.qr_type,
+        bs.sku_name,
+        bb.brand_name,
+        bb.parent_brand_name,
+        qp.qr_number,
+        IFNULL(bamaqpm.modify_type, 3) modify_type
+        from qr_package qp
+        inner join base_material bm on bm.id=qp.material_id
+        inner join base_sku bs on bs.id=bm.sku_id
+        inner join base_brand bb on bb.brand_code=bs.sub_brand_code
+		left join base_active_qr_package_mapping baqpm on baqpm.qr_package_id=qp.id
+        left join base_active ba on ba.id = baqpm.active_id
+		left join base_active_modify_apply bama on bama.active_id = ba.id and bama.is_delete = 0
+        left join base_active_modify_apply_qr_package_mapping bamaqpm on bamaqpm.apply_id=bama.id and bamaqpm.qr_package_id = qp.id and bamaqpm.is_delete = 0
+        where ba.id = #{activeId}
+        ORDER BY modify_type ASC
     </select>
 </mapper>