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-18 17:44:10 +08:00
parent 494003eed3
commit 3891a9395f
3 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java
View File

@ -96,6 +96,24 @@ public class EmisStaffController extends BaseController
return getDataTable(list);
}
/**
* 回款联系人
* @param searchValue
* @return
*/
@JacksonFilter(include= {"empName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@RequestMapping("/getPayeeList")
public TableDataInfo getPayeeList(String searchValue)
{
SysUser queryUser = new SysUser();
queryUser.setSearchValue(searchValue);
startPage();
// List<SysUser> list = userService.getPayeeList(queryUser);
// return getDataTable(list);
return null;
}
@RequestMapping("/getStaffQRCodePng")
public void getStaffQRCodePng(HttpServletResponse response,Integer size)
{

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -484,14 +484,16 @@ public class EmisBaseService {
EmisQuotePrice queryEmisQuotePrice = new EmisQuotePrice();
queryEmisQuotePrice.setProdCode(prodCode);
queryEmisQuotePrice.setStatus(1);
// 有效报价
// 有效报价 在有效期内，并且未失效的报价
queryEmisQuotePrice.getParams().put("quoteStatus",4);
queryEmisQuotePrice.setBillType(billType);
queryEmisQuotePrice.setSendAreaSiteCode(sendSiteCode);
queryEmisQuotePrice.setDispAreaSiteCode(destSiteCode);
return emisQuotePriceMapper.selectEmisQuotePriceList(queryEmisQuotePrice);
List<EmisQuotePrice> listQuote = emisQuotePriceMapper.selectEmisQuotePriceList(queryEmisQuotePrice);
return listQuote;
}

34
emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
View File

@ -19,16 +19,7 @@
<result property="otherType2" column="other_type2" />
<result property="carryType" column="carry_type" />
<result property="status" column="status" />
<result property="dispAreaId" column="disp_area_id" />
<result property="dispAreaName" column="disp_area_name" />
<result property="dispAreaSite" column="disp_area_site" />
<result property="dispAreaSiteCode" column="disp_area_site_code" />
<result property="dispAreaSiteId" column="disp_area_site_id" />
<result property="sendAreaId" column="send_area_id" />
<result property="sendAreaName" column="send_area_name" />
<result property="sendAreaSite" column="send_area_site" />
<result property="sendAreaSiteCode" column="send_area_site_code" />
<result property="sendAreaSiteId" column="send_area_site_id" />
<result property="carriesNumber" column="carries_number" />
<result property="discardsNumber" column="discards_number" />
<result property="leastPrice" column="least_price" />
@ -48,6 +39,18 @@
<result property="prodName" column="prod_name" />
<result property="dispAreaId" column="disp_area_id" />
<result property="dispAreaName" column="disp_area_name" />
<result property="dispAreaSite" column="disp_area_site" />
<result property="dispAreaSiteCode" column="disp_area_site_code" />
<result property="dispAreaSiteId" column="disp_area_site_id" />
<result property="sendAreaId" column="send_area_id" />
<result property="sendAreaName" column="send_area_name" />
<result property="sendAreaSite" column="send_area_site" />
<result property="sendAreaSiteCode" column="send_area_site_code" />
<result property="sendAreaSiteId" column="send_area_site_id" />
<association property="prodName" column="prod_code" select="selectProdNameByCode"/>
<association property="transLine" column="trans_line_code" select="selectLineNameByCode"/>
<association property="useSiteName" column="use_site_code" select="selectSiteNameByCode"/>
@ -79,8 +82,9 @@
select quote_id, quote_name, quote_code, use_site_code, use_site, trans_line_code, trans_line, fee_type, prod_code, prod_name, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_name, disp_area_site, disp_area_site_code, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_code, send_area_site_id, carries_number, discards_number, least_price, price_type, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_price
</sql>
<select id="selectProdNameByCode" parameterType="String" resultType="string">
select a.prod_name from emis_trans_product a where a.prod_code = #{code} limit 1
select group_concat(a.prod_name) from emis_trans_product a where FIND_IN_SET(a.prod_code, #{code}) limit 1
</select>
<select id="selectLineNameByCode" parameterType="String" resultType="string">
@ -101,6 +105,8 @@
<select id="selectEmisQuotePriceList" parameterType="EmisQuotePrice" resultMap="EmisQuotePriceResult">
<include refid="selectEmisQuotePriceVo"/>
<where>
del_flag = '0'
<if test="quoteId != null "> and quote_id = #{quoteId}</if>
<if test="quoteName != null and quoteName != ''"> and quote_name like concat('%', #{quoteName}, '%')</if>
<if test="quoteCode != null and quoteCode != ''"> and quote_code like concat('%', #{quoteCode}, '%')</if>
@ -117,13 +123,17 @@
<if test="carryType != null and carryType != ''"> and carry_type like concat('%', #{carryType}, '%')</if>
<if test="status != null "> and status = #{status}</if>
<if test="dispAreaId != null "> and disp_area_id like concat('%', #{dispAreaId}, '%')</if>
<if test="dispAreaName != null and dispAreaName != ''"> and disp_area_name like concat('%', #{dispAreaName}, '%')</if>
<if test="dispAreaSite != null and dispAreaSite != ''"> and disp_area_site like concat('%', #{dispAreaSite}, '%')</if>
<if test="dispAreaSiteCode != null and dispAreaSiteCode != ''">and ( find_in_set(#{dispAreaSiteCode},disp_area_site_code) or disp_area_site_code='-1' ) </if>
<if test="dispAreaSiteCode != null and dispAreaSiteCode != ''">
and ( find_in_set(#{dispAreaSiteCode},disp_area_site_code) or disp_area_site_code='-1' )
</if>
<if test="dispAreaSiteId != null and dispAreaSiteId != ''"> and disp_area_site_id like concat('%', #{dispAreaSiteId}, '%')</if>
<if test="sendAreaId != null "> and send_area_id = #{sendAreaId} </if>
<if test="sendAreaName != null and sendAreaName != ''"> and send_area_name like concat('%', #{sendAreaName}, '%')</if>
<if test="sendAreaSite != null and sendAreaSite != ''"> and send_area_site like concat('%', #{sendAreaSite}, '%')</if>