导出前提交

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerDataController.java

@@ -377,6 +377,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         }
         if (logServiceOne!=null){
             map.put("logId",logServiceOne.getId());
+            stringObjectMap.remove("id");
             map.putAll(stringObjectMap);
         }
         if (smsCheckCustomerData == null) {

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerInfoController.java

@@ -287,10 +287,41 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @RequestMapping(value = "/exportXls")
     @PermissionData(pageComponent = "smscheck/modules/TaskCheckList")
     public ModelAndView exportXls(HttpServletRequest request, SmsCheckCustomerInfo smsCheckCustomerInfo) {
-        return super.exportXls(request, smsCheckCustomerInfo, SmsCheckCustomerInfo.class, "客户信息");
+        return  exportXls(request, smsCheckCustomerInfo, SmsCheckCustomerInfo.class, "客户信息");
     }
 
 
+//    protected ModelAndView exportXls(HttpServletRequest request, T object, Class<T> clazz, String title) {
+//        // Step.1 组装查询条件
+//        QueryWrapper<T> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
+//        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//
+//        // Step.2 获取导出数据
+//        List<T> pageList = service.list(queryWrapper);
+//        List<T> exportList = null;
+//
+//        // 过滤选中数据
+//        String selections = request.getParameter("selections");
+//        if (oConvertUtils.isNotEmpty(selections)) {
+//            List<String> selectionList = Arrays.asList(selections.split(","));
+//            exportList = pageList.stream().filter(item -> selectionList.contains(getId(item))).collect(Collectors.toList());
+//        } else {
+//            exportList = pageList;
+//        }
+//
+//        // Step.3 AutoPoi 导出Excel
+//        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+//        //此处设置的filename无效 ,前端会重更新设置一下
+//        mv.addObject(NormalExcelConstants.FILE_NAME, title);
+//        mv.addObject(NormalExcelConstants.CLASS, clazz);
+//        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+//        ExportParams  exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+//        exportParams.setImageBasePath(upLoadPath);
+//        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+//        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+//        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+//        return mv;
+//    }
     /**
      * 通过excel导入数据
      *

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerData.java

@@ -225,7 +225,10 @@ public class SmsCheckCustomerData implements Serializable {
     @ApiModelProperty(value = " 备案通知到期时间是否长期")
     private String filingsDateDateIs;
 
-
+    @ApiModelProperty(value = " 增值业务许可证到期时间是否长期")
+    private String permitDateDateIs;
+    @ApiModelProperty(value = " 增值业务许可证到期时间是否")
+    private String permitDateDate;
 
 }
 

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerDataAndLog.java

@@ -289,5 +289,8 @@ public class SmsCheckCustomerDataAndLog  {
     private String filingsDateDate;
     @ApiModelProperty(value = " 备案通知到期时间是否长期")
     private String filingsDateDateIs;
-
+    @ApiModelProperty(value = " 增值业务许可证到期时间是否长期")
+    private String permitDateDateIs;
+    @ApiModelProperty(value = " 增值业务许可证到期时间是否")
+    private String permitDateDate;
 }