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

福利

Browse Source
This commit is contained in:
Paidax
2025-01-16 20:41:17 +08:00
parent 6795c475df
commit 4beba06d11
7 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/MainLauncher.java
-10
View File
@@ -95,16 +95,6 @@ public class MainLauncher {
init_task();
init_proposal_undertake();
ioc.get(Globals.class);
try {
FTPClient ftpClient = new FTPClient();
ftpClient.connect(conf.get(PROP_SERVER_HOST, ""), conf.getInt(PROP_SERVER_PORT, 21));
ftpClient.login(conf.get(PROP_SERVER_USERNAME, ""), conf.get(PROP_SERVER_PASSWORD, ""));
ftpClient.enterLocalPassiveMode();
System.out.println("***************************=" + ftpClient.getReplyCode());
} catch (Exception e) {
e.printStackTrace();
}
}
/**
src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java
+1 -1
View File
@@ -252,7 +252,7 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
// 人员状态及在职状态更新
userPatUpService.renewUserState();
// 修改不在人事库的人员，删除角色
userPatUpService.deleteNotInSourceUser(true);
// userPatUpService.deleteNotInSourceUser(true);
//清除缓存
// sysUserService.clearCache();
// sysRoleService.clearCache();
src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java
+9 -9
View File
@@ -456,15 +456,15 @@ public class WelfareListController {
if (StrUtil.isNotBlank(courierNumberExcelMode.getOneCourierNumber())) {
courierNumberList.add(courierNumberExcelMode.getOneCourierNumber());
}
if (StrUtil.isNotBlank(courierNumberExcelMode.getTwoCourierNumber())) {
courierNumberList.add(courierNumberExcelMode.getTwoCourierNumber());
}
if (StrUtil.isNotBlank(courierNumberExcelMode.getThreeCourierNumber())) {
courierNumberList.add(courierNumberExcelMode.getThreeCourierNumber());
}
if (StrUtil.isNotBlank(courierNumberExcelMode.getFourCourierNumber())) {
courierNumberList.add(courierNumberExcelMode.getFourCourierNumber());
}
// if (StrUtil.isNotBlank(courierNumberExcelMode.getTwoCourierNumber())) {
// courierNumberList.add(courierNumberExcelMode.getTwoCourierNumber());
// }
// if (StrUtil.isNotBlank(courierNumberExcelMode.getThreeCourierNumber())) {
// courierNumberList.add(courierNumberExcelMode.getThreeCourierNumber());
// }
// if (StrUtil.isNotBlank(courierNumberExcelMode.getFourCourierNumber())) {
// courierNumberList.add(courierNumberExcelMode.getFourCourierNumber());
// }
for (String number : courierNumberList) {
WelfareCourierNumber courierNumber = new WelfareCourierNumber();
src/main/java/io/v/nutz/zhgh/welfare/mode/CourierNumberExcelMode.java
+1 -1
View File
@@ -12,7 +12,7 @@ public class CourierNumberExcelMode {
@Excel(name = "姓名", width = 20)
private String userName;
@Excel(name = "快递单号1", width = 30)
@Excel(name = "快递单号", width = 30)
private String oneCourierNumber;
@Excel(name = "快递单号2", width = 30)
src/main/resources/views/mobile/welfare/mine/myWelfare.html
+4 -4
View File
@@ -112,10 +112,10 @@ layout("/mobile/platform.html"){
<div slot="footer" style="margin-top: 10px;">
<van-button @click="openEvaluate(item)" plain round size="small">评价商品
</van-button>
<!-- <van-button @click="openExpress(item)" plain round size="small"-->
<!-- v-if="item.provideMode==3">-->
<!-- 物流信息-->
<!-- </van-button>-->
<van-button @click="openExpress(item)" plain round size="small"
v-if="item.provideMode==3">
物流信息
</van-button>
<van-button @click="openView(item)" plain round size="small">查看详情
</van-button>
</div>
src/main/resources/views/platform/welfare/list/ListMange.html
+7 -7
View File
@@ -371,13 +371,13 @@ layout("/layouts/platform.html"){
</div>
</template>
</el-table-column>
<!-- <el-table-column label="快递单号" prop="courierNumber" show-overflow-tooltip-->
<!-- v-if="pageFormProjectType===3">-->
<!-- <template scope="{row}">-->
<!-- <span @click="viewCourierNumber(row)" class="text-primary"-->
<!-- style="cursor: pointer">点击查看</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="快递单号" prop="courierNumber" show-overflow-tooltip
v-if="pageFormProjectType===3">
<template scope="{row}">
<span @click="viewCourierNumber(row)" class="text-primary"
style="cursor: pointer">点击查看</span>
</template>
</el-table-column>
<el-table-column label="收货地址" prop="receiveAddress" show-overflow-tooltip
v-if="pageFormProjectType===3"></el-table-column>
<el-table-column align="center" fixed="right"
src/main/resources/views/platform/welfare/mine.html
+12 -12
View File
@@ -42,6 +42,7 @@ layout("/layouts/platform.html"){
:clearable="true"
placeholder="选择年"
type="year"
style="width: 100%"
v-model="pageForm.year"
value-format="yyyy">
</el-date-picker>
@@ -111,26 +112,25 @@ layout("/layouts/platform.html"){
<span v-else>暂无</span>
</template>
<!-- <template scope="{row}" v-else-if="column.prop=='courierNumber'">-->
<!-- <span @click="viewCourierNumber(row)" class="text-primary"-->
<!-- style="cursor: pointer">点击查看</span>-->
<!-- </template>-->
<template scope="{row}" v-else-if="column.prop=='courierNumber'">
<span @click="viewCourierNumber(row)" class="text-primary"
style="cursor: pointer">点击查看</span>
</template>
</el-table-column>
<el-table-column align="center" fixed="right" header-align="center"
label="操作" prop="userOnline"
width="200px">
width="250px">
<template scope="{row}">
<el-button @click="openView(row)" size="mini" type="primary">
查看
</el-button>
<!-- <el-button :disabled="!row.courierNumber" @click="openExpress(row)"-->
<!-- size="mini"-->
<!-- type="primary">-->
<!-- 查看物流-->
<!-- </el-button>-->
<el-button :disabled="!row.courierNumber" @click="openExpress(row)"
size="mini"
type="primary">
查看物流
</el-button>
<el-button :disabled="!row.courierNumber" @click="openEvaluate(row)"
size="mini"
type="primary">
@@ -380,7 +380,7 @@ layout("/layouts/platform.html"){
{prop: 'isChoose', label: '是否选择'},
{prop: 'gist_list', label: '所选福利'},
{prop: 'receiveAddress', label: '收货地址'},
// {prop: 'courierNumber', label: '快递单号', sortable: true},
{prop: 'courierNumber', label: '快递单号', sortable: true},
],
formRules: {},