diff --git a/src/main/java/io/v/nutz/MainLauncher.java b/src/main/java/io/v/nutz/MainLauncher.java index 8b6f45f..597a3af 100644 --- a/src/main/java/io/v/nutz/MainLauncher.java +++ b/src/main/java/io/v/nutz/MainLauncher.java @@ -95,16 +95,6 @@ public class MainLauncher { init_task(); init_proposal_undertake(); ioc.get(Globals.class); - - try { - FTPClient ftpClient = new FTPClient(); - ftpClient.connect(conf.get(PROP_SERVER_HOST, ""), conf.getInt(PROP_SERVER_PORT, 21)); - ftpClient.login(conf.get(PROP_SERVER_USERNAME, ""), conf.get(PROP_SERVER_PASSWORD, "")); - ftpClient.enterLocalPassiveMode(); - System.out.println("***************************=" + ftpClient.getReplyCode()); - } catch (Exception e) { - e.printStackTrace(); - } } /** diff --git a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java b/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java index cc4cf61..67fbbe0 100644 --- a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java @@ -252,7 +252,7 @@ public class SourceUserServiceImpl extends ViServiceImpl implements // 人员状态及在职状态更新 userPatUpService.renewUserState(); // 修改不在人事库的人员,删除角色 - userPatUpService.deleteNotInSourceUser(true); +// userPatUpService.deleteNotInSourceUser(true); //清除缓存 // sysUserService.clearCache(); // sysRoleService.clearCache(); diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java index 21e35bd..662d011 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java @@ -456,15 +456,15 @@ public class WelfareListController { if (StrUtil.isNotBlank(courierNumberExcelMode.getOneCourierNumber())) { courierNumberList.add(courierNumberExcelMode.getOneCourierNumber()); } - if (StrUtil.isNotBlank(courierNumberExcelMode.getTwoCourierNumber())) { - courierNumberList.add(courierNumberExcelMode.getTwoCourierNumber()); - } - if (StrUtil.isNotBlank(courierNumberExcelMode.getThreeCourierNumber())) { - courierNumberList.add(courierNumberExcelMode.getThreeCourierNumber()); - } - if (StrUtil.isNotBlank(courierNumberExcelMode.getFourCourierNumber())) { - courierNumberList.add(courierNumberExcelMode.getFourCourierNumber()); - } +// if (StrUtil.isNotBlank(courierNumberExcelMode.getTwoCourierNumber())) { +// courierNumberList.add(courierNumberExcelMode.getTwoCourierNumber()); +// } +// if (StrUtil.isNotBlank(courierNumberExcelMode.getThreeCourierNumber())) { +// courierNumberList.add(courierNumberExcelMode.getThreeCourierNumber()); +// } +// if (StrUtil.isNotBlank(courierNumberExcelMode.getFourCourierNumber())) { +// courierNumberList.add(courierNumberExcelMode.getFourCourierNumber()); +// } for (String number : courierNumberList) { WelfareCourierNumber courierNumber = new WelfareCourierNumber(); diff --git a/src/main/java/io/v/nutz/zhgh/welfare/mode/CourierNumberExcelMode.java b/src/main/java/io/v/nutz/zhgh/welfare/mode/CourierNumberExcelMode.java index 1143118..923740c 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/mode/CourierNumberExcelMode.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/mode/CourierNumberExcelMode.java @@ -12,7 +12,7 @@ public class CourierNumberExcelMode { @Excel(name = "姓名", width = 20) private String userName; - @Excel(name = "快递单号1", width = 30) + @Excel(name = "快递单号", width = 30) private String oneCourierNumber; @Excel(name = "快递单号2", width = 30) diff --git a/src/main/resources/views/mobile/welfare/mine/myWelfare.html b/src/main/resources/views/mobile/welfare/mine/myWelfare.html index 302bdcc..72457ef 100644 --- a/src/main/resources/views/mobile/welfare/mine/myWelfare.html +++ b/src/main/resources/views/mobile/welfare/mine/myWelfare.html @@ -112,10 +112,10 @@ layout("/mobile/platform.html"){
评价商品 - - - - + + 物流信息 + 查看详情
diff --git a/src/main/resources/views/platform/welfare/list/ListMange.html b/src/main/resources/views/platform/welfare/list/ListMange.html index 960c493..4f197dd 100644 --- a/src/main/resources/views/platform/welfare/list/ListMange.html +++ b/src/main/resources/views/platform/welfare/list/ListMange.html @@ -371,13 +371,13 @@ layout("/layouts/platform.html"){ - - - - - - - + + + @@ -111,26 +112,25 @@ layout("/layouts/platform.html"){ 暂无 - - - - - + + width="250px">