diff --git a/src/main/java/io/v/nutz/zhgh/data/constant/SourceData.java b/src/main/java/io/v/nutz/zhgh/data/constant/SourceData.java index 34426d2..c7a6e7a 100644 --- a/src/main/java/io/v/nutz/zhgh/data/constant/SourceData.java +++ b/src/main/java/io/v/nutz/zhgh/data/constant/SourceData.java @@ -1,28 +1,23 @@ package io.v.nutz.zhgh.data.constant; -import cn.afterturn.easypoi.excel.ExcelImportUtil; -import cn.afterturn.easypoi.excel.annotation.Excel; -import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import io.v.nutz.zhgh.data.model.UserSource; import io.v.nutz.base.expression.Exp4; import io.v.nutz.sys.models.Sys_unit; -import lombok.Data; -import org.nutz.json.Json; +import io.v.nutz.zhgh.data.model.UserSource; import org.nutz.lang.Strings; -import org.nutz.lang.util.NutMap; import org.springframework.util.Assert; -import java.io.File; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 获取源数据配置 @@ -158,7 +153,14 @@ public interface SourceData { } } }); - users.add(BeanUtil.mapToBean(entity, UserSource.class, true)); + UserSource source = BeanUtil.mapToBean(entity, UserSource.class, true); + if (StrUtil.isNotBlank(source.getBirthday())) { + source.setBirthday(DateUtil.format(DateUtil.parse(source.getBirthday(), "yyyyMMdd"),"yyyy-MM-dd")); + } + if (StrUtil.isNotBlank(source.getSchoolTime())) { + source.setSchoolTime(DateUtil.format(DateUtil.parse(source.getSchoolTime(), "yyyyMMdd"),"yyyy-MM-dd")); + } + users.add(source); } page++; Integer max_page = jsonObject.getJSONObject("result").getInteger("max_page"); 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 82c4421..8e1c069 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 @@ -144,6 +144,12 @@ public class SourceUserServiceImpl extends ViServiceImpl implements //不更新会员和福利会员字段 source.setMember(null); source.setWelfareMember(null); + if (StrUtil.isNotBlank(source.getBirthday())) { + source.setBirthday(DateUtil.format(DateUtil.parse(source.getBirthday(), "yyyyMMdd"),"yyyy-MM-dd")); + } + if (StrUtil.isNotBlank(source.getSchoolTime())) { + source.setSchoolTime(DateUtil.format(DateUtil.parse(source.getSchoolTime(), "yyyyMMdd"),"yyyy-MM-dd")); + } Sys_user user = userMap.get(source.getLoginname().toLowerCase()); Sys_user u = new Sys_user(); diff --git a/src/main/resources/views/platform/sys/home/appModule.js b/src/main/resources/views/platform/sys/home/appModule.js index ff19bb9..42ab1bd 100644 --- a/src/main/resources/views/platform/sys/home/appModule.js +++ b/src/main/resources/views/platform/sys/home/appModule.js @@ -36,7 +36,8 @@ const appModule = { }, created() { setTimeout(() => { - this.id = headerApp.appModuleId + // this.id = headerApp.appModuleId + this.enterEntranceModules({ id: headerApp.appModuleId }) }, 500) } }