commit

src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingLeaveController.java

@@ -117,7 +117,6 @@ public class MeetingLeaveController {
 		cnd.and("info.userId", "=", SecurityUtil.getUserId());
 		cnd.and("ins.id", "is not", null);
 		cnd.andEX("mi.type", "=", type);
-		cnd.and("info.createdBy", "=", SecurityUtil.getUserId());
 		if(year != null) {
 			long startTime = DateUtil.parse(year + "-01-01").getTime();
 			long endTime = DateUtil.parse(year + "-12-31").getTime();

src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteRecordController.java

@@ -65,10 +65,12 @@ public class SiteRecordController {
 					ins.id AS instanceId,
 					ins.state instanceState,
 					ins.processDefineId instanceProcessDefineId,
-					t.displayName taskName
+					t.displayName taskName,
+					IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName
 				FROM
 					site_apply info
 					LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id
+					LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
 					LEFT JOIN (
 						SELECT
 							processInstanceId,

src/main/java/com/budwk/app/zhgh/dayofficework/site/service/impl/SiteApplyServiceImpl.java

@@ -36,6 +36,9 @@ public class SiteApplyServiceImpl extends BaseServiceImpl<SiteApply> implements
 	@Override
 	public Map<Boolean, String> validateApply(SiteApply apply, String day) {
 		SiteInfo siteInfo = dao().fetch(SiteInfo.class, apply.getSiteId());
+		if(apply.getJoinCount() > siteInfo.getMaxNum()) {
+			return Map.of(false, "预约人数最多为%s人".formatted(siteInfo.getMaxNum()));
+		}
 		Sql sql = Sqls.create("""
 					select
 						sa.*
@@ -49,6 +52,7 @@ public class SiteApplyServiceImpl extends BaseServiceImpl<SiteApply> implements
 		cnd.and(SiteApply::getApplyDay, "=", day);
 		cnd.and(SiteApply::getStartTime, "=", apply.getStartTime());
 		cnd.and(SiteApply::getEndTime, "=", apply.getEndTime());
+		cnd.andEX("sa.id", "!=", apply.getId());
 
 		List<Integer> stateList = List.of(ProcessInstanceStateEnum.DOING.getCode(), ProcessInstanceStateEnum.FINISHED.getCode(), ProcessInstanceStateEnum.PENDING.getCode());
 		cnd.and(ProcessInstance::getState, "in", stateList);