diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java index ce642d40..fd602c0a 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java @@ -257,7 +257,7 @@ public class QcController { **/ @PostMapping(value="/samplingInspectionPlanSearch") public R samplingInspectionPlanSearch(@RequestBody QcSamplingInspectionPlanData data){ - PageUtils page = qcService.samplingInspectionPlanSearch(data); + PageUtils page = qcService.samplingInspectionPlanSearch(data); return R.ok().put("page", page); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java index 6d7f0be6..ac3ca807 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java @@ -1060,10 +1060,12 @@ public class EamServiceImpl implements EamService { List actualOperatorList = eamMapper.getActualOperatorList(data.getSite(), data.getOrderNo(), data.getFunctionType()); String operator = ""; for (int i = 0; i < actualOperatorList.size(); i++) { - if (operator.equals("")){ - operator = actualOperatorList.get(i); - }else { - operator = operator + ";" + actualOperatorList.get(i); + if (actualOperatorList.get(i) != null){ + if (operator.equals("")){ + operator = actualOperatorList.get(i); + }else { + operator = operator + ";" + actualOperatorList.get(i); + } } } data.setActualOperatorName(operator); diff --git a/src/main/java/com/xujie/sys/modules/sys/controller/SysDepartmentController.java b/src/main/java/com/xujie/sys/modules/sys/controller/SysDepartmentController.java new file mode 100644 index 00000000..b142c2f8 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/sys/controller/SysDepartmentController.java @@ -0,0 +1,65 @@ +package com.xujie.sys.modules.sys.controller; +import com.xujie.sys.common.utils.PageUtils; +import com.xujie.sys.common.utils.R; +import com.xujie.sys.modules.pms.data.QcSamplingInspectionPlanData; +import com.xujie.sys.modules.sys.entity.SysDepartmentEntity; +import com.xujie.sys.modules.sys.entity.SysUserEntity; +import com.xujie.sys.modules.sys.service.SysDepartmentService; +import com.xujie.sys.modules.sys.service.SysUserRoleService; +import com.xujie.sys.modules.sys.service.SysUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @description: 部门管理 + * @author: fengyuan_yang + * @date: 2023/6/30 13:34 + * @param: + * @return: + **/ +@RestController +@RequestMapping("/sys/department") +public class SysDepartmentController{ + @Autowired + private SysDepartmentService sysDepartmentService; + + /** + * @description: 查询部门 + * @author: fengyuan_yang + * @date: 2023/6/30 13:42 + * @param: [data] + * @return: com.xujie.sys.common.utils.R + **/ + @PostMapping("departmentSearch") + public R departmentSearch(@RequestBody SysDepartmentEntity data){ + PageUtils page = sysDepartmentService.departmentSearch(data); + return R.ok().put("page", page); + } + + /** + * @description: 新增部门 + * @author: fengyuan_yang + * @date: 2023/6/30 13:49 + * @param: [data] + * @return: com.xujie.sys.common.utils.R + **/ + @PostMapping(value="/departmentSave") + public R departmentSave(@RequestBody SysDepartmentEntity data){ + sysDepartmentService.departmentSave(data); + return R.ok(); + } + + /** + * @description: 删除部门 + * @author: fengyuan_yang + * @date: 2023/6/30 13:50 + * @param: [data] + * @return: com.xujie.sys.common.utils.R + **/ + @PostMapping(value="/departmentDelete") + public R departmentDelete(@RequestBody SysDepartmentEntity data){ + sysDepartmentService.departmentDelete(data); + return R.ok(); + } + +} diff --git a/src/main/java/com/xujie/sys/modules/sys/entity/SysDepartmentEntity.java b/src/main/java/com/xujie/sys/modules/sys/entity/SysDepartmentEntity.java new file mode 100644 index 00000000..701d0795 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/sys/entity/SysDepartmentEntity.java @@ -0,0 +1,84 @@ +package com.xujie.sys.modules.sys.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xujie.sys.common.utils.QueryPage; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +public class SysDepartmentEntity extends QueryPage { + // 工厂 + private String site; + // 部门编码 + private String departmentId; + // 部门名称 + private String departmentName; + // 创建时间 + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date createDate; + // 创建人 + private String createBy; + // 更新时间 + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date updateDate; + // 更新人 + private String updateBy; + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getDepartmentId() { + return departmentId; + } + + public void setDepartmentId(String departmentId) { + this.departmentId = departmentId; + } + + public String getDepartmentName() { + return departmentName; + } + + public void setDepartmentName(String departmentName) { + this.departmentName = departmentName; + } + + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Date getUpdateDate() { + return updateDate; + } + + public void setUpdateDate(Date updateDate) { + this.updateDate = updateDate; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } +} diff --git a/src/main/java/com/xujie/sys/modules/sys/mapper/SysDepartmentMapper.java b/src/main/java/com/xujie/sys/modules/sys/mapper/SysDepartmentMapper.java new file mode 100644 index 00000000..aa35058e --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/sys/mapper/SysDepartmentMapper.java @@ -0,0 +1,22 @@ +package com.xujie.sys.modules.sys.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.xujie.sys.modules.sys.entity.SysDepartmentEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SysDepartmentMapper { + IPage departmentSearch(Page sysDepartmentEntityPage, @Param("query") SysDepartmentEntity data); + + void departmentSave(SysDepartmentEntity data); + + void departmentDelete(SysDepartmentEntity data); + + List selectDepartmentInObject(SysDepartmentEntity data); + + List selectDepartmentInAdmin(SysDepartmentEntity data); +} diff --git a/src/main/java/com/xujie/sys/modules/sys/service/SysDepartmentService.java b/src/main/java/com/xujie/sys/modules/sys/service/SysDepartmentService.java new file mode 100644 index 00000000..3df034bf --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/sys/service/SysDepartmentService.java @@ -0,0 +1,12 @@ +package com.xujie.sys.modules.sys.service; + +import com.xujie.sys.common.utils.PageUtils; +import com.xujie.sys.modules.sys.entity.SysDepartmentEntity; + +public interface SysDepartmentService { + PageUtils departmentSearch(SysDepartmentEntity data); + + void departmentSave(SysDepartmentEntity data); + + void departmentDelete(SysDepartmentEntity data); +} diff --git a/src/main/java/com/xujie/sys/modules/sys/service/impl/SysDepartmentServiceImpl.java b/src/main/java/com/xujie/sys/modules/sys/service/impl/SysDepartmentServiceImpl.java new file mode 100644 index 00000000..7b226845 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/sys/service/impl/SysDepartmentServiceImpl.java @@ -0,0 +1,64 @@ +package com.xujie.sys.modules.sys.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.xujie.sys.common.utils.PageUtils; +import com.xujie.sys.modules.pms.data.EamObjectData; +import com.xujie.sys.modules.pms.data.QcTemplateData; +import com.xujie.sys.modules.sys.entity.SysDepartmentEntity; +import com.xujie.sys.modules.sys.mapper.SysDepartmentMapper; +import com.xujie.sys.modules.sys.service.SysDepartmentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class SysDepartmentServiceImpl implements SysDepartmentService { + + @Autowired + private SysDepartmentMapper sysDepartmentMapper; + + /** + * @description: 查询部门 + * @author: fengyuan_yang + * @date: 2023/6/30 13:53 + * @param: [data] + * @return: com.xujie.sys.common.utils.PageUtils + **/ + @Override + public PageUtils departmentSearch(SysDepartmentEntity data) { + IPage resultList = this.sysDepartmentMapper.departmentSearch(new Page(data.getPage(), data.getLimit()), data); + return new PageUtils(resultList); + } + + /** + * @description: 新增部门 + * @author: fengyuan_yang + * @date: 2023/6/30 13:53 + * @param: [data] + * @return: void + **/ + @Override + public void departmentSave(SysDepartmentEntity data) { + sysDepartmentMapper.departmentSave(data); + } + + /** + * @description: 删除部门 + * @author: fengyuan_yang + * @date: 2023/6/30 13:54 + * @param: [data] + * @return: void + **/ + @Override + public void departmentDelete(SysDepartmentEntity data) { + // 判断该部门是否被设备和人员引用 + List objectList = sysDepartmentMapper.selectDepartmentInObject(data); + List adminList = sysDepartmentMapper.selectDepartmentInAdmin(data); + if (objectList.size() > 0 || adminList.size() > 0){ + throw new RuntimeException("该部门已被引用，不能删除！"); + } + sysDepartmentMapper.departmentDelete(data); + } +} diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index 9d9c67f3..2f6d6689 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -1547,16 +1547,16 @@ b.MinValue,b.ItemRemark,b.ItemType diff --git a/src/main/resources/mapper/sys/SysDepartmentMapper.xml b/src/main/resources/mapper/sys/SysDepartmentMapper.xml new file mode 100644 index 00000000..93cc8a68 --- /dev/null +++ b/src/main/resources/mapper/sys/SysDepartmentMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + insert into sys_department (site, department_id, department_name, create_date, create_by, update_date, update_by) + values (#{site}, #{departmentId}, #{departmentName}, getDate(), #{createBy}, getDate(), #{updateBy}) + + + + + delete from sys_department + where site = #{site} + and department_id = #{departmentId} + + + + + + + + +