20211026后端更新代码

src/main/java/com/jkcredit/invoice/controller/localBussiness/CustomerController.java

@@ -79,6 +79,22 @@ public class CustomerController {
 
         return new RespR(customerRechargeService.findAllCustomerRecharge(page, customerRecharge));
     }
+
+
+
+    /**
+     * 分页查询客户
+     *
+     * @param page    参数集
+     * @return 用户集合
+     */
+    @PostMapping("/findCustomerRechargeMoney")
+    @ApiOperation(value="分页查询客户端客户充值信息", notes="分页查询客户端客户充值信息")
+    @LoginRequired
+    public RespR findCustomerRechargeMoney(Page page, CustomerRecharge customerRecharge) {
+
+        return new RespR(customerRechargeService.findAllCustomerRechargeMoney(page, customerRecharge));
+    }
     /**
      * 导出客户信息
      * @param

src/main/java/com/jkcredit/invoice/controller/localBussiness/NoCarController.java

@@ -100,6 +100,22 @@ public class NoCarController {
             noCarWayBill.setEndBegin(null);
         }
     }
+
+
+    public void setTimeDue2(NoCarWayBill noCarWayBill){
+        if("null".equals(noCarWayBill.getStartBegin())){
+            noCarWayBill.setStartBegin(null);
+        }
+        if("null".equals(noCarWayBill.getStartEnd())){
+            noCarWayBill.setStartEnd(null);
+        }
+        if("null".equals(noCarWayBill.getEndBegin())){
+            noCarWayBill.setEndBegin(null);
+        }
+        if("null".equals(noCarWayBill.getEndEnd())){
+            noCarWayBill.setEndEnd(null);
+        }
+    }
     /**
      * 分页查询运单信息
      *
@@ -119,6 +135,27 @@ public class NoCarController {
             return new RespR(false,e.getMessage());
         }
     }
+
+
+    /**
+     * 分页查询客户运单信息
+     *
+     * @param page    参数集
+     * @return 用户集合
+     */
+    @PostMapping("/findBillWayCust")
+    @ApiOperation(value="分页查询无车运单信息", notes="分页查询无车运单信息")
+    @LoginRequired
+    public RespR findBillWayCust(Page page, NoCarWayBill noCarWayBill) {
+        try {
+            setTimeDue2(noCarWayBill);
+            RespR respR = new RespR(noCarBillWayService.findByPageAndWayBill(page, noCarWayBill));
+            return respR;
+        }catch (Exception e){
+            e.printStackTrace();
+            return new RespR(false,e.getMessage());
+        }
+    }
     /**
      * 分页查询运单信息
      *
@@ -460,6 +497,7 @@ public class NoCarController {
             }else if("2".equals(fileName)){
                 fileName = "运单结束模板.xlsx";
             }else if("3".equals(fileName)){
+                fileName = "历史运单模板.xlsx";
             }else if("4".equals(fileName)){
                 fileName = "无车发票查询模板.xlsx";
             }else if("5".equals(fileName)){

src/main/java/com/jkcredit/invoice/credit/SimpleCORSFilter.java

@@ -100,6 +100,7 @@ public class SimpleCORSFilter implements Filter {
             "/v2/api-docs",
             "/customer/findCustomer",
             "/customer/findCustomerRecharge",
+            "/customer/findCustomerRechargeMoney",
             "/customer/findCustomerRecList",
             "/customer/findCustomerRecListExport",
             "/customer/addCustomer",
@@ -119,6 +120,7 @@ public class SimpleCORSFilter implements Filter {
 
             "/noCar/findCarRec",
             "/noCar/findBillWay",
+            "/noCar/findBillWayCust",
             "/noCar/findImportBillWay",
             "/noCar/updateStatus",
             "/noCar/findBatchList",

src/main/java/com/jkcredit/invoice/mapper/customer/CustomerRechargeMapper.java

@@ -14,6 +14,8 @@ public interface CustomerRechargeMapper extends BaseMapper<CustomerRecharge> {
 
     IPage<List<CustomerRecharge>> selectAllByPage(Page page, @Param("customerRecharge") CustomerRecharge customer);
 
+    IPage<List<CustomerRecharge>> selectAllByPageMoney(Page page, @Param("customerRecharge") CustomerRecharge customer);
+
     int deleteByPrimaryKey(Integer id);
 
     int insert(CustomerRecharge record);

src/main/java/com/jkcredit/invoice/service/customer/CustomerRechargeService.java

@@ -13,4 +13,5 @@ public interface CustomerRechargeService {
      */
     IPage findAllCustomerRecharge(Page page, CustomerRecharge customerRecharge);
 
+    IPage findAllCustomerRechargeMoney(Page page, CustomerRecharge customerRecharge);
 }

src/main/java/com/jkcredit/invoice/service/customer/impl/CustomerRechargeServiceImpl.java

@@ -17,4 +17,11 @@ public class CustomerRechargeServiceImpl extends ServiceImpl<CustomerRechargeMap
     public IPage findAllCustomerRecharge(Page page, CustomerRecharge customerRecharge) {
         return customerRechargeMapper.selectAllByPage(page,customerRecharge);
     }
+
+
+
+    @Override
+    public IPage findAllCustomerRechargeMoney(Page page, CustomerRecharge customerRecharge) {
+        return customerRechargeMapper.selectAllByPageMoney(page,customerRecharge);
+    }
 }

src/main/resources/mapper/customer/CustomerRecMapper.xml

@@ -52,7 +52,7 @@
       and company_referenceNum = #{customerRec.companyReferencenum}
     </if>
     <if test="customerRec.companyName != null and customerRec.companyName != ''">
-      and company_name = #{customerRec.companyName}
+      and company_name LIKE CONCAT('%',#{customerRec.companyName},'%')
     </if>
       <if test="customerRec.companyBelongName != null and customerRec.companyBelongName != ''">
         and company_belong_name  LIKE CONCAT('%',#{customerRec.companyBelongName},'%')

src/main/resources/mapper/customer/CustomerRechargeMapper.xml

@@ -29,6 +29,29 @@
     </where>
     order by recharge_time desc
   </select>
+
+
+  <select id="selectAllByPageMoney" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from t_customer_recharge
+    <where>
+      1 = 1
+      <if test="customerRecharge.customerName != null and customerRecharge.customerName != ''">
+        and customer_name LIKE CONCAT('%',#{customerRecharge.customerName},'%')
+      </if>
+      <if test="customerRecharge.companyName != null and customerRecharge.companyName != ''">
+        and companyName LIKE CONCAT('%',#{customerRecharge.companyName},'%')
+      </if>
+      <if test="customerRecharge.rechargeMony != null and customerRecharge.rechargeMony != ''">
+        and recharge_mony = #{rechargeMony,jdbcType=DOUBLE}
+      </if>
+      and  recharge_mony <![CDATA[ > ]]> 0
+    </where>
+    order by recharge_time desc
+  </select>
+
+
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />

src/main/resources/mapper/waybill/NoCarWaybillMapper.xml

@@ -82,6 +82,9 @@
             <if test="noCarWayBill.batchNum != null and noCarWayBill.batchNum != ''">
                 and batchNumber = #{noCarWayBill.batchNum}
             </if>
+            <if test="noCarWayBill.plateNum != null and noCarWayBill.plateNum != ''">
+                and plateNum = #{noCarWayBill.plateNum}
+            </if>
             <if test="noCarWayBill.batchNumEnd != null and noCarWayBill.batchNumEnd != ''">
                 and batchNumEnd = #{noCarWayBill.batchNumEnd}
             </if>