机关业务指导处

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

@@ -15,7 +15,6 @@ 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;
 
 

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

@@ -33,10 +33,12 @@ import com.ozs.pm.doman.vo.responseVo.*;
 import com.ozs.pm.mapper.PmAuditDeptRefMapper;
 import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.pm.service.*;
+import com.ozs.system.domain.SysDeptOrgan;
 import com.ozs.system.domain.SysFileInfo;
 import com.ozs.system.domain.SysFileRef;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
 import com.ozs.system.mapper.SysDeptMapper;
+import com.ozs.system.mapper.SysDeptOrganMapper;
 import com.ozs.system.mapper.SysFileRefMapper;
 import com.ozs.system.mapper.SysRoleMapper;
 import com.ozs.system.service.*;
@@ -80,6 +82,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @Autowired
     private SysFileRefMapper sysFileRefMapper;
     @Autowired
+    private SysDeptOrganMapper sysDeptOrganMapper;
+    @Autowired
     private SysDeptMapper deptMapper;
     @Autowired
     private SysFileService fileService;
@@ -382,18 +386,18 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 if (ofYear.getOrganDivision().contains(",")) {
                     String[] split = ofYear.getOrganDivision().split(",");
                     for (String s : split) {
-                        SysDept infoTow = deptMapper.checkDeptNameOnlyOne(s);
+                        SysDeptOrgan infoTow = sysDeptOrganMapper.checkDeptOrganNameOnlyOne(s);
                         //不是最后一位就加‘,’，是就直接结尾
                         if (!ofYear.getOrganDivision().endsWith(s)) {
                             if (!ObjectUtils.isEmpty(infoTow)) {
-                                zBuilder.append(infoTow.getDeptId() + ",");
+                                zBuilder.append(infoTow.getId() + ",");
                             } else {
                                 ++failureNum;
                                 failureMsg.append(failureNum + "、机关业务指导处(科)“" + s + "”不存在");
                             }
                         } else {
                             if (!ObjectUtils.isEmpty(infoTow)) {
-                                zBuilder.append(infoTow.getDeptId());
+                                zBuilder.append(infoTow.getId());
                             } else {
                                 ++failureNum;
                                 failureMsg.append(failureNum + "、机关业务指导处(科)“" + s + "”不存在");
@@ -408,9 +412,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                     }
                 } else {
                     //没有多选
-                    SysDept infoTow = deptMapper.checkDeptNameOnlyOne(ofYear.getOrganDivision());
+                    SysDeptOrgan infoTow = sysDeptOrganMapper.checkDeptOrganNameOnlyOne(ofYear.getOrganDivision());
                     if (!ObjectUtils.isEmpty(infoTow)) {
-                        zBuilder.append(infoTow.getDeptId());
+                        zBuilder.append(infoTow.getId());
                     } else {
                         ++failureNum;
                         failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofYear.getOrganDivision() + "”不存在");

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

@@ -35,14 +35,17 @@ import com.ozs.pm.mapper.PmAuditDeptRefMapper;
 import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.pm.service.IPmDemandService;
 import com.ozs.pm.service.PmAuditDeptRefService;
+import com.ozs.system.domain.SysDeptOrgan;
 import com.ozs.system.domain.SysFileInfo;
 import com.ozs.system.domain.SysFileRef;
 import com.ozs.system.domain.vo.responseVo.SysDeptResponseVo;
 import com.ozs.system.mapper.SysDeptMapper;
+import com.ozs.system.mapper.SysDeptOrganMapper;
 import com.ozs.system.mapper.SysFileRefMapper;
 import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.system.service.ISysUserService;
+import com.ozs.system.service.SysDeptOrganService;
 import com.ozs.system.service.SysFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -60,31 +63,33 @@ import java.util.stream.Collectors;
 public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMapper, ProvisionalPlan> implements ProvisionalPlanService {
 
     @Autowired
-    private ProvisionalPlanMapper provisionalPlanMapper;
+    private SysDeptMapper deptMapper;
     @Autowired
-    private ISysDictTypeService dictTypeService;
+    private SysFileService fileService;
     @Autowired
-    private SysDeptMapper deptMapper;
+    private ISysUserService userService;
     @Autowired
     private ISysDeptService deptService;
     @Autowired
-    private PlanYearsMapper planYearsMapper;
+    private PmDemandMapper pmDemandMapper;
     @Autowired
-    private SysFileRefMapper sysFileRefMapper;
+    private IPmDemandService demandService;
     @Autowired
-    private SysFileService fileService;
+    private PlanYearsMapper planYearsMapper;
     @Autowired
-    private PmDemandMapper pmDemandMapper;
+    private PlanQuarterService quarterService;
     @Autowired
-    private IPmDemandService demandService;
+    private SysFileRefMapper sysFileRefMapper;
     @Autowired
-    private ISysUserService userService;
+    private ISysDictTypeService dictTypeService;
     @Autowired
-    private PmAuditDeptRefService pmAuditDeptRefService;
+    private SysDeptOrganMapper sysDeptOrganMapper;
     @Autowired
     private PmAuditDeptRefMapper pmAuditDeptRefMapper;
     @Autowired
-    private PlanQuarterService quarterService;
+    private PmAuditDeptRefService pmAuditDeptRefService;
+    @Autowired
+    private ProvisionalPlanMapper provisionalPlanMapper;
 
     @Override
     public int deleteProvisionalPlanById(Long planPracticalId) {
@@ -146,18 +151,18 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     if (ofProvisionalPlan.getOrganDivision().contains(",")) {
                         String[] split = ofProvisionalPlan.getOrganDivision().split(",");
                         for (String s : split) {
-                            SysDept infoTow = deptMapper.checkDeptNameOnlyOne(s);
+                            SysDeptOrgan infoTow = sysDeptOrganMapper.checkDeptOrganNameOnlyOne(s);
                             //不是最后一位就加‘,’，是就直接结尾
                             if (!ofProvisionalPlan.getOrganDivision().endsWith(s)) {
                                 if (!ObjectUtils.isEmpty(infoTow)) {
-                                    zBuilder.append(infoTow.getDeptId() + ",");
+                                    zBuilder.append(infoTow.getId() + ",");
                                 } else {
                                     ++failureNum;
                                     failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofProvisionalPlan.getOrganDivision() + "”不存在");
                                 }
                             } else {
                                 if (!ObjectUtils.isEmpty(infoTow)) {
-                                    zBuilder.append(infoTow.getDeptId());
+                                    zBuilder.append(infoTow.getId());
                                 } else {
                                     ++failureNum;
                                     failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofProvisionalPlan.getOrganDivision() + "”不存在");
@@ -171,9 +176,9 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                         }
                     } else {
                         //没有多选
-                        SysDept infoTow = deptMapper.checkDeptNameOnlyOne(ofProvisionalPlan.getOrganDivision());
+                        SysDeptOrgan infoTow = sysDeptOrganMapper.checkDeptOrganNameOnlyOne(ofProvisionalPlan.getOrganDivision());
                         if (!ObjectUtils.isEmpty(infoTow)) {
-                            zBuilder.append(infoTow.getDeptId());
+                            zBuilder.append(infoTow.getId());
                         } else {
                             ++failureNum;
                             failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofProvisionalPlan.getOrganDivision() + "”不存在");

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

@@ -4,6 +4,7 @@ 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 org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,4 +16,11 @@ import java.util.List;
 @Mapper
 public interface SysDeptOrganMapper extends BaseMapper<SysDeptOrgan> {
 
+    /**
+     * 校验机关指导处名称是否唯一
+     *
+     * @param organName 机关指导处名称
+     * @return 结果
+     */
+    public SysDeptOrgan checkDeptOrganNameOnlyOne(@Param("organName") String organName);
 }