F

db/2023/09/06.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `invoice_fill`.`ta_invoice_detail`
+ADD COLUMN `is_need_lodging` char(10) NULL COMMENT '0不需要 1需要 是否需要住宿清单' AFTER `mail_address`,
+ADD COLUMN `room_code` varchar(255) NULL COMMENT '房号' AFTER `is_need_lodging`;

src/main/java/com/njyunzhi/invoice/common/excel/IsNeedLodqingCoverter.java

@@ -0,0 +1,44 @@
+package com.njyunzhi.invoice.common.excel;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+public class IsNeedLodqingCoverter implements Converter<String> {
+        @Override
+        public Class supportJavaTypeKey() {
+            return String.class;
+        }
+
+        @Override
+        public CellDataTypeEnum supportExcelTypeKey() {
+            return CellDataTypeEnum.STRING;
+        }
+
+        /**
+         * 写 Excel
+         * @param value
+         * @param contentProperty
+         * @param globalConfiguration
+         * @return
+         * @throws Exception
+         */
+        @Override
+        public WriteCellData<?> convertToExcelData(String value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+            if (null == value) return null;
+
+            String val;
+            switch (value) {
+                case "1":
+                    val = "是";
+                    break;
+                default:
+                    val = "否";
+            }
+
+
+            return new WriteCellData(val);
+        }
+}

src/main/java/com/njyunzhi/invoice/entity/TaInvoiceDetail.java

@@ -3,18 +3,17 @@ package com.njyunzhi.invoice.entity;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.util.List;
-
+import com.njyunzhi.invoice.common.excel.IsNeedLodqingCoverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -27,7 +26,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ExcelIgnoreUnannotated
-@ApiModel(value="TaInvoiceDetail对象", description="报销明细")
+@ApiModel(value = "TaInvoiceDetail对象", description = "报销明细")
 public class TaInvoiceDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -108,6 +107,14 @@ public class TaInvoiceDetail implements Serializable {
     @ApiModelProperty(value = "住宿清单")
     private String stayRemark;
 
+    @ExcelProperty(index = 12, converter = IsNeedLodqingCoverter.class)
+    @ApiModelProperty(value = "0不需要 1需要 是否需要住宿清单")
+    private String isNeedLodging;
+
+    @ExcelProperty(index = 13)
+    @ApiModelProperty(value = "房号")
+    private String roomCode;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 
@@ -117,4 +124,6 @@ public class TaInvoiceDetail implements Serializable {
     @ApiModelProperty("报销明细")
     @TableField(exist = false)
     private List<TaInvoiceItem> itemList;
+
+
 }

src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@ spring:
   datasource:
     url: jdbc:mysql://112.2.2.154:3394/invoice_fill?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: invoice_fill
-    password: invoice_fill@ABCD1234
+    password: invoice_fill
 
 wx:
   mp:

src/main/resources/mapper/TaInvoiceDetailMapper.xml

@@ -101,7 +101,9 @@
             t.`merge_remark`,
             t.`stay_remark`,
             t.`status`,
-            t.`create_date`
+            t.`create_date`,
+            t.`is_need_lodging`,
+            t.`room_code`
         FROM
             ta_invoice_detail t
                 INNER JOIN ta_invoice_item s ON t.invoice_id = s.invoice_id AND t.invoice_person_id = s.invoice_person_id