问题优化

2 years ago · 2533f9d024
14 changed files with 67 additions and 16 deletions
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java
@ -134,4 +134,6 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
    List<BaseDistributorListVo> selectAllDisList(String orgSid);

    BaseDistributorListVo selectDisListBySid(String sid);
+
+    List<BaseDistributorListVo> selectAppAllDisList(@Param("sid") String sid, @Param("search") String search);
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
@ -247,4 +247,17 @@
        WHERE isDelete = 0
        AND sid = #{sid}
    </select>
+
+    <select id="selectAppAllDisList" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributorListVo">
+        SELECT sid,
+               disName AS 'name', registNum,
+               registDetailAddress,
+               invoPhone,
+               invoBank,
+               invoBankNum
+        FROM base_distributor
+        WHERE isDelete = 0
+          AND createOrg = #{sid}
+          AND disName LIKE concat(#{search}, '%')
+    </select>
 </mapper>
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
@ -904,8 +904,13 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa

    public ResultBean<List<AppDisAndCustm>> invoiceName(String userSid, String orgPath, String search) {
        ResultBean rb = ResultBean.fireFail();
-        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
-        List<BaseDistributorListVo> baseDistributorListVos = baseMapper.selectAllDisList(sysOrganizationVo.getSid());
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        List<BaseDistributorListVo> baseDistributorListVos = new ArrayList<>();
+        if (StringUtils.isBlank(search)){
+            baseDistributorListVos = baseMapper.selectAllDisList(useOrgSid);
+        }else {
+            baseDistributorListVos = baseMapper.selectAppAllDisList(useOrgSid,search);
+        }
        List<AppDisAndCustm> appDisAndCustms = new ArrayList<>();
        for (BaseDistributorListVo baseDistributorListVo : baseDistributorListVos) {
            AppDisAndCustm appDisAndCustm = new AppDisAndCustm();
@ -939,6 +944,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
        crmCustomerTempListQuery.setStaffSid(sysUserVo.getStaffSid());
        crmCustomerTempListQuery.setOrgPath(orgPath);
        crmCustomerTempListQuery.setCertificateTypeKey("01");
+        crmCustomerTempListQuery.setSearch(search);
        List<CrmCustomerTempListVo> crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData();
        for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) {
            AppDisAndCustm appDisAndCustm = new AppDisAndCustm();
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java
@ -18,4 +18,7 @@ public class CrmCustomerTempListQuery implements Query {
    @ApiModelProperty("组织机构全路径sid")
    private String orgPath;
    private String certificateTypeKey; //证件类型
+
+    //移动端查询条件
+    private String search;
 }
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
@ -998,6 +998,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
        if (StringUtils.isNotBlank(query.getCertificateTypeKey())){
            qw.eq("ct.certificateTypeKey", query.getCertificateTypeKey());
        }
+        if (StringUtils.isNotBlank(query.getSearch())){
+            qw.like("ct.name",query.getSearch());
+        }
        qw.eq("ct.staffSid", staffSid);
        List<CrmCustomerTempListVo> list = baseMapper.selectCustomerList(qw);
        list.removeAll(Collections.singleton(null));
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java
@ -245,7 +245,7 @@ public interface FinBillApplicationFeign {
    @ResponseBody
    public ResultBean addInvoicedApply(@Valid @RequestBody AddInvoicedApplyDto dto);

-    @ApiOperation("移动端欠款开票初始化")
+    @ApiOperation("移动端开票申请初始化")
    @PostMapping("/appQKFetchDetailsBySid")
    @ResponseBody
    public ResultBean<FinBillApplicationDetailsVo> appQKFetchDetailsBySid(@RequestBody AppBillApplicationDetailsQKQuery query);
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java
@ -83,4 +83,7 @@ public class FinBillApplicationQuery implements Query {

    @ApiModelProperty("1待办2已办")
    private String type;
+
+    @ApiModelProperty("移动端查询条件")
+    private String name;
 }
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java
@ -91,4 +91,7 @@ public class FinBillApplicationVo implements Vo {
    private String procDefId;
    @ApiModelProperty(value = "实例id")
    private String procInstSid;
+
+    @ApiModelProperty("车架号拼接")
+    private String vinNo;
 }
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
@ -209,6 +209,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
        if (StringUtils.isNotBlank(query.getCreateByName())) {
            qw.like("fba.createByName", query.getCreateByName());
        }
+        //移动端条件
+        if (StringUtils.isNotBlank(query.getName())){
+            qw.and(wrapper -> wrapper.like("fba.customerName", query.getName()).or().like("fba.contractNo", query.getName()));
+        }
        String applyStartDate = query.getApplyStartDate();
        String applyEndDate = query.getApplyEndDate();
        qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (fba.applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
@ -228,6 +232,16 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
        QueryWrapper<FinBillApplication> qw = createQueryWrapper(query);
        IPage<FinBillApplication> page = PagerUtil.queryToPage(pq);
        IPage<FinBillApplicationVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (FinBillApplicationVo record : pagging.getRecords()) {
+            String sid = record.getSid();
+            List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(sid);
+            String vinNos = "";
+            for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                String vinNo = finBillVehicleVo.getVinNo();
+                vinNos = vinNos + vinNo + ",";
+            }
+            record.setVinNo(vinNos.substring(0,vinNos.lastIndexOf(",")));
+        }
        PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null);
        return p;
    }
@ -435,7 +449,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
        List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid);
        if (finBillTrailerVos.size() > 0) {
            for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
-                FinBillVehicleVo finBillVehicleVo = finBillVehicleService.fetchByMainSid(sid);
+                FinBillVehicleVo finBillVehicleVo = finBillVehicleService.fetchByMainSid(sid).get(0);
                finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks());
                BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData();
                List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java
@ -81,5 +81,5 @@ public interface FinBillVehicleMapper extends BaseMapper<FinBillVehicle> {
 	FinBillVehicleVo selByVinNo(String vinNo);

 	@Select("select * from fin_bill_vehicle where billAppSid = #{sid}")
-	FinBillVehicleVo fetchByMainSid(String sid);
+	List<FinBillVehicleVo> fetchByMainSid(String sid);
 }
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java
@ -146,7 +146,7 @@ public class FinBillVehicleService extends MybatisBaseService<FinBillVehicleMapp
       return baseMapper.selByVinNo(vinNo);
    }

