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-16 06:25:49 +08:00
parent 2d0ff2b8f0
commit a83405a83f
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletResponse;
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
import com.xdadan.erp.emis.domain.EmisCustomerUser; import com.xdadan.erp.emis.domain.EmisCustomerUser;
import com.xdadan.erp.emis.domain.EmisGoods; import com.xdadan.erp.emis.domain.EmisGoods;
import com.xdadan.erp.emis.service.IEmisCustomerUserService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -52,6 +53,9 @@ public class EmisMonthpayAccountController extends BaseController
@Autowired @Autowired
private IEmisMonthpayAccountService emisMonthpayAccountService; private IEmisMonthpayAccountService emisMonthpayAccountService;
private IEmisCustomerUserService emisCustomerUserService;
/** /**
* 查询月结账户表列表 * 查询月结账户表列表
*/ */
@ -65,22 +69,22 @@ public class EmisMonthpayAccountController extends BaseController
} }
/** /**
* 获取月结卡信息 * 获取月结卡信息 注意，该接口单独重新包装，使用月结用户信息
* @param emisMonthpayAccount * @param emisCustomerUser
* @return * @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") @RequestMapping("/listSimple")
public TableDataInfo listSimple(EmisMonthpayAccount emisMonthpayAccount) public TableDataInfo listSimple(EmisCustomerUser emisCustomerUser)
{ {
// startPage();
// emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode());
// List<EmisCustomerUser> list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser);
// return getDataTable(list);
startPage(); startPage();
List<EmisMonthpayAccount> list = emisMonthpayAccountService.selectEmisMonthpayAccountList(emisMonthpayAccount); emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode());
List<EmisCustomerUser> list = emisCustomerUserService.selectEmisCustomerUserList(emisCustomerUser);
return getDataTable(list); return getDataTable(list);
// startPage();
// List<EmisMonthpayAccount> list = emisMonthpayAccountService.selectEmisMonthpayAccountList(emisMonthpayAccount);
// return getDataTable(list);
} }
/** /**

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

@ -132,6 +132,11 @@ public class EmisCustomerUser extends BaseEntity
//--------- //---------
// 月结卡号别名
private String custNo;
// 客户别名
private String custName;
/* 国家 */ /* 国家 */
private String countryName; private String countryName;
/* 省份 */ /* 省份 */

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

@ -61,6 +61,9 @@
<result property="createSite" column="create_site" /> <result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" /> <result property="updateSite" column="update_site" />
<result property="custNo" column="monthly_pay_code" />
<result property="custName" column="customer_name" />
<association property="countryName" column="country" select="selectCountryNameByCode"/> <association property="countryName" column="country" select="selectCountryNameByCode"/>
<association property="provinceName" column="province" select="selectRegionNameByCode"/> <association property="provinceName" column="province" select="selectRegionNameByCode"/>
<association property="cityName" column="city" select="selectRegionNameByCode"/> <association property="cityName" column="city" select="selectRegionNameByCode"/>
@ -103,9 +106,15 @@
<if test="ownerSite != null and ownerSite != ''"> <if test="ownerSite != null and ownerSite != ''">
and owner_site=#{ownerSite} and owner_site=#{ownerSite}
</if> </if>
<if test="custName != null and custName != ''"> and customer_name like concat('%', #{custName}, '%')</if>
<if test="id != null "> and id = #{id}</if> <if test="id != null "> and id = #{id}</if>
<if test="customerCode != null and customerCode != ''"> and customer_code like concat('%', #{customerCode}, '%')</if> <if test="customerCode != null and customerCode != ''"> and customer_code like concat('%', #{customerCode}, '%')</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if> <if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="customerNameEn != null and customerNameEn != ''"> and customer_name_en like concat('%', #{customerNameEn}, '%')</if> <if test="customerNameEn != null and customerNameEn != ''"> and customer_name_en like concat('%', #{customerNameEn}, '%')</if>
<if test="simpleName != null and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if> <if test="simpleName != null and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if>
<if test="contact != null and contact != ''"> and contact like concat('%', #{contact}, '%')</if> <if test="contact != null and contact != ''"> and contact like concat('%', #{contact}, '%')</if>