From 2d2be3084792a9c3aa4154b09103bd4f93b38c2e Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 7 Mar 2024 16:48:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=9C=8D=E5=8A=A1-=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=EF=BC=9A=E5=B7=A5=E7=A7=8D=E3=80=81?=
 =?UTF-8?q?=E7=8F=AD=E7=BB=84=E3=80=81=E7=A7=91=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseVehicleCertificateService.java        |  6 ++
 .../api/asservicetype/AsServiceTypeDto.java   |  2 +
 .../api/asservicetype/AsServiceTypeQuery.java | 15 +---
 .../as/api/asservicetype/AsServiceTypeVo.java |  2 +-
 .../asservicetype/AsServiceTypeService.java   | 89 ++++++++++---------
 5 files changed, 58 insertions(+), 56 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java
index 7f18b2afc0..be62f7af8a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java
@@ -3,6 +3,7 @@ package com.yxt.anrui.base.biz.basevehiclecertificate;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandExportVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.*;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
@@ -353,6 +354,11 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
         if (vinNo.length() != 17) {
             return rb.setMsg("字符串长度不是17位");
         }
+        BaseVehicleVo baseVehicleVo = baseVehicleService.selVehicleByVinNo(vinNo).getData();
+        BaseVehicleCertificate baseVehicleCertificateCar = selectByVehicleSid(baseVehicleVo.getSid());
+        if (baseVehicleCertificateCar != null){
+            return rb.setMsg("新的车架号已存在，不能修改。");
+        }
         BaseVehicleCertificate baseVehicleCertificate = fetchBySid(sid);
         BaseVehicle baseVehicle = baseVehicleService.fetchBySid(baseVehicleCertificate.getVehicleSid());
         String tzVinNo = baseVehicle.getVinNo();
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java
index 085ca718b2..967019af02 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java
@@ -67,5 +67,7 @@ public class AsServiceTypeDto implements Dto {
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
 
 }
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java
index b1da654e10..64242dae1e 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java
@@ -51,19 +51,8 @@ import java.math.BigDecimal;
 @ApiModel(value = "服务类别-工种 查询条件", description = "服务类别-工种 查询条件")
 public class AsServiceTypeQuery implements Query {
 
+    @ApiModelProperty("门店")
+    private String store;
     @ApiModelProperty("服务类别名称")
     private String serviceTypeName;
-    @ApiModelProperty("服务类别编码")
-    private String serviceTypeCode;
-    @ApiModelProperty("提成比例")
-    private BigDecimal percentageRate;
-    @ApiModelProperty("提成金额")
-    private BigDecimal percentageAmount;
-    @ApiModelProperty("排序")
-    private Integer sortNo;
-    @ApiModelProperty("使用组织sid")
-    private String useOrgSid;
-    @ApiModelProperty("创建组织sid")
-    private String createOrgSid;
-
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java
index c7ad73abc1..3413b97bd8 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java
@@ -51,7 +51,7 @@ import java.math.BigDecimal;
 @ApiModel(value = "服务类别-工种 视图数据对象", description = "服务类别-工种 视图数据对象")
 public class AsServiceTypeVo implements Vo {
 
-    private String sid; // sid
+    private String sid;
 
     @ApiModelProperty("排序")
     private Integer sortNo;
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java
index 1c60b1e58b..69181f9427 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java
@@ -28,6 +28,7 @@ package com.yxt.anrui.as.biz.asservicetype;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -39,6 +40,7 @@ import com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo;
 import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDetailsVo;
 import com.yxt.anrui.as.api.asservicetype.AsServiceTypeDto;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -56,51 +58,54 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class AsServiceTypeService extends MybatisBaseService<AsServiceTypeMapper, AsServiceType> {
-	private QueryWrapper<AsServiceType> createQueryWrapper(AsServiceTypeQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<AsServiceType> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<AsServiceTypeVo> listPageVo(PagerQuery<AsServiceTypeQuery> pq) {
-		AsServiceTypeQuery query = pq.getParams();
-		QueryWrapper<AsServiceType> qw = createQueryWrapper(query);
-		IPage<AsServiceType> page = PagerUtil.queryToPage(pq);
-		IPage<AsServiceTypeVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<AsServiceTypeVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(AsServiceTypeDto dto){
+
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+
+    public PagerVo<AsServiceTypeVo> listPageVo(PagerQuery<AsServiceTypeQuery> pq) {
+        AsServiceTypeQuery query = pq.getParams();
+        QueryWrapper<AsServiceType> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(query.getServiceTypeName())){
+			qw.like("serviceTypeName", query.getServiceTypeName());
+		}
+        IPage<AsServiceType> page = PagerUtil.queryToPage(pq);
+        IPage<AsServiceTypeVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<AsServiceTypeVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(AsServiceTypeDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
+            String orgPath = dto.getOrgPath();
+            String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+            dto.setCreateOrgSid(createOrgSid);
             this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(AsServiceTypeDto dto){
-		AsServiceType entity = new AsServiceType();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(AsServiceTypeDto dto){
-          String dtoSid = dto.getSid();
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(AsServiceTypeDto dto) {
+        AsServiceType entity = new AsServiceType();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(AsServiceTypeDto dto) {
+        String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
-		AsServiceType entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public AsServiceTypeDetailsVo fetchDetailsVoBySid(String sid){
-		AsServiceType entity = fetchBySid(sid);
-		AsServiceTypeDetailsVo vo = new AsServiceTypeDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+        }
+        AsServiceType entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public AsServiceTypeDetailsVo fetchDetailsVoBySid(String sid) {
+        AsServiceType entity = fetchBySid(sid);
+        AsServiceTypeDetailsVo vo = new AsServiceTypeDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
 }
\ No newline at end of file