信息采集记录新增下单时间字段

fs-service/src/main/java/com/fs/his/service/impl/FsPackageOrderServiceImpl.java

@@ -893,6 +893,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                         if (collectionPersonalLog!=null){
                             collectionPersonalLog.setPackageOrderCode(orderSn);
                             collectionPersonalLog.setPersonalCollectStatus(PostPayPrescStatusEnum.ORDER_IS_CREATED.getCode());
+                            collectionPersonalLog.setOrderTime(DateUtils.getNowDate());
                             infoCollectionPersonalLogMapper.updateFsUserInformationCollectionPersonalLog(collectionPersonalLog);
                         }
 

fs-service/src/main/java/com/fs/hisStore/domain/FsUserInformationCollectionPersonalLog.java

@@ -96,6 +96,11 @@ public class FsUserInformationCollectionPersonalLog implements Serializable
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    /** 下单时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "下单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date orderTime;
+
     /** 备注 */
     @Excel(name = "备注")
     private String remark;

fs-service/src/main/resources/mapper/hisStore/FsUserInformationCollectionPersonalLogMapper.xml

@@ -10,7 +10,7 @@
         <result property="prescribeId"           column="prescribe_id"           />
         <result property="questionId"            column="question_id"            />
         <result property="userId"                column="user_id"                />
-        <result property="userName"                column="user_name"                />
+        <result property="userName"              column="user_name"              />
         <result property="doctorId"              column="doctor_id"              />
         <result property="companyUserId"         column="company_user_id"        />
         <result property="packageId"             column="package_id"             />
@@ -23,6 +23,7 @@
         <result property="logType"               column="log_type"               />
         <result property="createTime"            column="create_time"            />
         <result property="updateTime"            column="update_time"            />
+        <result property="orderTime"            column="order_time"            />
         <result property="operatorId"            column="operator_id"            />
         <result property="remark"                column="remark"                 />
     </resultMap>
@@ -31,7 +32,7 @@
         select id, collection_id, prescribe_id, question_id, user_id,user_name, doctor_id,
                company_user_id, package_id, package_name, pay_type, amount,
                package_order_code, doctor_confirm_time, personal_collect_status,
-               log_type, create_time, update_time, operator_id, remark
+               log_type, create_time, update_time,order_time, operator_id, remark
         from fs_user_information_collection_personal_log
     </sql>
 
@@ -156,6 +157,7 @@
             <if test="logType != null">log_type = #{logType},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             update_time = COALESCE(#{updateTime}, NOW()),
+            <if test="orderTime != null">order_time = #{orderTime},</if>
             <if test="operatorId != null">operator_id = #{operatorId},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>