no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/DailyImportSummaryVO.java

@@ -36,10 +36,10 @@ public class DailyImportSummaryVO {
     private SummaryStatusEnum summaryStatus;
 
     @ApiModelProperty(value = "导入操作人")
-    private Date importBy;
+    private String importBy;
 
     @ApiModelProperty(value = "导入时间")
-    private String importTime;
+    private Date importTime;
 
     @ApiModelProperty(value = "汇总操作人")
     private String summaryBy;

mall-server-api/src/main/java/com/gree/mall/manager/logic/settle/repair/DailyImportSummaryLogic.java

@@ -1185,7 +1185,6 @@ public class DailyImportSummaryLogic {
     }
 
 
-
     /**
      * 发放日结工资
      */
@@ -1221,7 +1220,7 @@ public class DailyImportSummaryLogic {
     public IPage<DailySummaryDataBean> cwSummaryList(String summaryBatchNo, String summaryStartTime, String summaryEndTime, String issueStartTime, String issueEndTime, Integer status, Integer pageNum, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
-        IPage<DailySummaryDataBean> page = dailyMapper.cwSummaryList(new Page(pageNum, pageSize),summaryBatchNo,summaryStartTime,summaryEndTime,issueStartTime,issueEndTime,status,
+        IPage<DailySummaryDataBean> page = dailyMapper.cwSummaryList(new Page(pageNum, pageSize), summaryBatchNo, summaryStartTime, summaryEndTime, issueStartTime, issueEndTime, status,
                 adminUser.getCompanyWechatIds(), adminUser.getAdminWebsitIds());
         return page;
     }
@@ -1249,11 +1248,11 @@ public class DailyImportSummaryLogic {
     }
 
     public ExcelData workerSummaryExport(List<SettleDailyIssueSummaryRecord> dailyIssueSummaryRecords) {
-        String[] titles = new String[]{"工资条编号","发放月份","状态","所属网点","网点编号","服务人员","服务人员编号",
-                "身份证","手机号","本次维修结算费用","需扣回费用(应扣)","需扣回费用(已扣)","增减费用",
-                "工伤保险(应扣)","工伤保险(已扣)","残保金(应扣)","残保金(已扣)","暂扣款应扣","应发金额","备注"};
+        String[] titles = new String[]{"工资条编号", "发放月份", "状态", "所属网点", "网点编号", "服务人员", "服务人员编号",
+                "身份证", "手机号", "本次维修结算费用", "需扣回费用(应扣)", "需扣回费用(已扣)", "增减费用",
+                "工伤保险(应扣)", "工伤保险(已扣)", "残保金(应扣)", "残保金(已扣)", "暂扣款应扣", "应发金额", "备注"};
         List<List<Object>> rows = new ArrayList<>();
-        for(SettleDailyIssueSummaryRecord bean : dailyIssueSummaryRecords){
+        for (SettleDailyIssueSummaryRecord bean : dailyIssueSummaryRecords) {
             List<Object> row = new ArrayList<>();
             row.add(bean.getSalaryNo());
             row.add(bean.getMonth());
@@ -1287,6 +1286,6 @@ public class DailyImportSummaryLogic {
 
     public IPage<DailyWorkerIssueSalaryBean> workerDetailList(Integer issueSalaryId, Integer pageNum, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        return  dailyMapper.workerDetailList(new Page(pageNum, pageSize),issueSalaryId,adminUser.getCompanyWechatIds(),adminUser.getAdminWebsitIds());
+        return dailyMapper.workerDetailList(new Page(pageNum, pageSize), issueSalaryId, adminUser.getCompanyWechatIds(), adminUser.getAdminWebsitIds());
     }
 }