Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4

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);

src/main/resources/views/platform/zhgh/dayofficework/site/apply/apply.js

@@ -88,7 +88,9 @@ const apply = {
             allowTimeList: [],
             selectDayList: [],
             dialogVisible: false,
-            formData: {},
+            formData: {
+                applyCause: ',',
+            },
             formRules: {
                 applyUserId: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                 applyUserName: [{required: true, message: '必填', trigger: ['blur', 'change']}],

src/main/resources/views/platform/zhgh/dayofficework/site/record/index.html

@@ -102,7 +102,7 @@ layout("/layouts/platform.html"){
                     {prop: 'startTime', label: '开始时间'},
                     {prop: 'endTime', label: '结束时间'},
                     {prop: 'applyMobile', label: '联系方式'},
-                    {prop: 'taskName', label: '当前节点'},
+                    {prop: 'curTaskName', label: '当前节点'},
                     {prop: 'instanceState', label: '流程状态'},
                 ],
             }

src/main/resources/views/platform/zhgh/dayofficework/site/schoolUnionAudit/index.html

@@ -128,7 +128,7 @@ layout("/layouts/platform.html"){
                     {prop: 'startTime', label: '开始时间'},
                     {prop: 'endTime', label: '结束时间'},
                     {prop: 'applyMobile', label: '联系方式'},
-                    {prop: 'taskName', label: '当前节点'},
+                    {prop: 'curTaskName', label: '当前节点'},
                     {prop: 'instanceState', label: '流程状态'},
                 ],
                 typeOptions: [],

src/main/resources/views/platform/zhghh5/dayofficework/site/apply/apply.js

@@ -91,7 +91,7 @@ const apply = {
                     <div class="form-actions">
                         <van-button @click="formVisible = false" type="info" plain round>关闭</van-button>
                         <van-button @click="onSubmit" v-if="!taskId" type="info" round>提交</van-button>
-                        <van-button @click="onFinishTask" type="info" round>提交</van-button>
+                        <van-button @click="onFinishTask" v-else type="info" round>提交</van-button>
                     </div>
                 </van-form>
             </van-action-sheet>
@@ -112,7 +112,9 @@ const apply = {
             weekdayCNMap: {0: '周日', 1: '周一', 2: '周二', 3: '周三', 4: '周四', 5: '周五', 6: '周六'},
 
             formVisible: false,
-            formData: {},
+            formData: {
+                applyCause: '',
+            },
 
             calendarVisible: false,
         }

src/main/resources/views/platform/zhghh5/dayofficework/site/schoolUnionAudit/index.html

@@ -37,7 +37,7 @@ layout("/layouts/platform_h5.html"){
             <table-column label="预约日期">{{row.applyDay}}</table-column>
             <table-column label="开始时间">{{row.startTime}}</table-column>
             <table-column label="结束时间">{{row.endTime}}</table-column>
-            <table-column label="当前节点">{{row.taskName}}</table-column>
+            <table-column label="当前节点">{{row.curTaskName}}</table-column>
         </template>
         <template #actions="{index,row}">
             <div class="action-btn" @click="onView(row)">