diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountController.java index 2e2e9eb4..63e14668 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountController.java @@ -2,8 +2,12 @@ package com.ruoyi.system.controller; import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; import com.alibaba.fastjson.JSON; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.process.general.service.IProcessService; @@ -92,6 +96,30 @@ public class BaseExpenseAccountController extends BaseController public TableDataInfo list(BaseExpenseAccountVo baseExpenseAccount) { startPage(); +// SysUser curUser = ShiroUtils.getSysUser(); +// String loginName = ShiroUtils.getLoginName(); +// Long userId = curUser.getUserId(); +// Set roleKeys = roleService.selectRoleKeys(userId); +// List sysUserlist = sysUserService.selectRoleToUserList("ywyRole"); +// sysUserlist.add(curUser); +// //如果当前登录人的角色中包含下面其中之一，包含角色为（总经理、财务经理、财务主管、财务、 超级管理）可以查看所有的报销信息 +// if(roleKeys.contains("zjlRole") || roleKeys.contains("zozjRole") || roleKeys.contains("fzjlRole") || +// roleKeys.contains("cwyRole") || roleKeys.contains("cwjlRole") || roleKeys.contains("cwzgRole") || +// roleKeys.contains("admin")){ +// List list = baseExpenseAccountService.selectBaseExpenseAccountList(baseExpenseAccount); +// return getDataTable(list); +// }else if(roleKeys.contains(",")) { +// //部门主管查询部门的所有,查看对应部门下的所有报销单 +// List list = baseExpenseAccountService.selectBaseExpenseAccountList(baseExpenseAccount); +// List findUser = sysUserlist.stream().filter(item -> (item.getDeptId().equals(curUser.getDeptId()))).collect(Collectors.toList()); +// List user = findUser.stream().map(SysUser::getLoginName).collect(Collectors.toList()); +// return getDataTable(list); +// } +// if (roleKeys.contains("jlRole")) { +// List findUser = sysUserlist.stream().filter(item -> (item.getDeptId().equals(curUser.getDeptId()))).collect(Collectors.toList()); +// List user = findUser.stream().map(SysUser::getLoginName).collect(Collectors.toList()); +//// String userStr = String.join(",", user); +// } List list = baseExpenseAccountService.selectBaseExpenseAccountList(baseExpenseAccount); return getDataTable(list); } @@ -103,7 +131,7 @@ public class BaseExpenseAccountController extends BaseController @Log(title = "报销单", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(BaseExpenseAccount baseExpenseAccount) + public AjaxResult export(BaseExpenseAccountVo baseExpenseAccount) { List list = baseExpenseAccountService.selectBaseExpenseAccountList(baseExpenseAccount); ExcelUtil util = new ExcelUtil(BaseExpenseAccountVo.class); @@ -221,7 +249,7 @@ public class BaseExpenseAccountController extends BaseController if (processIsFinish) { // 审核通过 baseExpenseAccountVo.setAuditStatus("1"); - baseExpenseAccountVo.setFinanceAuditStatus("1"); + baseExpenseAccountVo.setFinanceAuditStatus("0"); baseExpenseAccountVo.setManagerAuditStatus("1"); // 提交 if("submit".equals(instanceType)){ @@ -274,4 +302,10 @@ public class BaseExpenseAccountController extends BaseController public AjaxResult getId(){ return AjaxResult.success(baseExpenseAccountService.getId()); } + + @RequestMapping("/getExpenseUser") + @ResponseBody + public AjaxResult getExpenseCode() throws Exception { + return AjaxResult.success(sysUserService.selectUserAll()); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseExpenseAccount.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseExpenseAccount.java index 8e79c31c..5a6dda91 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseExpenseAccount.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseExpenseAccount.java @@ -101,6 +101,7 @@ public class BaseExpenseAccount extends BaseEntity /** 申请人 */ private String applyTitle; + /** 申请时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date applyTime; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseExpenseAccountChild.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseExpenseAccountChild.java index e21d06e8..0dd3bd66 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseExpenseAccountChild.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseExpenseAccountChild.java @@ -60,6 +60,8 @@ public class BaseExpenseAccountChild extends BaseEntity /** 删除状态 */ private String delFlag; + private Integer index; + public void setExpenseChildId(Long expenseChildId) { this.expenseChildId = expenseChildId; @@ -160,6 +162,14 @@ public class BaseExpenseAccountChild extends BaseEntity return delFlag; } + public Integer getIndex() { + return index; + } + + public void setIndex(Integer index) { + this.index = index; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseExpenseAccountMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseExpenseAccountMapper.java index d4cced6b..81fe0ee0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseExpenseAccountMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseExpenseAccountMapper.java @@ -26,7 +26,7 @@ public interface BaseExpenseAccountMapper * @param baseExpenseAccount 报销单 * @return 报销单集合 */ - public List selectBaseExpenseAccountList(BaseExpenseAccount baseExpenseAccount); + public List selectBaseExpenseAccountList(BaseExpenseAccountVo baseExpenseAccount); /** * 新增报销单 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseExpenseAccountService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseExpenseAccountService.java index c1988861..62957f18 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseExpenseAccountService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseExpenseAccountService.java @@ -28,7 +28,9 @@ public interface IBaseExpenseAccountService * @param baseExpenseAccount 报销单 * @return 报销单集合 */ - public List selectBaseExpenseAccountList(BaseExpenseAccount baseExpenseAccount); +// public List selectBaseExpenseAccountList(BaseExpenseAccount baseExpenseAccount); + + public List selectBaseExpenseAccountList(BaseExpenseAccountVo baseExpenseAccount); /** * 新增报销单 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java index 9dfebe9d..29966296 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java @@ -7,7 +7,6 @@ import java.util.Set; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.PageDomain; import com.ruoyi.common.core.page.TableSupport; @@ -78,7 +77,12 @@ public class BaseExpenseAccountServiceImpl implements IBaseExpenseAccountService @Override public BaseExpenseAccountVo selectBaseExpenseAccountById(Long expenseId) { - return baseExpenseAccountMapper.selectBaseExpenseAccountById(expenseId); + BaseExpenseAccountVo baseExpenseAccountVo = baseExpenseAccountMapper.selectBaseExpenseAccountById(expenseId); + SysUser sysUser2 = userMapper.selectUserByLoginName(baseExpenseAccountVo.getApplyUser()); + if (sysUser2!=null){ + baseExpenseAccountVo.setApplyUserName(sysUser2.getUserName()); + } + return baseExpenseAccountVo; } /** @@ -88,7 +92,7 @@ public class BaseExpenseAccountServiceImpl implements IBaseExpenseAccountService * @return 报销单 */ @Override - public List selectBaseExpenseAccountList(BaseExpenseAccount baseExpenseAccount) + public List selectBaseExpenseAccountList(BaseExpenseAccountVo baseExpenseAccount) { PageDomain pageDomain = TableSupport.buildPageRequest(); Integer pageNum = pageDomain.getPageNum(); diff --git a/ruoyi-admin/src/main/resources/mapper/system/BaseExpenseAccountMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/BaseExpenseAccountMapper.xml index f7e2c4bf..8185b4da 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/BaseExpenseAccountMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/BaseExpenseAccountMapper.xml @@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from base_expense_account - select b.expense_id, b.audit_status, b.manager_audit_status, b.finance_audit_status, b.expense_code, b.deptName, b.postName, b.fullName, b.expense_method, b.is_purchase_outsource, b.supplier_code, b.corporate_payee, b.corporate_receiving_account, b.public_account_banks, @@ -79,13 +79,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and b.apply_user = #{applyUser} and b.apply_time = #{applyTime} and b.expense_code like concat('%',#{keyword},'%') - and - or expense_code in ( + + and b.create_time between #{params.beginCreateTime} and #{params.endCreateTime} + + + and expense_code in ( select expense_code from ck_equipCodeChild and cost_type = #{params.costType} and cost_small_type = #{params.costTypeName} + and evection_code like concat('%',#{params.evectionCode},'%') + and outsource_code like concat('%',#{params.outsourceCode},'%') + and purchase_code like concat('%',#{params.purchaseCode},'%') ) diff --git a/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html b/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html index c6cd9fba..39957da7 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html @@ -2,24 +2,18 @@ - +
- -
+
- +
- +
@@ -29,77 +23,78 @@
- +
- +
- +
-