采購服務站

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseNoticeController.java

@@ -149,20 +149,6 @@ public class BaseNoticeController extends BaseController {
     @Log(title = ModularConstans.notice, businessType = BusinessType.QUERY)
     public AjaxResult homePage(@NotEmpty(message = "数据为空")
                            @RequestBody BaseNoticePageReqVo vo) {
-//        LambdaQueryWrapper<BaseNotice> lw = new LambdaQueryWrapper<>();
-//        if(!StringUtils.isBlank(vo.getTitle())){
-//            lw.like(BaseNotice::getTitle,vo.getTitle());
-//        }
-//        if(!ObjectUtils.isEmpty(vo.getStartTime())){
-//            lw.ge(BaseNotice::getReleaseTime,vo.getStartTime());
-//        }
-//        if(!ObjectUtils.isEmpty(vo.getStartTime())){
-//            lw.le(BaseNotice::getReleaseTime,vo.getEntTime());
-//        }
-//        if (!ObjectUtils.isEmpty(vo.getType())) {
-//            lw.eq(BaseNotice::getType, vo.getType());
-//        }
-//        lw.orderByDesc(BaseNotice::getReleaseTime);
         vo.setUserId(getUserId());
         vo.setDeptId(getDeptId());
         IPage<BaseNotice> page = baseNoticeService.queryPage(vo);

purchase-system/src/main/java/com/ozs/base/mapper/BaseNoticeMapper.java

@@ -23,7 +23,7 @@ public interface BaseNoticeMapper extends BaseMapper<BaseNotice> {
             " base_notice b left join pm_audit_dept_ref r " +
             " on b.demand_id = r.ref_id   " +
             " where (#{userId} = 1  or  (r.dept_id = #{deptId} and  r.ref_type = 2) )    " +
-            " and (#{title} is null  or   b.title like concat('%',#{title},'%'))  " +
+            " and (#{noticeName} is null  or   b.name like concat('%',#{noticeName},'%'))  " +
             " and (#{type} is null  or   b.type = #{type})  " +
             " and (#{startTime} is null  or   to_days(b.release_time) >= to_days(#{startTime}) ) " +
             " and (#{entTime} is null  or   to_days(b.release_time) <= to_days(#{entTime}) ) " +

purchase-system/src/main/java/com/ozs/base/service/impl/BaseNoticeServiceImpl.java

@@ -29,7 +29,7 @@ public class BaseNoticeServiceImpl extends ServiceImpl<BaseNoticeMapper, BaseNot
     public IPage<BaseNotice> queryPage(BaseNoticePageReqVo vo) {
         int pageNum = Integer.parseInt(vo.getPageNum().toString());
         int pageSize = Integer.parseInt(vo.getPageSize().toString());
-        vo.setTitle(StringUtils.isBlank(vo.getTitle()) ? null : vo.getTitle());
+        vo.setNoticeName(StringUtils.isBlank(vo.getNoticeName()) ? null : vo.getNoticeName());
         Page<BaseNotice> page = PageHelper.startPage(pageNum, pageSize)
                 .doSelectPage(() -> baseNoticeMapper.query(vo));
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseNotice> pageR =

purchase-system/src/main/java/com/ozs/base/vo/BaseNoticePageReqVo.java

@@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
 import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 
-@ApiModel(value = "BaseNoticePageReqVo", description = ModularConstans.notice+ "分页查询实体")
+@ApiModel(value = "BaseNoticePageReqVo", description = ModularConstans.notice + "分页查询实体")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -22,6 +22,8 @@ public class BaseNoticePageReqVo extends PageVo {
     @ApiModelProperty("公告标题")
     private String title;
 
+    @ApiModelProperty("项目名称")
+    private String noticeName;
     // 开始时间
     @ApiModelProperty("开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd")

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

@@ -462,7 +462,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
                         // 判断当前用户是否有审核权限
                         boolean flay = true;
-                        for (PmAuditDeptRef pmAuditDeptRef : listl) {
+                        List<PmAuditDeptRef> collect1 = listl.stream()
+                                .filter(pmAuditDeptRef -> pmAuditDeptRef.getRefId().equals(vo.getDemandId()))
+                                .collect(Collectors.toList());
+                        for (PmAuditDeptRef pmAuditDeptRef : collect1) {
                             if (pmAuditDeptRef.getDeptLevel().compareTo(deptLevel) > 0
                                     && pmAuditDeptRef.getStatus().equals(Integer.parseInt("0"))) {
                                 flay = false;