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

commit

Browse Source
This commit is contained in:
@jyuhsin
2026-02-05 08:49:31 +08:00
parent 20b3443866
commit 982bee4ffa
9 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/flow/service/FlowCommonService.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class FlowCommonService {
args.put(FlowConst.TASK_FORM_DATA_PREFIX + "userName", SecurityUtil.getUserUsername());
args.put(FlowConst.TASK_FORM_DATA_PREFIX + "loginName", SecurityUtil.getUserLoginname());
args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unitId", SecurityUtil.getUnitId());
args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unitName", SecurityUtil.getUnitId());
args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unitName", SecurityUtil.getUnitName());
args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unionId", SecurityUtil.getUnionId());
if (ObjectUtil.equals(submitType, ProcessSubmitTypeEnum.ROLLBACK.getCode())) {
src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java
+1
View File
@@ -395,6 +395,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Sys_user> implements Sys
.set("loginname", Strings.sNull(user.getLoginname()))
.set("username", Strings.sNull(user.getUsername()))
.set("unitId", Strings.sNull(user.getUnitId()))
.set("unitName", Strings.sNull(user.getUnit().getName()))
.set("unitPath", Strings.sNull(user.getUnitPath()))
.set("unionId", ObjectUtil.isEmpty(user.getUnion()) ? "" : user.getUnion().getId())
.set("unionGroupId", Strings.sNull(viewUser.getUnionGroupId()))
src/main/java/com/budwk/app/web/commons/auth/utils/SecurityUtil.java
+4
View File
@@ -40,6 +40,10 @@ public class SecurityUtil {
return Strings.sNull(getSession().get("unitId"));
}
public static String getUnitName() {
return Strings.sNull(getSession().get("unitName"));
}
/**
* 获取当前用户工会ID
*/
src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java
+6 -4
View File
@@ -215,14 +215,15 @@ public class ProposalMineController {
SELECT
t1.loginName,
t1.userName,
t1.sex,
ifnull(t1.sex, u.sex) AS sex,
t1.unitName,
t1.unionName,
t1.mobile,
ifnull(t1.mobile, u.mobile) AS mobile,
t2.NAME AS delegationName
FROM
teacher_congress_delegate t1
LEFT JOIN teacher_congress_delegation t2 ON t2.id = t1.delegationId
LEFT JOIN vw_user u ON u.id = t1.userId
$condition
""");
Cnd cnd = Cnd.where("t1.sessionId", "=", sessionId);
@@ -281,14 +282,15 @@ public class ProposalMineController {
t1.userId,
t1.loginName,
t1.userName,
t1.sex,
ifnull(t1.sex, u.sex) AS sex,
t1.unitName,
t1.unionName,
t1.mobile,
ifnull(t1.mobile, u.mobile) AS mobile,
t2.NAME AS delegationName
FROM
teacher_congress_delegate t1
LEFT JOIN teacher_congress_delegation t2 ON t2.id = t1.delegationId
LEFT JOIN vw_user u ON u.id = t1.userId
$condition
""");
sql.setCondition(Cnd.where("t1.loginName", "in", seconders).groupBy("t1.loginName"));
src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalQueryComprehensiveParam.java
+7 -1
View File
@@ -71,7 +71,13 @@ public class ProposalQueryComprehensiveParam extends PageForm {
cnd = Cnd.NEW();
}
//教代会届次
cnd.andEX("info.sessionId", "=", searchParam.getSessionId());
SqlExpressionGroup expressionGroup = new SqlExpressionGroup();
expressionGroup.orEX("info.sessionId", "=", searchParam.getSessionId());
expressionGroup.orEX("info.sessionId", "in", searchParam.getSessionIds());
if(!expressionGroup.isEmpty()){
cnd.and(expressionGroup);
}
//提案名称
if (StrUtil.isNotBlank(searchParam.getName())) {
cnd.where().andLike("info.name", searchParam.getName());
src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html
+6 -6
View File
@@ -172,12 +172,12 @@ layout("/layouts/platform.html"){
</div>
<search @search="doSearch" class="mt10">
<search-item label="代表团">
<!--<search-item label="代表团">
<el-select clearable filterable placeholder="请选择所属代表团" v-model="pageForm.delegationId">
<el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in delegationOptions"></el-option>
</el-select>
</search-item>
</search-item>-->
<search-item label="所属工会">
<el-select clearable filterable placeholder="请选择所属工会" v-model="pageForm.unionId"
@change="pageForm.unitId=null;listUnit();">
@@ -329,20 +329,20 @@ layout("/layouts/platform.html"){
this.pageForm.delegationId = null
this.listDelegation()
},
listDelegation() {
/*listDelegation() {
this.$axios.post("/platform/proposal/common/listDelegation", {sessionId: this.pageForm.sessionId}).then((res) => {
if (res.code === 0) {
this.delegationOptions = res.data
}
})
},
},*/
listSession() {
this.$axios.post("/platform/proposal/common/listSession").then((res) => {
if (res.code === 0) {
this.sessionOptions = res.data
if (this.sessionOptions) {
this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
this.listDelegation()
/*this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
this.listDelegation()*/
this.pageData()
}
}
src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html
+9
View File
@@ -231,6 +231,14 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
// 是否有协办单位
let tf_helpunitreply;
if (this.formData.tf_slaveUnitIds && this.formData.tf_slaveUnitIds.length > 0) {
tf_helpunitreply = 'HAS_HELP_UNIT'
} else {
tf_helpunitreply = 'NO_HELP_UNIT'
}
const loading = createLoading('提交中')
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
@@ -239,6 +247,7 @@ layout("/layouts/platform.html"){
tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null,
tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
tf_helpunitreply: tf_helpunitreply
})
}).then((res) => {
if (res.code === 0) {
src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js
+9
View File
@@ -123,6 +123,14 @@ const merge = {
cancelButtonText: "取消",
type: "warning"
}).then(() => {
// 是否有协办单位
let tf_helpunitreply;
if (this.formData.tf_slaveUnitIds && this.formData.tf_slaveUnitIds.length > 0) {
tf_helpunitreply = 'HAS_HELP_UNIT'
} else {
tf_helpunitreply = 'NO_HELP_UNIT'
}
const loading = createLoading('提交中')
this.$axios.post("/platform/proposal/committeeFiling/merge", {
data: JSON.stringify({
@@ -132,6 +140,7 @@ const merge = {
tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null,
tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
tf_helpunitreply: tf_helpunitreply
})
}).then((res) => {
if (res.code === 0) {
src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html
+4 -2
View File
@@ -127,8 +127,8 @@ layout("/layouts/platform.html"){
},
openAudit(row) {
// 找这个代表团的副团长
this.$refs.guava.edit(() => {
this.showApprovalForm = true
this.formData = {
@@ -148,6 +148,8 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
console.log(this.formData)
return
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,