1.订单自提实体扩充

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/EsignController.java

@@ -190,6 +190,11 @@ public class EsignController extends ApiBaseController {
     public Object dealerSignDriver() {
 
         ParameterObject obj = getParameterObject();
+        Calendar now = Calendar.getInstance();
+        //获取当前时间的年
+        int nowYear = now.get(Calendar.YEAR);
+        int nowMonth=now.get(Calendar.MONTH);
+        int nowDay=now.get(Calendar.DATE);
         obj.checkParameterNotNull("orderId,entrustName,beentrustName,bId,carNumber,deliveryNumber,year,month,day,redirectUrl");
         String orderId = obj.getString("orderId");
         String userId = obj.getString("userId");
@@ -199,16 +204,16 @@ public class EsignController extends ApiBaseController {
         String bId = obj.getString("bId");
         String carNumber = obj.getString("carNumber");
         String deliveryNumber = obj.getString("deliveryNumber");
-        String year = obj.getString("year");
-        String month = obj.getString("month");
-        String day = obj.getString("day");
+        String year = String.valueOf(nowYear);
+        String month = String.valueOf(nowMonth);
+        String day = String.valueOf(nowDay);
         String redirectUrl = obj.getString("redirectUrl");
         logger.info("签署完成跳转地址：{}",redirectUrl);
 
 
         String businessScene = "司机授权";
         //String fileName = orderId+"_签收订单.pdf";
-        String fileName = deliveryNumber+"_司机授权.pdf";
+        String fileName = deliveryNumber+"_签收订单.pdf";
         /*根据userId查询个人注册后accountId*/
         String signerAccountId = "";
         try {
@@ -243,6 +248,13 @@ public class EsignController extends ApiBaseController {
             orderFile.setSignerId(signerAccountId);
             orderFile.setSignerName(sysUser.getUserName());
             orderFile.setFlowId(flowId);
+            orderFile.setBeentrustName(beentrustName);
+            orderFile.setCarNumber(carNumber);
+            orderFile.setbId(bId);
+            orderFile.setEntrustName(entrustName);
+            orderFile.setDay(day);
+            orderFile.setMonth(month);
+            orderFile.setYear(year);
             orderFileService.insertOrderFile(orderFile);
             logger.info("保存签署订单附件");
             try{

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/domain/OrderFile.java

@@ -74,7 +74,92 @@ public class OrderFile extends BaseEntity
     @Excel(name = "是否删除")
     private String isDelete;
 
-    public void setOrderId(String orderId) 
+    /** 委托人 */
+    @Excel(name = "委托人")
+    private String entrustName;
+
+    /** 受托人 */
+    @Excel(name = "受托人")
+    private String beentrustName;
+
+    /** 身份证 */
+    @Excel(name = "身份证")
+    private String bId;
+
+    /** 车牌号 */
+    @Excel(name = "车牌号")
+    private String carNumber;
+
+    /** 年 */
+    @Excel(name = "年")
+    private String year;
+
+    /** 月 */
+    @Excel(name = "月")
+    private String month;
+
+    /** 日 */
+    @Excel(name = "日")
+    private String day;
+
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public String getMonth() {
+        return month;
+    }
+
+    public void setMonth(String month) {
+        this.month = month;
+    }
+
+    public String getDay() {
+        return day;
+    }
+
+    public void setDay(String day) {
+        this.day = day;
+    }
+
+    public String getEntrustName() {
+        return entrustName;
+    }
+
+    public void setEntrustName(String entrustName) {
+        this.entrustName = entrustName;
+    }
+
+    public String getBeentrustName() {
+        return beentrustName;
+    }
+
+    public void setBeentrustName(String beentrustName) {
+        this.beentrustName = beentrustName;
+    }
+
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
+
+    public String getCarNumber() {
+        return carNumber;
+    }
+
+    public void setCarNumber(String carNumber) {
+        this.carNumber = carNumber;
+    }
+
+    public void setOrderId(String orderId)
     {
         this.orderId = orderId;
     }

suishenbang-wxportal/suishenbang-wxportal-common/src/main/resources/mapper/wxportal/OrderFileMapper.xml

@@ -24,10 +24,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="isDelete"    column="is_delete"    />
+        <result property="entrustName"    column="entrust_Name"    />
+        <result property="beentrustName"    column="beentrust_Name"    />
+        <result property="bId"    column="b_Id"    />
+        <result property="carNumber"    column="car_Number"    />
+        <result property="year"    column="year"    />
+        <result property="month"    column="month"    />
+        <result property="day"    column="day"    />
     </resultMap>
 
     <sql id="selectOrderFileVo">
-        select order_id,delivery_number,shipment_number,ware_house_code,ware_house_name,code,message, flow_id,chains_code,customers_code,signer_id,signer_name, file_url, create_by, create_time, update_by, update_time, is_delete from ssb_order_file
+        select order_id,delivery_number,shipment_number,ware_house_code,ware_house_name,code,message, flow_id,chains_code,customers_code,signer_id,signer_name, file_url, create_by, create_time, update_by, update_time, is_delete ,entrust_Name,beentrust_Name,b_Id,car_Number from ssb_order_file
     </sql>
 
     <select id="selectOrderFileList" parameterType="OrderFile" resultMap="OrderFileResult">
@@ -44,6 +51,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         of.update_by,
         of.update_time,
         of.is_delete,
+        of.entrust_Name,
+        of.beentrust_Name,
+        of.b_Id,
+        of.car_Number,
+        of.year,
+        of.month,
+        of.day,
         c.chains_name AS chainsName
         FROM
         ssb_order_file AS of
@@ -96,6 +110,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="isDelete != null">is_delete,</if>
+            <if test="entrustName != null">entrust_Name,</if>
+            <if test="beentrustName != null">beentrust_Name,</if>
+            <if test="bId != null">b_Id,</if>
+            <if test="carNumber != null">car_Number,</if>
+            <if test="year != null">#{year},</if>
+            <if test="month != null">#{month},</if>
+            <if test="day != null">#{day},</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">#{orderId},</if>
@@ -116,6 +137,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="isDelete != null">#{isDelete},</if>
+            <if test="entrustName != null">#{entrustName},</if>
+            <if test="beentrustName != null">#{beentrustName},</if>
+            <if test="bId != null">#{bId},</if>
+            <if test="carNumber != null">#{carNumber},</if>
+            <if test="year != null">#{year},</if>
+            <if test="month != null">#{month},</if>
+            <if test="day != null">#{day},</if>
          </trim>
     </insert>
 
@@ -133,6 +161,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
+            <if test="entrustName != null">entrust_Name = #{entrustName},</if>
+            <if test="beentrustName != null">beentrust_Name = #{beentrustName},</if>
+            <if test="bId != null">b_Id = #{bId},</if>
+            <if test="carNumber != null">car_Number = #{carNumber},</if>
         </trim>
         where order_id = #{orderId}
     </update>
@@ -151,6 +183,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
+            <if test="entrustName != null">entrust_Name = #{entrustName},</if>
+            <if test="beentrustName != null">beentrust_Name = #{beentrustName},</if>
+            <if test="bId != null">b_Id = #{bId},</if>
+            <if test="carNumber != null">car_Number = #{carNumber},</if>
         </trim>
         where flow_id = #{flowId}
     </update>