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

commit

Browse Source
This commit is contained in:
c-zhouhf1
2026-02-09 14:14:58 +08:00
parent 54d5c69892
commit 98265fd7af
7 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/sys/controller/SysDataUserPullController.java
+2 -2
View File
@@ -42,7 +42,7 @@ public class SysDataUserPullController {
@ApiOperation("分页数据")
@Ok("json:{locked:'password|idCard|mobile'}")
public Result pageData(@Valid SysDataUserPullPageForm pageForm) {
Sql sql = Sqls.create("select us.*,su.`name` AS unit_name from sys_user_source us left join sys_unit su ON su.id = us.unitId $condition");
Sql sql = Sqls.create("select us.*,su.`name` AS unitName from sys_user_source us left join sys_unit su ON su.id = us.unitId $condition");
Cnd cnd = Cnd.NEW();
cnd.andEX(Sys_user_source::getPullTime, "=", pageForm.getPullTime());
cnd.and(Cnd.likeEX(Sys_user_source::getUsername, pageForm.getUserName()));
@@ -57,7 +57,7 @@ public class SysDataUserPullController {
}
cnd.desc(Sys_user_source::getPullTime);
sql.setCondition(cnd);
Pagination pagination = sysUserPullService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
Pagination pagination = sysUserPullService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pagination);
}
src/main/java/com/budwk/app/sys/services/impl/SysDataUnitPullServiceImpl.java
+1 -1
View File
@@ -124,7 +124,7 @@ public class SysDataUnitPullServiceImpl extends BaseServiceImpl<Sys_unit> implem
}
log.info("本次拉取单位数据，新增{}条，更新{}条", insertList.size(), updateList.size());
dao().insert(insertList);
dao().update(updateList);
dao().updateIgnoreNull(updateList);
}
src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java
+2 -2
View File
@@ -204,13 +204,13 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
u.setId(user.getId());
// 更新会员状态
boolean currentIsMember = user.getMember() != null && user.getMember();
/* boolean currentIsMember = user.getMember() != null && user.getMember();
if (!currentIsMember) {
addMemberUserIds.add(user.getId());
} else{
removeMemberUserIds.add(user.getId());
}
}*/
needDoUpdateList.add(u);
}
src/main/java/com/budwk/app/task/job/SysUserAllRenewJob.java
+1 -1
View File
@@ -57,6 +57,6 @@ public class SysUserAllRenewJob implements Job {
param.setUpdateMode(SysDataUpdateMode.ALL.name());
param.setConditionGroup(conditionGroup);
// sysDataUserUpdateService.update(param);
sysDataUserUpdateService.update(param);
}
}
src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveFamilyPlanningOfficeAuditController.java
+1
View File
@@ -167,6 +167,7 @@ public class MaternityLeaveFamilyPlanningOfficeAuditController {
maternityLeaveService.update(maternityLeave);
args.put("argsUnitId",maternityLeave.getUnitId());
flowCommonService.executeTask(args);
return Result.success();
src/main/resources/views/platform/sys/data/user/pull.html
+5 -5
View File
@@ -80,13 +80,13 @@ layout("/layouts/platform.html"){
<el-table-column prop="postDoctoralJoinDate" label="进站时间" sortable width="120"></el-table-column>
<el-table-column prop="personType" label="教职工类别" sortable width="120"></el-table-column>
<el-table-column prop="comeSchoolDate" label="来校年月" sortable width="120"></el-table-column>
<el-table-column prop="technicalTitle" label="技术职称" sortable width="120"></el-table-column>
<el-table-column prop="position" label="干部职务" sortable width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="education" label="学历" show-overflow-tooltip sortable width="120"></el-table-column>
<el-table-column prop="academicDegree" label="学位" show-overflow-tooltip sortable width="120"></el-table-column>
<!-- <el-table-column prop="technicalTitle" label="技术职称" sortable width="120"></el-table-column>-->
<!-- <el-table-column prop="position" label="干部职务" sortable width="120" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column prop="education" label="学历" show-overflow-tooltip sortable width="120"></el-table-column>-->
<!-- <el-table-column prop="academicDegree" label="学位" show-overflow-tooltip sortable width="120"></el-table-column>-->
<el-table-column prop="unitName" label="单位" show-overflow-tooltip sortable width="120"></el-table-column>
<el-table-column prop="unitId" label="单位编码" sortable width="120"></el-table-column>
<el-table-column prop="nationality" label="国籍" sortable></el-table-column>
<!-- <el-table-column prop="nationality" label="国籍" sortable></el-table-column>-->
<el-table-column prop="nation" label="民族" sortable></el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
src/main/resources/views/platform/sys/data/user/update.html
+5 -5
View File
@@ -75,13 +75,13 @@ layout("/layouts/platform.html"){
<el-table-column prop="preparedBy" label="编制类别" sortable width="120"></el-table-column>
<el-table-column prop="personType" label="教职工类别" sortable width="120"></el-table-column>
<el-table-column prop="arrivalAtSchoolDate" label="来校年月" sortable width="120"></el-table-column>
<el-table-column prop="technicalTitle" label="技术职称" sortable width="120"></el-table-column>
<el-table-column prop="position" label="职务" sortable width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="education" label="学历" show-overflow-tooltip sortable width="120"></el-table-column>
<el-table-column prop="academicDegree" label="学位" show-overflow-tooltip sortable width="120"></el-table-column>
<!-- <el-table-column prop="technicalTitle" label="技术职称" sortable width="120"></el-table-column>-->
<!-- <el-table-column prop="position" label="职务" sortable width="120" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column prop="education" label="学历" show-overflow-tooltip sortable width="120"></el-table-column>-->
<!-- <el-table-column prop="academicDegree" label="学位" show-overflow-tooltip sortable width="120"></el-table-column>-->
<el-table-column prop="unitName" label="单位" show-overflow-tooltip sortable width="120"></el-table-column>
<el-table-column prop="unitId" label="单位编码" sortable width="120"></el-table-column>
<el-table-column prop="nationality" label="国籍" sortable></el-table-column>
<!-- <el-table-column prop="nationality" label="国籍" sortable></el-table-column>-->
<el-table-column prop="nation" label="民族" sortable></el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->