Merge branch 'master' of http://gogs.hajianshe.cn/gmcs/HongHu-PSM

# Conflicts:
#	ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankDepositController.java

bidding-ui/src/views/mine/bankinfo.vue

@@ -5,37 +5,42 @@
     <el-alert v-if="bankinfoStatus == 3" :title="bankinfoStatusMap[bankinfoStatus]" type="error" center></el-alert>
     <el-form :model="form" ref="ruleForm" label-width="120px" :rules="rules" style="margin-top: 10px;">
       <el-row>
+        <el-col :span="12">
+          <el-form-item label="账户名称" prop="hName">
+            <el-input type="text" v-model="supplier.hName" :disabled="true" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="纳税人识别号" prop="hEncode">
             <el-input type="text" v-model="form.hEncode" :disabled="!isEdit" />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="12">
           <el-form-item label="开户行" prop="hBank">
             <el-input type="text" v-model="form.hBank" :disabled="!isEdit" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="12">
           <el-form-item label="银行账号" prop="hAccount">
             <el-input type="text" v-model="form.hAccount" :disabled="!isEdit" />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="12">
           <el-form-item label="开票地址" prop="hBankAddress">
             <el-input type="text" v-model="form.hBankAddress" :disabled="!isEdit" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="开户许可证" prop="hProve">
             <el-input v-show="false" v-model="form.hProve" :disabled="!isEdit" />
             <file-upload-json v-if="isEdit" @input="handleUpload" :limit="1" :value="fjAnnex.uploadFiles"
               :file-size="50" :file-type="['pdf']" />
             <div v-if="!isEdit">
-              <div v-for="(item, index) in fjAnnex.uploadFiles">
+              <div v-for="(item, index) in fjAnnex.uploadFiles" :key="index">
                 <a :href="item.url" style="color: blue;" target="_blank">{{ item.name }}</a>
               </div>
             </div>

bidding-ui/src/views/mine/tenderOffer.vue

@@ -32,8 +32,8 @@
       <el-table-column label="供应商联系方式" prop="contactPhone" align="center" />
       <el-table-column label="报价时间" prop="quoteTime" align="center">
         <template slot-scope="scope">
-            <span>{{scope.row.quoteTime}}</span>
-          </template>
+          {{ scope.row.thirdTime ? scope.row.thirdTime : (scope.row.secondTime ? scope.row.secondTime : scope.row.firstTime) }}
+        </template>
       </el-table-column>
       <el-table-column label="报价金额" align="center">
         <template slot-scope="scope">

ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java

@@ -27,7 +27,7 @@ public @interface DataScope
     public String userAlias() default "";
 
     /**
-     * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@RequiresPermissions获取，多个权限用逗号分隔开来
+     * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解// @RequiresPermissions获取，多个权限用逗号分隔开来
      */
     public String permission() default "";
 }

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java

@@ -87,7 +87,7 @@ public class PreAuthorizeAspect
             AuthUtil.checkRole(requiresRoles);
         }
 
-        // 校验 @RequiresPermissions 注解
+        // 校验 // @RequiresPermissions 注解
         RequiresPermissions requiresPermissions = method.getAnnotation(RequiresPermissions.class);
         if (requiresPermissions != null)
         {

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java

@@ -129,7 +129,7 @@ public class AuthLogic
     }
 
     /**
-     * 根据注解(@RequiresPermissions)鉴权, 如果验证未通过，则抛出异常: NotPermissionException
+     * 根据注解(// @RequiresPermissions)鉴权, 如果验证未通过，则抛出异常: NotPermissionException
      * 
      * @param requiresPermissions 注解对象
      */
@@ -292,7 +292,7 @@ public class AuthLogic
     }
 
     /**
-     * 根据注解(@RequiresPermissions)鉴权
+     * 根据注解(// @RequiresPermissions)鉴权
      * 
      * @param at 注解对象
      */

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsAccessController.java

