diff --git a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java index bc2957d..6211427 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java @@ -264,7 +264,7 @@ public class SysHomeController { // @CacheResult(cacheKey = "news", ignoreNull = true, cacheLiveTime = 60 * 60 * 24) public Result getNews() { // 定义要爬取的URL - String domain = "https://gh.hgu.edu.cn/index.htm"; + String domain = "https://gh.hgu.edu.cn"; try { // 使用Jsoup连接到URL并获取页面内容 Document doc = Jsoup.connect(domain).get(); diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java index e13bd2b..c14ed97 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java @@ -133,6 +133,7 @@ public class ActivityCultureApplyActivityController { } tissue.setUserId(SecurityUtil.getUserId()); tissue.setApplyTime(DateUtil.now()); + tissue.setIsUnseal(false); activityCultureService.insertOrUpdate(tissue); if (List.of(40002, 40003).contains(tissue.getActivity_type()) && tissue.getIsEnrollSystem()) { @@ -149,7 +150,7 @@ public class ActivityCultureApplyActivityController { } return Result.success(); } - if (tissue.getIsUnseal() && tissue.getIsEnrollSystem()) { + if (tissue.getIsEnrollSystem()) { Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); activityCultureService.insertOrUpdate(sysHomeActivity); } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeConfigController.java b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeConfigController.java index 600c32e..c7e9005 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeConfigController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteeConfigController.java @@ -59,12 +59,12 @@ public class ExecutiveCommitteeConfigController { sun.id as unionId, sun.name as unionName, sun.unionCode , - (SELECT count( 1 ) FROM vw_user where sun.id = unionId) as memberCount, + (SELECT count( 1 ) FROM teacher_congress_delegate where unionId =sun.id and sessionId=@sessionId) as dbCount, 0 as quotaCount FROM sys_union sun ORDER BY unionCode ASC - """); + """).setParam("sessionId",sessionId); List listMap = committeeConfigService.listMap(sql); config.setUnionQuotaList(listMap); } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java index 057839f..53aea30 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java @@ -15,6 +15,7 @@ import com.budwk.app.flow.constant.FlowConst; import com.budwk.app.flow.engine.FlowEngine; import com.budwk.app.flow.entity.ProcessInstance; import com.budwk.app.flow.entity.ProcessTask; +import com.budwk.app.flow.enums.ProcessInstanceStateEnum; import com.budwk.app.flow.enums.ProcessSubmitTypeEnum; import com.budwk.app.flow.enums.ProcessTaskStateEnum; import com.budwk.app.sys.views.View_user; @@ -123,8 +124,13 @@ public class TeacherCongressDelegatePushController { cnd.and(group); } cnd.desc("info.createdAt"); - if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) { - cnd.and("info.createdBy", "=", SecurityUtil.getUserId()); + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name())) { + if (AuthUtil.hasRole(RoleConstant.UNIT_PARTY_SECRETARY.name())) { + cnd.andEX("info.unionId", "=", SecurityUtil.getUnionId()); + } else { + cnd.and("info.createdBy", "=", SecurityUtil.getUserId()); + } + } sql.setCondition(cnd); Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); @@ -289,18 +295,36 @@ public class TeacherCongressDelegatePushController { Sql sql = Sqls.create(""" SELECT info.*, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariable, + ins.processDefineId instanceProcessDefineId, + t.id taskId, t.taskName AS taskKey, - t.displayName taskName + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariable FROM teacher_congress_delegate_push info LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id + AND t.taskState = 10 + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id $condition """); Cnd cnd = Cnd.NEW(); cnd.andEX("info.sessionId", "=", sessionId); cnd.andEX("info.unionId", "=", SecurityUtil.getUnionId()); - cnd.andEX("t.taskName", "=", "0cacd1e7-7bb2-47dd-818b-6a73062e0c62"); + SqlExpressionGroup group = new SqlExpressionGroup(); + group.or("t.taskName", "!=", "53ff0c2a-ba93-45e9-a9fd-db51cdab3080"); + group.or("t.taskName", "is", null); + cnd.and(group); + cnd.and("ins.state", "!=", ProcessInstanceStateEnum.REJECT.getCode()); cnd.groupBy("info.id"); sql.setCondition(cnd); List writeList = baseService.listMap(sql); @@ -328,6 +352,9 @@ public class TeacherCongressDelegatePushController { if (total > allocation.getAllocationNum()) { tips.append("上报总人数超出分配名额！"); } + if (total < allocation.getAllocationNum()) { + tips.append("上报总人数不满足分配名额！"); + } if (seniorTeacher < allocation.getSeniorTeaNum()) { tips.append("高级职称专任教师数不满足分配名额数！"); @@ -376,23 +403,7 @@ public class TeacherCongressDelegatePushController { Sql sql = Sqls.create(""" SELECT - info.*, - ins.id AS instanceId, - ins.businessNo, - ins.state instanceState, - ins.variable instanceVariale, - ins.processDefineId instanceProcessDefineId, - t.id taskId, - t.taskName AS taskKey, - t.displayName taskName, - t.taskType, - t.performType taskPerformType, - t.taskState, - t.finishTime, - t.taskParentId, - t.variable taskVariale, - IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke, - (SELECT MAX(id) FROM wf_process_task WHERE processInstanceId = ins.id AND taskName = 'startTask' AND taskState IN (10, 20)) AS startTaskId + info.* FROM teacher_congress_delegate_push info LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id @@ -401,10 +412,14 @@ public class TeacherCongressDelegatePushController { $condition """); Cnd cnd = Cnd.NEW(); + SqlExpressionGroup group = new SqlExpressionGroup(); + group.or("t.taskName", "=", "900217e4-4332-4a21-90dd-363b8be17801"); + group.or("t.taskName", "is", null); + cnd.and(group); + cnd.and("ins.state", "!=", ProcessInstanceStateEnum.REJECT.getCode()); cnd.andEX("info.sessionId", "=", sessionId); cnd.andEX("info.unionId", "=", unionId); cnd.andEX("info.representativeType", "=", "正式代表"); - cnd.and("ins.state", "=", ProcessTaskStateEnum.FINISHED.getCode()); sql.setCondition(cnd); List writeList = baseService.listMap(sql); diff --git a/src/main/resources/static/assets/platform/img/v4/xw.png b/src/main/resources/static/assets/platform/img/v4/xw.png new file mode 100644 index 0000000..c0ffbbb Binary files /dev/null and b/src/main/resources/static/assets/platform/img/v4/xw.png differ diff --git a/src/main/resources/views/layouts/v4/home/index.html b/src/main/resources/views/layouts/v4/home/index.html index 0b1f4b4..0199a22 100644 --- a/src/main/resources/views/layouts/v4/home/index.html +++ b/src/main/resources/views/layouts/v4/home/index.html @@ -86,7 +86,7 @@ layout("/layouts/v4/baseLayout.html"){ - + diff --git a/src/main/resources/views/layouts/v4/home/jcdt.js b/src/main/resources/views/layouts/v4/home/jcdt.js index aa0be87..736f7b1 100644 --- a/src/main/resources/views/layouts/v4/home/jcdt.js +++ b/src/main/resources/views/layouts/v4/home/jcdt.js @@ -4,21 +4,23 @@ const jcdt = {
基层动态 -
+
{{item.date}}
-
🆕
+
+ +
{{item.title}}
- + - +
@@ -120,7 +122,7 @@ const jcdt = { .jcdt-item .date { font-size: 20px; - font-weight: bold; + /*font-weight: bold;*/ white-space: nowrap; text-align: left; margin-bottom: 8px; diff --git a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html index e5045d5..6f7e1c3 100644 --- a/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html @@ -114,7 +114,7 @@ layout("/layouts/platform.html"){ }, tableColumns: [ {prop: 'unionName', label: '分工会名称', sortable: true}, - {prop: 'memberCount', label: '代表人数', sortable: true}, + {prop: 'dbCount', label: '代表人数', sortable: true}, {prop: 'quotaCount', label: '分配人数', sortable: true} ], formData: {}, diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html index e0f0af6..00eacbf 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html @@ -27,25 +27,28 @@ layout("/layouts/platform.html"){ - 正式代表预选 - - 列席代表预选 - - - - 正式代表提交上报 - + + + 导出 @@ -163,11 +166,12 @@ layout("/layouts/platform.html"){