Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -30,6 +30,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.bdempinfo.BDEmpinfo;
@@ -93,6 +94,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     @Autowired
     private BasePurchaseSystemService basePurchaseSystemService;
     @Autowired
+    private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
+    @Autowired
     private BaseVehicleBrandService baseVehicleBrandService;
 
     public ResultBean<Boolean> vehicleOut(BaseVehicleOutDto dto) {
@@ -136,30 +139,46 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
             Boolean aBoolean = finKingDeeFeign.customerExistState(FNumber).getData();
             if (!aBoolean) {
-                Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
+                //查询合同编号和车辆sid客户的临时编码
+                ResultBean<String> stringResultBean = busSalesOrderFeign.selectTemporaryNo(dto.getCustomerNo(),dto.getVinSid());
+                if(!stringResultBean.getSuccess()){
+                    return rb.setMsg("请检查合同是否审核");
+                }
+                String temporaryNo = stringResultBean.getData();
+//                Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
+                Boolean aBoolean1 = finKingDeeFeign.customerExistState(temporaryNo).getData();
                 if (!aBoolean1) {
-                    List<BdCustomer> bdCustomers = new ArrayList<>();
-                    BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
-                    if (data != null){
-                        bdCustomer.setTOrgIds(data.getOrgCode());
-                    }else {
-                        bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
-                    }
-                    bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
-                    String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
-                    if (FNumber1.length() > 30) {
-                        FNumber1 = FNumber1.substring(0, 30);
-                        bdCustomer.setFNumber(FNumber1);
-                    } else {
-                        bdCustomer.setFNumber(FNumber1);
+                    Boolean aBoolean2 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
+                    if(!aBoolean2){
+                        List<BdCustomer> bdCustomers = new ArrayList<>();
+                        BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
+                        if (data != null){
+                            bdCustomer.setTOrgIds(data.getOrgCode());
+                        }else {
+                            bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
+                        }
+                        bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
+                        String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
+                        if (FNumber1.length() > 30) {
+                            FNumber1 = FNumber1.substring(0, 30);
+                            bdCustomer.setFNumber(FNumber1);
+                        } else {
+                            bdCustomer.setFNumber(FNumber1);
+                        }
+                        bdCustomer.setFShortName(dto.getConcatNo());
+                        bdCustomers.add(bdCustomer);
+                        finKingDeeFeign.draftBdCustomers(bdCustomers);
+                        dto.setCwCustomerNo(bdCustomer.getFNumber());
+                    }else{
+                        b = true;
+                        return rb.success().setData(b);
                     }
-                    bdCustomer.setFShortName(dto.getConcatNo());
-                    bdCustomers.add(bdCustomer);
-                    finKingDeeFeign.draftBdCustomers(bdCustomers);
-                    dto.setCwCustomerNo(bdCustomer.getFNumber());
                 } else {
-                    b = true;
-                    return rb.success().setData(b);
+                   /* b = true;
+                    return rb.success().setData(b);*/
+                    //查询已选择的收款单的车架号是否存在，若存在则修改，不存在则不用管
+                    //临时号截取最后两位
+                    ResultBean resultBean = finCollectionConfirmationFeign.updateVin(dto.getVinNo(),dto.getConcatNo(),temporaryNo.substring(temporaryNo.length()-2));
                 }
             }
             //修改客户简称为合同编号
@@ -348,7 +367,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         BaseVehinstallDetailsVo baseVehinstallDetailsVo = baseVehinstallService.fetchByVinNoAndOrgSid(baseVehicle.getVinNo(), baseVehicle.getCreateOrgSid());
         if (baseTrailerDetailsVo != null) {
             //单据编号
-            salOutStock.setFBillNo(dto.getBillNo());
+            salOutStock.setFBillNo(dto.getBillNo() + "-1");
             //日期
             salOutStock.setFDate(DateUtil.today());
             //分公司id
@@ -391,7 +410,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             }
         } else if (baseVehinstallDetailsVo != null) {
             //单据编号
-            salOutStock.setFBillNo(dto.getBillNo());
+            salOutStock.setFBillNo(dto.getBillNo() + "-1");
             //日期
             salOutStock.setFDate(DateUtil.today());
             //分公司id

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -273,4 +273,9 @@ public interface BusSalesOrderFeign {
     @PutMapping("/completeBy")
     @ResponseBody
     public ResultBean completeBy(@RequestBody OrderFlowableQuery orderFlowableQuery);
+
+    @ApiOperation(value = "查询客户的临时编码")
+    @GetMapping("/selectTemporaryNo")
+    @ResponseBody
+    ResultBean<String> selectTemporaryNo(@RequestParam("contractNo")String contractNo,@RequestParam("vehSid")String vehSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -249,4 +249,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) {
         return null;
     }
+
+    @Override
+    public ResultBean<String> selectTemporaryNo(String contractNo, String vehSid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -193,4 +193,6 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     int updateImages(@Param("imagesFile") String imagesFile, @Param("sid") String sid);
 
     OrderRemarksVo getOrderRemarksInfo(String saleOrderSid);
+
+    String selectTemporaryNo(@Param("contractNo") String contractNo, @Param("vehSid") String vehSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -326,4 +326,9 @@
         from bus_sales_order
         where sid = #{saleOrderSid}
     </select>
+
+    <select id="selectTemporaryNo" resultType="java.lang.String">
+        select bv.temporaryNo from bus_sales_order bo left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
+        where bo.contractNo = #{contractNo} and bv.linkSid = #{vehSid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -328,4 +328,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean completeBy(OrderFlowableQuery orderFlowableQuery) {
         return busSalesOrderService.completeBy(orderFlowableQuery);
     }
+
+    @Override
+    public ResultBean<String> selectTemporaryNo(String contractNo, String vehSid) {
+        return busSalesOrderService.selectTemporaryNo(contractNo,vehSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -3873,4 +3873,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         return rb.success();
     }
+
+    public ResultBean<String> selectTemporaryNo(String contractNo, String vehSid) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String temporaryNo = baseMapper.selectTemporaryNo(contractNo,vehSid);
+        if(StringUtils.isBlank(temporaryNo)){
+            return rb;
+        }
+        return rb.success().setData(temporaryNo);
+    }
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java

@@ -179,4 +179,19 @@ public interface CrmCustomerTempFeign {
     @PostMapping("/saveFileCustomer")
     @ApiOperation("合同审核通过后更新客户档案证件")
     ResultBean saveFileCustomer(@RequestBody CrmCustomerFileDDto dto);
+
+    @ResponseBody
+    @PostMapping("/updateCompany/{sid}/{companyName}")
+    @ApiOperation("测试")
+    ResultBean updateCompany(@PathVariable("sid")String sid,@PathVariable("companyName")String companyName);
+
+    @ResponseBody
+    @PutMapping("/updateEmail/{sid}/{email}")
+    @ApiOperation("测试")
+    ResultBean updateEmail(@PathVariable("sid")String sid,@PathVariable("email")String email);
+
+    @ResponseBody
+    @PutMapping("/updateRemarks")
+    @ApiOperation("测试")
+    ResultBean updateRemarks(@RequestParam("sid")String sid,@RequestParam("remarks")String remarks);
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java

@@ -145,5 +145,20 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean updateCompany(String sid, String companyName) {
+		return null;
+	}
+
+	@Override
+	public ResultBean updateEmail(String sid, String email) {
+		return null;
+	}
+
+	@Override
+	public ResultBean updateRemarks(String sid, String remarks) {
+		return null;
+	}
+
 
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java

@@ -123,4 +123,10 @@ public interface CrmCustomerTempMapper extends BaseMapper<CrmCustomerTemp> {
     CrmCustomerTempVo selectNo(String customerNo);
 
     CrmCustomerTempVo selectNo1(@Param("customerNo") String customerNo, @Param("sid") String sid);
+
+    int updateCompany(@Param("sid") String sid, @Param("companyName") String companyName);
+
+    int updateEmail(@Param("sid") String sid, @Param("email") String email);
+
+    int updateRemarks(@Param("sid") String sid, @Param("remarks") String remarks);
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@@ -219,4 +219,16 @@
         where customerNo = #{customerNo}
           and sid != #{sid}
     </select>
+
+    <update id="updateCompany">
+        update crm_customer_temp set companyName = #{companyName} where sid = #{sid}
+    </update>
+
+    <update id="updateEmail">
+        update crm_customer_temp set e_mail = #{email} where sid = #{sid}
+    </update>
+
+    <update id="updateRemarks">
+        update crm_customer_temp set remarks = #{remarks} where sid = #{sid}
+    </update>
 </mapper>

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java

@@ -294,5 +294,20 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return crmCustomerTempService.saveFileCustomer(dto);
     }
 
+    @Override
+    public ResultBean updateCompany(String sid, String companyName) {
+        return crmCustomerTempService.updateCompany(sid,companyName);
+    }
+
+    @Override
+    public ResultBean updateEmail(String sid, String email) {
+        return crmCustomerTempService.updateEmail(sid,email);
+    }
+
+    @Override
+    public ResultBean updateRemarks(String sid, String remarks) {
+        return crmCustomerTempService.updateRemarks(sid,remarks);
+    }
+
 
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -1228,4 +1228,22 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         }
         return rb.success();
     }
+
+    public ResultBean updateCompany(String sid, String companyName) {
+        ResultBean rb = ResultBean.fireFail();
+        int i = baseMapper.updateCompany(sid,companyName);
+        return rb.success();
+    }
+
+    public ResultBean updateEmail(String sid, String email) {
+        ResultBean rb = ResultBean.fireFail();
+        int i = baseMapper.updateEmail(sid,email);
+        return rb.success();
+    }
+
+    public ResultBean updateRemarks(String sid, String remarks) {
+        ResultBean rb = ResultBean.fireFail();
+        int i = baseMapper.updateRemarks(sid,remarks);
+        return rb.success();
+    }
 }

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

@@ -137,4 +137,8 @@ public interface FinCollectionConfirmationFeign {
     @ApiOperation("根据分公司sid获取收款单编号")
     @GetMapping("/getApplyCode")
     ResultBean<String> getApplyCode(@RequestParam("useOrgSid")String useOrgSid);
+
+    @ApiOperation("更新已选择的款项明细的车架号")
+    @PutMapping("/updateVin")
+    ResultBean updateVin(@RequestParam("vinNo")String vinNo,@RequestParam("contractNo")String contractNo,@RequestParam("temporaryNo")String temporaryNo);
 }

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

@@ -147,4 +147,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     public ResultBean<String> getApplyCode(String useOrgSid) {
         return null;
     }
+
+    @Override
+    public ResultBean updateVin(String vinNo, String contractNo, String temporaryNo) {
+        return null;
+    }
 }

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

@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -109,4 +110,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
     FinCollectionConfirmation selectByBusSid(String virtualOrderSid);
 
     String selectNum(String bill);
+
+    int updateVin(@Param("vinNo") String vinNo, @Param("contractNo") String contractNo, @Param("temporaryNo") String temporaryNo);
 }

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

