Browse Source

[feat]

采购管理 供应商资料
修改供应商列表页面,新增导出多选和全部方法;
新增根据供应商编号集合查找供应商信息列表mapper和service方法;
修改供应商信息导出controller接口,实现多选和全部导出;
dev
王晓迪 1 month ago
parent
commit
249e8695ef
  1. 17
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSupplierController.java
  2. 2
      ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSupplierMapper.java
  3. 6
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierServiceImpl.java
  4. 9
      ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml
  5. 23
      ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html

17
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSupplierController.java

@ -13,9 +13,11 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.process.general.service.IProcessService; import com.ruoyi.process.general.service.IProcessService;
import com.ruoyi.system.domain.*; import com.ruoyi.system.domain.*;
@ -43,10 +45,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.io.IOException; import java.io.IOException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.HashMap; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -204,11 +203,15 @@ public class SysSupplierController extends BaseController
@Log(title = "供应商资料", businessType = BusinessType.EXPORT) @Log(title = "供应商资料", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
@ResponseBody @ResponseBody
public AjaxResult export(SysSupplier sysSupplier) public AjaxResult export(SysSupplier sysSupplier,String ids)
{ {
List<SysSupplier> list = sysSupplierService.exportSelectSupplierList(sysSupplier); List<SysSupplier> list = new ArrayList<>();
if(StringUtils.isEmpty(ids)){
list = sysSupplierService.exportSelectSupplierList(sysSupplier);
}else{
list = sysSupplierService.selectSysSupplierByCodes(Convert.toStrArray(ids));
}
ExcelUtil<SysSupplier> util = new ExcelUtil<SysSupplier>(SysSupplier.class); ExcelUtil<SysSupplier> util = new ExcelUtil<SysSupplier>(SysSupplier.class);
return util.exportExcel(list, "供应商资料"); return util.exportExcel(list, "供应商资料");
} }

2
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSupplierMapper.java

@ -107,4 +107,6 @@ public interface SysSupplierMapper
/** 根据供应商编号或名称查找供应商*/ /** 根据供应商编号或名称查找供应商*/
SysSupplier getSelectSupplier(SysSupplier supplier); SysSupplier getSelectSupplier(SysSupplier supplier);
List<SysSupplier> selectSysSupplierByCodes(String[] ids);
} }

6
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierServiceImpl.java

@ -475,4 +475,10 @@ public class SysSupplierServiceImpl implements ISysSupplierService{
public SysSupplier getSelectSupplier(SysSupplier supplier){ public SysSupplier getSelectSupplier(SysSupplier supplier){
return sysSupplierMapper.getSelectSupplier(supplier); return sysSupplierMapper.getSelectSupplier(supplier);
} }
/** 根据供应商编号集合查找供应商列表*/
@Override
public List<SysSupplier> selectSysSupplierByCodes(String[] ids){
return sysSupplierMapper.selectSysSupplierByCodes(ids);
}
} }

9
ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml

@ -425,4 +425,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectSysSupplierVo"/> <include refid="selectSysSupplierVo"/>
where supplier_code like concat(#{prefix}, '%') escape '\\' where supplier_code like concat(#{prefix}, '%') escape '\\'
</select> </select>
<select id="selectSysSupplierByCodes" parameterType="String" resultMap="SysSupplierResult">
<include refid="selectSysSupplierVo"/>
where supplier_code in
<foreach item="supplierCode" collection="array" open="(" separator="," close=")">
#{supplierCode}
</foreach>
</select>
</mapper> </mapper>

23
ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html

@ -60,7 +60,7 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:supplier:add"> <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:supplier:add">
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="system:supplier:export"> <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="system:supplier:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
@ -314,6 +314,27 @@
}); });
} }
} }
function exportExcel() {
var ids = $.table.selectColumns("supplierCode");
var dataParam = $("#formId").serializeArray();
let tipMsg = "确定导出当前所有数据吗?";
if ($.common.isNotEmpty(ids)) {
tipMsg = `确定导出选中的 ${ids.length} 条数据吗?`;
dataParam.push({ "name": "ids", "value": ids });
}
$.modal.confirm(tipMsg, function () {
$.modal.loading("正在导出数据,请稍后...");
$.post( prefix + "/export", dataParam, function (result) {
if (result.code === web_status.SUCCESS) {
window.location.href = ctx + "common/download?fileName="+ encodeURI(result.msg) + "&delete=" + true;
} else {
$.modal.alertError(result.msg);
}
$.modal.closeLoading();
});
});
}
</script> </script>
</body> </body>
</html> </html>
Loading…
Cancel
Save