mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小注释

master
xxssyyyyssxx 2021-11-03 19:06:31 +08:00
parent 08c0b2d862
commit 4c73c75eb4
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/cn/palmte/work/controller/backend/ProjectController.java
View File

@ -94,8 +94,7 @@ public class ProjectController extends BaseController{
* 预算保存草稿 * 预算保存草稿
*/ */
@RequestMapping("/estimateAddSave") @RequestMapping("/estimateAddSave")
public String estimateAddSave(Project project, EstimateBean estimateBean, public String estimateAddSave(Project project, EstimateBean estimateBean, Map<String, Object> model) {
Map<String, Object> model) {
projectService.estimateAddSave(project, estimateBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_UNCOMMIT); projectService.estimateAddSave(project, estimateBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_UNCOMMIT);
return "redirect:/project/list"; return "redirect:/project/list";
} }
@ -104,8 +103,7 @@ public class ProjectController extends BaseController{
* 预算保存并提交审核 * 预算保存并提交审核
*/ */
@RequestMapping("/estimateAddSaveAndApprove") @RequestMapping("/estimateAddSaveAndApprove")
public String estimateAddSaveAndApprove(Project project, EstimateBean estimateBean, public String estimateAddSaveAndApprove(Project project, EstimateBean estimateBean, Map<String, Object> model) {
Map<String, Object> model) {
projectService.estimateAddSave(project, estimateBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_PENDING); projectService.estimateAddSave(project, estimateBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_PENDING);
//TODO 发起审核 //TODO 发起审核
return "redirect:/project/list"; return "redirect:/project/list";
@ -121,15 +119,13 @@ public class ProjectController extends BaseController{
return "admin/project_estimate_edit"; return "admin/project_estimate_edit";
} }
@RequestMapping("/estimateEditSave") @RequestMapping("/estimateEditSave")
public String estimateEditSave(Project project, EstimateBean estimateBean, public String estimateEditSave(Project project, EstimateBean estimateBean, Map<String, Object> model) {
Map<String, Object> model) {
projectService.estimateEditSave(project, estimateBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_UNCOMMIT); projectService.estimateEditSave(project, estimateBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_UNCOMMIT);
return "redirect:/project/list"; return "redirect:/project/list";
} }
@RequestMapping("/estimateEditSaveAndApprove") @RequestMapping("/estimateEditSaveAndApprove")
public String estimateEditSaveAndApprove(Project project, EstimateBean estimateBean, public String estimateEditSaveAndApprove(Project project, EstimateBean estimateBean, Map<String, Object> model) {
Map<String, Object> model) {
projectService.estimateEditSave(project, estimateBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_PENDING); projectService.estimateEditSave(project, estimateBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_PENDING);
//TODO 发起审核 //TODO 发起审核
return "redirect:/project/list"; return "redirect:/project/list";
@ -154,8 +150,7 @@ public class ProjectController extends BaseController{
* 进行项目预算保存 * 进行项目预算保存
*/ */
@RequestMapping("/budgetEditSave") @RequestMapping("/budgetEditSave")
public String budgetEditSave(Project project, BudgetBean budgetBean, public String budgetEditSave(Project project, BudgetBean budgetBean, Map<String, Object> model) {
Map<String, Object> model) {
projectService.budgetEditSave(project, budgetBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_UNCOMMIT); projectService.budgetEditSave(project, budgetBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_UNCOMMIT);
return "redirect:/project/list"; return "redirect:/project/list";
} }
@ -163,8 +158,7 @@ public class ProjectController extends BaseController{
* 进行项目预算保存并提交审核 * 进行项目预算保存并提交审核
*/ */
@RequestMapping("/budgetEditSaveAndApprove") @RequestMapping("/budgetEditSaveAndApprove")
public String budgetEditSaveAndApprove(Project project, BudgetBean budgetBean, public String budgetEditSaveAndApprove(Project project, BudgetBean budgetBean, Map<String, Object> model) {
Map<String, Object> model) {
projectService.budgetEditSave(project, budgetBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_PENDING); projectService.budgetEditSave(project, budgetBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_PENDING);
return "redirect:/project/list"; return "redirect:/project/list";
} }

3
src/main/java/cn/palmte/work/service/ProjectBudgetService.java
View File

@ -144,6 +144,9 @@ public class ProjectBudgetService {
} }
/**
* 其实最好是通过明细表生成，不然可能有数据不一致的情况
*/
public BudgetBean getBudget(Project project) { public BudgetBean getBudget(Project project) {
BudgetBean budgetBean = new BudgetBean(); BudgetBean budgetBean = new BudgetBean();