@@ -150,4 +150,8 @@
         order by id desc
         limit 1
     </select>
+
+    <update id="updateVin">
+        update fin_selected_receivables_detailed set VIN = #{vinNo} where contractNo = #{contractNo} and VIN = #{temporaryNo}
+    </update>
 </mapper>

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

@@ -222,4 +222,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
         String applyCode = finCollectionConfirmationService.getApplyCode(useOrgSid);
         return rb.success().setData(applyCode);
     }
+
+    @Override
+    public ResultBean updateVin(String vinNo, String contractNo, String temporaryNo) {
+        return finCollectionConfirmationService.updateVin(vinNo,contractNo,temporaryNo);
+    }
 }

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

@@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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;
@@ -1213,9 +1214,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 }
             }
         }
-        IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName());
-        List<AppFinUncollectedReceivablesDetailedVo> records = collectionConfirmList.getRecords();
-        for (AppFinUncollectedReceivablesDetailedVo record : records) {
+//        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);
@@ -1233,7 +1235,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 }
             }
         }
-        return collectionConfirmList;
+        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);
+        page1.setTotal(collList.size());
+        page1.setPages((collList.size() / pagerQuery.getSize()) + 1);
+        page1.setCurrent(pagerQuery.getCurrent());
+        page1.setSize(pagerQuery.getSize());
+        return page1;
     }
 
     /**
@@ -2039,4 +2051,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);
         return rb.success().setData(pdfPath);
     }
+
+    public ResultBean updateVin(String vinNo, String contractNo, String temporaryNo) {
+        ResultBean rb = ResultBean.fireFail();
+        int i = baseMapper.updateVin(vinNo,contractNo,temporaryNo);
+        return rb.success();
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java

@@ -82,6 +82,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
      * @return
      */
     IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, @Param("name") String name);
