机关指导处的维护

purchase-admin/src/main/java/com/ozs/web/controller/system/SysDeptOrganController.java

@@ -42,6 +42,15 @@ public class SysDeptOrganController extends BaseController {
         return success(deptOrganList);
     }
 
+    /**
+     * 获取机关指导处列表（下拉框）
+     */
+    @GetMapping("/map")
+    @ApiOperation("获取机关指导处列表")
+    public AjaxResult map() {
+        return sysDeptOrganService.selectListMap();
+    }
+
     /**
      * 新增机关指导处
      */

purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/ProvisionalPlanVo.java

@@ -3,6 +3,7 @@ package com.ozs.plan.doman.vo.requestVo;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ozs.common.annotation.Excel;
 import com.ozs.common.vo.PageVo;
 import com.ozs.system.domain.SysFileInfo;
 import com.ozs.system.domain.SysFileRef;
@@ -67,6 +68,15 @@ public class ProvisionalPlanVo extends PageVo {
     @ApiModelProperty(value = "采购方式  (0:公开招标, 1:单一来源,2:邀请招标,3:竞争式谈判,4:询价)")
     private String purchaseMode;
 
+    /**
+     * 机关业务指导处(科)
+     */
+    private String organDivision;
+    /**
+     * 预算科目
+     */
+    private String budgetAccount;
+
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "计划提报需求时间--->需求单位成功提报采购需求的日期（具体到月）")
     private Date planDemandSubTime;

purchase-system/src/main/java/com/ozs/system/service/SysDeptOrganService.java

@@ -20,6 +20,8 @@ public interface SysDeptOrganService {
      */
     List<SysDeptOrgan> selectList();
 
+    AjaxResult selectListMap();
+
     /**
      * @param deptOrgan
      * @return

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

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 
@@ -46,6 +47,28 @@ public class SysDeptOrganServiceImpl implements SysDeptOrganService {
         return organs;
     }
 
+    @Override
+    public AjaxResult selectListMap() {
+        HashMap<String, List<SysDeptOrgan>> hashMap = new HashMap<>();
+        Long deptId = SecurityUtils.getDeptId();
+        SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
+        //本部门
+        LambdaQueryWrapper<SysDeptOrgan> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysDeptOrgan::getDeptId, deptId);
+        List<SysDeptOrgan> organs = deptOrganMapper.selectList(wrapper);
+        hashMap.put(sysDept.getDeptName(), organs);
+        //上级
+        LambdaQueryWrapper<SysDeptOrgan> wrapperT = new LambdaQueryWrapper<>();
+        List<SysDeptOrgan> organsT;
+        if (sysDept.getParentId() != 0) {
+            wrapperT.eq(SysDeptOrgan::getDeptId, sysDept.getParentId());
+            organsT = deptOrganMapper.selectList(wrapperT);
+            SysDept sysDeptTwo = sysDeptMapper.selectDeptById(deptId);
+            hashMap.put(sysDeptTwo.getDeptName(), organsT);
+        }
+        return AjaxResult.success(hashMap);
+    }
+
     @Override
     public AjaxResult insertDeptOrgan(SysDeptOrgan deptOrgan) {
         if (deptOrganMapper.insert(deptOrgan) == 1) {

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

@@ -64,6 +64,12 @@
             <if test="purchaseMode != null and purchaseMode != '' ">
                 purchase_mode = #{purchaseMode},
             </if>
+            <if test="organDivision != null and organDivision != '' ">
+                organ_division = #{organDivision},
+            </if>
+            <if test="budgetAccount != null and budgetAccount != '' ">
+                budget_account = #{budgetAccount},
+            </if>
             <if test="planDemandSubTime != null">
                 plan_demand_sub_time = #{planDemandSubTime},
             </if>