-    public FinBillVehicleVo fetchByMainSid(String sid) {
+    public List<FinBillVehicleVo> fetchByMainSid(String sid) {
        return baseMapper.fetchByMainSid(sid);
    }
 }
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java
@ -58,4 +58,7 @@ public class BillApplicationPageVo implements Vo {

    @ApiModelProperty("开票单位")
    private String billUnit;
+
+    @ApiModelProperty("车架号拼接")
+    private String vinNo;
 }
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
@ -1022,7 +1022,7 @@ public class AppBusAdvanceGinvoiceapplyService {
                    idCardImages.add(zjApplicationAppendx.getFileUrl());
                }
                ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo();
-                itemEditTextInfo.setTitle("证件");
+                itemEditTextInfo.setTitle("证件(营业执照或身份证)");
                itemEditTextInfo.setType(1);
                itemEditTextInfo.setNullAble(false);
                itemEditTextInfo.setKey("idCardImages");
@ -1046,7 +1046,7 @@ public class AppBusAdvanceGinvoiceapplyService {
                    invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl());
                }
                ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo();
-                itemEditTextInfo.setTitle("款项确认书");
+                itemEditTextInfo.setTitle("款项确认书(贷款业务上传)");
                itemEditTextInfo.setType(1);
                itemEditTextInfo.setNullAble(true);
                itemEditTextInfo.setKey("invoiceApplyConfirmImages");
