Pārlūkot izejas kodu

1、后台管理系统增加 上传企业开票经办人和营业执照信息
2、后台管理系统增加 上传企业开票经办人证明附件信息

mashengyi 7 mēneši atpakaļ
vecāks
revīzija
b8824dc4d4
18 mainītis faili ar 846 papildinājumiem un 61 dzēšanām
  1. 99 0
      src/main/java/com/jkcredit/invoice/controller/business/CustomerCompanyManagerOperController.java
  2. 29 4
      src/main/java/com/jkcredit/invoice/controller/business/CustomerController.java
  3. 21 1
      src/main/java/com/jkcredit/invoice/credit/SimpleCoreFilter.java
  4. 12 0
      src/main/java/com/jkcredit/invoice/mapper/customer/CustomerRecMapper.java
  5. 9 1
      src/main/java/com/jkcredit/invoice/mapper/waybill/NoCarCompanyMangerMapper.java
  6. 26 2
      src/main/java/com/jkcredit/invoice/model/entity/waybill/NoCarCompanyManger.java
  7. 11 0
      src/main/java/com/jkcredit/invoice/service/customer/CustomerRecService.java
  8. 14 0
      src/main/java/com/jkcredit/invoice/service/customer/impl/CustomerRecServiceImpl.java
  9. 10 1
      src/main/java/com/jkcredit/invoice/service/nocar/NoCarCompanyMangerOper.java
  10. 57 7
      src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarCompanyMangerOperImpl.java
  11. 5 13
      src/main/java/com/jkcredit/invoice/util/QueryDemoTest.java
  12. 165 0
      src/main/java/com/jkcredit/invoice/util/QueryDemoTest_opera.java
  13. 9 9
      src/main/java/com/jkcredit/invoice/util/QueryDemo_3rd.java
  14. 42 8
      src/main/java/com/jkcredit/invoice/util/QueryDemo_3rd2.java
  15. 253 0
      src/main/java/com/jkcredit/invoice/util/QueryDemo_3rd4.java
  16. 3 3
      src/main/java/com/jkcredit/invoice/util/QueryDemo_Test.java
  17. 65 0
      src/main/resources/mapper/customer/CustomerCompanyManagerMapper.xml
  18. 16 12
      src/main/resources/mapper/customer/CustomerRecMapper.xml

+ 99 - 0
src/main/java/com/jkcredit/invoice/controller/business/CustomerCompanyManagerOperController.java

@@ -0,0 +1,99 @@
+package com.jkcredit.invoice.controller.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jkcredit.invoice.annotation.LoginRequired;
+import com.jkcredit.invoice.annotation.annotationdes.AuthenticationInterceptor;
+import com.jkcredit.invoice.model.entity.user.User;
+import com.jkcredit.invoice.model.entity.waybill.NoCarCompanyManger;
+import com.jkcredit.invoice.model.vo.UserVo;
+import com.jkcredit.invoice.service.lowerservice.CheckHasAuthRole;
+import com.jkcredit.invoice.service.nocar.NoCarCompanyMangerOper;
+import com.jkcredit.invoice.util.RespR;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * All rights Reserved, Designed By www.erayt.com
+ *
+ * @author mashengyi
+ * @version V4.1
+ * @Title rcs41
+ * @Package com.jkcredit.invoice.controller.business
+ * @Description 无车企业开票人管理
+ * @date 2024/4/4 下午1:11
+ * @Copyright: 2024 www.erayt.com Inc. All rights reserved.
+ * 注意:本内容仅限于杭州时代银通软件股份有限公司内部传阅,禁止外泄以及用于其他的商业目的
+ **/
+
+@Api(tags = "无车企业开票人管理")
+@RestController
+@RequestMapping(value = {"/customerCompany"})
+public class CustomerCompanyManagerOperController {
+
+    @Autowired
+    NoCarCompanyMangerOper noCarCompanyMangerOper;
+
+    @Autowired
+    private CheckHasAuthRole checkHasAuthRole;
+
+    /**
+     * 新增上传企业开票经办人
+     *
+     * @return 经办人集合
+     */
+    @PostMapping("/detailAdd")
+    @ApiOperation(value = "新增上传企业开票经办人信息", notes = "新增上传企业开票经办人信息")
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
+    public RespR CustomerCompanyManagerDetailAdd(@RequestBody @Validated NoCarCompanyManger noCarCompanyManger) {
+        return noCarCompanyMangerOper.companyDetailAdd(noCarCompanyManger);
+    }
+
+
+    /**
+     * 新增上传证明文件
+     *
+     * @return 经办人集合
+     */
+    @PostMapping("/operatorEvidenceAdd")
+    @ApiOperation(value = "新增上传证明文件", notes = "新增上传证明文件")
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
+    public RespR CustomerCompanyManageroperatorEvidenceAdd(@RequestBody NoCarCompanyManger noCarCompanyManger) {
+        if (!checkHasAuthRole.checkMessage(noCarCompanyManger.getOperatorEvidenceContractFileName(), noCarCompanyManger.getOperatorEvidenceBase64Str())) {
+            return new RespR(false, "证明文件上传失败,请查看数据是否维护准确");
+        }
+        return noCarCompanyMangerOper.operatorEvidenceAdd(noCarCompanyManger);
+    }
+
+
+    /**
+     * 分页查询企业开票经办人
+     *
+     * @param page   参数集
+     * @param userVo 查询参数列表
+     * @return 用户集合
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "分页查询企业开票经办人", notes = "分页查询企业开票经办人")
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
+    public RespR getCustomerCompanyManagerDetailPage(Page page, NoCarCompanyManger noCarCompanyManger, UserVo userVo) {
+        return new RespR<>(noCarCompanyMangerOper.getCustomerCompanyManagerDetailPage(page, noCarCompanyManger));
+    }
+
+
+    /**
+     * @param noCarCompanyManger
+     * @return
+     */
+    @PostMapping("/noCarCompanyMangerQuery")
+    @ApiOperation(value = "企业开票经办人信息查询", notes = "企业开票经办人信息查询")
+    @LoginRequired
+    public RespR getCustomerCompanyManagerDetail(@RequestBody NoCarCompanyManger noCarCompanyManger, User user) {
+        return noCarCompanyMangerOper.noCarCompanyMangerQuery(noCarCompanyManger);
+    }
+}

