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

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-12-29 13:44:10 +08:00
parent ade761a450
commit 088418ec4d
21 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/sys/controller/v4/SysV4AppsController.java
+3 -2
View File
@@ -137,7 +137,7 @@ public class SysV4AppsController {
@Ok("json:full")
@SaCheckLogin
@ApiOperation("获取收藏的应用")
public Result favorite(HttpServletRequest req) {
public Result favorite(String platform, HttpServletRequest req) {
Sql sql = Sqls.create("""
SELECT
m.id,
@@ -156,12 +156,13 @@ public class SysV4AppsController {
LEFT JOIN sys_module sm ON sm.id = m.moduleId
WHERE
f.userId = @userId
AND m.platform = 'PC'
AND m.platform = @platform
AND m.disabled = 0
ORDER BY
m.location ASC;
""");
sql.setParam("userId", SecurityUtil.getUserId());
sql.setParam("platform", platform);
List<NutMap> list = sysMenuService.listMap(sql);
return Result.success(list);
}
src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareBranchUnionController.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class ActivityDeclareBranchUnionController {
cnd.and("t.taskName", "=", "54f481d7-3239-4cd2-882d-e1cc18ea86eb");
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
cnd.andEX("info.applyTime", "=", pageParam.getYear());
cnd.andEX("year(info.applyTime)", "=", pageParam.getYear());
if (pageParam.getAudit()) {
cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareClubPrincipalController.java
+1 -1
View File
@@ -100,7 +100,7 @@ public class ActivityDeclareClubPrincipalController {
cnd.and("t.taskName", "=", "06d5979b-b52f-4df1-8974-087568322cd6");
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
cnd.andEX("info.applyTime", "=", pageParam.getYear());
cnd.andEX("year(info.applyTime)", "=", pageParam.getYear());
if (pageParam.getAudit()) {
cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java
+1 -1
View File
@@ -126,7 +126,7 @@ public class ActivityDeclareMineController {
""");
Cnd cnd = Cnd.NEW();
pageParam.buildSearch(cnd, "info.");
cnd.andEX("info.applyTime", "=", pageParam.getYear());
cnd.andEX("year(info.applyTime)", "=", pageParam.getYear());
if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) {
cnd.desc("info.applyTime");
} else {
src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolPrincipalController.java
+1 -1
View File
@@ -100,7 +100,7 @@ public class ActivityDeclareSchoolPrincipalController {
cnd.and("t.taskName", "=", "5b511275-143f-4ecd-8eff-7c8ad1456b1b");
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
cnd.andEX("info.applyTime", "=", pageParam.getYear());
cnd.andEX("year(info.applyTime)", "=", pageParam.getYear());
if (pageParam.getAudit()) {
cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class ActivityDeclareSchoolUnionController {
Cnd cnd = Cnd.NEW();
cnd.and("t.taskName", "=", "81428a9b-63c0-44b8-a28c-17d282c2cc8e");
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
cnd.andEX("info.applyTime", "=", pageParam.getYear());
cnd.andEX("year(info.applyTime)", "=", pageParam.getYear());
if (pageParam.getAudit()) {
cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java
+1 -1
View File
@@ -122,7 +122,7 @@ public class ClubUserJoinApplyController {
ClubUserApply userApply = dao.fetch(ClubUserApply.class, Cnd.where("userId", "=", clubUserApply.getUserId()).and("clubId", "=", clubUserApply.getClubId()).and("mode", "=", 1).desc(ClubUserApply::getApplyDate));
if (ObjectUtil.isNotEmpty(userApply) && StrUtil.isBlank(userApply.getId())) {
ProcessInstance processInstance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", userApply.getId()));
if (!processInstance.getState().equals(ProcessInstanceStateEnum.FINISHED.getCode())) {
if (!List.of(ProcessInstanceStateEnum.REJECT.getCode(),ProcessInstanceStateEnum.FINISHED.getCode()).contains(processInstance.getState())) {
return Result.error("您有该协会的申请记录尚未完成，请到我的申请里查看！");
}
}
src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserMineClubController.java
+9 -2
View File
@@ -4,6 +4,8 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.service.BaseService;
import com.budwk.app.flow.entity.ProcessInstance;
import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.club.model.ClubUser;
import com.budwk.app.zhgh.club.param.ClubUserPageForm;
@@ -47,7 +49,12 @@ public class ClubUserMineClubController {
return Result.success();
}
List<String> clubIds = query.stream().map(ClubUser::getClubId).toList();
Sql sql = Sqls.create("""
List<ProcessInstance> processInstance = dao.query(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "in", clubIds));
List<ProcessInstance> instanceList = processInstance.stream().filter(o -> o.getState().equals(ProcessInstanceStateEnum.FINISHED.getCode())).toList();
List<String> list = instanceList.stream().map(ProcessInstance::getBusinessNo).toList();
Sql sql = Sqls.create("""
SELECT
club.*,
COUNT(DISTINCT ( uc.userId )) AS currentPeopleNum,
@@ -64,7 +71,7 @@ public class ClubUserMineClubController {
""");
Cnd cnd = Cnd.NEW();
cnd.andEX("club.clubName", "=", pageForm.getClubName());
cnd.and("club.id", "in", clubIds);
cnd.and("club.id", "in", list);
cnd.groupBy("club.id");
cnd.asc("club.clubCode");
sql.setCondition(cnd);
src/main/resources/views/layouts/v4/apps.html
+1 -1
View File
@@ -565,7 +565,7 @@ layout("/layouts/v4/baseLayout.html"){
// 加载收藏的应用
loadFavorites() {
$.get("/platform/v4/apps/favorite")
$.get("/platform/v4/apps/favorite", {platform: 'PC'})
.then((result) => {
if (result.code === 0) {
this.applications = result.data || []
src/main/resources/views/layouts/v4/serv.html
+2 -2
View File
@@ -146,7 +146,7 @@ layout("/layouts/v4/baseLayout.html"){
flex: 1;
overflow-y: auto;
grid-auto-rows: min-content;
padding-top: 5px;
padding: 5px 0;
}
.app-card {
@@ -528,7 +528,7 @@ layout("/layouts/v4/baseLayout.html"){
// 加载收藏的应用
loadFavorites() {
$.get("/platform/v4/serv/favorite")
$.get("/platform/v4/serv/favorite", {platform: 'PC'})
.then((result) => {
if (result.code === 0) {
this.applications = result.data || []
src/main/resources/views/platform/zhgh/activity/family/manage/basicForm.js
+2 -2
View File
@@ -598,8 +598,8 @@ const basicForm = {
cloneData.activitySignUpEndTime = cloneData.activitySignTime !== undefined ? cloneData.activitySignTime[1] : null
cloneData.activityStartTime = cloneData.activityTime !== undefined ? cloneData.activityTime[0] : null
cloneData.activityEndTime = cloneData.activityTime !== undefined ? cloneData.activityTime[1] : null
if (cloneData.activityStartTime !== undefined && cloneData.activityStartTime !== null) {
cloneData.year = new Date(cloneData.activityStartTime).getFullYear()
if (cloneData.activitySignUpStartTime !== undefined && cloneData.activitySignUpStartTime !== null) {
cloneData.year = new Date(cloneData.activitySignUpStartTime).getFullYear()
}
cloneData.typeLimits = JSON.stringify(this.formData.typeLimits)
cloneData.courseList = JSON.stringify(cloneData.courseList)
src/main/resources/views/platform/zhgh/activity/fellowship/manage/basicForm.js
+2 -2
View File
@@ -592,8 +592,8 @@ const basicForm = {
cloneData.activitySignUpEndTime = cloneData.activitySignTime !== undefined ? cloneData.activitySignTime[1] : null
cloneData.activityStartTime = cloneData.activityTime !== undefined ? cloneData.activityTime[0] : null
cloneData.activityEndTime = cloneData.activityTime !== undefined ? cloneData.activityTime[1] : null
if (cloneData.activityStartTime !== undefined && cloneData.activityStartTime !== null) {
cloneData.year = new Date(cloneData.activityStartTime).getFullYear()
if (cloneData.activitySignUpStartTime !== undefined && cloneData.activitySignUpStartTime !== null) {
cloneData.year = new Date(cloneData.activitySignUpStartTime).getFullYear()
}
cloneData.typeLimits = JSON.stringify(this.formData.typeLimits)
cloneData.courseList = JSON.stringify(cloneData.courseList)
src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js
+2 -2
View File
@@ -551,8 +551,8 @@ const basicForm = {
cloneData.activitySignUpEndTime = cloneData.activitySignTime !== undefined ? cloneData.activitySignTime[1] : null
cloneData.activityStartTime = cloneData.activityTime !== undefined ? cloneData.activityTime[0] : null
cloneData.activityEndTime = cloneData.activityTime !== undefined ? cloneData.activityTime[1] : null
if (cloneData.activityStartTime !== undefined && cloneData.activityStartTime !== null) {
cloneData.year = new Date(cloneData.activityStartTime).getFullYear()
if (cloneData.activitySignUpStartTime !== undefined && cloneData.activitySignUpStartTime !== null) {
cloneData.year = new Date(cloneData.activitySignUpStartTime).getFullYear()
}
cloneData.typeLimits = JSON.stringify(this.formData.typeLimits)
cloneData.courseList = JSON.stringify(cloneData.courseList)
src/main/resources/views/platform/zhgh/dayofficework/article/query/index.html
+1 -1
View File
@@ -94,7 +94,7 @@ layout("/layouts/platform.html"){
created() {
this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
this.$businessTool.listClub().then((res) => (this.clubOptions = res))
this.$businessTool.listCLubByRole().then((res) => (this.clubOptions = res))
this.pageData()
}
})
src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html
+8
View File
@@ -123,6 +123,10 @@ layout("/layouts/platform.html"){
onSubmit() {
this.$refs.formRef.validate((valid) => {
if (valid) {
if(this.formData.clubId) {
const club = this.permission?.clubs.find(o => o.id === this.formData.clubId)
this.$set(this.formData, 'clubName', club.clubName)
}
this.$axios.post("/platform/article/write/submit", {
article: JSON.stringify(this.formData),
taskId: this.taskId,
@@ -144,6 +148,10 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
if(this.formData.clubId) {
const club = this.permission?.clubs.find(o => o.id === this.formData.clubId)
this.$set(this.formData, 'clubName', club.clubName)
}
this.$axios.post('/platform/article/write/submitAgain', {
article: JSON.stringify(this.formData),
taskId: GetQueryString("taskId")
src/main/resources/views/platform/zhgh/dayofficework/ghkh/khph.html
+1 -1
View File
@@ -40,7 +40,7 @@ layout("/layouts/platform.html"){
<el-table-column label="年度" prop="annual" header-align="center"
align="center">
</el-table-column>
<el-table-column label="分工会名称" prop="unionName" header-align="center"
<el-table-column label="分工会名称" prop="unionname" header-align="center"
show-overflow-tooltip
align="center" sortable></el-table-column>
<el-table-column label="线上得分" prop="xgh_score" header-align="center"
src/main/resources/views/platform/zhgh/dayofficework/literacy/manage/basicForm.js
+2 -2
View File
@@ -549,8 +549,8 @@ const basicForm = {
cloneData.activitySignUpEndTime = cloneData.activitySignTime !== undefined ? cloneData.activitySignTime[1] : null
cloneData.activityStartTime = cloneData.activityTime !== undefined ? cloneData.activityTime[0] : null
cloneData.activityEndTime = cloneData.activityTime !== undefined ? cloneData.activityTime[1] : null
if (cloneData.activityStartTime !== undefined && cloneData.activityStartTime !== null) {
cloneData.year = new Date(cloneData.activityStartTime).getFullYear()
if (cloneData.activitySignUpStartTime !== undefined && cloneData.activitySignUpStartTime !== null) {
cloneData.year = new Date(cloneData.activitySignUpStartTime).getFullYear()
}
cloneData.typeLimits = JSON.stringify(this.formData.typeLimits)
cloneData.courseList = JSON.stringify(cloneData.courseList)
src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meeting/approval/index.html
+1 -2
View File
@@ -47,7 +47,6 @@ layout("/layouts/platform.html"){
<el-table-column label="申请人" prop="createUserName"></el-table-column>
<el-table-column label="所属工会" prop="unionName"></el-table-column>
<el-table-column label="会议类型" prop="meetingType"></el-table-column>
<el-table-column label="会议时间" prop="meetingTime"></el-table-column>
<el-table-column label="当前节点" prop="curTaskName"></el-table-column>
<el-table-column label="流程状态" prop="instanceState">
<template slot-scope="{row}">
@@ -96,7 +95,7 @@ layout("/layouts/platform.html"){
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回修改</el-button>
<el-button @click="handleTaskAction(20)" size="small" type="danger">不同意</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
</el-row>
</div>
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html
+10 -10
View File
@@ -301,11 +301,11 @@ layout("/layouts/platform.html"){
this.$message.warning(result.msg)
return
}
// const bankRes = this.validateCard(this.formData.bankCardNum)
// if (bankRes.status === 0) {
// this.$message.warning(bankRes.msg)
// return;
// }
const bankRes = this.validateCard(this.formData.bankCardNum)
if (bankRes.status === 0) {
this.$message.warning(bankRes.msg)
return;
}
this.$axios.post('/platform/difficultHelp/apply/submit', {
data: JSON.stringify(this.formData)
@@ -334,11 +334,11 @@ layout("/layouts/platform.html"){
this.$message.warning(result.msg)
return
}
// const bankRes = this.validateCard(this.formData.bankCardNum)
// if (bankRes.status === 0) {
// this.$message.warning(bankRes.msg)
// return;
// }
const bankRes = this.validateCard(this.formData.bankCardNum)
if (bankRes.status === 0) {
this.$message.warning(bankRes.msg)
return;
}
this.$axios.post('/platform/difficultHelp/apply/submitAgain', {
data: JSON.stringify(this.formData),
src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html
+2 -2
View File
@@ -417,9 +417,9 @@ layout("/layouts/platform_h5.html"){
this.$set(this.formData, "userName", user.username);
this.$set(this.formData, "loginName", user.loginname);
this.$set(this.formData, "sex", user.sex);
this.$set(this.formData, "unitId", user.unitid);
this.$set(this.formData, "unitId", user.unitId);
this.$set(this.formData, "unitName", user.unitName);
this.$set(this.formData, "unionId", user.unionid);
this.$set(this.formData, "unionId", user.unionId);
this.$set(this.formData, "unionName", user.unionName);
this.$set(this.formData, "birthday", user.birthday);
this.$set(this.formData, "mobile", user.mobile);
src/main/resources/views/platform/zhghh5/sys/home/apps.js
+1 -1
View File
@@ -196,7 +196,7 @@ const apps = {
// 加载收藏的应用
loadFavorites() {
this.$axios.post("/platform/v4/apps/favorite")
this.$axios.post("/platform/v4/apps/favorite", {platform: 'H5'})
.then((result) => {
if (result.code === 0) {
this.applications = result.data || []