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

..

Browse Source
This commit is contained in:
server
2025-09-11 15:30:12 +08:00
parent 2714b04f07
commit 1b8e15af6e
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareListController.java
+5 -2
View File
@@ -158,9 +158,12 @@ public class WelfareListController {
if (user != null) { if (user != null) {
WelfareList list = new WelfareList(); WelfareList list = new WelfareList();
list.setUserId(user.getId()); list.setUserId(user.getId());
list.setWelfareUnitId(user.getUnionId()); list.setWelfareUnitId(user.getUnitId());
list.setWelfareUnitName(user.getUnitName());
list.setWelfareUnionId(user.getUnionId());
list.setWelfareUnionName(user.getUnionName());
list.setProjectId(businessId); list.setProjectId(businessId);
list.setWelfareSecondLevelUnitId(user.getUnitId()); // list.setWelfareSecondLevelUnitId(user.getUnitId());
list.setPersonType(user.getPersonType()); list.setPersonType(user.getPersonType());
list.setUserState(user.getUserState()); list.setUserState(user.getUserState());
welfareLists.add(list); welfareLists.add(list);
src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java
+4 -2
View File
@@ -370,8 +370,10 @@ public class WelfareListServiceImpl extends BaseServiceImpl<WelfareList> impleme
WelfareList welfareList = new WelfareList(); WelfareList welfareList = new WelfareList();
welfareList.setProjectId(id); welfareList.setProjectId(id);
welfareList.setUserId(v.getId()); welfareList.setUserId(v.getId());
welfareList.setWelfareUnitId(v.getUnionId()); welfareList.setWelfareUnitId(v.getUnitId());
welfareList.setWelfareSecondLevelUnitId(v.getUnitId()); welfareList.setWelfareUnitName(v.getUnitName());
welfareList.setWelfareUnionId(v.getUnionId());
welfareList.setWelfareUnionName(v.getUnionName());
welfareList.setPersonType(v.getPersonType()); welfareList.setPersonType(v.getPersonType());
welfareList.setUserState(v.getUserState()); welfareList.setUserState(v.getUserState());
return welfareList; return welfareList;
src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java
+4 -2
View File
@@ -175,8 +175,10 @@ public class WelfareProjectServiceImpl extends BaseServiceImpl<WelfareProject> i
WelfareList list = new WelfareList(); WelfareList list = new WelfareList();
list.setProjectId(projectId); list.setProjectId(projectId);
list.setUserId(user.getString("id")); list.setUserId(user.getString("id"));
list.setWelfareUnitId(user.getString("unionId")); list.setWelfareUnitId(user.getString("unitId"));
list.setWelfareSecondLevelUnitId(user.getString("unitId")); list.setWelfareUnitName(user.getString("unitName"));
list.setWelfareUnionId(user.getString("unionId"));
list.setWelfareUnionName(user.getString("unionName"));
list.setPersonType(user.getString("personType")); list.setPersonType(user.getString("personType"));
list.setUserState(user.getString("userState")); list.setUserState(user.getString("userState"));
lists.add(list); lists.add(list);
src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java
+1
View File
@@ -46,6 +46,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
t1.userId, t1.userId,
t1.welfareUnionName, t1.welfareUnionName,
t1.welfareUnitName, t1.welfareUnitName,
t1.welfareUnitId,
GROUP_CONCAT(DISTINCT t3.optionName) AS selectedOptions, GROUP_CONCAT(DISTINCT t3.optionName) AS selectedOptions,
GROUP_CONCAT(DISTINCT t2.mobile) AS mobile, GROUP_CONCAT(DISTINCT t2.mobile) AS mobile,
GROUP_CONCAT(DISTINCT t2.receiveAddress) AS receiveAddress, GROUP_CONCAT(DISTINCT t2.receiveAddress) AS receiveAddress,