Merge remote-tracking branch 'origin/master'

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; // 索赔厂家名称
+}
+

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -360,11 +360,17 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             List<FileUrlQuery> 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);
                 }
             }

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<AsServiceClaimanu> {
 
 	IPage<AsServiceClaimanuVo> selectPageVo(IPage<AsServiceClaimanu> page, @Param(Constants.WRAPPER) Wrapper<AsServiceClaimanu> 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<AsServiceClaimanu> {
 
 	@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);
-}
+
+	@Select("select * from as_service_claimanu where useOrgSid = #{useOrgSid} and isDelete = '0'")
+    List<ServiceClaimanuVo> getListByUseOrgSid(@Param("useOrgSid") String useOrgSid);
+}

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(索赔厂家管理) <br/>
@@ -88,4 +86,12 @@ public class AsServiceClaimanuRest {
 		AsServiceClaimanuDetailsVo vo = asServiceClaimanuService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@ApiOperation("查询本部门索赔厂家")
+	@GetMapping("/getListByUseOrgSid")
+	public ResultBean<List<ServiceClaimanuVo>> getListByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid){
+		ResultBean rb = ResultBean.fireFail();
+		List<ServiceClaimanuVo> list = asServiceClaimanuService.getListByUseOrgSid(useOrgSid);
+		return rb.success().setData(list);
+	}
 }

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<AsServiceClaima
 	private SysOrganizationFeign sysOrganizationFeign;
 	@Autowired
 	private SysUserFeign sysUserFeign;
-	
+
 	public PagerVo<AsServiceClaimanuVo> listPageVo(PagerQuery<AsServiceClaimanuQuery> pq) {
 		AsServiceClaimanuQuery query = pq.getParams();
 		QueryWrapper<AsServiceClaimanu> qw = new QueryWrapper<>();
@@ -126,7 +122,7 @@ public class AsServiceClaimanuService extends MybatisBaseService<AsServiceClaima
 		PagerVo<AsServiceClaimanuVo> 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<AsServiceClaima
 		this.updateByDto(dto);
 		return rb.success();
 	}
-	
+
 	public void insertByDto(AsServiceClaimanuDto dto){
 		AsServiceClaimanu entity = new AsServiceClaimanu();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		baseMapper.insert(entity);
 	}
-	
+
 	public void updateByDto(AsServiceClaimanuDto dto){
           String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
+        }
 		AsServiceClaimanu entity = fetchBySid(dtoSid);
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		baseMapper.updateById(entity);
 	}
-	
+
 	public AsServiceClaimanuDetailsVo fetchDetailsVoBySid(String sid){
 		AsServiceClaimanu entity = baseMapper.fetchIsDeleteBySid(sid);
 		AsServiceClaimanuDetailsVo vo = new AsServiceClaimanuDetailsVo();
@@ -200,4 +196,8 @@ public class AsServiceClaimanuService extends MybatisBaseService<AsServiceClaima
 			baseMapper.updateIsDel(sid);
 		}
 	}
-}
+
+	public List<ServiceClaimanuVo> getListByUseOrgSid(String useOrgSid) {
+		return baseMapper.getListByUseOrgSid(useOrgSid);
+	}
+}