1.修改机构代码

src/main/java/com/ydtech/modules/admin/controller/SysDeptController.java

@@ -4,6 +4,7 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.vo.SysDeptVo;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.utils.StringUtils;
@@ -29,8 +30,8 @@ public class SysDeptController extends BaseController {
     //    @PreAuthorize("hasAuthority('sys:dept:add')")
     @PostMapping(value = "/add")
     @ApiOperation("增加机构")
-    public HttpResult<Boolean> add(@RequestBody SysDept sysDept) {
-        sysDeptService.addDept(sysDept);
+    public HttpResult<Boolean> add(@RequestBody SysDeptVo sysDeptVo) {
+        sysDeptService.addDept(sysDeptVo);
         return HttpResult.ok();
     }
 

src/main/java/com/ydtech/modules/admin/model/vo/SysDeptVo.java

@@ -0,0 +1,89 @@
+package com.ydtech.modules.admin.model.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @description: 机构新增实体
+ * @author: wenks
+ * @date: 2023/11/16 14:56
+ **/
+
+@Data
+public class SysDeptVo implements Serializable {
+
+    private static final long serialVersionUID = 4759609045226731089L;
+
+    @ApiModelProperty(value = "机构名称")
+    private String name;
+
+    @ApiModelProperty(value = "上级机构ID，一级机构为0")
+    private String parentId;
+
+    @ApiModelProperty(value = "排序")
+    private Integer orderNum;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新人")
+    private String lastUpdateBy;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date lastUpdateTime;
+
+    @ApiModelProperty(value = "是否删除  -1：已删除  0：正常")
+    private Integer delFlag;
+
+    @ApiModelProperty(value = "机构类型")
+    private String comtype;
+
+    @ApiModelProperty(value = "机构级别")
+    private String comlevel;
+
+    @ApiModelProperty(value = "机构地址")
+    private String address;
+
+    @ApiModelProperty(value = "负责人姓名")
+    private String leadername;
+
+    @ApiModelProperty(value = "负责人电话")
+    private String leaderphone;
+
+    @ApiModelProperty(value = "机构性质")
+    private String comattribute;
+
+    @ApiModelProperty(value = "是否停业")
+    private String isstop;
+
+    @ApiModelProperty(value = "机构编码")
+    private String deptCode;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "区县")
+    private String area;
+
+    @ApiModelProperty(value = "门店")
+    private String house;
+
+    @ApiModelProperty(value = "子公司C,门店M,部门D")
+    private String deptType;
+
+    @ApiModelProperty(value = "管理费比例%")
+    private double managementFee;
+
+
+}

src/main/java/com/ydtech/modules/admin/service/SysDeptService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.admin.model.SysDept;
+import com.ydtech.modules.admin.model.vo.SysDeptVo;
 import com.ydtech.modules.admin.model.vo.TreeSysDeptVO;
 
 import java.util.List;
@@ -41,7 +42,7 @@ public interface SysDeptService extends IService<SysDept> {
      * 增加机构
      * @param sysDept 机构信息
      */
-    void addDept(SysDept sysDept);
+    void addDept(SysDeptVo sysDeptVo);
 
 
     /**

src/main/java/com/ydtech/modules/admin/service/impl/SysDeptServiceImpl.java

@@ -10,11 +10,14 @@ import com.ydtech.core.page.PageResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.dao.SysDeptMapper;
 import com.ydtech.modules.admin.model.SysDept;
+import com.ydtech.modules.admin.model.vo.SysDeptVo;
 import com.ydtech.modules.admin.model.vo.TreeSysDeptVO;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.utils.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,13 +43,37 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
     }
 
     @Override
-    public void addDept(SysDept sysDept) {
+    public void addDept(SysDeptVo sysDeptVo) {
+        SysDept sysDept = new SysDept();
+        BeanUtils.copyProperties(sysDeptVo, sysDept);
+        String comlevel = sysDept.getComlevel();
+        String parentId = sysDept.getParentId();
+
+        String number = "9";
+        if (comlevel.equals("2")) {
+            AssertionUtils.isStringEmpty(sysDept.getProvince(), "二级机构份必填");
+            number = sysDept.getProvince();
+        } else if (comlevel.equals("3")) {
+            AssertionUtils.isStringEmpty(sysDept.getCity(), "三级机构市必填");
+            number = sysDept.getCity();
+        } else if (comlevel.equals("4")) {
+            AssertionUtils.isStringEmpty(sysDept.getArea(), "四级机构区必填");
+            number = sysDept.getArea();
+        }
+
+        String substring = number.substring(number.length() - 2);
+        String serialNumber = parentId + substring;
+        sysDept.setId(serialNumber);
+
         SysDept dept = getById(sysDept.getId());
-        AssertionUtils.isEmpty(dept, "机构编号为:" + dept.getId() + " " + dept.getName() + "已被占用");
+        if (!ObjectUtils.isEmpty(dept)) {
+            throw new SystemException("机构编号为:" + dept.getId() + " " + dept.getName() + "已被占用");
+        }
         boolean b = save(sysDept);
         AssertionUtils.isSucceed(b, "删除失败");
     }
 
+
     @Override
     public void deleteDept(String deptId) {
         SysDept sysDept = getById(deptId);
@@ -60,7 +87,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
     }
 
     @Override
-    public PageResult findSubDepts(PageRequest pageRequest) {
+    public PageResult<SysDept> findSubDepts(PageRequest pageRequest) {
         String id = pageRequest.getColumnFilterValue(pageRequest, "id");
 
         Page<SysDept> p = PageRequest.buildPageRequest(pageRequest);
@@ -68,8 +95,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
         lqw.eq(StringUtils.isNotEmpty(id), SysDept::getParentId, id);
         IPage<SysDept> pResult = page(p, lqw);
         //传入查询条件
-        PageResult pageResult = PageResult.buildPageResult(pResult);
-        return pageResult;
+        return PageResult.buildPageResult(pResult);
 
     }