From 0f540d6c2c5dd5abdd3837fb24a3a5e7e34a677b Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 15 May 2024 20:19:46 +0800 Subject: [PATCH] md --- .../web/emis/EmisCustomerUserController.java | 6 +++++ .../emis/EmisMonthpayAccountController.java | 13 +++++++++- .../web/emis/EmisQuotePriceController.java | 4 ++- .../erp/web/emis/EmisSiteController.java | 5 ++++ .../erp/emis/domain/EmisCustomerUser.java | 21 +++++++++++---- .../mapper/EmisCustomerUserMapper.xml | 26 +++++++++++++------ 6 files changed, 60 insertions(+), 15 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java index f1b0d1ea8..6787f3b39 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.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.EmisDestination; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; @@ -63,6 +66,9 @@ public class EmisCustomerUserController extends BaseController // @PreAuthorize("@ss.hasPermi('emis:emisCustomerUser:list')") @RequestMapping("/listSimple") + @JacksonFilter(include= { + "monthlyPayCode","company", + },value= EmisCustomerUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) public TableDataInfo listSimple(EmisCustomerUser emisCustomerUser) { 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 116108295..1445bf910 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 @@ -15,6 +15,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; +import com.xdadan.erp.emis.domain.EmisCustomerUser; import com.xdadan.erp.emis.domain.EmisGoods; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -63,10 +64,20 @@ 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) + /** + * 获取月结卡信息 + * @param emisMonthpayAccount + * @return + */ + @JacksonFilter(include= {"custNo","custName","payee","salesmen","payeeName","salesmenName"},value= EmisMonthpayAccount.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @RequestMapping("/listSimple") public TableDataInfo listSimple(EmisMonthpayAccount emisMonthpayAccount) { +// startPage(); +// emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); +// List list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser); +// return getDataTable(list); + startPage(); List list = emisMonthpayAccountService.selectEmisMonthpayAccountList(emisMonthpayAccount); return getDataTable(list); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuotePriceController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuotePriceController.java index 11d42f7c4..d48613798 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuotePriceController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuotePriceController.java @@ -66,7 +66,9 @@ public class EmisQuotePriceController extends BaseController { startPage(); - emisQuotePrice.setUseSiteCode(getLoginUser().getUser().getOwnerSiteCode()); + if(StringUtils.isEmpty(emisQuotePrice.getUseSiteCode())) { + emisQuotePrice.setUseSiteCode(getLoginUser().getUser().getOwnerSiteCode()); + } List list = emisQuotePriceService.selectEmisQuotePriceList(emisQuotePrice); return getDataTable(list); diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java index 813999906..e34a03415 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java @@ -15,6 +15,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; +import com.xdadan.erp.emis.service.EmisBaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; @@ -50,6 +51,9 @@ public class EmisSiteController extends BaseController @Autowired private IEmisSiteService emisSiteService; + @Autowired + private EmisBaseService emisBaseService; + /** * 查询网点列表 */ @@ -62,6 +66,7 @@ public class EmisSiteController extends BaseController return getDataTable(list); } + /** * 查询网点-精简 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java index c19ddacc7..45a6c09fd 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java @@ -43,6 +43,8 @@ public class EmisCustomerUser extends BaseEntity private String customerNameEn; /* 客户简称 */ private String simpleName; + /* 业务联系人 */ + private String contact; /* 电话包含手机 */ private String phone; /* 手机号 */ @@ -100,16 +102,20 @@ public class EmisCustomerUser extends BaseEntity private String address; /* email */ private String email; - /* 发件国 */ + /* 寄件国 */ private String sendCountry; - /* 发件省 */ + /* 寄件省 */ private String sendProvince; - /* 发件区 */ + /* 寄件区 */ private String sendCity; - /* 发件区 */ + /* 寄件区 */ private String sendCounty; - /* 发件镇 */ + /* 寄件镇 */ private String sendTown; + /* 寄件人 */ + private String sendPerson; + /* 寄件电话 */ + private String sendPhone; /* 邮编 */ private String postCode; /* 启用状态 1-启用 0-未启用 */ @@ -132,6 +138,11 @@ public class EmisCustomerUser extends BaseEntity private String opEmpCode; /* 排序 */ private String orderNum; + /* 首次签约 */ + private String firstSigningDay; + + + //--------- /* 国家 */ private String countryName; diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml index d9bffe5a7..581b12788 100644 --- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml @@ -11,6 +11,7 @@ + @@ -44,6 +45,8 @@ + + @@ -55,6 +58,7 @@ + @@ -95,11 +99,8 @@ select a.emp_name from sys_user a where a.emp_code = #{code} limit 1 - - - - select id, customer_code, customer_name, customer_name_en, simple_name, phone, mobile, customer_type, settled_type, user_type, company, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, send_country, send_province, send_city, send_county, send_town, post_code, status, real_name, id_no, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_user + select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, send_country, send_province, send_city, send_county, send_town, send_person, send_phone, post_code, status, real_name, id_no, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, order_num, first_signing_day, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_user @@ -185,6 +186,7 @@ customer_name, customer_name_en, simple_name, + contact, phone, mobile, customer_type, @@ -218,6 +220,8 @@ send_city, send_county, send_town, + send_person, + send_phone, post_code, status, real_name, @@ -229,6 +233,7 @@ bl_sms, op_emp_code, order_num, + first_signing_day, remark, del_flag, create_by, @@ -244,6 +249,7 @@ #{customerName}, #{customerNameEn}, #{simpleName}, + #{contact}, #{phone}, #{mobile}, #{customerType}, @@ -277,6 +283,8 @@ #{sendCity}, #{sendCounty}, #{sendTown}, + #{sendPerson}, + #{sendPhone}, #{postCode}, #{status}, #{realName}, @@ -288,6 +296,7 @@ #{blSms}, #{opEmpCode}, #{orderNum}, + #{firstSigningDay}, #{remark}, #{delFlag}, #{createBy}, @@ -306,6 +315,7 @@ customer_name = #{customerName}, customer_name_en = #{customerNameEn}, simple_name = #{simpleName}, + contact = #{contact}, phone = #{phone}, mobile = #{mobile}, customer_type = #{customerType}, @@ -339,6 +349,8 @@ send_city = #{sendCity}, send_county = #{sendCounty}, send_town = #{sendTown}, + send_person = #{sendPerson}, + send_phone = #{sendPhone}, post_code = #{postCode}, status = #{status}, real_name = #{realName}, @@ -350,6 +362,7 @@ bl_sms = #{blSms}, op_emp_code = #{opEmpCode}, order_num = #{orderNum}, + first_signing_day = #{firstSigningDay}, remark = #{remark}, del_flag = #{delFlag}, create_by = #{createBy}, @@ -363,9 +376,6 @@ - - - update emis_customer_user set del_flag='1' where id = #{id}