aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-15 20:19:46 +08:00
parent ce26290f68
commit 0f540d6c2c
6 changed files with 60 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
View File

@ -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();

13
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java
View File

@ -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<EmisCustomerUser> list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser);
// return getDataTable(list);
startPage();
List<EmisMonthpayAccount> list = emisMonthpayAccountService.selectEmisMonthpayAccountList(emisMonthpayAccount);
return getDataTable(list);

4
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisQuotePriceController.java
View File

@ -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<EmisQuotePrice> list = emisQuotePriceService.selectEmisQuotePriceList(emisQuotePrice);
return getDataTable(list);

5
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java
View File

@ -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);
}
/**
* 查询网点-精简
*/

21
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java
View File

@ -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;

26
emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
View File

@ -11,6 +11,7 @@
<result property="customerName" column="customer_name" />
<result property="customerNameEn" column="customer_name_en" />
<result property="simpleName" column="simple_name" />
<result property="contact" column="contact" />
<result property="phone" column="phone" />
<result property="mobile" column="mobile" />
<result property="customerType" column="customer_type" />
@ -44,6 +45,8 @@
<result property="sendCity" column="send_city" />
<result property="sendCounty" column="send_county" />
<result property="sendTown" column="send_town" />
<result property="sendPerson" column="send_person" />
<result property="sendPhone" column="send_phone" />
<result property="postCode" column="post_code" />
<result property="status" column="status" />
<result property="realName" column="real_name" />
@ -55,6 +58,7 @@
<result property="blSms" column="bl_sms" />
<result property="opEmpCode" column="op_emp_code" />
<result property="orderNum" column="order_num" />
<result property="firstSigningDay" column="first_signing_day" />
<result property="remark" column="remark" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
@ -95,11 +99,8 @@
select a.emp_name from sys_user a where a.emp_code = #{code} limit 1
</select>
<sql id="selectEmisCustomerUserVo">
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
</sql>
<select id="selectEmisCustomerUserList" parameterType="EmisCustomerUser" resultMap="EmisCustomerUserResult">
@ -172,7 +173,7 @@
</select>
<select id="selectEmisCustomerUserById" parameterType="Long" resultMap="EmisCustomerUserResult">
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
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 a
where a.id = #{id}
</select>
@ -185,6 +186,7 @@
<if test="customerName != null and customerName != ''">customer_name,</if>
<if test="customerNameEn != null and customerNameEn != ''">customer_name_en,</if>
<if test="simpleName != null and simpleName != ''">simple_name,</if>
<if test="contact != null and contact != ''">contact,</if>
<if test="phone != null and phone != ''">phone,</if>
<if test="mobile != null and mobile != ''">mobile,</if>
<if test="customerType != null and customerType != ''">customer_type,</if>
@ -218,6 +220,8 @@
<if test="sendCity != null and sendCity != ''">send_city,</if>
<if test="sendCounty != null and sendCounty != ''">send_county,</if>
<if test="sendTown != null and sendTown != ''">send_town,</if>
<if test="sendPerson != null and sendPerson != ''">send_person,</if>
<if test="sendPhone != null and sendPhone != ''">send_phone,</if>
<if test="postCode != null and postCode != ''">post_code,</if>
<if test="status != null and status != ''">status,</if>
<if test="realName != null and realName != ''">real_name,</if>
@ -229,6 +233,7 @@
<if test="blSms != null and blSms != ''">bl_sms,</if>
<if test="opEmpCode != null and opEmpCode != ''">op_emp_code,</if>
<if test="orderNum != null and orderNum != ''">order_num,</if>
<if test="firstSigningDay != null and firstSigningDay != ''">first_signing_day,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
@ -244,6 +249,7 @@
<if test="customerName != null and customerName != ''">#{customerName},</if>
<if test="customerNameEn != null and customerNameEn != ''">#{customerNameEn},</if>
<if test="simpleName != null and simpleName != ''">#{simpleName},</if>
<if test="contact != null and contact != ''">#{contact},</if>
<if test="phone != null and phone != ''">#{phone},</if>
<if test="mobile != null and mobile != ''">#{mobile},</if>
<if test="customerType != null and customerType != ''">#{customerType},</if>
@ -277,6 +283,8 @@
<if test="sendCity != null and sendCity != ''">#{sendCity},</if>
<if test="sendCounty != null and sendCounty != ''">#{sendCounty},</if>
<if test="sendTown != null and sendTown != ''">#{sendTown},</if>
<if test="sendPerson != null and sendPerson != ''">#{sendPerson},</if>
<if test="sendPhone != null and sendPhone != ''">#{sendPhone},</if>
<if test="postCode != null and postCode != ''">#{postCode},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="realName != null and realName != ''">#{realName},</if>
@ -288,6 +296,7 @@
<if test="blSms != null and blSms != ''">#{blSms},</if>
<if test="opEmpCode != null and opEmpCode != ''">#{opEmpCode},</if>
<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
<if test="firstSigningDay != null and firstSigningDay != ''">#{firstSigningDay},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
@ -306,6 +315,7 @@
<if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
<if test="customerNameEn != null and customerNameEn != ''">customer_name_en = #{customerNameEn},</if>
<if test="simpleName != null and simpleName != ''">simple_name = #{simpleName},</if>
<if test="contact != null and contact != ''">contact = #{contact},</if>
<if test="phone != null and phone != ''">phone = #{phone},</if>
<if test="mobile != null and mobile != ''">mobile = #{mobile},</if>
<if test="customerType != null and customerType != ''">customer_type = #{customerType},</if>
@ -339,6 +349,8 @@
<if test="sendCity != null and sendCity != ''">send_city = #{sendCity},</if>
<if test="sendCounty != null and sendCounty != ''">send_county = #{sendCounty},</if>
<if test="sendTown != null and sendTown != ''">send_town = #{sendTown},</if>
<if test="sendPerson != null and sendPerson != ''">send_person = #{sendPerson},</if>
<if test="sendPhone != null and sendPhone != ''">send_phone = #{sendPhone},</if>
<if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="realName != null and realName != ''">real_name = #{realName},</if>
@ -350,6 +362,7 @@
<if test="blSms != null and blSms != ''">bl_sms = #{blSms},</if>
<if test="opEmpCode != null and opEmpCode != ''">op_emp_code = #{opEmpCode},</if>
<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
<if test="firstSigningDay != null and firstSigningDay != ''">first_signing_day = #{firstSigningDay},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
@ -363,9 +376,6 @@
</update>
<delete id="deleteEmisCustomerUserById" parameterType="Long">
update emis_customer_user set del_flag='1' where id = #{id}
</delete>