导出优化

coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml

@@ -14,7 +14,7 @@
         limit 1
     </select>
     <select id="selectByShopIds" resultType="com.cool.store.entity.SignFranchiseDO">
-        select contract_code,shop_id,contract_start_time,contract_end_time,contract_amount
+        select contract_code,shop_id,contract_start_time,contract_end_time,contract_amount,create_time
         from xfsg_sign_franchise
         where 1=1
         <if test="list !=null and list.size >0">

coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java

@@ -74,102 +74,107 @@ public class ExportBranchShopDTO {
     @ColumnWidth(30)
     private String currency;
 
-    @ExcelProperty(value = "合计缴费金额（取自账单）",order = 15)
+    @ExcelProperty(value = "缴纳加盟费/保证金",order =15)
+    @ColumnWidth(30)
+    private String franchiseFeeStageStatus;
+    @ExcelProperty(value = "加盟合同签约",order =16)
+    @ColumnWidth(30)
+    private String signFranchiseStageStatus ;
+    @ExcelProperty(value = "签约时间",order =17)
+    @ColumnWidth(30)
+    private String signTime ;
+    @ExcelProperty(value = "合同金额",order =18)
+    @ColumnWidth(30)
+    private String contractAmount;
+
+    @ExcelProperty(value = "合计缴费金额（取自账单）",order = 19)
     @ColumnWidth(30)
     private String totalAmountContributions;
 
-    @ExcelProperty(value = "加盟费（取自账单）",order = 16)
+    @ExcelProperty(value = "加盟费（取自账单）",order = 20)
     @ColumnWidth(30)
     private String franchiseFeeBill;
 
-    @ExcelProperty(value = "加盟费(含税金额)",order = 18)
+    @ExcelProperty(value = "加盟费(含税金额)",order = 21)
     @ColumnWidth(30)
     private String franchiseFeeTax;
 
-    @ExcelProperty(value = "加盟费(不含税金额)",order = 19)
+    @ExcelProperty(value = "加盟费(不含税金额)",order = 22)
     @ColumnWidth(30)
     private String franchiseFee;
 
-    @ExcelProperty(value = "保证金（取自账单）",order = 20)
+    @ExcelProperty(value = "保证金（取自账单）",order = 23)
     @ColumnWidth(30)
     private String loanMargin;
 
-    @ExcelProperty(value = "第一年度管理费（取自账单）",order = 21)
+    @ExcelProperty(value = "第一年度管理费（取自账单）",order = 24)
     @ColumnWidth(30)
     private String firstYearManagementFeeBill;
 
-    @ExcelProperty(value = "第一年度管理费(含税金额)",order = 22)
+    @ExcelProperty(value = "第一年度管理费(含税金额)",order = 25)
     @ColumnWidth(30)
     private String firstYearManagementFeeTax;
 
-    @ExcelProperty(value = "第一年度管理费(不含税金额)",order = 23)
+    @ExcelProperty(value = "第一年度管理费(不含税金额)",order = 26)
     @ColumnWidth(30)
     private String firstYearManagementFee;
 
-    @ExcelProperty(value = "第一年度品牌费（取自账单）",order = 24)
+    @ExcelProperty(value = "第一年度品牌费（取自账单）",order = 27)
     @ColumnWidth(30)
     private String firstYearBrandingFeeBill;
 
-    @ExcelProperty(value = "第一年度品牌费(含税金额)",order = 25)
+    @ExcelProperty(value = "第一年度品牌费(含税金额)",order = 28)
     @ColumnWidth(30)
     private String firstYearBrandingFeeTax;
 
-    @ExcelProperty(value = "第一年度品牌费(不含税金额)",order = 26)
+    @ExcelProperty(value = "第一年度品牌费(不含税金额)",order = 29)
     @ColumnWidth(30)
     private String firstYearBrandingFee;
 
-    @ExcelProperty(value = "设计费（取自账单)",order = 27)
+    @ExcelProperty(value = "设计费（取自账单)",order = 30)
     @ColumnWidth(30)
     private String performanceBondBill;
 
-    @ExcelProperty(value = "设计费(含税金额)",order = 28)
+    @ExcelProperty(value = "设计费(含税金额)",order = 31)
     @ColumnWidth(30)
     private String designFeeTax;
 
-    @ExcelProperty(value = "设计费(不含税金额)",order = 29)
+    @ExcelProperty(value = "设计费(不含税金额)",order = 32)
     @ColumnWidth(30)
     private String designFee;
 
-    @ExcelProperty(value = "第1次缴纳时间",order = 30)
+    @ExcelProperty(value = "第1次缴纳时间",order = 33)
     @ColumnWidth(30)
     private String firstPayTime;
 
-    @ExcelProperty(value = "第2次缴纳时间",order = 31)
+    @ExcelProperty(value = "第2次缴纳时间",order = 34)
     @ColumnWidth(30)
     private String secondPayTime;
 
-    @ExcelProperty(value = "第3次缴纳时间",order = 32)
+    @ExcelProperty(value = "第3次缴纳时间",order = 35)
     @ColumnWidth(30)
     private String thirdPayTime;
 
-    @ExcelProperty(value = "第4次缴纳时间",order = 33)
+    @ExcelProperty(value = "第4次缴纳时间",order = 36)
     @ColumnWidth(30)
     private String fourthPayTime;
 
-    @ExcelProperty(value = "当前进度",order = 34)
+    @ExcelProperty(value = "当前进度",order = 37)
     @ColumnWidth(30)
     private String currentProgress;
 
-    @ExcelProperty(value = "状态",order = 35)
+    @ExcelProperty(value = "状态",order = 38)
     @ColumnWidth(30)
     private String shopStatus;
 
-    @ExcelProperty(value = "计划开店时间",order = 36)
+    @ExcelProperty(value = "计划开店时间",order = 39)
     @ColumnWidth(30)
     private String planOpenTime;
 
-    @ExcelProperty(value = "开店时长(天)",order =37)
+    @ExcelProperty(value = "开店时长(天)",order =40)
     @ColumnWidth(30)
     private String openDuration;
-    @ExcelProperty(value = "缴纳加盟费/保证金",order =38)
+
-    @ColumnWidth(30)
-    private String franchiseFeeStageStatus;
-    @ExcelProperty(value = "加盟合同签约",order =39)
-    @ColumnWidth(30)
-    private String signFranchiseStageStatus ;
-    @ExcelProperty(value = "合同金额",order =40)
-    @ColumnWidth(30)
-    private String contractAmount;
 
 
 

coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java

@@ -168,6 +168,7 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
                     dto.setContractCode(signFranchiseDO.getContractCode());
                     dto.setContractStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractStartTime()));
                     dto.setContractEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractEndTime()));
+                    dto.setSignTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getCreateTime()));
                 }
                 List<Date> payTime = payTimeMap.getOrDefault(response.getShopId(), new ArrayList<>());
                 for (int i = 0; i < payTime.size() && i <= 3; i++) {