Merge remote-tracking branch 'origin/master'

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;
 }

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("挂靠公司")

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("挂靠公司")

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("挂靠公司")

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<LoanCustomerRe
                 if (StringUtils.isNotBlank(datum.getPhone())) {
                     vo.setPhone(datum.getPhone());
                 }
+                if (StringUtils.isNotBlank(datum.getSid())) {
+                    vo.setSid(datum.getSid());
+                }
                 if (StringUtils.isNotBlank(datum.getAddress())) {
                     vo.setAddress(datum.getAddress());
                 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java

@@ -151,7 +151,13 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
             if (StringUtils.isNotBlank(entity.getCreditReview())) {
                 result = entity.getCreditReview();
             }
-            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            BeanUtil.copyProperties(dto, entity, "id", "sid", "affiliatedCompanySid", "affiliatedCompany");
+            if (StringUtils.isNotBlank(dto.getType())) {
+                if (dto.getType().equals("2")) {
+                    entity.setAffiliatedCompany(dto.getAffiliatedCompany());
+                    entity.setAffiliatedCompanySid(dto.getAffiliatedCompanySid());
+                }
+            }
             entity.setBorrowerSid(borrowerSid);
             baseMapper.updateById(entity);
             String sid = entity.getSid();
@@ -212,7 +218,13 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
             }
         } else {
             LoanNoGuaranteeCreditReview loanNoGuaranteeCreditReview = new LoanNoGuaranteeCreditReview();
-            BeanUtil.copyProperties(dto, loanNoGuaranteeCreditReview, "id", "sid");
+            BeanUtil.copyProperties(dto, loanNoGuaranteeCreditReview, "id", "sid", "affiliatedCompanySid", "affiliatedCompany");
+            if (StringUtils.isNotBlank(dto.getType())) {
+                if (dto.getType().equals("2")) {
+                    loanNoGuaranteeCreditReview.setAffiliatedCompany(dto.getAffiliatedCompany());
+                    loanNoGuaranteeCreditReview.setAffiliatedCompanySid(dto.getAffiliatedCompanySid());
+                }
+            }
             loanNoGuaranteeCreditReview.setBorrowerSid(borrowerSid);
             baseMapper.insert(loanNoGuaranteeCreditReview);
             String sid = loanNoGuaranteeCreditReview.getSid();

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;
 

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;
 }

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;
 

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;
 }

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;
 

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("组织全路径")

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<AsServiceTypeMapper
 
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     public PagerVo<AsServiceTypeVo> listPageVo(PagerQuery<AsServiceTypeQuery> pq) {
         AsServiceTypeQuery query = pq.getParams();
@@ -79,7 +83,9 @@ public class AsServiceTypeService extends MybatisBaseService<AsServiceTypeMapper
         if (StringUtils.isBlank(dtoSid)) {
             String orgPath = dto.getOrgPath();
             String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
             dto.setCreateOrgSid(createOrgSid);
+            dto.setCreateOrgName(sysOrganizationVo.getName());
             this.insertByDto(dto);
             return;
         }

yxt-as/src/main/java/com/yxt/anrui/as/feign/portal/sysorganization/SysOrganizationFeign.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.as.feign.portal.sysorganization;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign <br/>
+ * Description: 组织机构表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @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<SysOrganizationVo> fetchBySid(@PathVariable("sid") String sid);
+}

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(门户建设) <br/>
+ * File: SysOrganizationVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo <br/>
+ * Description: 组织机构表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @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<SysOrganizationVo> 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;
+}