机关指导处的维护

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

@@ -0,0 +1,68 @@
+package com.ozs.web.controller.system;
+
+import com.ozs.common.annotation.Log;
+import com.ozs.common.core.controller.BaseController;
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.enums.BusinessType;
+import com.ozs.system.domain.SysDeptOrgan;
+import com.ozs.system.service.SysDeptOrganService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 部门的机关指导处 操作处理
+ *
+ * @author ruoyi
+ */
+@Api(tags = "机关指导处")
+@RestController
+@RequestMapping("/system/dept/organ")
+public class SysDeptOrganController extends BaseController {
+
+    @Autowired
+    private SysDeptOrganService sysDeptOrganService;
+
+    /**
+     * 获取机关指导处列表(本级和上级)
+     */
+    @GetMapping("/list")
+    @ApiOperation("获取机关指导处列表")
+    public AjaxResult list() {
+        List<SysDeptOrgan> deptOrganList = sysDeptOrganService.selectList();
+        return success(deptOrganList);
+    }
+
+    /**
+     * 新增机关指导处
+     */
+    @Log(title = "机关指导处管理", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ApiOperation("新增机关指导处")
+    public AjaxResult add(@RequestBody SysDeptOrgan deptOrgan) {
+        Long userId = getUserId();
+        deptOrgan.setCreateBy(String.valueOf(userId));
+        deptOrgan.setCreateTime(new Date());
+        return sysDeptOrganService.insertDeptOrgan(deptOrgan);
+    }
+
+    /**
+     * 删除机关指导处
+     */
+    @Log(title = "机关指导处管理", businessType = BusinessType.DELETE)
+    @PostMapping("/deleteById")
+    @ApiOperation("删除机关指导处")
+    public AjaxResult deleteById(@RequestBody SysDeptOrgan deptOrgan) {
+        return sysDeptOrganService.deleteById(deptOrgan);
+    }
+
+}

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

@@ -335,9 +335,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         //deptService
         for (PlanYears ofYear : plans) {
             try {
-                //验证项目名称是否重复导入
                 //将录入信息中的值更改为要保存的数据
-                if (planYearsMapper.countProjectName(ofYear.getProjectName()) == 0) {
                     //采购单位
                     SysDept info = deptMapper.checkDeptNameOnlyOne(ofYear.getPurchaseDeptName());
                     if (!ObjectUtils.isEmpty(info)) {
@@ -387,7 +385,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     }
                     ofYear.setOrganDivision(zBuilder.toString());
 
-
                     ofYear.setProjectType(projectTypesMap.get(ofYear.getProjectType()));
                     ofYear.setPurchaseServices(purchaseServicesMap.get(ofYear.getPurchaseServices()));
                     ofYear.setBudgetAccount(budgetAccountMap.get(ofYear.getBudgetAccount()));
@@ -412,10 +409,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     planYearsMapper.insertPlanYears(ofYear);
                     successNum++;
                     successMsg.append(successNum + "、项目【" + ofYear.getProjectName() + "】导入成功!");
-                } else {
-                    failureNum++;
-                    failureMsg.append(failureNum + "、项目【" + ofYear.getProjectName() + "】已存在！");
-                }
             } catch (Exception exc) {
                 failureNum++;
                 String msg = successNum + "、项目【" + ofYear.getProjectName() + "】导入失败";

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

@@ -132,10 +132,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
 
         for (ProvisionalPlan ofProvisionalPlan : provisionalPlans) {
             try {
-                //验证项目名称是否重复导入
-                List<ProvisionalPlan> plan = provisionalPlanMapper.selectProjectName(ofProvisionalPlan.getProjectName());
                 //将录入信息中的值更改为要保存的数据
-                if (plan.size() == 0) {
                     //采购单位
                     SysDept info = deptMapper.checkDeptNameOnlyOne(ofProvisionalPlan.getPurchaseDeptName());
                     if (StringUtils.isNotNull(info)) {
@@ -207,10 +204,6 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     provisionalPlanMapper.insert(ofProvisionalPlan);
                     successNum++;
                     successMsg.append(successNum + "、项目 " + ofProvisionalPlan.getProjectName() + " 导入成功!");
-                } else {
-                    failureNum++;
-                    failureMsg.append(successNum + "、项目 " + ofProvisionalPlan.getProjectName() + " 已存在；");
-                }
             } catch (Exception exc) {
                 failureNum++;
                 String msg = successNum + "、项目 " + ofProvisionalPlan.getProjectName() + " 导入失败；";

purchase-system/src/main/java/com/ozs/system/domain/SysDeptOrgan.java

@@ -0,0 +1,48 @@
+package com.ozs.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ozs.common.annotation.DataScope;
+import com.ozs.common.core.domain.BaseEntity;
+import lombok.Data;
+import nonapi.io.github.classgraph.json.Id;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Size;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 部门下机关指导处表 sys_dept_organ
+ *
+ * @author ruoyi
+ */
+@Data
+@TableName(value = "sys_dept_organ")
+public class SysDeptOrgan extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 部门ID */
+    /**
+     * 主键编号
+     */
+    @Id
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 关联部门ID
+     */
+    @TableField("dept_id")
+    private Long deptId;
+
+    /**
+     * 机关指导处名称
+     */
+    @TableField("organ_name")
+    private String organName;
+
+}

purchase-system/src/main/java/com/ozs/system/mapper/SysDeptOrganMapper.java

@@ -0,0 +1,18 @@
+package com.ozs.system.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.system.domain.SysDeptOrgan;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 部门的机关指导处
+ *
+ * @author bu
+ */
+@Mapper
+public interface SysDeptOrganMapper extends BaseMapper<SysDeptOrgan> {
+
+}

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

@@ -0,0 +1,36 @@
+package com.ozs.system.service;
+
+
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.system.domain.SysDeptOrgan;
+
+import java.util.List;
+
+/**
+ * 部门的机关指导处 服务层
+ *
+ * @author buzy
+ */
+public interface SysDeptOrganService {
+
+    /**
+     * 获取机关指导处列表
+     *
+     * @return
+     */
+    List<SysDeptOrgan> selectList();
+
+    /**
+     * @param deptOrgan
+     * @return
+     */
+    AjaxResult insertDeptOrgan(SysDeptOrgan deptOrgan);
+
+    /**
+     * 删除机关指导处
+     *
+     * @param deptOrgan
+     * @return
+     */
+    AjaxResult deleteById(SysDeptOrgan deptOrgan);
+}

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

@@ -0,0 +1,67 @@
+package com.ozs.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.core.domain.entity.SysDept;
+import com.ozs.common.utils.SecurityUtils;
+import com.ozs.system.domain.SysDeptOrgan;
+import com.ozs.system.mapper.SysDeptMapper;
+import com.ozs.system.mapper.SysDeptOrganMapper;
+import com.ozs.system.service.SysDeptOrganService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 参数配部门的机关指导处 服务层实现
+ *
+ * @author buzy
+ */
+@Service
+public class SysDeptOrganServiceImpl implements SysDeptOrganService {
+
+    @Autowired
+    private SysDeptOrganMapper deptOrganMapper;
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
+
+    @Override
+    public List<SysDeptOrgan> selectList() {
+        Long deptId = SecurityUtils.getDeptId();
+        SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
+        List<Long> list = new ArrayList<>();
+        list.add(deptId);
+        //本级和上级
+        if (!ObjectUtils.isEmpty(sysDept) && !ObjectUtils.isEmpty(sysDept.getParentId())) {
+            list.add(sysDept.getParentId());
+        }
+        LambdaQueryWrapper<SysDeptOrgan> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(SysDeptOrgan::getDeptId, list);
+        List<SysDeptOrgan> organs = deptOrganMapper.selectList(wrapper);
+        return organs;
+    }
+
+    @Override
+    public AjaxResult insertDeptOrgan(SysDeptOrgan deptOrgan) {
+        if (deptOrganMapper.insert(deptOrgan) == 1) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error("网络出小差，请稍后重试");
+        }
+    }
+
+    @Override
+    public AjaxResult deleteById(SysDeptOrgan deptOrgan) {
+        if (deptOrganMapper.deleteById(deptOrgan.getId()) == 1) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error("网络出小差，请稍后重试");
+        }
+    }
+
+}