+ 29 - 4
src/main/java/com/jkcredit/invoice/controller/business/CustomerController.java

@@ -31,7 +31,11 @@ import org.apache.ibatis.annotations.Insert;
 import org.apache.poi.util.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
@@ -40,9 +44,17 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
-import java.util.*;
-
-import static com.jkcredit.invoice.common.CommonConst.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import static com.jkcredit.invoice.common.CommonConst.NO_CAR;
+import static com.jkcredit.invoice.common.CommonConst.NULL;
+import static com.jkcredit.invoice.common.CommonConst.SELF_CAR;
 
 /**
  * 客户操作
@@ -504,4 +516,17 @@ public class CustomerController {
         List<Map<String, String>> cards = customerChangeInfoService.selectChangeCards(applyId);
         return new RespR(cards);
     }
+
+
+    /**
+     * @param
+     * @return
+     */
+    @PostMapping("/customeRecQueryList")
+    @ApiOperation(value = "用户备案列表查询", notes = "用户备案列表查询")
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
+    public RespR customeRecQueryList() {
+        return new RespR(customerRecService.findAllCustomeRecQueryList());
+    }
+
 }

+ 21 - 1
src/main/java/com/jkcredit/invoice/credit/SimpleCoreFilter.java

@@ -104,6 +104,10 @@ public class SimpleCoreFilter implements Filter {
      * 这些映射无需进行api/appSecret等参数校验,故过滤
      */
     private final static String[] NO_TOKEN_API_PATHS = {
+
+            /**
+             * 前台映射
+            */
             "/**/favicon.ico",
             "/favicon.ico",
             "/swagger-ui.html",
@@ -117,6 +121,10 @@ public class SimpleCoreFilter implements Filter {
             "/swagger-resources/configuration/security",
             "/swagger-resources",
             "/v2/api-docs",
+
+            /**
+             * 客户管理
+            */
             "/customer/findCustomer",
             "/customer/findCustomerRecharge",
             "/customer/findCustomerRechargeMoney",
@@ -143,7 +151,18 @@ public class SimpleCoreFilter implements Filter {
             "/customer/contractStatusFail",
             "/customer/contractStatusProcess",
             "/customer/contractStatusSuccess",
+            "/customer/customeRecQueryList",
+
+            //无车企业开票人管理
+            "/customerCompany/detailAdd",
+            "/customerCompany/operatorEvidenceAdd",
+            "/customerCompany/page",
+            "/customerCompany/noCarCompanyMangerQuery",
+
+            //登陆管理
             "/auth/login/loginOut",
+
+            //无车管理
             "/noCar/findCarRec",
             "/noCar/findBillWay",
             "/noCar/findBillWayCust",
@@ -166,7 +185,7 @@ public class SimpleCoreFilter implements Filter {
             "/noCar/batchImportNocarInvoices",
             "/noCar/batchImportNocarBillWay",
 
-
+            //自由车管理
             "/selfCar/selfCarUnBind",
             "/selfCar/findTradesUpper",
             "/selfCar/findTrades",
@@ -180,6 +199,7 @@ public class SimpleCoreFilter implements Filter {
             "/selfCar/batchImportSelfcarTrades",
             "/selfCar/updateTrades",
 
+            //参数管理
             "/param",
             "/param/page",
             "/param/updateParam",

+ 12 - 0
src/main/java/com/jkcredit/invoice/mapper/customer/CustomerRecMapper.java

@@ -206,8 +206,20 @@ public interface CustomerRecMapper extends BaseMapper<CustomerRec> {
 
     /**
      * 根据id和协议上传状态更新企业备案信息
+     *
      * @param customerRec
      * @return
      */
     int updateContractStatus(CustomerRec customerRec);
+
+    /**
+     * 查询有效的客户备案信息
+     *
+     * @param
+     * @return java.util.List<com.jkcredit.invoice.model.entity.customer.CustomerRec>
+     * @throws
+     * @createDate 2024/4/4 上午11:21
+     * @author mashengyi
+     */
+    List<CustomerRec> selectAllCustomeRecQueryList();
 }

+ 9 - 1
src/main/java/com/jkcredit/invoice/mapper/waybill/NoCarCompanyMangerMapper.java

@@ -1,11 +1,19 @@
 package com.jkcredit.invoice.mapper.waybill;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.model.entity.waybill.NoCarCompanyManger;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
-public interface NoCarCompanyMangerMapper extends BaseMapper<NoCarCompanyManger>{
+public interface NoCarCompanyMangerMapper extends BaseMapper<NoCarCompanyManger> {
+
 
+    IPage<List<NoCarCompanyManger>> selectAllCustomerCompanyManagerDetailPage(Page page, @Param("noCarCompanyManger") NoCarCompanyManger noCarCompanyManger);
 
+    NoCarCompanyManger selectBycompanyNumAndOr(NoCarCompanyManger noCarCompanyManger);
 }

+ 26 - 2
src/main/java/com/jkcredit/invoice/model/entity/waybill/NoCarCompanyManger.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jkcredit.invoice.model.BaseMode;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * 企业经办人信息
@@ -19,11 +22,15 @@ public class NoCarCompanyManger extends BaseMode{
     /**
      * 经办人姓名
      */
+    @NotNull(message = "经办人姓名不能为空")
+    @Length(max = 50, message = "经办人姓名格式有误")
     private String operatorName;
 
     /**
      * 经办人手机号
      */
+    @NotNull(message = "经办人手机号电话不能为空")
+    @Length(max = 13, message = "经办人手机号人电话格式有误")
     private String operatorMobile;
 
     /**
@@ -47,17 +54,34 @@ public class NoCarCompanyManger extends BaseMode{
     private String identificationIdTemp;
 
     /**
-     * 附件名称
+     * 经办人附件名称
      */
+    @NotNull(message = "附件名称不能为空")
     private String contractFileName;
 
     /**
      * 附件
      */
+    @NotNull(message = "附件不能为空")
     private String base64Str;
 
     /**
-     * 状态 1-成功 2- 待输入验证码
+     * 状态 todo 这里需要处理清楚逻辑,如果没有上传过企业开票经办人,是不能进行变更经办人的(证明附件不进行强制教研)
+     * 1-变更经办人成功(已输入验证码确认)(客户端)
+     * 2-待输入验证码(已提交变更企业开票经办人成功)(客户端)
+     * 3-开票经办人上传成功(管理端)
+     * 4-证明附件上传成功(管理端)
      */
     private String status;
+
+    /**
+     * 证明协议附件名称
+     */
+    private String operatorEvidenceContractFileName;
+
+
+    /**
+     * 证明协议附件
+     */
+    private String operatorEvidenceBase64Str;
 }

+ 11 - 0
src/main/java/com/jkcredit/invoice/service/customer/CustomerRecService.java

@@ -62,4 +62,15 @@ public interface CustomerRecService {
      * @return
      */
     CustomerRec selectByCustomerNameAndCompanyConcat(CustomerRec customerRec);
+
+    /**
+     * 查询有效的客户备案信息
+     *
+     * @param
+     * @return java.util.List<com.jkcredit.invoice.model.entity.customer.CustomerRec>
+     * @throws
+     * @createDate 2024/4/4 上午11:23
+     * @author mashengyi
+     */
+    List<CustomerRec> findAllCustomeRecQueryList();
 }

+ 14 - 0
src/main/java/com/jkcredit/invoice/service/customer/impl/CustomerRecServiceImpl.java

@@ -98,4 +98,18 @@ public class CustomerRecServiceImpl extends ServiceImpl<CustomerRecMapper, Custo
     public CustomerRec selectByCustomerNameAndCompanyConcat(CustomerRec record) {
         return customerRecMapper.selectByCustomerNameAndCompanyConcat(record);
     }
+
+    /**
+     * 查询有效的客户备案信息
+     *
+     * @param
+     * @return java.util.List<com.jkcredit.invoice.model.entity.customer.CustomerRec>
+     * @throws
+     * @createDate 2024/4/4 上午11:21
+     * @author mashengyi
+     */
+    @Override
+    public List<CustomerRec> findAllCustomeRecQueryList() {
+        return customerRecMapper.selectAllCustomeRecQueryList();
+    }
 }

+ 10 - 1
src/main/java/com/jkcredit/invoice/service/nocar/NoCarCompanyMangerOper.java

@@ -1,5 +1,7 @@
 package com.jkcredit.invoice.service.nocar;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.model.entity.waybill.NoCarCompanyManger;
 import com.jkcredit.invoice.model.vo.OperatorEditConfirmVo;
 import com.jkcredit.invoice.model.vo.OperatorEditVo;
@@ -14,13 +16,20 @@ public interface NoCarCompanyMangerOper {
 
    RespR companyDetailAdd(NoCarCompanyManger noCarCompanyManger);
 
-   RespR operatorEdit(OperatorEditVo operatorEditVo);
+    RespR operatorEdit(OperatorEditVo operatorEditVo);
 
     RespR operatorEditConfirm(OperatorEditConfirmVo operatorEditConfirmVo);
 
+    @Deprecated
     RespR operatorEvidence(OperatorEvidenceVo operatorEvidenceVo);
 
     RespR operatorSendCode(OperatorSendCodeVo operatorSendCodeVo);
 
     RespR operatorValidCode(OperatorSendCodeVo operatorSendCodeVo);
+
+    IPage getCustomerCompanyManagerDetailPage(Page page, NoCarCompanyManger noCarCompanyManger);
+
+    RespR operatorEvidenceAdd(NoCarCompanyManger noCarCompanyManger);
+
+    RespR noCarCompanyMangerQuery(NoCarCompanyManger noCarCompanyManger);
 }

+ 57 - 7
src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarCompanyMangerOperImpl.java

@@ -1,11 +1,18 @@
 package com.jkcredit.invoice.service.nocar.impl;
 
-import cn.com.taiji.sdk.model.comm.protocol.eoms.company.*;
+import cn.com.taiji.sdk.model.comm.protocol.eoms.company.CompanyDetailAddRequest;
+import cn.com.taiji.sdk.model.comm.protocol.eoms.company.CompanyDetailAddResponse;
+import cn.com.taiji.sdk.model.comm.protocol.eoms.company.OperatorEditConfirmRequest;
+import cn.com.taiji.sdk.model.comm.protocol.eoms.company.OperatorEditRequest;
+import cn.com.taiji.sdk.model.comm.protocol.eoms.company.OperatorEvidenceRequest;
 import cn.com.taiji.sdk.model.comm.protocol.tts.waybill.OperatorSendCodeRequest;
 import cn.com.taiji.sdk.model.comm.protocol.tts.waybill.OperatorValidCodeRequest;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jkcredit.invoice.common.CommonConst;
 import com.jkcredit.invoice.mapper.waybill.NoCarCompanyMangerMapper;
 import com.jkcredit.invoice.model.entity.waybill.NoCarCompanyManger;
 import com.jkcredit.invoice.model.vo.OperatorEditConfirmVo;
@@ -35,7 +42,7 @@ public class NoCarCompanyMangerOperImpl extends ServiceImpl<NoCarCompanyMangerMa
     @Override
     public RespR companyDetailAdd(NoCarCompanyManger noCarCompanyManger) {
         QueryWrapper<NoCarCompanyManger> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("operatorMobile").eq("companyNum",noCarCompanyManger.getCompanyNum());
+        queryWrapper.select("operator_mobile").eq("company_num", noCarCompanyManger.getCompanyNum());
         NoCarCompanyManger noCarCompanyMangerDb = noCarCompanyMangerMapper.selectOne(queryWrapper);
         if(noCarCompanyMangerDb !=null){
             return new RespR(false,"已经上传企业开票人,无需重复上传");
@@ -46,8 +53,9 @@ public class NoCarCompanyMangerOperImpl extends ServiceImpl<NoCarCompanyMangerMa
         if(respR.getCode() == 1){
             log.error("companyDetailAdd上传失败,失败原因:{}",respR.getMsg());
             return new RespR(false,respR.getMsg());
-        }else{
-            noCarCompanyManger.setStatus("1");
+        }else {
+            //开票经办人上传成功(管理端)
+            noCarCompanyManger.setStatus("3");
             noCarCompanyMangerMapper.insert(noCarCompanyManger);
             return new RespR("success");
         }
@@ -141,10 +149,52 @@ public class NoCarCompanyMangerOperImpl extends ServiceImpl<NoCarCompanyMangerMa
         operatorValidCodeRequest.setCompanyNum(companyNum);
         operatorValidCodeRequest.setValidCode(operatorSendCodeVo.getValidCode());
         RespR respR = noCarInterface.operatorValidCode(operatorValidCodeRequest);
-        if(respR.getCode()==1){
-            return new RespR(false,respR.getMsg());
-        }else {
+        if (respR.getCode() == 1) {
+            return new RespR(false, respR.getMsg());
+        } else {
+            return new RespR("success");
+        }
+    }
+
+    @Override
+    public IPage getCustomerCompanyManagerDetailPage(Page page, NoCarCompanyManger noCarCompanyManger) {
+
+        return baseMapper.selectAllCustomerCompanyManagerDetailPage(page, noCarCompanyManger);
+    }
+
+    @Override
+    public RespR operatorEvidenceAdd(NoCarCompanyManger noCarCompanyManger) {
+        log.info("开始上传证明文件:NoCarCompanyMangerOperImpl.operatorEvidenceAdd{}", noCarCompanyManger);
+        if (noCarCompanyManger.getStatus().equals(CommonConst.FOR)) {
+            return new RespR(false, "证明文件已上传,请误重复上传");
+        }
+        if (!noCarCompanyManger.getStatus().equals(CommonConst.THREE)) {
+            return new RespR(false, "无法上传证明文件,开票经办人未上传或者处于经办人调整过程中");
+        }
+        OperatorEvidenceRequest operatorEvidenceRequest = new OperatorEvidenceRequest();
+        operatorEvidenceRequest.setCompanyNum(noCarCompanyManger.getCompanyNum());
+        operatorEvidenceRequest.setOperatorMobile(noCarCompanyManger.getOperatorMobile());
+        operatorEvidenceRequest.setBase64Str(noCarCompanyManger.getOperatorEvidenceBase64Str());
+        operatorEvidenceRequest.setContractFileName(noCarCompanyManger.getOperatorEvidenceContractFileName());
+        RespR respR = noCarInterface.operatorEvidence(operatorEvidenceRequest);
+        if (respR.getCode() == 1) {
+            log.error("operatorEvidence失败,失败原因:{}", respR.getMsg());
+            return new RespR(false, respR.getMsg());
+        } else {
+            UpdateWrapper<NoCarCompanyManger> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("company_num", noCarCompanyManger.getCompanyNum());
+            updateWrapper.set("operator_evidence_base64_str", noCarCompanyManger.getOperatorEvidenceBase64Str());
+            updateWrapper.set("operator_evidence_contract_file_name", noCarCompanyManger.getOperatorEvidenceContractFileName());
+            updateWrapper.set("status", CommonConst.FOR);
+            // 4-证明附件上传成功(管理端)
+            noCarCompanyManger.setStatus("4");
+            noCarCompanyMangerMapper.update(noCarCompanyManger, updateWrapper);
             return new RespR("success");
         }
     }
+
+    @Override
+    public RespR noCarCompanyMangerQuery(NoCarCompanyManger noCarCompanyManger) {
+        return new RespR(noCarCompanyMangerMapper.selectBycompanyNumAndOr(noCarCompanyManger));
+    }
 }

+ 5 - 13
src/main/java/com/jkcredit/invoice/util/QueryDemoTest.java

@@ -19,7 +19,7 @@ public class QueryDemoTest {
     /**
      * 测试地址
      */
-    private static final String URL = "http://etc.jkcredit.com:9999/api/rest";
+    private static final String URL = "http://127.0.0.1:18081/api/rest";
 
     /**
      * 分配的appKey
@@ -29,7 +29,7 @@ public class QueryDemoTest {
     /**
      * 分配的appSecret
      */
-    private static final String APP_SECRET = "7697CE9BB9D5A856CFDDE738320AD34EA53E483C";
+    private static final String APP_SECRET = "7697CE9BB1D5AC46CFDDA238328AD34EA33E483G";
 
 
     /**
@@ -95,7 +95,7 @@ public class QueryDemoTest {
          */
         JSONObject paramJsonObj = new JSONObject();
         //CMCC_MOBILE_CHECK_V8//CMCC_3RD_V2//CMCC_3RD_DETAIL_V1//
-        paramJsonObj.put("api", "WAY_BILL_HISTORY_START");
+        paramJsonObj.put("api", "WAYBILL_OPERATORSENDCODE");
         paramJsonObj.put("appKey", APP_KEY);
         paramJsonObj.put("appSecret", APP_SECRET);
 
@@ -113,16 +113,8 @@ public class QueryDemoTest {
          * 具体业务参数放在data中
          */
         JSONObject dataJson = new JSONObject();
-        dataJson.put("num", "1556502451-29");
-        dataJson.put("plateNumber", "京CF0237");
-        dataJson.put("plateColor", 1);
-        dataJson.put("startTime", "2023-07-05T19:25:56");
-        dataJson.put("realDestAddr", "北京市朝阳区");
-        dataJson.put("destAddr", "北京市朝阳区");
-        dataJson.put("endTime", "2023-07-06T09:25:56");
-        dataJson.put("fee", 10000);
-        dataJson.put("titleType", 1);
-        dataJson.put("taxplayerCode", "91330106MA28LMW9XQ");
+        dataJson.put("taxplayerCode", "91110105MA01BCJJ7U");
+
         return dataJson;
     }
 

+ 165 - 0
src/main/java/com/jkcredit/invoice/util/QueryDemoTest_opera.java

@@ -0,0 +1,165 @@
+package com.jkcredit.invoice.util;
+
+import net.sf.json.JSONObject;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.NameValuePair;
+import org.apache.commons.httpclient.methods.PostMethod;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Iterator;
+
+/**
+ * @author mashengyi
+ */
+public class QueryDemoTest_opera {
+
+    /**
+     * 测试地址
+     */
+    private static final String URL = "http://127.0.0.1:18081/api/rest";
+
+    /**
+     * 分配的appKey
+     */
+    private static final String APP_KEY = "jkxy";
+
+    /**
+     * 分配的appSecret
+     */
+    private static final String APP_SECRET = "7697CE9BB1D5AC46CFDDA238328AD34EA33E483G";
+
+
+    /**
+     * 方法入口
+     *
+     * @param args
+     */
+    public static void main(String[] args) throws Exception {
+        QueryDemoTest_opera demo = new QueryDemoTest_opera();
+        demo.runMainService();
+    }
+
+    /**
+     * 流转字符串
+     *
+     * @param is
+     * @return
+     */
+    public static String convertStreamToString(InputStream is) {
+        BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+        StringBuilder builder = new StringBuilder();
+        String line = null;
+        try {
+            while ((line = reader.readLine()) != null) {
+                builder.append(line + "\n");
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                is.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return builder.toString();
+    }
+
+    /**
+     * 调用主接口
+     */
+    public void runMainService() {
+        try {
+            /**
+             * 实名demo
+             */
+            JSONObject paramJsonObj = initParamJsonObjRealname();
+            String ret = postClient(URL, paramJsonObj);
+            System.out.println(ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 整合参数
+     *
+     * @return
+     */
+    public JSONObject initParamJsonObjRealname() {
+        /**
+         * 基本参数
+         */
+        JSONObject paramJsonObj = new JSONObject();
+        //CMCC_MOBILE_CHECK_V8//CMCC_3RD_V2//CMCC_3RD_DETAIL_V1//
+        paramJsonObj.put("api", "COMPANY_COMPANYDETAILADD");
+        paramJsonObj.put("appKey", APP_KEY);
+        paramJsonObj.put("appSecret", APP_SECRET);
+
+
+        /**
+         * 业务参数
+         */
+        JSONObject dataJson = initMainServiceParamJsonObjRealname();
+        paramJsonObj.put("data", dataJson);
+        return paramJsonObj;
+    }
+
+    public JSONObject initMainServiceParamJsonObjRealname() {
+        /**
+         * 具体业务参数放在data中
+         */
+        JSONObject dataJson = new JSONObject();
+        dataJson.put("taxplayerCode", "91110105MA01BCJJ8U");
+        dataJson.put("operatorName", "张三");
+        dataJson.put("operatorMobile", "19910751229");
+        dataJson.put("identificationId", "410327199311279656");
+        dataJson.put("contractFileName", "测试msy.pdf");
+        dataJson.put("base64Str", Base64Util.getPdfBinary(new File("/Users/mashengyi/Downloads/b10852e4-430a-4222-b088-41f12d41b941.pdf")));
+
+        return dataJson;
+    }
+
+    /**
+     * 实现http post请求 注意编码 UTF-8
+     *
+     * @param url
+     * @param paramObj
+     * @return
+     */
+    public String postClient(String url, JSONObject paramObj) {
+        String str = "";
+        HttpClient client = null;
+        PostMethod method = null;
+        try {
+            client = new HttpClient();
+            method = new PostMethod(url);
+            method.setRequestHeader("Content-Type", "application/json;charset=utf-8");
+            NameValuePair[] param = new NameValuePair[paramObj.size()];
+            @SuppressWarnings("unchecked")
+            Iterator<String> keys = paramObj.keys();
+            int i = 0;
+            while (keys.hasNext()) {
+                String key = keys.next();
+                String value = paramObj.getString(key);
+                param[i] = new NameValuePair(key, value);
+                i++;
+            }
+            method.setRequestBody(param);
+            client.executeMethod(method);
+            str = convertStreamToString(method.getResponseBodyAsStream());
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (method != null) {
+                method.releaseConnection();
+            }
+        }
+        return str;
+    }
+
+}

+ 9 - 9
src/main/java/com/jkcredit/invoice/util/QueryDemo_3rd.java

@@ -28,7 +28,7 @@ public class QueryDemo_3rd {
     /**
      * 分配的appKey
      */
-    private static final String appKey = "data_test";
+    private static final String appKey = "jkxy";
 
     static String filename = "/Users/mashengyi/Downloads/";
     static String logname = "请求参数.txt";
@@ -184,7 +184,7 @@ public class QueryDemo_3rd {
         paramJsonObj.put("api", "WAY_BILL_START");
         paramJsonObj.put("appKey", appKey);
         paramJsonObj.put("appSecret",
-                "6MD50FA127P1ACNP9C64272X13C1FA1BEA20H406");
+                "7697CE9BB1D5AC46CFDDA238328AD34EA33E483G");
 
 
         /**
@@ -207,19 +207,19 @@ public class QueryDemo_3rd {
          * 具体业务参数放在data中
          */
         JSONObject dataJson = new JSONObject();
-        dataJson.put("num", "1556502455-23");
-        dataJson.put("plateNumber", "京CF0237");
+        dataJson.put("num", "JIAOKE20231121061");
+        dataJson.put("plateNumber", "渝C82217");
         dataJson.put("plateColor", 1);
-        dataJson.put("startTime", "2023-11-13T19:25:56");
+        dataJson.put("startTime", "2023-11-21T07:25:56");
         dataJson.put("sourceAddr", "北京市朝阳区");
         dataJson.put("destAddr", "北京市朝阳区");
-        dataJson.put("predictEndTime", "2023-11-16T09:25:56");
-        dataJson.put("fee", 10000);
+        dataJson.put("predictEndTime", "2023-11-21T19:25:56");
+        dataJson.put("fee", 10);
         dataJson.put("titleType", 1);
-        dataJson.put("taxplayerCode", "91330106MA28LMW9XQ");
+        dataJson.put("taxplayerCode", "91110105MA01BY5W45");
         dataJson.put("waybillFileName", name);
         dataJson.put("base64Str", mobile);
-        dataJson.put("contractType",idcard);
+        dataJson.put("contractType", idcard);
         return dataJson;
     }
 

+ 42 - 8
src/main/java/com/jkcredit/invoice/util/QueryDemo_3rd2.java

@@ -1,14 +1,17 @@
 package com.jkcredit.invoice.util;
 
+import com.alibaba.fastjson.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.NameValuePair;
 import org.apache.commons.httpclient.methods.PostMethod;
 
 import java.io.BufferedReader;
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -23,16 +26,17 @@ public class QueryDemo_3rd2 {
     /**
      * 测试地址
      */
-   private static final String URL = "http://etc.jkcredit.com:9999/api/rest";
+    private static final String URL = "http://etc.jkcredit.com:9999/api/rest";
     //  private static final String URL = "http://127.0.0.1:18081/api/rest";
 
     /**
      * 分配的appKey
      */
-  //  private static final String appKey = "yqxd";
+    //  private static final String appKey = "yqxd";
 
     static String filename = "/Users/mashengyi/Downloads/";
-    static String logname = "编辑1.txt";
+    static String writename = "/Users/mashengyi/Downloads/msy.txt";
+    static String logname = "hccc.txt";
 
     /**
      * 方法入口
@@ -67,16 +71,32 @@ public class QueryDemo_3rd2 {
                     if (str == null)
                         break;
 
-                    String appKey = getsrt("appKey:", ":::appSecret:::", str).trim();
-                    String appSecret = getsrt(":::appSecret:::", ":::num:::", str).trim();
-                    String num = getsrt1(":::num:::",str).trim();
 
-                    demo.runMainService(appKey,appSecret,num);
+                    com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(str);
+                    JSONArray jsonArray = jsonObject.getJSONArray("result");
+
+                    try (BufferedWriter writer = new BufferedWriter(new FileWriter("/Users/mashengyi/Downloads/msy.txt"))) {
+                        // 遍历数组并写入每行数据到txt文件
+
+                        for (int i = 0; i < jsonArray.size(); i++) {
+                            com.alibaba.fastjson.JSONObject jsonObject1 = jsonArray.getJSONObject(i);
+                            String sellerName = jsonObject1.getString("invoiceCode");
+                            writer.write(sellerName);
+                            writer.newLine();
+                        }
+
+                        System.out.println("数据已成功写入txt文件!");
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+
+
+                    //  demo.runMainService(appKey,appSecret,num);
 
 
                 } catch (Exception e) {
 
-                    System.out.println("无法解析:" + str);
+                    //   System.out.println("无法解析:" + str);
                 }
             }
             lr.close();
@@ -251,4 +271,18 @@ public class QueryDemo_3rd2 {
         return builder.toString();
     }
 
+
+    public static void writeToFile(String filePath, String content) throws IOException {
+        FileWriter writer = new FileWriter(filePath);
+
+        try (BufferedWriter bufferedWriter = new BufferedWriter(writer)) {
+            bufferedWriter.write(content);
+        } catch (IOException e) {
+            throw e; // 可根据需要进行处理或重新抛出异常
+        } finally {
+            if (writer != null) {
+                writer.close();
+            }
+        }
+    }
 }

+ 253 - 0
src/main/java/com/jkcredit/invoice/util/QueryDemo_3rd4.java

@@ -0,0 +1,253 @@
+package com.jkcredit.invoice.util;
+
+import net.sf.json.JSONObject;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.NameValuePair;
+import org.apache.commons.httpclient.methods.PostMethod;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class QueryDemo_3rd4 {
+
+    /**
+     * 测试地址
+     */
+    private static final String URL = "http://etc.jkcredit.com:9999/api/rest";
+    //  private static final String URL = "http://127.0.0.1:18081/api/rest";
+
+    /**
+     * 分配的appKey
+     */
+    //  private static final String appKey = "yqxd";
+
+    static String filename = "/Users/mashengyi/Downloads/";
+    static String logname = "cc.txt";
+
+    /**
+     * 方法入口
+     *
+     * @param args
+     */
+
+    public static void main(String args[]) throws Exception {
+
+        QueryDemo_3rd4 demo = new QueryDemo_3rd4();
+
+
+        int count = 0;
+        int total = 0;
+
+        HashMap hashMap = new HashMap();
+
+        try {
+            File file = new File(filename + logname);
+            FileInputStream fis = new FileInputStream(file);
+            InputStreamReader isr = new InputStreamReader(fis, "UTF-8");
+            LineNumberReader lr = new LineNumberReader(isr, 512);
+            String laststr = "";
+            int count_d = 0;
+            int total_d = 0;
+            while (true) {
+
+                String str = lr.readLine();
+
+                try {
+                    if (str == null)
+                        break;
+
+                    String appKey = "yqxd";
+                    String appSecret = "01C01EF10B715233D90AC3B5FB2363FD37C6CF5D";
+                    String num = str.trim();
+
+                    demo.runMainService(appKey, appSecret, num);
+
+
+                } catch (Exception e) {
+
+                    System.out.println("无法解析:" + str);
+                }
+            }
+            lr.close();
+
+        } catch (FileNotFoundException e) {
+            System.out.println("FILENAME:" + filename);
+            System.out.println("File not found");
+        } catch (IOException e) {
+            System.out.println("IO error");
+        }
+
+        Iterator it = hashMap.keySet().iterator();
+
+        while (it.hasNext()) {
+
+            String key = (String) it.next();
+            Integer ttttttt = (Integer) hashMap.get(key);
+
+            System.out.println(key + "====" + ttttttt);
+        }
+
+    }
+
+    public static String getsrt(String startkeystr, String endstr, String str) {
+        int customerindex = str.indexOf(startkeystr);
+        String temp = str.substring(customerindex + startkeystr.length());
+        int endindex = temp.indexOf(endstr);
+        String sss = temp.substring(0, endindex);
+        return sss;
+    }
+
+    public static String getsrt1(String startkeystr, String str) {
+        int customerindex = str.indexOf(startkeystr);
+        String temp = str.substring(customerindex + startkeystr.length());
+        return temp;
+    }
+
+    /**
+     * 利用正则表达式判断字符串是否是数字
+     *
+     * @param str
+     * @return
+     */
+    public static boolean isNumeric(String str) {
+        Pattern pattern = Pattern.compile("[0-9]*");
+        Matcher isNum = pattern.matcher(str);
+        if (!isNum.matches()) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 调用主接口
+     */
+    public void runMainService(String appKey, String appSecret, String num) {
+        try {
+            /**
+             * 实名demo
+             */
+
+            JSONObject paramJsonObj = initParamJsonObj_Realname(appKey, appSecret, num);
+            String ret = postClient(URL, paramJsonObj);
+            System.out.println(ret);
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 整合参数(实名认证)
+     *
+     * @return
+     */
+    public JSONObject initParamJsonObj_Realname(String appKey, String appSecret, String num) {
+        /**
+         * 基本参数
+         */
+        JSONObject paramJsonObj = new JSONObject();
+        paramJsonObj.put("api", "WAY_BILL_NUM_FIND_OWNER_INVOICE");
+        paramJsonObj.put("appKey", appKey);
+        paramJsonObj.put("appSecret",
+                appSecret);
+
+
+        /**
+         * 业务参数
+         */
+        JSONObject dataJson = initMainServiceParamJsonObj_Realname(num);
+        paramJsonObj.put("data", dataJson);
+        return paramJsonObj;
+    }
+
+    /*
+     * 初始化业务参数(实名认证)
+     *
+     * 姓名,身份证,手机号
+     *
+     * @return
+     */
+    public JSONObject initMainServiceParamJsonObj_Realname(String num) {
+        /**
+         * 具体业务参数放在data中
+         */
+        JSONObject dataJson = new JSONObject();
+        dataJson.put("num", num);
+        return dataJson;
+    }
+
+    /**
+     * 实现http post请求 注意编码 UTF-8
+     *
+     * @param url
+     * @param paramObj
+     * @return
+     */
+    public String postClient(String url, JSONObject paramObj) {
+        String str = "";
+        HttpClient client = null;
+        PostMethod method = null;
+        try {
+            client = new HttpClient();
+            method = new PostMethod(url);
+            method.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
+            NameValuePair[] param = new NameValuePair[paramObj.size()];
+            Iterator<String> keys = paramObj.keys();
+            int i = 0;
+            while (keys.hasNext()) {
+                String key = (String) keys.next();
+                String value = paramObj.getString(key);
+                param[i] = new NameValuePair(key, value);
+                i++;
+            }
+            method.setRequestBody(param);
+            client.executeMethod(method);
+            str = convertStreamToString(method.getResponseBodyAsStream());
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (method != null) {
+                method.releaseConnection();
+            }
+        }
+        return str;
+    }
+
+    /**
+     * 流转字符串
+     *
+     * @param is
+     * @return
+     */
+    public static String convertStreamToString(InputStream is) {
+        BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+        StringBuilder builder = new StringBuilder();
+        String line = null;
+        try {
+            while ((line = reader.readLine()) != null) {
+                builder.append(line + "\n");
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                is.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return builder.toString();
+    }
+
+}

+ 3 - 3
src/main/java/com/jkcredit/invoice/util/QueryDemo_Test.java

@@ -21,16 +21,16 @@ import java.util.Iterator;
 public class QueryDemo_Test {
 
     /**
-     * 	测试地址
+     * 测试地址
      */
     //	private static final String URL = "http://110.88.150.74:80/credit?api=credit.sec.data";
     //private static final String URL = "http://110.88.150.74/credit?api=credit.sec.data";
     //	private static final String URL = "http://123.57.186.204/gateway?api=credit.sec.data";
     //private static final String URL = "http://123.57.186.204/gateway?api=credit.sec.data";
     //private static final String URL = "http://192.168.50.4:18080/gateway?api=credit.sec.data";//北京节点
-    //	private static final String URL = "http://jk.h11.site/gateway?api=credit.sec.data";
+    private static final String URL = "https://credit.h11.site/gateway?api=credit.sec.data";
     //	  private static final String URL = "http://127.0.0.1:18080/gateway?api=credit.sec.data";
-  		private static final String URL = "http://110.88.150.68:8000/gateway?api=credit.sec.data";
+    //	private static final String URL = "http://110.88.150.68:8000/gateway?api=credit.sec.data";
     //	private static final String URL = "http://110.88.150.72:8000/gateway?api=credit.sec.data_test";
     //	private static final String URL = "http://60.205.114.163:8000/gateway?api=credit.sec.data";
     //private static final String URL = " http://45.126.120.88/gateway?api=credit.sec.data_test";

+ 65 - 0
src/main/resources/mapper/customer/CustomerCompanyManagerMapper.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.jkcredit.invoice.mapper.waybill.NoCarCompanyMangerMapper">
+    <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.waybill.NoCarCompanyManger">
+        <result column="company_num" property="companyNum" jdbcType="VARCHAR"/>
+        <result column="operator_name" property="operatorName" jdbcType="VARCHAR"/>
+        <result column="operator_mobile" property="operatorMobile" jdbcType="VARCHAR"/>
+        <result column="identification_id" property="identificationId" jdbcType="VARCHAR"/>
+        <result column="operator_name_temp" property="operatorNameTemp" jdbcType="VARCHAR"/>
+        <result column="operator_mobile_temp" property="operatorMobileTemp" jdbcType="VARCHAR"/>
+        <result column="identification_id_temp" property="identificationIdTemp" jdbcType="VARCHAR"/>
+        <result column="contract_file_name" property="contractFileName" jdbcType="VARCHAR"/>
+        <result column="base64_str" property="base64Str" jdbcType="VARCHAR"/>
+        <result column="status" property="status" jdbcType="VARCHAR"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+    company_num, operator_name,operator_mobile, identification_id, operator_name_temp, operator_mobile_temp, identification_id_temp, contract_file_name, status,operator_evidence_contract_file_name
+  </sql>
+
+
+    <select id="selectAllCustomerCompanyManagerDetailPage" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from t_nocar_company_manger
+        <where>
+            <if test="noCarCompanyManger.companyNum != null and noCarCompanyManger.companyNum != ''">company_num =
+                #{noCarCompanyManger.companyNum}
+            </if>
+            <if test="noCarCompanyManger.operatorName != null and noCarCompanyManger.operatorName != ''">AND
+                operator_name = #{noCarCompanyManger.operatorName}
+            </if>
+            <if test="noCarCompanyManger.operatorMobile != null and noCarCompanyManger.operatorMobile != ''">AND
+                operator_mobile = #{noCarCompanyManger.operatorMobile}
+            </if>
+            <if test="noCarCompanyManger.identificationId != null and noCarCompanyManger.identificationId != ''">AND
+                identification_id = #{noCarCompanyManger.identificationId}
+            </if>
+            <if test="noCarCompanyManger.operatorNameTemp != null and noCarCompanyManger.operatorNameTemp != ''">AND
+                operator_name_temp = #{noCarCompanyManger.operatorNameTemp}
+            </if>
+            <if test="noCarCompanyManger.operatorMobileTemp != null and noCarCompanyManger.operatorMobileTemp != ''">AND
+                operator_mobile_temp = #{noCarCompanyManger.operatorMobileTemp}
+            </if>
+            <if test="noCarCompanyManger.identificationIdTemp != null and noCarCompanyManger.identificationIdTemp != ''">
+                AND identification_id_temp = #{noCarCompanyManger.identificationIdTemp}
+            </if>
+            <if test="noCarCompanyManger.contractFileName != null and noCarCompanyManger.contractFileName != ''">AND
+                contract_file_name = #{noCarCompanyManger.contractFileName}
+            </if>
+            <if test="noCarCompanyManger.status != null and noCarCompanyManger.status != ''">AND status =
+                #{noCarCompanyManger.status}
+            </if>
+            <if test="noCarCompanyManger.operatorEvidenceContractFileName != null and noCarCompanyManger.operatorEvidenceContractFileName != ''">
+                AND operator_evidence_contract_file_name = #{noCarCompanyManger.operatorEvidenceContractFileName}
+            </if>
+        </where>
+    </select>
+    <select id="selectBycompanyNumAndOr" resultMap="BaseResultMap"
+            parameterType="com.jkcredit.invoice.model.entity.waybill.NoCarCompanyManger">
+        select
+        <include refid="Base_Column_List"/>
+        from t_nocar_company_manger
+        where company_num = #{companyNum,jdbcType=VARCHAR}
+    </select>
+</mapper>

+ 16 - 12
src/main/resources/mapper/customer/CustomerRecMapper.xml

@@ -283,21 +283,29 @@
 
     <select id="selectByCompanyNum" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
         select
-        <include refid="Base_Column_List" />
-        from t_customer_rec
-        where  company_num =  #{companyNum,jdbcType=VARCHAR} and rec_status =1
+      <include refid="Base_Column_List"/>
+      from t_customer_rec
+      where company_num = #{companyNum,jdbcType=VARCHAR} and rec_status =1
     </select>
-  <select id="selectByCompanyName" resultMap="BaseResultMap" parameterType="java.lang.String" >
+  <select id="selectByCompanyName" resultMap="BaseResultMap" parameterType="java.lang.String">
     select
-    <include refid="Base_Column_List" />
+    <include refid="Base_Column_List"/>
+    from t_customer_rec
+    where company_name = #{companyName,jdbcType=VARCHAR} and rec_status =1
+  </select>
+  <select id="selectAllCustomeRecQueryList"
+          resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"/>
     from t_customer_rec
-    where  company_name =  #{companyName,jdbcType=VARCHAR} and rec_status =1
+    where rec_status =1
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from t_customer_rec
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
+  <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec">
     insert into t_customer_rec (customerName,company_leader, company_leader_Phone,
       company_name, company_referenceNum, company_openbank, 
       company_openbank_acc, company_adress, company_phone, 
@@ -513,10 +521,6 @@
 
 
 
-
-
-
-
   <update id="updateContractStatus" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
     update t_customer_rec
     <set>