Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -1349,6 +1349,9 @@
         from base_vehicle bv
         <where>
             ${ew.sqlSegment}
+            <if test="names != null and names != ''">
+                and bv.vinNo LIKE concat('%', #{names}, '%')
+            </if>
         </where>
     </select>
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -167,10 +167,18 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         qw.orderByDesc("bva.id");
         IPage<BusVehicleApply> page = PagerUtil.queryToPage(pq);
         IPage<BusVehicleApplyVo> pagging = baseMapper.selectPageVo(page, qw);
-        for (BusVehicleApplyVo record : pagging.getRecords()) {
-            String orgDeptSid = record.getOrgDeptSid();
-            BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(orgDeptSid).getData();
-            record.setPurchaseSystemName(basePurchaseSystemDetailsVo.getPurchaseSystemName());
+        List<BusVehicleApplyVo> busVehicleApplyVoList = pagging.getRecords();
+        busVehicleApplyVoList.removeAll(Collections.singleton(null));
+        if(!busVehicleApplyVoList.isEmpty()){
+            for (BusVehicleApplyVo record : pagging.getRecords()) {
+                String orgDeptSid = record.getOrgDeptSid();
+                if(StringUtils.isNotBlank(orgDeptSid)){
+                    BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(orgDeptSid).getData();
+                    if(basePurchaseSystemDetailsVo != null){
+                        record.setPurchaseSystemName(basePurchaseSystemDetailsVo.getPurchaseSystemName());
+                    }
+                }
+            }
         }
         PagerVo<BusVehicleApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml

@@ -25,9 +25,7 @@
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.commoncontract.CommonContractVo">
         SELECT *
         FROM common_contract
-        <where>
-            ${ew.sqlSegment}
-        </where>
+        ${ew.customSqlSegment}
     </select>
 
     <select id="selectCountByTypeAndOrgAndCreateDate" resultType="int">

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -199,6 +199,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         qw.apply(StringUtils.isNotEmpty(createDateStart), "date_format (createDate,'%Y-%m-%d') >= date_format('" + createDateStart + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(createDateEnd), "date_format (createDate,'%Y-%m-%d') <= date_format('" + createDateEnd + "','%Y-%m-%d')"
                 );
+        qw.orderByDesc("id");
         return qw;
     }
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java

@@ -6,6 +6,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -71,6 +72,7 @@ public class AppFinCollectionConfirmationDto implements Dto {
     private List<String> payFiles;
 
     @ApiModelProperty("款项明细")
+    @Valid
     private List<AppFinSelectedReceivablesDetailedDto> contractList;
 
     @ApiModelProperty("申请部门")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -37,6 +37,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -113,7 +114,7 @@ public interface FinCollectionConfirmationFeign {
 
     @ApiOperation("手机端—提交款项确认申请")
     @PostMapping("/submitCollectionConfirm")
-    public ResultBean submitCollectionConfirm(@RequestBody AppFinCollectionConfirmationDto dto);
+    public ResultBean submitCollectionConfirm(@Valid @RequestBody AppFinCollectionConfirmationDto dto);
 
     @ApiOperation("手机端—删除收款确认单")
     @DeleteMapping("/deleteCollectionConfirm")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java

@@ -31,6 +31,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 /**
@@ -55,6 +56,7 @@ public class AppFinSelectedReceivablesDetailedDto implements Dto {
     @ApiModelProperty("车架号")
     private String vin;
     @ApiModelProperty("认款金额")
+    @NotNull(message = "认款金额不允许为空")
     private BigDecimal confirmMoney;
     @ApiModelProperty("合同号")
     private String contractId;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -32,13 +32,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
-import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo;
 import com.yxt.anrui.base.api.commonappendix.*;
 import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
@@ -97,6 +94,7 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Project: anrui-fin(销售相关) <br/>
@@ -987,162 +985,26 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             finSelectedReceivablesDetailed.setCreateByName(finCollectionConfirmation.getCreateByName());
             finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
 
-            //车辆状态表锁定
             BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
             baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
             baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
-            baseVehicleTempstateDto.setTempKey("0001");
-            baseVehicleTempstateDto.setTempValue("待审核");
-            baseVehicleTempstateDto.setBusSid(paymentDetail.getReceivablesSid());
-            baseVehicleTempstateDto.setVinNo(finSelectedReceivablesDetailed.getVIN());
-            BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), finCollectionConfirmation.getUseOrgSid()).getData();
-            if (baseVehicle != null) {
-                baseVehicleTempstateDto.setVehSid(baseVehicle.getSid());
-            }
-            baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
-        }
-
-//        String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
-//        List<AppFinSelectedReceivablesDetailedDto> paymentDetails = dto.getContractList();
-/*        CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
-        if (StringUtils.isBlank(dto.getCollectionBillSid())) {
-            FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
-            BeanUtil.copyProperties(dto, finCollectionConfirmation);
-            for (AppFinSelectedReceivablesDetailedDto paymentDetail : paymentDetails) {
-                FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
-                finSelectedReceivablesDetailed.setCurrentReceivableMoney(paymentDetail.getReceivable());
-                finSelectedReceivablesDetailed.setVIN(paymentDetail.getVin());
-                finSelectedReceivablesDetailed.setSubscriptionMoney(paymentDetail.getConfirmMoney());
-                finSelectedReceivablesDetailed.setContractNo(paymentDetail.getContractId());
-                finSelectedReceivablesDetailed.setReceivablesName(paymentDetail.getProjectName());
-                finSelectedReceivablesDetailed.setContractSid(paymentDetail.getContractSid());
-                finSelectedReceivablesDetailed.setCustomerName(paymentDetail.getName());
-                finSelectedReceivablesDetailed.setCustomerPhone(paymentDetail.getMobile());
-                finSelectedReceivablesDetailed.setSubscriptionDate(paymentDetail.getConfirmDate());
-                finSelectedReceivablesDetailed.setCollSid(dto.getCollectionBillSid());
-                finSelectedReceivablesDetailed.setAuditState(1);
-                finSelectedReceivablesDetailed.setReceivablesSid(finCollectionConfirmation.getSid());
-                finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
-                //已选应收款项-车架号
-                String vin = finSelectedReceivablesDetailed.getVIN();
-                //已选应收款项-应收项目名称
-                String receivablesName = finSelectedReceivablesDetailed.getReceivablesName();
-                FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
-                //应收未收款项-当前应收金额
-                BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney());
-                //已选应收款项-认款金额
-                BigDecimal subscriptionMoney = finSelectedReceivablesDetailed.getSubscriptionMoney();
-                BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney);
-//                if (subtract.compareTo(BigDecimal.ZERO) < 0) {
-//                    return rb.setMsg("认款金额超出应收金额，请重新输入");
-//                }
-                if (subtract.compareTo(BigDecimal.ZERO) != 0) {
-                    return rb.setMsg("该确认单应收金额总额还剩余" + subtract + "，请继续核对");
-                }
-                finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract));
-                FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
-                BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
-                finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
-                //车辆状态表锁定
-                BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
-                baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
-                baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
-                baseVehicleTempstateDto.setTempKey("0001");
-                baseVehicleTempstateDto.setTempValue("待审核");
-                baseVehicleTempstateDto.setBusSid(finSelectedReceivablesDetailed.getSid());
-                baseVehicleTempstateDto.setVinNo(finSelectedReceivablesDetailed.getVIN());
-                BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), userOrgSid).getData();
-                if (baseVehicle != null) {
-                    baseVehicleTempstateDto.setVehSid(baseVehicle.getSid());
-                }
-                baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
+            if ("车款".equals(finSelectedReceivablesDetailed.getReceivablesName())) {
+                baseVehicleTempstateDto.setTempKey("001");
+                baseVehicleTempstateDto.setTempValue("车款");
             }
-            List<String> payConfirmFiles = dto.getPayConfirmFiles();
-            String remFilePath = "";
-            for (String payFilePath : payConfirmFiles) {
-                if (payFilePath != null) {
-                    remFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
-                    commonAppendixDto.setLinkSid(dto.getCollectionBillSid());
-                    commonAppendixDto.setFilePath(remFilePath);
-                    commonAppendixDto.setCreateBySid(staffSid);
-                    commonAppendixDto.setFileName("汇款确认");
-                    commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
-                    commonAppendixFeign.save(commonAppendixDto);
-                }
-                remFilePath += remFilePath + ",";
+            if ("订金".equals(finSelectedReceivablesDetailed.getReceivablesName())) {
+                baseVehicleTempstateDto.setTempKey("002");
+                baseVehicleTempstateDto.setTempValue("订金");
             }
-            finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath);
-            finCollectionConfirmation.setAuditState(1);
-            finCollectionConfirmation.setCreateBySid(dto.getUserSid());
-            save(finCollectionConfirmation);
-        } else {
-            FinCollectionConfirmation finCollectionConfirmation = fetchBySid(dto.getCollectionBillSid());
-            BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
-            finSelectedReceivablesDetailedService.deleteByCollSid(dto.getCollectionBillSid());
-            for (AppFinSelectedReceivablesDetailedDto paymentDetail : paymentDetails) {
-                FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
-                finSelectedReceivablesDetailed.setCurrentReceivableMoney(paymentDetail.getReceivable());
-                finSelectedReceivablesDetailed.setVIN(paymentDetail.getVin());
-                finSelectedReceivablesDetailed.setSubscriptionMoney(paymentDetail.getConfirmMoney());
-                finSelectedReceivablesDetailed.setContractNo(paymentDetail.getContractId());
-                finSelectedReceivablesDetailed.setReceivablesName(paymentDetail.getProjectName());
-                finSelectedReceivablesDetailed.setContractSid(paymentDetail.getContractSid());
-                finSelectedReceivablesDetailed.setCustomerName(paymentDetail.getName());
-                finSelectedReceivablesDetailed.setCustomerPhone(paymentDetail.getMobile());
-                finSelectedReceivablesDetailed.setSubscriptionDate(paymentDetail.getConfirmDate());
-                finSelectedReceivablesDetailed.setCollSid(dto.getCollectionBillSid());
-                finSelectedReceivablesDetailed.setAuditState(1);
-                finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
-                //已选应收款项-车架号
-                String vin = finSelectedReceivablesDetailed.getVIN();
-                //已选应收款项-应收项目名称
-                String receivablesName = finSelectedReceivablesDetailed.getReceivablesName();
-                FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
-                //应收未收款项-当前应收金额
-                BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney());
-                //已选应收款项-认款金额
-                BigDecimal subscriptionMoney = finSelectedReceivablesDetailed.getSubscriptionMoney();
-                BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney);
-                if (subtract.compareTo(BigDecimal.ZERO) < 0) {
-                    return rb.setMsg("认款金额超出应收金额，请重新输入");
-                }
-                finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract));
-                FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
-                BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
-                finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
-                //车辆状态表锁定
-                BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
-                baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
-                baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
-                baseVehicleTempstateDto.setTempKey("0001");
-                baseVehicleTempstateDto.setTempValue("待审核");
-                baseVehicleTempstateDto.setBusSid(finSelectedReceivablesDetailed.getSid());
-                baseVehicleTempstateDto.setVinNo(finSelectedReceivablesDetailed.getVIN());
-                BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finSelectedReceivablesDetailed.getVIN(), userOrgSid).getData();
-                if (baseVehicle != null) {
-                    baseVehicleTempstateDto.setVehSid(baseVehicle.getSid());
-                }
-                baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
-            }
-            commonAppendixFeign.delFilesByLinkSidAndAttachType(dto.getCollectionBillSid(), CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
-            List<String> payConfirmFiles = dto.getPayConfirmFiles();
-            String remFilePath = "";
-            for (String payFilePath : payConfirmFiles) {
-                if (payFilePath != null) {
-                    remFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
-                    commonAppendixDto.setLinkSid(dto.getCollectionBillSid());
-                    commonAppendixDto.setFilePath(remFilePath);
-                    commonAppendixDto.setCreateBySid(staffSid);
-                    commonAppendixDto.setFileName("汇款确认");
-                    commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
-                    commonAppendixFeign.save(commonAppendixDto);
-                }
-                remFilePath += remFilePath + ",";
+
+            baseVehicleTempstateDto.setBusSid(finCollectionConfirmation.getSid());
+            //根据合同编号和车架号查询该合同的车辆sid
+            ResultBean<String> resultBean = busSalesOrderFeign.getVinSidByConSid(finSelectedReceivablesDetailed.getContractNo(), finSelectedReceivablesDetailed.getVIN());
+            if (resultBean.getSuccess()) {
+                baseVehicleTempstateDto.setVehSid(resultBean.getData());
             }
-            finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath);
-            finCollectionConfirmation.setAuditState(1);
-            updateById(finCollectionConfirmation);
-        }*/
+            ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
+        }
         return rb.success();
     }
 
@@ -1190,18 +1052,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             qw.notIn("sid", params.getSidList());
         }
         qw.ne("currentReceivableMoney", 0);//应收金额
