From e6eec0c6a21765ddaef2fad057041d39acb4c9af Mon Sep 17 00:00:00 2001 From: wangcl Date: Fri, 17 Dec 2021 10:22:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=85=AC=E5=8F=B8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=92=8C=E5=AE=A2=E6=88=B7=E4=BA=BA=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusiCustomerCompanyController.java | 4 ++ .../BusiCustomerPersonController.java | 43 ++++++++++--------- .../impl/BusiCustomerCompanyServiceImpl.java | 1 + .../templates/busi/company/company.html | 11 +++++ .../templates/busi/person/person.html | 9 +++- 5 files changed, 45 insertions(+), 23 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiCustomerCompanyController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiCustomerCompanyController.java index e33093e77..4491a44b3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiCustomerCompanyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiCustomerCompanyController.java @@ -86,6 +86,8 @@ public class BusiCustomerCompanyController extends BaseController { @PostMapping("/add") @ResponseBody public AjaxResult addSave(BusiCustomerCompany busiCustomerCompany) { + busiCustomerCompany.setCreateBy(getLoginName()); + busiCustomerCompany.getBusiCustomerPersonList().stream().forEach(person -> person.setCreateBy(getLoginName())); return toAjax(busiCustomerCompanyService.insertBusiCustomerCompany(busiCustomerCompany)); } @@ -107,6 +109,8 @@ public class BusiCustomerCompanyController extends BaseController { @PostMapping("/edit") @ResponseBody public AjaxResult editSave(BusiCustomerCompany busiCustomerCompany) { + busiCustomerCompany.setUpdateBy(getLoginName()); + busiCustomerCompany.getBusiCustomerPersonList().stream().forEach(person -> person.setCreateBy(getLoginName())); return toAjax(busiCustomerCompanyService.updateBusiCustomerCompany(busiCustomerCompany)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiCustomerPersonController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiCustomerPersonController.java index ed7b8b0b2..81e456a20 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiCustomerPersonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiCustomerPersonController.java @@ -1,6 +1,9 @@ package com.ruoyi.busi.controller; import java.util.List; + +import com.ruoyi.busi.domain.BusiCustomerCompany; +import com.ruoyi.busi.service.IBusiCustomerCompanyService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -21,23 +24,26 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 客户公司人员Controller - * + * * @author WangCL * @date 2021-12-16 */ @Controller @RequestMapping("/busi/person") -public class BusiCustomerPersonController extends BaseController -{ +public class BusiCustomerPersonController extends BaseController { private String prefix = "busi/person"; @Autowired private IBusiCustomerPersonService busiCustomerPersonService; + @Autowired + private IBusiCustomerCompanyService busiCustomerCompanyService; + @RequiresPermissions("busi:person:view") - @GetMapping() - public String person() - { + @GetMapping("/{companyId}") + public String person(@PathVariable("companyId") String companyId, ModelMap mmap) { + BusiCustomerCompany busiCustomerCompany = busiCustomerCompanyService.selectBusiCustomerCompanyById(companyId); + mmap.put("company", busiCustomerCompany == null ? new BusiCustomerCompany() : busiCustomerCompany); return prefix + "/person"; } @@ -47,8 +53,7 @@ public class BusiCustomerPersonController extends BaseController @RequiresPermissions("busi:person:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(BusiCustomerPerson busiCustomerPerson) - { + public TableDataInfo list(BusiCustomerPerson busiCustomerPerson) { startPage(); List list = busiCustomerPersonService.selectBusiCustomerPersonList(busiCustomerPerson); return getDataTable(list); @@ -61,8 +66,7 @@ public class BusiCustomerPersonController extends BaseController @Log(title = "客户公司人员", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(BusiCustomerPerson busiCustomerPerson) - { + public AjaxResult export(BusiCustomerPerson busiCustomerPerson) { List list = busiCustomerPersonService.selectBusiCustomerPersonList(busiCustomerPerson); ExcelUtil util = new ExcelUtil(BusiCustomerPerson.class); return util.exportExcel(list, "客户公司人员数据"); @@ -72,8 +76,7 @@ public class BusiCustomerPersonController extends BaseController * 新增客户公司人员 */ @GetMapping("/add") - public String add() - { + public String add() { return prefix + "/add"; } @@ -84,8 +87,8 @@ public class BusiCustomerPersonController extends BaseController @Log(title = "客户公司人员", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(BusiCustomerPerson busiCustomerPerson) - { + public AjaxResult addSave(BusiCustomerPerson busiCustomerPerson) { + busiCustomerPerson.setCreateBy(getLoginName()); return toAjax(busiCustomerPersonService.insertBusiCustomerPerson(busiCustomerPerson)); } @@ -93,8 +96,7 @@ public class BusiCustomerPersonController extends BaseController * 修改客户公司人员 */ @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") String id, ModelMap mmap) - { + public String edit(@PathVariable("id") String id, ModelMap mmap) { BusiCustomerPerson busiCustomerPerson = busiCustomerPersonService.selectBusiCustomerPersonById(id); mmap.put("busiCustomerPerson", busiCustomerPerson); return prefix + "/edit"; @@ -107,8 +109,8 @@ public class BusiCustomerPersonController extends BaseController @Log(title = "客户公司人员", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(BusiCustomerPerson busiCustomerPerson) - { + public AjaxResult editSave(BusiCustomerPerson busiCustomerPerson) { + busiCustomerPerson.setUpdateBy(getLoginName()); return toAjax(busiCustomerPersonService.updateBusiCustomerPerson(busiCustomerPerson)); } @@ -117,10 +119,9 @@ public class BusiCustomerPersonController extends BaseController */ @RequiresPermissions("busi:person:remove") @Log(title = "客户公司人员", businessType = BusinessType.DELETE) - @PostMapping( "/remove") + @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) - { + public AjaxResult remove(String ids) { return toAjax(busiCustomerPersonService.deleteBusiCustomerPersonByIds(ids)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCustomerCompanyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCustomerCompanyServiceImpl.java index 0653e0538..0cb05cc04 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCustomerCompanyServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCustomerCompanyServiceImpl.java @@ -122,6 +122,7 @@ public class BusiCustomerCompanyServiceImpl implements IBusiCustomerCompanyServi List list = new ArrayList(); for (BusiCustomerPerson busiCustomerPerson : busiCustomerPersonList) { + busiCustomerPerson.setCreateTime(DateUtils.getNowDate()); busiCustomerPerson.setCompanyId(id); list.add(busiCustomerPerson); } diff --git a/ruoyi-admin/src/main/resources/templates/busi/company/company.html b/ruoyi-admin/src/main/resources/templates/busi/company/company.html index 077da2871..2a0bc24ce 100644 --- a/ruoyi-admin/src/main/resources/templates/busi/company/company.html +++ b/ruoyi-admin/src/main/resources/templates/busi/company/company.html @@ -92,6 +92,11 @@ field: 'taxNumber', title: '纳税号' }, + { + field: 'createTime', + title: '创建时间', + sortable: true + }, { title: '操作', align: 'center', @@ -99,12 +104,18 @@ var actions = []; actions.push('编辑 '); actions.push('删除'); + actions.push(' 人员列表 '); return actions.join(''); } }] }; $.table.init(options); }); + /*进入人员列表-详细*/ + function detail(companyid, companyName) { + var url = ctx + "busi/person/" + companyid; + $.modal.openTab(companyName + "人员信息", url, true); + } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/person/person.html b/ruoyi-admin/src/main/resources/templates/busi/person/person.html index f262ba654..872ff4171 100644 --- a/ruoyi-admin/src/main/resources/templates/busi/person/person.html +++ b/ruoyi-admin/src/main/resources/templates/busi/person/person.html @@ -12,8 +12,8 @@
  • - - + +
  • @@ -105,6 +105,11 @@ return $.table.selectDictLabel(roleDatas, value); } }, + { + field: 'createTime', + title: '创建时间', + sortable: true + }, { title: '操作', align: 'center',