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 2025-06-12 05:40:39 +08:00
parent 629e4b2065
commit ca29db1e26
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSupplierController.java
View File

@ -11,11 +11,14 @@
package com.xdadan.erp.web.emis; package com.xdadan.erp.web.emis;
import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; 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.common.core.domain.entity.SysUser; import com.xdadan.erp.common.core.domain.entity.SysUser;
import com.xdadan.erp.emis.utils.WaybillHelper;
import org.apache.commons.lang3.StringUtils;
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;
@ -32,7 +35,6 @@ import com.xdadan.erp.common.core.controller.BaseController;
import com.xdadan.erp.common.core.domain.AjaxResult; import com.xdadan.erp.common.core.domain.AjaxResult;
import com.xdadan.erp.common.core.page.TableDataInfo; import com.xdadan.erp.common.core.page.TableDataInfo;
import com.xdadan.erp.common.enums.BusinessType; import com.xdadan.erp.common.enums.BusinessType;
import com.xdadan.erp.common.utils.StringUtils;
import com.xdadan.erp.common.utils.poi.ExcelUtil; import com.xdadan.erp.common.utils.poi.ExcelUtil;
import com.xdadan.erp.emis.domain.EmisSupplier; import com.xdadan.erp.emis.domain.EmisSupplier;
@ -57,6 +59,14 @@ public class EmisSupplierController extends BaseController
{ {
setPrivParams(emisSupplier); setPrivParams(emisSupplier);
if(!StringUtils.isEmpty(emisSupplier.getCode())){
emisSupplier.setCode(WaybillHelper.formatQueryValue(emisSupplier.getCode()));
String[] codeSortList = emisSupplier.getCode().split(",");
if(codeSortList.length>1){
emisSupplier.getParams().put("codeSortList", Arrays.asList(codeSortList));
}
}
startPage(); startPage();
List<EmisSupplier> list = emisSupplierService.selectEmisSupplierList(emisSupplier); List<EmisSupplier> list = emisSupplierService.selectEmisSupplierList(emisSupplier);
return getDataTable(list); return getDataTable(list);

13
emis-biz/src/main/resources/mapper/EmisSupplierMapper.xml
View File

@ -73,7 +73,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </if>
</where> </where>
order by create_time desc
<if test="params.codeSortList != null ">
ORDER BY FIELD
<foreach collection="params.codeSortList" item="item" open="(code," separator="," close=")">
#{item}
</foreach>
</if>
<if test="params.codeSortList == null ">
ORDER BY create_time desc
</if>
</select> </select>
<select id="checkUnique" parameterType="EmisSupplier" resultType="int"> <select id="checkUnique" parameterType="EmisSupplier" resultType="int">