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 1445bf910..be7a8021c 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 @@ -17,6 +17,7 @@ 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 com.xdadan.erp.emis.service.IEmisCustomerUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; @@ -52,6 +53,9 @@ public class EmisMonthpayAccountController extends BaseController @Autowired private IEmisMonthpayAccountService emisMonthpayAccountService; + private IEmisCustomerUserService emisCustomerUserService; + + /** * 查询月结账户表列表 */ @@ -65,22 +69,22 @@ public class EmisMonthpayAccountController extends BaseController } /** - * 获取月结卡信息 - * @param emisMonthpayAccount + * 获取月结卡信息 注意,该接口单独重新包装,使用月结用户信息 + * @param emisCustomerUser * @return */ - @JacksonFilter(include= {"custNo","custName","payee","salesmen","payeeName","salesmenName"},value= EmisMonthpayAccount.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + @JacksonFilter(include= {"custNo","custName","payee","salesmen","payeeName","salesmenName"},value= EmisCustomerUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @RequestMapping("/listSimple") - public TableDataInfo listSimple(EmisMonthpayAccount emisMonthpayAccount) + public TableDataInfo listSimple(EmisCustomerUser emisCustomerUser) { -// startPage(); -// emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); -// List list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser); -// return getDataTable(list); - startPage(); - List list = emisMonthpayAccountService.selectEmisMonthpayAccountList(emisMonthpayAccount); + 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/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java index 30ce5ba71..bb752c71f 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 @@ -132,6 +132,11 @@ public class EmisCustomerUser extends BaseEntity //--------- + // 月结卡号别名 + private String custNo; + // 客户别名 + private String custName; + /* 国家 */ private String countryName; /* 省份 */ diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml index 679c6eb71..3acf44bff 100644 --- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml @@ -61,6 +61,9 @@ + + + @@ -103,9 +106,15 @@ and owner_site=#{ownerSite} + + and customer_name like concat('%', #{custName}, '%') + and id = #{id} and customer_code like concat('%', #{customerCode}, '%') and customer_name like concat('%', #{customerName}, '%') + + + and customer_name_en like concat('%', #{customerNameEn}, '%') and simple_name like concat('%', #{simpleName}, '%') and contact like concat('%', #{contact}, '%')