初始化项目

This commit is contained in:
2026-03-22 22:09:11 +08:00
parent 6efba6e069
commit 3ec3a07cd3
33 changed files with 1087 additions and 647 deletions

View File

@@ -0,0 +1,162 @@
package com.jeesite.modules.apps.Service;
import com.jeesite.modules.erp.entity.*;
import com.jeesite.modules.erp.service.ErpAccountService;
import com.jeesite.modules.erp.service.ErpCategoryService;
import com.jeesite.modules.erp.service.ErpDebtsService;
import com.jeesite.modules.erp.service.ErpTransactionFlowService;
import com.jeesite.modules.utils.BigDecimalUtils;
import com.jeesite.modules.utils.DateUtils;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.Date;
@Service
public class erpFlowService {
@Resource
private ErpDebtsService erpDebtsService;
@Resource
private ErpAccountService erpAccountService;
@Resource
private ErpCategoryService erpCategoryService;
@Resource
private ErpTransactionFlowService erpTransactionFlowService;
/**
* 支出新增
*/
public void addExpense(ErpExpense erpExpense) {
ErpAccount account = erpAccountService.get(erpExpense.getAccountId());
ErpCategory category = erpCategoryService.get(erpExpense.getCategoryId());
account.setUpdateTime(new Date());
account.setCurrentBalance(BigDecimalUtils.subtract(account.getCurrentBalance(), erpExpense.getAmount()));
erpAccountService.save(account);
addFlow(
erpExpense.getExpenseName(), // 交易名称
category.getCategoryType(), // 交易类型
erpExpense.getAmount(), // 交易金额
erpExpense.getAccountId(), // 账户ID
erpExpense.getCategoryId(), // 分类ID
erpExpense.getRemark(), // 备注
erpExpense.getExpenseId(), // 业务ID
DateUtils.getCurrentYear(), // 年份
DateUtils.getCurrentMonth() // 月份
);
}
/**
* 收入新增
*/
public void addIncome(ErpIncome erpIncome) {
ErpAccount account = erpAccountService.get(erpIncome.getAccountId());
ErpCategory category = erpCategoryService.get(erpIncome.getCategoryId());
account.setUpdateTime(new Date());
account.setCurrentBalance(BigDecimalUtils.add(account.getCurrentBalance(), erpIncome.getAmount()));
erpAccountService.save(account);
addFlow(
erpIncome.getIncomeName(), // 流水名称
category.getCategoryType(), // 流水类型
erpIncome.getAmount(), // 金额
erpIncome.getAccountId(), // 账户ID
erpIncome.getCategoryId(), // 分类ID
erpIncome.getRemark(), // 备注
erpIncome.getIncomeId(), // 业务ID
com.jeesite.modules.utils.DateUtils.getCurrentYear(), // 年
com.jeesite.modules.utils.DateUtils.getCurrentMonth() // 月
);
}
/**
* 还款支出
*/
public void addDebt(ErpDebtRecords erpDebtRecords) {
ErpDebts debts = erpDebtsService.get(erpDebtRecords.getDebtId());
ErpAccount account = erpAccountService.get(erpDebtRecords.getAccountId());
ErpCategory category = erpCategoryService.get(erpDebtRecords.getCategoryId());
debts.setRemaining(BigDecimalUtils.add(debts.getRemaining(),erpDebtRecords.getRepayAmount()));
erpDebtsService.save(debts);
account.setUpdateTime(new Date());
account.setCurrentBalance(BigDecimalUtils.subtract(account.getCurrentBalance(), erpDebtRecords.getRepayAmount()));
erpAccountService.save(account);
addFlow(
erpDebtRecords.getDebtName(), // 交易名称
category.getCategoryType(), // 交易类型
erpDebtRecords.getRepayAmount(), // 交易金额
erpDebtRecords.getAccountId(), // 账户ID
erpDebtRecords.getCategoryId(), // 分类ID
erpDebtRecords.getRemark(), // 备注
erpDebtRecords.getDebtId(), // 业务ID
DateUtils.getCurrentYear(), // 年份
DateUtils.getCurrentMonth() // 月份
);
}
/**
* 账户转账
*/
public void accountTran(ErpAccountTransfer erpAccountTransfer) {
// 转入
ErpAccount inAccount = erpAccountService.get(erpAccountTransfer.getInAccountId());
inAccount.setCurrentBalance(BigDecimalUtils.add(inAccount.getCurrentBalance(), erpAccountTransfer.getTransferAmount()));
erpAccountService.save(inAccount);
//转出
ErpAccount outAccount = erpAccountService.get(erpAccountTransfer.getOutAccountId());
outAccount.setCurrentBalance(BigDecimalUtils.subtract(outAccount.getCurrentBalance(), erpAccountTransfer.getTransferAmount()));
erpAccountService.save(outAccount);
//分类
ErpCategory category = erpCategoryService.get(erpAccountTransfer.getCategoryId());
addFlow(
erpAccountTransfer.getTransferName(),
category.getCategoryType(),
erpAccountTransfer.getTransferAmount(),
erpAccountTransfer.getInAccountId(),
erpAccountTransfer.getCategoryId(),
erpAccountTransfer.getRemark(),
erpAccountTransfer.getTransferId(),
DateUtils.getCurrentYear(),
DateUtils.getCurrentMonth()
);
addFlow(
erpAccountTransfer.getTransferName(),
category.getCategoryType(),
erpAccountTransfer.getTransferAmount(),
erpAccountTransfer.getOutAccountId(),
erpAccountTransfer.getCategoryId(),
erpAccountTransfer.getRemark(),
erpAccountTransfer.getTransferId(),
DateUtils.getCurrentYear(),
DateUtils.getCurrentMonth()
);
}
/**
* 流水新增
*/
public void addFlow(String flowName, String flowType, BigDecimal amount,
String accountId, String categoryId, String remark, String businessId, String yearDate, String monthDate) {
ErpTransactionFlow flow = new ErpTransactionFlow();
flow.setFlowName(flowName); // 交易名称
flow.setFlowType(flowType); // 交易类型
flow.setAmount(amount); // 交易金额
flow.setTradeTime(new Date()); // 交易时间
flow.setAccountId(accountId); // 交易账户
flow.setCategoryId(categoryId); // 交易分类
flow.setRemark(remark); // 交易备注
flow.setUpdateTime(new Date()); // 更新时间
flow.setBusinessId(businessId); // 业务标识
flow.setYearDate(yearDate); // 年份
flow.setMonthDate(monthDate); // 月份
erpTransactionFlowService.save(flow);
}
}