@ -1058,7 +1058,7 @@ public class AppBusAdvanceGinvoiceapplyService {
                    registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
                }
                ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo();
-                itemEditTextInfo.setTitle("车辆登记合同");
+                itemEditTextInfo.setTitle("车辆登记合同(开票名称与客户名称不一致时上传)");
                itemEditTextInfo.setType(1);
                itemEditTextInfo.setNullAble(true);
                itemEditTextInfo.setKey("registerContractImages");
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
@ -53,7 +53,7 @@ public class InvoicedService {
        BillApplicationPageQuery params = pagerQuery.getParams();
        FinBillApplicationQuery finBillApplicationQuery = new FinBillApplicationQuery();
        finBillApplicationQuery.setCreateBySid(params.getUserSid());
-        finBillApplicationQuery.setCustomerName(params.getName());
+        finBillApplicationQuery.setName(params.getName());
        finBillApplicationQuery.setOrgPath(params.getOrgPath());
        finBillApplicationQuery.setType(params.getType());
        PagerQuery<FinBillApplicationQuery> pcq = new PagerQuery<>();
@ -80,6 +80,7 @@ public class InvoicedService {
            }else {
                billApplicationPageVo.setShowUpData(false);
            }
+            billApplicationPageVo.setVinNo(record.getVinNo());
            billApplicationPageVos.add(billApplicationPageVo);
        }
        v.setRecords(billApplicationPageVos);
@ -373,12 +374,12 @@ public class InvoicedService {
        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
        submitBillApplicationDto.setUseOrgSid(useOrgSid);
        submitBillApplicationDto.setCreateBySid(dto.getUserSid());
-        submitBillApplicationDto.setTotalBillMoney(dto.getInvoiceMoney());
+        submitBillApplicationDto.setTotalBillMoney(dto.getInvoiceTotal());
        submitBillApplicationDto.setOrgSidPath(dto.getOrgPath());
        submitBillApplicationDto.setSaleTypeValue(dto.getSaleType());
-        submitBillApplicationDto.setSaleDeptName(dto.getSellerName());
+        submitBillApplicationDto.setSaleDeptName(dto.getSellerDept());
        submitBillApplicationDto.setStaffName(dto.getSellerName());
-        submitBillApplicationDto.setOpenTickUnitName(dto.getOpenTickName());
+        submitBillApplicationDto.setOpenTickUnitName(dto.getInvoicingUnit());
        submitBillApplicationDto.setCustomerName(dto.getName());
        submitBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney());
        submitBillApplicationDto.setOpenTickTypeKey(dto.getOpenTickTypeKey());
@ -562,7 +563,7 @@ public class InvoicedService {
                    idCardImages.add(zjApplicationAppendx.getFileUrl());
                }
                ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo();
-                itemEditTextInfo.setTitle("证件");
+                itemEditTextInfo.setTitle("证件(营业执照或身份证)");
                itemEditTextInfo.setType(1);
                itemEditTextInfo.setNullAble(false);
                itemEditTextInfo.setKey("idCardImages");
@ -586,7 +587,7 @@ public class InvoicedService {
                    invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl());
                }
                ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo();
-                itemEditTextInfo.setTitle("款项确认书");
+                itemEditTextInfo.setTitle("款项确认书(贷款业务上传)");
                itemEditTextInfo.setType(1);
                itemEditTextInfo.setNullAble(true);
                itemEditTextInfo.setKey("invoiceApplyConfirmImages");
@ -598,7 +599,7 @@ public class InvoicedService {
                    registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
                }
                ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo();
-                itemEditTextInfo.setTitle("车辆登记合同");
+                itemEditTextInfo.setTitle("车辆登记合同(开票名称与客户名称不一致时上传)");
                itemEditTextInfo.setType(1);
                itemEditTextInfo.setNullAble(true);
                itemEditTextInfo.setKey("registerContractImages");