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

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-10-19 17:18:13 +08:00
parent c9e825ecb9
commit be764149e4
20 changed files with 131 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java
+7 -2
View File
@@ -33,6 +33,7 @@ import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
@@ -100,6 +101,7 @@ public class HealthCheckupListController {
hcus.selectTime,
hcus.campus,
hcus.subjectId,
hcus.bz,
ca.campusName
FROM
health_checkup_user hcu
@@ -117,8 +119,11 @@ public class HealthCheckupListController {
cnd.andEX("hcu.unionId", "=", SecurityUtil.getUnionId());
}
if (StrUtil.isNotBlank(pageForm.getSearchName()) && StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
cnd.and(Cnd.likeEX(pageForm.getSearchName(), pageForm.getSearchKeyword()));
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
SqlExpressionGroup group = new SqlExpressionGroup();
group.orLike("hcu.userName", pageForm.getSearchKeyword());
group.orLike("hcu.loginName", pageForm.getSearchKeyword());
cnd.and(group);
}
cnd.groupBy("hcu.userId");
if (StrUtil.isNotBlank(pageForm.getPageOrderName()) && Strings.isNotBlank(pageForm.getPageOrderBy())) {
src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java
+13 -1
View File
@@ -34,6 +34,7 @@ import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
@@ -348,7 +349,7 @@ public class HealthCheckupSingleController {
}
}
//如果有符合的就添加
if (subjectMoneyId != null){
if (subjectMoneyId != null) {
HealthCheckupUserSelection selection = new HealthCheckupUserSelection();
selection.setProjectId(projectId);
selection.setSelectUserId(v);
@@ -363,4 +364,15 @@ public class HealthCheckupSingleController {
});
return Result.success();
}
@At
@ApiOperation("给未选的人发送提醒")
@Ok("json:full")
@SaCheckPermission("healthCheckup.statisticsSingle")
@SLog(type = "healthCheckup", tag = "体检管理", msg = "管理员给未选的人发送提醒")
public Result msgNotSelect(@Valid String projectId) {
List<NutMap> userList = healthCheckupSingleService.receivePageData(projectId, null, "1");
return Result.success("暂未开启消息！");
}
}
src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java
+10 -8
View File
@@ -170,6 +170,7 @@ public class TeacherCongressDelegatePushController {
sql.setParam("sessionId", sessionId);
Cnd cnd = Cnd.NEW();
cnd.and("u.member", "=", 1);
cnd.and("u.username", "is not", null);
cnd.andEX("u.id", "not in", userIds);
cnd.and("tcd.userId", "is", null);
cnd.and("tcdp.id", "is", null);
@@ -249,6 +250,7 @@ public class TeacherCongressDelegatePushController {
// 自动完成第一个申请任务
List<ProcessTask> doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null);
for (ProcessTask task : doingTaskList) {
args.put(FlowConst.NEXT_NODE_OPERATOR, teacherCongressDelegatePush.getUserId());
flowEngine.executeProcessTask(task.getId(), SecurityUtil.getUserId(), args);
}
});
@@ -370,7 +372,7 @@ public class TeacherCongressDelegatePushController {
Teacher_congress_quota_allocation allocation = dao.fetch(Teacher_congress_quota_allocation.class,
Cnd.where(Teacher_congress_quota_allocation::getSessionId, "=", sessionId)
.and(Teacher_congress_quota_allocation::getUnionId, "=", SecurityUtil.getUnionId()));
if(allocation == null){
if (allocation == null) {
return Result.success();
}
@@ -414,23 +416,23 @@ public class TeacherCongressDelegatePushController {
// 女代表人数
int female = (int) writeList.stream().filter(v -> List.of("女", "女性").contains(v.getString("sex"))).count();
// 高级职称专任教师人数
int seniorTeacher = (int) writeList.stream().filter(v->v.getBoolean("seniorTeacher")).count();
int seniorTeacher = (int) writeList.stream().filter(v -> v.getBoolean("seniorTeacher")).count();
// 中级职称及以下
int intermediateBelow = (int) writeList.stream().filter(v->v.getBoolean("intermediateBelow")).count();
int intermediateBelow = (int) writeList.stream().filter(v -> v.getBoolean("intermediateBelow")).count();
// 干部
int cadre = (int) writeList.stream().filter(v->v.getBoolean("cadre")).count();
int cadre = (int) writeList.stream().filter(v -> v.getBoolean("cadre")).count();
// 工人
int worker = (int) writeList.stream().filter(v->v.getBoolean("worker")).count();
int worker = (int) writeList.stream().filter(v -> v.getBoolean("worker")).count();
// 专任教师人数
int ordinaryTeacher = (int) writeList.stream().filter(v->v.getBoolean("ordinaryTeacher")).count();
int ordinaryTeacher = (int) writeList.stream().filter(v -> v.getBoolean("ordinaryTeacher")).count();
// 45岁以下代表
int under45 = (int) writeList.stream().filter(v -> Convert.toInt(v.getInt("age"), 0) <= 45).count();
// 少数民族代表
long ethnicMinority = writeList.stream().filter(v -> StrUtil.isNotBlank(v.getString("nation")) && !"汉族".equals(v.getString("nation"))).count();
// 校领导数
long schoolLeader = writeList.stream().filter(v->v.getBoolean("schoolLeader")).count();
long schoolLeader = writeList.stream().filter(v -> v.getBoolean("schoolLeader")).count();
// 中层领导数
long middleLevelLeader = writeList.stream().filter(v->v.getBoolean("middleLevelLeader")).count();
long middleLevelLeader = writeList.stream().filter(v -> v.getBoolean("middleLevelLeader")).count();
HashMap<String, Object> hashMap = new HashMap<>();
src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java
+7 -6
View File
@@ -24,6 +24,7 @@ import com.budwk.app.sys.views.View_user;
import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.TeacherCongressDelegatePush;
import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate;
import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_union;
import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_unit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
@@ -227,15 +228,15 @@ public class TeacherCongressDelegatePushZgAuditController {
delegate.setSessionId(delegatePush.getSessionId());
Teacher_congress_delegation_union delegation_union = baseService.dao().fetch(Teacher_congress_delegation_union.class,
Cnd.where(Teacher_congress_delegation_union::getUnionId, "=", user.getUnionId())
Teacher_congress_delegation_unit delegation_unit = baseService.dao().fetch(Teacher_congress_delegation_unit.class,
Cnd.where(Teacher_congress_delegation_unit::getUnitId, "=", user.getUnitId())
.and(Teacher_congress_delegation_union::getSessionId, "=", delegatePush.getSessionId()));
if (ObjectUtil.isNotEmpty(delegation_union)) {
delegate.setDelegationId(delegation_union.getId());
userRole.setTcDelegationId(delegation_union.getId());
if (ObjectUtil.isNotEmpty(delegation_unit)) {
delegate.setDelegationId(delegation_unit.getId());
userRole.setTcDelegationId(delegation_unit.getId());
} else {
return Result.error(user.getUnionName() + "没有设置到代表团,请先在代表团管理里设置。");
return Result.error(user.getUnitName() + "没有设置到代表团,请先在代表团管理里设置。");
}
if ("正式代表".equals(delegatePush.getRepresentativeType())) {
Sys_role sys_role = baseService.dao().fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.TEACHER_CONGRESS_DELEGATE_FORMAL.name()));
src/main/java/com/budwk/app/zhgh/staffmanage/thirtyTeach/controller/ThirtyTeachController.java
+3 -3
View File
@@ -181,11 +181,11 @@ public class ThirtyTeachController {
for (ThirtyTeachTemp temp : teachTempList) {
if (StrUtil.isBlank(temp.getUserName())) {
temp.setResult("获取不到该用户的姓名！");
/* temp.setResult("获取不到该用户的姓名！");
errorInfos.add(temp);
break;
break;*/
} else if (StrUtil.isBlank(temp.getLoginName())) {
temp.setResult("获取不到该用户的出生日期！");
temp.setResult("获取不到该用户的工号！");
errorInfos.add(temp);
break;
}else if (StrUtil.isBlank(temp.getThirtyCertificateProcessingTime())) {