后端代码提交

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

@@ -20,6 +20,7 @@ public interface CustomerRecMapper extends BaseMapper<CustomerRec> {
     CustomerRec selectByPrimaryKey(String id);
     CustomerRec selectByPrimaryKeyHasBase64(Integer id);
     List<CustomerRec> selectByCustomerName(String customerName);
+    List<CustomerRec> selectByCustomerNameAll(String customerName);
 
     CustomerRec selectByCustomerNameAndCompany(CustomerRec record);
     CustomerRec selectByCustomerNameAndCompanyConcat(CustomerRec record);

src/main/java/com/jkcredit/invoice/service/lowerService/impl/CustomerLowerServiceImpl.java

@@ -118,20 +118,21 @@ public class CustomerLowerServiceImpl implements CustomeLowerService {
 
     @Override
     public RespR customeRecQueryList(CustomerRec customerRec) {
-        List<CustomerRec> customerRecs = customerRecMapper.selectByCustomerName(customerRec.getCustomerName());
+       /* List<CustomerRec> customerRecs = customerRecMapper.selectByCustomerNameAll(customerRec.getCustomerName());
         if(customerRec.getBussinessType()!=null){
             List<CustomerRec> customerRecsN = new ArrayList<>();
             if(customerRecs!=null && customerRecs.size()>0){
                 customerRecs.forEach(customerRec1 -> {
                     if(customerRec.getBussinessType().equals(customerRec1.getBussinessType())){
+                        if(customerRec1.getRecStatus() == 1)
                         customerRecsN.add(customerRec1);
                     }
                 });
             }
-            return new RespR(customerRecsN);
-        }
+            return new RespR(customerRecsN); TODO
+        }*/
 
-        return new RespR(customerRecMapper.selectByCustomerName(customerRec.getCustomerName()));
+        return new RespR(customerRecMapper.selectByCustomerNameAll(customerRec.getCustomerName()));
     }
     @Override
     public RespR customeRecQuery(CustomerRec customerRec) {

src/main/resources/mapper/calculateInfor/NoCarCalculateInforMapper.xml

@@ -57,6 +57,8 @@
                 and calculateTime BETWEEN #{calculateInfor.calculateStart} and #{calculateInfor.calculateEnd}
             </if>
         </where>
+
+           ORDER BY id desc
     </select>
     <resultMap id="staticResultMap" type="java.util.Map">
         <result column="customId" property="customId"/>

src/main/resources/mapper/calculateInfor/SefCarCalculateInforMapper.xml

@@ -52,6 +52,7 @@
         <if test="calculateInfor.calTime != null and calculateInfor.calTime != ''">
             and calTime BETWEEN #{calculateInfor.calTimeStart} and #{calculateInfor.calTimeEnd}
         </if>
+        order by id DESC
     </select>
     <select id="selectByEtcAndTime" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor">
         select

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

@@ -34,7 +34,7 @@
         customer_name = #{query.customerName,jdbcType=VARCHAR}
       </if>
       <if test="query.carNum != null and query.carNum != ''">
-        and car_num = #{query.carNum}
+        and BINARY car_num = #{query.carNum}
       </if>
       <if test="query.companyName != null and query.companyName != ''">
         and company_name LIKE CONCAT('%',#{query.companyName},'%')
@@ -58,6 +58,7 @@
         )
       </if>
     </where>
+    ORDER BY succ_time||fail_time DESC
   </select>
   <select id="selectByCustName" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
@@ -69,19 +70,19 @@
     select
     <include refid="Base_Column_List" />
     from t_customer_carRec
-    where car_num = #{customerName,jdbcType=VARCHAR} and bussiness_type=2
+    where BINARY car_num = #{carNum,jdbcType=VARCHAR} and bussiness_type=2
   </select>
   <select id="selectBySelfCarNum" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from t_customer_carRec
-    where car_num = #{customerName,jdbcType=VARCHAR} and bussiness_type=0 and rec_status = 1
+    where BINARY car_num = #{carNum,jdbcType=VARCHAR} and bussiness_type=0 and rec_status = 1
   </select>
   <select id="selectAllEtcBySelfCarNum" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from t_customer_carRec
-    where car_num = #{customerName,jdbcType=VARCHAR} and bussiness_type=0
+    where BINARY car_num = #{carNum,jdbcType=VARCHAR} and bussiness_type=0
   </select>
   <select id="selectByETC" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
@@ -194,7 +195,7 @@
         company_name = #{companyName,jdbcType=VARCHAR},
       </if>
       <if test="carNum != null">
-        car_num = #{carNum,jdbcType=VARCHAR},
+         car_num = #{carNum,jdbcType=VARCHAR},
       </if>
       <if test="carColor != null">
         car_color = #{carColor,jdbcType=VARCHAR},
@@ -221,7 +222,7 @@
         inter_type = #{interType,jdbcType=INTEGER}
       </if>
     </set>
-    where car_num = #{carNum,jdbcType=VARCHAR}  and bussiness_type=2
+    where BINARY car_num = #{carNum,jdbcType=VARCHAR}  and bussiness_type=2
   </update>
   <update id="updateETCByPrimaryKeySelective" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerCarRec">
     update t_customer_carRec
@@ -230,7 +231,7 @@
         company_name = #{companyName,jdbcType=VARCHAR},
       </if>
       <if test="carNum != null">
-        car_num = #{carNum,jdbcType=VARCHAR},
+        BINARY car_num = #{carNum,jdbcType=VARCHAR},
       </if>
       <if test="carColor != null">
         car_color = #{carColor,jdbcType=VARCHAR},
@@ -273,7 +274,7 @@
       rec_status = #{recStatus,jdbcType=INTEGER},
       fail_reason = #{failReason,jdbcType=VARCHAR},
       inter_type = #{interType,jdbcType=INTEGER}
-    where car_num = #{carNum,jdbcType=VARCHAR}  and bussiness_type=2
+    where BINARY car_num = #{carNum,jdbcType=VARCHAR}  and bussiness_type=2
   </update>
 
   <update id="updateETCByPrimaryKey" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerCarRec">

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

@@ -61,6 +61,7 @@
         and service_endTime BETWEEN #{customerRec.serviceEndTimeStart} and #{customerRec.serviceEndTimeEnd}
       </if>
     </where>
+      order by id DESC
   </select>
   <select id="selectAllByPageExport" resultMap="BaseResultMap">
     select
@@ -97,6 +98,12 @@
     from t_customer_rec
     where customerName = #{customerName,jdbcType=VARCHAR} and rec_status =1
   </select>
+    <select id="selectByCustomerNameAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        <include refid="Base_Column_List" />
+        from t_customer_rec
+        where customerName = #{customerName,jdbcType=VARCHAR}
+    </select>
     <select id="selectByCustomerNameAndCompany" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
         select
         <include refid="Base_Column_List" />

src/main/resources/mapper/invoice/BillInvoiceMapper.xml

@@ -103,6 +103,7 @@
 
             </if>
         </where>
+        order by id DESC
     </select>
 
 

src/main/resources/mapper/invoice/SelfCarApplMapper.xml

@@ -30,7 +30,7 @@
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
         <include refid="baseSql" />
-        from t_SelfCarAppl
+        from t_SelfCarAppl ORDER by id desc;
     </select>
     <select id="selectAllNoRec" resultMap="BaseResultMap">
         select

src/main/resources/mapper/invoice/SelfCarInvoiceMapper.xml

@@ -85,6 +85,7 @@
                 and invoiceMakeTime BETWEEN #{selfCarInvoice.invoiceMakeStart} and #{selfCarInvoice.invoiceMakeEnd}
             </if>
         </where>
+        order by id desc
     </select>
     <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice" >
         insert into t_SelfCarInvoice (

src/main/resources/mapper/user/UserMapper.xml

@@ -44,6 +44,7 @@
             <include refid="userSql" />
         FROM
             t_user
+        ORDER by id desc
     </select>
 
     <select id="getUserById" resultMap="baseResultMap">

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

@@ -89,7 +89,7 @@
             <if test="noCarWayBill.success == 2">
                 and billwayStatus in(-1,-2,-3)
             </if>
-        </where>
+        </where>  ORDER by id desc
     </select>
     <select id="selectAllByPageException" resultMap="BaseResultMap">
         select

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

@@ -95,6 +95,7 @@
                 and billwayStatus in(-1,-2,-3)
             </if>
         </where>
+        order by id desc
     </select>
     <select id="selectAllByPageException" resultMap="BaseResultMap">
         select

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

@@ -62,6 +62,8 @@
                 and  now()>date_add(aclTime,interval 10 day) and (status=2 or status =1)
             </if>
         </where>
+
+        order by id desc
     </select>
     <select id="selectByTradeId" resultMap="BaseResultMap" parameterType="java.lang.String">
         select