Browse Source

[feat] 销售管理

按照万材要求,销售管理客户资料其他收货地址新增导出功能,支持部分行和全部行导出,导出更多数据
dev
liuxiaoxu 5 days ago
parent
commit
4c45c18aed
  1. 20
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysShippingAddressController.java
  2. 3
      ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysShippingAddressMapper.java
  3. 5
      ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysShippingAddressService.java
  4. 10
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysShippingAddressServiceImpl.java
  5. 2
      ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml
  6. 8
      ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml
  7. 2
      ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
  8. 63
      ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html

20
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysShippingAddressController.java

@ -57,15 +57,31 @@ public class SysShippingAddressController extends BaseController
*/
@RequiresPermissions("system:shippingaddress:export")
@Log(title = "送货地址", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@PostMapping("/exportAll")
@ResponseBody
public AjaxResult export(SysShippingAddress sysShippingAddress)
public AjaxResult exportAll(SysShippingAddress sysShippingAddress)
{
List<SysShippingAddress> list = sysShippingAddressService.selectSysShippingAddressList(sysShippingAddress);
ExcelUtil<SysShippingAddress> util = new ExcelUtil<SysShippingAddress>(SysShippingAddress.class);
return util.exportExcel(list, "送货地址数据");
}
/**
* 导出送货地址列表
*/
@RequiresPermissions("system:shippingaddress:export")
@Log(title = "送货地址", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(@RequestBody Long[] deliveryIds)
{
List<SysShippingAddress> list = sysShippingAddressService.selectSysShippingAddressListByDeliveryIds(deliveryIds);
ExcelUtil<SysShippingAddress> util = new ExcelUtil<SysShippingAddress>(SysShippingAddress.class);
return util.exportExcel(list, "送货地址数据");
}
/**
* 新增送货地址
*/

3
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysShippingAddressMapper.java

@ -61,4 +61,7 @@ public interface SysShippingAddressMapper
public int deleteSysShippingAddressByIds(String[] deliveryIds);
public List<SysShippingAddress> selectSysShippingAddressByenterpriseCode(String enterpriseCode);
List<SysShippingAddress> selectSysShippingAddressListByDeliveryIds(Long[] deliveryIds);
}

5
ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysShippingAddressService.java

@ -61,4 +61,9 @@ public interface ISysShippingAddressService
public int deleteSysShippingAddressById(Long deliveryId);
public List<SysShippingAddress> selectSysShippingAddressByenterpriseCode(String enterpriseCode);
/**
* 根据deliveryId集合查询送货地址
* */
List<SysShippingAddress> selectSysShippingAddressListByDeliveryIds(Long[] deliveryIds);
}

10
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysShippingAddressServiceImpl.java

@ -19,7 +19,7 @@ import java.util.List;
* @date 2022-11-16
*/
@Service
public class SysShippingAddressServiceImpl implements ISysShippingAddressService
public class SysShippingAddressServiceImpl implements ISysShippingAddressService
{
@Autowired
private SysShippingAddressMapper sysShippingAddressMapper;
@ -48,6 +48,14 @@ public class SysShippingAddressServiceImpl implements ISysShippingAddressService
return sysShippingAddressMapper.selectSysShippingAddressList(sysShippingAddress);
}
/**
* 根据deliveryId集合查询送货地址
* */
@Override
public List<SysShippingAddress> selectSysShippingAddressListByDeliveryIds(Long[] deliveryIds) {
return sysShippingAddressMapper.selectSysShippingAddressListByDeliveryIds(deliveryIds);
}
/**
* 新增送货地址
*

2
ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml

@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where enterprise_code = #{enterpriseCode}
</select>
<select id="selectSysContactsListByContactids" parameterType="String" resultMap="SysContactsResult">
<select id="selectSysContactsListByContactids" parameterType="Long" resultMap="SysContactsResult">
<include refid="selectSysContactsVo"/>
where contactid in
<foreach item="contactid" collection="array" open="(" separator="," close=")">

8
ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml

@ -45,6 +45,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectSysShippingAddressVo"/>
where enterprise_code = #{enterpriseCode}
</select>
<select id="selectSysShippingAddressListByDeliveryIds" parameterType="Long" resultMap="SysShippingAddressResult">
<include refid="selectSysShippingAddressVo"/>
where delivery_id in
<foreach item="deliveryId" collection="array" open="(" separator="," close=")">
#{deliveryId}
</foreach>
</select>
<insert id="insertSysShippingAddress" parameterType="SysShippingAddress" useGeneratedKeys="true" keyProperty="deliveryId">
insert into sys_shipping_address
<trim prefix="(" suffix=")" suffixOverrides=",">

2
ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html

@ -39,7 +39,7 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:contacts:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="erp:inboundOrder:export">
<a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="system:contacts:export">
<i class="fa fa-download"></i> 导出
</a>
</div>

63
ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html

@ -41,10 +41,9 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:shippingaddress:add">
<i class="fa fa-plus"></i> 添加
</a>
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()"-->
<!-- shiro:hasPermission="system:shippingaddress:export">-->
<!-- <i class="fa fa-download"></i> 导出-->
<!-- </a>-->
<a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="system:shippingaddress:add">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" ></table>
@ -100,6 +99,62 @@
};
$.table.init(options);
});
// 导出
function exportExcel(formId) {
// $.table.set();
var deliveryIdData = [];
var selections = $("#bootstrap-table").bootstrapTable("getSelections");
if(selections.length === 0){
$.modal.confirm("确定导出所有其他收货地址吗?", function() {
var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
var params = $("#bootstrap-table").bootstrapTable('getOptions');
var dataParam = $("#" + currentId).serializeArray();
dataParam.push({ "name": "orderByColumn", "value": params.sortName });
dataParam.push({ "name": "isAsc", "value": params.sortOrder });
$.modal.loading("正在导出数据,请稍后...");
$.post(prefix + '/exportAll', dataParam, function(result) {
if (result.code == web_status.SUCCESS) {
window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
} else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg)
} else {
$.modal.alertError(result.msg);
}
$.modal.closeLoading();
});
});
}else {
$.modal.confirm("确定导出选中的所有其他收货地址吗?", function () {
//·拼接单号
for(let i=0;i<selections.length;i++){
deliveryIdData.push(selections[i].deliveryId);
}
var deliveryIds = JSON.stringify(deliveryIdData);
// console.log(bomNos);
$.modal.loading("正在导出数据,请稍后...");
var config = {
url: prefix + '/export',
type: "post",
dataType: "json",
contentType: "application/json;charset=utf-8",
data: deliveryIds,
success: function(result) {
window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
$.modal.alertSuccess("导出成功!")
$.modal.closeLoading();
},
error: function (result){
$.modal.alertError(result.msg);
}
};
$.ajax(config)
});
}
};
</script>
</body>
</html>
Loading…
Cancel
Save