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-04-25 10:26:51 +08:00
parent 07ba0e3679
commit f917ca1769
4 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAccountController.java
View File

@ -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));
// }
}

6
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteSendArea.java
View File

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

8
emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml
View File

@ -7,7 +7,6 @@
<resultMap type="EmisQuoteDispArea" id="EmisQuoteDispAreaResult">
<result property="areaId" column="area_id" />
<result property="areaName" column="area_name" />
<result property="useSite" column="use_site" />
<result property="useSiteCode" column="use_site_code" />
<result property="areaSite" column="area_site" />
<result property="areaSiteCode" column="area_site_code" />
@ -25,12 +24,19 @@
<result property="updateTime" column="update_time" />
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="useSite" column="use_site" select="selectSiteNameByCode"/>
</resultMap>
<sql id="selectEmisQuoteDispAreaVo">
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
</sql>
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
select a.site_name from emis_site a where a.site_code = #{code} limit 1
</select>
<select id="selectEmisQuoteDispAreaList" parameterType="EmisQuoteDispArea" resultMap="EmisQuoteDispAreaResult">
<include refid="selectEmisQuoteDispAreaVo"/>
<where>

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

@ -7,7 +7,7 @@
<resultMap type="EmisQuoteSendArea" id="EmisQuoteSendAreaResult">
<result property="areaId" column="area_id" />
<result property="areaName" column="area_name" />
<result property="useSite" column="use_site" />
<result property="useSiteCode" column="use_site_code" />
<result property="areaSite" column="area_site" />
<result property="areaSiteCode" column="area_site_code" />
@ -25,12 +25,19 @@
<result property="updateTime" column="update_time" />
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="useSite" column="use_site" select="selectSiteNameByCode"/>
</resultMap>
<sql id="selectEmisQuoteSendAreaVo">
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_send_area
</sql>
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
select a.site_name from emis_site a where a.site_code = #{code} limit 1
</select>
<select id="selectEmisQuoteSendAreaList" parameterType="EmisQuoteSendArea" resultMap="EmisQuoteSendAreaResult">
<include refid="selectEmisQuoteSendAreaVo"/>
<where>