Parcourir la source

财务经理查看修改

anderx il y a 1 an
Parent
commit
b965e851ef

+ 2 - 48
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -36,8 +36,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 新增私有报销帐号
-     * @param in
-     * @return
      */
     @RequestMapping(value = "/add",method = RequestMethod.POST)
     public Result add(@Validated InputExpenseAccount in , BindingResult bindingResult){
@@ -55,8 +53,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 删除报销
-     * @param id
-     * @return
      */
     @RequestMapping(value = "/delete",method = RequestMethod.POST)
     public Result delete(String id){
@@ -69,7 +65,6 @@ public class ExpenseAccountController extends CertifyApiController {
     /**
      * 新增私有报销帐号
      * @param in  updateType=1时,作为修改类型。会删除所有子项
-     * @return
      */
     @RequestMapping(value = "/update",method = RequestMethod.POST)
     public Result update( InputExpenseAccount in ){
@@ -94,7 +89,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 删除报销抵扣
-     * @return
      */
     @RequestMapping(value = "/updateDebitId",method = RequestMethod.POST)
     public Result updateDebitId( InputExpenseAccount in ){
@@ -105,8 +99,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 主报销列表
-     * @param in
-     * @return
      */
     @RequestMapping(value = "/mainList",method = RequestMethod.GET)
     public Result mainList(ExpenseMainListInput in){
@@ -116,8 +108,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 报销列表,子报销列表
-     * @param in
-     * @return
      */
     @RequestMapping(value = "/pageList",method = RequestMethod.GET)
     public Result pageList(InputPageListBo in ){
@@ -128,8 +118,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 费用单列表导出
-     * @param in
-     * @return
      */
     @RequestMapping(value = "/pageListExport",method = RequestMethod.GET)
     public Result pageListExport(InputPageListBo in ){
@@ -140,7 +128,6 @@ public class ExpenseAccountController extends CertifyApiController {
     }
     /**
      * 报销详情列表
-     * @return
      */
     @RequestMapping(value = "/detailsList",method = RequestMethod.GET)
     public Result detailsList(InputDetailsListBo in ){
@@ -151,7 +138,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 费用详情列表导出
-     * @return
      */
     @RequestMapping(value = "/detailsListExport",method = RequestMethod.GET)
     public Result detailsListExport(InputDetailsListBo in ){
@@ -166,8 +152,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 判断当前是否存在草稿
-     * @param in
-     * @return
      */
     @RequestMapping(value = "/selectByPrid",method = RequestMethod.GET)
     public Result selectByPrid(InputExpenseAccount in ){
@@ -178,8 +162,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 报销列表
-     * @param id
-     * @return
      */
     @RequestMapping(value = "/selectById",method = RequestMethod.GET)
     public Result selectById(Integer id ){
@@ -190,8 +172,7 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 报销列表
-     * @param checkNo
-     * @return
+     * @param checkNo 查询编号
      */
     @RequestMapping(value = "/selectByCheckNo",method = RequestMethod.GET)
     public Result selectByCheckNo(String checkNo ){
@@ -205,8 +186,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 新增报销详情
-     * @param in
-     * @return
      */
     @RequestMapping(value = "/details/add",method = RequestMethod.POST)
     public Result addDetails(@Validated InputExpenseAccountDetails in , BindingResult bindingResult){
@@ -223,8 +202,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 删除报销详情
-     * @param id
-     * @return
      */
     @RequestMapping(value = "/details/delete",method = RequestMethod.GET)
     public Result deleteDetails(Integer id){
@@ -235,8 +212,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 报销详情
-     * @param eaid
-     * @return
      */
     @RequestMapping(value = "/details/list",method = RequestMethod.GET)
     public Result detailsList(Integer eaid){
@@ -259,9 +234,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 报销审核
-     * @param in
-     * @param bindingResult
-     * @return
      */
     @RequestMapping(value = "/examine",method = RequestMethod.POST)
     public Result examine(InputExpenseAccount in,BindingResult bindingResult){
@@ -277,7 +249,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 获取借支列表
-     * @return
      */
     @RequestMapping(value = "/selectDebitOrder",method = RequestMethod.GET)
     public Result selectDebitOrder(String depId,Integer id){
@@ -292,15 +263,12 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 获取后台统计数据
-     * @return
      */
     @RequestMapping(value = "/statistics",method = RequestMethod.GET)
     public Result statistics(String name,String depId,String startTime,String endTime) {
         Result res = new Result();
         String lander = null;
-        if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)){
-            lander=null;
-        }else if (TokenManager.hasRole(AFTConstants.FINANCE)) {
+        if (TokenManager.hasRole(AFTConstants.FINANCE)) {
             lander = TokenManager.getAdminId();
         }
         res.setData(expenseAccountService.statistics(name, depId, startTime, endTime, lander));
@@ -317,7 +285,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 获取后台统计数据
-     * @return
      */
     @RequestMapping(value = "/statistics/export",method = RequestMethod.GET)
     public Result statisticsExport(String name,String depId,String startTime,String endTime) {
@@ -332,8 +299,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 合并报销
-     * @param ids
-     * @return
      */
     @RequestMapping(value = "/merge",method = RequestMethod.GET)
     public Result merge(String ids){
@@ -371,8 +336,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 主报销详情
-     * @param id
-     * @return
      */
     @RequestMapping(value = "/mainExpense",method = RequestMethod.GET)
     public Result mainExpense(Integer id){
@@ -386,8 +349,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 修改主报销
-     * @param in
-     * @return
      */
     @RequestMapping(value = "/updateMain",method = RequestMethod.POST)
     public Result updateMain( MainExpenseAccount in){
@@ -408,7 +369,6 @@ public class ExpenseAccountController extends CertifyApiController {
      * @param type 类型 1报销与费用  2费用详细  去掉修改上级,只能修改费用
      * @param id 编号
      * @param amount 金额
-     * @return
      */
     @RequestMapping(value = "/updateRealAmount",method = RequestMethod.POST)
     public Result updateRealAmount(Integer type ,Integer id,BigDecimal amount){
@@ -426,9 +386,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      *  修改报销类型说明
-     * @param id
-     * @param typeOther
-     * @return
      */
     @RequestMapping(value = "/updateTypeOther",method = RequestMethod.POST)
     public Result updateTypeOther(Integer id ,String typeOther,String remarks,String orderNo){
@@ -442,7 +399,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      * 主类分类说明
-     * @return
      */
     @RequestMapping(value = "/pushAll",method = RequestMethod.GET)
     public Result pushAll(){
@@ -452,8 +408,6 @@ public class ExpenseAccountController extends CertifyApiController {
 
     /**
      *  获取报销部门设置
-     * @param id
-     * @return
      */
     @RequestMapping(value = "/getDepDetails",method = RequestMethod.GET)
     public Result<OrganizationListOut> getDepDetails(Integer id){