From d90bbf229f76e376b6d5ded7a9066a8e0c2038b4 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Wed, 13 Oct 2021 15:22:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCaseCommitteeController.java | 5 +++++ .../PayCaseCommitteeSubitemController.java | 7 +++++++ .../controller/PayMailBillController.java | 5 +++++ .../controller/PayMailContractController.java | 21 +++++++++++++++++-- .../AllProjectStatisticsController.java | 6 +++++- .../CompanyComeMoneyStatisticsController.java | 4 ++++ .../PayWorkingGroupStatisticsController.java | 4 ++++ .../PrincipalPeopleStatisticsController.java | 3 +++ 8 files changed, 52 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java index 49315f6f..bb22d38b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java @@ -26,6 +26,8 @@ import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresAuthentication; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -144,6 +146,7 @@ public class PayCaseCommitteeController extends JeroController find(@RequestParam(name="contactsName",required =false) String contactsName, @@ -146,6 +148,8 @@ public class PayCaseCommitteeSubitemController extends JeroController queryPageList( PayMailBillSearch payMailBillSearch, @@ -198,6 +200,7 @@ public class PayMailBillController extends JeroController queryPageList(PayMailBillList payMailBillList, @@ -104,10 +106,11 @@ public class PayMailContractController extends JeroController edit(@RequestBody PayMailContract payMailContract + @PostMapping(value = "/mile") + public Result mile(@RequestBody PayMailContract payMailContract ) { PayMailContract payMailContractData = payMailContractService.getById(payMailContract.getId()); payMailContract.setPostStatus(1); @@ -137,7 +140,20 @@ public class PayMailContractController extends JeroController edit(@RequestBody PayMailContract payMailContract + ) { + payMailContract.setPostStatus(1); + payMailContractService.updateById(payMailContract); + return Result.OK("操作成功!"); + } // /** // * 通过id删除 // * @@ -186,6 +202,7 @@ public class PayMailContractController extends JeroController list(@Valid AllProjectStatisticsSearch allProjectStatisticsSearch, @@ -142,7 +144,7 @@ public class AllProjectStatisticsController { * @param pageNo 页数 * @param pageSize 条数 */ - + @RequiresPermissions("projectPaymentStatistics:search") @ApiOperation(value = "企业项目统计-分页列表查询", notes = "企业项目统计-详情分页列表查询") @GetMapping(value = "/listProject") public Result listProject(AllProjectStatisticsSearch allProjectStatisticsSearch, @@ -215,6 +217,7 @@ public class AllProjectStatisticsController { *所领导统计导出 * */ + @RequiresPermissions("wholeInstituteStatistics:export") @AutoLog(value = "全所统计导出-导出统计") @GetMapping(value = "/statistics/excel") @ApiOperation(value = "全所统计导出-导出统计", notes = "全所统计导出-导出统计") @@ -264,6 +267,7 @@ public class AllProjectStatisticsController { *企业来款统计 * */ + @RequiresPermissions("projectPaymentStatistics:export") @AutoLog(value = "企业项目统计-导出统计") @GetMapping(value = "/statistics/excelProject") @ApiOperation(value = "企业项目统计-导出统计", notes = "企业项目统计-导出统计") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index b002fa64..91f9669d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -20,6 +20,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -55,6 +56,7 @@ public class CompanyComeMoneyStatisticsController { * @param pageNo 页数 * @param pageSize 条数 */ + @RequiresPermissions("companyPaymentStatistics:search") @ApiOperation(value = "企业来款统计-分页列表查询", notes = "企业来款统计-分页列表查询") @GetMapping(value = "/list") public Result list(CompanyComeMoneySearch companyComeMoneySearch, @@ -124,6 +126,7 @@ public class CompanyComeMoneyStatisticsController { * @param pageNo 页数 * @param pageSize 条数 */ + @RequiresPermissions("companyPaymentStatistics:detail") @ApiOperation(value = "企业来款详情统计-详情分页列表查询", notes = "企业来款详情统计-详情分页列表查询") @GetMapping(value = "/listForDetail") public Result listForDetail(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch, @@ -194,6 +197,7 @@ public class CompanyComeMoneyStatisticsController { *企业来款统计 * */ + @RequiresPermissions("companyPaymentStatistics:export") @AutoLog(value = "企业来款统计-导出统计") @GetMapping(value = "/excel") @ApiOperation(value = "企业来款统计-导出统计", notes = "企业来款统计-导出统计") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java index 43558c19..61402b54 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java @@ -28,6 +28,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.hssf.record.DVALRecord; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -64,6 +65,7 @@ public class PayWorkingGroupStatisticsController { * @param pageSize 条数 * */ + @RequiresPermissions("workingGroupPaymentStatistics:search") @ApiOperation(value="工作组项目统计-统计分页列表查询", notes="工作组项目统计-统计分页列表查询") @GetMapping(value = "/list") public Result list(PayWorkingGroupSearch payWorkingGroupSearch, @@ -137,6 +139,7 @@ public class PayWorkingGroupStatisticsController { * 工作组项目统计-统计导出excel * */ + @RequiresPermissions("workingGroupPaymentStatistics:export") @AutoLog(value = "工作组项目统计-统计导出excel") @GetMapping(value = "/exportXls2") @ApiOperation(value="工作组项目统计-统计导出excel", notes="工作组项目统计-统计导出excel") @@ -194,6 +197,7 @@ public class PayWorkingGroupStatisticsController { * @param pageSize 条数 * */ + @RequiresPermissions("workingGroupPaymentStatistics:detail") @ApiOperation(value = "工作组成员统计-详情分页列表查询(传工作组id)", notes = "工作组成员统计-详情分页列表查询(传工作组id)") @GetMapping(value = "/listSub") @ApiImplicitParam(name = "id", value = "工作组id", dataType = "String", required = true) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java index 3aec7d81..6b1edd26 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java @@ -24,6 +24,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -58,6 +59,7 @@ public class PrincipalPeopleStatisticsController { * @param pageNo 页数 * @param pageSize 条数 */ + @RequiresPermissions("individualPaymentStatistics:search") @ApiOperation(value = "个人来款统计-分页列表查询", notes = "个人来款统计-分页列表查询") @GetMapping(value = "/list") public Result list(PrincipalPeopleSearch principalPeopleSearch, @@ -178,6 +180,7 @@ public class PrincipalPeopleStatisticsController { *个人来款统计导出 * */ + @RequiresPermissions("individualPaymentStatistics:export") @AutoLog(value = "个人来款统计导出-导出统计") @GetMapping(value = "/excel") @ApiOperation(value = "个人来款统计导出-导出统计", notes = "个人来款统计导出-导出统计")