From 7ffc84db2adfff3a56d4e3d6fbd6e6d814de3e40 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 18 Jul 2024 09:23:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=AC=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E7=B4=A2=E8=B5=94=E5=8E=82=E5=AE=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asserviceclaimanu/ServiceClaimanuVo.java | 19 +++++++++++++++ .../AsServiceClaimanuMapper.java | 8 +++++-- .../AsServiceClaimanuRest.java | 14 +++++++---- .../AsServiceClaimanuService.java | 24 +++++++++---------- 4 files changed, 47 insertions(+), 18 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceclaimanu/ServiceClaimanuVo.java diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceclaimanu/ServiceClaimanuVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceclaimanu/ServiceClaimanuVo.java new file mode 100644 index 0000000000..f7c2ed5cad --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceclaimanu/ServiceClaimanuVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.as.api.asserviceclaimanu; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/18 9:19 + */ +@Data +public class ServiceClaimanuVo { + + + private String sid; + @ApiModelProperty("索赔厂家名称") + private String claiManuName; // 索赔厂家名称 +} + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuMapper.java index 4ed665035b..83056bbe4f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.as.api.asserviceclaimanu.ServiceClaimanuVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -55,7 +56,7 @@ import java.util.List; public interface AsServiceClaimanuMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - + @Update("update as_service_claimanu set isDelete = '1' where sid = #{sid}") void updateIsDel(String sid); @@ -67,4 +68,7 @@ public interface AsServiceClaimanuMapper extends BaseMapper { @Select("select count(*) from as_service_claimanu where claiManuNo = #{claiManuNo} and useOrgSid = #{useOrgSid} and sid != #{dtoSid} and isDelete = '0'") int checkSidByCodeAndUseOrgSid(@Param("claiManuNo") String claiManuNo,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); -} \ No newline at end of file + + @Select("select * from as_service_claimanu where useOrgSid = #{useOrgSid} and isDelete = '0'") + List getListByUseOrgSid(@Param("useOrgSid") String useOrgSid); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuRest.java index 1716f3817a..63fe01d813 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.as.biz.asserviceclaimanu; +import com.yxt.anrui.as.api.asserviceclaimanu.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -33,10 +34,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuQuery; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuVo; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuDetailsVo; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuDto; +import java.util.List; /** * Project: yxt-as(索赔厂家管理)
@@ -88,4 +86,12 @@ public class AsServiceClaimanuRest { AsServiceClaimanuDetailsVo vo = asServiceClaimanuService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @ApiOperation("查询本部门索赔厂家") + @GetMapping("/getListByUseOrgSid") + public ResultBean> getListByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid){ + ResultBean rb = ResultBean.fireFail(); + List list = asServiceClaimanuService.getListByUseOrgSid(useOrgSid); + return rb.success().setData(list); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuService.java index 54392cc682..27a23230ca 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceclaimanu/AsServiceClaimanuService.java @@ -28,6 +28,7 @@ package com.yxt.anrui.as.biz.asserviceclaimanu; 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.api.asserviceclaimanu.*; import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; @@ -39,11 +40,6 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanu; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuQuery; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuVo; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuDetailsVo; -import com.yxt.anrui.as.api.asserviceclaimanu.AsServiceClaimanuDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -73,7 +69,7 @@ public class AsServiceClaimanuService extends MybatisBaseService listPageVo(PagerQuery pq) { AsServiceClaimanuQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -126,7 +122,7 @@ public class AsServiceClaimanuService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } - + public ResultBean saveOrUpdateDto(AsServiceClaimanuDto dto){ ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); @@ -171,23 +167,23 @@ public class AsServiceClaimanuService extends MybatisBaseService getListByUseOrgSid(String useOrgSid) { + return baseMapper.getListByUseOrgSid(useOrgSid); + } +} From b19e6e0308ecc5e819ebb845d4b4875256ddf55d Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 18 Jul 2024 10:05:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../as/biz/asbusrepairbill/AsBusrepairBillService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index 1bc0eee336..1072558ae8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -360,11 +360,17 @@ public class AsBusrepairBillService extends MybatisBaseService fileList = dto.getFileName(); if (!fileList.isEmpty()) { for (FileUrlQuery query : fileList) { + String name = query.getName(); String filePath = query.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); AsAppendix asAppendix = new AsAppendix(); asAppendix.setLinkSid(sid); asAppendix.setAttachType(AsFileEnum.WXGD.getAttachType()); asAppendix.setFilePath(filePath); + if (name.contains(".")) { + String[] split = name.split("."); + asAppendix.setFileName(split[0]); + asAppendix.setFileType(split[1]); + } asAppendixService.save(asAppendix); } }