上传新jar

src/main/java/com/jkcredit/invoice/mapper/waybill/NoCarWaybillMapper.java

@@ -54,7 +54,7 @@ public interface NoCarWaybillMapper extends BaseMapper<NoCarWayBill> {
      * @return
      */
     int updateByBillNum(NoCarWayBill record);
-
+    int updateByBillNumEnd(NoCarWayBill record);
     /**
      * 根据运单号更新运单是否失败信息
      * @param record

src/main/java/com/jkcredit/invoice/service/lowerservice/impl/NoCarServiceImpl.java

@@ -502,7 +502,7 @@ public class NoCarServiceImpl implements NoCarService {
             if (curr.getBillwayStatus() > 1) {
                 return;
             }
-            noCarWaybillMapper.updateByBillNum(noCarWayBill);
+            noCarWaybillMapper.updateByBillNumEnd(noCarWayBill);
         }
     }
 

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

@@ -25,12 +25,13 @@
         <include refid="Base_Column_List"/>
         from t_nocar_company_manger
         <where>
-            <if test="noCarCompanyManger.companyNum != null and noCarCompanyManger.companyNum != ''">company_num =
-                #{noCarCompanyManger.companyNum}
+            <if test="noCarCompanyManger.companyNum != null and noCarCompanyManger.companyNum != ''">
+               and company_num =#{noCarCompanyManger.companyNum}
             </if>
-            <if test="noCarCompanyManger.custId != null and noCarCompanyManger.custId != ''">cust_id =
-                #{noCarCompanyManger.custId}
+            <if test="noCarCompanyManger.companyName != null and noCarCompanyManger.companyName != ''"> AND
+                 company_name LIKE BINARY CONCAT('%',#{noCarCompanyManger.companyName},'%')
             </if>
+
             <if test="noCarCompanyManger.operatorName != null and noCarCompanyManger.operatorName != ''">AND
                 operator_name = #{noCarCompanyManger.operatorName}
             </if>

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

@@ -218,6 +218,36 @@
         splitFlag = #{splitFlag,jdbcType=INTEGER}
         where  billNum = BINARY #{billNum,jdbcType=VARCHAR} and billwayStatus <= #{billwayStatus,jdbcType=INTEGER}
     </update>
+    <update id="updateByBillNumEnd" parameterType="com.jkcredit.invoice.model.entity.waybill.NoCarWayBill" >
+        update t_waybill_no
+        set customerName = #{customerName,jdbcType=VARCHAR},
+        companyName = #{companyName,jdbcType=VARCHAR},
+        billNum = #{billNum,jdbcType=VARCHAR},
+        plateNum = #{plateNum,jdbcType=VARCHAR},
+        plateColor = #{plateColor,jdbcType=VARCHAR},
+        startTime = #{startTime,jdbcType=VARCHAR},
+        sourceAddr = #{sourceAddr,jdbcType=VARCHAR},
+        destAddr = #{destAddr,jdbcType=VARCHAR},
+        predictEndTime = #{predictEndTime,jdbcType=VARCHAR},
+        fee = #{fee,jdbcType=INTEGER},
+        titleType = #{titleType,jdbcType=INTEGER},
+        taxplayerCode = #{taxplayerCode,jdbcType=VARCHAR},
+        intfaceStartTime = #{intfaceStartTime,jdbcType=VARCHAR},
+        interfaceEndTime = #{interfaceEndTime,jdbcType=VARCHAR},
+        billwayStatus = #{billwayStatus,jdbcType=INTEGER},
+        hisFlag = #{hisFlag,jdbcType=INTEGER},
+        companyAdress = #{companyAdress,jdbcType=VARCHAR},
+        companyBank = #{companyBank,jdbcType=VARCHAR},
+        companyBankAcc = #{companyBankAcc,jdbcType=VARCHAR},
+        companyTel = #{companyTel,jdbcType=VARCHAR},
+        companyNum = #{companyNum,jdbcType=VARCHAR},
+        failReason = #{failReason,jdbcType=VARCHAR},
+        interType = #{interType,jdbcType=INTEGER},
+        destAddrPre = #{destAddrPre,jdbcType=VARCHAR},
+        preEndTime = #{preEndTime,jdbcType=VARCHAR},
+        splitFlag = #{splitFlag,jdbcType=INTEGER}
+        where  billNum = BINARY #{billNum,jdbcType=VARCHAR}
+    </update>
     <update id="updateByBillNumTimeRes" parameterType="com.jkcredit.invoice.model.entity.waybill.NoCarWayBill" >
         update t_waybill_no
         set interfaceEndTime = #{interfaceEndTime,jdbcType=VARCHAR},