1

ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java

@@ -391,7 +391,7 @@ public class InstructionServiceImpl implements IInstructionService {
                 address.append(phone);
                 System.out.println(address);
                 for (int i = 4; i < parts.length; i++) {
-                    address.append(parts[i]);
+                    address.append(parts[i]);F
                 }
                 String jf = productWithJF.get(modelNumber);
 

ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml

@@ -121,6 +121,8 @@
             <if test="itemId != null  and itemId != ''"> and item_id = #{itemId}</if>
             <if test="callerItemId != null  and callerItemId != ''"> and caller_item_id = #{callerItemId}</if>
             <if test="orderTag != null  and orderTag != ''"> and order_tag = #{orderTag}</if>
+            <if test="params.beginTime != null"> and order_time &gt;= #{params.beginTime}</if>
+            <if test="params.endTime != null"> and order_time &lt;= #{params.endTime}</if>
         </where>
         order by order_time desc
     </select>