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

医疗互助系统：修复‘新增补助记录’的工号搜索时，列名重复问题；

Browse Source
This commit is contained in:
c-duxc1
2026-09-20 17:27:55 +08:00
parent f5095c72ad
commit 5c61ec443a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/sickHelp/service/impl/SickHelpImportServiceImpl.java
+1 -1
View File
@@ -180,7 +180,7 @@ public class SickHelpImportServiceImpl extends ViServiceImpl<SickHelp> implement
Cnd cnd = Cnd.where(Cnd.likeEX("m.userName", key)).or(Cnd.likeEX("m.loginName", key)); Cnd cnd = Cnd.where(Cnd.likeEX("m.userName", key)).or(Cnd.likeEX("m.loginName", key));
cnd.or(Cnd.likeEX("m.idcard", key)).or(Cnd.likeEX("u.idcard", key)); cnd.or(Cnd.likeEX("m.idcard", key)).or(Cnd.likeEX("u.idcard", key));
Sql sql = Sqls.create("select m.*, IFNULL(NULLIF(m.idcard, ''), u.idcard) AS idcard from sick_fund_member m left join user u on u.loginname = m.loginName $condition"); Sql sql = Sqls.create("select m.*, IFNULL(NULLIF(m.idcard, ''), u.idcard) AS effectiveIdcard from sick_fund_member m left join user u on u.loginname = m.loginName $condition");
sql.setCondition(cnd); sql.setCondition(cnd);
Pagination pagination = listPageMap(1, 10, sql); Pagination pagination = listPageMap(1, 10, sql);
return pagination.getList(); return pagination.getList();
src/main/resources/views/platform/sickHelp/import/form.html
+3 -3
View File
@@ -90,7 +90,7 @@ layout("/layouts/platform.html"){
v-model="formData.loginName"> v-model="formData.loginName">
<el-option <el-option
:key="item.loginName" :key="item.loginName"
:label="item.userName+'('+item.loginName+') '+(item.idcard || '')" :label="item.userName+'('+item.loginName+') '+(item.effectiveIdcard || '')"
:value="item.loginName" :value="item.loginName"
v-for="item in userList" v-for="item in userList"
></el-option> ></el-option>
@@ -382,7 +382,7 @@ layout("/layouts/platform.html"){
this.$set(this.formData, 'userName', user.userName) this.$set(this.formData, 'userName', user.userName)
this.$set(this.formData, 'unitName', user.unitName) this.$set(this.formData, 'unitName', user.unitName)
this.$set(this.formData, 'loginName', user.loginName) this.$set(this.formData, 'loginName', user.loginName)
this.$set(this.formData, 'idcard', user.idcard) this.$set(this.formData, 'idcard', user.effectiveIdcard)
await this.getHistoryApplyRecords(user.loginName, this.formData.year) await this.getHistoryApplyRecords(user.loginName, this.formData.year)
}, },
async getHistoryApplyRecords(loginName, year) { async getHistoryApplyRecords(loginName, year) {
@@ -409,7 +409,7 @@ layout("/layouts/platform.html"){
resp.data.year = resp.data.year.toString() resp.data.year = resp.data.year.toString()
this.formData = resp.data this.formData = resp.data
const user = this.userList.find(v => v.loginName === loginName) const user = this.userList.find(v => v.loginName === loginName)
this.$set(this.formData, 'idcard', user ? user.idcard : null) this.$set(this.formData, 'idcard', user ? user.effectiveIdcard : null)
await this.getHistoryApplyRecords(loginName, this.formData.year) await this.getHistoryApplyRecords(loginName, this.formData.year)
} }
}, },