bug整改

src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/h5/H5ActivityWorksUploadCollectionController.java

@@ -56,17 +56,21 @@ public class H5ActivityWorksUploadCollectionController {
                   `activity_works_collection` awc
                   LEFT JOIN activity_user_scope aus ON aus.groupId = awc.activityGroupId
                   AND aus.userId = @userId
+                  $condition
                 """).setParam("userId", SecurityUtil.getUserId());
         Cnd cnd = Cnd.NEW();
         cnd.andEX("YEAR(awc.startDateTime)", "=", year);
-        //查询报名中
+        // 查询报名中
         if (activityType == 2) {
             cnd.and(new Static("now() > awc.startDateTime and now() < awc.endDateTime"));
-        }//查询已结束的
+        }
+        // 查询已结束的
         else if (activityType == 3) {
-            cnd.and(new Static("now() > awc.startDateTime"));
+            cnd.and(new Static("now() > awc.endDateTime"));
-        } else if (activityType == 4) {
+        }
-            cnd.and(new Static("now() < awc.endDateTime"));
+        // 查询未开始的
+        else if (activityType == 4) {
+            cnd.and(new Static("now() < awc.startDateTime"));
         }
         cnd.and("awc.enable", "=", 1);
         cnd.and("awc.type", "=", 1);

src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java

@@ -118,6 +118,8 @@ public class ClubRefreshReportController {
     public Object submit(@Param("data") SysClubRefresh clubRefresh) {
 
 		Cnd cnd = Cnd.NEW();
+        cnd.and("userId", "=", SecurityUtil.getUserId());
+//        cnd.and("clubId", "=", clubRefresh.getClubId());
         if(StrUtil.isNotBlank(clubRefresh.getId())) {
             cnd.and(SysClubRefresh::getId, "!=", clubRefresh.getId());
         }

src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java

@@ -195,8 +195,9 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl<SysClubExamineReg
                 """);
         cnd.andEX("YEAR(info.registerDate)", "=", pageForm.getYear());
         cnd.andEX("sc.id", "=", pageForm.getClubId());
+        if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())&& !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) {
             cnd.and("info.userId", "=", SecurityUtil.getUserId());
-
+        }
         cnd.groupBy("info.id");
         cnd.desc("registerDate");
         sql.setCondition(cnd);

src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleMineController.java

@@ -61,6 +61,7 @@ public class ArticleMineController {
                   info.unitName,
                   info.unionName,
                   info.submitTime,
+                  info.clubName,
                   ins.id AS instanceId,
                   ins.businessNo,
                   ins.state instanceState,
@@ -91,6 +92,7 @@ public class ArticleMineController {
             cnd.andEX("info.title", "LIKE", "%" + pageForm.getTitle().trim() + "%");
         }
         cnd.desc("info.submitTime");
+        cnd.groupBy("info.id");
         sql.setCondition(cnd);
         Pagination<NutMap> pageVO = articleService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
         return Result.success(pageVO);

src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleQueryController.java

@@ -51,6 +51,7 @@ public class ArticleQueryController {
                   info.unionName,
                   info.submitTime,
                   info.origin,
+                  info.clubName,
                   ins.id AS instanceId,
                   ins.businessNo,
                   ins.state instanceState,

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java

@@ -112,7 +112,7 @@ public class CondolenceMineController {
 		} else {
 			cnd.desc("info.createTime");
 		}
-
+		cnd.groupBy("info.id");
 		sql.setCondition(cnd);
 		Pagination<NutMap> pagination = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
 		return Result.success(pagination);

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpMineController.java

@@ -104,6 +104,7 @@ public class DifficultHelpMineController {
         } else {
             cnd.orderBy("info." + pageParam.getPageOrderName(), PageUtil.getOrder(pageParam.getPageOrderBy()));
         }
+        cnd.groupBy("info.id");
         sql.setCondition(cnd);
         Pagination<NutMap> pagination = difficultHelpCommonService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql);
         return Result.success().addData(pagination);

src/main/resources/views/platform/zhgh/club/common/clubUserJoin.js

@@ -18,7 +18,7 @@ const clubUserJoin = {
                         {{viewData.sex}}
                     </el-descriptions-item>
                     <el-descriptions-item label="出生年月">
-                        {{viewData.birthday}}
+                        {{$moment(viewData.birthday).format('YYYY-MM-DD')}}
                     </el-descriptions-item>
                     <el-descriptions-item label="联系电话">
                         {{viewData.mobile}}

src/main/resources/views/platform/zhgh/club/join/schoolUnionApproval/index.html

@@ -16,7 +16,7 @@ layout("/layouts/platform.html"){
                         @change="doSearch"
                     ></el-date-picker>
                 </search-item>
-                <search-item label="关键字">
+                <search-item label="姓名/工号">
                     <el-input clearable placeholder="请输入姓名或者工号查询" v-model="pageForm.searchKeyword"></el-input>
                 </search-item>
                 <search-item label="所属工会">

src/main/resources/views/platform/zhgh/dayofficework/article/mine/index.html

@@ -25,6 +25,11 @@ layout("/layouts/platform.html"){
                 <el-table-column prop="userName" label="投稿人姓名"></el-table-column>
                 <el-table-column prop="unitName" label="投稿人单位"></el-table-column>
                 <el-table-column prop="unionName" label="投稿人工会"></el-table-column>
+                <el-table-column v-if="tableData.some(row => row.clubName)" label="投稿人协会">
+                    <template slot-scope="{row}">
+                        <span>{{ row.clubName }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="submitTime" label="投稿时间"></el-table-column>
                 <el-table-column prop="taskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">

src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html

@@ -202,6 +202,7 @@ layout("/layouts/platform.html"){
 				pageForm.memberTypes = JSON.stringify(this.pageForm.memberTypes)
 				pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
 				pageForm.userStates = JSON.stringify(this.pageForm.userStates)
+				pageForm.age = JSON.stringify(this.pageForm.age)
 				const data = this.tableColumns.filter(item => this.checkedFields.includes(item.prop)).map(item => {
 					return {prop: item.prop, label: item.label}
 				})

src/main/resources/views/platform/zhghh5/club/common/clubUserJoin.js

@@ -9,7 +9,7 @@ const clubUserJoin = {
                         <van-cell title="姓名">{{ viewData.userName }}</van-cell>
                         <van-cell title="工号">{{ viewData.loginName }}</van-cell>
                         <van-cell title="性别">{{ viewData.sex }}</van-cell>
-                        <van-cell title="出生年月">{{ viewData.birthday }}</van-cell>
+                        <van-cell title="出生年月">{{$moment(viewData.birthday).format('YYYY-MM-DD')}}</van-cell>
                         <van-cell title="联系电话">{{ viewData.mobile }}</van-cell>
                         <van-cell title="电子信箱">{{ viewData.email }}</van-cell>
                         <van-cell title="分工会">{{ viewData.unionName }}</van-cell>