Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -903,12 +903,15 @@
                 d.period,
                 h.actualDate,
                 h.actualMoney,
-                h.returnWay
+                h.returnWay,
+                fj.payCostTitleValue AS kxType
         FROM
                 loan_repayment_history h
                         LEFT JOIN loan_repayment_plan_details d
                         ON h.planDetailSid = d.sid
                                 AND h.scheduleSid = d.scheduleSid
+                        LEFT JOIN anrui_fin.fin_uncollected_receivables_detailed_jr fj
+                        ON d.sid = fj.`busSid`
         WHERE d.vinNo = #{vinNo}
           AND h.scheduleSid = #{scheduleSid}
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -7055,7 +7055,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         AppRepaymentHistoryThead appRepaymentHistoryThead2 = new AppRepaymentHistoryThead();
         appRepaymentHistoryThead2.setName("kxType");
         appRepaymentHistoryThead2.setLabel("款项类别");
-        appRepaymentHistoryThead2.setWidth("80");
+        appRepaymentHistoryThead2.setWidth("120");
         appRepaymentHistoryThead2.setEmptyString("-");
         appRepaymentHistoryThead2.setAlign("center");
         appRepaymentHistoryTheads.add(appRepaymentHistoryThead2);

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java

@@ -76,35 +76,35 @@ public class BaseSupplierTypeService extends MybatisBaseService<BaseSupplierType
 	public ResultBean saveOrUpdateDto(BaseSupplierTypeDto dto){
 		ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
-		if (StringUtils.isBlank(dtoSid)) {
+		String deptName = "";
-			String deptName = "";
+		String deptSid = "";
-			String deptSid = "";
+		String createOrgSid = "";
-			String createOrgSid = "";
+		String orgPath = dto.getOrgPath();
-			String orgPath = dto.getOrgPath();
+		if (StringUtils.isNotBlank(orgPath)) {
-			if (StringUtils.isNotBlank(orgPath)) {
+			List<String> split = Arrays.asList(orgPath.split("/"));
-				List<String> split = Arrays.asList(orgPath.split("/"));
+			if (split.size() > 1) {
-				if (split.size() > 1) {
+				//获取本级sid获取本级部门信息
-					//获取本级sid获取本级部门信息
+				SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
-					SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
+				SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
-					SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+				deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
-					deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
+				deptName = sysOrganization1.getName();
-					deptName = sysOrganization1.getName();
+				deptSid = sysOrganization1.getSid();
-					deptSid = sysOrganization1.getSid();
+			} else {
-				} else {
+				SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
-					SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+				deptName = sysOrganization.getName();
-					deptName = sysOrganization.getName();
+				deptName = sysOrganization.getName();
-					deptName = sysOrganization.getName();
+				deptSid = sysOrganization.getSid();
-					deptSid = sysOrganization.getSid();
+			}
-				}
+			dto.setUseOrgSid(deptSid);
-				dto.setUseOrgSid(deptSid);
+			createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-				createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+			//创建组织使用组织
-				//创建组织使用组织
+			ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
-				ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
+			if (organizationResultBean.getData() != null) {
-				if (organizationResultBean.getData() != null) {
+				dto.setCreateOrgSid(createOrgSid);
-					dto.setCreateOrgSid(createOrgSid);
+				dto.setCreateOrgName(organizationResultBean.getData().getName());
-					dto.setCreateOrgName(organizationResultBean.getData().getName());
-				}
 			}
+		}
+		if (StringUtils.isBlank(dtoSid)) {
 			int i = baseMapper.checkSaveCode(dto.getSupplierTypeCode(),dto.getUseOrgSid());
 			if (i > 0){
 				return rb.setMsg("新增编码已存在，请重新输入");