活动、价格、库存申请

hx-oa/src/main/java/com/fjhx/oa/controller/activity/ActivityPriceInventoryController.java

@@ -57,7 +57,7 @@ public class ActivityPriceInventoryController {
      */
     @PostMapping("/edit")
     public void edit(@RequestBody ActivityPriceInventoryDto activityPriceInventoryDto) {
-        activityPriceInventoryService.edit(activityPriceInventoryDto);
+        activityPriceInventoryService.addOrEdit(activityPriceInventoryDto);
     }
 
     /**

hx-oa/src/main/java/com/fjhx/oa/entity/activity/dto/ActivityPriceInventorySelectDto.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class ActivityPriceInventorySelectDto extends BaseSelectDto {
 
+    /**
+     * 审批状态
+     */
+    private Integer status;
+
 }

hx-oa/src/main/java/com/fjhx/oa/service/activity/impl/ActivityPriceInventoryServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.enums.FlowStatusEnum1;
+import com.fjhx.common.utils.AuthorityUtils;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.entity.flow.po.FlowExample;
 import com.fjhx.flow.enums.FlowStatusEnum;
@@ -17,6 +18,7 @@ import com.fjhx.oa.entity.activity.po.ActivityPriceInventory;
 import com.fjhx.oa.entity.activity.po.ActivityPriceInventoryDetail;
 import com.fjhx.oa.entity.activity.vo.ActivityPriceInventoryDetailVo;
 import com.fjhx.oa.entity.activity.vo.ActivityPriceInventoryVo;
+import com.fjhx.oa.entity.education.po.EducationSubsidy;
 import com.fjhx.oa.mapper.activity.ActivityPriceInventoryMapper;
 import com.fjhx.oa.service.activity.ActivityPriceInventoryDetailService;
 import com.fjhx.oa.service.activity.ActivityPriceInventoryService;
@@ -24,6 +26,7 @@ import com.fjhx.tenant.utils.DeptUstil;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,6 +56,16 @@ public class ActivityPriceInventoryServiceImpl extends ServiceImpl<ActivityPrice
     @Override
     public Page<ActivityPriceInventoryVo> getPage(ActivityPriceInventorySelectDto dto) {
         IWrapper<ActivityPriceInventory> wrapper = getWrapper();
+
+        //权限过滤
+        AuthorityUtils.cofAuthority("api", ActivityPriceInventory::getCompanyId, wrapper);
+
+        wrapper.keyword(dto.getKeyword(),
+                new SqlField("api", ActivityPriceInventory::getCode),
+                new SqlField("api", ActivityPriceInventory::getActivityName)
+        );
+        wrapper.eq("api", EducationSubsidy::getStatus, dto.getStatus());
+
         wrapper.orderByDesc("api", ActivityPriceInventory::getId);
         Page<ActivityPriceInventoryVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ActivityPriceInventoryVo> records = page.getRecords();