c-zhangr1/zhgh_hrbnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server_commit

Browse Source
This commit is contained in:
zhengziru
2025-04-02 14:25:14 +08:00
parent a9aa038a67
commit 931acaa20e
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/data/constant/SourceData.java
+14 -1
View File
@@ -82,6 +82,18 @@ public interface SourceData {
}}; }};
Map<String, String> PERSON_TYPE_CODE = new HashMap<>() {{
put("01", "管理人员");
put("02", "专业技术人员");
put("03", "技术工人");
put("04", "普通工人");
put("05", "勤工俭学");
put("06", "大集体");
put("07", "返聘");
put("08", "督导");
}};
/** /**
* 接口中的数据跟SourceUser的对应关系 * 接口中的数据跟SourceUser的对应关系
* <p> * <p>
@@ -95,7 +107,7 @@ public interface SourceData {
put("XM", new String[]{"username"}); put("XM", new String[]{"username"});
put("DWDM", new String[]{"unitid"}); put("DWDM", new String[]{"unitid"});
put("DQZTDM", new String[]{"userState"}); put("DQZTDM", new String[]{"userState"});
put("JZGRYLB", new String[]{"personType"}); put("JZGRYLBDM", new String[]{"personType"});
put("SJH", new String[]{"mobile"}); put("SJH", new String[]{"mobile"});
put("RXRQ", new String[]{"schoolTime"}); put("RXRQ", new String[]{"schoolTime"});
put("ZZMM", new String[]{"political"}); put("ZZMM", new String[]{"political"});
@@ -110,6 +122,7 @@ public interface SourceData {
*/ */
Map<String, Exp4> USER_FIELD_PLUGIN = new HashMap<>() {{ Map<String, Exp4> USER_FIELD_PLUGIN = new HashMap<>() {{
put("DQZTDM", v -> Strings.sBlank(USER_STATE_CODE.get(v), "")); put("DQZTDM", v -> Strings.sBlank(USER_STATE_CODE.get(v), ""));
put("JZGRYLBDM", v -> Strings.sBlank(PERSON_TYPE_CODE.get(v), ""));
}}; }};
/** /**
src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java
+6 -6
View File
@@ -144,12 +144,12 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
//不更新会员和福利会员字段 //不更新会员和福利会员字段
source.setMember(null); source.setMember(null);
source.setWelfareMember(null); source.setWelfareMember(null);
if (StrUtil.isNotBlank(source.getBirthday())) { // if (StrUtil.isNotBlank(source.getBirthday())) {
source.setBirthday(DateUtil.format(DateUtil.parse(source.getBirthday(), "yyyyMMdd"),"yyyy-MM-dd")); // source.setBirthday(DateUtil.format(DateUtil.parse(source.getBirthday(), "yyyyMMdd"),"yyyy-MM-dd"));
} // }
if (StrUtil.isNotBlank(source.getSchoolTime())) { // if (StrUtil.isNotBlank(source.getSchoolTime())) {
source.setSchoolTime(DateUtil.format(DateUtil.parse(source.getSchoolTime(), "yyyyMMdd"),"yyyy-MM-dd")); // source.setSchoolTime(DateUtil.format(DateUtil.parse(source.getSchoolTime(), "yyyyMMdd"),"yyyy-MM-dd"));
} // }
Sys_user user = userMap.get(source.getLoginname().toLowerCase()); Sys_user user = userMap.get(source.getLoginname().toLowerCase());
Sys_user u = new Sys_user(); Sys_user u = new Sys_user();
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ApplyController.java
+1 -1
View File
@@ -224,7 +224,7 @@ public class ApplyController {
dao.execute(sql); dao.execute(sql);
List<String> loginNameList = sql.getList(String.class); List<String> loginNameList = sql.getList(String.class);
if (Lang.isNotEmpty(loginNameList) && "999".equals(activityBx.getState_id())) { if (Lang.isNotEmpty(loginNameList)) {
NutMap map = new NutMap(); NutMap map = new NutMap();
map.setv("userId",activityBx.getUser_id()); map.setv("userId",activityBx.getUser_id());
map.setv("activityName",activityBx.getActivity_name()); map.setv("activityName",activityBx.getActivity_name());