This commit is contained in:
Paidax
2024-12-09 17:31:22 +08:00
parent 8da42abcf1
commit 2ea4f69427
2 changed files with 16 additions and 13 deletions
@@ -1,28 +1,23 @@
package io.v.nutz.zhgh.data.constant; 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.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.v.nutz.zhgh.data.model.UserSource;
import io.v.nutz.base.expression.Exp4; import io.v.nutz.base.expression.Exp4;
import io.v.nutz.sys.models.Sys_unit; import io.v.nutz.sys.models.Sys_unit;
import lombok.Data; import io.v.nutz.zhgh.data.model.UserSource;
import org.nutz.json.Json;
import org.nutz.lang.Strings; import org.nutz.lang.Strings;
import org.nutz.lang.util.NutMap;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import java.io.File; import java.util.ArrayList;
import java.util.*; import java.util.HashMap;
import java.util.stream.Collectors; 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++; page++;
Integer max_page = jsonObject.getJSONObject("result").getInteger("max_page"); Integer max_page = jsonObject.getJSONObject("result").getInteger("max_page");
@@ -36,7 +36,8 @@ const appModule = {
}, },
created() { created() {
setTimeout(() => { setTimeout(() => {
this.id = headerApp.appModuleId // this.id = headerApp.appModuleId
this.enterEntranceModules({ id: headerApp.appModuleId })
}, 500) }, 500)
} }
} }