项目管理

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmPurchaseExecutionController.java

@@ -210,6 +210,8 @@ public class PmPurchaseExecutionController extends BaseController {
 
     @ApiOperation(value = "获取专家身份证号列表")
     @GetMapping("/getExpertIdNumberList")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:getExpertIdNumberList')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.QUERY)
     public AjaxResult getExpertIdNumberList(@NotEmpty(message = "采购需求id不能为空")
                                                 @RequestParam(value = "demandId", required = true) Long demandId) {
         PmDemand pmDemand = pmDemandService.getById(demandId);
@@ -232,6 +234,8 @@ public class PmPurchaseExecutionController extends BaseController {
 
     @ApiOperation(value = "根据身份证号查询专家", notes = "必传 查询条件：身份证号")
     @GetMapping("/findExpertWithIdNumber")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:findExpertWithIdNumber')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.QUERY)
     public AjaxResult findExpertWithIdNumber(@NotEmpty(message = "采购需求id不能为空")
                                                  @RequestParam(value = "demandId", required = true) Long demandId,
                                              @NotEmpty(message = "身份证号不能为空")
@@ -280,6 +284,8 @@ public class PmPurchaseExecutionController extends BaseController {
 
     @ApiOperation(value = "获取回避单位下拉列表")
     @GetMapping("/getExpertUnitList")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:getExpertUnitList')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.QUERY)
     public AjaxResult getExpertUnitList() {
         List<BaseExpert> baseExperts = baseExpertService.list();
         if(ObjectUtils.isEmpty(baseExperts)){
@@ -297,6 +303,8 @@ public class PmPurchaseExecutionController extends BaseController {
      */
     @ApiOperation(value = "抽取专家",notes = "采购需求ID必传")
     @PostMapping("/extractExpertBatch")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:extractExpertBatch')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.UPDATE)
     public AjaxResult extractExpertBatch(@NotEmpty(message = "参数不能为空")
                                              @RequestBody PmBaseExpertExtractReqVo pmBaseExpertExtractReqVo) {
 
@@ -314,6 +322,8 @@ public class PmPurchaseExecutionController extends BaseController {
 
     @ApiOperation(value = "填写开标信息",notes = "采购需求ID必传")
     @PostMapping("/insertBidOpeningBatch")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:insertBidOpeningBatch')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.INSERT)
     public AjaxResult insertBidOpeningBatch(@NotEmpty(message = "数据为空")
                                                   @RequestBody PmBidOpeningFillReqVo pmBidOpeningFillReqVo) {
 
@@ -336,6 +346,8 @@ public class PmPurchaseExecutionController extends BaseController {
      */
     @ApiOperation(value = "中标基本情况填制-开标信息下拉列表", notes = "必传选需求ID")
     @GetMapping("/getPullDownBidOpeningList")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:getPullDownBidOpeningList')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.QUERY)
     public AjaxResult getPullDownBidOpeningList(@NotEmpty(message = "需求ID不能为空")
                                         @RequestParam(value = "demandId", required = true) Long demandId) {
         LambdaQueryWrapper<PmBidOpening> pmBidOpeningLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -348,6 +360,8 @@ public class PmPurchaseExecutionController extends BaseController {
 
     @ApiOperation(value = "中标基本情况填制-中标情况填制提交",notes = "采购需求ID必传")
     @PostMapping("/insertPmBidWinning")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:insertPmBidWinning')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.INSERT)
     public AjaxResult insertPmBidWinning(@NotEmpty(message = "数据为空")
                                                   @RequestBody PmBidWinningReqVo pmBidWinningReqVo) {
       try {
@@ -367,6 +381,8 @@ public class PmPurchaseExecutionController extends BaseController {
 
     @ApiOperation(value = "中标基本情况填制-更换中标人提交",notes = "采购需求ID必传")
     @PostMapping("/updatePmBidWinning")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:updatePmBidWinning')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.UPDATE)
     public AjaxResult updatePmBidWinning(@NotEmpty(message = "数据为空")
                                          @RequestBody PmBidWinningReqVo pmBidWinningReqVo) {
         try {
@@ -384,6 +400,8 @@ public class PmPurchaseExecutionController extends BaseController {
 
     @ApiOperation(value = "流标情况填制",notes = "采购需求ID必传")
     @PostMapping("/insertPmBidFailure")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:insertPmBidFailure')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.INSERT)
     public AjaxResult insertPmBidFailure(@NotEmpty(message = "数据为空")
                                          @RequestBody PmBidFailureReqVo pmBidFailureReqVo) {
         try {
@@ -403,6 +421,8 @@ public class PmPurchaseExecutionController extends BaseController {
 
     @ApiOperation(value = "质疑处理",notes = "采购需求ID必传")
     @PostMapping("/handleCallQuestion")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:handleCallQuestion')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.UPDATE)
     public AjaxResult handleCallQuestion(@NotEmpty(message = "数据为空")
                                          @RequestBody PmCallQuestionReqVo pmCallQuestionReqVo) {
         try {
@@ -428,6 +448,8 @@ public class PmPurchaseExecutionController extends BaseController {
 
     @ApiOperation(value = "上传中标通知书",notes = "采购需求ID和上传附件必传")
     @PostMapping("/uploadBidWinningNotification")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:uploadBidWinningNotification')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.IMPORT)
     public AjaxResult uploadBidWinningNotification(@NotEmpty(message = "数据为空") @RequestBody PmPurchaseExecutionReqVo pmPurchaseExecutionReqVo) {
         Long demandId = pmPurchaseExecutionReqVo.getDemandId();
         if(ObjectUtils.isEmpty(demandId)){
@@ -460,6 +482,8 @@ public class PmPurchaseExecutionController extends BaseController {
      */
     @ApiOperation(value = "查看详情", notes = "必传demandId和详情类型(1项目计划，2需求建档，3任务下达,4中标信息，5合同信息，6建设情况),其他字段不传")
     @PostMapping("/view")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:view')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.QUERY)
     public AjaxResult view(@RequestBody PmDemandReqVo pmDemandReqVo) {
         if(pmDemandReqVo.getDemandId() == null){
             return AjaxResult.error("demandId不能为空");
@@ -475,6 +499,8 @@ public class PmPurchaseExecutionController extends BaseController {
      */
     @ApiOperation(value = "专家信息查看详情列表", notes = "必传需求ID和选取时间(yyyy-MM-dd)")
     @GetMapping("/getBaseExpertList")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:getBaseExpertList')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.QUERY)
     public AjaxResult getBaseExpertList(@NotEmpty(message = "需求ID不能为空")
                                             @RequestParam(value = "demandId", required = true) Long demandId,
                                          @NotEmpty(message = "选取时间不能为空")
@@ -501,6 +527,8 @@ public class PmPurchaseExecutionController extends BaseController {
      */
     @ApiOperation(value = "开标信息查看详情列表", notes = "必传选需求ID和开标时间(yyyy-MM-dd)")
     @GetMapping("/getBidOpeningList")
+    @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:getBidOpeningList')")
+    @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.QUERY)
     public AjaxResult getBidOpeningList(@NotEmpty(message = "需求ID不能为空")
                                         @RequestParam(value = "demandId", required = true) Long demandId,
                                         @NotEmpty(message = "开标时间不能为空")

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmBidWinningResVo.java

@@ -57,11 +57,6 @@ public class PmBidWinningResVo implements Serializable {
     @ApiModelProperty("更新时间")
     private Date updateTime;
 
-    /**
-     * 中标信息列表
-     */
-    @ApiModelProperty("中标信息列表")
-    private List<Long> pmBidOpeningIdList;
 
     /**
      * 已上传的关联附件信息

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmPurchaseExecutionResVo.java

@@ -45,6 +45,14 @@ public class PmPurchaseExecutionResVo {
     @ApiModelProperty("中标信息列表")
     private List<PmBidWinningResVo> pmBidWinningResVoList;
 
+    /** 是否有质疑，1是，0否 */
+    @ApiModelProperty("是否有质疑，1是，0否")
+    private String callQuestion;
+
+    /** 是否有质疑，1是，0否 */
+    @ApiModelProperty("是否有质疑，1是，0否")
+    private String callQuestionName;
+
     /**
      * 质疑情况附件
      */

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -258,6 +258,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                     pmPurchaseExecutionResVo.setPmBidWinningResVoList(pmBidWinningResVoList);
                 }
 
+                pmPurchaseExecutionResVo.setCallQuestion(pmDemand.getCallQuestion());
+
                 //质疑情况
                 List<SysFileInfo> callRequestFileInfos = getSysFileInfoList(vo.getDemandId(), SysFileRefEnum.PM_BID_CALL_QEUSTION_FILE.getType());
                 if (!ObjectUtils.isEmpty(callRequestFileInfos)) {