From aad03bc19264c5b0c6338a2329fc65f5a625a747 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Mon, 20 May 2024 18:07:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BB=B7=E6=A0=BC=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB=E5=A2=9E=E5=8A=A0=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/vo/BasicdataPricePageVO.java    |  3 ++
 .../controller/BasicdataPriceController.java  | 10 ++++++
 .../mapper/BasicdataPriceMapper.java          |  2 ++
 .../basicdata/mapper/BasicdataPriceMapper.xml | 23 ++++++++++++++
 .../service/IBasicdataPriceService.java       |  3 ++
 .../impl/BasicdataPriceServiceImpl.java       | 31 +++++++++++++++++++
 6 files changed, 72 insertions(+)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPricePageVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPricePageVO.java
index 3ce265f24..873848787 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPricePageVO.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataPricePageVO.java
@@ -45,6 +45,9 @@ public class BasicdataPricePageVO implements Serializable {
 	@ApiModelProperty(value = "品牌id")
 	private String brandId;
 
+	@ApiModelProperty(value = "客户id")
+	private String clientId;
+
 	@ApiModelProperty(value = "价格模板id")
 	private String templateId;
 
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java
index edf8f1d17..76fd23e51 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java
@@ -101,6 +101,16 @@ public class BasicdataPriceController extends BladeController {
 		IPage<BasicdataPricePageVO> pages = basicdataPriceService.selectBasicdataPricePage(Condition.getPage(query), basicdataPrice);
 		return R.data(pages);
 	}
+	/**
+	 * 基础价格表 历史版本查询
+	 */
+	@GetMapping("hisPage")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "历史版本查询", notes = "历史版本查询")
+	public R<IPage<BasicdataPricePageVO>> hisPage(BasicdataPricePageVO basicdataPrice, Query query) {
+		IPage<BasicdataPricePageVO> pages = basicdataPriceService.hisPage(Condition.getPage(query), basicdataPrice);
+		return R.data(pages);
+	}
 
 	/**
 	 * 基础价格表 修改
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.java
index f33c6e028..49631d70f 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.java
@@ -54,4 +54,6 @@ public interface BasicdataPriceMapper extends BaseMapper<BasicdataPriceEntity> {
     List<BasicdataPriceImportVO> findEntityByClientAndBrand(@Param("prices") List<BasicdataPriceExcel> prices);
 
 	List<BasicdataPriceImportVO> findEntityByClientAndBrandV2(@Param("prices") List<BasicdataPriceV2Excel> priceExcels);
+
+	List<BasicdataPricePageVO> hisPage(IPage<BasicdataPricePageVO> page, BasicdataPricePageVO basicdataPrice);
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml
index d30da1eae..32d14c8b8 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml
@@ -44,6 +44,29 @@
             </if>
         </if>
     </select>
+    <select id="hisPage" resultType="com.logpm.basicdata.vo.BasicdataPricePageVO">
+        select t.id,
+               cli.client_name,
+               t.brand_id,
+               t.template_id,
+               ldb.brand_name,
+               lbpt.service_type,
+               case
+                   when t.maintenance_status = 1 then '未维护'
+                   when t.maintenance_status = 2 then '已维护'
+                   else ''
+                   end maintenance_status,
+               t.update_time,
+               t.effective_time,
+               t.expiry_time
+        from logpm_basicdata_price t
+                 left join logpm_basicdata_price_template lbpt on t.template_id = lbpt.id
+                 left join logpm_basicdata_client cli on cli.id = t.client_id
+                 left join logpm_basicdata_brand ldb on ldb.id = t.brand_id
+        where t.is_deleted = 0
+        and t.client_id = #{basicdataPrice.clientId}
+        and t.brand_id = #{basicdataPrice.brandId}
+    </select>
 
     <select id="findEntityByClientAndBrand" resultType="com.logpm.basicdata.vo.BasicdataPriceImportVO">
         select t.*,lbc.client_name,lbb.brand_name,lbc.client_code
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java
index e71302753..f99c5cbb2 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java
@@ -71,4 +71,7 @@ public interface IBasicdataPriceService extends BaseService<BasicdataPriceEntity
     String upload(MultipartFile file);
 
 	String uploadV2(MultipartFile file);
+
+	IPage<BasicdataPricePageVO> hisPage(IPage<BasicdataPricePageVO> page, BasicdataPricePageVO basicdataPrice);
+
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
index 0f5b7c972..ed0c85b22 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
@@ -171,6 +171,37 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		return page.setRecords(basicdataPriceVOS);
 	}
 
+	@Override
+	public IPage<BasicdataPricePageVO> hisPage(IPage<BasicdataPricePageVO> page, BasicdataPricePageVO basicdataPrice) {
+		if (ObjectUtil.hasEmpty(basicdataPrice.getClientId(), basicdataPrice.getBrandId())) {
+			throw new ServiceException("客户id和品牌id不能为空");
+		}
+		List<BasicdataPricePageVO> basicdataPriceVOS = baseMapper.hisPage(page, basicdataPrice);
+		if (CollUtil.isNotEmpty(basicdataPriceVOS)) {
+			for (BasicdataPricePageVO basicdataPriceVO : basicdataPriceVOS) {
+				// 维护状态
+				if (ObjectUtil.isNotEmpty(basicdataPriceVO.getExpiryTime())) {
+					DateTime now = DateUtil.date();
+					if (now.isAfter(basicdataPriceVO.getExpiryTime())) {
+						// 已到期
+						basicdataPriceVO.setMaintenanceStatus("已过期");
+					}
+				}
+				// 服务类型
+				String serviceType = basicdataPriceVO.getServiceType();
+				if (StrUtil.isNotEmpty(serviceType)) {
+					List<String> res = new ArrayList<>();
+					List<String> split = StrUtil.split(serviceType, ",");
+					for (String s : split) {
+						res.add(IDict.getTextByCode(ServiceTypeEnums.class, Convert.toInt(s)));
+					}
+					basicdataPriceVO.setServiceType(StrUtil.join("/", res));
+				}
+			}
+		}
+		return page.setRecords(basicdataPriceVOS);
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Boolean basicUpdate(BasicdataPriceBasicUpdateVO vo) {