政策法规：在用 止用

系统首页搜索接口

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

@@ -58,9 +58,9 @@ public class BasePolicyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('base:policy:list')")
     @Log(title = ModularConstans.policy, businessType = BusinessType.QUERY)
     public AjaxResult page(@NotEmpty(message = "数据为空")
-                               @RequestBody BasePolicyPageReqVo vo) {
+                           @RequestBody BasePolicyPageReqVo vo) {
         LambdaQueryWrapper<BasePolicy> lw = new LambdaQueryWrapper<>();
-        if(!StringUtils.isBlank(vo.getName())){
+        if (!StringUtils.isBlank(vo.getName())) {
             List<EsMessage> maps = null;
             try {
                 maps = FileUtils.eSearch(vo.getName());
@@ -69,13 +69,13 @@ public class BasePolicyController extends BaseController {
             }
             List<String> ids = maps.stream().map(EsMessage::getId).collect(Collectors.toList());
 //            lw.like(BasePolicy::getName,vo.getName());
-            lw.in(BasePolicy::getEsId,ids);
+            lw.in(BasePolicy::getEsId, ids);
         }
-        if(!ObjectUtils.isEmpty(vo.getStartTime())){
-            lw.ge(BasePolicy::getReleaseTime,vo.getStartTime());
+        if (!ObjectUtils.isEmpty(vo.getStartTime())) {
+            lw.ge(BasePolicy::getReleaseTime, vo.getStartTime());
         }
-        if(!ObjectUtils.isEmpty(vo.getStartTime())){
-            lw.le(BasePolicy::getReleaseTime,vo.getEntTime());
+        if (!ObjectUtils.isEmpty(vo.getStartTime())) {
+            lw.le(BasePolicy::getReleaseTime, vo.getEntTime());
         }
         IPage<BasePolicy> page = basePolicyService.page(new Page<>(vo.getPageNum(), vo.getPageSize()), lw);
         return success(page);
@@ -94,7 +94,7 @@ public class BasePolicyController extends BaseController {
             String filePath = PurchaseConfig.getUploadPath();
             // 上传并返回新文件名称
             String upload = FileUploadUtils.upload(filePath, file);
-            FileUtils.uploadESFile(upload,esId);
+            FileUtils.uploadESFile(upload, esId);
             AjaxResult ajax = AjaxResult.success();
             String url = serverConfig.getUrl() + upload;
             ajax.put("url", url);
@@ -113,14 +113,33 @@ public class BasePolicyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('base:policy:add')")
     @Log(title = ModularConstans.policy, businessType = BusinessType.INSERT)
     public AjaxResult insert(@NotEmpty(message = "数据为空")
-                                 @RequestBody BasePolicy vo) {
+                             @RequestBody BasePolicy vo) {
         vo.setCreated(getUserId().toString());
         vo.setCreateTime(new Date());
         vo.setUpdated(vo.getCreated());
         vo.setUpdateTime(vo.getCreateTime());
+        vo.setState("1");
         return toAjax(basePolicyService.save(vo));
     }
 
+    @ApiOperation(value = "在用")
+    @PostMapping("/statusUse")
+    @PreAuthorize("@ss.hasPermi('base:policy:update')")
+    @Log(title = ModularConstans.policy, businessType = BusinessType.INSERT)
+    public AjaxResult statusUse(@NotEmpty(message = "数据为空") @RequestBody BasePolicy vo) {
+        vo.setState("1");
+        return toAjax(basePolicyService.updateById(vo));
+    }
+
+    @ApiOperation(value = "止用")
+    @PostMapping("/statusNonUse")
+    @PreAuthorize("@ss.hasPermi('base:policy:update')")
+    @Log(title = ModularConstans.policy, businessType = BusinessType.INSERT)
+    public AjaxResult statusNonUse(@NotEmpty(message = "数据为空") @RequestBody BasePolicy vo) {
+        vo.setState("0");
+        return toAjax(basePolicyService.updateById(vo));
+    }
+
     @ApiOperation(value = "删除政策法规")
     @PostMapping("/remove")
     @PreAuthorize("@ss.hasPermi('base:policy:remove')")

purchase-admin/src/main/java/com/ozs/web/controller/home/HomeNoticeController.java

@@ -12,7 +12,11 @@ import com.ozs.common.utils.StringUtils;
 import com.ozs.home.domain.HomeNotice;
 import com.ozs.home.domain.vo.HomeNoticeVo;
 import com.ozs.home.service.HomeNoticeService;
+import com.ozs.plan.doman.PlanYears;
+import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
+import com.ozs.plan.service.PlanYearsService;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -21,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 首页公告控制层
@@ -30,9 +36,11 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping("/home/homeNotice")
 public class HomeNoticeController extends BaseController {
-    
+
     @Resource
-    private  HomeNoticeService homeNoticeService;
+    private HomeNoticeService homeNoticeService;
+    @Autowired
+    private PlanYearsService planYearsService;
 
     @ApiOperation(value = "查询首页公告")
     @PostMapping("/selectHomeNotice")
@@ -49,13 +57,36 @@ public class HomeNoticeController extends BaseController {
         if (!StringUtils.isBlank(homeNoticeVo.getHomepageClassification())) {
             lw.eq(HomeNotice::getHomepageClassification, homeNoticeVo.getHomepageClassification());
         }
-        if(!ObjectUtils.isEmpty(homeNoticeVo.getNoticeTime())){
-            lw.ge(HomeNotice::getNoticeTime,homeNoticeVo.getNoticeTime());
+        if (!ObjectUtils.isEmpty(homeNoticeVo.getNoticeTime())) {
+            lw.ge(HomeNotice::getNoticeTime, homeNoticeVo.getNoticeTime());
         }
-        if(!ObjectUtils.isEmpty(homeNoticeVo.getNoticeTime())){
-            lw.le(HomeNotice::getNoticeTime,homeNoticeVo.getNoticeTime());
+        if (!ObjectUtils.isEmpty(homeNoticeVo.getNoticeTime())) {
+            lw.le(HomeNotice::getNoticeTime, homeNoticeVo.getNoticeTime());
         }
         IPage<HomeNotice> page = homeNoticeService.page(new Page<HomeNotice>(homeNoticeVo.getPageNum(), homeNoticeVo.getPageSize()), lw);
         return success(page);
     }
+
+    @ApiOperation(value = "搜索项目列表")
+    @PostMapping("/listPlanYears")
+    public AjaxResult listPlanYears(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+        if (StringUtils.isNull(yearsStandardVo.getProjectName())) {
+            return error("查询项目名称不能为空！");
+        }
+        LambdaQueryWrapper<PlanYears> lw = new LambdaQueryWrapper<PlanYears>();
+        if (!StringUtils.isBlank(yearsStandardVo.getProjectName())) {
+            lw.like(PlanYears::getProjectName, "%" + yearsStandardVo.getProjectName() + "%");
+        }
+        List<PlanYears> list = planYearsService.list(lw);
+        return AjaxResult.success(list);
+    }
+
+    @ApiOperation(value = "搜索项目--选择项目查看详情")
+    @PostMapping("/projectDetails")
+    public AjaxResult projectDetails(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+        if (StringUtils.isNull(yearsStandardVo.getPlanYearId())) {
+            return error("查询年度ID不能为空！");
+        }
+        return planYearsService.projectDetails(yearsStandardVo.getPlanYearId());
+    }
 }

purchase-system/src/main/java/com/ozs/base/domain/BasePolicy.java

@@ -81,4 +81,8 @@ public class BasePolicy extends BaseDto
     @NotBlank(message = "es存储id")
     private String esId;
 
+    /** 1:在用，0:止用 */
+    @Excel(name = "状态 1:在用，0:止用")
+    @ApiModelProperty("1:在用，0:止用")
+    private String state;
 }

purchase-system/src/main/java/com/ozs/plan/mapper/ProvisionalPlanMapper.java

@@ -26,4 +26,12 @@ public interface ProvisionalPlanMapper extends BaseMapper<ProvisionalPlan> {
     List<ProvisionalPlan> selectProvisionalPlanAudit(ProvisionalPlanVo provisionalPlanVo);
 
     int review(ProvisionalPlan provisionalPlan);
+
+    /**
+     * 通过年度ID，查询季度、临时计划详情
+     *
+     * @param planYearId
+     * @return
+     */
+    ProvisionalPlan selectProvisionalPlanByYearId(@Param("planYearId") Integer planYearId);
 }

purchase-system/src/main/java/com/ozs/plan/service/PlanYearsService.java

@@ -11,6 +11,7 @@ import com.ozs.plan.doman.vo.responseVo.PlanQuarterResponseVo;
 import com.ozs.plan.doman.vo.responseVo.PlanYearsResponseVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 系统访问日志情况信息 服务层
@@ -258,4 +259,11 @@ public interface PlanYearsService extends IService<PlanYears> {
      * @return
      */
     AjaxResult purchasingManagementWillManipulateTotal();
+
+    /**
+     * 通过年度ID，查询季度、临时计划详情，通过季度、临时计划ID查询项目
+     * @param planYearId
+     * @return
+     */
+    AjaxResult projectDetails(Long planYearId);
 }

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -24,11 +24,13 @@ import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.home.domain.vo.HomeToDoQueryResVo;
 import com.ozs.plan.doman.PlanQuarter;
 import com.ozs.plan.doman.PlanYears;
+import com.ozs.plan.doman.ProvisionalPlan;
 import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import com.ozs.plan.doman.vo.responseVo.PlanQuarterResponseVo;
 import com.ozs.plan.doman.vo.responseVo.PlanYearsResponseVo;
 import com.ozs.plan.mapper.PlanQuarterMapper;
 import com.ozs.plan.mapper.PlanYearsMapper;
+import com.ozs.plan.mapper.ProvisionalPlanMapper;
 import com.ozs.plan.service.PlanYearsService;
 import com.ozs.pm.doman.PmDemand;
 import com.ozs.pm.doman.vo.responseVo.PmDemandResVo;
@@ -95,6 +97,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     private PlanQuarterServiceImpl quartzServiceImpl;
     @Autowired
     private IPmDemandService demandService;
+    @Autowired
+    private ProvisionalPlanMapper provisionalPlanMapper;
 
     @Override
     public Page selectPlanYearsList(PlanYearsStandardVo vo) {
@@ -890,6 +894,26 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         return AjaxResult.success(homeRes);
     }
 
+    /**
+     * 通过年度ID，查询季度、临时计划详情，通过季度、临时计划ID查询项目
+     *
+     * @param planYearId
+     * @return
+     */
+    @Override
+    public AjaxResult projectDetails(Long planYearId) {
+        Map<String, Object> returnMap = new HashMap<>();
+        // 通过年度ID查询年度详情
+        PlanYears byId = planYearsMapper.getById(planYearId);
+        if (StringUtils.isNull(byId)) {
+            return AjaxResult.error("没有查到相关数据！");
+        }
+        // 通过年度ID查询季度、临时计划详情
+        ProvisionalPlan provisionalPlan = provisionalPlanMapper.selectProvisionalPlanByYearId(planYearId.intValue());
+
+        return null;
+    }
+
     /**
      * 查询已被催告发函的计划
      *

purchase-system/src/main/resources/mapper/plan/ProvisionalPlanMapper.xml

@@ -196,4 +196,10 @@
         </trim>
         where plan_practical_id = #{planPracticalId}
     </update>
+
+    <select id="selectProvisionalPlanByYearId" resultType="com.ozs.plan.doman.ProvisionalPlan" parameterType="java.lang.Integer">
+        select *
+        from plan_practical
+        where plan_year_id = #{planYearId}
+    </select>
 </mapper>