feat: 统一调整高校名
This commit is contained in:
@@ -362,7 +362,7 @@ public class SmsServiceImpl implements SmsService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 调用地大通讯平台 REST 接口。
|
* 调用浙江师范大学通讯平台 REST 接口。
|
||||||
*
|
*
|
||||||
* @param apiPath 具体接口路径
|
* @param apiPath 具体接口路径
|
||||||
* @param payload 发送报文
|
* @param payload 发送报文
|
||||||
|
|||||||
@@ -206,7 +206,7 @@ public class WkFailProcessor extends ViewProcessor {
|
|||||||
// new ServerRedirectView(authUrl).render(request, response, null);
|
// new ServerRedirectView(authUrl).render(request, response, null);
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// 武汉城市职业学院 跳转到企业微信cas登录页
|
// 浙江师范大学 跳转到企业微信cas登录页
|
||||||
String callBackUrl = propertiesProxy.get("wecom.wecom-client-host-url") + propertiesProxy.get("wecom.wecom-client-call-back-url") + "?redirect=" + redirect;
|
String callBackUrl = propertiesProxy.get("wecom.wecom-client-host-url") + propertiesProxy.get("wecom.wecom-client-call-back-url") + "?redirect=" + redirect;
|
||||||
String authUrl = propertiesProxy.get("wecom.wecom-server-login-url") + "?service=" + URLEncoder.encode(callBackUrl, StandardCharsets.UTF_8);
|
String authUrl = propertiesProxy.get("wecom.wecom-server-login-url") + "?service=" + URLEncoder.encode(callBackUrl, StandardCharsets.UTF_8);
|
||||||
log.info("auth:"+authUrl);
|
log.info("auth:"+authUrl);
|
||||||
|
|||||||
+1
-1
@@ -94,7 +94,7 @@ public class BuildHomeKpiWriteController {
|
|||||||
buildHomeKpiWriteService.exportDocx(id, os);
|
buildHomeKpiWriteService.exportDocx(id, os);
|
||||||
// 下载生成的文件
|
// 下载生成的文件
|
||||||
CommonDownloadUtil.download(
|
CommonDownloadUtil.download(
|
||||||
"中国地质大学分工会教职工之家建设考核评议自评表.docx",
|
"浙江师范大学分工会教职工之家建设考核评议自评表.docx",
|
||||||
os.toByteArray(),
|
os.toByteArray(),
|
||||||
response
|
response
|
||||||
);
|
);
|
||||||
|
|||||||
+1
-1
@@ -136,7 +136,7 @@ public class BuildHomeLogBookController {
|
|||||||
template.render(map).writeAndClose(os);
|
template.render(map).writeAndClose(os);
|
||||||
// 下载生成的文件
|
// 下载生成的文件
|
||||||
CommonDownloadUtil.download(
|
CommonDownloadUtil.download(
|
||||||
"中国地质大学分工会建家记录册.docx",
|
"浙江师范大学分工会建家记录册.docx",
|
||||||
os.toByteArray(),
|
os.toByteArray(),
|
||||||
response
|
response
|
||||||
);
|
);
|
||||||
|
|||||||
+5
-5
@@ -299,7 +299,7 @@ public class DifficultHelpReadingController {
|
|||||||
docData.put("bankCardNum", record.getString("bankCardNum"));
|
docData.put("bankCardNum", record.getString("bankCardNum"));
|
||||||
docData.put("reason", record.getString("reason"));
|
docData.put("reason", record.getString("reason"));
|
||||||
docData.put("applyTime", DateUtil.format(DateUtil.parse(record.getString("applyTime")), "yyyy年MM月dd日"));
|
docData.put("applyTime", DateUtil.format(DateUtil.parse(record.getString("applyTime")), "yyyy年MM月dd日"));
|
||||||
docData.put("schoolname", "中国地质大学(武汉)");
|
docData.put("schoolname", "浙江师范大学");
|
||||||
docData.put("year", DateUtil.format(DateUtil.parse(record.getString("applyTime")), "yyyy"));
|
docData.put("year", DateUtil.format(DateUtil.parse(record.getString("applyTime")), "yyyy"));
|
||||||
|
|
||||||
String familyListStr = record.getString("familyList");
|
String familyListStr = record.getString("familyList");
|
||||||
@@ -350,7 +350,7 @@ public class DifficultHelpReadingController {
|
|||||||
docData.put("bankCardNum", difficultHelp.getBankCardNum());
|
docData.put("bankCardNum", difficultHelp.getBankCardNum());
|
||||||
docData.put("reason", difficultHelp.getReason());
|
docData.put("reason", difficultHelp.getReason());
|
||||||
docData.put("applyTime", DateUtil.format(difficultHelp.getApplyTime(), "yyyy-MM-dd"));
|
docData.put("applyTime", DateUtil.format(difficultHelp.getApplyTime(), "yyyy-MM-dd"));
|
||||||
docData.put("schoolname","中国地质大学(武汉)");
|
docData.put("schoolname","浙江师范大学");
|
||||||
docData.put("year",DateUtil.format(difficultHelp.getApplyTime(), "yyyy"));
|
docData.put("year",DateUtil.format(difficultHelp.getApplyTime(), "yyyy"));
|
||||||
|
|
||||||
docData.put("familyList", difficultHelp.getFamilyList() != null ? difficultHelp.getFamilyList() : new ArrayList<>());
|
docData.put("familyList", difficultHelp.getFamilyList() != null ? difficultHelp.getFamilyList() : new ArrayList<>());
|
||||||
@@ -371,7 +371,7 @@ public class DifficultHelpReadingController {
|
|||||||
@At
|
@At
|
||||||
private void exportAsPDF(String templateName, HashMap<String, Object> docData,Configure config,
|
private void exportAsPDF(String templateName, HashMap<String, Object> docData,Configure config,
|
||||||
DifficultHelpInfo difficultHelp, HttpServletResponse response) throws Exception {
|
DifficultHelpInfo difficultHelp, HttpServletResponse response) throws Exception {
|
||||||
String fileName = "中国地质大学(武汉)困难慰问申请表_" + difficultHelp.getUserName() + "_" +
|
String fileName = "浙江师范大学困难慰问申请表_" + difficultHelp.getUserName() + "_" +
|
||||||
DateUtil.format(difficultHelp.getApplyTime(), "yyyyMMdd") + ".pdf";
|
DateUtil.format(difficultHelp.getApplyTime(), "yyyyMMdd") + ".pdf";
|
||||||
|
|
||||||
try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
|
try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
|
||||||
@@ -396,7 +396,7 @@ public class DifficultHelpReadingController {
|
|||||||
@At
|
@At
|
||||||
private void exportAsWord(String templateName, HashMap<String, Object> docData,Configure config,
|
private void exportAsWord(String templateName, HashMap<String, Object> docData,Configure config,
|
||||||
DifficultHelpInfo difficultHelp, HttpServletResponse response) throws Exception {
|
DifficultHelpInfo difficultHelp, HttpServletResponse response) throws Exception {
|
||||||
String fileName = "中国地质大学(武汉)困难慰问申请表_" + difficultHelp.getUserName() + "_" +
|
String fileName = "浙江师范大学困难慰问申请表_" + difficultHelp.getUserName() + "_" +
|
||||||
DateUtil.format(difficultHelp.getApplyTime(), "yyyyMMdd") + ".docx";
|
DateUtil.format(difficultHelp.getApplyTime(), "yyyyMMdd") + ".docx";
|
||||||
|
|
||||||
try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
|
try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
|
||||||
@@ -450,7 +450,7 @@ public class DifficultHelpReadingController {
|
|||||||
list.get(i).put("index", (i + 1));
|
list.get(i).put("index", (i + 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
result.put("schoolName", "中国地址大学(武汉)");
|
result.put("schoolName", "浙江师范大学");
|
||||||
result.put("year", DateUtil.format(new Date(), "yyyy"));
|
result.put("year", DateUtil.format(new Date(), "yyyy"));
|
||||||
result.put("applyTime", DateUtil.format(new Date(), "yyyy年MM月dd日"));
|
result.put("applyTime", DateUtil.format(new Date(), "yyyy年MM月dd日"));
|
||||||
result.put("proxyUserName",SecurityUtil.getUserUsername() );
|
result.put("proxyUserName",SecurityUtil.getUserUsername() );
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
redis:
|
redis:
|
||||||
host: 175.27.165.74
|
host: 175.27.165.74
|
||||||
port: 6379
|
port: 6379
|
||||||
database: 4
|
database: 5
|
||||||
mode: normal
|
mode: normal
|
||||||
password: ddss@2025
|
password: ddss@2025
|
||||||
jdbc:
|
jdbc:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
framework:
|
framework:
|
||||||
server:
|
server:
|
||||||
port: 8088
|
port: 8080
|
||||||
host: 0.0.0.0
|
host: 0.0.0.0
|
||||||
nutz:
|
nutz:
|
||||||
application:
|
application:
|
||||||
|
|||||||
@@ -76,6 +76,7 @@ redis:
|
|||||||
max_redir: 10
|
max_redir: 10
|
||||||
database: '${framework.redis.database}'
|
database: '${framework.redis.database}'
|
||||||
maxTotal: 850
|
maxTotal: 850
|
||||||
|
password: '${framework.redis.password}'
|
||||||
pool:
|
pool:
|
||||||
maxTotal: 900
|
maxTotal: 900
|
||||||
maxIdle: 500
|
maxIdle: 500
|
||||||
@@ -189,7 +190,7 @@ data-center:
|
|||||||
msg:
|
msg:
|
||||||
platform:
|
platform:
|
||||||
enabled: '${custom.msg.platform.enabled}'
|
enabled: '${custom.msg.platform.enabled}'
|
||||||
# 地大通讯平台基础地址,默认对接正式地址
|
# 浙江师范大学通讯平台基础地址,默认对接正式地址
|
||||||
base-url: '${custom.msg.platform.base-url}'
|
base-url: '${custom.msg.platform.base-url}'
|
||||||
# 授权系统名称,对应文档中的 tp_name
|
# 授权系统名称,对应文档中的 tp_name
|
||||||
tp-name: '${custom.msg.platform.tp-name}'
|
tp-name: '${custom.msg.platform.tp-name}'
|
||||||
|
|||||||
Binary file not shown.
@@ -56,7 +56,7 @@ layout("/layouts/platform.html"){
|
|||||||
|
|
||||||
<el-card class="mt10" shadow="never">
|
<el-card class="mt10" shadow="never">
|
||||||
<table-tool
|
<table-tool
|
||||||
:label="pageForm.status==='2'?('中国地质大学(武汉)'+pageForm.year+'年教职工运动会获奖个数汇总表'):'奖品名单'">
|
:label="pageForm.status==='2'?('浙江师范大学'+pageForm.year+'年教职工运动会获奖个数汇总表'):'奖品名单'">
|
||||||
<el-tag
|
<el-tag
|
||||||
:effect="pageForm.status===item.code?'dark':'plain'"
|
:effect="pageForm.status===item.code?'dark':'plain'"
|
||||||
:key="item.code"
|
:key="item.code"
|
||||||
@@ -76,7 +76,7 @@ layout("/layouts/platform.html"){
|
|||||||
<tr>
|
<tr>
|
||||||
<td class="text-center" colspan="11">
|
<td class="text-center" colspan="11">
|
||||||
<span v-if="activityList.find(v=>v.id === pageForm.activityId)">
|
<span v-if="activityList.find(v=>v.id === pageForm.activityId)">
|
||||||
中国地质大学(武汉){{ activityList.find(v=>v.id === pageForm.activityId).name }}
|
浙江师范大学{{ activityList.find(v=>v.id === pageForm.activityId).name }}
|
||||||
({{unionName}})获奖名单
|
({{unionName}})获奖名单
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ layout("/layouts/platform.html"){
|
|||||||
|
|
||||||
<!-- <el-form-item>-->
|
<!-- <el-form-item>-->
|
||||||
<!-- <el-checkbox v-model="isAgree">-->
|
<!-- <el-checkbox v-model="isAgree">-->
|
||||||
<!-- 本人自愿申请参加南昌大学教职工医疗互助“爱心”基金会,同意并遵守《南昌大学教职工医疗互助“爱心”基金管理办法》的相关规定。-->
|
<!-- 本人自愿申请参加浙江师范大学教职工医疗互助“爱心”基金会,同意并遵守《浙江师范大学教职工医疗互助“爱心”基金管理办法》的相关规定。-->
|
||||||
<!-- </el-checkbox>-->
|
<!-- </el-checkbox>-->
|
||||||
<!-- </el-form-item>-->
|
<!-- </el-form-item>-->
|
||||||
|
|
||||||
@@ -183,7 +183,7 @@ layout("/layouts/platform.html"){
|
|||||||
this.$refs.formRef.validate(valid => {
|
this.$refs.formRef.validate(valid => {
|
||||||
if (!valid) return
|
if (!valid) return
|
||||||
// if (!this.isAgree) {
|
// if (!this.isAgree) {
|
||||||
// this.$message.error("请先阅读并同意《南昌大学教职工医疗互助“爱心”基金管理办法》")
|
// this.$message.error("请先阅读并同意《浙江师范大学教职工医疗互助“爱心”基金管理办法》")
|
||||||
// return
|
// return
|
||||||
// }
|
// }
|
||||||
this.$confirm("您确定要提交吗?", "提示", {
|
this.$confirm("您确定要提交吗?", "提示", {
|
||||||
|
|||||||
+2
-2
@@ -63,7 +63,7 @@ layout("/layouts/platform.html"){
|
|||||||
</el-checkbox>
|
</el-checkbox>
|
||||||
<div style="cursor: pointer;" @click="isReadClick" class="ml5">
|
<div style="cursor: pointer;" @click="isReadClick" class="ml5">
|
||||||
<div style="color: #1e88e5">
|
<div style="color: #1e88e5">
|
||||||
中国地质大学(武汉)教职工重大疾病互助基金管理办法
|
浙江师范大学教职工重大疾病互助基金管理办法
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -137,7 +137,7 @@ layout("/layouts/platform.html"){
|
|||||||
this.$commonUtil.previewFile({
|
this.$commonUtil.previewFile({
|
||||||
suffix: "pdf",
|
suffix: "pdf",
|
||||||
downloadPath: "/platform/sys/file/download?id=15eblmambgh3hoj7hg20n4obsg",
|
downloadPath: "/platform/sys/file/download?id=15eblmambgh3hoj7hg20n4obsg",
|
||||||
name: "中国地质大学(武汉)教职工重大疾病互助基金管理办法.pdf",
|
name: "浙江师范大学教职工重大疾病互助基金管理办法.pdf",
|
||||||
id: "15eblmambgh3hoj7hg20n4obsg"
|
id: "15eblmambgh3hoj7hg20n4obsg"
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
+2
-2
@@ -92,7 +92,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
<div style="padding: 10px;">
|
<div style="padding: 10px;">
|
||||||
<van-checkbox v-model="formData.isRead" shape="square" @change="isReadChange">
|
<van-checkbox v-model="formData.isRead" shape="square" @change="isReadChange">
|
||||||
<div style="color:#246FB4;" @click.stop="isReadClick">
|
<div style="color:#246FB4;" @click.stop="isReadClick">
|
||||||
中国地质大学(武汉)教职工重大疾病互助基金管理办法
|
浙江师范大学教职工重大疾病互助基金管理办法
|
||||||
</div>
|
</div>
|
||||||
</van-checkbox>
|
</van-checkbox>
|
||||||
</div>
|
</div>
|
||||||
@@ -203,7 +203,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
this.$commonUtil.previewFile({
|
this.$commonUtil.previewFile({
|
||||||
suffix: "pdf",
|
suffix: "pdf",
|
||||||
downloadPath: "/platform/sys/file/download?id=orpgde84uggjmpflbob83tadan",
|
downloadPath: "/platform/sys/file/download?id=orpgde84uggjmpflbob83tadan",
|
||||||
name: "中国地质大学(武汉)教职工重大疾病互助基金管理办法.pdf",
|
name: "浙江师范大学教职工重大疾病互助基金管理办法.pdf",
|
||||||
id: "orpgde84uggjmpflbob83tadan"
|
id: "orpgde84uggjmpflbob83tadan"
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user