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

commit

Browse Source
This commit is contained in:
c-zhangr1
2026-09-10 09:52:44 +08:00
parent ba3a985c40
commit 3080eaa2cb
10 changed files with 66 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/jarRepositories.xml
Generated
+15
View File
@@ -31,11 +31,26 @@
<option name="name" value="Maven Central repository" /> <option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" /> <option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="nutz-snapshots" />
<option name="name" value="nutz-snapshots" />
<option name="url" value="https://maven.aliyun.com/repository/public" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="jboss.community" /> <option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" /> <option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" /> <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://maven.aliyun.com/repository/public" />
</remote-repository>
<remote-repository>
<option name="id" value="nutz" />
<option name="name" value="nutz" />
<option name="url" value="https://maven.aliyun.com/repository/public" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="central" /> <option name="id" value="central" />
<option name="name" value="Central Repository" /> <option name="name" value="Central Repository" />
.idea/misc.xml
Generated
+1 -14
View File
@@ -8,18 +8,5 @@
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="adopt-15" project-jdk-type="JavaSDK" /> <component name="ProjectRootManager" version="2" languageLevel="JDK_15" project-jdk-name="15" project-jdk-type="JavaSDK" />
<component name="SvnBranchConfigurationManager">
<option name="myConfigurationMap">
<map>
<entry key="$PROJECT_DIR$">
<value>
<SvnBranchConfiguration>
<option name="trunkUrl" value="http://192.168.21.203:8443/svn/UNION_NSI" />
</SvnBranchConfiguration>
</value>
</entry>
</map>
</option>
</component>
</project> </project>
.idea/modules.xml
Generated
-8
View File
@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/mini.iml" filepath="$PROJECT_DIR$/mini.iml" />
</modules>
</component>
</project>
mini.iml
-8
View File
@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="AdditionalModuleElements">
<content url="file://$MODULE_DIR$" dumb="true">
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
</content>
</component>
</module>
src/main/java/io/v/nutz/activity/controller/site/SiteUnionProcessController.java
+2 -2
View File
@@ -133,7 +133,7 @@ public class SiteUnionProcessController {
String dyHomeReserve = "9020230075"; String dyHomeReserve = "9020230075";
// String dyHomeReserve = "2007080352"; // String dyHomeReserve = "2007080352";
//校工会审核人(邓研,苏新荣) //校工会审核人(邓研,苏新荣)
String schoolReserve = "2007080352,1996070092"; String schoolReserve = "1996070092";
// String schoolReserve = "2007080352"; // String schoolReserve = "2007080352";
if (isPass){ if (isPass){
@@ -151,7 +151,7 @@ public class SiteUnionProcessController {
// msgApi.sendQiyeMsgTemplate(sendUserLoginName,schoolReserve,"场地预约审核",auditUrl,schoolContent); // msgApi.sendQiyeMsgTemplate(sendUserLoginName,schoolReserve,"场地预约审核",auditUrl,schoolContent);
msgApi.sendMsg(schoolReserve,msgContent); msgApi.sendMsg(schoolReserve,msgContent);
} }
List<String> list = Lang.list("2007080352", "1996070092"); List<String> list = Lang.list("1996070092");
list.forEach(item -> { list.forEach(item -> {
msgApi.sendMsg(item,msgContent); msgApi.sendMsg(item,msgContent);
}); });
src/main/java/io/v/nutz/zgfw/handler/condolence/CondolenceMsgHandler.java
+2 -2
View File
@@ -43,7 +43,7 @@ public enum CondolenceMsgHandler {
NutMap nutMap = condolenceService.fetch(sql); NutMap nutMap = condolenceService.fetch(sql);
String msg = "您好!" + nutMap.getString("unionname") + "的" + nutMap.getString("username") + "申请的" String msg = "您好!" + nutMap.getString("unionname") + "的" + nutMap.getString("username") + "申请的"
+ nutMap.getString("typeName") + "慰问已经提交,请您登录到智慧工会系统职工服务>职工慰问下进行审核。"; + nutMap.getString("typeName") + "慰问已经提交,请您登录到智慧工会系统职工服务>职工慰问下进行审核。";
List<String> schoolLoginNames = Lang.list("2007080352", "1996070092", "1987070031"); List<String> schoolLoginNames = Lang.list("1996070092", "1987010012");
for (String loginname : schoolLoginNames) { for (String loginname : schoolLoginNames) {
msgApi.sendMsg(loginname, msg); msgApi.sendMsg(loginname, msg);
} }
@@ -94,7 +94,7 @@ public enum CondolenceMsgHandler {
NutMap nutMap = condolenceService.fetch(sql); NutMap nutMap = condolenceService.fetch(sql);
String msg = "您好!" + nutMap.getString("unionname") + "的" + nutMap.getString("username") + "申请的" String msg = "您好!" + nutMap.getString("unionname") + "的" + nutMap.getString("username") + "申请的"
+ nutMap.getString("typeName") + "慰问分工会主席已经审批通过,请您登录到智慧工会系统职工服务>职工慰问下进行审核。"; + nutMap.getString("typeName") + "慰问分工会主席已经审批通过,请您登录到智慧工会系统职工服务>职工慰问下进行审核。";
List<String> schoolLoginNames = Lang.list("1986110082", "1996070092", "1987070031"); List<String> schoolLoginNames = Lang.list("1986110082", "1996070092", "1987010012");
for (String loginname : schoolLoginNames) { for (String loginname : schoolLoginNames) {
msgApi.sendMsg(loginname, msg); msgApi.sendMsg(loginname, msg);
} }
src/main/java/io/v/nutz/zgfw/handler/condolence/CondolenceToDoHandler.java
+1 -1
View File
@@ -140,7 +140,7 @@ public enum CondolenceToDoHandler {
CREATE_SCHOOL_TASK() { CREATE_SCHOOL_TASK() {
@Override @Override
public void exec(Condolence condolence, String option) { public void exec(Condolence condolence, String option) {
List<String> schoolLoginNames = Lang.list("2007080352", "1996070092", "1987070031"); List<String> schoolLoginNames = Lang.list("1996070092", "1987010012");
localProcessService.createTask( localProcessService.createTask(
"condolence@" + condolence.getId(), "condolence@" + condolence.getId(),
"vice_chairman_review", "vice_chairman_review",
src/main/resources/views/platform/zgfw/condolence/apply.html
+43 -36
View File
@@ -102,42 +102,44 @@ layout("/layouts/platform.html"){
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-row gutter="60">--> <!-- 结婚、退休离岗慰问无需填写收款信息；不渲染表单项可同时避免触发对应必填校验。 -->
<el-col :span="12"> <template v-if="showPayeeFields">
<el-form-item prop="payee" label="收款人"> <el-col :span="12">
<el-select <el-form-item prop="payee" label="收款人">
style="width: 100%" <el-select
v-model="formData.payee" style="width: 100%"
filterable v-model="formData.payee"
clearable filterable
remote clearable
reserve-keyword remote
placeholder="请输入姓名或工号查找" reserve-keyword
:remote-method="userPayee" placeholder="请输入姓名或工号查找"
:loading="userLoading" :remote-method="userPayee"
@change="payeeChange"> :loading="userLoading"
<el-option @change="payeeChange">
v-for="item in userPayees" <el-option
:key="item.id" v-for="item in userPayees"
:label="item.username+'（'+item.loginname+'）'+'('+item.unitname+')'" :key="item.id"
:value="item.id"> :label="item.username+'（'+item.loginname+'）'+'('+item.unitname+')'"
</el-option> :value="item.id">
</el-select> </el-option>
</el-form-item> </el-select>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item prop="payee_bank_number" label="收款人银行卡"> <el-col :span="12">
<el-input placeholder="请填写银行卡号" v-model="formData.payee_bank_number" <el-form-item prop="payee_bank_number" label="收款人银行卡">
maxlength="30" <el-input placeholder="请填写银行卡号" v-model="formData.payee_bank_number"
type="text"></el-input> maxlength="30"
</el-form-item> type="text"></el-input>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item prop="payee_bank_name" label="收款人开户行"> <el-col :span="12">
<el-input placeholder="请填写开户行" v-model="formData.payee_bank_name" maxlength="30" <el-form-item prop="payee_bank_name" label="收款人开户行">
type="text"></el-input> <el-input placeholder="请填写开户行" v-model="formData.payee_bank_name" maxlength="30"
</el-form-item> type="text"></el-input>
</el-col> </el-form-item>
</el-col>
</template>
</el-row> </el-row>
<el-row gutter="60"> <el-row gutter="60">
@@ -444,6 +446,11 @@ layout("/layouts/platform.html"){
}*/ }*/
}, },
computed: { computed: {
showPayeeFields() {
const condolenceType = this.typeOptions.find(item => item.id === this.formData.type)
const hiddenTypeNames = ['会员结婚慰问', '会员退休离岗慰问']
return !condolenceType || !hiddenTypeNames.includes(condolenceType.name)
},
goodsAlbumFile() { goodsAlbumFile() {
const goodsAlbum = this.formData.goodsAlbum const goodsAlbum = this.formData.goodsAlbum
return goodsAlbum && goodsAlbum.length ? goodsAlbum[0] : null return goodsAlbum && goodsAlbum.length ? goodsAlbum[0] : null
target/maven-archiver/pom.properties
+1 -1
View File
@@ -1,4 +1,4 @@
#Created by Apache Maven 3.8.4 #Created by Apache Maven 3.6.3
groupId=io.v groupId=io.v
artifactId=mini artifactId=mini
version=5.3.0 version=5.3.0
target/test-classes/io/v/nutz/WebTestDemo.class
BIN
View File
Binary file not shown.