+    List<AppFinUncollectedReceivablesDetailedVo> getPaymentList(@Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, @Param("name") String name);
 
 
     @Select("select * from fin_selected_receivables_detailed where collSid = #{sid} and auditState = #{auditState}")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -53,6 +53,36 @@
         order by furd.contractNo desc
     </select>
 
+    <select id="getPaymentList"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo">
+        SELECT sid,
+        contractNo             AS contractId,
+        receivablesName        AS projectName,
+        customerPhone          AS mobile,
+        customerName           AS `name`,
+        currentReceivableMoney AS receivable,
+        contractSid,
+        VIN                    AS vin,
+        furd.busVinSid,
+        furd.payType,
+        furd.payTypeKey
+        FROM fin_uncollected_receivables_detailed furd
+        <where>
+            ${ew.sqlSegment}
+            <if test="name != null and name != ''">
+                and concat(IFNULL(furd.customerName
+                , '')
+                , ifnull(furd.contractNo
+                , '')) LIKE concat('%'
+                , #{name}
+                , '%')
+            </if>
+            and length(furd.busVinSid)
+            >0
+        </where>
+        order by furd.contractNo desc
+    </select>
+
     <select id="selectGroupConAndRecAndPay"
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
         SELECT receivablesName,

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -181,6 +181,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         return baseMapper.getPaymentDetailsList(page, qw, name);
     }
 
