diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java index 6e14f26e..9ba10d93 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java @@ -137,7 +137,7 @@ public class ActivityCultureAuditActivityController { public Result doReview(@Param("data") String param, String id) { Dict args = Json.fromJson(Dict.class, param); ActivityTissue tissue = activityCultureService.dao().fetch(ActivityTissue.class, id); - if (tissue.getIsUnseal()!=null &&tissue.getIsUnseal() && args.getInt("submitType") == 1) { + if (args.getInt("submitType") == 1) { Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); activityCultureService.insertOrUpdate(sysHomeActivity); } 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 5be957ec..79cb27de 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 @@ -183,9 +183,11 @@ public class ActivityCultureUserStatisticsController { ActivityTissue tissue = dao.fetch(ActivityTissue.class, id); Sql sql = Sqls.create(""" SELECT - atp.* + atp.*, + us.idcard idCard FROM `activity_tissue_person` atp + left join sys_user us on us.id=atp.userId $condition """); Cnd cnd = Cnd.NEW(); @@ -221,7 +223,7 @@ public class ActivityCultureUserStatisticsController { entityList.add(new ExcelExportEntity("身份证号", "idCard", 20)); entityList.add(new ExcelExportEntity("单位", "unitName", 20)); entityList.add(new ExcelExportEntity("工会", "unionName", 20)); - if (tissue.getSignUpMethod() == 3) { + if (List.of(2,3).contains(tissue.getSignUpMethod())) { entityList.add(new ExcelExportEntity("报名人姓名", "applyUserUserName", 20)); } entityList.add(new ExcelExportEntity("报名时间", "applyDateTime", 20)); diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java index c82a6f3f..b8b94cd9 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java @@ -231,7 +231,7 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo @Column @Comment("是否开启") - @Default("0") + @Default("1") @ColDefine(type = ColType.BOOLEAN) private Boolean isUnseal; @@ -240,6 +240,16 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo @ColDefine(type = ColType.MYSQL_JSON) private List goods; + @Column + @Comment("主办单位") + @ColDefine(type = ColType.MYSQL_JSON) + private List hostUnitIds; + + @Column + @Comment("承办单位") + @ColDefine(type = ColType.MYSQL_JSON) + private List undertakeUnitIds; + @Column @Comment("报名表单配置") @ColDefine(type = ColType.MYSQL_JSON) diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java index a8bd3c37..60a048b5 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java @@ -159,15 +159,19 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl club.clubName, u.username, u.loginname, - abs.`name` projectTypeName + abs.`name` projectTypeName, + aus.groupName FROM activity_tissue tissue LEFT JOIN sys_union uni ON uni.id = tissue.unionId LEFT JOIN sys_club club ON club.id = tissue.clubId LEFT JOIN `vw_user` u ON u.id=tissue.userId LEFT JOIN activity_basic_settings abs ON abs.`code`=tissue.projectTypeCode + LEFT JOIN activity_user_scope aus on aus.groupId=tissue.groupId WHERE tissue.id = @id + GROUP BY + tissue.id """).setParam("id", id); NutMap nutMap = (NutMap) dao().execute(sql.setCallback(Sqls.callback.map())).getResult(); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvSurveyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvSurveyController.java index 03cbe753..664aed44 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvSurveyController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/h5controller/H5QsvSurveyController.java @@ -35,7 +35,7 @@ public class H5QsvSurveyController { private QsvUserAnswerRecordService qsvUserAnswerRecordService; @At("") - @Ok("beetl:/mobile/qsv/survey/index.html") + @Ok("beetl:/platform/zhghh5/dayofficework/qsv/survey/index.html") public void index() { } diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js index 451cbd97..afff3ae0 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js @@ -164,6 +164,34 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { + + + + + + + + + + + + + + + + @@ -571,7 +599,10 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { {prop: "mobile", label: "联系方式"}, {prop: "unitName", label: "所属单位"}, {prop: "unionName", label: "所属工会"} - ] + ], + + unitOptions: [], + clubOptions: [], } }, components: { @@ -592,6 +623,10 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { } }, methods: { + async getClubsByRole() { + const resp = await this.$axios.post("/platform/club/examine/apply/getClubsByRole") + return resp.data + }, // 保存 onSave() { this.$confirm("您确定保存吗？", "提示", { @@ -869,7 +904,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { }) return data }, - init(id) { + async init(id) { if (id) { this.activeName = "1" this.findOne(id) @@ -897,6 +932,12 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { this.$set(this.formData, "unionUserNumberLimit", data) }) } + this.clubOptions = await this.getClubsByRole() + this.clubOptions.map((v) => { + v.name = v.clubName + }) + const units = await this.$businessTool.listUnit() + this.unitOptions = this.clubOptions.concat(units) }, async queryUserByIds(ids) { const {data} = await this.$axios.post("/platform/activity/culture/applyActivity/queryUserByIds", {ids: JSON.stringify(ids)}) @@ -918,6 +959,8 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { if (data.startPlannedDate) data.plannedDate = [data.startPlannedDate, data.endPlannedDate] this.userData = clone(data.tissuePersonList) data.unionUserNumberLimit = JSON.parse(data.unionUserNumberLimit) + data.undertakeUnitIds = JSON.parse(data.undertakeUnitIds) + data.hostUnitIds = JSON.parse(data.hostUnitIds) this.formData = data if (!this.formData.unionUserNumberLimit) { this.getUnionData().then((data) => { diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js index 515b762f..25991115 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js @@ -41,6 +41,9 @@ const ACTIVITY_CULTURE_INFO_ACTIVITY = { {{ viewData.peopleNum || '暂无' }} + + {{ viewData.groupName || '暂无' }} + {{ viewData.address }} diff --git a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html index 2e7d3ebf..03a32413 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html @@ -326,14 +326,11 @@ layout("/layouts/platform.html"){ type: 'warning' }) if (confirm === "confirm") { - this.tableLoading = true - const resp = await $.get(loc() + '/selectOptionByLastYear', { + const resp = await this.$axios.post(loc() + '/selectOptionByLastYear', { projectId: this.pageForm.projectId }) - this.tableLoading = false if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) } else { this.notifyWarning(resp.msg) @@ -345,7 +342,7 @@ layout("/layouts/platform.html"){ this.selectByAdminDialogVisible = true }, async yearChange() { - const resp = await $.get("/platform/healthCheckup/project/mange/getHealthCheckupProject", {year: this.pageForm.year}) + const resp = await this.$axios.post("/platform/healthCheckup/project/mange/getHealthCheckupProject", {year: this.pageForm.year}) if (resp.code === 0) { this.projectOptions = resp.data if (resp.data && resp.data.length > 0) { @@ -360,7 +357,7 @@ layout("/layouts/platform.html"){ }, async getHealthCheckupSubject() { this.projectSubjectOptions = [] - const resp = await $.get("/platform/healthCheckup/project/mange/findOne", {id: this.pageForm.projectId}) + const resp = await this.$axios.post("/platform/healthCheckup/project/mange/findOne", {id: this.pageForm.projectId}) if (resp.code === 0) { if (resp.data) { this.projectInfo = resp.data @@ -372,7 +369,7 @@ layout("/layouts/platform.html"){ this.doSearch() }, async queryCampus() { - const resp = await $.get("/platform/healthCheckup/campus/queryCampus") + const resp = await this.$axios.post("/platform/healthCheckup/campus/queryCampus") if (resp.code === 0) { this.campusOptions = resp.data } else { @@ -406,7 +403,7 @@ layout("/layouts/platform.html"){ this.tableData = [] } - const resp = await $.post(loc() + '/pageData', this.pageForm) + const resp = await this.$axios.post(loc() + '/pageData', this.pageForm) if (resp.code === 0) { this.tableData = resp.data.tableList } @@ -454,7 +451,7 @@ layout("/layouts/platform.html"){ await this.pageUnionData(); }, async pageUnionData() { - const resp = await $.post(loc() + '/receivePageData', this.pageFormUnion) + const resp = await this.$axios.post(loc() + '/receivePageData', this.pageFormUnion) if (resp.code === 0) { this.$refs.guava.view() this.receive_tableColumns = resp.data.label diff --git a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/subjectForm.js b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/subjectForm.js index 3a9c579a..1c22aaf7 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/subjectForm.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/subjectForm.js @@ -195,9 +195,9 @@ const subjectForm = {
- + 从文本导入 diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/qsv/survey/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/qsv/survey/index.html new file mode 100644 index 00000000..484009f2 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/dayofficework/qsv/survey/index.html @@ -0,0 +1,292 @@ + + + + +
+ +
+

{{ activity.title }}

+
+
+

{{index+1}}、{{ subject.title }}

+
+ 多选 + 单选 + {{subject.score}}分 +
+ + + + + + + + + + + + +
+ +
+
+
+ {{isEnd ? '已结束' : '提交'}} +
+
+
+
+ + + +