diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAccountController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAccountController.java index 16abc7cf6..2b1c7b05f 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAccountController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAccountController.java @@ -15,14 +15,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.xdadan.erp.common.annotation.Log; import com.xdadan.erp.common.core.controller.BaseController; @@ -115,4 +108,14 @@ public class EmisCustomerAccountController extends BaseController { return toAjax(emisCustomerAccountService.deleteEmisCustomerAccountByIds(ids)); } + + /** + * 根据地区获取新月结账号 + */ +// @PreAuthorize("@ss.hasPermi('system:user:query')") +// @GetMapping(value = { "/getNewCustNo" }) +// public AjaxResult getNewCustNo(@RequestParam("ownerSiteCode")String ownerSiteCode) +// { +// return AjaxResult.success("成功",userService.getNewEmpCode(ownerSiteCode)); +// } } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteSendArea.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteSendArea.java index 96e55c142..296cadb8b 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteSendArea.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteSendArea.java @@ -37,8 +37,7 @@ public class EmisQuoteSendArea extends BaseEntity private Long areaId; /* 区域名称 */ private String areaName; - /* 使用站点名称 */ - private String useSite; + /* 使用站点代码 */ private String useSiteCode; /* 区域站点列表 */ @@ -60,4 +59,7 @@ public class EmisQuoteSendArea extends BaseEntity /* 更新网点 */ private String updateSite; + /* 使用站点名称 */ + private String useSite; + } diff --git a/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml index f3e64ddf6..b9b8441c9 100644 --- a/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml @@ -7,7 +7,6 @@ - @@ -25,12 +24,19 @@ + + + select area_id, area_name, use_site, use_site_code, area_site, area_site_code, area_site_id, fee_type, area_type, sync, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_disp_area + + + select a.site_name from emis_site a where a.site_code = #{code} limit 1 + +