From 947e20b2e94a1b00ba4cbf5bd92ab01623292835 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 8 Mar 2024 10:50:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1-=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=9A=E5=B7=A5=E7=A7=8D=E3=80=81=E7=8F=AD=E7=BB=84=E3=80=81?= =?UTF-8?q?=E7=A7=91=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../as/api/asservicegroup/AsServiceGroup.java | 3 + .../api/asservicegroup/AsServiceGroupDto.java | 5 +- .../asservicesubject/AsServiceSubject.java | 3 + .../asservicesubject/AsServiceSubjectDto.java | 5 +- .../as/api/asservicetype/AsServiceType.java | 3 + .../api/asservicetype/AsServiceTypeDto.java | 2 + .../asservicetype/AsServiceTypeService.java | 6 ++ .../sysorganization/SysOrganizationFeign.java | 35 ++++++++ .../sysorganization/SysOrganizationVo.java | 88 +++++++++++++++++++ 9 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/feign/portal/sysorganization/SysOrganizationFeign.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/feign/portal/sysorganization/SysOrganizationVo.java diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java index bf00d9f87a..cf62a5fd6d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java @@ -50,12 +50,15 @@ import lombok.Data; public class AsServiceGroup extends BaseEntity { private static final long serialVersionUID = 1L; + private String sid; @ApiModelProperty("班组名称") private String groupName; @ApiModelProperty("排序") private Integer sortNo; @ApiModelProperty("使用组织sid") private String useOrgSid; + @ApiModelProperty("创建组织名称") + private String createOrgName; @ApiModelProperty("创建组织sid") private String createOrgSid; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java index 46e2bb9411..a1bcf9a3d8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java @@ -57,7 +57,10 @@ public class AsServiceGroupDto implements Dto { private Integer sortNo; @ApiModelProperty("使用组织sid") private String useOrgSid; + @ApiModelProperty("创建组织名称") + private String createOrgName; @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/asservicesubject/AsServiceSubject.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubject.java index 8e4c3aa534..94abe7e540 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubject.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubject.java @@ -50,6 +50,7 @@ import lombok.Data; public class AsServiceSubject extends BaseEntity { private static final long serialVersionUID = 1L; + private String sid; @ApiModelProperty("科目名称") private String subjectName; @ApiModelProperty("科目编码") @@ -60,6 +61,8 @@ public class AsServiceSubject extends BaseEntity { private Integer sortNo; @ApiModelProperty("使用组织sid") private String useOrgSid; + @ApiModelProperty("创建组织名称") + private String createOrgName; @ApiModelProperty("创建组织sid") private String createOrgSid; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java index f5afeb4bec..b0e1f7f3b8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java @@ -61,7 +61,10 @@ public class AsServiceSubjectDto implements Dto { private Integer sortNo; @ApiModelProperty("使用组织sid") private String useOrgSid; + @ApiModelProperty("创建组织名称") + private String createOrgName; @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/AsServiceType.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceType.java index 5a8ed485c1..7fcae9e0d7 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceType.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceType.java @@ -52,6 +52,7 @@ import java.math.BigDecimal; public class AsServiceType extends BaseEntity { private static final long serialVersionUID = 1L; + private String sid; @ApiModelProperty("服务类别名称") private String serviceTypeName; @ApiModelProperty("服务类别编码") @@ -64,6 +65,8 @@ public class AsServiceType extends BaseEntity { private Integer sortNo; @ApiModelProperty("使用组织sid") private String useOrgSid; + @ApiModelProperty("创建组织名称") + private String createOrgName; @ApiModelProperty("创建组织sid") private String createOrgSid; 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 967019af02..96cc62a94a 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 @@ -65,6 +65,8 @@ public class AsServiceTypeDto implements Dto { private Integer sortNo; @ApiModelProperty("使用组织sid") private String useOrgSid; + @ApiModelProperty("创建组织名称") + private String createOrgName; @ApiModelProperty("创建组织sid") private String createOrgSid; @ApiModelProperty("组织全路径") 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 69181f9427..eacb31faf4 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,8 @@ 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.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -61,6 +63,8 @@ public class AsServiceTypeService extends MybatisBaseService listPageVo(PagerQuery pq) { AsServiceTypeQuery query = pq.getParams(); @@ -79,7 +83,9 @@ public class AsServiceTypeService extends MybatisBaseService + * File: SysOrganizationFeign.java
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign
+ * Description: 组织机构表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "组织机构表") +@FeignClient( + contextId = "anrui-portal-SysOrganization", + name = "anrui-portal", + path = "v1/sysorganization") +public interface SysOrganizationFeign { + + @ApiOperation("获取一条记录 根据sid") + @ResponseBody + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/portal/sysorganization/SysOrganizationVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/portal/sysorganization/SysOrganizationVo.java new file mode 100644 index 0000000000..13fe790469 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/portal/sysorganization/SysOrganizationVo.java @@ -0,0 +1,88 @@ +package com.yxt.anrui.as.feign.portal.sysorganization; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationVo.java
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo
+ * Description: 组织机构表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "组织机构表 视图数据对象", description = "组织机构表 视图数据对象") +@Data +public class SysOrganizationVo implements Vo { + @ApiModelProperty("部门/组织名称") + private String name; + + @ApiModelProperty("父(部门/组织) sid") + private String psid; + + @ApiModelProperty("联系电话") + private String linkPhone; + + @ApiModelProperty("联系人") + private String linkPerson; + + @ApiModelProperty("部门sid全路径") + private String orgSidPath; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("地址") + private String addrs; + + @ApiModelProperty("地理位置经纬度") + private String jwd; + + @ApiModelProperty("二维码") + private String qrText; + + @ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己") + private Integer limitOrgMember; + + @ApiModelProperty("部门编码") + private String orgCode; + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("子集") + private List children = new ArrayList<>(); + @ApiModelProperty("主管人员名称") + private String zgNames; + @ApiModelProperty("分管人员名称") + private String fgNames; + @ApiModelProperty("主管人员sid") + private String zgStaffSid; + @ApiModelProperty("分管人员sid") + private String fgStaffSid; + @ApiModelProperty("组织简称") + private String orgAbbre; + @ApiModelProperty("是否是部门(0否，1是)") + private Integer isDept; + @ApiModelProperty("组织属性key") + private String orgAttributeKey; + @ApiModelProperty("组织属性value") + private String orgAttributeValue; + @ApiModelProperty("管理层级key") + private String orgLevelKey; + @ApiModelProperty("管理层级value") + private String orgLevelValue; + @ApiModelProperty("其他编码") + private String otherCode; + @ApiModelProperty("主管用户sid") + private String managerSid; +} From 713175f8dfc67cdfc62316d8707f462d8ddd7945 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 8 Mar 2024 10:52:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9D=9E=E6=8B=85?= =?UTF-8?q?=E4=BF=9D=E8=BF=9B=E5=BA=A6=E5=A2=9E=E5=8A=A0=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanFinCompanyInvoicingVo.java | 1 + .../LoanNoGuaranteeCreditReview.java | 2 +- .../LoanNoGuaranteeCreditReviewDetailsVo.java | 2 +- .../LoanNoGuaranteeCreditReviewDto.java | 2 +- .../LoanCustomerRecordService.java | 3 +++ .../LoanNoGuaranteeCreditReviewService.java | 16 ++++++++++++++-- 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanFinCompanyInvoicingVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanFinCompanyInvoicingVo.java index 5976a668ae..9a814d2045 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanFinCompanyInvoicingVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/LoanFinCompanyInvoicingVo.java @@ -18,4 +18,5 @@ public class LoanFinCompanyInvoicingVo { private String address; @ApiModelProperty("挂靠公司电话") private String phone; // 台数 + private String sid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReview.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReview.java index c932d0c3d6..79cc1932aa 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReview.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReview.java @@ -42,7 +42,7 @@ public class LoanNoGuaranteeCreditReview extends BaseEntity { @ApiModelProperty("是否公司开票（0是，1否）") private String isCompInvoic; @ApiModelProperty("车辆登记类型（1客户，2挂靠公司）") - private Integer type; + private String type; @ApiModelProperty("挂靠公司Sid") private String affiliatedCompanySid; @ApiModelProperty("挂靠公司") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDetailsVo.java index 6e4983a0e0..18a078b005 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDetailsVo.java @@ -52,7 +52,7 @@ public class LoanNoGuaranteeCreditReviewDetailsVo implements Vo { @ApiModelProperty("是否公司开票（0是，1否）") private String isCompInvoic; @ApiModelProperty("车辆登记类型（1客户，2挂靠公司）") - private Integer type; + private String type; @ApiModelProperty("挂靠公司Sid") private String affiliatedCompanySid; @ApiModelProperty("挂靠公司") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDto.java index 0553304c87..3392241435 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDto.java @@ -51,7 +51,7 @@ public class LoanNoGuaranteeCreditReviewDto implements Dto { @ApiModelProperty("是否公司开票（0是，1否）") private String isCompInvoic; @ApiModelProperty("车辆登记类型（1客户，2挂靠公司）") - private Integer type; + private String type; @ApiModelProperty("挂靠公司Sid") private String affiliatedCompanySid; @ApiModelProperty("挂靠公司") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java index 6aa5071fe1..4f506be9e6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java @@ -430,6 +430,9 @@ public class LoanCustomerRecordService extends MybatisBaseService