【修改】政府采购

src/main/java/io/office/modules/manage/controller/ApplicationCaseController.java

@@ -11,6 +11,7 @@ import io.office.modules.manage.service.ApplicationCaseService;
 import io.office.modules.manage.service.TokenCountService;
 import io.office.modules.sys.controller.AbstractController;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -41,7 +42,7 @@ public class ApplicationCaseController extends AbstractController {
      * 列表
      */
     @RequestMapping("/list")
-    //@RequiresPermissions("manage:applicationcase:list")
+    @RequiresPermissions("publicmanage:cases:list")
     public R list(@RequestBody Map<String, Object> params) {
         PageUtils page = applicationCaseService.queryPage(params);
 
@@ -52,7 +53,7 @@ public class ApplicationCaseController extends AbstractController {
     @RequestMapping("/api/list")
     //@RequiresPermissions("manage:applicationcase:list")
     public R getList(@RequestBody Map<String, Object> params) {
-        PageUtils page = applicationCaseService.queryPage(params);
+        PageUtils page = applicationCaseService.getList(params);
 
         return R.ok().put("data", page);
     }
@@ -61,7 +62,7 @@ public class ApplicationCaseController extends AbstractController {
      * 信息
      */
     @RequestMapping("/info/{id}")
-    //@RequiresPermissions("manage:applicationcase:info")
+    @RequiresPermissions("publicmanage:cases:info")
     public R info(@PathVariable("id") String id) {
         ApplicationCaseEntity applicationCase = applicationCaseService.getById(id);
         return R.ok().put("data", applicationCase);
@@ -72,7 +73,7 @@ public class ApplicationCaseController extends AbstractController {
      */
     @SysLog("保存政府采购应用案例")
     @RequestMapping("/save")
-    //@RequiresPermissions("manage:applicationcase:save")
+    @RequiresPermissions("publicmanage:cases:save")
     public R save(@RequestBody ApplicationCaseEntity applicationCaseEntity) {
         //校验参数
        // ValidatorUtils.validateEntity(applicationCase, AddGroup.class);
@@ -89,7 +90,7 @@ public class ApplicationCaseController extends AbstractController {
      */
     @SysLog("修改政府采购应用案例")
     @RequestMapping("/update")
-    //@RequiresPermissions("manage:applicationcase:update")
+    @RequiresPermissions("publicmanage:cases:update")
     public R update(@RequestBody ApplicationCaseEntity applicationCaseEntity) {
         applicationCaseService.updateApplicationCaseById(applicationCaseEntity, getUser());
         return R.ok();
@@ -100,7 +101,7 @@ public class ApplicationCaseController extends AbstractController {
      */
     @SysLog("删除政府采购应用案例")
     @RequestMapping("/delete")
-    //@RequiresPermissions("manage:applicationcase:delete")
+    @RequiresPermissions("publicmanage:cases:delete")
     public R delete(@RequestBody String[] ids) {
         for(String id :ids) {
             UpdateWrapper<ApplicationCaseEntity> applicationCaseEntityUpdateWrapper = new UpdateWrapper<>();
@@ -114,7 +115,7 @@ public class ApplicationCaseController extends AbstractController {
 
     @SysLog("审批政府采购应用案例")
     @RequestMapping("/check")
-    //@RequiresPermissions("manage:applicationcase:delete")
+    @RequiresPermissions("publicmanage:cases:check")
     public R check(@RequestBody ApplicationCaseEntity applicationCaseEntity) {
         applicationCaseService.checkApplicationCaseById(applicationCaseEntity, getUser());
         return R.ok();

src/main/java/io/office/modules/manage/service/impl/ApplicationCaseServiceImpl.java

@@ -61,7 +61,7 @@ public class ApplicationCaseServiceImpl extends ServiceImpl<ApplicationCaseDao,
         QueryWrapper<ApplicationCaseEntity> applicationCaseEntityQueryWrapper = new QueryWrapper<>();
         applicationCaseEntityQueryWrapper.gt("status", 0);
         applicationCaseEntityQueryWrapper.orderByAsc("levels");
-        applicationCaseEntityQueryWrapper.orderByDesc("show_date");
+        applicationCaseEntityQueryWrapper.orderByDesc("show_time");
         IPage<ApplicationCaseEntity> page = this.page(
                 new Query<ApplicationCaseEntity>().getPage(params),
                 applicationCaseEntityQueryWrapper