Browse Source

[feat] 销售管理

按照万材要求,销售管理客户资料其他开票信息新增导出功能,支持部分行和全部行导出,导出更多数据
dev
liuxiaoxu 6 days ago
parent
commit
bda495414c
  1. 27
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysInvoiceController.java
  2. 5
      ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysInvoiceMapper.java
  3. 5
      ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysInvoiceService.java
  4. 8
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysInvoiceServiceImpl.java
  5. 7
      ruoyi-admin/src/main/resources/mapper/system/SysInvoiceMapper.xml
  6. 63
      ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html
  7. 2
      ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html

27
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysInvoiceController.java

@ -7,11 +7,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.SysInvoice; import com.ruoyi.system.domain.SysInvoice;
@ -61,15 +57,32 @@ public class SysInvoiceController extends BaseController
*/ */
@RequiresPermissions("system:invoice:export") @RequiresPermissions("system:invoice:export")
@Log(title = "其他开票信息", businessType = BusinessType.EXPORT) @Log(title = "其他开票信息", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/exportAll")
@ResponseBody @ResponseBody
public AjaxResult export(SysInvoice sysInvoice) public AjaxResult exportAll(SysInvoice sysInvoice)
{ {
List<SysInvoice> list = sysInvoiceService.selectSysInvoiceList(sysInvoice); List<SysInvoice> list = sysInvoiceService.selectSysInvoiceList(sysInvoice);
ExcelUtil<SysInvoice> util = new ExcelUtil<SysInvoice>(SysInvoice.class); ExcelUtil<SysInvoice> util = new ExcelUtil<SysInvoice>(SysInvoice.class);
return util.exportExcel(list, "其他开票信息数据"); return util.exportExcel(list, "其他开票信息数据");
} }
/**
* 导出其他开票信息列表
*/
@RequiresPermissions("system:invoice:export")
@Log(title = "其他开票信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(@RequestBody Long[] ids)
{
List<SysInvoice> list = sysInvoiceService.selectSysInvoiceListByIds(ids);
ExcelUtil<SysInvoice> util = new ExcelUtil<SysInvoice>(SysInvoice.class);
return util.exportExcel(list, "其他开票信息数据");
}
/** /**
* 新增其他开票信息 * 新增其他开票信息
*/ */

5
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysInvoiceMapper.java

@ -89,4 +89,9 @@ public interface SysInvoiceMapper
* @return 结果 * @return 结果
*/ */
SysInvoice selectSysInvoiceByName(String invoiceCompanyName); SysInvoice selectSysInvoiceByName(String invoiceCompanyName);
/**
* 根据id集合查询客户信息
* */
List<SysInvoice> selectSysInvoiceListByIds(Long[] ids);
} }

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

@ -82,4 +82,9 @@ public interface ISysInvoiceService
int restoreSysInvoiceById(Long id); int restoreSysInvoiceById(Long id);
public String getId(); public String getId();
/**
* 根据id集合查询其他开票信息
* */
List<SysInvoice> selectSysInvoiceListByIds(Long[] ids);
} }

8
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysInvoiceServiceImpl.java

@ -56,6 +56,14 @@ public class SysInvoiceServiceImpl implements ISysInvoiceService
return sysInvoiceMapper.selectSysInvoiceByCode(enterpriseCode); return sysInvoiceMapper.selectSysInvoiceByCode(enterpriseCode);
} }
/**
* 根据ID查询其他开票信息
* */
@Override
public List<SysInvoice> selectSysInvoiceListByIds(Long[] ids) {
return sysInvoiceMapper.selectSysInvoiceListByIds(ids);
}
/** /**
* 新增其他开票信息 * 新增其他开票信息
* *

7
ruoyi-admin/src/main/resources/mapper/system/SysInvoiceMapper.xml

@ -48,6 +48,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectSysInvoiceVo"/> <include refid="selectSysInvoiceVo"/>
where invoice_company_name = #{invoiceCompanyName} where invoice_company_name = #{invoiceCompanyName}
</select> </select>
<select id="selectSysInvoiceListByIds" parameterType="Long" resultMap="SysInvoiceResult">
<include refid="selectSysInvoiceVo"/>
where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</select>
<insert id="insertSysInvoice" parameterType="SysInvoice" useGeneratedKeys="true" keyProperty="id"> <insert id="insertSysInvoice" parameterType="SysInvoice" useGeneratedKeys="true" keyProperty="id">
insert into sys_invoice insert into sys_invoice

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

@ -28,9 +28,13 @@
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="invoice:invoice:add"> <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:invoice:add">
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="system:invoice:export">
<i class="fa fa-download"></i> 导出
</a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
@ -120,6 +124,63 @@
}; };
$.table.init(options); $.table.init(options);
}); });
// 导出
function exportExcel(formId) {
// $.table.set();
var idData = [];
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++){
idData.push(selections[i].id);
}
var ids = JSON.stringify(idData);
// console.log(bomNos);
$.modal.loading("正在导出数据,请稍后...");
var config = {
url: prefix + '/export',
type: "post",
dataType: "json",
contentType: "application/json;charset=utf-8",
data: ids,
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> </script>
</body> </body>
</html> </html>

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

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

Loading…
Cancel
Save