Excel导入查询快递，增加客服人员，送货客户

box-bps/src/main/java/com/ruoyi/bps/domain/ExpressInfo.java

@@ -22,11 +22,18 @@ public class ExpressInfo extends BaseEntity
     @Excel(name = "消息",type= Excel.Type.EXPORT)
     private String message;
 
-
     /** 出货单号 */
     @Excel(name = "出货单号")
     private String deliveryNum;
 
+    /** 送货客户*/
+    @Excel(name = "送货客户")
+    private String customer;
+
+    /** 客服人员*/
+    @Excel(name = "客服人员")
+    private String csName;
+
     /** 快递单号 */
     @Excel(name = "快递单号")
     private String nu;
@@ -97,6 +104,7 @@ public class ExpressInfo extends BaseEntity
     /** 查询类型*/
     private String queryType;
 
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -269,6 +277,22 @@ public class ExpressInfo extends BaseEntity
         this.queryType = queryType;
     }
 
+    public String getCsName() {
+        return csName;
+    }
+
+    public void setCsName(String csName) {
+        this.csName = csName;
+    }
+
+    public String getCustomer() {
+        return customer;
+    }
+
+    public void setCustomer(String customer) {
+        this.customer = customer;
+    }
+
     @Override
     public String toString() {
         return "ExpressInfo{" +
@@ -293,6 +317,8 @@ public class ExpressInfo extends BaseEntity
                 ", queryUserName='" + queryUserName + '\'' +
                 ", queryId='" + queryId + '\'' +
                 ", queryType='" + queryType + '\'' +
+                ", csName='" + csName + '\'' +
+                ", customer='" + customer + '\'' +
                 '}';
     }
 }

box-bps/src/main/java/com/ruoyi/bps/service/impl/ExpImportQueryServiceImpl.java

@@ -140,6 +140,8 @@ public class ExpImportQueryServiceImpl implements IExpImportQueryService
                 ei.setQueryUserName(ShiroUtils.getSysUser().getUserName());
                 ei.setQueryType("excel");
                 ei.setQueryTime(queryTime);
+                ei.setCustomer(expressInfo.getCustomer());  //送货客户
+                ei.setCsName(expressInfo.getCsName());      //客服人员
                 //expressInfoService.insertExpressInfo(ei);
                 expressInfoListForInsert.add(ei);
                /* for(int i=1;i<1001;i++){ //测试批量插入效率用时打开Mark，产生5万条数据。

box-bps/src/main/resources/mapper/bps/ExpressInfoMapper.xml

@@ -26,12 +26,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="queryId"    column="queryId"    />
         <result property="queryType"    column="queryType"    />
         <result property="deliveryNum"    column="deliveryNum"    />
+        <result property="csName"    column="csName"    />
+        <result property="customer"    column="customer"    />
 
     </resultMap>
 
     <sql id="selectExpressInfoVo">
         select sid, message, nu, deliveryNum, ischeck, com, status, `data`, `state`, `condition`, routeInfo, returnCode, `result`, phone,
-               collectTime, singedTime, lastUpdateTime, queryTime, queryUserName, queryId, queryType
+               collectTime, singedTime, lastUpdateTime, queryTime, queryUserName, queryId, queryType, csName, customer
         from expressInfo
     </sql>
 
@@ -43,6 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
             <if test="queryId != null  and queryId != ''"> and queryId = #{queryId}</if>
             <if test="deliveryNum != null  and deliveryNum != ''"> and deliveryNum = #{deliveryNum}</if>
+            <if test="csName != null  and csName != ''"> and csName = #{csName}</if>
+            <if test="customer != null  and customer != ''"> and customer = #{customer}</if>
         </where>
     </select>
     
@@ -74,6 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="queryId != null">queryId,</if>
             <if test="queryType != null">queryType,</if>
             <if test="deliveryNum != null">deliveryNum,</if>
+            <if test="csName != null">csName,</if>
+            <if test="customer != null">customer,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="message != null">#{message},</if>
@@ -96,6 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="queryId != null">#{queryId},</if>
             <if test="queryType != null">#{queryType},</if>
             <if test="deliveryNum != null">#{deliveryNum},</if>
+            <if test="csName != null">#{csName},</if>
+            <if test="customer != null">#{customer},</if>
          </trim>
     </insert>
 
@@ -121,6 +129,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="queryId != null">queryId = #{queryId},</if>
             <if test="queryType != null">queryType = #{queryType},</if>
             <if test="deliveryNum != null">deliveryNum = #{deliveryNum},</if>
+            <if test="csName != null">csName = #{csName},</if>
+            <if test="customer != null">customer = #{customer},</if>
         </trim>
         where message = #{message}
     </update>
@@ -138,12 +148,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="batchInsertExpressInfo">
         insert into expressInfo(message, nu, deliveryNum, ischeck, com, status, `data`, `state`, `condition`, routeInfo, returnCode, `result`, phone,
-        collectTime, singedTime, lastUpdateTime, queryTime, queryUserName, queryId, queryType) values
+        collectTime, singedTime, lastUpdateTime, queryTime, queryUserName, queryId, queryType, csName, customer) values
         <foreach item="expressInfo" index="index" collection="list" separator=",">
             ( #{expressInfo.message}, #{expressInfo.nu}, #{expressInfo.deliveryNum}, #{expressInfo.ischeck}, #{expressInfo.com}, #{expressInfo.status},
              #{expressInfo.data}, #{expressInfo.state}, #{expressInfo.condition}, #{expressInfo.routeInfo}, #{expressInfo.returnCode},
              #{expressInfo.result}, #{expressInfo.phone}, #{expressInfo.collectTime}, #{expressInfo.singedTime}, #{expressInfo.lastUpdateTime},
-             #{expressInfo.queryTime}, #{expressInfo.queryUserName}, #{expressInfo.queryId}, #{expressInfo.queryType}
+             #{expressInfo.queryTime}, #{expressInfo.queryUserName}, #{expressInfo.queryId}, #{expressInfo.queryType}, #{expressInfo.csName}, #{expressInfo.customer}
             )
         </foreach>
     </insert>

box-bps/src/main/resources/templates/bps/expImportQuery/detail.html

@@ -55,6 +55,14 @@
                     field: 'deliveryNum',
                     title: '出货单号'
                 },
+                {
+                    field: 'customer',
+                    title: '送货客户'
+                },
+                {
+                    field: 'csName',
+                    title: '客服人员'
+                },
                 {
                     field: 'nu',
                     title: '快递单号'