View File

@@ -38,6 +38,13 @@ import java.io.Serial;
@Column(name = "used_ratio", attrName = "usedRatio", label = "预算占比", isQuery = false),
@Column(name = "over_amount", attrName = "overAmount", label = "超支金额", isQuery = false),
@Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false, isUpdateForce = true),
}, joinTable = {
@JoinTable(type = Type.LEFT_JOIN, entity = ErpCategory.class, alias = "b",
on = "a.category_id = b.category_id", attrName = "this",
columns = {
@Column(name = "parent_name", attrName = "parentName", label = "父级名称"),
@Column(name = "category_name", attrName = "categoryName", label = "分类名称"),
}),
}, orderBy = "a.budget_id DESC"
)
@Data
@@ -55,10 +62,16 @@ public class ErpBudgets extends DataEntity<ErpBudgets> implements Serializable {
private Double overAmount; // 超支金额
private Date updateTime; // 更新时间
private String parentName;
private String categoryName;
@ExcelFields({
@ExcelField(title = "记录时间", attrName = "createTime", align = Align.CENTER, sort = 10, dataFormat = "yyyy-MM-dd hh:mm"),
@ExcelField(title = "唯一主键", attrName = "budgetId", align = Align.CENTER, sort = 20),
@ExcelField(title = "分类标识", attrName = "categoryId", align = Align.CENTER, sort = 30),
@ExcelField(title = "父级分类", attrName = "parentName", align = Align.CENTER, sort = 30),
@ExcelField(title = "分类名称", attrName = "categoryName", align = Align.CENTER, sort = 35),
@ExcelField(title = "预算年月", attrName = "budgetMonth", align = Align.CENTER, sort = 40),
@ExcelField(title = "预算金额", attrName = "budgetAmount", align = Align.CENTER, sort = 50),
@ExcelField(title = "使用金额", attrName = "usedAmount", align = Align.CENTER, sort = 60),

View File

@@ -37,7 +37,26 @@ import java.io.Serial;
@Column(name = "account_id", attrName = "accountId", label = "账户标识"),
@Column(name = "repay_amount", attrName = "repayAmount", label = "还款金额", isQuery = false),
@Column(name = "repay_time", attrName = "repayTime", label = "还款时间", isQuery = false, isUpdateForce = true),
@Column(name = "category_id", attrName = "categoryId", label = "分类标识"),
@Column(name = "remark", attrName = "remark", label = "备注说明", queryType = QueryType.LIKE),
@Column(name = "is_recorded", attrName = "isRecorded", label = "是否记账"),
}, joinTable = {
@JoinTable(type = Type.LEFT_JOIN, entity = ErpAccount.class, alias = "b",
on = "a.account_id = b.account_id", attrName = "this",
columns = {
@Column(name = "account_name", attrName = "accountName", label = "账户名称"),
}),
@JoinTable(type = Type.LEFT_JOIN, entity = ErpDebts.class, alias = "c",
on = "a.debt_id = c.debt_id", attrName = "this",
columns = {
@Column(name = "debt_name", attrName = "debtName", label = "对方名称"),
}),
@JoinTable(type = Type.LEFT_JOIN, entity = ErpCategory.class, alias = "d",
on = "a.category_id = d.category_id", attrName = "this",
columns = {
@Column(name = "parent_name", attrName = "parentName", label = "父级名称"),
@Column(name = "category_name", attrName = "categoryName", label = "分类名称"),
}),
}, orderBy = "a.record_id DESC"
)
@Data
@@ -51,13 +70,22 @@ public class ErpDebtRecords extends DataEntity<ErpDebtRecords> implements Serial
private String accountId; // 账户标识
private BigDecimal repayAmount; // 还款金额
private Date repayTime; // 还款时间
private String categoryId;
private String remark; // 备注说明
private String isRecorded;
private String accountName;
private String debtName;
private String parentName;
private String categoryName;
@ExcelFields({
@ExcelField(title = "记录时间", attrName = "createTime", align = Align.CENTER, sort = 10, dataFormat = "yyyy-MM-dd hh:mm"),
@ExcelField(title = "唯一标识", attrName = "recordId", align = Align.CENTER, sort = 20),
@ExcelField(title = "负债标识", attrName = "debtId", align = Align.CENTER, sort = 30),
@ExcelField(title = "账户标识", attrName = "accountId", align = Align.CENTER, sort = 40),
@ExcelField(title = "负债名称", attrName = "debtName", align = Align.CENTER, sort = 30),
@ExcelField(title = "账户名称", attrName = "accountName", align = Align.CENTER, sort = 40),
@ExcelField(title = "还款金额", attrName = "repayAmount", align = Align.CENTER, sort = 50),
@ExcelField(title = "还款时间", attrName = "repayTime", align = Align.CENTER, sort = 60, dataFormat = "yyyy-MM-dd hh:mm"),
@ExcelField(title = "备注说明", attrName = "remark", align = Align.CENTER, sort = 70),

View File

@@ -39,6 +39,7 @@ import java.io.Serial;
@Column(name = "remaining", attrName = "remaining", label = "未还金额", isQuery = false, isUpdateForce = true),
@Column(name = "end_time", attrName = "endTime", label = "结清时间", isQuery = false, isUpdateForce = true),
@Column(name = "ustatus", attrName = "ustatus", label = "状态"),
@Column(name = "remark", attrName = "remark", label = "交易备注", isQuery = false),
}, orderBy = "a.create_time DESC"
)
@Data
@@ -54,6 +55,7 @@ public class ErpDebts extends DataEntity<ErpDebts> implements Serializable {
private BigDecimal remaining; // 未还金额
private Date endTime; // 结清时间
private String ustatus; // 状态
private String remark;
@ExcelFields({
@ExcelField(title = "记录时间", attrName = "createTime", align = Align.CENTER, sort = 10, dataFormat = "yyyy-MM-dd hh:mm"),

View File

@@ -34,6 +34,8 @@ import java.io.Serial;
@Column(name = "category_id", attrName = "categoryId", label = "支出分类"),
@Column(name = "amount", attrName = "amount", label = "交易金额", isQuery = false),
@Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false, isUpdateForce = true),
@Column(name = "is_recorded", attrName = "isRecorded", label = "是否记账"),
@Column(name = "remark", attrName = "remark", label = "交易备注", isQuery = false),
}, joinTable = {
@JoinTable(type = Type.LEFT_JOIN, entity = ErpAccount.class, alias = "b",
on = "a.account_id = b.account_id", attrName = "this",
@@ -60,6 +62,8 @@ public class ErpExpense extends DataEntity<ErpExpense> implements Serializable {
private String categoryId; // 支出分类
private BigDecimal amount; // 交易金额
private Date updateTime; // 更新时间
private String isRecorded;
private String remark;
private String accountName;

View File

@@ -39,6 +39,8 @@ import java.io.Serial;
@Column(name = "category_id", attrName = "categoryId", label = "收入分类"),
@Column(name = "amount", attrName = "amount", label = "交易金额", isQuery = false),
@Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false, isUpdateForce = true),
@Column(name = "is_recorded", attrName = "isRecorded", label = "是否记账"),
@Column(name = "remark", attrName = "remark", label = "交易备注", isQuery = false),
}, joinTable = {
@JoinTable(type = Type.LEFT_JOIN, entity = ErpAccount.class, alias = "b",
on = "a.account_id = b.account_id", attrName = "this",
@@ -65,6 +67,8 @@ public class ErpIncome extends DataEntity<ErpIncome> implements Serializable {
private String categoryId; // 收入分类
private BigDecimal amount; // 交易金额
private Date updateTime; // 更新时间
private String isRecorded;
private String remark;
private String accountName;

View File

@@ -42,6 +42,8 @@ import java.io.Serial;
@Column(name = "remark", attrName = "remark", label = "交易备注", isQuery = false),
@Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false, isUpdateForce = true),
@Column(name = "business_id", attrName = "businessId", label = "业务标识"),
@Column(name = "year_date", attrName = "yearDate", label = "业务标识"),
@Column(name = "month_date", attrName = "monthDate", label = "业务标识"),
}, joinTable = {
@JoinTable(type = Type.LEFT_JOIN, entity = ErpAccount.class, alias = "b",
on = "a.account_id = b.account_id", attrName = "this",
@@ -72,6 +74,8 @@ public class ErpTransactionFlow extends DataEntity<ErpTransactionFlow> implement
private String remark; // 交易备注
private Date updateTime; // 更新时间
private String businessId; // 业务标识
private String yearDate;
private String monthDate;
private String accountName;

View File

@@ -1,6 +1,11 @@
package com.jeesite.modules.erp.web;
import java.util.List;
import com.jeesite.modules.apps.Service.erpFlowService;
import com.jeesite.modules.erp.entity.*;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -21,11 +26,11 @@ import com.jeesite.common.utils.excel.ExcelExport;
import com.jeesite.common.utils.excel.annotation.ExcelField.Type;
import org.springframework.web.multipart.MultipartFile;
import com.jeesite.common.web.BaseController;
import com.jeesite.modules.erp.entity.ErpAccountTransfer;
import com.jeesite.modules.erp.service.ErpAccountTransferService;
/**
* 转账明细表 Controller
*
* @author gaoxq
* @version 2026-03-22
*/
@@ -33,114 +38,131 @@ import com.jeesite.modules.erp.service.ErpAccountTransferService;
@RequestMapping(value = "${adminPath}/erp/accountTransfer")
public class ErpAccountTransferController extends BaseController {
private final ErpAccountTransferService erpAccountTransferService;
@Resource
private erpFlowService flowService;
public ErpAccountTransferController(ErpAccountTransferService erpAccountTransferService) {
this.erpAccountTransferService = erpAccountTransferService;
}
/**
* 获取数据
*/
@ModelAttribute
public ErpAccountTransfer get(String transferId, boolean isNewRecord) {
return erpAccountTransferService.get(transferId, isNewRecord);
}
/**
* 查询列表
*/
@RequiresPermissions("erp:accountTransfer:view")
@RequestMapping(value = {"list", ""})
public String list(ErpAccountTransfer erpAccountTransfer, Model model) {
model.addAttribute("erpAccountTransfer", erpAccountTransfer);
return "modules/erp/erpAccountTransferList";
}
/**
* 查询列表数据
*/
@RequiresPermissions("erp:accountTransfer:view")
@RequestMapping(value = "listData")
@ResponseBody
public Page<ErpAccountTransfer> listData(ErpAccountTransfer erpAccountTransfer, HttpServletRequest request, HttpServletResponse response) {
erpAccountTransfer.setPage(new Page<>(request, response));
Page<ErpAccountTransfer> page = erpAccountTransferService.findPage(erpAccountTransfer);
return page;
}
private final ErpAccountTransferService erpAccountTransferService;
/**
* 查看编辑表单
*/
@RequiresPermissions("erp:accountTransfer:view")
@RequestMapping(value = "form")
public String form(ErpAccountTransfer erpAccountTransfer, Model model) {
model.addAttribute("erpAccountTransfer", erpAccountTransfer);
return "modules/erp/erpAccountTransferForm";
}
public ErpAccountTransferController(ErpAccountTransferService erpAccountTransferService) {
this.erpAccountTransferService = erpAccountTransferService;
}
/**
* 保存数据
*/
@RequiresPermissions("erp:accountTransfer:edit")
@PostMapping(value = "save")
@ResponseBody
public String save(@Validated ErpAccountTransfer erpAccountTransfer) {
erpAccountTransferService.save(erpAccountTransfer);
return renderResult(Global.TRUE, text("保存转账成功!"));
}
/**
* 获取数据
*/
@ModelAttribute
public ErpAccountTransfer get(String transferId, boolean isNewRecord) {
return erpAccountTransferService.get(transferId, isNewRecord);
}
/**
* 导出数据
*/
@RequiresPermissions("erp:accountTransfer:view")
@RequestMapping(value = "exportData")
public void exportData(ErpAccountTransfer erpAccountTransfer, HttpServletResponse response) {
List<ErpAccountTransfer> list = erpAccountTransferService.findList(erpAccountTransfer);
String fileName = "转账" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
try(ExcelExport ee = new ExcelExport("转账", ErpAccountTransfer.class)){
ee.setDataList(list).write(response, fileName);
}
}
/**
* 查询列表
*/
@RequiresPermissions("erp:accountTransfer:view")
@RequestMapping(value = {"list", ""})
public String list(ErpAccountTransfer erpAccountTransfer, Model model) {
model.addAttribute("erpAccountTransfer", erpAccountTransfer);
return "modules/erp/erpAccountTransferList";
}
/**
* 下载模板
*/
@RequiresPermissions("erp:accountTransfer:view")
@RequestMapping(value = "importTemplate")
public void importTemplate(HttpServletResponse response) {
ErpAccountTransfer erpAccountTransfer = new ErpAccountTransfer();
List<ErpAccountTransfer> list = ListUtils.newArrayList(erpAccountTransfer);
String fileName = "转账模板.xlsx";
try(ExcelExport ee = new ExcelExport("转账", ErpAccountTransfer.class, Type.IMPORT)){
ee.setDataList(list).write(response, fileName);
}
}
/**
* 查询列表数据
*/
@RequiresPermissions("erp:accountTransfer:view")
@RequestMapping(value = "listData")
@ResponseBody
public Page<ErpAccountTransfer> listData(ErpAccountTransfer erpAccountTransfer, HttpServletRequest request, HttpServletResponse response) {
erpAccountTransfer.setPage(new Page<>(request, response));
Page<ErpAccountTransfer> page = erpAccountTransferService.findPage(erpAccountTransfer);
return page;
}
/**
* 查看编辑表单
*/
@RequiresPermissions("erp:accountTransfer:view")
@RequestMapping(value = "form")
public String form(ErpAccountTransfer erpAccountTransfer, Model model) {
model.addAttribute("erpAccountTransfer", erpAccountTransfer);
return "modules/erp/erpAccountTransferForm";
}
/**
* 保存数据
*/
@RequiresPermissions("erp:accountTransfer:edit")
@PostMapping(value = "save")
@ResponseBody
public String save(@Validated ErpAccountTransfer erpAccountTransfer) {
erpAccountTransferService.save(erpAccountTransfer);
return renderResult(Global.TRUE, text("保存转账成功!"));
}
/**
* 导出数据
*/
@RequiresPermissions("erp:accountTransfer:view")
@RequestMapping(value = "exportData")
public void exportData(ErpAccountTransfer erpAccountTransfer, HttpServletResponse response) {
List<ErpAccountTransfer> list = erpAccountTransferService.findList(erpAccountTransfer);
String fileName = "转账" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
try (ExcelExport ee = new ExcelExport("转账", ErpAccountTransfer.class)) {
ee.setDataList(list).write(response, fileName);
}
}
/**
* 下载模板
*/
@RequiresPermissions("erp:accountTransfer:view")
@RequestMapping(value = "importTemplate")
public void importTemplate(HttpServletResponse response) {
ErpAccountTransfer erpAccountTransfer = new ErpAccountTransfer();
List<ErpAccountTransfer> list = ListUtils.newArrayList(erpAccountTransfer);
String fileName = "转账模板.xlsx";
try (ExcelExport ee = new ExcelExport("转账", ErpAccountTransfer.class, Type.IMPORT)) {
ee.setDataList(list).write(response, fileName);
}
}
/**
* 导入数据
*/
@ResponseBody
@RequiresPermissions("erp:accountTransfer:edit")
@PostMapping(value = "importData")
public String importData(MultipartFile file) {
try {
String message = erpAccountTransferService.importData(file);
return renderResult(Global.TRUE, "posfull:" + message);
} catch (Exception ex) {
return renderResult(Global.FALSE, "posfull:" + ex.getMessage());
}
}
/**
* 删除数据
*/
@RequiresPermissions("erp:accountTransfer:edit")
@RequestMapping(value = "delete")
@ResponseBody
public String delete(ErpAccountTransfer erpAccountTransfer) {
erpAccountTransferService.delete(erpAccountTransfer);
return renderResult(Global.TRUE, text("删除转账成功!"));
}
/**
* 记账数据
*/
@RequestMapping(value = "recorded")
@ResponseBody
public String recorded(ErpAccountTransfer erpAccountTransfer) {
ErpAccountTransfer accountTransfer = erpAccountTransferService.get(erpAccountTransfer);
accountTransfer.setTransferStatus("1");
erpAccountTransferService.save(accountTransfer);
flowService.accountTran(accountTransfer);
return renderResult(Global.TRUE, text("记账转账成功!"));
}
/**
* 导入数据
*/
@ResponseBody
@RequiresPermissions("erp:accountTransfer:edit")
@PostMapping(value = "importData")
public String importData(MultipartFile file) {
try {
String message = erpAccountTransferService.importData(file);
return renderResult(Global.TRUE, "posfull:"+message);
} catch (Exception ex) {
return renderResult(Global.FALSE, "posfull:"+ex.getMessage());
}
}
/**
* 删除数据
*/
@RequiresPermissions("erp:accountTransfer:edit")
@RequestMapping(value = "delete")
@ResponseBody
public String delete(ErpAccountTransfer erpAccountTransfer) {
erpAccountTransferService.delete(erpAccountTransfer);
return renderResult(Global.TRUE, text("删除转账成功!"));
}
}

View File

@@ -1,6 +1,10 @@
package com.jeesite.modules.erp.web;
import java.util.List;
import com.jeesite.modules.apps.Service.erpFlowService;
import com.jeesite.modules.erp.entity.ErpExpense;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -33,6 +37,9 @@ import com.jeesite.modules.erp.service.ErpDebtRecordsService;
@RequestMapping(value = "${adminPath}/erp/debtRecords")
public class ErpDebtRecordsController extends BaseController {
@Resource
private erpFlowService flowService;
private final ErpDebtRecordsService erpDebtRecordsService;
public ErpDebtRecordsController(ErpDebtRecordsService erpDebtRecordsService) {
@@ -142,5 +149,18 @@ public class ErpDebtRecordsController extends BaseController {
erpDebtRecordsService.delete(erpDebtRecords);
return renderResult(Global.TRUE, text("删除借贷明细成功!"));
}
/**
* 记账数据
*/
@RequestMapping(value = "recorded")
@ResponseBody
public String recorded(ErpDebtRecords erpDebtRecords) {
ErpDebtRecords debtRecords = erpDebtRecordsService.get(erpDebtRecords);
debtRecords.setIsRecorded("1");
erpDebtRecordsService.save(debtRecords);
flowService.addDebt(debtRecords);
return renderResult(Global.TRUE, text("记账支出成功!"));
}
}

View File

@@ -1,6 +1,11 @@
package com.jeesite.modules.erp.web;
import java.util.List;
import com.jeesite.modules.apps.Service.erpFlowService;
import com.jeesite.modules.erp.entity.*;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -15,17 +20,17 @@ import org.springframework.web.bind.annotation.ResponseBody;
import com.jeesite.common.config.Global;
import com.jeesite.common.collect.ListUtils;
import com.jeesite.common.entity.Page;
import com.jeesite.common.lang.DateUtils;
import com.jeesite.common.entity.Page;
import com.jeesite.common.utils.excel.ExcelExport;
import com.jeesite.common.utils.excel.annotation.ExcelField.Type;
import org.springframework.web.multipart.MultipartFile;
import com.jeesite.common.web.BaseController;
import com.jeesite.modules.erp.entity.ErpExpense;
import com.jeesite.modules.erp.service.ErpExpenseService;
/**
* 支出明细表 Controller
*
* @author gaoxq
* @version 2026-03-22
*/
@@ -33,114 +38,129 @@ import com.jeesite.modules.erp.service.ErpExpenseService;
@RequestMapping(value = "${adminPath}/erp/expense")
public class ErpExpenseController extends BaseController {
private final ErpExpenseService erpExpenseService;
@Resource
private erpFlowService flowService;
public ErpExpenseController(ErpExpenseService erpExpenseService) {
this.erpExpenseService = erpExpenseService;
}
/**
* 获取数据
*/
@ModelAttribute
public ErpExpense get(String expenseId, boolean isNewRecord) {
return erpExpenseService.get(expenseId, isNewRecord);
}
/**
* 查询列表
*/
@RequiresPermissions("erp:expense:view")
@RequestMapping(value = {"list", ""})
public String list(ErpExpense erpExpense, Model model) {
model.addAttribute("erpExpense", erpExpense);
return "modules/erp/erpExpenseList";
}
/**
* 查询列表数据
*/
@RequiresPermissions("erp:expense:view")
@RequestMapping(value = "listData")
@ResponseBody
public Page<ErpExpense> listData(ErpExpense erpExpense, HttpServletRequest request, HttpServletResponse response) {
erpExpense.setPage(new Page<>(request, response));
Page<ErpExpense> page = erpExpenseService.findPage(erpExpense);
return page;
}
private final ErpExpenseService erpExpenseService;
/**
* 查看编辑表单
*/
@RequiresPermissions("erp:expense:view")
@RequestMapping(value = "form")
public String form(ErpExpense erpExpense, Model model) {
model.addAttribute("erpExpense", erpExpense);
return "modules/erp/erpExpenseForm";
}
public ErpExpenseController(ErpExpenseService erpExpenseService) {
this.erpExpenseService = erpExpenseService;
}
/**
* 保存数据
*/
@RequiresPermissions("erp:expense:edit")
@PostMapping(value = "save")
@ResponseBody
public String save(@Validated ErpExpense erpExpense) {
erpExpenseService.save(erpExpense);
return renderResult(Global.TRUE, text("保存支出成功!"));
}
/**
* 获取数据
*/
@ModelAttribute
public ErpExpense get(String expenseId, boolean isNewRecord) {
return erpExpenseService.get(expenseId, isNewRecord);
}
/**
* 导出数据
*/
@RequiresPermissions("erp:expense:view")
@RequestMapping(value = "exportData")
public void exportData(ErpExpense erpExpense, HttpServletResponse response) {
List<ErpExpense> list = erpExpenseService.findList(erpExpense);
String fileName = "支出" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
try(ExcelExport ee = new ExcelExport("支出", ErpExpense.class)){
ee.setDataList(list).write(response, fileName);
}
}
/**
* 查询列表
*/
@RequiresPermissions("erp:expense:view")
@RequestMapping(value = {"list", ""})
public String list(ErpExpense erpExpense, Model model) {
model.addAttribute("erpExpense", erpExpense);
return "modules/erp/erpExpenseList";
}
/**
* 下载模板
*/
@RequiresPermissions("erp:expense:view")
@RequestMapping(value = "importTemplate")
public void importTemplate(HttpServletResponse response) {
ErpExpense erpExpense = new ErpExpense();
List<ErpExpense> list = ListUtils.newArrayList(erpExpense);
String fileName = "支出模板.xlsx";
try(ExcelExport ee = new ExcelExport("支出", ErpExpense.class, Type.IMPORT)){
ee.setDataList(list).write(response, fileName);
}
}
/**
* 查询列表数据
*/
@RequiresPermissions("erp:expense:view")
@RequestMapping(value = "listData")
@ResponseBody
public Page<ErpExpense> listData(ErpExpense erpExpense, HttpServletRequest request, HttpServletResponse response) {
erpExpense.setPage(new Page<>(request, response));
Page<ErpExpense> page = erpExpenseService.findPage(erpExpense);
return page;
}
/**
* 导入数据
*/
@ResponseBody
@RequiresPermissions("erp:expense:edit")
@PostMapping(value = "importData")
public String importData(MultipartFile file) {
try {
String message = erpExpenseService.importData(file);
return renderResult(Global.TRUE, "posfull:"+message);
} catch (Exception ex) {
return renderResult(Global.FALSE, "posfull:"+ex.getMessage());
}
}
/**
* 删除数据
*/
@RequiresPermissions("erp:expense:edit")
@RequestMapping(value = "delete")
@ResponseBody
public String delete(ErpExpense erpExpense) {
erpExpenseService.delete(erpExpense);
return renderResult(Global.TRUE, text("删除支出成功!"));
}
/**
* 查看编辑表单
*/
@RequiresPermissions("erp:expense:view")
@RequestMapping(value = "form")
public String form(ErpExpense erpExpense, Model model) {
model.addAttribute("erpExpense", erpExpense);
return "modules/erp/erpExpenseForm";
}
/**
* 保存数据
*/
@RequiresPermissions("erp:expense:edit")
@PostMapping(value = "save")
@ResponseBody
public String save(@Validated ErpExpense erpExpense) {
erpExpenseService.save(erpExpense);
return renderResult(Global.TRUE, text("保存支出成功!"));
}
/**
* 导出数据
*/
@RequiresPermissions("erp:expense:view")
@RequestMapping(value = "exportData")
public void exportData(ErpExpense erpExpense, HttpServletResponse response) {
List<ErpExpense> list = erpExpenseService.findList(erpExpense);
String fileName = "支出" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
try (ExcelExport ee = new ExcelExport("支出", ErpExpense.class)) {
ee.setDataList(list).write(response, fileName);
}
}
/**
* 下载模板
*/
@RequiresPermissions("erp:expense:view")
@RequestMapping(value = "importTemplate")
public void importTemplate(HttpServletResponse response) {
ErpExpense erpExpense = new ErpExpense();
List<ErpExpense> list = ListUtils.newArrayList(erpExpense);
String fileName = "支出模板.xlsx";
try (ExcelExport ee = new ExcelExport("支出", ErpExpense.class, Type.IMPORT)) {
ee.setDataList(list).write(response, fileName);
}
}
/**
* 导入数据
*/
@ResponseBody
@RequiresPermissions("erp:expense:edit")
@PostMapping(value = "importData")
public String importData(MultipartFile file) {
try {
String message = erpExpenseService.importData(file);
return renderResult(Global.TRUE, "posfull:" + message);
} catch (Exception ex) {
return renderResult(Global.FALSE, "posfull:" + ex.getMessage());
}
}
/**
* 删除数据
*/
@RequiresPermissions("erp:expense:edit")
@RequestMapping(value = "delete")
@ResponseBody
public String delete(ErpExpense erpExpense) {
erpExpenseService.delete(erpExpense);
return renderResult(Global.TRUE, text("删除支出成功!"));
}
/**
* 记账数据
*/
@RequestMapping(value = "recorded")
@ResponseBody
public String recorded(ErpExpense erpExpense) {
ErpExpense expense = erpExpenseService.get(erpExpense);
expense.setIsRecorded("1");
erpExpenseService.save(expense);
flowService.addExpense(expense);
return renderResult(Global.TRUE, text("记账支出成功!"));
}
}

View File

@@ -1,6 +1,9 @@
package com.jeesite.modules.erp.web;
import java.util.List;
import com.jeesite.modules.apps.Service.erpFlowService;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -26,6 +29,7 @@ import com.jeesite.modules.erp.service.ErpIncomeService;
/**
* 收入明细表 Controller
*
* @author gaoxq
* @version 2026-03-22
*/
@@ -33,114 +37,129 @@ import com.jeesite.modules.erp.service.ErpIncomeService;
@RequestMapping(value = "${adminPath}/erp/income")
public class ErpIncomeController extends BaseController {
private final ErpIncomeService erpIncomeService;
@Resource
private erpFlowService flowService;
public ErpIncomeController(ErpIncomeService erpIncomeService) {
this.erpIncomeService = erpIncomeService;
}
/**
* 获取数据
*/
@ModelAttribute
public ErpIncome get(String incomeId, boolean isNewRecord) {
return erpIncomeService.get(incomeId, isNewRecord);
}
/**
* 查询列表
*/
@RequiresPermissions("erp:income:view")
@RequestMapping(value = {"list", ""})
public String list(ErpIncome erpIncome, Model model) {
model.addAttribute("erpIncome", erpIncome);
return "modules/erp/erpIncomeList";
}
/**
* 查询列表数据
*/
@RequiresPermissions("erp:income:view")
@RequestMapping(value = "listData")
@ResponseBody
public Page<ErpIncome> listData(ErpIncome erpIncome, HttpServletRequest request, HttpServletResponse response) {
erpIncome.setPage(new Page<>(request, response));
Page<ErpIncome> page = erpIncomeService.findPage(erpIncome);
return page;
}
private final ErpIncomeService erpIncomeService;
/**
* 查看编辑表单
*/
@RequiresPermissions("erp:income:view")
@RequestMapping(value = "form")
public String form(ErpIncome erpIncome, Model model) {
model.addAttribute("erpIncome", erpIncome);
return "modules/erp/erpIncomeForm";
}
public ErpIncomeController(ErpIncomeService erpIncomeService) {
this.erpIncomeService = erpIncomeService;
}
/**
* 保存数据
*/
@RequiresPermissions("erp:income:edit")
@PostMapping(value = "save")
@ResponseBody
public String save(@Validated ErpIncome erpIncome) {
erpIncomeService.save(erpIncome);
return renderResult(Global.TRUE, text("保存收入成功!"));
}
/**
* 获取数据
*/
@ModelAttribute
public ErpIncome get(String incomeId, boolean isNewRecord) {
return erpIncomeService.get(incomeId, isNewRecord);
}
/**
* 导出数据
*/
@RequiresPermissions("erp:income:view")
@RequestMapping(value = "exportData")
public void exportData(ErpIncome erpIncome, HttpServletResponse response) {
List<ErpIncome> list = erpIncomeService.findList(erpIncome);
String fileName = "收入" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
try(ExcelExport ee = new ExcelExport("收入", ErpIncome.class)){
ee.setDataList(list).write(response, fileName);
}
}
/**
* 查询列表
*/
@RequiresPermissions("erp:income:view")
@RequestMapping(value = {"list", ""})
public String list(ErpIncome erpIncome, Model model) {
model.addAttribute("erpIncome", erpIncome);
return "modules/erp/erpIncomeList";
}
/**
* 下载模板
*/
@RequiresPermissions("erp:income:view")
@RequestMapping(value = "importTemplate")
public void importTemplate(HttpServletResponse response) {
ErpIncome erpIncome = new ErpIncome();
List<ErpIncome> list = ListUtils.newArrayList(erpIncome);
String fileName = "收入模板.xlsx";
try(ExcelExport ee = new ExcelExport("收入", ErpIncome.class, Type.IMPORT)){
ee.setDataList(list).write(response, fileName);
}
}
/**
* 查询列表数据
*/
@RequiresPermissions("erp:income:view")
@RequestMapping(value = "listData")
@ResponseBody
public Page<ErpIncome> listData(ErpIncome erpIncome, HttpServletRequest request, HttpServletResponse response) {
erpIncome.setPage(new Page<>(request, response));
Page<ErpIncome> page = erpIncomeService.findPage(erpIncome);
return page;
}
/**
* 导入数据
*/
@ResponseBody
@RequiresPermissions("erp:income:edit")
@PostMapping(value = "importData")
public String importData(MultipartFile file) {
try {
String message = erpIncomeService.importData(file);
return renderResult(Global.TRUE, "posfull:"+message);
} catch (Exception ex) {
return renderResult(Global.FALSE, "posfull:"+ex.getMessage());
}
}
/**
* 删除数据
*/
@RequiresPermissions("erp:income:edit")
@RequestMapping(value = "delete")
@ResponseBody
public String delete(ErpIncome erpIncome) {
erpIncomeService.delete(erpIncome);
return renderResult(Global.TRUE, text("删除收入成功!"));
}
/**
* 查看编辑表单
*/
@RequiresPermissions("erp:income:view")
@RequestMapping(value = "form")
public String form(ErpIncome erpIncome, Model model) {
model.addAttribute("erpIncome", erpIncome);
return "modules/erp/erpIncomeForm";
}
/**
* 保存数据
*/
@RequiresPermissions("erp:income:edit")
@PostMapping(value = "save")
@ResponseBody
public String save(@Validated ErpIncome erpIncome) {
erpIncomeService.save(erpIncome);
return renderResult(Global.TRUE, text("保存收入成功!"));
}
/**
* 导出数据
*/
@RequiresPermissions("erp:income:view")
@RequestMapping(value = "exportData")
public void exportData(ErpIncome erpIncome, HttpServletResponse response) {
List<ErpIncome> list = erpIncomeService.findList(erpIncome);
String fileName = "收入" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
try (ExcelExport ee = new ExcelExport("收入", ErpIncome.class)) {
ee.setDataList(list).write(response, fileName);
}
}
/**
* 下载模板
*/
@RequiresPermissions("erp:income:view")
@RequestMapping(value = "importTemplate")
public void importTemplate(HttpServletResponse response) {
ErpIncome erpIncome = new ErpIncome();
List<ErpIncome> list = ListUtils.newArrayList(erpIncome);
String fileName = "收入模板.xlsx";
try (ExcelExport ee = new ExcelExport("收入", ErpIncome.class, Type.IMPORT)) {
ee.setDataList(list).write(response, fileName);
}
}
/**
* 导入数据
*/
@ResponseBody
@RequiresPermissions("erp:income:edit")
@PostMapping(value = "importData")
public String importData(MultipartFile file) {
try {
String message = erpIncomeService.importData(file);
return renderResult(Global.TRUE, "posfull:" + message);
} catch (Exception ex) {
return renderResult(Global.FALSE, "posfull:" + ex.getMessage());
}
}
/**
* 删除数据
*/
@RequiresPermissions("erp:income:edit")
@RequestMapping(value = "delete")
@ResponseBody
public String delete(ErpIncome erpIncome) {
erpIncomeService.delete(erpIncome);
return renderResult(Global.TRUE, text("删除收入成功!"));
}
/**
* 记账数据
*/
@RequestMapping(value = "recorded")
@ResponseBody
public String recorded(ErpIncome erpIncome) {
ErpIncome income = erpIncomeService.get(erpIncome);
income.setIsRecorded("1");
erpIncomeService.save(income);
flowService.addIncome(income);
return renderResult(Global.TRUE, text("记账收入成功!"));
}
}

View File

@@ -0,0 +1,54 @@
package com.jeesite.modules.utils;
import java.math.BigDecimal;
import java.math.RoundingMode;
public class BigDecimalUtils {
private static final int SCALE = 2;
private static final RoundingMode ROUND_MODE = RoundingMode.HALF_UP;
/**
* 加
*/
public static BigDecimal add(BigDecimal num1, BigDecimal num2) {
num1 = defaultIfNull(num1);
num2 = defaultIfNull(num2);
return num1.add(num2);
}
/**
* 减
*/
public static BigDecimal subtract(BigDecimal num1, BigDecimal num2) {
num1 = defaultIfNull(num1);
num2 = defaultIfNull(num2);
return num1.subtract(num2);
}
/**
* 乘
*/
public static BigDecimal multiply(BigDecimal num1, BigDecimal num2) {
num1 = defaultIfNull(num1);
num2 = defaultIfNull(num2);
return num1.multiply(num2).setScale(SCALE, ROUND_MODE);
}
/**
* 除
*/
public static BigDecimal divide(BigDecimal num1, BigDecimal num2) {
num1 = defaultIfNull(num1);
num2 = defaultIfNull(num2);
if (num2.compareTo(BigDecimal.ZERO) == 0) {
return BigDecimal.ZERO;
}
return num1.divide(num2, SCALE, ROUND_MODE);
}
private static BigDecimal defaultIfNull(BigDecimal num) {
return num == null ? BigDecimal.ZERO : num;
}
}

View File

@@ -1,7 +1,10 @@
package com.jeesite.modules.utils;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.Date;
public class DateUtils {
private static final DateTimeFormatter MONTH_FORMATTER = DateTimeFormatter.ofPattern("MM");
@@ -12,7 +15,6 @@ public class DateUtils {
private static final DateTimeFormatter SHORT_YEAR_MONTH_CN_FORMATTER = DateTimeFormatter.ofPattern("yy年MM月");
public static String dsValue() {
LocalDate currentDate = LocalDate.now();
return currentDate.format(DATE_FORMATTER);
@@ -50,4 +52,20 @@ public class DateUtils {
public static String getMonth(LocalDate date) {
return date.format(MONTH_FORMATTER);
}
public static String getYear(Date date) {
return getYear(dateToLocalDate(date));
}
public static String getMonth(Date date) {
return getMonth(dateToLocalDate(date));
}
public static String getDate(String pattern) {
return new SimpleDateFormat(pattern).format(new Date());
}
public static LocalDate dateToLocalDate(Date date) {
return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
}
}