From 34268b85cae2153a5724ded6d67daa43231d7c84 Mon Sep 17 00:00:00 2001 From: paidaxing444 <12qwaszx> Date: Sat, 10 Oct 2020 15:50:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=B9=BC=E5=84=BF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=92=8C=E7=B4=A7=E6=80=A5=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/benyi/child.js | 106 +-- ruoyi-ui/src/api/benyi/contactpeople.js | 9 + ruoyi-ui/src/views/benyi/child/index.vue | 659 ++++++++++++------ .../src/views/benyi/contactpeople/index.vue | 2 +- .../ByChildContactpeopleController.java | 15 + .../benyi/controller/ByChildController.java | 25 +- .../mapper/ByChildContactpeopleMapper.java | 8 + .../service/IByChildContactpeopleService.java | 8 + .../impl/ByChildContactpeopleServiceImpl.java | 11 + .../benyi/ByChildContactpeopleMapper.xml | 7 + 10 files changed, 574 insertions(+), 276 deletions(-) diff --git a/ruoyi-ui/src/api/benyi/child.js b/ruoyi-ui/src/api/benyi/child.js index 1b6426885..fdb052e81 100644 --- a/ruoyi-ui/src/api/benyi/child.js +++ b/ruoyi-ui/src/api/benyi/child.js @@ -2,96 +2,96 @@ import request from '@/utils/request' // 查询幼儿信息列表 export function listChild(query) { - return request({ - url: '/benyi/child/list', - method: 'get', - params: query - }) + return request({ + url: '/benyi/child/list', + method: 'get', + params: query + }) } // 查询幼儿信息列表 export function listByCheck(query) { - return request({ - url: '/benyi/child/listByCheck', - method: 'get', - params: query - }) + return request({ + url: '/benyi/child/listByCheck', + method: 'get', + params: query + }) } // 查询幼儿信息详细 export function getChild(id) { - return request({ - url: '/benyi/child/' + id, - method: 'get' - }) + return request({ + url: '/benyi/child/' + id, + method: 'get' + }) } // 查询维护幼儿详细 export function getChild_query(query) { - return request({ - url: '/benyi/child/getInfo', - method: 'get', - params: query - }) + return request({ + url: '/benyi/child/getInfo', + method: 'get', + params: query + }) } // 新增幼儿信息 export function addChild(data) { - return request({ - url: '/benyi/child', - method: 'post', - data: data - }) + return request({ + url: '/benyi/child', + method: 'post', + data: data + }) } // 修改幼儿信息 export function updateChild(data) { - return request({ - url: '/benyi/child', - method: 'put', - data: data - }) + return request({ + url: '/benyi/child', + method: 'put', + data: data + }) } // 修改幼儿信息 export function updateChild_tb(data, id) { - return request({ - url: '/benyi/child/' + id, - method: 'put', - data: data - }) + return request({ + url: '/benyi/child/' + id, + method: 'put', + data: data + }) } // 删除幼儿信息 export function delChild(id) { - return request({ - url: '/benyi/child/' + id, - method: 'delete' - }) + return request({ + url: '/benyi/child/' + id, + method: 'delete' + }) } // 导出幼儿信息 export function exportChild(query) { - return request({ - url: '/benyi/child/export', - method: 'get', - params: query - }) + return request({ + url: '/benyi/child/export', + method: 'get', + params: query + }) } // 查询班级信息列表 export function listChildCheck(query) { - return request({ - url: '/benyi/child/checklist', - method: 'get', - params: query - }) + return request({ + url: '/benyi/child/checklist', + method: 'get', + params: query + }) } // 下载用户导入模板 export function importTemplate() { - return request({ - url: '/benyi/child/importTemplate', - method: 'get' - }) - } \ No newline at end of file + return request({ + url: '/benyi/child/importTemplate', + method: 'get' + }) +} diff --git a/ruoyi-ui/src/api/benyi/contactpeople.js b/ruoyi-ui/src/api/benyi/contactpeople.js index dcc7cf1e2..d8465a9a5 100644 --- a/ruoyi-ui/src/api/benyi/contactpeople.js +++ b/ruoyi-ui/src/api/benyi/contactpeople.js @@ -17,6 +17,15 @@ export function getContactpeople(id) { }) } + +// 查询幼儿紧急情况联系人详细 +export function getContactpeopleByChildId(id) { + return request({ + url: '/benyi/contactpeople/bychild/' + id, + method: 'get' + }) +} + // 新增幼儿紧急情况联系人 export function addContactpeople(data) { return request({ diff --git a/ruoyi-ui/src/views/benyi/child/index.vue b/ruoyi-ui/src/views/benyi/child/index.vue index fef19279b..76b59a957 100644 --- a/ruoyi-ui/src/views/benyi/child/index.vue +++ b/ruoyi-ui/src/views/benyi/child/index.vue @@ -6,19 +6,19 @@ :inline="true" label-width="68px" > - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ dict.dictLabel }} - - - - - - - - - - - - - - {{ dict.dictLabel }} - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ dict.dictLabel }} + + + + + + + + + + + + + + {{ dict.dictLabel }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
确 定 取 消 @@ -503,6 +672,14 @@ import { updateChild_tb, importTemplate, } from "@/api/benyi/child"; +import { + listContactpeople, + getContactpeople, + getContactpeopleByChildId, + delContactpeople, + addContactpeople, + updateContactpeople, +} from "@/api/benyi/contactpeople"; import { listClass } from "@/api/system/class"; import { getToken } from "@/utils/auth"; @@ -569,6 +746,8 @@ export default { sourceOptions: [], //班级 classOptions: [], + //家庭关系 + jtgxOptions: [], //是否可编辑 isable: false, // 幼儿导入参数 @@ -630,6 +809,10 @@ export default { }, // 表单参数 form: {}, + // 表单参数 + form_jhr: {}, + //监护人验证 + rules_jhr: {}, // 表单校验 rules: { name: [ @@ -663,6 +846,9 @@ export default { this.getDicts("sys_dm_ryqd").then((response) => { this.sourceOptions = response.data; }); + this.getDicts("sys_dm_jtgx").then((response) => { + this.jtgxOptions = response.data; + }); this.getLink(); }, components: { @@ -826,6 +1012,29 @@ export default { this.diglogForm2.area = ""; this.resetForm("form"); + + this.form_jhr = { + id: undefined, + childid: undefined, + fathername: undefined, + fphone: undefined, + foffphone: undefined, + mothername: undefined, + mphone: undefined, + moffphone: undefined, + grandfathername: undefined, + gfgx: undefined, + gfphone: undefined, + gfoffphone: undefined, + gfaddress: undefined, + grandmothername: undefined, + gmgx: undefined, + gmphone: undefined, + gmaddress: undefined, + gmoffphone: undefined, + createTime: undefined, + }; + this.resetForm("form_jhr"); }, /** 搜索按钮操作 */ handleQuery() { @@ -850,10 +1059,10 @@ export default { this.title = "添加幼儿信息"; }, /** 修改按钮操作 */ - handleUpdate(row) { + async handleUpdate(row) { this.reset(); const id = row.id || this.ids; - getChild(id).then((response) => { + await getChild(id).then((response) => { this.form = response.data; this.diglogForm.province = response.data.birthProvincename; @@ -870,6 +1079,12 @@ export default { this.open = true; this.title = "修改幼儿信息"; + + //根据幼儿id获取监护人信息 + getContactpeopleByChildId(this.form.id).then((res) => { + // console.log("childid:" + this.form.id + ";jhr:" + res.data); + this.form_jhr = res.data; + }); }); }, /** 提交按钮 */ @@ -879,17 +1094,25 @@ export default { if (this.form.id != undefined) { updateChild(this.form).then((response) => { if (response.code === 200) { - this.msgSuccess("修改成功"); - this.open = false; - this.getList(); + updateContactpeople(this.form_jhr).then((res) => { + if (res.code === 200) { + this.msgSuccess("修改成功"); + this.open = false; + this.getList(); + } + }); } }); } else { addChild(this.form).then((response) => { + console.log(response); if (response.code === 200) { - this.msgSuccess("新增成功"); - this.open = false; - this.getList(); + this.form_jhr.childid = response.data; + addContactpeople(this.form_jhr).then((res) => { + this.msgSuccess("新增成功"); + this.open = false; + this.getList(); + }); } }); } @@ -941,7 +1164,7 @@ export default { }, //所在省市区触发联动方法 onSelected_brith(data) { - console.log("onSelected_brith=" + data); + // console.log("onSelected_brith=" + data); if ( data.province.code == undefined || data.city.code == undefined || @@ -959,7 +1182,7 @@ export default { }, //户口所在地 onSelected_registered(data) { - console.log("onSelected_registered=" + data); + // console.log("onSelected_registered=" + data); if ( data.province.code == undefined || data.city.code == undefined || @@ -977,7 +1200,7 @@ export default { }, //住址所在地 onSelected_addr(data) { - console.log("onSelected_addr=" + data); + // console.log("onSelected_addr=" + data); if ( data.province.code == undefined || data.city.code == undefined || diff --git a/ruoyi-ui/src/views/benyi/contactpeople/index.vue b/ruoyi-ui/src/views/benyi/contactpeople/index.vue index b509c75d8..a8ce424f6 100644 --- a/ruoyi-ui/src/views/benyi/contactpeople/index.vue +++ b/ruoyi-ui/src/views/benyi/contactpeople/index.vue @@ -121,7 +121,7 @@ - + list = byChildContactpeopleService.selectByChildContactpeopleList(byChildContactpeople); + if (list != null && list.size() > 0) { + byChildContactpeople = list.get(0); + } + return AjaxResult.success(byChildContactpeople); + } + /** * 新增幼儿紧急情况联系人 */ diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildController.java index bc3e955aa..b6b6eff00 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildController.java @@ -8,6 +8,8 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.framework.security.LoginUser; import com.ruoyi.framework.security.service.TokenService; +import com.ruoyi.project.benyi.domain.ByChildContactpeople; +import com.ruoyi.project.benyi.service.IByChildContactpeopleService; import com.ruoyi.project.common.SchoolCommon; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -44,6 +46,8 @@ public class ByChildController extends BaseController { private SchoolCommon schoolCommon; @Autowired private TokenService tokenService; + @Autowired + private IByChildContactpeopleService byChildContactpeopleService; /** * 查询幼儿信息列表 @@ -100,8 +104,8 @@ public class ByChildController extends BaseController { LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); String operName = loginUser.getUsername(); Long deptId = loginUser.getUser().getDeptId(); - String bjbh=schoolCommon.getClassId(); - String message = byChildService.importChild(childList, operName,deptId,bjbh); + String bjbh = schoolCommon.getClassId(); + String message = byChildService.importChild(childList, operName, deptId, bjbh); return AjaxResult.success(message); } @@ -145,7 +149,7 @@ public class ByChildController extends BaseController { @PreAuthorize("@ss.hasPermi('benyi:child:add')") @Log(title = "幼儿信息", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody ByChild byChild) { + public AjaxResult add(@RequestBody ByChild byChild, @RequestBody ByChildContactpeople byChildContactpeople) { //首先判断当前账户是否为幼儿园账号 if (schoolCommon.isSchool()) { //学校id @@ -156,7 +160,18 @@ public class ByChildController extends BaseController { if (schoolCommon.isStringEmpty(byChild.getClassid())) { byChild.setClassid(schoolCommon.getClassId()); } - return toAjax(byChildService.insertByChild(byChild)); + int i = byChildService.insertByChild(byChild); + Long chilId = byChild.getId(); + if (i > 0) { + chilId = byChild.getId(); +// System.out.println("newId:" + chilId); +// System.out.println("byChildContactpeople:" + byChildContactpeople); +// byChildContactpeople.setChildid(chilId); +// byChildContactpeopleService.insertByChildContactpeople(byChildContactpeople); + return AjaxResult.success(chilId.intValue()); + } else { + return AjaxResult.error("创建失败，请联系管理员"); + } } else { return AjaxResult.error("当前用户非幼儿园，无法添加幼儿"); } @@ -196,6 +211,8 @@ public class ByChildController extends BaseController { @Log(title = "幼儿信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { + //删除幼儿信息 同时删除幼儿联系人信息 + byChildContactpeopleService.deleteByChildContactpeopleByChildIds(ids); return toAjax(byChildService.deleteByChildByIds(ids)); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByChildContactpeopleMapper.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByChildContactpeopleMapper.java index cd748b05f..f4aa73746 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByChildContactpeopleMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByChildContactpeopleMapper.java @@ -58,4 +58,12 @@ public interface ByChildContactpeopleMapper { * @return 结果 */ public int deleteByChildContactpeopleByIds(Long[] ids); + + /** + * 批量删除幼儿紧急情况联系人 + * + * @param childIds 需要删除的幼儿紧急情况联系人ID + * @return 结果 + */ + public int deleteByChildContactpeopleByChildIds(Long[] childIds); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByChildContactpeopleService.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByChildContactpeopleService.java index 17e13de13..0533222d1 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByChildContactpeopleService.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByChildContactpeopleService.java @@ -58,4 +58,12 @@ public interface IByChildContactpeopleService { * @return 结果 */ public int deleteByChildContactpeopleById(Long id); + + /** + * 批量删除幼儿紧急情况联系人 + * + * @param childIds 需要删除的幼儿紧急情况联系人ID + * @return 结果 + */ + public int deleteByChildContactpeopleByChildIds(Long[] childIds); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByChildContactpeopleServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByChildContactpeopleServiceImpl.java index 36509ea59..dc8897695 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByChildContactpeopleServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByChildContactpeopleServiceImpl.java @@ -86,4 +86,15 @@ public class ByChildContactpeopleServiceImpl implements IByChildContactpeopleSer public int deleteByChildContactpeopleById(Long id) { return byChildContactpeopleMapper.deleteByChildContactpeopleById(id); } + + /** + * 批量删除幼儿紧急情况联系人 + * + * @param childIds 需要删除的幼儿紧急情况联系人ID + * @return 结果 + */ + @Override + public int deleteByChildContactpeopleByChildIds(Long[] childIds) { + return byChildContactpeopleMapper.deleteByChildContactpeopleByChildIds(childIds); + } } diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByChildContactpeopleMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByChildContactpeopleMapper.xml index b577ea6c6..8d7673895 100644 --- a/ruoyi/src/main/resources/mybatis/benyi/ByChildContactpeopleMapper.xml +++ b/ruoyi/src/main/resources/mybatis/benyi/ByChildContactpeopleMapper.xml @@ -149,4 +149,11 @@ + + delete from by_child_contactpeople where childid in + + #{childid} + + + \ No newline at end of file