From f0ea22821ee79fce2e090bc6e31625eff4b21af2 Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 24 Apr 2024 14:12:38 +0800 Subject: [PATCH] md --- .../erp/web/emis/EmisGoodsController.java | 4 +-- .../emis/EmisMonthpayAccountController.java | 12 +++++++ .../erp/web/emis/EmisRegionController.java | 7 ++++ .../erp/emis/domain/EmisMonthpayAccount.java | 12 +++++++ .../mapper/EmisMonthpayAccountMapper.xml | 32 +++++++++++++++++++ 5 files changed, 65 insertions(+), 2 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java index a2b6597ec..e1a9a9346 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java @@ -63,9 +63,9 @@ public class EmisGoodsController extends BaseController return getDataTable(list); } - @PreAuthorize("@ss.hasPermi('emis:emisGoods:list')") +// @PreAuthorize("@ss.hasPermi('emis:emisGoods:list')") @JacksonFilter(include= {"id","goodsSn","goodsName","goodsNameEn"},value= EmisGoods.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - @GetMapping("/listSimple") + @RequestMapping("/listSimple") public TableDataInfo listSimple(EmisGoods emisGoods) { startPage(); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java index 03f02dd2d..116108295 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java @@ -13,6 +13,9 @@ package com.xdadan.erp.web.emis; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; +import com.xdadan.erp.emis.domain.EmisGoods; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; @@ -60,6 +63,15 @@ public class EmisMonthpayAccountController extends BaseController return getDataTable(list); } + @JacksonFilter(include= {"custNo","custName","customerCode","custNameEn","custNameEn","payee","salesmen","email","payeeName","salesmenName"},value= EmisMonthpayAccount.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + @RequestMapping("/listSimple") + public TableDataInfo listSimple(EmisMonthpayAccount emisMonthpayAccount) + { + startPage(); + List list = emisMonthpayAccountService.selectEmisMonthpayAccountList(emisMonthpayAccount); + return getDataTable(list); + } + /** * 导出月结账户表列表 */ diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java index 33a24c5a6..86dca774e 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java @@ -68,6 +68,13 @@ public class EmisRegionController extends BaseController @GetMapping("/listSimple") public TableDataInfo listSimple(EmisRegion emisRegion) { + if(emisRegion.getRegionType() == null){ + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(500); + rspData.setMsg("参数错误,regionType必传"); + return rspData; + } + startPage(); List list = emisRegionService.selectEmisRegionList(emisRegion); return getDataTable(list); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayAccount.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayAccount.java index e452ce221..b6b97d91a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayAccount.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayAccount.java @@ -127,4 +127,16 @@ public class EmisMonthpayAccount extends BaseEntity /* 更新网点 */ private String updateSite; + + private String countryName; + private String provinceName; + private String cityName; + private String countyName; + + private String payeeName; + private String salesmenName; + private String ownerSiteName; + private String marketManName; + + } diff --git a/emis-biz/src/main/resources/mapper/EmisMonthpayAccountMapper.xml b/emis-biz/src/main/resources/mapper/EmisMonthpayAccountMapper.xml index 03a6bffda..d21b4a6f8 100644 --- a/emis-biz/src/main/resources/mapper/EmisMonthpayAccountMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisMonthpayAccountMapper.xml @@ -55,12 +55,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + select id, cust_no, cust_name, cust_name_en, customer_code, user_type, company, lic_no, biz_info, cust_level, country, province, city, county, address, sex, owner_site, contact, phone, email, status, payee, salesmen, market_man, invitation_info, contract_type, order_num, contract_content, contract_change_content, contract_startdate, contract_enddate, contract_signdate, contract_senddate, contract_recievedate, express_name, express_billcode, bank, account_no, invoice_address, financial_contact, sender, send_address, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_monthpay_account + + + + + + + + + +