Browse Source

修改申请人姓名

luyanwen-001 3 years ago
parent
commit
dc3370fde2

+ 1 - 1
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/QueryOrderFormDetailVO.java

@@ -23,7 +23,7 @@ public class QueryOrderFormDetailVO implements Serializable {
     private Long batchQrNumber;
 
     @ApiModelProperty("申请人")
-    private Long applicationName;
+    private String applicationName;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("申请时间")

+ 1 - 1
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/QueryOrderFormDetailRes.java

@@ -64,7 +64,7 @@ public class QueryOrderFormDetailRes implements Serializable {
         private Long batchQrNumber;
 
         @ApiModelProperty("申请人")
-        private Long applicationName;
+        private String applicationName;
 
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         @ApiModelProperty("申请时间")

+ 2 - 1
abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageBookingOrderMapper.xml

@@ -29,10 +29,11 @@
             package.id AS packageId,
             batch.batch_qr_number AS batchQrNumber ,
             package.create_time AS applicationTime,
-            package.create_by AS applicationName
+            ui.user_name AS applicationName
         FROM
             qr_package AS package
             LEFT JOIN qr_package_batch AS batch ON batch.package_id = package.id
+            LEFT JOIN user_info AS ui on package.update_by = ui.id
         WHERE
             package.booking_order = #{queryOrderFormDetailReq.bookingOrder,jdbcType=VARCHAR}
     </select>