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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
@jyuhsin
2025-05-27 15:08:04 +08:00
parent d1a95f1788 e60bb8c4ce
commit 0b5e7a173c
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/fitnessWalk/utils/WeAppCloudUtil.java
+3 -3
View File
@@ -25,11 +25,11 @@ import java.util.*;
*/
@IocBean
public class WeAppCloudUtil {
public static String ENV = "v3-0grh8ofi12c1e212";
public static String ENV = "cloud1-6ghjohj8f589452c";
private static final String APPID = "wxed550c6c0e92973f";
private static final String APPID = "wx6820cc6ed157a9b5";
private static final String APP_SECRET = "13068904da9d11980d3bad641e20a41d";
private static final String APP_SECRET = "3301c30b4b7cd3ed7e68a08dbdbfcc28";
@Inject
public RedisService redisService;
src/main/java/io/v/nutz/zhgh/trainSignUp/models/TrainSignUpActivity.java
+1 -1
View File
@@ -144,7 +144,7 @@ public class TrainSignUpActivity extends BaseModel implements Serializable, SysH
sysHomeActivity.setCover(this.getCover().get(0).getFilepath());
}
sysHomeActivity.setUrl("/platform/trainSingUp/manage/apply");
sysHomeActivity.setH5Url("/platform/mobile/trainSignUpActivity/trainInfo?activityId=" + this.getId() + "&endTime=" + DateUtil.format(this.getActivityEndTime(), "yyyy-MM-dd HH:mm:ss"));
sysHomeActivity.setH5Url("/platform/mobile/trainSignUpActivity/activityInfo?activityId=" + this.getId() + "&endTime=" + DateUtil.format(this.getActivityEndTime(), "yyyy-MM-dd HH:mm:ss"));
if (Lang.isNotEmpty(this.getActivitySignUpStartTime())) {
sysHomeActivity.setStartDate(this.getActivitySignUpStartTime());
sysHomeActivity.setEndDate(this.getActivitySignUpEndTime());
src/main/java/io/v/nutz/zhgh/welfare/controller/statistics/WelfareSingleController.java
+1 -1
View File
@@ -821,7 +821,7 @@ public class WelfareSingleController {
cnd.and("wpus.selectNum", "!=", 0);
cnd.andEX("u.unioncode", "=", welfareUnitCode);
//下次活动必须打开
//cnd.groupBy("wpus.selectUserId", "wpus.selectOptionId");
cnd.groupBy("wpus.selectUserId", "wpus.selectOptionId");
sql.setCondition(cnd);
List<NutMap> list = welfareSingleService.listMap(sql);
src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java
+2 -1
View File
@@ -1182,7 +1182,8 @@ public class WelfareSingleServiceImpl extends ViServiceImpl<WelfareProject> impl
} else {
list = this.unclaimedData(projectId, welfareUnitCode, null);
}
List<NutMap> list2 = list.stream().filter(v -> Strings.isNotBlank(v.getString("unionName"))).collect(Collectors.toList());
//List<NutMap> list2 = list.stream().filter(v -> Strings.isNotBlank(v.getString("unionName"))).collect(Collectors.toList());
List<NutMap> list2 = list;
List<WelfareExportEntityTc> welfareExportEntityTcList = list2.stream()
.map(map -> JSON.parseObject(JSON.toJSONString(map), WelfareExportEntityTc.class))
src/main/resources/views/mobile/train/activityInfo.html
+1 -1
View File
@@ -115,7 +115,7 @@ layout("/mobile/platform.html"){
</van-tab>
</van-tabs>
<van-button @click="toSign" color="#1867b0" block style="position: fixed; bottom: 0; z-index: 2">去报名</van-button>
<van-button @click="toSign" color="#1867b0" block style="position: fixed; bottom: 0; z-index: 2; font-size: 16px">去报名</van-button>
</div>
<script>
src/main/resources/views/platform/trainSingUp/manage/trainSignUpType.html
+3 -2
View File
@@ -115,8 +115,9 @@ layout("/layouts/platform.html"){
<el-table-column label="字段名称" prop="columnName">
<template scope="{row}">
<el-input v-model="row.columnName" placeholder="请输入字段名称"
:disabled="formData.isBringFamily === true && row.columnCode === 'xdqsrs'"></el-input>
<!-- <el-input v-model="row.columnName" placeholder="请输入字段名称"-->
<!-- :disabled="formData.isBringFamily === true && row.columnCode === 'xdqsrs'"></el-input>-->
<el-input v-model="row.columnName" placeholder="请输入字段名称"></el-input>
</template>
</el-table-column>