+    public List<AppFinUncollectedReceivablesDetailedVo> getPaymentList(QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, String name) {
+        return baseMapper.getPaymentList(qw, name);
+    }
+
     public List<FinSelectedReceivablesDetailedVo> fetchByAuditState(String sid, Integer auditState) {
         return baseMapper.fetchByAuditState(sid, auditState);
     }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonFeign.java

@@ -57,4 +57,9 @@ public interface DictCommonFeign {
     @ResponseBody
     @ApiOperation("根据数据字典的key获取第一个值（默认值）")
     ResultBean getFirstDictKeyByType(@RequestParam("dictType") String dictType, @RequestParam("psid") String psid);
+
+    @GetMapping("/getTypeValueList")
+    @ResponseBody
+    @ApiOperation("根据分类编码和数据分组查询数据字典")
+    ResultBean<List<DictCommonVo>> getTypeValueList(@RequestParam("type")String type,@RequestParam("groupNum")String groupNum);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dictcommon/DictCommonFeignFallback.java

@@ -49,4 +49,9 @@ public class DictCommonFeignFallback implements DictCommonFeign {
     public ResultBean getFirstDictKeyByType(String dictType, String psid) {
         return ResultBean.fireFail().setMsg("网站维护，请稍后再试");
     }
+
+    @Override
+    public ResultBean<List<DictCommonVo>> getTypeValueList(String type, String groupNum) {
+        return null;
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.java

@@ -52,4 +52,12 @@ public interface DictCommonMapper extends BaseMapper<DictCommon> {
      * @return
      */
     List<DictCommonVo> getValue(@Param(Constants.WRAPPER) QueryWrapper<DictCommonVo> qw);
+
+    /**
+     * 根据数据字典编码类别和分组查询数据字典
+     * @param type 数据字典编码类别
+     * @param groupNum 数据字典分组
+     * @return
+     */
+    List<DictCommonVo> getList(@Param("type") String type, @Param("groupNum") String groupNum);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml

@@ -36,4 +36,8 @@
         WHERE dictType = #{type}
           AND dictkey = #{key}
     </select>
+
+    <select id="getList" resultType="com.yxt.anrui.portal.api.dictcommon.DictCommonVo">
+        select * from dict_common dc where dc.dictType = #{type} and find_in_set(#{groupNum}, replace(dc.groupName, ',', ','));
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonRest.java

@@ -138,4 +138,9 @@ public class DictCommonRest implements DictCommonFeign {
             return new ResultBean().fail().setData(new DictCommon());
         }
     }
+
+    @Override
+    public ResultBean<List<DictCommonVo>> getTypeValueList(String type, String groupNum) {
+        return dictCommonService.getList(type,groupNum);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonService.java

@@ -10,6 +10,7 @@ import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -72,4 +73,9 @@ public class DictCommonService extends MybatisBaseService<DictCommonMapper, Dict
         return baseMapper.selectBykey(key, type);
     }
 
+    public ResultBean<List<DictCommonVo>> getList(String type, String groupNum) {
+        ResultBean<List<DictCommonVo>> rb = ResultBean.fireFail();
+        List<DictCommonVo> list = baseMapper.getList(type,groupNum);
+        return rb.success().setData(list);
+    }
 }