@@ -46,7 +46,7 @@ public class BsAccessController extends BaseController {
     /**
      * 查询供应商准入列表
      */
-    @RequiresPermissions("system:supplier:list")
+    // @RequiresPermissions("system:supplier:list")
     @GetMapping("/list")
     public TableDataInfo list(BsAccess bsAccess) {
         startPage();

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsAccessoriesController.java

@@ -47,7 +47,7 @@ public class BsAccessoriesController extends BaseController {
     /**
      * 导出相关附件列表
      */
-    @RequiresPermissions("system:accessories:export")
+    // @RequiresPermissions("system:accessories:export")
     @Log(title = "相关附件", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BsAccessories bsAccessories) {
@@ -59,7 +59,7 @@ public class BsAccessoriesController extends BaseController {
     /**
      * 获取相关附件详细信息
      */
-    @RequiresPermissions("system:accessories:query")
+    // @RequiresPermissions("system:accessories:query")
     @GetMapping(value = "/{fjId}")
     public AjaxResult getInfo(@PathVariable("fjId") Long fjId) {
         return success(bsAccessoriesService.selectBsAccessoriesByFjId(fjId));
@@ -68,7 +68,7 @@ public class BsAccessoriesController extends BaseController {
     /**
      * 新增相关附件
      */
-    @RequiresPermissions("system:accessories:add")
+    // @RequiresPermissions("system:accessories:add")
     @Log(title = "相关附件", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BsAccessories bsAccessories) {
@@ -87,7 +87,7 @@ public class BsAccessoriesController extends BaseController {
     /**
      * 修改相关附件
      */
-    @RequiresPermissions("system:accessories:edit")
+    // @RequiresPermissions("system:accessories:edit")
     @Log(title = "相关附件", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BsAccessories bsAccessories) {
@@ -106,7 +106,7 @@ public class BsAccessoriesController extends BaseController {
     /**
      * 删除相关附件
      */
-    @RequiresPermissions("system:accessories:remove")
+    // @RequiresPermissions("system:accessories:remove")
     @Log(title = "相关附件", businessType = BusinessType.DELETE)
     @DeleteMapping("/{fjIds}")
     public AjaxResult remove(@PathVariable Long[] fjIds) {

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsAchievementController.java

@@ -47,7 +47,7 @@ public class BsAchievementController extends BaseController {
     /**
      * 导出业绩列表
      */
-    @RequiresPermissions("system:achievement:export")
+    // @RequiresPermissions("system:achievement:export")
     @Log(title = "业绩", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BsAchievement bsAchievement) {
@@ -59,7 +59,7 @@ public class BsAchievementController extends BaseController {
     /**
      * 获取业绩详细信息
      */
-    @RequiresPermissions("system:achievement:query")
+    // @RequiresPermissions("system:achievement:query")
     @GetMapping(value = "/{yjId}")
     public AjaxResult getInfo(@PathVariable("yjId") Long yjId) {
         return success(bsAchievementService.selectBsAchievementByYjId(yjId));
@@ -68,7 +68,7 @@ public class BsAchievementController extends BaseController {
     /**
      * 新增业绩
      */
-    @RequiresPermissions("system:achievement:add")
+    // @RequiresPermissions("system:achievement:add")
     @Log(title = "业绩", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BsAchievement bsAchievement) {
@@ -84,7 +84,7 @@ public class BsAchievementController extends BaseController {
     /**
      * 修改业绩
      */
-    @RequiresPermissions("system:achievement:edit")
+    // @RequiresPermissions("system:achievement:edit")
     @Log(title = "业绩", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BsAchievement bsAchievement) {
@@ -103,7 +103,7 @@ public class BsAchievementController extends BaseController {
     /**
      * 删除业绩
      */
-    @RequiresPermissions("system:achievement:remove")
+    // @RequiresPermissions("system:achievement:remove")
     @Log(title = "业绩", businessType = BusinessType.DELETE)
     @DeleteMapping("/{yjIds}")
     public AjaxResult remove(@PathVariable Long[] yjIds) {

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsEducateController.java

@@ -47,7 +47,7 @@ public class BsEducateController extends BaseController {
     /**
      * 导出教育列表
      */
-    @RequiresPermissions("system:educate:export")
+    // @RequiresPermissions("system:educate:export")
     @Log(title = "教育", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BsEducate bsEducate) {
@@ -59,7 +59,7 @@ public class BsEducateController extends BaseController {
     /**
      * 获取教育详细信息
      */
-    @RequiresPermissions("system:educate:query")
+    // @RequiresPermissions("system:educate:query")
     @GetMapping(value = "/{rid}")
     public AjaxResult getInfo(@PathVariable("rid") Long rid) {
         return success(bsEducateService.selectBsEducateByRid(rid));
@@ -68,7 +68,7 @@ public class BsEducateController extends BaseController {
     /**
      * 新增教育
      */
-    @RequiresPermissions("system:educate:add")
+    // @RequiresPermissions("system:educate:add")
     @Log(title = "教育", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BsEducate bsEducate) {
@@ -78,7 +78,7 @@ public class BsEducateController extends BaseController {
     /**
      * 修改教育
      */
-    @RequiresPermissions("system:educate:edit")
+    // @RequiresPermissions("system:educate:edit")
     @Log(title = "教育", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BsEducate bsEducate) {
@@ -88,7 +88,7 @@ public class BsEducateController extends BaseController {
     /**
      * 删除教育
      */
-    @RequiresPermissions("system:educate:remove")
+    // @RequiresPermissions("system:educate:remove")
     @Log(title = "教育", businessType = BusinessType.DELETE)
     @DeleteMapping("/{rids}")
     public AjaxResult remove(@PathVariable Long[] rids) {

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsEnterpriseController.java

@@ -47,7 +47,7 @@ public class BsEnterpriseController extends BaseController {
     /**
      * 导出企业资质列表
      */
-    @RequiresPermissions("system:enterprise:export")
+    // @RequiresPermissions("system:enterprise:export")
     @Log(title = "企业资质", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BsEnterprise bsEnterprise) {
@@ -59,7 +59,7 @@ public class BsEnterpriseController extends BaseController {
     /**
      * 获取企业资质详细信息
      */
-    @RequiresPermissions("system:enterprise:query")
+    // @RequiresPermissions("system:enterprise:query")
     @GetMapping(value = "/{zzId}")
     public AjaxResult getInfo(@PathVariable("zzId") Long zzId) {
         return success(bsEnterpriseService.selectBsEnterpriseByZzId(zzId));
@@ -68,7 +68,7 @@ public class BsEnterpriseController extends BaseController {
     /**
      * 新增企业资质
      */
-    @RequiresPermissions("system:enterprise:add")
+    // @RequiresPermissions("system:enterprise:add")
     @Log(title = "企业资质", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BsEnterprise bsEnterprise) {
@@ -87,7 +87,7 @@ public class BsEnterpriseController extends BaseController {
     /**
      * 修改企业资质
      */
-    @RequiresPermissions("system:enterprise:edit")
+    // @RequiresPermissions("system:enterprise:edit")
     @Log(title = "企业资质", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BsEnterprise bsEnterprise) {
@@ -106,7 +106,7 @@ public class BsEnterpriseController extends BaseController {
     /**
      * 删除企业资质
      */
-    @RequiresPermissions("system:enterprise:remove")
+    // @RequiresPermissions("system:enterprise:remove")
     @Log(title = "企业资质", businessType = BusinessType.DELETE)
     @DeleteMapping("/{zzIds}")
     public AjaxResult remove(@PathVariable Long[] zzIds) {

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsExperienceController.java

@@ -47,7 +47,7 @@ public class BsExperienceController extends BaseController {
     /**
      * 导出任职经历列表
      */
-    @RequiresPermissions("system:experience:export")
+    // @RequiresPermissions("system:experience:export")
     @Log(title = "任职经历", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BsExperience bsExperience) {
@@ -59,7 +59,7 @@ public class BsExperienceController extends BaseController {
     /**
      * 获取任职经历详细信息
      */
-    @RequiresPermissions("system:experience:query")
+    // @RequiresPermissions("system:experience:query")
     @GetMapping(value = "/{qid}")
     public AjaxResult getInfo(@PathVariable("qid") Long qid) {
         return success(bsExperienceService.selectBsExperienceByQid(qid));
@@ -68,7 +68,7 @@ public class BsExperienceController extends BaseController {
     /**
      * 新增任职经历
      */
-    @RequiresPermissions("system:experience:add")
+    // @RequiresPermissions("system:experience:add")
     @Log(title = "任职经历", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BsExperience bsExperience) {
@@ -78,7 +78,7 @@ public class BsExperienceController extends BaseController {
     /**
      * 修改任职经历
      */
-    @RequiresPermissions("system:experience:edit")
+    // @RequiresPermissions("system:experience:edit")
     @Log(title = "任职经历", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BsExperience bsExperience) {
@@ -88,7 +88,7 @@ public class BsExperienceController extends BaseController {
     /**
      * 删除任职经历
      */
-    @RequiresPermissions("system:experience:remove")
+    // @RequiresPermissions("system:experience:remove")
     @Log(title = "任职经历", businessType = BusinessType.DELETE)
     @DeleteMapping("/{qids}")
     public AjaxResult remove(@PathVariable Long[] qids) {

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsExpertController.java

@@ -55,7 +55,6 @@ public class BsExpertController extends BaseController {
     /**
      * 查询专家列表
      */
-//    @RequiresPermissions("system:expert:list")
     @GetMapping("/list")
     public TableDataInfo list(BsExpert bsExpert) {
         startPage();
@@ -66,7 +65,6 @@ public class BsExpertController extends BaseController {
     /**
      * 导出专家列表
      */
-    @RequiresPermissions("system:expert:export")
     @Log(title = "专家", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BsExpert bsExpert) {
@@ -86,7 +84,6 @@ public class BsExpertController extends BaseController {
     /**
      * 新增专家
      */
-    @RequiresPermissions("system:expert:add")
     @Log(title = "专家", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BsExpert bsExpert) {

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsFinancialStatusController.java

@@ -47,7 +47,7 @@ public class BsFinancialStatusController extends BaseController {
     /**
      * 导出财务状态列表
      */
-    @RequiresPermissions("system:status:export")
+    // @RequiresPermissions("system:status:export")
     @Log(title = "财务状态", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BsFinancialStatus bsFinancialStatus) {
@@ -59,7 +59,7 @@ public class BsFinancialStatusController extends BaseController {
     /**
      * 获取财务状态详细信息
      */
-    @RequiresPermissions("system:status:query")
+    // @RequiresPermissions("system:status:query")
     @GetMapping(value = "/{cId}")
     public AjaxResult getInfo(@PathVariable("cId") Long cId) {
         return success(bsFinancialStatusService.selectBsFinancialStatusByCId(cId));
@@ -68,7 +68,7 @@ public class BsFinancialStatusController extends BaseController {
     /**
      * 新增财务状态
      */
-    @RequiresPermissions("system:status:add")
+    // @RequiresPermissions("system:status:add")
     @Log(title = "财务状态", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BsFinancialStatus bsFinancialStatus) {
@@ -87,7 +87,7 @@ public class BsFinancialStatusController extends BaseController {
     /**
      * 修改财务状态
      */
-    @RequiresPermissions("system:status:edit")
+    // @RequiresPermissions("system:status:edit")
     @Log(title = "财务状态", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BsFinancialStatus bsFinancialStatus) {
@@ -106,7 +106,7 @@ public class BsFinancialStatusController extends BaseController {
     /**
      * 删除财务状态
      */
-    @RequiresPermissions("system:status:remove")
+    // @RequiresPermissions("system:status:remove")
     @Log(title = "财务状态", businessType = BusinessType.DELETE)
     @DeleteMapping("/{cIds}")
     public AjaxResult remove(@PathVariable Long[] cIds) {

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsJobController.java

@@ -47,7 +47,7 @@ public class BsJobController extends BaseController {
     /**
      * 导出职称列表
      */
-    @RequiresPermissions("system:job:export")
+    // @RequiresPermissions("system:job:export")
     @Log(title = "职称", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BsJob bsJob) {
@@ -59,7 +59,7 @@ public class BsJobController extends BaseController {
     /**
      * 获取职称详细信息
      */
-    @RequiresPermissions("system:job:query")
+    // @RequiresPermissions("system:job:query")
     @GetMapping(value = "/{mid}")
     public AjaxResult getInfo(@PathVariable("mid") Long mid) {
         return success(bsJobService.selectBsJobByMid(mid));
@@ -68,7 +68,7 @@ public class BsJobController extends BaseController {
     /**
      * 新增职称
      */
-    @RequiresPermissions("system:job:add")
+    // @RequiresPermissions("system:job:add")
     @Log(title = "职称", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BsJob bsJob) {
@@ -78,7 +78,7 @@ public class BsJobController extends BaseController {
     /**
      * 修改职称
      */
-    @RequiresPermissions("system:job:edit")
+    // @RequiresPermissions("system:job:edit")
     @Log(title = "职称", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BsJob bsJob) {
@@ -88,7 +88,7 @@ public class BsJobController extends BaseController {
     /**
      * 删除职称
      */
-    @RequiresPermissions("system:job:remove")
+    // @RequiresPermissions("system:job:remove")
     @Log(title = "职称", businessType = BusinessType.DELETE)
     @DeleteMapping("/{mids}")
     public AjaxResult remove(@PathVariable Long[] mids) {

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsOccupationController.java

@@ -47,7 +47,7 @@ public class BsOccupationController extends BaseController {
     /**
      * 导出职业列表
      */
-    @RequiresPermissions("system:occupation:export")
+    // @RequiresPermissions("system:occupation:export")
     @Log(title = "职业", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BsOccupation bsOccupation) {
@@ -59,7 +59,7 @@ public class BsOccupationController extends BaseController {
     /**
      * 获取职业详细信息
      */
-    @RequiresPermissions("system:occupation:query")
+    // @RequiresPermissions("system:occupation:query")
     @GetMapping(value = "/{nid}")
     public AjaxResult getInfo(@PathVariable("nid") Long nid) {
         return success(bsOccupationService.selectBsOccupationByNid(nid));
@@ -68,7 +68,7 @@ public class BsOccupationController extends BaseController {
     /**
      * 新增职业
      */
-    @RequiresPermissions("system:occupation:add")
+    // @RequiresPermissions("system:occupation:add")
     @Log(title = "职业", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BsOccupation bsOccupation) {
@@ -78,7 +78,7 @@ public class BsOccupationController extends BaseController {
     /**
      * 修改职业
      */
-    @RequiresPermissions("system:occupation:edit")
+    // @RequiresPermissions("system:occupation:edit")
     @Log(title = "职业", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BsOccupation bsOccupation) {
@@ -88,7 +88,7 @@ public class BsOccupationController extends BaseController {
     /**
      * 删除职业
      */
-    @RequiresPermissions("system:occupation:remove")
+    // @RequiresPermissions("system:occupation:remove")
     @Log(title = "职业", businessType = BusinessType.DELETE)
     @DeleteMapping("/{nids}")
     public AjaxResult remove(@PathVariable Long[] nids) {

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsOperatorController.java

@@ -47,7 +47,7 @@ public class BsOperatorController extends BaseController {
     /**
      * 导出业务经办人信息列表
      */
-    @RequiresPermissions("system:operator:export")
+    // @RequiresPermissions("system:operator:export")
     @Log(title = "业务经办人信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BsOperator bsOperator) {

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsPersonnelController.java

@@ -47,7 +47,7 @@ public class BsPersonnelController extends BaseController {
     /**
      * 导出核心技术人员列表
      */
-    @RequiresPermissions("system:personnel:export")
+    // @RequiresPermissions("system:personnel:export")
     @Log(title = "核心技术人员", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BsPersonnel bsPersonnel) {

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsRiskMonitorController.java

@@ -37,7 +37,7 @@ public class BsRiskMonitorController extends BaseController {
     /**
      * 查询供应商风险监控列表
      */
-    @RequiresPermissions("system:monitor:riskMonitor")
+    // @RequiresPermissions("system:monitor:riskMonitor")
     @GetMapping("/list")
     public TableDataInfo list(BsRiskMonitor bsRiskMonitor) {
         startPage();

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsSupplierController.java

@@ -216,7 +216,6 @@ public class BsSupplierController extends BaseController {
     /**
      * 查询合格供应商列表
      */
-    @RequiresPermissions("system:supplier:list")
     @GetMapping("/list")
     public TableDataInfo list(BsSupplier bsSupplier) {
         startPage();
@@ -227,7 +226,6 @@ public class BsSupplierController extends BaseController {
     /**
      * 查询不合格供应商列表
      */
-    @RequiresPermissions("system:supplier:list")
     @GetMapping("/noSupplierList")
     public TableDataInfo noSupplierList(BsSupplier bsSupplier) {
         startPage();
@@ -238,7 +236,6 @@ public class BsSupplierController extends BaseController {
     /**
      * 查询供应商不良记录列表
      */
-    @RequiresPermissions("system:supplier:list")
     @GetMapping("/supplierBadList")
     public TableDataInfo supplierBadList(BsSupplier bsSupplier) {
         startPage();
@@ -249,7 +246,6 @@ public class BsSupplierController extends BaseController {
     /**
      * 导出供应商列表
      */
-    @RequiresPermissions("system:supplier:export")
     @Log(title = "供应商", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BsSupplier bsSupplier) {
@@ -290,7 +286,7 @@ public class BsSupplierController extends BaseController {
     /**
      * 新增供应商
      */
-//    @RequiresPermissions("system:supplier:export")
+//    // @RequiresPermissions("system:supplier:export")
 //    @RequiresRoles("supplierAccount")
     @Log(title = "供应商", businessType = BusinessType.INSERT)
     @PostMapping
@@ -393,7 +389,7 @@ public class BsSupplierController extends BaseController {
     /**
      * 修改供应商
      */
-    @RequiresPermissions(value = {"system:supplier:edit", "system:supplierAccount:edit"}, logical = Logical.OR)
+    // @RequiresPermissions(value = {"system:supplier:edit", "system:supplierAccount:edit"}, logical = Logical.OR)
     @Log(title = "供应商", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BsSupplier bsSupplier) {
@@ -412,7 +408,7 @@ public class BsSupplierController extends BaseController {
     /**
      * 查询非招标项目
      */
-//    @RequiresPermissions("system:supplier:list")
+//    // @RequiresPermissions("system:supplier:list")
     @GetMapping("/noBidList")
     public TableDataInfo noBidList(NobidNonPro nobidNonPro) {
         startPage();

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsTrainingController.java

@@ -47,7 +47,7 @@ public class BsTrainingController extends BaseController {
     /**
      * 导出培训列表
      */
-    @RequiresPermissions("system:training:export")
+    // @RequiresPermissions("system:training:export")
     @Log(title = "培训", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BsTraining bsTraining) {
@@ -59,7 +59,7 @@ public class BsTrainingController extends BaseController {
     /**
      * 获取培训详细信息
      */
-    @RequiresPermissions("system:training:query")
+    // @RequiresPermissions("system:training:query")
     @GetMapping(value = "/{lid}")
     public AjaxResult getInfo(@PathVariable("lid") Long lid) {
         return success(bsTrainingService.selectBsTrainingByLid(lid));
@@ -68,7 +68,7 @@ public class BsTrainingController extends BaseController {
     /**
      * 新增培训
      */
-    @RequiresPermissions("system:training:add")
+    // @RequiresPermissions("system:training:add")
     @Log(title = "培训", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BsTraining bsTraining) {
@@ -78,7 +78,7 @@ public class BsTrainingController extends BaseController {
     /**
      * 修改培训
      */
-    @RequiresPermissions("system:training:edit")
+    // @RequiresPermissions("system:training:edit")
     @Log(title = "培训", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BsTraining bsTraining) {
@@ -88,7 +88,7 @@ public class BsTrainingController extends BaseController {
     /**
      * 删除培训
      */
-    @RequiresPermissions("system:training:remove")
+    // @RequiresPermissions("system:training:remove")
     @Log(title = "培训", businessType = BusinessType.DELETE)
     @DeleteMapping("/{lids}")
     public AjaxResult remove(@PathVariable Long[] lids) {

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidApplicationsController.java

@@ -49,7 +49,7 @@ public class BidApplicationsController extends BaseController
     /**
      * 查询抽取申请列表
      */
-    @RequiresPermissions("system:applications:list")
+    // @RequiresPermissions("system:applications:list")
     @GetMapping("/list")
     public TableDataInfo list(BidApplications bidApplications)
     {
@@ -61,7 +61,7 @@ public class BidApplicationsController extends BaseController
     /**
      * 导出抽取申请列表
      */
-    @RequiresPermissions("system:applications:export")
+    // @RequiresPermissions("system:applications:export")
     @Log(title = "抽取申请", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidApplications bidApplications)
@@ -74,7 +74,7 @@ public class BidApplicationsController extends BaseController
     /**
      * 获取抽取申请详细信息
      */
-    @RequiresPermissions("system:applications:query")
+    // @RequiresPermissions("system:applications:query")
     @GetMapping(value = "/{xid}")
     public AjaxResult getInfo(@PathVariable("xid") Long xid)
     {
@@ -84,7 +84,7 @@ public class BidApplicationsController extends BaseController
     /**
      * 新增抽取申请
      */
-    @RequiresPermissions("system:applications:add")
+    // @RequiresPermissions("system:applications:add")
     @Log(title = "抽取申请", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BidApplications bidApplications)
@@ -99,7 +99,7 @@ public class BidApplicationsController extends BaseController
     /**
      * 修改抽取申请
      */
-    @RequiresPermissions("system:applications:edit")
+    // @RequiresPermissions("system:applications:edit")
     @Log(title = "抽取申请", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BidApplications bidApplications)
@@ -110,7 +110,7 @@ public class BidApplicationsController extends BaseController
     /**
      * 删除抽取申请
      */
-    @RequiresPermissions("system:applications:remove")
+    // @RequiresPermissions("system:applications:remove")
     @Log(title = "抽取申请", businessType = BusinessType.DELETE)
     @DeleteMapping("/{xids}")
     public AjaxResult remove(@PathVariable Long[] xids)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidCandidateController.java

@@ -37,7 +37,7 @@ public class BidCandidateController extends BaseController {
     /**
      * 查询中标候选人列表
      */
-    @RequiresPermissions("system:candidate:list")
+    // @RequiresPermissions("system:candidate:list")
     @GetMapping("/list")
     public TableDataInfo list(BidCandidate bidCandidate) {
         startPage();
@@ -48,7 +48,7 @@ public class BidCandidateController extends BaseController {
     /**
      * 导出中标候选人列表
      */
-    @RequiresPermissions("system:candidate:export")
+    // @RequiresPermissions("system:candidate:export")
     @Log(title = "中标候选人", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidCandidate bidCandidate) {
@@ -60,7 +60,7 @@ public class BidCandidateController extends BaseController {
     /**
      * 获取中标候选人详细信息
      */
-    @RequiresPermissions("system:candidate:query")
+    // @RequiresPermissions("system:candidate:query")
     @GetMapping(value = "/{zid}")
     public AjaxResult getInfo(@PathVariable("zid") Long zid) {
         return success(bidCandidateService.selectBidCandidateByZid(zid));
@@ -69,7 +69,7 @@ public class BidCandidateController extends BaseController {
     /**
      * 新增中标候选人
      */
-    @RequiresPermissions("system:candidate:add")
+    // @RequiresPermissions("system:candidate:add")
     @Log(title = "中标候选人", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BidCandidate bidCandidate) {
@@ -79,7 +79,7 @@ public class BidCandidateController extends BaseController {
     /**
      * 修改中标候选人
      */
-    @RequiresPermissions("system:candidate:edit")
+    // @RequiresPermissions("system:candidate:edit")
     @Log(title = "中标候选人", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BidCandidate bidCandidate) {
@@ -89,7 +89,7 @@ public class BidCandidateController extends BaseController {
     /**
      * 删除中标候选人
      */
-    @RequiresPermissions("system:candidate:remove")
+    // @RequiresPermissions("system:candidate:remove")
     @Log(title = "中标候选人", businessType = BusinessType.DELETE)
     @DeleteMapping("/{zids}")
     public AjaxResult remove(@PathVariable Long[] zids) {

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidCommitteeController.java

@@ -62,7 +62,7 @@ public class BidCommitteeController extends BaseController
     /**
      * 查询评标委员会列表
      */
-    @RequiresPermissions("system:committee:list")
+    // @RequiresPermissions("system:committee:list")
     @GetMapping("/list")
     public TableDataInfo list(BidCommittee bidCommittee)
     {
@@ -74,7 +74,7 @@ public class BidCommitteeController extends BaseController
     /**
      * 导出评标委员会列表
      */
-    @RequiresPermissions("system:committee:export")
+    // @RequiresPermissions("system:committee:export")
     @Log(title = "评标委员会", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidCommittee bidCommittee)
@@ -87,7 +87,7 @@ public class BidCommitteeController extends BaseController
     /**
      * 获取评标委员会详细信息
      */
-    @RequiresPermissions("system:committee:query")
+    // @RequiresPermissions("system:committee:query")
     @GetMapping(value = "/{pbId}")
     public AjaxResult getInfo(@PathVariable("pbId") Long pbId)
     {
@@ -146,12 +146,14 @@ public class BidCommitteeController extends BaseController
         bidCommittee.setUserId(userId);
 
         if(bidCommitteeService.selectBidCommitteeList(bidCommittee).size() == 0){
+            bidCommittee.setStatus(3L);
             bidCommitteeService.insertBidCommittee(bidCommittee);
         }
         for (BsExpert bsExpert : committee.getExpertList()){
             bidCommittee.setBsExpert(bsExpert);
             bidCommittee.setJid(bsExpert.getJid());
             bidCommittee.setUserId(bsExpert.getUserId());
+            bidCommittee.setStatus(0L);
             int i = bidCommitteeService.insertBidCommittee(bidCommittee);
         }
         return success("保存成功");

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidContractController.java

@@ -71,7 +71,7 @@ public class BidContractController extends BaseController
     /**
      * 查询合同列表
      */
-    @RequiresPermissions("bidding:contract:list")
+    // @RequiresPermissions("bidding:contract:list")
     @GetMapping("/list")
     public TableDataInfo list(BidContract bidContract)
     {
@@ -83,7 +83,7 @@ public class BidContractController extends BaseController
     /**
      * 导出合同列表
      */
-    @RequiresPermissions("bidding:contract:export")
+    // @RequiresPermissions("bidding:contract:export")
     @Log(title = "合同", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidContract bidContract)
@@ -126,7 +126,7 @@ public class BidContractController extends BaseController
     /**
      * 删除合同
      */
-    @RequiresPermissions("bidding:contract:remove")
+    // @RequiresPermissions("bidding:contract:remove")
     @Log(title = "合同", businessType = BusinessType.DELETE)
     @DeleteMapping("/{cids}")
     public AjaxResult remove(@PathVariable Long[] cids)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidDocumentsController.java

@@ -41,7 +41,7 @@ public class BidDocumentsController extends BaseController
     /**
      * 查询招标文件列表
      */
-//    @RequiresPermissions("system:documents:list")
+//    // @RequiresPermissions("system:documents:list")
     @GetMapping("/list")
     public TableDataInfo list(BidDocuments bidDocuments)
     {
@@ -60,7 +60,7 @@ public class BidDocumentsController extends BaseController
     /**
      * 导出招标文件列表
      */
-    @RequiresPermissions("system:documents:export")
+    // @RequiresPermissions("system:documents:export")
     @Log(title = "招标文件", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidDocuments bidDocuments)
@@ -73,7 +73,7 @@ public class BidDocumentsController extends BaseController
     /**
      * 获取招标文件详细信息
      */
-    @RequiresPermissions("system:documents:query")
+    // @RequiresPermissions("system:documents:query")
     @GetMapping(value = "/{wid}")
     public AjaxResult getInfo(@PathVariable("wid") Long wid)
     {
@@ -83,7 +83,7 @@ public class BidDocumentsController extends BaseController
     /**
      * 新增招标文件
      */
-    @RequiresPermissions("system:documents:add")
+    // @RequiresPermissions("system:documents:add")
     @Log(title = "招标文件", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BidDocuments bidDocuments)
@@ -94,7 +94,7 @@ public class BidDocumentsController extends BaseController
     /**
      * 修改招标文件
      */
-    @RequiresPermissions("system:documents:edit")
+    // @RequiresPermissions("system:documents:edit")
     @Log(title = "招标文件", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BidDocuments bidDocuments)
@@ -105,7 +105,7 @@ public class BidDocumentsController extends BaseController
     /**
      * 删除招标文件
      */
-    @RequiresPermissions("system:documents:remove")
+    // @RequiresPermissions("system:documents:remove")
     @Log(title = "招标文件", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{wids}")
     public AjaxResult remove(@PathVariable Long[] wids)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidExamineController.java

@@ -44,7 +44,7 @@ public class BidExamineController extends BaseController
     /**
      * 查询资格审查列表
      */
-    @RequiresPermissions("bidding:examine:list")
+    // @RequiresPermissions("bidding:examine:list")
     @GetMapping("/list")
     public TableDataInfo list(BidExamine bidExamine)
     {
@@ -56,7 +56,7 @@ public class BidExamineController extends BaseController
     /**
      * 导出资格审查列表
      */
-    @RequiresPermissions("bidding:examine:export")
+    // @RequiresPermissions("bidding:examine:export")
     @Log(title = "资格审查", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidExamine bidExamine)
@@ -69,7 +69,7 @@ public class BidExamineController extends BaseController
     /**
      * 获取资格审查详细信息
      */
-    @RequiresPermissions("bidding:examine:query")
+    // @RequiresPermissions("bidding:examine:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -79,7 +79,7 @@ public class BidExamineController extends BaseController
     /**
      * 新增资格审查
      */
-    @RequiresPermissions("bidding:examine:add")
+    // @RequiresPermissions("bidding:examine:add")
     @Log(title = "资格审查", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BidExamine bidExamine)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidExpertExamineController.java

@@ -38,7 +38,7 @@ public class BidExpertExamineController extends BaseController
     /**
      * 查询专家资质表列表
      */
-    @RequiresPermissions("bidding:expertExamine:list")
+    // @RequiresPermissions("bidding:expertExamine:list")
     @GetMapping("/list")
     public TableDataInfo list(BidExpertExamine bidExpertExamine)
     {
@@ -50,7 +50,7 @@ public class BidExpertExamineController extends BaseController
     /**
      * 导出专家资质表列表
      */
-    @RequiresPermissions("bidding:expertExamine:export")
+    // @RequiresPermissions("bidding:expertExamine:export")
     @Log(title = "专家资质表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidExpertExamine bidExpertExamine)
@@ -63,7 +63,7 @@ public class BidExpertExamineController extends BaseController
     /**
      * 获取专家资质表详细信息
      */
-    @RequiresPermissions("bidding:expertExamine:query")
+    // @RequiresPermissions("bidding:expertExamine:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -73,7 +73,7 @@ public class BidExpertExamineController extends BaseController
     /**
      * 新增专家资质表
      */
-    @RequiresPermissions("bidding:expertExamine:add")
+    // @RequiresPermissions("bidding:expertExamine:add")
     @Log(title = "专家资质表", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BidExpertExamine bidExpertExamine)
@@ -84,7 +84,7 @@ public class BidExpertExamineController extends BaseController
     /**
      * 修改专家资质表
      */
-    @RequiresPermissions("bidding:expertExamine:edit")
+    // @RequiresPermissions("bidding:expertExamine:edit")
     @Log(title = "专家资质表", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BidExpertExamine bidExpertExamine)
@@ -95,7 +95,7 @@ public class BidExpertExamineController extends BaseController
     /**
      * 删除专家资质表
      */
-    @RequiresPermissions("bidding:expertExamine:remove")
+    // @RequiresPermissions("bidding:expertExamine:remove")
     @Log(title = "专家资质表", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidExpertRespondController.java

@@ -38,7 +38,7 @@ public class BidExpertRespondController extends BaseController
     /**
      * 查询专家响应列表
      */
-    @RequiresPermissions("bidding:respond:list")
+    // @RequiresPermissions("bidding:respond:list")
     @GetMapping("/list")
     public TableDataInfo list(BidExpertRespond bidExpertRespond)
     {
@@ -50,7 +50,7 @@ public class BidExpertRespondController extends BaseController
     /**
      * 导出专家响应列表
      */
-    @RequiresPermissions("bidding:respond:export")
+    // @RequiresPermissions("bidding:respond:export")
     @Log(title = "专家响应", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidExpertRespond bidExpertRespond)
@@ -63,7 +63,7 @@ public class BidExpertRespondController extends BaseController
     /**
      * 获取专家响应详细信息
      */
-    @RequiresPermissions("bidding:respond:query")
+    // @RequiresPermissions("bidding:respond:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -73,7 +73,7 @@ public class BidExpertRespondController extends BaseController
     /**
      * 新增专家响应
      */
-    @RequiresPermissions("bidding:respond:add")
+    // @RequiresPermissions("bidding:respond:add")
     @Log(title = "专家响应", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BidExpertRespond bidExpertRespond)
@@ -84,7 +84,7 @@ public class BidExpertRespondController extends BaseController
     /**
      * 修改专家响应
      */
-    @RequiresPermissions("bidding:respond:edit")
+    // @RequiresPermissions("bidding:respond:edit")
     @Log(title = "专家响应", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BidExpertRespond bidExpertRespond)
@@ -95,7 +95,7 @@ public class BidExpertRespondController extends BaseController
     /**
      * 删除专家响应
      */
-    @RequiresPermissions("bidding:respond:remove")
+    // @RequiresPermissions("bidding:respond:remove")
     @Log(title = "专家响应", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidExpertTechController.java

@@ -38,7 +38,7 @@ public class BidExpertTechController extends BaseController
     /**
      * 查询专家技术列表
      */
-    @RequiresPermissions("bidding:tech:list")
+    // @RequiresPermissions("bidding:tech:list")
     @GetMapping("/list")
     public TableDataInfo list(BidExpertTech bidExpertTech)
     {
@@ -50,7 +50,7 @@ public class BidExpertTechController extends BaseController
     /**
      * 导出专家技术列表
      */
-    @RequiresPermissions("bidding:tech:export")
+    // @RequiresPermissions("bidding:tech:export")
     @Log(title = "专家技术", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidExpertTech bidExpertTech)
@@ -63,7 +63,7 @@ public class BidExpertTechController extends BaseController
     /**
      * 获取专家技术详细信息
      */
-    @RequiresPermissions("bidding:tech:query")
+    // @RequiresPermissions("bidding:tech:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -73,7 +73,7 @@ public class BidExpertTechController extends BaseController
     /**
      * 新增专家技术
      */
-    @RequiresPermissions("bidding:tech:add")
+    // @RequiresPermissions("bidding:tech:add")
     @Log(title = "专家技术", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BidExpertTech bidExpertTech)
@@ -84,7 +84,7 @@ public class BidExpertTechController extends BaseController
     /**
      * 修改专家技术
      */
-    @RequiresPermissions("bidding:tech:edit")
+    // @RequiresPermissions("bidding:tech:edit")
     @Log(title = "专家技术", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BidExpertTech bidExpertTech)
@@ -95,7 +95,7 @@ public class BidExpertTechController extends BaseController
     /**
      * 删除专家技术
      */
-    @RequiresPermissions("bidding:tech:remove")
+    // @RequiresPermissions("bidding:tech:remove")
     @Log(title = "专家技术", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidGetTenderController.java

@@ -37,7 +37,7 @@ public class BidGetTenderController extends BaseController {
     /**
      * 查询获取标书列表
      */
-//    @RequiresPermissions("system:tender:list")
+//    // @RequiresPermissions("system:tender:list")
     @GetMapping("/list")
     public TableDataInfo list(BidGetTender bidGetTender) {
         startPage();
@@ -48,7 +48,7 @@ public class BidGetTenderController extends BaseController {
     /**
      * 导出获取标书列表
      */
-    @RequiresPermissions("system:tender:export")
+    // @RequiresPermissions("system:tender:export")
     @Log(title = "获取标书", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidGetTender bidGetTender) {
@@ -60,7 +60,7 @@ public class BidGetTenderController extends BaseController {
     /**
      * 获取获取标书详细信息
      */
-    @RequiresPermissions("system:tender:query")
+    // @RequiresPermissions("system:tender:query")
     @GetMapping(value = "/{yid}")
     public AjaxResult getInfo(@PathVariable("yid") Long yid) {
         return success(bidGetTenderService.selectBidGetTenderByYid(yid));
@@ -69,7 +69,7 @@ public class BidGetTenderController extends BaseController {
     /**
      * 新增获取标书
      */
-    @RequiresPermissions("system:tender:add")
+    // @RequiresPermissions("system:tender:add")
     @Log(title = "获取标书", businessType = BusinessType.INSERT)
     @PostMapping("/addBs")
     public AjaxResult add(@RequestBody BidGetTender bidGetTender) {
@@ -79,7 +79,7 @@ public class BidGetTenderController extends BaseController {
     /**
      * 修改获取标书
      */
-    @RequiresPermissions("system:tender:edit")
+    // @RequiresPermissions("system:tender:edit")
     @Log(title = "获取标书", businessType = BusinessType.UPDATE)
     @PutMapping("/putBs")
     public AjaxResult edit(@RequestBody BidGetTender bidGetTender) {
@@ -89,7 +89,7 @@ public class BidGetTenderController extends BaseController {
     /**
      * 删除获取标书
      */
-    @RequiresPermissions("system:tender:remove")
+    // @RequiresPermissions("system:tender:remove")
     @Log(title = "获取标书", businessType = BusinessType.DELETE)
     @DeleteMapping("/{yids}")
     public AjaxResult remove(@PathVariable Long[] yids) {

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidIdeaController.java

@@ -3,15 +3,10 @@ package com.hh.bidding.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+
+import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -38,19 +33,17 @@ public class BidIdeaController extends BaseController
     /**
      * 查询专家意见列表
      */
-    @RequiresPermissions("bidding:idea:list")
     @GetMapping("/list")
-    public TableDataInfo list(BidIdea bidIdea)
+    public AjaxResult list(BidIdea bidIdea)
     {
-        startPage();
         List<BidIdea> list = bidIdeaService.selectBidIdeaList(bidIdea);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**
      * 导出专家意见列表
      */
-    @RequiresPermissions("bidding:idea:export")
+    // @RequiresPermissions("bidding:idea:export")
     @Log(title = "专家意见", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidIdea bidIdea)
@@ -63,7 +56,7 @@ public class BidIdeaController extends BaseController
     /**
      * 获取专家意见详细信息
      */
-    @RequiresPermissions("bidding:idea:query")
+    // @RequiresPermissions("bidding:idea:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -73,7 +66,7 @@ public class BidIdeaController extends BaseController
     /**
      * 新增专家意见
      */
-    @RequiresPermissions("bidding:idea:add")
+    // @RequiresPermissions("bidding:idea:add")
     @Log(title = "专家意见", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BidIdea bidIdea)
@@ -84,7 +77,7 @@ public class BidIdeaController extends BaseController
     /**
      * 修改专家意见
      */
-    @RequiresPermissions("bidding:idea:edit")
+    // @RequiresPermissions("bidding:idea:edit")
     @Log(title = "专家意见", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BidIdea bidIdea)
@@ -95,11 +88,23 @@ public class BidIdeaController extends BaseController
     /**
      * 删除专家意见
      */
-    @RequiresPermissions("bidding:idea:remove")
+    // @RequiresPermissions("bidding:idea:remove")
     @Log(title = "专家意见", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(bidIdeaService.deleteBidIdeaByIds(ids));
     }
+
+
+    /**
+     * 查询专家意见列表
+     */
+    @GetMapping("/selectIdeaBySid")
+    public AjaxResult selectIdeaBySid(@RequestParam("sid") Long sid,@RequestParam("hid") Long hid)
+    {
+        BidIdea bidIdea = bidIdeaService.selectIdeaBySid(sid,hid);
+        return success(bidIdea);
+    }
+
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidInfoController.java

@@ -44,7 +44,7 @@ public class BidInfoController extends BaseController
     /**
      * 查询基本信息列表
      */
-    @RequiresPermissions("bidding:info:list")
+    // @RequiresPermissions("bidding:info:list")
     @GetMapping("/list")
     public TableDataInfo list(BidInfo bidInfo)
     {
@@ -56,7 +56,7 @@ public class BidInfoController extends BaseController
     /**
      * 导出基本信息列表
      */
-    @RequiresPermissions("bidding:info:export")
+    // @RequiresPermissions("bidding:info:export")
     @Log(title = "基本信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidInfo bidInfo)
@@ -69,7 +69,7 @@ public class BidInfoController extends BaseController
     /**
      * 获取基本信息详细信息
      */
-    @RequiresPermissions("bidding:info:query")
+    // @RequiresPermissions("bidding:info:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -79,7 +79,7 @@ public class BidInfoController extends BaseController
     /**
      * 新增基本信息
      */
-    @RequiresPermissions("bidding:info:add")
+    // @RequiresPermissions("bidding:info:add")
     @Log(title = "基本信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BidInfo bidInfo)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidInvoiceController.java

@@ -85,7 +85,7 @@ public class BidInvoiceController extends BaseController
     /**
      * 查询开票信息列表
      */
-//    @RequiresPermissions("bidding:bidInvoice:list")
+//    // @RequiresPermissions("bidding:bidInvoice:list")
     @GetMapping("/list")
     public TableDataInfo list(BidInvoice bidInvoice)
     {
@@ -97,7 +97,7 @@ public class BidInvoiceController extends BaseController
     /**
      * 导出开票信息列表
      */
-    @RequiresPermissions("bidding:bidInvoice:export")
+    // @RequiresPermissions("bidding:bidInvoice:export")
     @Log(title = "开票信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidInvoice bidInvoice)
@@ -110,7 +110,7 @@ public class BidInvoiceController extends BaseController
     /**
      * 获取开票信息详细信息
      */
-//    @RequiresPermissions("bidding:bidInvoice:query")
+//    // @RequiresPermissions("bidding:bidInvoice:query")
     @GetMapping(value = "/{eid}")
     public AjaxResult getInfo(@PathVariable("eid") Long eid)
     {
@@ -120,7 +120,7 @@ public class BidInvoiceController extends BaseController
     /**
      * 新增开票信息
      */
-//    @RequiresPermissions("bidding:bidInvoice:add")
+//    // @RequiresPermissions("bidding:bidInvoice:add")
     @Log(title = "开票信息", businessType = BusinessType.INSERT)
     @Transactional
     @PostMapping("/add")
@@ -132,7 +132,7 @@ public class BidInvoiceController extends BaseController
     /**
      * 修改开票信息
      */
-//    @RequiresPermissions("bidding:bidInvoice:edit")
+//    // @RequiresPermissions("bidding:bidInvoice:edit")
     @Log(title = "开票信息", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
     @PutMapping("/update")
@@ -154,7 +154,7 @@ public class BidInvoiceController extends BaseController
     /**
      * 删除开票信息
      */
-//    @RequiresPermissions("bidding:bidInvoice:remove")
+//    // @RequiresPermissions("bidding:bidInvoice:remove")
     @Log(title = "开票信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{eids}")
     public AjaxResult remove(@PathVariable Long[] eids)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidIvrController.java

@@ -60,7 +60,7 @@ public class BidIvrController extends BaseController
     /**
      * 查询语音交互列表
      */
-    @RequiresPermissions("bidding:ivr:list")
+    // @RequiresPermissions("bidding:ivr:list")
     @GetMapping("/list")
     public TableDataInfo list(BidIvr bidIvr)
     {
@@ -72,7 +72,7 @@ public class BidIvrController extends BaseController
     /**
      * 导出语音交互列表
      */
-    @RequiresPermissions("bidding:ivr:export")
+    // @RequiresPermissions("bidding:ivr:export")
     @Log(title = "语音交互", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidIvr bidIvr)
@@ -85,7 +85,7 @@ public class BidIvrController extends BaseController
     /**
      * 获取语音交互详细信息
      */
-    @RequiresPermissions("bidding:ivr:query")
+    // @RequiresPermissions("bidding:ivr:query")
     @GetMapping(value = "/getInfo")
     public AjaxResult getInfo(@RequestParam("rid") Long rid)
     {
@@ -95,7 +95,7 @@ public class BidIvrController extends BaseController
     /**
      * 新增语音交互
      */
-    @RequiresPermissions("bidding:ivr:add")
+    // @RequiresPermissions("bidding:ivr:add")
     @Log(title = "语音交互", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@RequestBody BidIvr bidIvr)
@@ -106,7 +106,7 @@ public class BidIvrController extends BaseController
     /**
      * 修改语音交互
      */
-    @RequiresPermissions("bidding:ivr:edit")
+    // @RequiresPermissions("bidding:ivr:edit")
     @Log(title = "语音交互", businessType = BusinessType.UPDATE)
     @PutMapping("/edit")
     public AjaxResult edit(@RequestBody BidIvr bidIvr)
@@ -117,7 +117,7 @@ public class BidIvrController extends BaseController
     /**
      * 删除语音交互
      */
-    @RequiresPermissions("bidding:ivr:remove")
+    // @RequiresPermissions("bidding:ivr:remove")
     @Log(title = "语音交互", businessType = BusinessType.DELETE)
     @DeleteMapping("/{rids}")
     public AjaxResult remove(@PathVariable Long[] rids)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidMessageController.java

@@ -38,7 +38,7 @@ public class BidMessageController extends BaseController
     /**
      * 查询消息回执列表
      */
-    @RequiresPermissions("bidding:message:list")
+    // @RequiresPermissions("bidding:message:list")
     @GetMapping("/list")
     public TableDataInfo list(BidMessage bidMessage)
     {
@@ -50,7 +50,7 @@ public class BidMessageController extends BaseController
     /**
      * 导出消息回执列表
      */
-    @RequiresPermissions("bidding:message:export")
+    // @RequiresPermissions("bidding:message:export")
     @Log(title = "消息回执", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidMessage bidMessage)
@@ -63,7 +63,7 @@ public class BidMessageController extends BaseController
     /**
      * 获取消息回执详细信息
      */
-    @RequiresPermissions("bidding:message:query")
+    // @RequiresPermissions("bidding:message:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -73,7 +73,7 @@ public class BidMessageController extends BaseController
     /**
      * 新增消息回执
      */
-    @RequiresPermissions("bidding:message:add")
+    // @RequiresPermissions("bidding:message:add")
     @Log(title = "消息回执", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BidMessage bidMessage)
@@ -84,7 +84,7 @@ public class BidMessageController extends BaseController
     /**
      * 修改消息回执
      */
-    @RequiresPermissions("bidding:message:edit")
+    // @RequiresPermissions("bidding:message:edit")
     @Log(title = "消息回执", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BidMessage bidMessage)
@@ -95,7 +95,7 @@ public class BidMessageController extends BaseController
     /**
      * 删除消息回执
      */
-    @RequiresPermissions("bidding:message:remove")
+    // @RequiresPermissions("bidding:message:remove")
     @Log(title = "消息回执", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidNoticeController.java

@@ -158,7 +158,7 @@ public class BidNoticeController extends BaseController {
     /**
      * 导出招标公告列表
      */
-    @RequiresPermissions("system:notice:export")
+    // @RequiresPermissions("system:notice:export")
     @Log(title = "招标公告", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidNotice bidNotice) {
@@ -170,7 +170,7 @@ public class BidNoticeController extends BaseController {
     /**
      * 获取招标公告详细信息
      */
-//    @RequiresPermissions("system:notice:query")
+//    // @RequiresPermissions("system:notice:query")
     @GetMapping(value = "/{uid}")
     public AjaxResult getInfo(@PathVariable("uid") Long uid) {
         BidNotice bidNotice = bidNoticeService.selectBidNoticeByUid(uid);
@@ -186,7 +186,7 @@ public class BidNoticeController extends BaseController {
     /**
      * 新增招标公告
      */
-    @RequiresPermissions("system:notice:add")
+    // @RequiresPermissions("system:notice:add")
     @Log(title = "招标公告", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody BidNotice bidNotice) {
@@ -236,7 +236,7 @@ public class BidNoticeController extends BaseController {
     /**
      * 修改招标公告
      */
-    @RequiresPermissions("system:notice:edit")
+    // @RequiresPermissions("system:notice:edit")
     @Log(title = "招标公告", businessType = BusinessType.UPDATE)
     @PutMapping
     @Transactional(rollbackFor = Exception.class)
@@ -293,7 +293,7 @@ public class BidNoticeController extends BaseController {
     /**
      * 删除招标公告
      */
-    @RequiresPermissions("system:notice:remove")
+    // @RequiresPermissions("system:notice:remove")
     @Log(title = "招标公告", businessType = BusinessType.DELETE)
     @DeleteMapping("/{uids}")
     public AjaxResult remove(@PathVariable Long[] uids) {

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidQuoteController.java

@@ -389,15 +389,19 @@ public class BidQuoteController extends BaseController
             if(item.getHid().equals(hid)){
                 if(current == 0){
                     item.setFirst(item.getFirst());
+                    item.setFirstTime(item.getFirstTime());
                 }
                 else if(current == 1){
                     item.setFirst(item.getFirst());
+                    item.setFirstTime(item.getFirstTime());
                 }
                 else if(current == 2){
                     item.setSecond(item.getSecond());
+                    item.setSecondTime(item.getSecondTime());
                 }
                 else if(current == 3){
                     item.setThird(item.getThird());
+                    item.setThirdTime(item.getThirdTime());
                 }
                 res.add(item);
             }else{
@@ -405,15 +409,21 @@ public class BidQuoteController extends BaseController
 
                 } else if(current == 1){
                     item.setFirst(item.getFirst());
+                    item.setFirstTime(item.getFirstTime());
                     item.setSecond(null);
+                    item.setSecondTime(null);
                     item.setThird(null);
+                    item.setThirdTime(null);
                     res.add(item);
                 } else if (current == 2) {
                     item.setSecond(item.getSecond());
+                    item.setSecondTime(item.getSecondTime());
                     item.setThird(null);
+                    item.setThirdTime(null);
                     res.add(item);
                 } else if (current == 3) {
                     item.setThird(item.getThird());
+                    item.setThirdTime(item.getThirdTime());
                     res.add(item);
                 }
             }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidRespondController.java

@@ -38,7 +38,7 @@ public class BidRespondController extends BaseController
     /**
      * 查询响应性审查列表
      */
-    @RequiresPermissions("bidding:respond:list")
+    // @RequiresPermissions("bidding:respond:list")
     @GetMapping("/list")
     public TableDataInfo list(BidRespond bidRespond)
     {
@@ -50,7 +50,7 @@ public class BidRespondController extends BaseController
     /**
      * 导出响应性审查列表
      */
-    @RequiresPermissions("bidding:respond:export")
+    // @RequiresPermissions("bidding:respond:export")
     @Log(title = "响应性审查", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidRespond bidRespond)
@@ -63,7 +63,7 @@ public class BidRespondController extends BaseController
     /**
      * 获取响应性审查详细信息
      */
-    @RequiresPermissions("bidding:respond:query")
+    // @RequiresPermissions("bidding:respond:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -73,7 +73,7 @@ public class BidRespondController extends BaseController
     /**
      * 新增响应性审查
      */
-    @RequiresPermissions("bidding:respond:add")
+    // @RequiresPermissions("bidding:respond:add")
     @Log(title = "响应性审查", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BidRespond bidRespond)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidSubmissionController.java

@@ -37,7 +37,7 @@ public class BidSubmissionController extends BaseController
     /**
      * 查询投递标书列表
      */
-//    @RequiresPermissions("system:submission:list")
+//    // @RequiresPermissions("system:submission:list")
     @GetMapping("/list")
     public TableDataInfo list(BidSubmission bidSubmission)
     {
@@ -49,7 +49,7 @@ public class BidSubmissionController extends BaseController
     /**
      * 导出投递标书列表
      */
-    @RequiresPermissions("system:submission:export")
+    // @RequiresPermissions("system:submission:export")
     @Log(title = "投递标书", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidSubmission bidSubmission)
@@ -62,7 +62,7 @@ public class BidSubmissionController extends BaseController
     /**
      * 获取投递标书详细信息
      */
-    @RequiresPermissions("system:submission:query")
+    // @RequiresPermissions("system:submission:query")
     @GetMapping(value = "/{tdId}")
     public AjaxResult getInfo(@PathVariable("tdId") Long tdId)
     {
@@ -72,7 +72,7 @@ public class BidSubmissionController extends BaseController
     /**
      * 新增投递标书
      */
-//    @RequiresPermissions("system:submission:add")
+//    // @RequiresPermissions("system:submission:add")
     @Log(title = "投递标书", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BidSubmission bidSubmission)
@@ -83,7 +83,7 @@ public class BidSubmissionController extends BaseController
     /**
      * 修改投递标书
      */
-    @RequiresPermissions("system:submission:edit")
+    // @RequiresPermissions("system:submission:edit")
     @Log(title = "投递标书", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BidSubmission bidSubmission)
@@ -94,7 +94,7 @@ public class BidSubmissionController extends BaseController
     /**
      * 删除投递标书
      */
-    @RequiresPermissions("system:submission:remove")
+    // @RequiresPermissions("system:submission:remove")
     @Log(title = "投递标书", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{tdIds}")
     public AjaxResult remove(@PathVariable Long[] tdIds)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidTechController.java

@@ -38,7 +38,7 @@ public class BidTechController extends BaseController
     /**
      * 查询技术审查列表
      */
-    @RequiresPermissions("bidding:tech:list")
+    // @RequiresPermissions("bidding:tech:list")
     @GetMapping("/list")
     public TableDataInfo list(BidTech bidTech)
     {
@@ -50,7 +50,7 @@ public class BidTechController extends BaseController
     /**
      * 导出技术审查列表
      */
-    @RequiresPermissions("bidding:tech:export")
+    // @RequiresPermissions("bidding:tech:export")
     @Log(title = "技术审查", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidTech bidTech)
@@ -63,7 +63,7 @@ public class BidTechController extends BaseController
     /**
      * 获取技术审查详细信息
      */
-    @RequiresPermissions("bidding:tech:query")
+    // @RequiresPermissions("bidding:tech:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -73,7 +73,7 @@ public class BidTechController extends BaseController
     /**
      * 新增技术审查
      */
-    @RequiresPermissions("bidding:tech:add")
+    // @RequiresPermissions("bidding:tech:add")
     @Log(title = "技术审查", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BidTech bidTech)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidTenderController.java

@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.security.NoSuchAlgorithmException;
@@ -102,7 +103,6 @@ public class BidTenderController extends BaseController {
     /**
      * 查询招标项目列表
      */
-    @RequiresPermissions("system:tender:list")
     @GetMapping("/list")
     public TableDataInfo list(BidTenderAndNotoce bidTenderAndNotoce) {
         System.out.println(SecurityUtils.getUserId());
@@ -133,7 +133,6 @@ public class BidTenderController extends BaseController {
     /**
      * 查询招标项目列表
      */
-    @RequiresPermissions("system:tender:list")
     @GetMapping("/listOrigin")
     public TableDataInfo list(BidTender bidTender) {
         startPage();
@@ -147,7 +146,6 @@ public class BidTenderController extends BaseController {
      * @param bidTender
      * @return
      */
-    @RequiresPermissions("system:tender:list")
     @GetMapping("/selectTenderNoticeList")
     public TableDataInfo selectTenderNoticeList(BidTender bidTender) {
         startPage();
@@ -161,7 +159,6 @@ public class BidTenderController extends BaseController {
      * @param bidTender
      * @return
      */
-    @RequiresPermissions("system:tender:list")
     @GetMapping("/selectBiddingTender")
     public TableDataInfo selectBiddingTender(BidTender bidTender) {
         startPage();
@@ -178,7 +175,6 @@ public class BidTenderController extends BaseController {
     /**
      * 导出招标项目列表
      */
-    @RequiresPermissions("system:tender:export")
     @Log(title = "招标项目", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidTender bidTender) {
@@ -192,7 +188,6 @@ public class BidTenderController extends BaseController {
     /**
      * 新增招标项目
      */
-//    @RequiresPermissions("system:tender:add")
     @Log(title = "招标项目", businessType = BusinessType.INSERT)
     @PostMapping("addTender")
     public AjaxResult add(@RequestBody BidTender bidTender) {
@@ -202,7 +197,6 @@ public class BidTenderController extends BaseController {
     /**
      * 修改招标项目
      */
-//    @RequiresPermissions("system:tender:edit")
     @Log(title = "招标项目", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BidTender bidTender) {
@@ -1033,8 +1027,8 @@ public class BidTenderController extends BaseController {
             }
         }
         Map<String,BigDecimal> resMap = new HashMap<>();
-        //TODO
-        resMap.put("servicePrice",servicePrice);
+        BigDecimal bigDecimal = servicePrice.setScale(0, RoundingMode.CEILING);
+        resMap.put("servicePrice",bigDecimal);
         resMap.put("finalPrice",finalPrice);
         return success(resMap);
 
@@ -1083,7 +1077,6 @@ public class BidTenderController extends BaseController {
     /**
      * 删除招标项目
      */
-    @RequiresPermissions("system:tender:remove")
     @Log(title = "招标项目", businessType = BusinessType.DELETE)
     @DeleteMapping("/{sids}")
     public AjaxResult remove(@PathVariable Long[] sids) {

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidWinnerController.java

@@ -1,6 +1,7 @@
 package com.hh.bidding.controller;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
@@ -89,7 +90,7 @@ public class BidWinnerController extends BaseController
     /**
      * 导出中标人列表
      */
-    @RequiresPermissions("bidding:winner:export")
+    // @RequiresPermissions("bidding:winner:export")
     @Log(title = "中标人", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidWinner bidWinner)
@@ -136,7 +137,7 @@ public class BidWinnerController extends BaseController
     /**
      * 删除中标人
      */
-    @RequiresPermissions("bidding:winner:remove")
+    // @RequiresPermissions("bidding:winner:remove")
     @Log(title = "中标人", businessType = BusinessType.DELETE)
     @DeleteMapping("/{wids}")
     public AjaxResult remove(@PathVariable Long[] wids)
@@ -417,7 +418,7 @@ public class BidWinnerController extends BaseController
                 }
             }
         }
-        bidWinner.setServicePrice(servicePrice);
+        bidWinner.setServicePrice(servicePrice.setScale(0, RoundingMode.CEILING));
         return success(bidWinner);
     }
 

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidWinningResultsController.java

@@ -77,7 +77,7 @@ public class BidWinningResultsController extends BaseController {
     /**
      * 查询中标公告列表
      */
-    @RequiresPermissions("bidding:BidWinning:list")
+    // @RequiresPermissions("bidding:BidWinning:list")
     @GetMapping("/list")
     public TableDataInfo list(BidWinningResults bidWinningResults) {
         startPage();
@@ -124,7 +124,7 @@ public class BidWinningResultsController extends BaseController {
     /**
      * 导出中标公告列表
      */
-    @RequiresPermissions("bidding:BidWinning:export")
+    // @RequiresPermissions("bidding:BidWinning:export")
     @Log(title = "中标公告", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidWinningResults bidWinningResults) {
@@ -144,7 +144,7 @@ public class BidWinningResultsController extends BaseController {
     /**
      * 新增中标公告 + 变更中标公告
      */
-    @RequiresPermissions("bidding:BidWinning:add")
+    // @RequiresPermissions("bidding:BidWinning:add")
     @Log(title = "中标公告", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BidWinningResults bidWinningResults) {
@@ -201,7 +201,7 @@ public class BidWinningResultsController extends BaseController {
     /**
      * 修改中标公告
      */
-    @RequiresPermissions("bidding:BidWinning:edit")
+    // @RequiresPermissions("bidding:BidWinning:edit")
     @Log(title = "中标公告", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BidWinningResults bidWinningResults) {
@@ -244,7 +244,7 @@ public class BidWinningResultsController extends BaseController {
     /**
      * 删除中标公告
      */
-    @RequiresPermissions("bidding:BidWinning:remove")
+    // @RequiresPermissions("bidding:BidWinning:remove")
     @Log(title = "中标公告", businessType = BusinessType.DELETE)
     @DeleteMapping("/{gsIds}")
     public AjaxResult remove(@PathVariable Long[] gsIds) {

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidWinnoticeController.java

@@ -73,7 +73,7 @@ public class BidWinnoticeController extends BaseController
     /**
      * 查询中标通知书列表
      */
-    @RequiresPermissions("bidding:winnotice:list")
+    // @RequiresPermissions("bidding:winnotice:list")
     @GetMapping("/list")
     public TableDataInfo list(BidWinnotice bidWinnotice)
     {
@@ -85,7 +85,7 @@ public class BidWinnoticeController extends BaseController
     /**
      * 导出中标通知书列表
      */
-    @RequiresPermissions("bidding:winnotice:export")
+    // @RequiresPermissions("bidding:winnotice:export")
     @Log(title = "中标通知书", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BidWinnotice bidWinnotice)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/ExpertMarkController.java

@@ -7,7 +7,10 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.RemoteMaterialService;
+import com.ruoyi.system.api.RemotePlanService;
 import com.ruoyi.system.api.domain.BsExpert;
+import com.ruoyi.system.api.domain.PpmProcurementPlan;
 import com.ruoyi.system.api.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -60,6 +63,18 @@ public class ExpertMarkController extends BaseController{
     @Autowired
     private IScoreSummaryService scoreSummaryService;
 
+    @Autowired
+    private IBidIdeaService bidIdeaService;
+
+    @Autowired
+    private IBidTenderService bidTenderService;
+
+    @Autowired
+    private RemotePlanService remotePlanService;
+
+    @Autowired
+    private RemoteMaterialService remoteMaterialService;
+
     // 查询全部评分细则
     @GetMapping("/getMarkDetail")
     public AjaxResult getMarkDetail(@RequestParam("sid") Long sid){
@@ -294,9 +309,11 @@ public class ExpertMarkController extends BaseController{
         List<BidExpertRespond> respondDetails = bidExpertRespondService.selectBidExpertRespondList(bidExpertRespond);
         List<BidExpertTech> techDetails = bidExpertTechService.selectBidExpertTechList(bidExpertTech);
         mark.setSid(sid);
-        mark.setsName(info.getsName());
-        mark.setuKaiTime(info.getuKaiTime());
-        mark.setuKaiPosition(info.getuKaiPosition());
+        if(info != null){
+            mark.setsName(info.getsName());
+            mark.setuKaiTime(info.getuKaiTime());
+            mark.setuKaiPosition(info.getuKaiPosition());
+        }
         mark.setBidExpertExamines(examineDetails);
         mark.setBidExpertResponds(respondDetails);
         mark.setBidExpertTeches(techDetails);
@@ -315,32 +332,54 @@ public class ExpertMarkController extends BaseController{
         Long jid = bsExpert.getJid();
         String jName = bsExpert.getjName();
 
-        List<BidExpertExamine> bidExpertExamines = mark.getBidExpertExamines();
-        List<BidExpertRespond> bidExpertResponds = mark.getBidExpertResponds();
-        List<BidExpertTech> bidExpertTeches = mark.getBidExpertTeches();
+        BidCommittee bidCommittee = new BidCommittee();
+        bidCommittee.setJid(jid);
+        bidCommittee.setSid(mark.getSid());
+        bidCommittee.setIsLeader(1);
 
-        for (BidExpertExamine bidExpertExamine : bidExpertExamines){
-            if(bidExpertExamine.getId() != null){
-                bidExpertExamineService.updateBidExpertExamine(bidExpertExamine);
-            }else {
-                bidExpertExamine.setJid(jid);
-                bidExpertExamine.setjName(jName);
-                bidExpertExamine.setUserId(userId);
-                bidExpertExamineService.insertBidExpertExamine(bidExpertExamine);
+        List<BidCommittee> bidCommittees = bidCommitteeService.selectBidCommitteeList(bidCommittee);
+        if(!CollectionUtils.isEmpty(bidCommittees)){
+            BidIdea bidIdea = new BidIdea();
+            bidIdea.setSid(mark.getSid());
+            bidIdea.setHid(mark.getHid());
+            List<BidIdea> bidIdeas = bidIdeaService.selectBidIdeaList(bidIdea);
+            if(mark.getIdea() != null){
+                bidIdea.setIdea(mark.getIdea());
+                if(bidIdeas.size() == 0){
+                    bidIdeaService.insertBidIdea(bidIdea);
+                }else {
+                    bidIdea.setId(bidIdeas.get(0).getId());
+                    bidIdeaService.updateBidIdea(bidIdea);
+                }
             }
-        }
 
-        for(BidExpertRespond bidExpertRespond : bidExpertResponds){
-            if(bidExpertRespond.getId() != null){
-                bidExpertRespondService.updateBidExpertRespond(bidExpertRespond);
-            }else {
-                bidExpertRespond.setJid(jid);
-                bidExpertRespond.setjName(jName);
-                bidExpertRespond.setUserId(userId);
-                bidExpertRespondService.insertBidExpertRespond(bidExpertRespond);
+            List<BidExpertExamine> bidExpertExamines = mark.getBidExpertExamines();
+            List<BidExpertRespond> bidExpertResponds = mark.getBidExpertResponds();
+
+            for (BidExpertExamine bidExpertExamine : bidExpertExamines){
+                if(bidExpertExamine.getId() != null){
+                    bidExpertExamineService.updateBidExpertExamine(bidExpertExamine);
+                }else {
+                    bidExpertExamine.setJid(jid);
+                    bidExpertExamine.setjName(jName);
+                    bidExpertExamine.setUserId(userId);
+                    bidExpertExamineService.insertBidExpertExamine(bidExpertExamine);
+                }
+            }
+
+            for(BidExpertRespond bidExpertRespond : bidExpertResponds){
+                if(bidExpertRespond.getId() != null){
+                    bidExpertRespondService.updateBidExpertRespond(bidExpertRespond);
+                }else {
+                    bidExpertRespond.setJid(jid);
+                    bidExpertRespond.setjName(jName);
+                    bidExpertRespond.setUserId(userId);
+                    bidExpertRespondService.insertBidExpertRespond(bidExpertRespond);
+                }
             }
         }
 
+        List<BidExpertTech> bidExpertTeches = mark.getBidExpertTeches();
         for (BidExpertTech bidExpertTech : bidExpertTeches){
             if(bidExpertTech.getId() != null){
                 bidExpertTechService.updateBidExpertTech(bidExpertTech);
@@ -367,57 +406,53 @@ public class ExpertMarkController extends BaseController{
             return success("没有报价信息");
         }
 
-        BigDecimal fullScore = new BigDecimal("7.00");
-
-        BigDecimal middle = new BigDecimal(0);
-        if(bidQuotes.size() >= 5){
-            for (int i = 0; i < bidQuotes.size() ; i++) {
-                if(i != 0 && i != bidQuotes.size() - 1){
-                    middle = middle.add(bidQuotes.get(i).getQuotePrice());
-                }
-            }
-            middle = middle.divide(new BigDecimal(bidQuotes.size() - 2),2, RoundingMode.HALF_UP);
-        } else {
-            for (int i = 0; i < bidQuotes.size(); i++) {
-                middle = middle.add(bidQuotes.get(i).getQuotePrice());
+        // 基准值
+        BigDecimal middle = bidQuotes.get(0).getQuotePrice();
+        List<BidQuote> bidQuoteList = new ArrayList<>();
+        List<Long> hids = bidInfoService.getHids(sid);
+        for(BidQuote item : bidQuotes){
+            if(!hids.contains(item.getHid())){
+                bidQuoteList.add(item);
             }
-            middle = middle.divide(new BigDecimal(bidQuotes.size()),2, RoundingMode.HALF_UP);
         }
-        BigDecimal standard = middle.multiply(new BigDecimal("0.01"));
-        for(BidQuote item :bidQuotes){
-            String hName = bidInfoService.getSupplierByhid(item.getHid());
-            QuoteScore score = new QuoteScore();
-            score.setSid(sid);
-            score.setHid(item.getHid());
-            score.sethName(hName);
-            score.setLevel(middle);
-            score.setQuotePrice(item.getQuotePrice());
-            BigDecimal percent = item.getQuotePrice().subtract(middle).divide(middle,4,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-            score.setPercent(percent);
-            BigDecimal relScore = new BigDecimal(0);
-
-            if(item.getQuotePrice().compareTo(middle) > 0){
-                BigDecimal divide = item.getQuotePrice().subtract(middle).divide(standard,2,RoundingMode.HALF_UP);
-                divide = divide.setScale(0,RoundingMode.DOWN);
-                if(divide.compareTo(new BigDecimal(0)) == 0){
-                    relScore = fullScore.subtract(item.getQuotePrice().subtract(middle).divide(standard,2,RoundingMode.HALF_UP).multiply(new BigDecimal("0.6")));
-                } else {
-                    relScore = fullScore.subtract(divide.multiply(new BigDecimal("0.6")));
-                }
 
-            } else if(item.getQuotePrice().compareTo(middle) < 0){
-                BigDecimal divide = middle.subtract(item.getQuotePrice()).divide(standard,2,RoundingMode.HALF_UP);
-                divide = divide.setScale(0,RoundingMode.DOWN);
-                if(divide.compareTo(new BigDecimal(0)) == 0){
-                    relScore = fullScore.subtract(middle.subtract(item.getQuotePrice()).divide(standard,2,RoundingMode.HALF_UP).multiply(new BigDecimal("0.6")));
-                } else{
-                    relScore = fullScore.subtract(divide.multiply(new BigDecimal("0.5")));
-                }
-            } else{
-                relScore = fullScore;
+        BidTender bidTender = bidTenderService.selectBidTenderBySid(sid);
+        PpmProcurementPlan plan = remotePlanService.getPlan(bidTender.getXyId(), SecurityConstants.INNER);
+        Long materialId = plan.getMaterialId();
+
+        // 报价得分计算
+        if(materialId == 39 || materialId == 40 || materialId == 41 || materialId == 42){
+            for(BidQuote item : bidQuoteList){
+                String hName = bidInfoService.getSupplierByhid(item.getHid());
+                QuoteScore score = new QuoteScore();
+                score.setSid(sid);
+                score.setHid(item.getHid());
+                score.sethName(hName);
+                score.setLevel(middle);
+                score.setQuotePrice(item.getQuotePrice());
+                BigDecimal percent = item.getQuotePrice().subtract(middle).divide(middle,4,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+                score.setPercent(percent);
+                BigDecimal relScore = new BigDecimal(0);
+                relScore = middle.divide(item.getQuotePrice(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("10")).setScale(2,RoundingMode.HALF_UP);
+                score.setScore(relScore);
+                scores.add(score);
+            }
+        } else {
+            for(BidQuote item : bidQuoteList){
+                String hName = bidInfoService.getSupplierByhid(item.getHid());
+                QuoteScore score = new QuoteScore();
+                score.setSid(sid);
+                score.setHid(item.getHid());
+                score.sethName(hName);
+                score.setLevel(middle);
+                score.setQuotePrice(item.getQuotePrice());
+                BigDecimal percent = item.getQuotePrice().subtract(middle).divide(middle,4,RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
+                score.setPercent(percent);
+                BigDecimal relScore = new BigDecimal(0);
+                relScore = middle.divide(item.getQuotePrice(),10,RoundingMode.HALF_UP).multiply(new BigDecimal("30")).setScale(2,RoundingMode.HALF_UP);
+                score.setScore(relScore);
+                scores.add(score);
             }
-            score.setScore(relScore);
-            scores.add(score);
         }
         return success(scores);
     }
@@ -436,101 +471,104 @@ public class ExpertMarkController extends BaseController{
             return success("没有报价信息");
         }
 
-        BigDecimal fullScore = new BigDecimal("7.00");
-
-        BigDecimal middle = new BigDecimal(0);
-        if(bidQuotes.size() >= 5){
-            for (int i = 0; i < bidQuotes.size() ; i++) {
-                if(i != 0 && i != bidQuotes.size() - 1){
-                    middle = middle.add(bidQuotes.get(i).getQuotePrice());
-                }
-            }
-            middle = middle.divide(new BigDecimal(bidQuotes.size() - 2),2, RoundingMode.HALF_UP);
-        } else {
-            for (int i = 0; i < bidQuotes.size(); i++) {
-                middle = middle.add(bidQuotes.get(i).getQuotePrice());
+        // 基准值
+        BigDecimal middle = bidQuotes.get(0).getQuotePrice();
+        List<BidQuote> bidQuoteList = new ArrayList<>();
+        List<Long> hids = bidInfoService.getHids(sid);
+        for(BidQuote item : bidQuotes){
+            if(!hids.contains(item.getHid())){
+                bidQuoteList.add(item);
             }
-            middle = middle.divide(new BigDecimal(bidQuotes.size()),2, RoundingMode.HALF_UP);
         }
-        BigDecimal standard = middle.multiply(new BigDecimal("0.01"));
-
-        for(BidQuote item : bidQuotes){
-            TotalScore totalScore = new TotalScore();
-            totalScore.setSid(sid);
-            String hName = bidInfoService.getSupplierByhid(item.getHid());
-            totalScore.setHid(item.getHid());
-            totalScore.sethName(hName);
-
-            BigDecimal priceScore = new BigDecimal(0);
-
-            if(item.getQuotePrice().compareTo(middle) > 0){
-                BigDecimal divide = item.getQuotePrice().subtract(middle).divide(standard,2,RoundingMode.HALF_UP);
-                divide = divide.setScale(0,RoundingMode.DOWN);
-                if(divide.compareTo(new BigDecimal(0)) == 0){
-                    priceScore = fullScore.subtract(item.getQuotePrice().subtract(middle).divide(standard,2,RoundingMode.HALF_UP).multiply(new BigDecimal("0.6")));
-                } else {
-                    priceScore = fullScore.subtract(divide.multiply(new BigDecimal("0.6")));
-                }
 
-            } else if(item.getQuotePrice().compareTo(middle) < 0){
-                BigDecimal divide = middle.subtract(item.getQuotePrice()).divide(standard,2,RoundingMode.HALF_UP);
-                divide = divide.setScale(0,RoundingMode.DOWN);
-                if(divide.compareTo(new BigDecimal(0)) == 0){
-                    priceScore = fullScore.subtract(middle.subtract(item.getQuotePrice()).divide(standard,2,RoundingMode.HALF_UP).multiply(new BigDecimal("0.6")));
-                } else{
-                    priceScore = fullScore.subtract(divide.multiply(new BigDecimal("0.5")));
+        BidTender bidTender = bidTenderService.selectBidTenderBySid(sid);
+        PpmProcurementPlan plan = remotePlanService.getPlan(bidTender.getXyId(), SecurityConstants.INNER);
+        Long materialId = plan.getMaterialId();
+
+        // 报价得分计算
+        if(materialId == 39 || materialId == 40 || materialId == 41 || materialId == 42){
+            for(BidQuote item : bidQuoteList){
+                TotalScore totalScore = new TotalScore();
+                totalScore.setSid(sid);
+                String hName = bidInfoService.getSupplierByhid(item.getHid());
+                totalScore.setHid(item.getHid());
+                totalScore.sethName(hName);
+                BigDecimal priceScore = new BigDecimal(0);
+                priceScore = middle.divide(item.getQuotePrice(),10,RoundingMode.HALF_UP).multiply(new BigDecimal(10)).setScale(2,RoundingMode.HALF_UP);
+                totalScore.setPriceScore(priceScore);
+                List<TechScore> techScores = bidInfoService.getTechScore(sid);
+                List<TechScore> techScores1 = new ArrayList<>();
+
+                int size = 0;
+                Double total = 0.0;
+                for (TechScore techScore : techScores){
+                    if(techScore.getHid().equals(item.getHid())){
+                        size++;
+                        total += techScore.getScore();
+                        techScores1.add(techScore);
+                    }
                 }
-            } else{
-                priceScore = fullScore;
+                totalScore.setTechList(techScores1);
+                BigDecimal averageScore = new BigDecimal(total.toString()).divide(new BigDecimal(String.valueOf(size)),2,RoundingMode.HALF_UP);
+                totalScore.setAverScore(averageScore);
+                totalScore.setTotalScore(averageScore.add(priceScore));
+                totalScore.setSize(size);
+                list.add(totalScore);
             }
-
-            totalScore.setPriceScore(priceScore);
-            List<TechScore> techScores = bidInfoService.getTechScore(sid);
-            List<TechScore> techScores1 = new ArrayList<>();
-
-            int size = 0;
-            Double total = 0.0;
-            for (TechScore techScore : techScores){
-                if(techScore.getHid().equals(item.getHid())){
-                    size++;
-                    total += techScore.getScore();
-                    techScores1.add(techScore);
+        } else {
+            for(BidQuote item : bidQuoteList){
+                TotalScore totalScore = new TotalScore();
+                totalScore.setSid(sid);
+                String hName = bidInfoService.getSupplierByhid(item.getHid());
+                totalScore.setHid(item.getHid());
+                totalScore.sethName(hName);
+                BigDecimal priceScore = new BigDecimal(0);
+                priceScore = middle.divide(item.getQuotePrice(),10,RoundingMode.HALF_UP).multiply(new BigDecimal(30)).setScale(2,RoundingMode.HALF_UP);
+                totalScore.setPriceScore(priceScore);
+
+                List<TechScore> techScores = bidInfoService.getTechScore(sid);
+                List<TechScore> techScores1 = new ArrayList<>();
+
+                int size = 0;
+                Double total = 0.0;
+                for (TechScore techScore : techScores){
+                    if(techScore.getHid().equals(item.getHid())){
+                        size++;
+                        total += techScore.getScore();
+                        techScores1.add(techScore);
+                    }
                 }
+                totalScore.setTechList(techScores1);
+                BigDecimal averageScore = new BigDecimal(total.toString()).divide(new BigDecimal(String.valueOf(size)),2,RoundingMode.HALF_UP);
+                totalScore.setAverScore(averageScore);
+                totalScore.setTotalScore(averageScore.add(priceScore));
+                totalScore.setSize(size);
+                list.add(totalScore);
             }
-            totalScore.setTechList(techScores1);
-            BigDecimal averageScore = new BigDecimal(total.toString()).divide(new BigDecimal(String.valueOf(size)),2,RoundingMode.HALF_UP);
-            totalScore.setAverScore(averageScore);
-            totalScore.setTotalScore(averageScore.add(priceScore));
-            totalScore.setSize(size);
-            list.add(totalScore);
         }
-
         Collections.sort(list);
-//
-//        scoreSummaryService.deleteScoreSummaryBySid(sid);
-//        for (int i = 0; i < list.size(); i++){
-//            list.get(i).setSize(i+1);
-//
-//            ScoreSummary scoreSummary = new ScoreSummary();
-//            scoreSummary.setSid(sid);
-//            scoreSummary.setHid(list.get(i).getHid());
-//            scoreSummary.sethName(list.get(i).gethName());
-//            List<TechScore> techList = list.get(i).getTechList();
-//            String scoreInfo = "";
-//            for(TechScore item : techList){
-//                scoreInfo+=item.getjName()+","+item.getScore().toString()+";";
-//            }
-//            scoreSummary.setScoreInfo(scoreInfo);
-//            scoreSummary.setPriceScore(list.get(i).getPriceScore());
-//            scoreSummary.setAverScore(list.get(i).getAverScore());
-//            scoreSummary.setTotalScore(list.get(i).getTotalScore());
-//            scoreSummary.setSort(Long.valueOf(i+1));
-//            scoreSummaryService.insertScoreSummary(scoreSummary);
-//        }
 
+        scoreSummaryService.deleteScoreSummaryBySid(sid);
+        for (int i = 0; i < list.size(); i++){
+            list.get(i).setSize(i+1);
+
+            ScoreSummary scoreSummary = new ScoreSummary();
+            scoreSummary.setSid(sid);
+            scoreSummary.setHid(list.get(i).getHid());
+            scoreSummary.sethName(list.get(i).gethName());
+            List<TechScore> techList = list.get(i).getTechList();
+            String scoreInfo = "";
+            for(TechScore item : techList){
+                scoreInfo+=item.getjName()+","+item.getScore().toString()+";";
+            }
+            scoreSummary.setScoreInfo(scoreInfo);
+            scoreSummary.setPriceScore(list.get(i).getPriceScore());
+            scoreSummary.setAverScore(list.get(i).getAverScore());
+            scoreSummary.setTotalScore(list.get(i).getTotalScore());
+            scoreSummary.setSort(Long.valueOf(i+1));
+            scoreSummaryService.insertScoreSummary(scoreSummary);
+        }
         return success(list);
-
     }
 
-
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/ScoreSummaryController.java

@@ -48,7 +48,7 @@ public class ScoreSummaryController extends BaseController
     /**
      * 导出评分汇总记录列表
      */
-    @RequiresPermissions("bidding:summary:export")
+    // @RequiresPermissions("bidding:summary:export")
     @Log(title = "评分汇总记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ScoreSummary scoreSummary)
@@ -61,7 +61,7 @@ public class ScoreSummaryController extends BaseController
     /**
      * 获取评分汇总记录详细信息
      */
-    @RequiresPermissions("bidding:summary:query")
+    // @RequiresPermissions("bidding:summary:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class ScoreSummaryController extends BaseController
     /**
      * 新增评分汇总记录
      */
-    @RequiresPermissions("bidding:summary:add")
+    // @RequiresPermissions("bidding:summary:add")
     @Log(title = "评分汇总记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ScoreSummary scoreSummary)
@@ -82,7 +82,7 @@ public class ScoreSummaryController extends BaseController
     /**
      * 修改评分汇总记录
      */
-    @RequiresPermissions("bidding:summary:edit")
+    // @RequiresPermissions("bidding:summary:edit")
     @Log(title = "评分汇总记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ScoreSummary scoreSummary)
@@ -93,7 +93,7 @@ public class ScoreSummaryController extends BaseController
     /**
      * 删除评分汇总记录
      */
-    @RequiresPermissions("bidding:summary:remove")
+    // @RequiresPermissions("bidding:summary:remove")
     @Log(title = "评分汇总记录", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/WinNoticeController.java

@@ -52,7 +52,7 @@ public class WinNoticeController extends BaseController
      * 查询中标通知书
      列表
      */
-    @RequiresPermissions("bidding:winNotice:list")
+    // @RequiresPermissions("bidding:winNotice:list")
     @GetMapping("/list")
     public TableDataInfo list(WinNotice winNotice)
     {
@@ -65,7 +65,7 @@ public class WinNoticeController extends BaseController
      * 导出中标通知书
      列表
      */
-    @RequiresPermissions("bidding:winNotice:export")
+    // @RequiresPermissions("bidding:winNotice:export")
     @Log(title = "中标通知书 ", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, WinNotice winNotice)
@@ -79,7 +79,7 @@ public class WinNoticeController extends BaseController
      * 获取中标通知书
      详细信息
      */
-    @RequiresPermissions("bidding:winNotice:query")
+    // @RequiresPermissions("bidding:winNotice:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -90,7 +90,7 @@ public class WinNoticeController extends BaseController
      * 新增中标通知书
 
      */
-    @RequiresPermissions("bidding:winNotice:add")
+    // @RequiresPermissions("bidding:winNotice:add")
     @Log(title = "中标通知书 ", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody WinNotice winNotice)
@@ -102,7 +102,7 @@ public class WinNoticeController extends BaseController
      * 修改中标通知书
 
      */
-    @RequiresPermissions("bidding:winNotice:edit")
+    // @RequiresPermissions("bidding:winNotice:edit")
     @Log(title = "中标通知书 ", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody WinNotice winNotice)
@@ -116,7 +116,7 @@ public class WinNoticeController extends BaseController
      * 删除中标通知书
 
      */
-    @RequiresPermissions("bidding:winNotice:remove")
+    // @RequiresPermissions("bidding:winNotice:remove")
     @Log(title = "中标通知书 ", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/domain/BidIdea.java

@@ -26,6 +26,8 @@ public class BidIdea extends BaseEntity
     @Excel(name = "专家意见")
     private String idea;
 
+    private Long hid;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -54,6 +56,14 @@ public class BidIdea extends BaseEntity
         return idea;
     }
 
+    public Long getHid() {
+        return hid;
+    }
+
+    public void setHid(Long hid) {
+        this.hid = hid;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/domain/Mark.java

@@ -26,6 +26,10 @@ public class Mark {
 
     private String uKaiPosition;
 
+    private String idea;
+
+    private Long hid;
+
     private List<BidExamine> examineList;
 
     private List<BidRespond> bidRespondList;
@@ -151,4 +155,20 @@ public class Mark {
     public void setIsLeader(Long isLeader) {
         this.isLeader = isLeader;
     }
+
+    public String getIdea() {
+        return idea;
+    }
+
+    public void setIdea(String idea) {
+        this.idea = idea;
+    }
+
+    public Long getHid() {
+        return hid;
+    }
+
+    public void setHid(Long hid) {
+        this.hid = hid;
+    }
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/mapper/BidIdeaMapper.java

@@ -2,6 +2,7 @@ package com.hh.bidding.mapper;
 
 import java.util.List;
 import com.hh.bidding.domain.BidIdea;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 专家意见Mapper接口
@@ -58,4 +59,7 @@ public interface BidIdeaMapper
      * @return 结果
      */
     public int deleteBidIdeaByIds(Long[] ids);
+
+    public BidIdea selectIdeaBySid(@Param("sid") Long sid, @Param("hid") Long hid);
+
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/mapper/BidInfoMapper.java

@@ -2,6 +2,7 @@ package com.hh.bidding.mapper;
 
 import java.util.List;
 import com.hh.bidding.domain.BidInfo;
+import com.hh.bidding.domain.BidQuote;
 import com.hh.bidding.domain.TechScore;
 import com.ruoyi.system.api.domain.BsExpert;
 
@@ -100,4 +101,8 @@ public interface BidInfoMapper
      */
     public List<TechScore> getTechScore(Long sid);
 
+    // 获取不合格的供应商ID
+    public List<Long> getHids(Long sid);
+
+
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/service/IBidIdeaService.java

@@ -58,4 +58,6 @@ public interface IBidIdeaService
      * @return 结果
      */
     public int deleteBidIdeaById(Long id);
+
+    public BidIdea selectIdeaBySid(Long sid,Long hid);
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/service/IBidInfoService.java

@@ -99,4 +99,7 @@ public interface IBidInfoService
      * @return
      */
     public List<TechScore> getTechScore(Long sid);
+
+    // 获取不合格的供应商ID
+    public List<Long> getHids(Long sid);
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/service/impl/BidIdeaServiceImpl.java

@@ -93,4 +93,9 @@ public class BidIdeaServiceImpl implements IBidIdeaService
     {
         return bidIdeaMapper.deleteBidIdeaById(id);
     }
+
+    @Override
+    public BidIdea selectIdeaBySid(Long sid,Long hid) {
+        return bidIdeaMapper.selectIdeaBySid(sid,hid);
+    }
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/service/impl/BidInfoServiceImpl.java

@@ -121,4 +121,9 @@ public class BidInfoServiceImpl implements IBidInfoService
     public List<TechScore> getTechScore(Long sid) {
         return bidInfoMapper.getTechScore(sid);
     }
+
+    @Override
+    public List<Long> getHids(Long sid) {
+        return bidInfoMapper.getHids(sid);
+    }
 }

ruoyi-modules/hh-bidding/src/main/resources/mapper/BidCommitteeMapper.xml

@@ -39,7 +39,7 @@
     </select>
 
     <select id="getProjectByUserId" parameterType="Long" resultType="com.hh.bidding.domain.BidTender">
-        select t.* from bid_tender t inner join bid_committee c on t.sid = c.sid where c.user_id = #{userId} and (c.status = 1 or c.status = 3)
+        select t.* from bid_tender t inner join bid_committee c on t.sid = c.sid where c.user_id = #{userId} and (c.status = 1 or c.status = 3) order by t.sid desc
     </select>
 
     <select id="selectBidCommitteeByPbId" parameterType="Long" resultMap="BidCommitteeResult">
@@ -61,6 +61,7 @@
             <if test="jid != null">jid,</if>
             <if test="sid != null">sid,</if>
             <if test="userId != null">user_id,</if>
+            <if test="status != null">status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="pbId != null">#{pbId},</if>
@@ -74,6 +75,7 @@
             <if test="jid != null">#{jid},</if>
             <if test="sid != null">#{sid},</if>
             <if test="userId != null">#{userId},</if>
+            <if test="status != null">#{status},</if>
         </trim>
     </insert>
 

ruoyi-modules/hh-bidding/src/main/resources/mapper/BidIdeaMapper.xml

@@ -10,10 +10,11 @@
         <result property="idea"    column="idea"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="hid" column="hid" />
     </resultMap>
 
     <sql id="selectBidIdeaVo">
-        select id, sid, idea, create_time, update_time from bid_idea
+        select id, sid, idea, create_time, update_time,hid from bid_idea
     </sql>
 
     <select id="selectBidIdeaList" parameterType="BidIdea" resultMap="BidIdeaResult">
@@ -21,6 +22,7 @@
         <where>
             <if test="sid != null "> and sid = #{sid}</if>
             <if test="idea != null  and idea != ''"> and idea = #{idea}</if>
+            <if test="hid != null "> and hid = #{hid}</if>
         </where>
     </select>
 
@@ -36,12 +38,14 @@
             <if test="idea != null">idea,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="hid != null">hid,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sid != null">#{sid},</if>
             <if test="idea != null">#{idea},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="hid != null">#{hid},</if>
         </trim>
     </insert>
 
@@ -52,6 +56,7 @@
             <if test="idea != null">idea = #{idea},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="hid != null">hid = #{hid},</if>
         </trim>
         where id = #{id}
     </update>
@@ -66,4 +71,8 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectIdeaBySid">
+        select * from bid_idea where sid = #{sid} and hid = #{hid}
+    </select>
 </mapper>

ruoyi-modules/hh-bidding/src/main/resources/mapper/BidInfoMapper.xml

@@ -97,4 +97,13 @@
         SELECT sid,jid,j_name,hid,sum(score) as score FROM bid_expert_tech where sid = #{sid} group by hid,jid,j_name order by j_name
     </select>
 
+    <select id = "getHids" parameterType="Long">
+        select * from (SELECT * FROM bid_expert_respond
+                       where is_ok = '不合格' and sid = #{sid}
+                       UNION
+                       select * from bid_expert_examine
+                       where is_ok = '不合格' and sid = #{sid}
+                      ) e
+    </select>
+
 </mapper>

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankAccrualController.java

@@ -55,7 +55,7 @@ public class BankAccrualController extends BaseController
     /**
      * 查询保证金利息试算查询列表
      */
-    @RequiresPermissions("bank:accrual:list")
+    // @RequiresPermissions("bank:accrual:list")
     @GetMapping("/list")
     public TableDataInfo list(BankAccrual bankAccrual)
     {
@@ -67,7 +67,7 @@ public class BankAccrualController extends BaseController
     /**
      * 导出保证金利息试算查询列表
      */
-    @RequiresPermissions("bank:accrual:export")
+    // @RequiresPermissions("bank:accrual:export")
     @Log(title = "保证金利息试算查询", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BankAccrual bankAccrual)
@@ -80,7 +80,7 @@ public class BankAccrualController extends BaseController
     /**
      * 获取保证金利息试算查询详细信息
      */
-    @RequiresPermissions("bank:accrual:query")
+    // @RequiresPermissions("bank:accrual:query")
     @GetMapping(value = "/{accrualid}")
     public AjaxResult getInfo(@PathVariable("accrualid") String accrualid)
     {
@@ -90,7 +90,7 @@ public class BankAccrualController extends BaseController
     /**
      * 新增保证金利息试算查询
      */
-    @RequiresPermissions("bank:accrual:add")
+    // @RequiresPermissions("bank:accrual:add")
     @Log(title = "保证金利息试算查询", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankAccrual bankAccrual)
@@ -121,7 +121,7 @@ public class BankAccrualController extends BaseController
     /**
      * 修改保证金利息试算查询
      */
-    @RequiresPermissions("bank:accrual:edit")
+    // @RequiresPermissions("bank:accrual:edit")
     @Log(title = "保证金利息试算查询", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BankAccrual bankAccrual)
@@ -183,7 +183,7 @@ public class BankAccrualController extends BaseController
     /**
      * 删除保证金利息试算查询
      */
-    @RequiresPermissions("bank:accrual:remove")
+    // @RequiresPermissions("bank:accrual:remove")
     @Log(title = "保证金利息试算查询", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{accrualids}")
     public AjaxResult remove(@PathVariable String[] accrualids)

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankDepositController.java

@@ -65,7 +65,7 @@ public class BankDepositController extends BaseController {
     /**
      * 查询查询保证金入账数量列表
      */
-    @RequiresPermissions("bank:deposit:list")
+    // @RequiresPermissions("bank:deposit:list")
     @GetMapping("/list")
     public TableDataInfo list(BankDeposit bankDeposit) {
         startPage();
@@ -76,7 +76,7 @@ public class BankDepositController extends BaseController {
     /**
      * 导出查询保证金入账数量列表
      */
-    @RequiresPermissions("bank:deposit:export")
+    // @RequiresPermissions("bank:deposit:export")
     @Log(title = "查询保证金入账数量", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BankDeposit bankDeposit) {
@@ -161,7 +161,7 @@ public class BankDepositController extends BaseController {
     /**
      * 新增查询保证金入账数量
      */
-    @RequiresPermissions("bank:deposit:add")
+    // @RequiresPermissions("bank:deposit:add")
     @Log(title = "查询保证金入账数量", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankDeposit bankDeposit) {
@@ -197,7 +197,7 @@ public class BankDepositController extends BaseController {
     /**
      * 修改查询保证金入账数量
      */
-    @RequiresPermissions("bank:deposit:edit")
+    // @RequiresPermissions("bank:deposit:edit")
     @Log(title = "查询保证金入账数量", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BankDeposit bankDeposit) {
@@ -261,7 +261,7 @@ public class BankDepositController extends BaseController {
     /**
      * 删除查询保证金入账数量
      */
-    @RequiresPermissions("bank:deposit:remove")
+    // @RequiresPermissions("bank:deposit:remove")
     @Log(title = "查询保证金入账数量", businessType = BusinessType.DELETE)
     @DeleteMapping("/{depositids}")
     public AjaxResult remove(@PathVariable String[] depositids) {

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankDepositdescController.java

@@ -56,7 +56,7 @@ public class BankDepositdescController extends BaseController {
     /**
      * 查询查询保证金入账明细列表
      */
-    @RequiresPermissions("bank:depositdesc:list")
+    // @RequiresPermissions("bank:depositdesc:list")
     @GetMapping("/list")
     public TableDataInfo list(BankDepositdesc bankDepositdesc) {
         startPage();
@@ -67,7 +67,7 @@ public class BankDepositdescController extends BaseController {
     /**
      * 导出查询保证金入账明细列表
      */
-    @RequiresPermissions("bank:depositdesc:export")
+    // @RequiresPermissions("bank:depositdesc:export")
     @Log(title = "查询保证金入账明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BankDepositdesc bankDepositdesc) {
@@ -79,7 +79,7 @@ public class BankDepositdescController extends BaseController {
     /**
      * 获取查询保证金入账明细详细信息
      */
-    @RequiresPermissions("bank:depositdesc:query")
+    // @RequiresPermissions("bank:depositdesc:query")
     @GetMapping(value = "/{depositdescid}")
     public AjaxResult getInfo(@PathVariable("depositdescid") String depositdescid) {
 
@@ -89,7 +89,7 @@ public class BankDepositdescController extends BaseController {
     /**
      * 新增查询保证金入账明细
      */
-    @RequiresPermissions("bank:depositdesc:add")
+    // @RequiresPermissions("bank:depositdesc:add")
     @Log(title = "查询保证金入账明细", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankDepositdesc bankDepositdesc) {
@@ -126,7 +126,7 @@ public class BankDepositdescController extends BaseController {
      * 修改查询保证金入账明细
      */
     @Transactional
-    @RequiresPermissions("bank:depositdesc:edit")
+    // @RequiresPermissions("bank:depositdesc:edit")
     @Log(title = "查询保证金入账明细", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BankDepositdesc bankDepositdesc) {
@@ -249,7 +249,7 @@ public class BankDepositdescController extends BaseController {
     /**
      * 批量退还保证金
      */
-    @RequiresPermissions("bank:depositdesc:remove")
+    // @RequiresPermissions("bank:depositdesc:remove")
     @Log(title = "查询保证金入账明细", businessType = BusinessType.DELETE)
     @DeleteMapping("/{depositdescids}")
     public AjaxResult remove(@PathVariable String[] depositdescids) {

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankDepositleftController.java

@@ -54,7 +54,7 @@ public class BankDepositleftController extends BaseController {
     /**
      * 查询非原路退还保证金列表
      */
-    @RequiresPermissions("bank:depositleft:list")
+    // @RequiresPermissions("bank:depositleft:list")
     @GetMapping("/list")
     public TableDataInfo list(BankDepositleft bankDepositleft) {
         startPage();
@@ -65,7 +65,7 @@ public class BankDepositleftController extends BaseController {
     /**
      * 导出非原路退还保证金列表
      */
-    @RequiresPermissions("bank:depositleft:export")
+    // @RequiresPermissions("bank:depositleft:export")
     @Log(title = "非原路退还保证金", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BankDepositleft bankDepositleft) {
@@ -77,7 +77,7 @@ public class BankDepositleftController extends BaseController {
     /**
      * 获取非原路退还保证金详细信息
      */
-    @RequiresPermissions("bank:depositleft:query")
+    // @RequiresPermissions("bank:depositleft:query")
     @GetMapping(value = "/{depositleftid}")
     public AjaxResult getInfo(@PathVariable("depositleftid") String depositleftid) {
         return success(bankDepositleftService.selectBankDepositleftByDepositleftid(depositleftid));
@@ -86,7 +86,7 @@ public class BankDepositleftController extends BaseController {
     /**
      * 新增非原路退还保证金
      */
-    @RequiresPermissions("bank:depositleft:add")
+    // @RequiresPermissions("bank:depositleft:add")
     @Log(title = "非原路退还保证金", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankDepositleft bankDepositleft) {
@@ -120,7 +120,7 @@ public class BankDepositleftController extends BaseController {
     /**
      * 修改非原路退还保证金
      */
-    @RequiresPermissions("bank:depositleft:edit")
+    // @RequiresPermissions("bank:depositleft:edit")
     @Log(title = "非原路退还保证金", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BankDepositleft bankDepositleft) {
@@ -191,7 +191,7 @@ public class BankDepositleftController extends BaseController {
     /**
      * 删除非原路退还保证金
      */
-    @RequiresPermissions("bank:depositleft:remove")
+    // @RequiresPermissions("bank:depositleft:remove")
     @Log(title = "非原路退还保证金", businessType = BusinessType.DELETE)
     @DeleteMapping("/{depositleftids}")
     public AjaxResult remove(@PathVariable String[] depositleftids) {

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankFrzandpenaltyController.java

@@ -55,7 +55,7 @@ public class BankFrzandpenaltyController extends BaseController
     /**
      * 查询保证金冻结/罚没金额查询列表
      */
-    @RequiresPermissions("bank:frzandpenalty:list")
+    // @RequiresPermissions("bank:frzandpenalty:list")
     @GetMapping("/list")
     public TableDataInfo list(BankFrzandpenalty bankFrzandpenalty)
     {
@@ -67,7 +67,7 @@ public class BankFrzandpenaltyController extends BaseController
     /**
      * 导出保证金冻结/罚没金额查询列表
      */
-    @RequiresPermissions("bank:frzandpenalty:export")
+    // @RequiresPermissions("bank:frzandpenalty:export")
     @Log(title = "保证金冻结/罚没金额查询", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BankFrzandpenalty bankFrzandpenalty)
@@ -80,7 +80,7 @@ public class BankFrzandpenaltyController extends BaseController
     /**
      * 获取保证金冻结/罚没金额查询详细信息
      */
-    @RequiresPermissions("bank:frzandpenalty:query")
+    // @RequiresPermissions("bank:frzandpenalty:query")
     @GetMapping(value = "/{frzandpenaltyid}")
     public AjaxResult getInfo(@PathVariable("frzandpenaltyid") String frzandpenaltyid)
     {
@@ -90,7 +90,7 @@ public class BankFrzandpenaltyController extends BaseController
     /**
      * 新增保证金冻结/罚没金额查询
      */
-    @RequiresPermissions("bank:frzandpenalty:add")
+    // @RequiresPermissions("bank:frzandpenalty:add")
     @Log(title = "保证金冻结/罚没金额查询", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankFrzandpenalty bankFrzandpenalty)
@@ -123,7 +123,7 @@ public class BankFrzandpenaltyController extends BaseController
     /**
      * 修改保证金冻结/罚没金额查询
      */
-    @RequiresPermissions("bank:frzandpenalty:edit")
+    // @RequiresPermissions("bank:frzandpenalty:edit")
     @Log(title = "保证金冻结/罚没金额查询", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BankFrzandpenalty bankFrzandpenalty)
@@ -203,7 +203,7 @@ public class BankFrzandpenaltyController extends BaseController
     /**
      * 删除保证金冻结/罚没金额查询
      */
-    @RequiresPermissions("bank:frzandpenalty:remove")
+    // @RequiresPermissions("bank:frzandpenalty:remove")
     @Log(title = "保证金冻结/罚没金额查询", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{frzandpenaltyids}")
     public AjaxResult remove(@PathVariable String[] frzandpenaltyids)

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankRefundController.java

@@ -55,7 +55,7 @@ public class BankRefundController extends BaseController {
     /**
      * 查询查询保证金退款信息列表
      */
-    @RequiresPermissions("bank:refund:list")
+    // @RequiresPermissions("bank:refund:list")
     @GetMapping("/list")
     public TableDataInfo list(BankRefund bankRefund) {
         startPage();
@@ -66,7 +66,7 @@ public class BankRefundController extends BaseController {
     /**
      * 导出查询保证金退款信息列表
      */
-    @RequiresPermissions("bank:refund:export")
+    // @RequiresPermissions("bank:refund:export")
     @Log(title = "查询保证金退款信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BankRefund bankRefund) {
@@ -78,7 +78,7 @@ public class BankRefundController extends BaseController {
     /**
      * 获取查询保证金退款信息详细信息
      */
-    @RequiresPermissions("bank:refund:query")
+    // @RequiresPermissions("bank:refund:query")
     @GetMapping(value = "/{refundid}")
     public AjaxResult getInfo(@PathVariable("refundid") String refundid) {
         return success(bankRefundService.selectBankRefundByRefundid(refundid));
@@ -87,7 +87,7 @@ public class BankRefundController extends BaseController {
     /**
      * 新增查询保证金退款信息
      */
-    @RequiresPermissions("bank:refund:add")
+    // @RequiresPermissions("bank:refund:add")
     @Log(title = "查询保证金退款信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankRefund bankRefund) {
@@ -134,7 +134,7 @@ public class BankRefundController extends BaseController {
     /**
      * 修改查询保证金退款信息
      */
-    @RequiresPermissions("bank:refund:edit")
+    // @RequiresPermissions("bank:refund:edit")
     @Log(title = "查询保证金退款信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BankRefund bankRefund) {
@@ -261,7 +261,7 @@ public class BankRefundController extends BaseController {
     /**
      * 删除查询保证金退款信息
      */
-    @RequiresPermissions("bank:refund:remove")
+    // @RequiresPermissions("bank:refund:remove")
     @Log(title = "查询保证金退款信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{refundids}")
     public AjaxResult remove(@PathVariable String[] refundids) {

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankRefundbatController.java

@@ -56,7 +56,7 @@ public class BankRefundbatController extends BaseController {
     /**
      * 查询批量退还保证金列表
      */
-    @RequiresPermissions("bank:refundbat:list")
+    // @RequiresPermissions("bank:refundbat:list")
     @GetMapping("/list")
     public TableDataInfo list(BankRefundbat bankRefundbat) {
         startPage();
@@ -67,7 +67,7 @@ public class BankRefundbatController extends BaseController {
     /**
      * 导出批量退还保证金列表
      */
-    @RequiresPermissions("bank:refundbat:export")
+    // @RequiresPermissions("bank:refundbat:export")
     @Log(title = "批量退还保证金", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BankRefundbat bankRefundbat) {
@@ -79,7 +79,7 @@ public class BankRefundbatController extends BaseController {
     /**
      * 获取批量退还保证金详细信息
      */
-    @RequiresPermissions("bank:refundbat:query")
+    // @RequiresPermissions("bank:refundbat:query")
     @GetMapping(value = "/{refundbatid}")
     public AjaxResult getInfo(@PathVariable("refundbatid") String refundbatid) {
         return success(bankRefundbatService.selectBankRefundbatByRefundbatid(refundbatid));
@@ -88,7 +88,7 @@ public class BankRefundbatController extends BaseController {
     /**
      * 新增批量退还保证金
      */
-    @RequiresPermissions("bank:refundbat:add")
+    // @RequiresPermissions("bank:refundbat:add")
     @Log(title = "批量退还保证金", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankRefundbat bankRefundbat) {
@@ -135,7 +135,7 @@ public class BankRefundbatController extends BaseController {
     /**
      * 修改批量退还保证金
      */
-    @RequiresPermissions("bank:refundbat:edit")
+    // @RequiresPermissions("bank:refundbat:edit")
     @Log(title = "批量退还保证金", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BankRefundbat bankRefundbat) {
@@ -223,7 +223,7 @@ public class BankRefundbatController extends BaseController {
     /**
      * 删除批量退还保证金
      */
-    @RequiresPermissions("bank:refundbat:remove")
+    // @RequiresPermissions("bank:refundbat:remove")
     @Log(title = "批量退还保证金", businessType = BusinessType.DELETE)
     @DeleteMapping("/{refundbatids}")
     public AjaxResult remove(@PathVariable String[] refundbatids) {

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankRefundmgrController.java

@@ -55,7 +55,7 @@ public class BankRefundmgrController extends BaseController {
     /**
      * 查询保证金管理列表
      */
-    @RequiresPermissions("bank:refundmgr:list")
+    // @RequiresPermissions("bank:refundmgr:list")
     @GetMapping("/list")
     public TableDataInfo list(BankRefundmgr bankRefundmgr) {
         startPage();
@@ -66,7 +66,7 @@ public class BankRefundmgrController extends BaseController {
     /**
      * 导出保证金管理列表
      */
-    @RequiresPermissions("bank:refundmgr:export")
+    // @RequiresPermissions("bank:refundmgr:export")
     @Log(title = "保证金管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BankRefundmgr bankRefundmgr) {
@@ -78,7 +78,7 @@ public class BankRefundmgrController extends BaseController {
     /**
      * 获取保证金管理详细信息
      */
-    @RequiresPermissions("bank:refundmgr:query")
+    // @RequiresPermissions("bank:refundmgr:query")
     @GetMapping(value = "/{refundmgrid}")
     public AjaxResult getInfo(@PathVariable("refundmgrid") String refundmgrid) {
         return success(bankRefundmgrService.selectBankRefundmgrByRefundmgrid(refundmgrid));
@@ -87,7 +87,7 @@ public class BankRefundmgrController extends BaseController {
     /**
      * 新增保证金管理
      */
-    @RequiresPermissions("bank:refundmgr:add")
+    // @RequiresPermissions("bank:refundmgr:add")
     @Log(title = "保证金管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankRefundmgr bankRefundmgr) {
@@ -118,7 +118,7 @@ public class BankRefundmgrController extends BaseController {
     /**
      * 修改保证金管理
      */
-    @RequiresPermissions("bank:refundmgr:edit")
+    // @RequiresPermissions("bank:refundmgr:edit")
     @Log(title = "保证金管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BankRefundmgr bankRefundmgr) {
@@ -189,7 +189,7 @@ public class BankRefundmgrController extends BaseController {
     /**
      * 删除保证金管理
      */
-    @RequiresPermissions("bank:refundmgr:remove")
+    // @RequiresPermissions("bank:refundmgr:remove")
     @Log(title = "保证金管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{refundmgrids}")
     public AjaxResult remove(@PathVariable String[] refundmgrids) {

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankSubaccoutapplyController.java

@@ -55,7 +55,7 @@ public class BankSubaccoutapplyController extends BaseController
     /**
      * 查询子账户申请列表
      */
-    @RequiresPermissions("bank:subaccoutapply:list")
+    // @RequiresPermissions("bank:subaccoutapply:list")
     @GetMapping("/list")
     public TableDataInfo list(BankSubaccoutapply bankSubaccoutapply)
     {
@@ -67,7 +67,7 @@ public class BankSubaccoutapplyController extends BaseController
     /**
      * 导出子账户申请列表
      */
-    @RequiresPermissions("bank:subaccoutapply:export")
+    // @RequiresPermissions("bank:subaccoutapply:export")
     @Log(title = "子账户申请", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BankSubaccoutapply bankSubaccoutapply)
@@ -80,7 +80,7 @@ public class BankSubaccoutapplyController extends BaseController
     /**
      * 获取子账户申请详细信息
      */
-    @RequiresPermissions("bank:subaccoutapply:query")
+    // @RequiresPermissions("bank:subaccoutapply:query")
     @GetMapping(value = "/{subaccoutapplyid}")
     public AjaxResult getInfo(@PathVariable("subaccoutapplyid") String subaccoutapplyid)
     {
@@ -90,7 +90,7 @@ public class BankSubaccoutapplyController extends BaseController
     /**
      * 新增子账户申请
      */
-    @RequiresPermissions("bank:subaccoutapply:add")
+    // @RequiresPermissions("bank:subaccoutapply:add")
     @Log(title = "子账户申请", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankSubaccoutapply bankSubaccoutapply)
@@ -120,7 +120,7 @@ public class BankSubaccoutapplyController extends BaseController
     /**
      * 修改子账户申请
      */
-    @RequiresPermissions("bank:subaccoutapply:edit")
+    // @RequiresPermissions("bank:subaccoutapply:edit")
     @Log(title = "子账户申请", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BankSubaccoutapply bankSubaccoutapply)
@@ -188,7 +188,7 @@ public class BankSubaccoutapplyController extends BaseController
     /**
      * 删除子账户申请
      */
-    @RequiresPermissions("bank:subaccoutapply:remove")
+    // @RequiresPermissions("bank:subaccoutapply:remove")
     @Log(title = "子账户申请", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{subaccoutapplyids}")
     public AjaxResult remove(@PathVariable String[] subaccoutapplyids)

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankTenderdelController.java

@@ -54,7 +54,7 @@ public class BankTenderdelController extends BaseController {
     /**
      * 查询删除标段列表
      */
-    @RequiresPermissions("bank:tenderdel:list")
+    // @RequiresPermissions("bank:tenderdel:list")
     @GetMapping("/list")
     public TableDataInfo list(BankTenderdel bankTenderdel) {
         startPage();
@@ -65,7 +65,7 @@ public class BankTenderdelController extends BaseController {
     /**
      * 导出删除标段列表
      */
-    @RequiresPermissions("bank:tenderdel:export")
+    // @RequiresPermissions("bank:tenderdel:export")
     @Log(title = "删除标段", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BankTenderdel bankTenderdel) {
@@ -77,7 +77,7 @@ public class BankTenderdelController extends BaseController {
     /**
      * 获取删除标段详细信息
      */
-    @RequiresPermissions("bank:tenderdel:query")
+    // @RequiresPermissions("bank:tenderdel:query")
     @GetMapping(value = "/{tenderdelid}")
     public AjaxResult getInfo(@PathVariable("tenderdelid") String tenderdelid) {
         return success(bankTenderdelService.selectBankTenderdelByTenderdelid(tenderdelid));
@@ -86,7 +86,7 @@ public class BankTenderdelController extends BaseController {
     /**
      * 新增删除标段
      */
-    @RequiresPermissions("bank:tenderdel:add")
+    // @RequiresPermissions("bank:tenderdel:add")
     @Log(title = "删除标段", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankTenderdel bankTenderdel) {
@@ -113,7 +113,7 @@ public class BankTenderdelController extends BaseController {
     /**
      * 修改删除标段
      */
-    @RequiresPermissions("bank:tenderdel:edit")
+    // @RequiresPermissions("bank:tenderdel:edit")
     @Log(title = "删除标段", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BankTenderdel bankTenderdel) {
@@ -177,7 +177,7 @@ public class BankTenderdelController extends BaseController {
     /**
      * 删除删除标段
      */
-    @RequiresPermissions("bank:tenderdel:remove")
+    // @RequiresPermissions("bank:tenderdel:remove")
     @Log(title = "删除标段", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tenderdelids}")
     public AjaxResult remove(@PathVariable String[] tenderdelids) {

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankTendereditController.java

@@ -54,7 +54,7 @@ public class BankTendereditController extends BaseController {
     /**
      * 查询标段修改列表
      */
-    @RequiresPermissions("bank:tenderedit:list")
+    // @RequiresPermissions("bank:tenderedit:list")
     @GetMapping("/list")
     public TableDataInfo list(BankTenderedit bankTenderedit) {
         startPage();
@@ -65,7 +65,7 @@ public class BankTendereditController extends BaseController {
     /**
      * 导出标段修改列表
      */
-    @RequiresPermissions("bank:tenderedit:export")
+    // @RequiresPermissions("bank:tenderedit:export")
     @Log(title = "标段修改", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BankTenderedit bankTenderedit) {
@@ -77,7 +77,7 @@ public class BankTendereditController extends BaseController {
     /**
      * 获取标段修改详细信息
      */
-    @RequiresPermissions("bank:tenderedit:query")
+    // @RequiresPermissions("bank:tenderedit:query")
     @GetMapping(value = "/{tendereditid}")
     public AjaxResult getInfo(@PathVariable("tendereditid") String tendereditid) {
         return success(bankTendereditService.selectBankTendereditByTendereditid(tendereditid));
@@ -86,7 +86,7 @@ public class BankTendereditController extends BaseController {
     /**
      * 新增标段修改
      */
-    @RequiresPermissions("bank:tenderedit:add")
+    // @RequiresPermissions("bank:tenderedit:add")
     @Log(title = "标段修改", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankTenderedit bankTenderedit) {
@@ -130,7 +130,7 @@ public class BankTendereditController extends BaseController {
     /**
      * 修改标段修改
      */
-    @RequiresPermissions("bank:tenderedit:edit")
+    // @RequiresPermissions("bank:tenderedit:edit")
     @Log(title = "标段修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BankTenderedit bankTenderedit) {
@@ -227,7 +227,7 @@ public class BankTendereditController extends BaseController {
     /**
      * 删除标段修改
      */
-    @RequiresPermissions("bank:tenderedit:remove")
+    // @RequiresPermissions("bank:tenderedit:remove")
     @Log(title = "标段修改", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tendereditids}")
     public AjaxResult remove(@PathVariable String[] tendereditids) {

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankTenderpubController.java

@@ -69,7 +69,7 @@ public class BankTenderpubController extends BaseController {
     /**
      * 查询标段发布列表
      */
-    @RequiresPermissions("bank:tenderpub:list")
+    // @RequiresPermissions("bank:tenderpub:list")
     @GetMapping("/list")
     public TableDataInfo list(BankTenderpub bankTenderpub) {
         startPage();
@@ -80,7 +80,7 @@ public class BankTenderpubController extends BaseController {
     /**
      * 导出标段发布列表
      */
-    @RequiresPermissions("bank:tenderpub:export")
+    // @RequiresPermissions("bank:tenderpub:export")
     @Log(title = "标段发布", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BankTenderpub bankTenderpub) {
@@ -143,7 +143,7 @@ public class BankTenderpubController extends BaseController {
     /**
      * 获取标段发布详细信息
      */
-    @RequiresPermissions("bank:tenderpub:query")
+    // @RequiresPermissions("bank:tenderpub:query")
     @GetMapping(value = "/{tenderpubid}")
     public AjaxResult getInfo(@PathVariable("tenderpubid") String tenderpubid) {
         return success(bankTenderpubService.selectBankTenderpubByTenderpubid(tenderpubid));
@@ -184,7 +184,7 @@ public class BankTenderpubController extends BaseController {
      * web 接口
      */
     @Transactional
-    @RequiresPermissions("bank:tenderpub:add")
+    // @RequiresPermissions("bank:tenderpub:add")
     @Log(title = "标段发布", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankTenderpub bankTenderpub) {
@@ -241,7 +241,7 @@ public class BankTenderpubController extends BaseController {
      * 修改标段发布
      * 同步数据
      */
-    @RequiresPermissions("bank:tenderpub:edit")
+    // @RequiresPermissions("bank:tenderpub:edit")
     @Log(title = "标段修改", businessType = BusinessType.UPDATE)
     @PutMapping("/edit")
     public AjaxResult edit(@RequestBody BankTenderpub bankTenderpub) {
@@ -333,7 +333,7 @@ public class BankTenderpubController extends BaseController {
     /**
      * 删除标段发布
      */
-    @RequiresPermissions("bank:tenderpub:remove")
+    // @RequiresPermissions("bank:tenderpub:remove")
     @Log(title = "标段发布", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tenderpubids}")
     public AjaxResult remove(@PathVariable String[] tenderpubids) {

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankTenderqueryController.java

@@ -55,7 +55,7 @@ public class BankTenderqueryController extends BaseController {
     /**
      * 查询标段信息查询列表
      */
-    @RequiresPermissions("bank:tenderquery:list")
+    // // @RequiresPermissions("bank:tenderquery:list")
     @GetMapping("/list")
     public TableDataInfo list(BankTenderquery bankTenderquery) throws Exception {
         startPage();
@@ -88,7 +88,7 @@ public class BankTenderqueryController extends BaseController {
     /**
      * 导出标段信息查询列表
      */
-    @RequiresPermissions("bank:tenderquery:export")
+    // @RequiresPermissions("bank:tenderquery:export")
     @Log(title = "标段信息查询", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BankTenderquery bankTenderquery) {
@@ -100,7 +100,7 @@ public class BankTenderqueryController extends BaseController {
     /**
      * 获取标段信息查询详细信息
      */
-    @RequiresPermissions("bank:tenderquery:query")
+    // @RequiresPermissions("bank:tenderquery:query")
     @GetMapping(value = "/{tenderqueryid}")
     public AjaxResult getInfo(@PathVariable("tenderqueryid") String tenderqueryid) {
         return success(bankTenderqueryService.selectBankTenderqueryByTenderqueryid(tenderqueryid));
@@ -109,7 +109,7 @@ public class BankTenderqueryController extends BaseController {
     /**
      * 新增标段信息查询
      */
-    @RequiresPermissions("bank:tenderquery:add")
+    // @RequiresPermissions("bank:tenderquery:add")
     @Log(title = "标段信息查询", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankTenderquery bankTenderquery) {
@@ -120,7 +120,7 @@ public class BankTenderqueryController extends BaseController {
      * 修改标段信息查询
      * 同步银行数据
      */
-    @RequiresPermissions("bank:tenderquery:edit")
+    // @RequiresPermissions("bank:tenderquery:edit")
     @Log(title = "标段信息查询", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BankTenderquery bankTenderquery) {
@@ -234,7 +234,7 @@ public class BankTenderqueryController extends BaseController {
     /**
      * 删除标段信息查询
      */
-    @RequiresPermissions("bank:tenderquery:remove")
+    // @RequiresPermissions("bank:tenderquery:remove")
     @Log(title = "标段信息查询", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tenderqueryids}")
     public AjaxResult remove(@PathVariable String[] tenderqueryids) {

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankUncleardepositController.java

@@ -54,7 +54,7 @@ public class BankUncleardepositController extends BaseController {
     /**
      * 查询查询不明保证金明细列表
      */
-    @RequiresPermissions("bank:uncleardeposit:list")
+    // @RequiresPermissions("bank:uncleardeposit:list")
     @GetMapping("/list")
     public TableDataInfo list(BankUncleardeposit bankUncleardeposit) {
         startPage();
@@ -65,7 +65,7 @@ public class BankUncleardepositController extends BaseController {
     /**
      * 导出查询不明保证金明细列表
      */
-    @RequiresPermissions("bank:uncleardeposit:export")
+    // @RequiresPermissions("bank:uncleardeposit:export")
     @Log(title = "查询不明保证金明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BankUncleardeposit bankUncleardeposit) {
@@ -77,7 +77,7 @@ public class BankUncleardepositController extends BaseController {
     /**
      * 获取查询不明保证金明细详细信息
      */
-    @RequiresPermissions("bank:uncleardeposit:query")
+    // @RequiresPermissions("bank:uncleardeposit:query")
     @GetMapping(value = "/{uncleardepositid}")
     public AjaxResult getInfo(@PathVariable("uncleardepositid") String uncleardepositid) {
         return success(bankUncleardepositService.selectBankUncleardepositByUncleardepositid(uncleardepositid));
@@ -86,7 +86,7 @@ public class BankUncleardepositController extends BaseController {
     /**
      * 新增查询不明保证金明细
      */
-    @RequiresPermissions("bank:uncleardeposit:add")
+    // @RequiresPermissions("bank:uncleardeposit:add")
     @Log(title = "查询不明保证金明细", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankUncleardeposit bankUncleardeposit) {
@@ -122,7 +122,7 @@ public class BankUncleardepositController extends BaseController {
     /**
      * 修改查询不明保证金明细
      */
-    @RequiresPermissions("bank:uncleardeposit:edit")
+    // @RequiresPermissions("bank:uncleardeposit:edit")
     @Log(title = "查询不明保证金明细", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BankUncleardeposit bankUncleardeposit) {
@@ -204,7 +204,7 @@ public class BankUncleardepositController extends BaseController {
     /**
      * 删除查询不明保证金明细
      */
-    @RequiresPermissions("bank:uncleardeposit:remove")
+    // @RequiresPermissions("bank:uncleardeposit:remove")
     @Log(title = "查询不明保证金明细", businessType = BusinessType.DELETE)
     @DeleteMapping("/{uncleardepositids}")
     public AjaxResult remove(@PathVariable String[] uncleardepositids) {

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankUncleardepositrfndController.java

@@ -55,7 +55,7 @@ public class BankUncleardepositrfndController extends BaseController
     /**
      * 查询不明保证金退款申请列表
      */
-    @RequiresPermissions("bank:uncleardepositrfnd:list")
+    // @RequiresPermissions("bank:uncleardepositrfnd:list")
     @GetMapping("/list")
     public TableDataInfo list(BankUncleardepositrfnd bankUncleardepositrfnd)
     {
@@ -67,7 +67,7 @@ public class BankUncleardepositrfndController extends BaseController
     /**
      * 导出不明保证金退款申请列表
      */
-    @RequiresPermissions("bank:uncleardepositrfnd:export")
+    // @RequiresPermissions("bank:uncleardepositrfnd:export")
     @Log(title = "不明保证金退款申请", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BankUncleardepositrfnd bankUncleardepositrfnd)
@@ -80,7 +80,7 @@ public class BankUncleardepositrfndController extends BaseController
     /**
      * 获取不明保证金退款申请详细信息
      */
-    @RequiresPermissions("bank:uncleardepositrfnd:query")
+    // @RequiresPermissions("bank:uncleardepositrfnd:query")
     @GetMapping(value = "/{uncleardepositrfndid}")
     public AjaxResult getInfo(@PathVariable("uncleardepositrfndid") String uncleardepositrfndid)
     {
@@ -90,7 +90,7 @@ public class BankUncleardepositrfndController extends BaseController
     /**
      * 新增不明保证金退款申请
      */
-    @RequiresPermissions("bank:uncleardepositrfnd:add")
+    // @RequiresPermissions("bank:uncleardepositrfnd:add")
     @Log(title = "不明保证金退款申请", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BankUncleardepositrfnd bankUncleardepositrfnd)
@@ -122,7 +122,7 @@ public class BankUncleardepositrfndController extends BaseController
     /**
      * 修改不明保证金退款申请
      */
-    @RequiresPermissions("bank:uncleardepositrfnd:edit")
+    // @RequiresPermissions("bank:uncleardepositrfnd:edit")
     @Log(title = "不明保证金退款申请", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BankUncleardepositrfnd bankUncleardepositrfnd)
@@ -202,7 +202,7 @@ public class BankUncleardepositrfndController extends BaseController
     /**
      * 删除不明保证金退款申请
      */
-    @RequiresPermissions("bank:uncleardepositrfnd:remove")
+    // @RequiresPermissions("bank:uncleardepositrfnd:remove")
     @Log(title = "不明保证金退款申请", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{uncleardepositrfndids}")
     public AjaxResult remove(@PathVariable String[] uncleardepositrfndids)

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/materiel/controller/MastMaterielController.java

@@ -34,7 +34,7 @@ public class MastMaterielController extends BaseController
     /**
      * 查询物料组信息列表
      */
-//    @RequiresPermissions("mast:materiel:list")
+//    // @RequiresPermissions("mast:materiel:list")
     @GetMapping("/list")
     public AjaxResult list(MastMateriel mastMateriel)
     {
@@ -45,7 +45,7 @@ public class MastMaterielController extends BaseController
     /**
      * 导出物料组信息列表
      */
-    @RequiresPermissions("mast:materiel:export")
+    // @RequiresPermissions("mast:materiel:export")
     @Log(title = "物料组信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, MastMateriel mastMateriel)
@@ -58,7 +58,7 @@ public class MastMaterielController extends BaseController
     /**
      * 获取物料组信息详细信息
      */
-//    @RequiresPermissions("mast:materiel:query")
+//    // @RequiresPermissions("mast:materiel:query")
     @GetMapping(value = "/{materielId}")
     public AjaxResult getInfo(@PathVariable("materielId") Long materielId)
     {
@@ -79,7 +79,7 @@ public class MastMaterielController extends BaseController
     /**
      * 新增物料组信息
      */
-    @RequiresPermissions("mast:materiel:add")
+    // @RequiresPermissions("mast:materiel:add")
     @Log(title = "物料组信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody MastMateriel mastMateriel)
@@ -90,7 +90,7 @@ public class MastMaterielController extends BaseController
     /**
      * 修改物料组信息
      */
-    @RequiresPermissions("mast:materiel:edit")
+    // @RequiresPermissions("mast:materiel:edit")
     @Log(title = "物料组信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody MastMateriel mastMateriel)
@@ -101,7 +101,7 @@ public class MastMaterielController extends BaseController
     /**
      * 删除物料组信息
      */
-    @RequiresPermissions("mast:materiel:remove")
+    // @RequiresPermissions("mast:materiel:remove")
     @Log(title = "物料组信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{materielIds}")
     public AjaxResult remove(@PathVariable Long[] materielIds)
@@ -113,7 +113,7 @@ public class MastMaterielController extends BaseController
     /**
      * 获取物料组信息详细信息
      */
-//    @RequiresPermissions("mast:materiel:query")
+//    // @RequiresPermissions("mast:materiel:query")
     @InnerAuth
     @GetMapping(value = "/getMaterialTypeById")
     public MastMateriel getMaterialTypeById(@RequestParam("materielId") Long materielId)

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/project/controller/MastProjectController.java

@@ -78,7 +78,7 @@ public class MastProjectController extends BaseController {
     /**
      * 导出工程项目列表
      */
-    @RequiresPermissions("mast:project:export")
+    // @RequiresPermissions("mast:project:export")
     @Log(title = "工程项目", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, MastProject mastProject) {
@@ -92,7 +92,7 @@ public class MastProjectController extends BaseController {
     /**
      * 获取工程项目详细信息
      */
-    @RequiresPermissions("mast:project:query")
+    // @RequiresPermissions("mast:project:query")
     @GetMapping(value = "/{projId}")
     public AjaxResult getInfo(@PathVariable("projId") Long projId) {
         return success(mastProjectService.selectMastProjectByProjId(projId));
@@ -103,19 +103,27 @@ public class MastProjectController extends BaseController {
      */
 //    @RequiresRoles("purchaser")
     @RequiresRoles("operator")
-    @RequiresPermissions("mast:project:add")
+    // @RequiresPermissions("mast:project:add")
     @Log(title = "工程项目", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody MastProject mastProject) {
         Long l = remoteUserService.getDeptIdByDictValue(mastProject.getProjCompanyname(), SecurityConstants.INNER);
         mastProject.setOwnerDept(l);
+        MastProject item = new MastProject();
+        item.setProjCompanyname(mastProject.getProjCompanyname());
+        item.setProjYear(mastProject.getProjYear());
+        item.setOwnerDepts("("+l+")");
+        List<MastProject> mastProjects = mastProjectService.selectMastProjectList(item);
+        Integer res = mastProjects.size()+1;
+        String format = String.format("%04d",res);
+        mastProject.setProjNo(format);
         return toAjax(mastProjectService.insertMastProject(mastProject));
     }
 
     /**
      * 修改工程项目
      */
-    @RequiresPermissions("mast:project:edit")
+    // @RequiresPermissions("mast:project:edit")
     @Log(title = "工程项目", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody MastProject mastProject) {
@@ -125,7 +133,7 @@ public class MastProjectController extends BaseController {
     /**
      * 删除工程项目
      */
-    @RequiresPermissions("mast:project:remove")
+    // @RequiresPermissions("mast:project:remove")
     @Log(title = "工程项目", businessType = BusinessType.DELETE)
     @DeleteMapping("/{projIds}")
     public AjaxResult remove(@PathVariable Long[] projIds) {

ruoyi-modules/hh-ppm/src/main/java/com/hh/procure/controller/ComCodeRulesController.java

@@ -38,7 +38,7 @@ public class ComCodeRulesController extends BaseController
     /**
      * 查询【请填写功能名称】列表
      */
-    @RequiresPermissions("system:rules:list")
+    // @RequiresPermissions("system:rules:list")
     @GetMapping("/list")
     public TableDataInfo list(ComCodeRules comCodeRules)
     {
@@ -50,7 +50,7 @@ public class ComCodeRulesController extends BaseController
     /**
      * 导出【请填写功能名称】列表
      */
-    @RequiresPermissions("system:rules:export")
+    // @RequiresPermissions("system:rules:export")
     @Log(title = "编号规则", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ComCodeRules comCodeRules)
@@ -63,7 +63,7 @@ public class ComCodeRulesController extends BaseController
     /**
      * 获取【请填写功能名称】详细信息
      */
-    @RequiresPermissions("system:rules:query")
+    // @RequiresPermissions("system:rules:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -73,7 +73,7 @@ public class ComCodeRulesController extends BaseController
     /**
      * 新增【请填写功能名称】
      */
-    @RequiresPermissions("system:rules:add")
+    // @RequiresPermissions("system:rules:add")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ComCodeRules comCodeRules)
@@ -84,7 +84,7 @@ public class ComCodeRulesController extends BaseController
     /**
      * 修改【请填写功能名称】
      */
-    @RequiresPermissions("system:rules:edit")
+    // @RequiresPermissions("system:rules:edit")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ComCodeRules comCodeRules)
@@ -95,7 +95,7 @@ public class ComCodeRulesController extends BaseController
     /**
      * 删除【请填写功能名称】
      */
-    @RequiresPermissions("system:rules:remove")
+    // @RequiresPermissions("system:rules:remove")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-modules/hh-ppm/src/main/java/com/hh/procure/controller/ComPubAttachmentsController.java

@@ -35,7 +35,7 @@ public class ComPubAttachmentsController extends BaseController {
     /**
      * 查询公共附件列表
      */
-    @RequiresPermissions("system:attachments:list")
+    // @RequiresPermissions("system:attachments:list")
     @GetMapping("/list")
     public TableDataInfo list(ComPubAttachments comPubAttachments) {
         startPage();
@@ -46,7 +46,7 @@ public class ComPubAttachmentsController extends BaseController {
     /**
      * 导出公共附件列表
      */
-    @RequiresPermissions("system:attachments:export")
+    // @RequiresPermissions("system:attachments:export")
     @Log(title = "公共附件", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ComPubAttachments comPubAttachments) {
@@ -58,7 +58,7 @@ public class ComPubAttachmentsController extends BaseController {
     /**
      * 获取公共附件详细信息
      */
-    @RequiresPermissions("system:attachments:query")
+    // @RequiresPermissions("system:attachments:query")
     @GetMapping(value = "/{anId}")
     public AjaxResult getInfo(@PathVariable("anId") Integer anId) {
         return success(comPubAttachmentsService.selectComPubAttachmentsByAnId(anId));
@@ -67,7 +67,7 @@ public class ComPubAttachmentsController extends BaseController {
     /**
      * 新增公共附件
      */
-    @RequiresPermissions("system:attachments:add")
+    // @RequiresPermissions("system:attachments:add")
     @Log(title = "公共附件", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ComPubAttachments comPubAttachments) {
@@ -77,7 +77,7 @@ public class ComPubAttachmentsController extends BaseController {
     /**
      * 修改公共附件
      */
-    @RequiresPermissions("system:attachments:edit")
+    // @RequiresPermissions("system:attachments:edit")
     @Log(title = "公共附件", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ComPubAttachments comPubAttachments) {
@@ -87,14 +87,14 @@ public class ComPubAttachmentsController extends BaseController {
     /**
      * 删除公共附件
      */
-    @RequiresPermissions("system:attachments:remove")
+    // @RequiresPermissions("system:attachments:remove")
     @Log(title = "公共附件", businessType = BusinessType.DELETE)
     @DeleteMapping("/{anIds}")
     public AjaxResult remove(@PathVariable Integer[] anIds) {
         return toAjax(comPubAttachmentsService.deleteComPubAttachmentsByAnIds(anIds));
     }
 
-    @RequiresPermissions("system:attachments:query")
+    // @RequiresPermissions("system:attachments:query")
     @PostMapping("/selectedComPubAttamentsByAid")
     public AjaxResult selectedComPubAttamentsByAid(Integer aid) {
         return success(comPubAttachmentsService.selectedComPubAttamentsByAid(aid));

ruoyi-modules/hh-ppm/src/main/java/com/hh/procure/controller/PpmApprovalRecordController.java

@@ -37,7 +37,7 @@ public class PpmApprovalRecordController extends BaseController {
     /**
      * 查询审批记录列表
      */
-    @RequiresPermissions("system:record:list")
+    // @RequiresPermissions("system:record:list")
     @GetMapping("/list")
     public TableDataInfo list(PpmApprovalRecord ppmApprovalRecord) {
         System.out.println("ppmApprovalRecord:" + ppmApprovalRecord);
@@ -49,7 +49,7 @@ public class PpmApprovalRecordController extends BaseController {
     /**
      * 导出审批记录列表
      */
-    @RequiresPermissions("system:record:export")
+    // @RequiresPermissions("system:record:export")
     @Log(title = "审批记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PpmApprovalRecord ppmApprovalRecord) {
@@ -61,7 +61,7 @@ public class PpmApprovalRecordController extends BaseController {
     /**
      * 获取审批记录详细信息
      */
-    @RequiresPermissions("system:record:query")
+    // @RequiresPermissions("system:record:query")
     @GetMapping(value = "/{rid}")
     public AjaxResult getInfo(@PathVariable("rid") Integer rid) {
         return success(ppmApprovalRecordService.selectPpmApprovalRecordByRid(rid));
@@ -70,7 +70,7 @@ public class PpmApprovalRecordController extends BaseController {
     /**
      * 新增审批记录
      */
-    @RequiresPermissions("system:record:add")
+    // @RequiresPermissions("system:record:add")
     @Log(title = "审批记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody PpmApprovalRecord ppmApprovalRecord) {
@@ -80,7 +80,7 @@ public class PpmApprovalRecordController extends BaseController {
     /**
      * 修改审批记录
      */
-    @RequiresPermissions("system:record:edit")
+    // @RequiresPermissions("system:record:edit")
     @Log(title = "审批记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody PpmApprovalRecord ppmApprovalRecord) {
@@ -90,7 +90,7 @@ public class PpmApprovalRecordController extends BaseController {
     /**
      * 删除审批记录
      */
-    @RequiresPermissions("system:record:remove")
+    // @RequiresPermissions("system:record:remove")
     @Log(title = "审批记录", businessType = BusinessType.DELETE)
     @DeleteMapping("/{rids}")
     public AjaxResult remove(@PathVariable Integer[] rids) {

ruoyi-modules/hh-ppm/src/main/java/com/hh/procure/controller/PpmBudgetController.java

@@ -46,7 +46,7 @@ public class PpmBudgetController extends BaseController {
     /**
      * 查询预算列表
      */
-    @RequiresPermissions("system:budget:list")
+    // @RequiresPermissions("system:budget:list")
     @GetMapping("/list")
     public TableDataInfo list(PpmBudget ppmBudget) {
         startPage();
@@ -57,7 +57,7 @@ public class PpmBudgetController extends BaseController {
     /**
      * 导出预算列表
      */
-    @RequiresPermissions("system:budget:export")
+    // @RequiresPermissions("system:budget:export")
     @Log(title = "预算", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PpmBudget ppmBudget) {
@@ -69,7 +69,7 @@ public class PpmBudgetController extends BaseController {
     /**
      * 获取预算详细信息
      */
-    @RequiresPermissions("system:budget:query")
+    // @RequiresPermissions("system:budget:query")
     @GetMapping(value = "/{duId}")
     public AjaxResult getInfo(@PathVariable("duId") String duId) {
         return success(ppmBudgetService.selectPpmBudgetByDuId(duId));
@@ -78,7 +78,7 @@ public class PpmBudgetController extends BaseController {
     /**
      * 新增预算
      */
-    @RequiresPermissions("system:budget:add")
+    // @RequiresPermissions("system:budget:add")
     @Log(title = "预算", businessType = BusinessType.INSERT)
     @PostMapping
     @Transactional
@@ -95,7 +95,7 @@ public class PpmBudgetController extends BaseController {
     /**
      * 修改预算
      */
-    @RequiresPermissions("system:budget:edit")
+    // @RequiresPermissions("system:budget:edit")
     @Log(title = "预算", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody PpmBudget ppmBudget) {
@@ -105,14 +105,14 @@ public class PpmBudgetController extends BaseController {
     /**
      * 删除预算
      */
-    @RequiresPermissions("system:budget:remove")
+    // @RequiresPermissions("system:budget:remove")
     @Log(title = "预算", businessType = BusinessType.DELETE)
     @DeleteMapping("/{duIds}")
     public AjaxResult remove(@PathVariable String[] duIds) {
         return toAjax(ppmBudgetService.deletePpmBudgetByDuIds(duIds));
     }
 
-    @RequiresPermissions("system:budget:query")
+    // @RequiresPermissions("system:budget:query")
     @PostMapping("/BudgetBy")
     public AjaxResult selectPpmBudgetByAid(String aid) {
         return AjaxResult.success(ppmBudgetService.selectPpmBudgetByAid(aid));

ruoyi-modules/hh-ppm/src/main/java/com/hh/procure/controller/PpmDeviceController.java

@@ -37,7 +37,7 @@ public class PpmDeviceController extends BaseController {
     /**
      * 查询设备信息列表
      */
-    @RequiresPermissions("system:device:list")
+    // @RequiresPermissions("system:device:list")
     @GetMapping("/list")
     public TableDataInfo list(PpmDevice ppmDevice) {
         startPage();
@@ -49,7 +49,7 @@ public class PpmDeviceController extends BaseController {
     /**
      * 导出设备信息列表
      */
-    @RequiresPermissions("system:device:export")
+    // @RequiresPermissions("system:device:export")
     @Log(title = "设备信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PpmDevice ppmDevice) {
@@ -61,7 +61,7 @@ public class PpmDeviceController extends BaseController {
     /**
      * 获取设备信息详细信息
      */
-    @RequiresPermissions("system:device:query")
+    // @RequiresPermissions("system:device:query")
     @GetMapping(value = "/{tid}")
     public AjaxResult getInfo(@PathVariable("tid") String tid) {
         return success(ppmDeviceService.selectPpmDeviceByTid(tid));
@@ -70,7 +70,7 @@ public class PpmDeviceController extends BaseController {
     /**
      * 新增设备信息
      */
-    @RequiresPermissions("system:device:add")
+    // @RequiresPermissions("system:device:add")
     @Log(title = "设备信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody PpmDevice ppmDevice) {
@@ -80,7 +80,7 @@ public class PpmDeviceController extends BaseController {
     /**
      * 修改设备信息
      */
-    @RequiresPermissions("system:device:edit")
+    // @RequiresPermissions("system:device:edit")
     @Log(title = "设备信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody PpmDevice ppmDevice) {
@@ -90,7 +90,7 @@ public class PpmDeviceController extends BaseController {
     /**
      * 删除设备信息
      */
-    @RequiresPermissions("system:device:remove")
+    // @RequiresPermissions("system:device:remove")
     @Log(title = "设备信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tids}")
     public AjaxResult remove(@PathVariable String[] tids) {

ruoyi-modules/hh-ppm/src/main/java/com/hh/procure/controller/PpmFrameManagementController.java

@@ -38,7 +38,7 @@ public class PpmFrameManagementController extends BaseController
     /**
      * 查询框架协议管理列表
      */
-    @RequiresPermissions("system:management:list")
+    // @RequiresPermissions("system:management:list")
     @GetMapping("/list")
     public TableDataInfo list(PpmFrameManagement ppmFrameManagement)
     {
@@ -50,7 +50,7 @@ public class PpmFrameManagementController extends BaseController
     /**
      * 导出框架协议管理列表
      */
-    @RequiresPermissions("system:management:export")
+    // @RequiresPermissions("system:management:export")
     @Log(title = "框架协议管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PpmFrameManagement ppmFrameManagement)
@@ -63,7 +63,7 @@ public class PpmFrameManagementController extends BaseController
     /**
      * 获取框架协议管理详细信息
      */
-    @RequiresPermissions("system:management:query")
+    // @RequiresPermissions("system:management:query")
     @GetMapping(value = "/{oid}")
     public AjaxResult getInfo(@PathVariable("oid") Long oid)
     {
@@ -73,7 +73,7 @@ public class PpmFrameManagementController extends BaseController
     /**
      * 新增框架协议管理
      */
-    @RequiresPermissions("system:management:add")
+    // @RequiresPermissions("system:management:add")
     @Log(title = "框架协议管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody PpmFrameManagement ppmFrameManagement)
@@ -84,7 +84,7 @@ public class PpmFrameManagementController extends BaseController
     /**
      * 修改框架协议管理
      */
-    @RequiresPermissions("system:management:edit")
+    // @RequiresPermissions("system:management:edit")
     @Log(title = "框架协议管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody PpmFrameManagement ppmFrameManagement)
@@ -95,7 +95,7 @@ public class PpmFrameManagementController extends BaseController
     /**
      * 删除框架协议管理
      */
-    @RequiresPermissions("system:management:remove")
+    // @RequiresPermissions("system:management:remove")
     @Log(title = "框架协议管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{oids}")
     public AjaxResult remove(@PathVariable Long[] oids)

ruoyi-modules/hh-ppm/src/main/java/com/hh/procure/controller/PpmFramePlanController.java

@@ -51,7 +51,7 @@ public class PpmFramePlanController extends BaseController {
     /**
      * 查询框架计划列表
      */
-    @RequiresPermissions("system:plan:list")
+    // @RequiresPermissions("system:plan:list")
     @GetMapping("/list")
     public TableDataInfo list(PpmFramePlan ppmFramePlan) {
         startPage();
@@ -62,7 +62,7 @@ public class PpmFramePlanController extends BaseController {
     /**
      * 导出框架计划列表
      */
-    @RequiresPermissions("system:plan:export")
+    // @RequiresPermissions("system:plan:export")
     @Log(title = "框架计划", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PpmFramePlan ppmFramePlan) {
@@ -74,7 +74,7 @@ public class PpmFramePlanController extends BaseController {
     /**
      * 获取框架计划详细信息
      */
-    @RequiresPermissions("system:plan:query")
+    // @RequiresPermissions("system:plan:query")
     @GetMapping(value = "/{jhId}")
     public AjaxResult getInfo(@PathVariable("jhId") Long jhId) {
         return success(ppmFramePlanService.selectPpmFramePlanByJhId(jhId));
@@ -83,7 +83,7 @@ public class PpmFramePlanController extends BaseController {
     /**
      * 新增框架计划
      */
-    @RequiresPermissions("system:plan:add")
+    // @RequiresPermissions("system:plan:add")
     @Log(title = "框架计划", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody PpmFramePlan ppmFramePlan) {
@@ -93,7 +93,7 @@ public class PpmFramePlanController extends BaseController {
     /**
      * 修改框架计划
      */
-    @RequiresPermissions("system:plan:edit")
+    // @RequiresPermissions("system:plan:edit")
     @Log(title = "框架计划", businessType = BusinessType.UPDATE)
     @Transactional
     @PutMapping
@@ -117,7 +117,7 @@ public class PpmFramePlanController extends BaseController {
     /**
      * 删除框架计划
      */
-    @RequiresPermissions("system:plan:remove")
+    // @RequiresPermissions("system:plan:remove")
     @Log(title = "框架计划", businessType = BusinessType.DELETE)
     @DeleteMapping("/{jhIds}")
     public AjaxResult remove(@PathVariable Long[] jhIds) {

ruoyi-modules/hh-ppm/src/main/java/com/hh/procure/controller/PpmLineItemsController.java

@@ -38,7 +38,7 @@ public class PpmLineItemsController extends BaseController
     /**
      * 查询行项目列表
      */
-    @RequiresPermissions("system:items:list")
+    // @RequiresPermissions("system:items:list")
     @GetMapping("/list")
     public TableDataInfo list(PpmLineItems ppmLineItems)
     {
@@ -50,7 +50,7 @@ public class PpmLineItemsController extends BaseController
     /**
      * 导出行项目列表
      */
-    @RequiresPermissions("system:items:export")
+    // @RequiresPermissions("system:items:export")
     @Log(title = "行项目", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PpmLineItems ppmLineItems)
@@ -63,7 +63,7 @@ public class PpmLineItemsController extends BaseController
     /**
      * 获取行项目详细信息
      */
-    @RequiresPermissions("system:items:query")
+    // @RequiresPermissions("system:items:query")
     @GetMapping(value = "/{vid}")
     public AjaxResult getInfo(@PathVariable("vid") Integer vid)
     {
@@ -73,7 +73,7 @@ public class PpmLineItemsController extends BaseController
     /**
      * 新增行项目
      */
-    @RequiresPermissions("system:items:add")
+    // @RequiresPermissions("system:items:add")
     @Log(title = "行项目", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody PpmLineItems ppmLineItems)
@@ -84,7 +84,7 @@ public class PpmLineItemsController extends BaseController
     /**
      * 修改行项目
      */
-    @RequiresPermissions("system:items:edit")
+    // @RequiresPermissions("system:items:edit")
     @Log(title = "行项目", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody PpmLineItems ppmLineItems)
@@ -95,7 +95,7 @@ public class PpmLineItemsController extends BaseController
     /**
      * 删除行项目
      */
-    @RequiresPermissions("system:items:remove")
+    // @RequiresPermissions("system:items:remove")
     @Log(title = "行项目", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{vids}")
     public AjaxResult remove(@PathVariable Integer[] vids)

ruoyi-modules/hh-ppm/src/main/java/com/hh/procure/controller/PpmProcurementPlanController.java

@@ -56,7 +56,7 @@ public class PpmProcurementPlanController extends BaseController {
     /**
      * 查询采购计划列表
      */
-    @RequiresPermissions("system:plan:list")
+    // @RequiresPermissions("system:plan:list")
     @GetMapping("/list")
     public TableDataInfo list(PpmProcurementPlan ppmProcurementPlan) {
         startPage();
@@ -67,7 +67,7 @@ public class PpmProcurementPlanController extends BaseController {
     /**
      * 导出采购计划列表
      */
-    @RequiresPermissions("system:plan:export")
+    // @RequiresPermissions("system:plan:export")
     @Log(title = "采购计划", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PpmProcurementPlan ppmProcurementPlan) {
@@ -79,7 +79,7 @@ public class PpmProcurementPlanController extends BaseController {
     /**
      * 获取采购计划详细信息
      */
-    @RequiresPermissions("system:plan:query")
+    // @RequiresPermissions("system:plan:query")
     @GetMapping(value = "/{aid}")
     public AjaxResult getInfo(@PathVariable("aid") Integer aid) {
         return success(ppmProcurementPlanService.selectPpmProcurementPlanByAid(aid));
@@ -88,7 +88,7 @@ public class PpmProcurementPlanController extends BaseController {
     /**
      * 新增采购计划
      */
-    @RequiresPermissions("system:plan:add")
+    // @RequiresPermissions("system:plan:add")
     @Log(title = "采购计划", businessType = BusinessType.INSERT)
     @Transactional
     @PostMapping
@@ -107,7 +107,7 @@ public class PpmProcurementPlanController extends BaseController {
     /**
      * 修改采购计划
      */
-    @RequiresPermissions("system:plan:edit")
+    // @RequiresPermissions("system:plan:edit")
     @Log(title = "采购计划", businessType = BusinessType.UPDATE)
     @PutMapping
     @Transactional
@@ -143,7 +143,7 @@ public class PpmProcurementPlanController extends BaseController {
     /**
      * 删除采购计划
      */
-    @RequiresPermissions("system:plan:remove")
+    // @RequiresPermissions("system:plan:remove")
     @Log(title = "采购计划", businessType = BusinessType.DELETE)
     @Transactional
     @DeleteMapping("/{aids}")
@@ -153,13 +153,13 @@ public class PpmProcurementPlanController extends BaseController {
         return toAjax(ppmProcurementPlanService.deletePpmProcurementPlanByAids(aids));
     }
 
-    @RequiresPermissions("system:plan:query")
+    // @RequiresPermissions("system:plan:query")
     @GetMapping("/many")
     public AjaxResult selectProcurementPlanByIdForThreeTables(Integer aid) {
         return success(ppmProcurementPlanService.selectProcurementPlanByIdForThreeTables(aid));
     }
 
-    @RequiresPermissions("system:plan:query")
+    // @RequiresPermissions("system:plan:query")
     @GetMapping("/generatePlanID")
     public String generatePlanID() {
         ComCodeRules rules = comCodeRulesService.selectComCodeRulesByTargetForm(CodeRuleUtil.PROCUREMENTNAME);
@@ -169,7 +169,7 @@ public class PpmProcurementPlanController extends BaseController {
         return result.getCode();
     }
 
-    @RequiresPermissions("system:plan:edit")
+    // @RequiresPermissions("system:plan:edit")
     @PostMapping("/otherInformation")
     @Transactional
     public AjaxResult ModifyPlanAndOtherInformation(@RequestBody PpmProcurementPlan ppmProcurementPlan) {
@@ -242,7 +242,7 @@ public class PpmProcurementPlanController extends BaseController {
         return getDataTable(ppmProcurementPlanService.FindProcurementPlanBy(ppmProcurementPlan));
     }
 
-    @RequiresPermissions("system:plan:list")
+    // @RequiresPermissions("system:plan:list")
     @PostMapping("/PpmProcurementPlanAndComPubAttament")
     public TableDataInfo selectePpmProcurementPlanAndComPubAttamentByAid(@RequestBody PpmProcurementPlan ppmProcurementPlan) {
         System.out.println("执行了PpmProcurementPlanAndComPubAttament：" + ppmProcurementPlan);

ruoyi-modules/hh-procure/src/main/java/com/hh/procure/controller/ComCodeRulesController.java

@@ -31,7 +31,7 @@ public class ComCodeRulesController extends BaseController {
     /**
      * 查询【请填写功能名称】列表
      */
-    @RequiresPermissions("system:rules:list")
+    // @RequiresPermissions("system:rules:list")
     @GetMapping("/list")
     public TableDataInfo list(ComCodeRules comCodeRules) {
         startPage();
@@ -42,7 +42,7 @@ public class ComCodeRulesController extends BaseController {
     /**
      * 导出【请填写功能名称】列表
      */
-    @RequiresPermissions("system:rules:export")
+    // @RequiresPermissions("system:rules:export")
     @Log(title = "编号规则", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ComCodeRules comCodeRules) {
@@ -54,7 +54,7 @@ public class ComCodeRulesController extends BaseController {
     /**
      * 获取【请填写功能名称】详细信息
      */
-    @RequiresPermissions("system:rules:query")
+    // @RequiresPermissions("system:rules:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(comCodeRulesService.selectComCodeRulesById(id));
@@ -63,7 +63,7 @@ public class ComCodeRulesController extends BaseController {
     /**
      * 新增【请填写功能名称】
      */
-    @RequiresPermissions("system:rules:add")
+    // @RequiresPermissions("system:rules:add")
     @Log(title = "编号规则", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ComCodeRules comCodeRules) {
@@ -74,7 +74,7 @@ public class ComCodeRulesController extends BaseController {
     /**
      * 修改【请填写功能名称】
      */
-    @RequiresPermissions("system:rules:edit")
+    // @RequiresPermissions("system:rules:edit")
     @Log(title = "编号规则", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ComCodeRules comCodeRules) {
@@ -84,7 +84,7 @@ public class ComCodeRulesController extends BaseController {
     /**
      * 删除【请填写功能名称】
      */
-    @RequiresPermissions("system:rules:remove")
+    // @RequiresPermissions("system:rules:remove")
     @Log(title = "编号规则", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

ruoyi-modules/hh-procure/src/main/java/com/hh/procure/controller/ComPubAttachmentsController.java

@@ -35,7 +35,7 @@ public class ComPubAttachmentsController extends BaseController {
     /**
      * 查询公共附件列表
      */
-    @RequiresPermissions("system:attachments:list")
+    // @RequiresPermissions("system:attachments:list")
     @GetMapping("/list")
     public TableDataInfo list(ComPubAttachments comPubAttachments) {
         startPage();
@@ -46,7 +46,7 @@ public class ComPubAttachmentsController extends BaseController {
     /**
      * 导出公共附件列表
      */
-    @RequiresPermissions("system:attachments:export")
+    // @RequiresPermissions("system:attachments:export")
     @Log(title = "公共附件", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ComPubAttachments comPubAttachments) {
@@ -58,7 +58,7 @@ public class ComPubAttachmentsController extends BaseController {
     /**
      * 获取公共附件详细信息
      */
-    @RequiresPermissions("system:attachments:query")
+    // @RequiresPermissions("system:attachments:query")
     @GetMapping(value = "/{anId}")
     public AjaxResult getInfo(@PathVariable("anId") Integer anId) {
         return success(comPubAttachmentsService.selectComPubAttachmentsByAnId(anId));
@@ -67,7 +67,7 @@ public class ComPubAttachmentsController extends BaseController {
     /**
      * 新增公共附件
      */
-    @RequiresPermissions("system:attachments:add")
+    // @RequiresPermissions("system:attachments:add")
     @Log(title = "公共附件", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ComPubAttachments comPubAttachments) {
@@ -77,7 +77,7 @@ public class ComPubAttachmentsController extends BaseController {
     /**
      * 修改公共附件
      */
-    @RequiresPermissions("system:attachments:edit")
+    // @RequiresPermissions("system:attachments:edit")
     @Log(title = "公共附件", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ComPubAttachments comPubAttachments) {
@@ -87,14 +87,14 @@ public class ComPubAttachmentsController extends BaseController {
     /**
      * 删除公共附件
      */
-    @RequiresPermissions("system:attachments:remove")
+    // @RequiresPermissions("system:attachments:remove")
     @Log(title = "公共附件", businessType = BusinessType.DELETE)
     @DeleteMapping("/{anIds}")
     public AjaxResult remove(@PathVariable Integer[] anIds) {
         return toAjax(comPubAttachmentsService.deleteComPubAttachmentsByAnIds(anIds));
     }
 
-    @RequiresPermissions("system:attachments:list")
+    // @RequiresPermissions("system:attachments:list")
     @PostMapping("/selectedComPubAttamentsByAid")
     public AjaxResult selectedComPubAttamentsByAid(@RequestBody ComPubAttachments comPubAttachments) {
         return success(comPubAttachmentsService.selectedComPubAttamentsByAid(comPubAttachments));

ruoyi-modules/hh-procure/src/main/java/com/hh/procure/controller/PpmApprovalRecordController.java

@@ -31,7 +31,7 @@ public class PpmApprovalRecordController extends BaseController {
     /**
      * 查询审批记录列表
      */
-    @RequiresPermissions("system:record:list")
+    // @RequiresPermissions("system:record:list")
     @GetMapping("/list")
     public TableDataInfo list(PpmApprovalRecord ppmApprovalRecord) {
         System.out.println("ppmApprovalRecord:" + ppmApprovalRecord);
@@ -43,7 +43,7 @@ public class PpmApprovalRecordController extends BaseController {
     /**
      * 导出审批记录列表
      */
-    @RequiresPermissions("system:record:export")
+    // @RequiresPermissions("system:record:export")
     @Log(title = "审批记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PpmApprovalRecord ppmApprovalRecord) {
@@ -55,7 +55,7 @@ public class PpmApprovalRecordController extends BaseController {
     /**
      * 获取审批记录详细信息
      */
-    @RequiresPermissions("system:record:query")
+    // @RequiresPermissions("system:record:query")
     @GetMapping(value = "/{rid}")
     public AjaxResult getInfo(@PathVariable("rid") Integer rid) {
         return success(ppmApprovalRecordService.selectPpmApprovalRecordByRid(rid));
@@ -74,7 +74,7 @@ public class PpmApprovalRecordController extends BaseController {
      * 修改审批记录
      */
     @InnerAuth
-    @RequiresPermissions("system:record:edit")
+    // @RequiresPermissions("system:record:edit")
     @Log(title = "审批记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody PpmApprovalRecord ppmApprovalRecord) {
@@ -84,7 +84,7 @@ public class PpmApprovalRecordController extends BaseController {
     /**
      * 删除审批记录
      */
-    @RequiresPermissions("system:record:remove")
+    // @RequiresPermissions("system:record:remove")
     @Log(title = "审批记录", businessType = BusinessType.DELETE)
     @DeleteMapping("/{rids}")
     public AjaxResult remove(@PathVariable Integer[] rids) {

ruoyi-modules/hh-procure/src/main/java/com/hh/procure/controller/PpmBudgetController.java

@@ -39,7 +39,7 @@ public class PpmBudgetController extends BaseController {
     /**
      * 查询预算列表
      */
-    @RequiresPermissions("system:budget:list")
+    // @RequiresPermissions("system:budget:list")
     @GetMapping("/list")
     public TableDataInfo list(PpmBudget ppmBudget) {
         startPage();
@@ -50,7 +50,7 @@ public class PpmBudgetController extends BaseController {
     /**
      * 导出预算列表
      */
-    @RequiresPermissions("system:budget:export")
+    // @RequiresPermissions("system:budget:export")
     @Log(title = "预算", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PpmBudget ppmBudget) {
@@ -62,7 +62,7 @@ public class PpmBudgetController extends BaseController {
     /**
      * 获取预算详细信息
      */
-    @RequiresPermissions("system:budget:query")
+    // @RequiresPermissions("system:budget:query")
     @GetMapping(value = "/{duId}")
     public AjaxResult getInfo(@PathVariable("duId") String duId) {
         return success(ppmBudgetService.selectPpmBudgetByDuId(duId));
@@ -71,7 +71,7 @@ public class PpmBudgetController extends BaseController {
     /**
      * 新增预算
      */
-    @RequiresPermissions("system:budget:add")
+    // @RequiresPermissions("system:budget:add")
     @Log(title = "预算", businessType = BusinessType.INSERT)
     @PostMapping
     @Transactional
@@ -88,7 +88,7 @@ public class PpmBudgetController extends BaseController {
     /**
      * 修改预算
      */
-    @RequiresPermissions("system:budget:edit")
+    // @RequiresPermissions("system:budget:edit")
     @Log(title = "预算", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody PpmBudget ppmBudget) {
@@ -98,14 +98,14 @@ public class PpmBudgetController extends BaseController {
     /**
      * 删除预算
      */
-    @RequiresPermissions("system:budget:remove")
+    // @RequiresPermissions("system:budget:remove")
     @Log(title = "预算", businessType = BusinessType.DELETE)
     @DeleteMapping("/{duIds}")
     public AjaxResult remove(@PathVariable String[] duIds) {
         return toAjax(ppmBudgetService.deletePpmBudgetByDuIds(duIds));
     }
 
-    @RequiresPermissions("system:budget:query")
+    // @RequiresPermissions("system:budget:query")
     @PostMapping("/BudgetBy")
     public AjaxResult selectPpmBudgetByAid(String aid) {
         return AjaxResult.success(ppmBudgetService.selectPpmBudgetByAid(aid));

ruoyi-modules/hh-procure/src/main/java/com/hh/procure/controller/PpmDeviceController.java

@@ -30,7 +30,7 @@ public class PpmDeviceController extends BaseController {
     /**
      * 查询设备信息列表
      */
-    @RequiresPermissions("system:device:list")
+    // @RequiresPermissions("system:device:list")
     @GetMapping("/list")
     public TableDataInfo list(PpmDevice ppmDevice) {
         startPage();
@@ -41,7 +41,7 @@ public class PpmDeviceController extends BaseController {
     /**
      * 导出设备信息列表
      */
-    @RequiresPermissions("system:device:export")
+    // @RequiresPermissions("system:device:export")
     @Log(title = "设备信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PpmDevice ppmDevice) {
@@ -53,7 +53,7 @@ public class PpmDeviceController extends BaseController {
     /**
      * 获取设备信息详细信息
      */
-    @RequiresPermissions("system:device:query")
+    // @RequiresPermissions("system:device:query")
     @GetMapping(value = "/{tid}")
     public AjaxResult getInfo(@PathVariable("tid") String tid) {
         return success(ppmDeviceService.selectPpmDeviceByTid(tid));
@@ -62,7 +62,7 @@ public class PpmDeviceController extends BaseController {
     /**
      * 新增设备信息
      */
-    @RequiresPermissions("system:device:add")
+    // @RequiresPermissions("system:device:add")
     @Log(title = "设备信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody PpmDevice ppmDevice) {
@@ -72,7 +72,7 @@ public class PpmDeviceController extends BaseController {
     /**
      * 修改设备信息
      */
-    @RequiresPermissions("system:device:edit")
+    // @RequiresPermissions("system:device:edit")
     @Log(title = "设备信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody PpmDevice ppmDevice) {
@@ -82,7 +82,7 @@ public class PpmDeviceController extends BaseController {
     /**
      * 删除设备信息
      */
-    @RequiresPermissions("system:device:remove")
+    // @RequiresPermissions("system:device:remove")
     @Log(title = "设备信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tids}")
     public AjaxResult remove(@PathVariable String[] tids) {

ruoyi-modules/hh-procure/src/main/java/com/hh/procure/controller/PpmFramePlanController.java

@@ -49,7 +49,7 @@ public class PpmFramePlanController extends BaseController {
     /**
      * 查询框架计划列表
      */
-    @RequiresPermissions("system:plan:list")
+    // @RequiresPermissions("system:plan:list")
     @GetMapping("/list")
     public TableDataInfo list(PpmFramePlan ppmFramePlan) {
         startPage();
@@ -60,7 +60,7 @@ public class PpmFramePlanController extends BaseController {
     /**
      * 导出框架计划列表
      */
-    @RequiresPermissions("system:plan:export")
+    // @RequiresPermissions("system:plan:export")
     @Log(title = "框架计划", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PpmFramePlan ppmFramePlan) {
@@ -72,7 +72,7 @@ public class PpmFramePlanController extends BaseController {
     /**
      * 获取框架计划详细信息
      */
-    @RequiresPermissions("system:plan:query")
+    // @RequiresPermissions("system:plan:query")
     @GetMapping(value = "/{jhId}")
     public AjaxResult getInfo(@PathVariable("jhId") Long jhId) {
         return success(ppmFramePlanService.selectPpmFramePlanByJhId(jhId));
@@ -81,7 +81,7 @@ public class PpmFramePlanController extends BaseController {
     /**
      * 新增框架计划
      */
-    @RequiresPermissions("system:plan:add")
+    // @RequiresPermissions("system:plan:add")
     @Log(title = "框架计划", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody PpmFramePlan ppmFramePlan) {
@@ -92,7 +92,7 @@ public class PpmFramePlanController extends BaseController {
     /**
      * 修改框架计划
      */
-    @RequiresPermissions("system:plan:edit")
+    // @RequiresPermissions("system:plan:edit")
     @Log(title = "框架计划", businessType = BusinessType.UPDATE)
     @Transactional
     @PutMapping
@@ -116,7 +116,7 @@ public class PpmFramePlanController extends BaseController {
     /**
      * 删除框架计划
      */
-    @RequiresPermissions("system:plan:remove")
+    // @RequiresPermissions("system:plan:remove")
     @Log(title = "框架计划", businessType = BusinessType.DELETE)
     @DeleteMapping("/{jhIds}")
     public AjaxResult remove(@PathVariable Long[] jhIds) {

ruoyi-modules/hh-procure/src/main/java/com/hh/procure/controller/PpmLineItemsController.java

@@ -31,7 +31,7 @@ public class PpmLineItemsController extends BaseController
     /**
      * 查询行项目列表
      */
-    @RequiresPermissions("system:items:list")
+    // @RequiresPermissions("system:items:list")
     @GetMapping("/list")
     public TableDataInfo list(PpmLineItems ppmLineItems)
     {
@@ -43,7 +43,7 @@ public class PpmLineItemsController extends BaseController
     /**
      * 导出行项目列表
      */
-    @RequiresPermissions("system:items:export")
+    // @RequiresPermissions("system:items:export")
     @Log(title = "行项目", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PpmLineItems ppmLineItems)
@@ -56,7 +56,7 @@ public class PpmLineItemsController extends BaseController
     /**
      * 获取行项目详细信息
      */
-    @RequiresPermissions("system:items:query")
+    // @RequiresPermissions("system:items:query")
     @GetMapping(value = "/{vid}")
     public AjaxResult getInfo(@PathVariable("vid") Integer vid)
     {
@@ -66,7 +66,7 @@ public class PpmLineItemsController extends BaseController
     /**
      * 新增行项目
      */
-    @RequiresPermissions("system:items:add")
+    // @RequiresPermissions("system:items:add")
     @Log(title = "行项目", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody PpmLineItems ppmLineItems)
@@ -77,7 +77,7 @@ public class PpmLineItemsController extends BaseController
     /**
      * 修改行项目
      */
-    @RequiresPermissions("system:items:edit")
+    // @RequiresPermissions("system:items:edit")
     @Log(title = "行项目", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody PpmLineItems ppmLineItems)
@@ -88,7 +88,7 @@ public class PpmLineItemsController extends BaseController
     /**
      * 删除行项目
      */
-    @RequiresPermissions("system:items:remove")
+    // @RequiresPermissions("system:items:remove")
     @Log(title = "行项目", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{vids}")
     public AjaxResult remove(@PathVariable Integer[] vids)

ruoyi-modules/hh-procure/src/main/java/com/hh/procure/controller/PpmProcurementDetailController.java

@@ -47,7 +47,7 @@ public class PpmProcurementDetailController extends BaseController
     /**
      * 查询采购明细列表
      */
-    @RequiresPermissions("procure:detail:list")
+    // @RequiresPermissions("procure:detail:list")
     @GetMapping("/list")
     public TableDataInfo list(PpmProcurementDetail ppmProcurementDetail)
     {
@@ -59,7 +59,7 @@ public class PpmProcurementDetailController extends BaseController
     /**
      * 导出采购明细列表
      */
-    @RequiresPermissions("procure:detail:export")
+    // @RequiresPermissions("procure:detail:export")
     @Log(title = "采购明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PpmProcurementDetail ppmProcurementDetail)
@@ -72,7 +72,7 @@ public class PpmProcurementDetailController extends BaseController
     /**
      * 获取采购明细详细信息
      */
-//    @RequiresPermissions("procure:detail:query")
+//    // @RequiresPermissions("procure:detail:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -93,7 +93,7 @@ public class PpmProcurementDetailController extends BaseController
     /**
      * 新增采购明细
      */
-    @RequiresPermissions("procure:detail:add")
+    // @RequiresPermissions("procure:detail:add")
     @Log(title = "采购明细", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody PpmProcurementDetail ppmProcurementDetail)
@@ -104,7 +104,7 @@ public class PpmProcurementDetailController extends BaseController
     /**
      * 修改采购明细
      */
-    @RequiresPermissions("procure:detail:edit")
+    // @RequiresPermissions("procure:detail:edit")
     @Log(title = "采购明细", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody PpmProcurementDetail ppmProcurementDetail)
@@ -115,7 +115,7 @@ public class PpmProcurementDetailController extends BaseController
     /**
      * 删除采购明细
      */
-    @RequiresPermissions("procure:detail:remove")
+    // @RequiresPermissions("procure:detail:remove")
     @Log(title = "采购明细", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-modules/hh-procure/src/main/java/com/hh/procure/controller/PpmProcurementPlanController.java

@@ -79,7 +79,7 @@ public class PpmProcurementPlanController extends BaseController {
     /**
      * 查询采购计划列表
      */
-    @RequiresPermissions("system:plan:list")
+    // @RequiresPermissions("system:plan:list")
     @GetMapping("/list")
     public TableDataInfo list(PpmProcurementPlan ppmProcurementPlan) {
         startPage();
@@ -113,7 +113,7 @@ public class PpmProcurementPlanController extends BaseController {
     /**
      * 查询采购计划列表
      */
-    @RequiresPermissions("system:plan:list")
+    // @RequiresPermissions("system:plan:list")
     @GetMapping("/getStopPlan")
     public TableDataInfo getStopPlan(PpmProcurementPlan ppmProcurementPlan) {
         startPage();
@@ -143,7 +143,7 @@ public class PpmProcurementPlanController extends BaseController {
     /**
      * 导出采购计划列表
      */
-    @RequiresPermissions("system:plan:export")
+    // @RequiresPermissions("system:plan:export")
     @Log(title = "采购计划", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PpmProcurementPlan ppmProcurementPlan) {
@@ -156,7 +156,7 @@ public class PpmProcurementPlanController extends BaseController {
     /**
      * 获取采购计划详细信息
      */
-//    @RequiresPermissions("system:plan:query")
+//    // @RequiresPermissions("system:plan:query")
     @GetMapping(value = "/{aid}")
     public AjaxResult getInfo(@PathVariable("aid") Integer aid) {
         Map<Long, String> companies = remoteUserService.getCompanies(SecurityConstants.INNER);
@@ -168,7 +168,7 @@ public class PpmProcurementPlanController extends BaseController {
     /**
      * 新增采购计划
      */
-    @RequiresPermissions("system:plan:add")
+    // @RequiresPermissions("system:plan:add")
     @Log(title = "采购计划", businessType = BusinessType.INSERT)
     @Transactional
     @PostMapping
@@ -206,7 +206,7 @@ public class PpmProcurementPlanController extends BaseController {
     /**
      * 修改采购计划
      */
-//    @RequiresPermissions("system:plan:edit")
+//    // @RequiresPermissions("system:plan:edit")
     @Log(title = "采购计划", businessType = BusinessType.UPDATE)
     @PutMapping("/edit")
     @Transactional
@@ -235,7 +235,7 @@ public class PpmProcurementPlanController extends BaseController {
     /**
      * 修改采购计划状态
      */
-//    @RequiresPermissions("system:plan:edit")
+//    // @RequiresPermissions("system:plan:edit")
     @Log(title = "采购计划状态", businessType = BusinessType.UPDATE)
     @PutMapping
     @Transactional
@@ -272,7 +272,7 @@ public class PpmProcurementPlanController extends BaseController {
     /**
      * 申请终止采购计划/ 申请变更
      */
-//    @RequiresPermissions("system:plan:edit")
+//    // @RequiresPermissions("system:plan:edit")
     @Log(title = "申请终止采购计划", businessType = BusinessType.UPDATE)
     @PutMapping("/editStopPlan")
     @Transactional
@@ -343,13 +343,13 @@ public class PpmProcurementPlanController extends BaseController {
     }
 
 
-    @RequiresPermissions("system:attachments:list")
+    // @RequiresPermissions("system:attachments:list")
     @GetMapping("/many")
     public AjaxResult selectProcurementPlanByIdForThreeTables(Integer aid) {
         return success(ppmProcurementPlanService.selectProcurementPlanByIdForThreeTables(aid));
     }
 
-    @RequiresPermissions("system:plan:query")
+    // @RequiresPermissions("system:plan:query")
     @GetMapping("/generatePlanID")
     public String generatePlanID() {
         ComCodeRules rules = comCodeRulesService.selectComCodeRulesByTargetForm(CodeRuleUtil.PROCUREMENTNAME);
@@ -359,7 +359,7 @@ public class PpmProcurementPlanController extends BaseController {
         return result.getCode();
     }
 
-    @RequiresPermissions("system:plan:edit")
+    // @RequiresPermissions("system:plan:edit")
     @PostMapping("/otherInformation")
     @Transactional
     public AjaxResult ModifyPlanAndOtherInformation(@RequestBody PpmProcurementPlan ppmProcurementPlan) {
@@ -464,7 +464,7 @@ public class PpmProcurementPlanController extends BaseController {
         return getDataTable(list);
     }
 
-    @RequiresPermissions("system:plan:list")
+    // @RequiresPermissions("system:plan:list")
     @GetMapping("/PpmProcurementPlanAndComPubAttament")
     public TableDataInfo selectePpmProcurementPlanAndComPubAttamentByAid(PpmProcurementPlan ppmProcurementPlan) {
 //        System.out.println("执行了PpmProcurementPlanAndComPubAttament：" + ppmProcurementPlan);
@@ -481,7 +481,7 @@ public class PpmProcurementPlanController extends BaseController {
         return ppmProcurementPlanService.selectPpmpProcurementCount(ppmProcurementPlan);
     }
 
-    @RequiresPermissions
+    // @RequiresPermissions
     @PostMapping("/selectContractCount")
     public R selectContractCount() {
         return R.ok(ppmProcurementPlanService.selectContractCount());

ruoyi-modules/hh-procure/src/main/java/com/hh/procure/controller/PpmProcurementProfileController.java

@@ -31,7 +31,7 @@ public class PpmProcurementProfileController extends BaseController
     /**
      * 查询采购概况列表
      */
-    @RequiresPermissions("procure:profile:list")
+    // @RequiresPermissions("procure:profile:list")
     @GetMapping("/list")
     public TableDataInfo list(PpmProcurementProfile ppmProcurementProfile)
     {
@@ -43,7 +43,7 @@ public class PpmProcurementProfileController extends BaseController
     /**
      * 导出采购概况列表
      */
-    @RequiresPermissions("procure:profile:export")
+    // @RequiresPermissions("procure:profile:export")
     @Log(title = "采购概况", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PpmProcurementProfile ppmProcurementProfile)
@@ -56,7 +56,7 @@ public class PpmProcurementProfileController extends BaseController
     /**
      * 获取采购概况详细信息
      */
-    @RequiresPermissions("procure:profile:query")
+    // @RequiresPermissions("procure:profile:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -66,7 +66,7 @@ public class PpmProcurementProfileController extends BaseController
     /**
      * 获取采购概况详细信息
      */
-//    @RequiresPermissions("procure:profile:query")
+//    // @RequiresPermissions("procure:profile:query")
     @GetMapping(value = "/profile")
     public AjaxResult getProfile(@RequestParam("aid") Long aid)
     {
@@ -76,7 +76,7 @@ public class PpmProcurementProfileController extends BaseController
     /**
      * 新增采购概况
      */
-    @RequiresPermissions("procure:profile:add")
+    // @RequiresPermissions("procure:profile:add")
     @Log(title = "采购概况", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody PpmProcurementProfile ppmProcurementProfile)
@@ -87,7 +87,7 @@ public class PpmProcurementProfileController extends BaseController
     /**
      * 修改采购概况
      */
-    @RequiresPermissions("procure:profile:edit")
+    // @RequiresPermissions("procure:profile:edit")
     @Log(title = "采购概况", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody PpmProcurementProfile ppmProcurementProfile)
@@ -98,7 +98,7 @@ public class PpmProcurementProfileController extends BaseController
     /**
      * 删除采购概况
      */
-    @RequiresPermissions("procure:profile:remove")
+    // @RequiresPermissions("procure:profile:remove")
     @Log(title = "采购概况", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java

@@ -46,7 +46,7 @@ public class GenController extends BaseController
     /**
      * 查询代码生成列表
      */
-    @RequiresPermissions("tool:gen:list")
+    // @RequiresPermissions("tool:gen:list")
     @GetMapping("/list")
     public TableDataInfo genList(GenTable genTable)
     {
@@ -58,7 +58,7 @@ public class GenController extends BaseController
     /**
      * 修改代码生成业务
      */
-    @RequiresPermissions("tool:gen:query")
+    // @RequiresPermissions("tool:gen:query")
     @GetMapping(value = "/{tableId}")
     public AjaxResult getInfo(@PathVariable Long tableId)
     {
@@ -75,7 +75,7 @@ public class GenController extends BaseController
     /**
      * 查询数据库列表
      */
-    @RequiresPermissions("tool:gen:list")
+    // @RequiresPermissions("tool:gen:list")
     @GetMapping("/db/list")
     public TableDataInfo dataList(GenTable genTable)
     {
@@ -100,7 +100,7 @@ public class GenController extends BaseController
     /**
      * 导入表结构（保存）
      */
-    @RequiresPermissions("tool:gen:import")
+    // @RequiresPermissions("tool:gen:import")
     @Log(title = "代码生成", businessType = BusinessType.IMPORT)
     @PostMapping("/importTable")
     public AjaxResult importTableSave(String tables)
@@ -115,7 +115,7 @@ public class GenController extends BaseController
     /**
      * 修改保存代码生成业务
      */
-    @RequiresPermissions("tool:gen:edit")
+    // @RequiresPermissions("tool:gen:edit")
     @Log(title = "代码生成", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
@@ -128,7 +128,7 @@ public class GenController extends BaseController
     /**
      * 删除代码生成
      */
-    @RequiresPermissions("tool:gen:remove")
+    // @RequiresPermissions("tool:gen:remove")
     @Log(title = "代码生成", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tableIds}")
     public AjaxResult remove(@PathVariable Long[] tableIds)
@@ -140,7 +140,7 @@ public class GenController extends BaseController
     /**
      * 预览代码
      */
-    @RequiresPermissions("tool:gen:preview")
+    // @RequiresPermissions("tool:gen:preview")
     @GetMapping("/preview/{tableId}")
     public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
     {
@@ -151,7 +151,7 @@ public class GenController extends BaseController
     /**
      * 生成代码（下载方式）
      */
-    @RequiresPermissions("tool:gen:code")
+    // @RequiresPermissions("tool:gen:code")
     @Log(title = "代码生成", businessType = BusinessType.GENCODE)
     @GetMapping("/download/{tableName}")
     public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
@@ -163,7 +163,7 @@ public class GenController extends BaseController
     /**
      * 生成代码（自定义路径）
      */
-    @RequiresPermissions("tool:gen:code")
+    // @RequiresPermissions("tool:gen:code")
     @Log(title = "代码生成", businessType = BusinessType.GENCODE)
     @GetMapping("/genCode/{tableName}")
     public AjaxResult genCode(@PathVariable("tableName") String tableName)
@@ -175,7 +175,7 @@ public class GenController extends BaseController
     /**
      * 同步数据库
      */
-    @RequiresPermissions("tool:gen:edit")
+    // @RequiresPermissions("tool:gen:edit")
     @Log(title = "代码生成", businessType = BusinessType.UPDATE)
     @GetMapping("/synchDb/{tableName}")
     public AjaxResult synchDb(@PathVariable("tableName") String tableName)
@@ -187,7 +187,7 @@ public class GenController extends BaseController
     /**
      * 批量生成代码
      */
-    @RequiresPermissions("tool:gen:code")
+    // @RequiresPermissions("tool:gen:code")
     @Log(title = "代码生成", businessType = BusinessType.GENCODE)
     @GetMapping("/batchGenCode")
     public void batchGenCode(HttpServletResponse response, String tables) throws IOException

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm

@@ -41,7 +41,7 @@ public class ${ClassName}Controller extends BaseController
     /**
      * 查询${functionName}列表
      */
-    @RequiresPermissions("${permissionPrefix}:list")
+    // @RequiresPermissions("${permissionPrefix}:list")
     @GetMapping("/list")
 #if($table.crud || $table.sub)
     public TableDataInfo list(${ClassName} ${className})
@@ -61,7 +61,7 @@ public class ${ClassName}Controller extends BaseController
     /**
      * 导出${functionName}列表
      */
-    @RequiresPermissions("${permissionPrefix}:export")
+    // @RequiresPermissions("${permissionPrefix}:export")
     @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ${ClassName} ${className})
@@ -74,7 +74,7 @@ public class ${ClassName}Controller extends BaseController
     /**
      * 获取${functionName}详细信息
      */
-    @RequiresPermissions("${permissionPrefix}:query")
+    // @RequiresPermissions("${permissionPrefix}:query")
     @GetMapping(value = "/{${pkColumn.javaField}}")
     public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
     {
@@ -84,7 +84,7 @@ public class ${ClassName}Controller extends BaseController
     /**
      * 新增${functionName}
      */
-    @RequiresPermissions("${permissionPrefix}:add")
+    // @RequiresPermissions("${permissionPrefix}:add")
     @Log(title = "${functionName}", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ${ClassName} ${className})
@@ -95,7 +95,7 @@ public class ${ClassName}Controller extends BaseController
     /**
      * 修改${functionName}
      */
-    @RequiresPermissions("${permissionPrefix}:edit")
+    // @RequiresPermissions("${permissionPrefix}:edit")
     @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ${ClassName} ${className})
@@ -106,7 +106,7 @@ public class ${ClassName}Controller extends BaseController
     /**
      * 删除${functionName}
      */
-    @RequiresPermissions("${permissionPrefix}:remove")
+    // @RequiresPermissions("${permissionPrefix}:remove")
     @Log(title = "${functionName}", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{${pkColumn.javaField}s}")
     public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java

@@ -43,7 +43,7 @@ public class SysJobController extends BaseController
     /**
      * 查询定时任务列表
      */
-    @RequiresPermissions("monitor:job:list")
+    // @RequiresPermissions("monitor:job:list")
     @GetMapping("/list")
     public TableDataInfo list(SysJob sysJob)
     {
@@ -55,7 +55,7 @@ public class SysJobController extends BaseController
     /**
      * 导出定时任务列表
      */
-    @RequiresPermissions("monitor:job:export")
+    // @RequiresPermissions("monitor:job:export")
     @Log(title = "定时任务", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysJob sysJob)
@@ -68,7 +68,7 @@ public class SysJobController extends BaseController
     /**
      * 获取定时任务详细信息
      */
-    @RequiresPermissions("monitor:job:query")
+    // @RequiresPermissions("monitor:job:query")
     @GetMapping(value = "/{jobId}")
     public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
     {
@@ -78,7 +78,7 @@ public class SysJobController extends BaseController
     /**
      * 新增定时任务
      */
-    @RequiresPermissions("monitor:job:add")
+    // @RequiresPermissions("monitor:job:add")
     @Log(title = "定时任务", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
@@ -114,7 +114,7 @@ public class SysJobController extends BaseController
     /**
      * 修改定时任务
      */
-    @RequiresPermissions("monitor:job:edit")
+    // @RequiresPermissions("monitor:job:edit")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
@@ -150,7 +150,7 @@ public class SysJobController extends BaseController
     /**
      * 定时任务状态修改
      */
-    @RequiresPermissions("monitor:job:changeStatus")
+    // @RequiresPermissions("monitor:job:changeStatus")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
@@ -163,7 +163,7 @@ public class SysJobController extends BaseController
     /**
      * 定时任务立即执行一次
      */
-    @RequiresPermissions("monitor:job:changeStatus")
+    // @RequiresPermissions("monitor:job:changeStatus")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     @PutMapping("/run")
     public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
@@ -175,7 +175,7 @@ public class SysJobController extends BaseController
     /**
      * 删除定时任务
      */
-    @RequiresPermissions("monitor:job:remove")
+    // @RequiresPermissions("monitor:job:remove")
     @Log(title = "定时任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{jobIds}")
     public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java

@@ -34,7 +34,7 @@ public class SysJobLogController extends BaseController
     /**
      * 查询定时任务调度日志列表
      */
-    @RequiresPermissions("monitor:job:list")
+    // @RequiresPermissions("monitor:job:list")
     @GetMapping("/list")
     public TableDataInfo list(SysJobLog sysJobLog)
     {
@@ -46,7 +46,7 @@ public class SysJobLogController extends BaseController
     /**
      * 导出定时任务调度日志列表
      */
-    @RequiresPermissions("monitor:job:export")
+    // @RequiresPermissions("monitor:job:export")
     @Log(title = "任务调度日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysJobLog sysJobLog)
@@ -59,7 +59,7 @@ public class SysJobLogController extends BaseController
     /**
      * 根据调度编号获取详细信息
      */
-    @RequiresPermissions("monitor:job:query")
+    // @RequiresPermissions("monitor:job:query")
     @GetMapping(value = "/{jobLogId}")
     public AjaxResult getInfo(@PathVariable Long jobLogId)
     {
@@ -69,7 +69,7 @@ public class SysJobLogController extends BaseController
     /**
      * 删除定时任务调度日志
      */
-    @RequiresPermissions("monitor:job:remove")
+    // @RequiresPermissions("monitor:job:remove")
     @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{jobLogIds}")
     public AjaxResult remove(@PathVariable Long[] jobLogIds)
@@ -80,7 +80,7 @@ public class SysJobLogController extends BaseController
     /**
      * 清空定时任务调度日志
      */
-    @RequiresPermissions("monitor:job:remove")
+    // @RequiresPermissions("monitor:job:remove")
     @Log(title = "调度日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
     public AjaxResult clean()

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java

@@ -38,7 +38,7 @@ public class SysConfigController extends BaseController
     /**
      * 获取参数配置列表
      */
-    @RequiresPermissions("system:config:list")
+    // @RequiresPermissions("system:config:list")
     @GetMapping("/list")
     public TableDataInfo list(SysConfig config)
     {
@@ -48,7 +48,7 @@ public class SysConfigController extends BaseController
     }
 
     @Log(title = "参数管理", businessType = BusinessType.EXPORT)
-    @RequiresPermissions("system:config:export")
+    // @RequiresPermissions("system:config:export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysConfig config)
     {
@@ -78,7 +78,7 @@ public class SysConfigController extends BaseController
     /**
      * 新增参数配置
      */
-    @RequiresPermissions("system:config:add")
+    // @RequiresPermissions("system:config:add")
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysConfig config)
@@ -94,7 +94,7 @@ public class SysConfigController extends BaseController
     /**
      * 修改参数配置
      */
-    @RequiresPermissions("system:config:edit")
+    // @RequiresPermissions("system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysConfig config)
@@ -110,7 +110,7 @@ public class SysConfigController extends BaseController
     /**
      * 删除参数配置
      */
-    @RequiresPermissions("system:config:remove")
+    // @RequiresPermissions("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{configIds}")
     public AjaxResult remove(@PathVariable Long[] configIds)
@@ -122,7 +122,7 @@ public class SysConfigController extends BaseController
     /**
      * 刷新参数缓存
      */
-    @RequiresPermissions("system:config:remove")
+    // @RequiresPermissions("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
     public AjaxResult refreshCache()

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java

@@ -35,7 +35,7 @@ public class SysDeptController extends BaseController
     /**
      * 获取部门列表
      */
-    @RequiresPermissions("system:dept:list")
+    // @RequiresPermissions("system:dept:list")
     @GetMapping("/list")
     public AjaxResult list(SysDept dept)
     {
@@ -46,7 +46,7 @@ public class SysDeptController extends BaseController
     /**
      * 查询部门列表（排除节点）
      */
-    @RequiresPermissions("system:dept:list")
+    // @RequiresPermissions("system:dept:list")
     @GetMapping("/list/exclude/{deptId}")
     public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
     {
@@ -58,7 +58,7 @@ public class SysDeptController extends BaseController
     /**
      * 根据部门编号获取详细信息
      */
-    @RequiresPermissions("system:dept:query")
+    // @RequiresPermissions("system:dept:query")
     @GetMapping(value = "/{deptId}")
     public AjaxResult getInfo(@PathVariable Long deptId)
     {
@@ -69,7 +69,7 @@ public class SysDeptController extends BaseController
     /**
      * 新增部门
      */
-    @RequiresPermissions("system:dept:add")
+    // @RequiresPermissions("system:dept:add")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDept dept)
@@ -85,7 +85,7 @@ public class SysDeptController extends BaseController
     /**
      * 修改部门
      */
-    @RequiresPermissions("system:dept:edit")
+    // @RequiresPermissions("system:dept:edit")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysDept dept)
@@ -111,7 +111,7 @@ public class SysDeptController extends BaseController
     /**
      * 删除部门
      */
-    @RequiresPermissions("system:dept:remove")
+    // @RequiresPermissions("system:dept:remove")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
     public AjaxResult remove(@PathVariable Long deptId)