From 5d01ca6aada102c0f7f01ac9b364b4a066a508c6 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Wed, 10 Sep 2025 16:49:01 +0800 Subject: [PATCH] commit --- .../basic/models/ActivityUserScope.java | 7 +- ...tivityCultureUserStatisticsController.java | 5 +- .../AssetStocktakingController.java | 12 +- .../zhghh5/activity/culture/applyUser.html | 20 +- .../zhghh5/activity/culture/signUp.html | 1 - .../asset/stocktaking/index.html | 168 +++++++++++++++ .../dayofficework/asset/stocktaking/info.js | 124 +++++++++++ .../asset/stocktaking/stocktakingForm.js | 192 ++++++++++++++++++ .../enrollmentRegistration/apply/index.html | 6 +- .../enrollmentRegistration/mine/index.html | 2 +- 10 files changed, 520 insertions(+), 17 deletions(-) create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/asset/stocktaking/index.html create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/asset/stocktaking/info.js create mode 100644 src/main/resources/views/platform/zhghh5/dayofficework/asset/stocktaking/stocktakingForm.js diff --git a/src/main/java/com/budwk/app/zhgh/activity/basic/models/ActivityUserScope.java b/src/main/java/com/budwk/app/zhgh/activity/basic/models/ActivityUserScope.java index 4e368cc4..e2517cd0 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/basic/models/ActivityUserScope.java +++ b/src/main/java/com/budwk/app/zhgh/activity/basic/models/ActivityUserScope.java @@ -3,7 +3,6 @@ package com.budwk.app.zhgh.activity.basic.models; import com.budwk.app.base.model.BaseModel; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import org.nutz.dao.entity.annotation.*; import java.io.Serial; @@ -16,9 +15,13 @@ import java.io.Serializable; */ @EqualsAndHashCode(callSuper = true) -@Table +@Table("activity_user_scope") @Data @Comment("活动人员范围设置") +@TableIndexes({ + @Index(name = "INDEX_ACTIVITY_USER_SCOPE_GROUPID", fields = {"groupId"}, unique = false), + @Index(name = "INDEX_ACTIVITY_USER_SCOPE_USERID", fields = {"userId"}, unique = false) +}) public class ActivityUserScope extends BaseModel implements Serializable { @Serial diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java index ef6daba6..e40a2342 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java @@ -6,7 +6,6 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.constant.RoleConstant; @@ -161,7 +160,9 @@ public class ActivityCultureUserStatisticsController { } } // 只查询流程实例状态为20的数据（已完成状态） - cnd.and("ins.state", "=", 20); + if (!List.of(40001).contains(activity_type)) { + cnd.and("ins.state", "=", 20); + } cnd.andEX("YEAR(tissue.startTime)", "=", year).desc("tissue.startTime"); sql.setCondition(cnd); return Result.success(activityCultureApplyUserService.list(sql)); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/asset/controller/AssetStocktakingController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/controller/AssetStocktakingController.java index 38e089d9..2f7fd956 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/asset/controller/AssetStocktakingController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/asset/controller/AssetStocktakingController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.dayofficework.asset.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; @@ -39,11 +40,16 @@ public class AssetStocktakingController { @SaCheckPermission("asset.stocktaking") public void index() { } + @At("/h5") + @Ok("beetl:/platform/zhghh5/dayofficework/asset/stocktaking/index.html") + @SaCheckPermission("h5.asset.stocktaking") + public void h5Index() { + } @At @ApiOperation("分页查询") - @SaCheckPermission("asset.stocktaking") + @SaCheckPermission(value = {"asset.stocktaking","h5.asset.stocktaking"}, mode = SaMode.OR) public Result pageData(AssetPageForm pageForm) { Sql sql = assetStocktakingService.getSql(pageForm); Pagination pagination = assetStocktakingService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); @@ -54,7 +60,7 @@ public class AssetStocktakingController { @ApiOperation("资产盘点提交") @Aop(TransAop.READ_COMMITTED) @SLog(type = "AssetStocktaking", tag = "资产盘点", msg = "提交了一条资产盘点信息") - @SaCheckPermission("asset.stocktaking") + @SaCheckPermission(value = {"asset.stocktaking","h5.asset.stocktaking"}, mode = SaMode.OR) public Result doSubmit(AssetStocktaking assetStocktaking) { assetStocktakingService.doSubmit(assetStocktaking); @@ -66,7 +72,7 @@ public class AssetStocktakingController { @ApiOperation("删除资产盘点") @Aop(TransAop.READ_COMMITTED) @SLog(type = "AssetStocktaking", tag = "资产盘点", msg = "删除了一条资产盘点信息") - @SaCheckPermission("asset.stocktaking") + @SaCheckPermission(value = {"asset.stocktaking","h5.asset.stocktaking"}, mode = SaMode.OR) public Result doDelete(String id,String assetStocktakingPlanId) { assetStocktakingService.doDelete(id,assetStocktakingPlanId); return Result.success(); diff --git a/src/main/resources/views/platform/zhghh5/activity/culture/applyUser.html b/src/main/resources/views/platform/zhghh5/activity/culture/applyUser.html index 70ccb58e..7817a123 100644 --- a/src/main/resources/views/platform/zhghh5/activity/culture/applyUser.html +++ b/src/main/resources/views/platform/zhghh5/activity/culture/applyUser.html @@ -8,8 +8,8 @@ layout("/layouts/platform_h5.html"){ } .list-card-body { - width: calc(100% - 140px); - display: flex; + /* width: calc(100% - 140px); + display: flex;*/ flex-direction: column; justify-content: space-between; } @@ -35,6 +35,9 @@ layout("/layouts/platform_h5.html"){ padding: 5px; border-radius: 5px; } + .list-card-img img{ + width: 100%; + }
@@ -44,6 +47,7 @@ layout("/layouts/platform_h5.html"){ + @@ -115,12 +119,13 @@ layout("/layouts/platform_h5.html"){ loading: false, refreshing: false, pageForm: { - state: 2, + state: 1, isEnrolledText: 0, year: new Date().getFullYear(), pageNumber: 1, pageSize: 5, - totalCount: 0 + totalCount: 0, + activity_type: 40001 }, yearList: [], isEnrolledOptions: [ @@ -134,7 +139,12 @@ layout("/layouts/platform_h5.html"){ ], subLoading: false, viewShow: false, - viewData: {} + viewData: {}, + activityTypeOptions: [ + { value: 40001, text: "校文化活动" }, + { value: 40002, text: "分工会文化活动" }, + { value: 40003, text: "协会文化活动" }, + ] } }, components: { diff --git a/src/main/resources/views/platform/zhghh5/activity/culture/signUp.html b/src/main/resources/views/platform/zhghh5/activity/culture/signUp.html index e6d1cab7..dab7902c 100644 --- a/src/main/resources/views/platform/zhghh5/activity/culture/signUp.html +++ b/src/main/resources/views/platform/zhghh5/activity/culture/signUp.html @@ -301,7 +301,6 @@ layout("/layouts/platform_h5.html"){ 取消报名 {{viewData.applyEndTime}}截止报名
-
活动已结束
diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/asset/stocktaking/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/asset/stocktaking/index.html new file mode 100644 index 00000000..ea205d82 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/dayofficework/asset/stocktaking/index.html @@ -0,0 +1,168 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/asset/stocktaking/info.js b/src/main/resources/views/platform/zhghh5/dayofficework/asset/stocktaking/info.js new file mode 100644 index 00000000..d1192e05 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/dayofficework/asset/stocktaking/info.js @@ -0,0 +1,124 @@ +const H5_ASSET_INFO = { + template: /*language=HTML*/ ` + + + + + + + + +
+ + + {{ viewData.assetNumber }} + + + {{ viewData.assetName }} + + + {{viewData.assetCategoryName}}（{{viewData.assetDepreciationYear}}年） + + + {{viewData.assetSpecs}} + + + {{viewData.assetSupplierName}} + + + {{viewData.assetFundingSubjectName}} + + + {{viewData.assetUnitPrice}} + + + {{viewData.assetQuantity}} + + + {{viewData.assetTypeCode===1?'校工会资产':'分工会资产'}} + + + {{$moment(viewData.assetUsedDate).format('YYYY-MM-DD')}} + + + {{$moment(viewData.assetRetiredAssetsDate).format('YYYY-MM-DD')}} + + + {{viewData.assetUseUserName}} + + + {{viewData.assetUseUnionName}} + + + {{viewData.assetStorageLocation}} + + + {{viewData.assetUsageStateName}} + + +
{{viewData.assetNotes}}
+ + +
+ +
+ + +
+ + `, + data() { + return { + visible: false, + viewData: {}, + row: null, + activeName: "1", + actionSheetRef: null + } + }, + methods: { + // 打开 + onOpen(row) { + this.activeName = "1" + this.row = row + this.visible = true + this.getInfo() + }, + // 获取申请信息 + getInfo() { + this.$axios.post('/platform/asset/manage/fondOneAsset', {id: this.row.id}).then((res) => { + if (res.code === 0) { + this.viewData = res.data + } + }) + }, + + } +} diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/asset/stocktaking/stocktakingForm.js b/src/main/resources/views/platform/zhghh5/dayofficework/asset/stocktaking/stocktakingForm.js new file mode 100644 index 00000000..487730de --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/dayofficework/asset/stocktaking/stocktakingForm.js @@ -0,0 +1,192 @@ +let H5_ASSET_STOCKTAKING_FORM = { + template: /*language=HTML*/ ` + +
+
+ + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + +
+ 提交 +
+ +
+
+ + `, + dicts: ["ASSET_USAGE_STATE"], + data() { + return { + visible: false, + viewData: {}, + row: null, + formData: {}, + assetUsageStateNameOption:[], + showAssetUsageStateNamePopup:false, + + assetUseUserOption:[], + assetUseNameShow:false, + searchKeyword:"" + } + }, + methods: { + // 打开 + async onOpen(row) { + this.row = row + this.$set(this.formData, "assetId", row.id) + this.$set(this.formData, "assetStocktakingPlanId", row.assetStocktakingPlanId) + this.$set(this.formData, "assetNumber", row.assetNumber) + this.$set(this.formData, "assetName", row.assetName) + this.$set(this.formData, "assetUsedDate", row.assetUsedDate) + this.$set(this.formData, "assetStorageLocation", row.assetStorageLocation) + this.assetUsageStateNameOption = await this.$businessTool.getDictOptions("ASSET_USAGE_STATE") + this.visible = true + }, + onAssetUsageStateNameConfirm(value,index){ + this.formData.assetUsageStateName = this.assetUsageStateNameOption[index].name + this.showAssetUsageStateNamePopup=false + }, + onUserSelect(o){ + this.$set(this.formData, "assetUseUserId", o.id) + this.$set(this.formData, "assetUseName", o.username) + this.assetUseNameShow = false + }, + searchAssetUseUser(val) { + $.get("/platform/asset/manage/searchAssetUseUser", {query: val}).then(resp => { + if (resp.code === 0) { + this.assetUseUserOption = resp.data + } + }) + }, + onSubmit() { + this.$refs.formRef.validate().then(() => { + this.$dialog.confirm({ + title: "提示", + message: "您确定要提交吗？" + }).then(() => { + let formData = clone(this.formData) + if (formData.assetFiles) { + formData.assetFiles = JSON.stringify(formData.assetFiles) + } + this.$axios.post("/platform/asset/stocktaking/doSubmit", formData).then(res => { + if (res.code === 0) { + this.$toast(res.msg) + this.visible = false + this.$emit("save_success") + } + }) + }) + }) + }, + } +} diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/apply/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/apply/index.html index c59b3358..98962b9b 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/apply/index.html @@ -403,7 +403,7 @@ layout("/layouts/platform_h5.html"){ }).then(res => { if (res.code === 0) { this.$toast.success("提交成功") - pjaxReplace("/platform/h5/enrollmentRegistration/apply/mine") + pjaxReplace("/platform/enrollmentRegistration/applyList/h5") } }) }).catch(() => { @@ -427,7 +427,7 @@ layout("/layouts/platform_h5.html"){ }).then(res => { if (res.code === 0) { this.$toast.success("提交成功") - pjaxReplace("/platform/h5/enrollmentRegistration/apply/mine") + pjaxReplace("/platform/enrollmentRegistration/applyList/h5") } }) }).catch(() => { @@ -454,7 +454,7 @@ layout("/layouts/platform_h5.html"){ }).then(res => { if (res.code === 0) { this.$toast.success("提交成功") - pjaxReplace("/platform/h5/enrollmentRegistration/apply/mine") + pjaxReplace("/platform/enrollmentRegistration/applyList/h5") } }) }).catch(() => { diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/mine/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/mine/index.html index 3b6f3a85..7fd2ac7f 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/mine/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/mine/index.html @@ -79,7 +79,7 @@ layout("/layouts/platform_h5.html"){ this.$refs.h5EnrollmentRegistrationInfoRef.onOpen(row) }, onEdit(row) { - pjaxReplace('/platform/h5/enrollmentRegistration/apply/index?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id) + pjaxReplace('/platform/enrollmentRegistration/apply/h5?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id) }, onDelete(id) { this.$dialog.confirm({