-        List<String> vinNoList = new ArrayList<>();
-        List<BaseVehicleTempstateVo> baseVehicleTempstateVos = baseVehicleTempstateFeign.selectAll(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode()).getData();
-        for (BaseVehicleTempstateVo baseVehicleTempstateVo : baseVehicleTempstateVos) {
-            String vehSid = baseVehicleTempstateVo.getVehSid();
-            if (StringUtils.isNotBlank(vehSid)) {
-                BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vehSid).getData();
-                vinNoList.add(baseVehicleSelectVo.getVinNo());
+        ResultBean<List<BaseVehicleTempstate>> baseVehicleTempstateFeignList = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
+        List<BaseVehicleTempstate> baseVehicleTempstates = baseVehicleTempstateFeignList.getData();
+        if (baseVehicleTempstates.size() > 0) {
+            List<String> stringList = baseVehicleTempstates.stream().map(v -> v.getBusSid()).distinct().collect(Collectors.toList());
+            List<String> sidsList = getList(stringList, userSid, useOrgSid);
+            if (sidsList.size() > 0) {
+                //查询该申请下是否存在款项明细
+                List<FinSelectedReceivablesDetailed> finSelectedReceivablesDetaileds = finSelectedReceivablesDetailedService.getList(sidsList);
+                List<String> strings = finSelectedReceivablesDetaileds.stream().map(v -> v.getReceivablesSid()).distinct().collect(Collectors.toList());
+                if (strings.size() > 0) {
+                    qw.notIn("sid", strings);
+                }
             }
         }
-        if (vinNoList.size() > 0) {
-            qw.notIn("VIN", vinNoList);
-        }
         if (StringUtils.isNotBlank(pagerQuery.getParams().getPurchaseSystemSid())) {
             qw.eq("purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid());
         } else {
@@ -1224,28 +1088,54 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
 //        IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName());
         List<AppFinUncollectedReceivablesDetailedVo> collList = finSelectedReceivablesDetailedService.getPaymentList(qw,params.getName());
-//        List<AppFinUncollectedReceivablesDetailedVo> records = collectionConfirmList.getRecords();
-        for (AppFinUncollectedReceivablesDetailedVo record : collList) {
-            record.setConfirmDate(dateFormat.format(new Date()));
-            String busVinSid = record.getBusVinSid();
-            ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid);
-            if (resultBean.getData() != null) {
-                String vinNo = resultBean.getData().getLinkNo();
-                String vinSid = resultBean.getData().getLinkSid();
-                String temporaryNo = resultBean.getData().getTemporaryNo();
-                record.setVin(vinNo);
-                if (StringUtils.isNotBlank(vinNo)) {
-                    record.setVin(vinNo.substring(vinNo.length() - 8));
-                } else {
-                    if ("2".equals(record.getPayTypeKey())) {
-                        record.setVin(temporaryNo.substring(temporaryNo.length() - 2));
+        if(collList.isEmpty()){
+            collList = finSelectedReceivablesDetailedService.getPaymentList(qw,"");
+            for (AppFinUncollectedReceivablesDetailedVo record : collList) {
+                record.setConfirmDate(dateFormat.format(new Date()));
+                String busVinSid = record.getBusVinSid();
+                ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid);
+                if (resultBean.getData() != null) {
+                    String vinNo = resultBean.getData().getLinkNo();
+                    String vinSid = resultBean.getData().getLinkSid();
+                    String temporaryNo = resultBean.getData().getTemporaryNo();
+                    record.setVin(vinNo);
+                    if (StringUtils.isNotBlank(vinNo)) {
+                        record.setVin(vinNo.substring(vinNo.length() - 8));
+                    } else {
+                        if ("2".equals(record.getPayTypeKey())) {
+                            record.setVin(temporaryNo.substring(temporaryNo.length() - 2));
+                        }
                     }
                 }
             }
+            if(StringUtils.isNotBlank(pagerQuery.getParams().getName())){
+                collList = collList.stream().filter(v->v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList());
+            }
+        }else{
+            for (AppFinUncollectedReceivablesDetailedVo record : collList) {
+                record.setConfirmDate(dateFormat.format(new Date()));
+                String busVinSid = record.getBusVinSid();
+                ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid);
+                if (resultBean.getData() != null) {
+                    String vinNo = resultBean.getData().getLinkNo();
+                    String vinSid = resultBean.getData().getLinkSid();
+                    String temporaryNo = resultBean.getData().getTemporaryNo();
+                    record.setVin(vinNo);
+                    if (StringUtils.isNotBlank(vinNo)) {
+                        record.setVin(vinNo.substring(vinNo.length() - 8));
+                    } else {
+                        if ("2".equals(record.getPayTypeKey())) {
+                            record.setVin(temporaryNo.substring(temporaryNo.length() - 2));
+                        }
+                    }
+                }
+            }
+            if(StringUtils.isNotBlank(pagerQuery.getParams().getName())){
+                List<AppFinUncollectedReceivablesDetailedVo> cll = collList.stream().filter(v->v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList());
+                collList = Stream.of(collList, cll).flatMap(Collection::stream).collect(Collectors.toList());
+            }
         }
-        if(StringUtils.isNotBlank(pagerQuery.getParams().getName())){
-            collList = collList.stream().filter(v->v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList());
-        }
+
         //分页
         IPage<AppFinUncollectedReceivablesDetailedVo> page1 = new Page<>();
         page1.setRecords(collList);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -120,4 +120,6 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     List<SysOrgVo> getListDeptByOrgSid(String orgSid);
 
     List<SysOrganizationVo> selectOrgByPSid(String psid);
+
+    int updateOrgBySid(@Param("orgSid") String sid, @Param("orgName") String orgName, @Param("orgSidPath") String orgSidPath, @Param("orgNamePath") String orgNamePath);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -188,11 +188,12 @@
     </select>
 
     <select id="selectByOrgDeptSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgStaffVo">
-        select distinct si.name staffName, si.sid staffSid,su.sid userSid
+        select distinct si.name staffName, si.sid staffSid, su.sid userSid
         from sys_staff_org so
                  left join sys_staffinfo si on so.staffSid = si.sid
-        left join sys_user su on su.staffSid = si.sid
-        where so.orgSid = #{orgDeptSid} and si.personTypeKey != '01'
+                 left join sys_user su on su.staffSid = si.sid
+        where so.orgSid = #{orgDeptSid}
+          and si.personTypeKey != '01'
     </select>
 
     <select id="selectByPSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
@@ -203,7 +204,9 @@
     </select>
 
     <select id="selectOrgSidList" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
-        select sid,name,orgCode from sys_organization so where so.isDept = 0
+        select sid, name, orgCode
+        from sys_organization so
+        where so.isDept = 0
     </select>
 
     <select id="getListDeptByOrgSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgVo">
@@ -216,6 +219,16 @@
     <select id="selectOrgByPSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
         SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
         FROM sys_organization so
-        WHERE isDept = 0 AND so.psid = #{psid}
+        WHERE isDept = 0
+          AND so.psid = #{psid}
     </select>
+
+    <update id="updateOrgBySid">
+        update sys_staff_org
+        set orgName     = #{orgName},
+            orgSidPath  = #{orgSidPath},
+            orgNamePath = #{orgNamePath}
+        where orgSid = #{orgSid}
+          and manageType = '3'
+    </update>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.portal.api.sysorganization.*;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.anrui.portal.api.sysuser.SysUser;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@@ -138,6 +139,14 @@ public class SysOrganizationRest implements SysOrganizationFeign {
                 return rb.setMsg(resultBean.getMsg());
             }
         }
+        //查询所有该orgSid的staffSid的类型为员工的
+        List<SysStaffOrg> staffList = sysStaffOrgService.selectStaffByOrgSid(sid,"3");
+        staffList.removeAll(Collections.singleton(null));
+        if(!staffList.isEmpty()){
+            //更新关联表中的orgName和orgNamePath以及orgSidPath
+            //查询该部门的全部信息
+            ResultBean resultBean = sysOrganizationService.updateStaffList(sysOrganization);
+        }
         sysOrganizationService.updateById(sysOrganization);
         //修改金蝶组织信息
         /*List<OrgOrganizations> orgOrganizationsList = new ArrayList<>();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -227,15 +227,6 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
                 }
                 sysStaffOrg.setOrgNamePath(orgName.toString());
             }
-            /*String psid = entity.getPsid();
-            if (StringUtils.isNotBlank(psid)) {
-                SysOrganization sysOrganization = this.fetchBySid(psid);
-                if (sysOrganization != null) {
-                    sysStaffOrg.setOrgNamePath(sysOrganization.getName() + "/" + entity.getName());
-                } else {
-                    sysStaffOrg.setOrgNamePath(entity.getName());
-                }
-            }*/
             sysStaffOrgService.save(sysStaffOrg);
             //==========================添加清空变化的用户的token
             List<SysStaffOrgVo> sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid);
@@ -633,4 +624,35 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         List<SysOrganizationVo> sysOrganizationVos = baseMapper.selectOrgByPSid(psid);
         return rb.success().setData(sysOrganizationVos);
     }
+
+    public ResultBean updateStaffList(SysOrganization entity) {
+        ResultBean rb = ResultBean.fireFail();
+        //部门名称
+        String orgName = entity.getName();
+        //部门sid全路径
+        String orgSidPath = entity.getOrgSidPath();
+        //部门名称全路径
+        String orgNamePath = "";
+        if(StringUtils.isNotBlank(orgSidPath)){
+            StringBuilder orgNamePath1 = new StringBuilder();
+            List<String> split = Arrays.asList(orgSidPath.split("/"));
+            if(split.size()>1){
+                for(int i = 0;i<split.size();i++){
+                    SysOrganization sysOrganization = fetchBySid(split.get(i));
+                    if(i == 0){
+                        orgNamePath1 = orgNamePath1.append(sysOrganization.getName());
+                    }else{
+                        orgNamePath1 = orgNamePath1.append("/").append(sysOrganization.getName());
+                    }
+                }
+            }else{
+                SysOrganization sysOrganization = fetchBySid(split.get(0));
+                orgNamePath1 = orgNamePath1.append(sysOrganization.getName());
+            }
+            orgNamePath = orgNamePath1.toString();
+        }
+        //更新关联该部门的所有员工的关联表中的部门名称、部门全路径以及名称全路径
+        baseMapper.updateOrgBySid(entity.getSid(),orgName,orgSidPath,orgNamePath);
+        return rb.success();
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java

@@ -109,4 +109,6 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {
     List<SysStaffOrg> selectOrgBySid(@Param("orgPath") String orgPath, @Param("staffSid") String staffSid);
 
     List<SysOrgPathList> getList(String staffSid);
+
+    List<SysStaffOrg> selectStaffByOrgSid(@Param("orgSid") String sid, @Param("type") String type);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml

@@ -112,4 +112,8 @@
     <select id="getList" resultType="com.yxt.anrui.portal.api.sysuserdefaultorg.SysOrgPathList">
         select sid as staffOrgSid,orgSidPath,orgNamePath from sys_staff_org where staffSid = #{staffSid}
     </select>
+
+    <select id="selectStaffByOrgSid" resultType="com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg">
+        select * from sys_staff_org where orgSid = #{orgSid} and manageType = #{type}
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java

@@ -308,4 +308,8 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
     public List<SysOrgPathList> getList(String staffSid) {
         return baseMapper.getList(staffSid);
     }
+
+    public List<SysStaffOrg> selectStaffByOrgSid(String sid, String type) {
+        return baseMapper.selectStaffByOrgSid(sid,type);
+    }
 }