From aba7eecea31551274c45ba4737c98aa9244babf8 Mon Sep 17 00:00:00 2001 From: zhouhy Date: Wed, 18 Oct 2023 10:52:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E9=A1=B9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseMonitorWorkUnitController.java | 18 ++ .../BaseQualityInspectionItemController.java | 110 ++++++++++ .../domain/BaseQualityInspectionItem.java | 196 ++++++++++++++++++ .../BaseQualityInspectionItemMapper.java | 62 ++++++ .../IBaseQualityInspectionItemService.java | 62 ++++++ ....java => BaseMaterialInfoServiceImpl.java} | 0 .../impl/BaseMonitorWorkUnitServiceImpl.java | 17 +- .../BaseQualityInspectionItemServiceImpl.java | 98 +++++++++ .../mapper/base/BaseMonitorWorkUnitMapper.xml | 3 +- .../base/BaseQualityInspectionItemMapper.xml | 119 +++++++++++ 10 files changed, 676 insertions(+), 9 deletions(-) create mode 100644 aucma-base/src/main/java/com/aucma/base/controller/BaseQualityInspectionItemController.java create mode 100644 aucma-base/src/main/java/com/aucma/base/domain/BaseQualityInspectionItem.java create mode 100644 aucma-base/src/main/java/com/aucma/base/mapper/BaseQualityInspectionItemMapper.java create mode 100644 aucma-base/src/main/java/com/aucma/base/service/IBaseQualityInspectionItemService.java rename aucma-base/src/main/java/com/aucma/base/service/impl/{BaseMaterialinfoServiceImpl.java => BaseMaterialInfoServiceImpl.java} (100%) create mode 100644 aucma-base/src/main/java/com/aucma/base/service/impl/BaseQualityInspectionItemServiceImpl.java create mode 100644 aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml diff --git a/aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorWorkUnitController.java b/aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorWorkUnitController.java index c220795..dadde3e 100644 --- a/aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorWorkUnitController.java +++ b/aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorWorkUnitController.java @@ -3,6 +3,10 @@ package com.aucma.base.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.aucma.base.domain.BaseMonitorInfo; +import com.aucma.base.domain.BaseWorkUnit; +import com.aucma.base.service.IBaseMonitorInfoService; +import com.aucma.base.service.IBaseWorkUnitService; import com.aucma.common.utils.DateUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +39,12 @@ public class BaseMonitorWorkUnitController extends BaseController { @Autowired private IBaseMonitorWorkUnitService baseMonitorWorkUnitService; + @Autowired + private IBaseMonitorInfoService baseMonitorInfoService; + + @Autowired + private IBaseWorkUnitService baseWorkUnitService; + /** * 查询统计计量信息列表 */ @@ -74,6 +84,10 @@ public class BaseMonitorWorkUnitController extends BaseController { @Log(title = "统计计量信息" , businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody BaseMonitorWorkUnit baseMonitorWorkUnit) { + BaseMonitorInfo baseMonitorInfo = baseMonitorInfoService.selectBaseMonitorInfoByObjId(Long.valueOf(baseMonitorWorkUnit.getMonitorCode())); + baseMonitorWorkUnit.setMonitorCode(baseMonitorInfo.getMonitorCode()); + BaseWorkUnit baseWorkUnit = baseWorkUnitService.selectBaseWorkUnitByObjId(Long.valueOf(baseMonitorWorkUnit.getWorkUnitCode())); + baseMonitorWorkUnit.setWorkUnitCode(baseWorkUnit.getWorkUnitCode()); baseMonitorWorkUnit.setCreatedBy(getUsername()); baseMonitorWorkUnit.setCreatedTime(DateUtils.getNowDate()); return toAjax(baseMonitorWorkUnitService.insertBaseMonitorWorkUnit(baseMonitorWorkUnit)); @@ -86,6 +100,10 @@ public class BaseMonitorWorkUnitController extends BaseController { @Log(title = "统计计量信息" , businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody BaseMonitorWorkUnit baseMonitorWorkUnit) { + BaseMonitorInfo baseMonitorInfo = baseMonitorInfoService.selectBaseMonitorInfoByObjId(Long.valueOf(baseMonitorWorkUnit.getMonitorCode())); + baseMonitorWorkUnit.setMonitorCode(baseMonitorInfo.getMonitorCode()); + BaseWorkUnit baseWorkUnit = baseWorkUnitService.selectBaseWorkUnitByObjId(Long.valueOf(baseMonitorWorkUnit.getWorkUnitCode())); + baseMonitorWorkUnit.setWorkUnitCode(baseWorkUnit.getWorkUnitCode()); baseMonitorWorkUnit.setUpdatedBy(getUsername()); baseMonitorWorkUnit.setUpdatedTime(DateUtils.getNowDate()); return toAjax(baseMonitorWorkUnitService.updateBaseMonitorWorkUnit(baseMonitorWorkUnit)); diff --git a/aucma-base/src/main/java/com/aucma/base/controller/BaseQualityInspectionItemController.java b/aucma-base/src/main/java/com/aucma/base/controller/BaseQualityInspectionItemController.java new file mode 100644 index 0000000..1ff77b9 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/controller/BaseQualityInspectionItemController.java @@ -0,0 +1,110 @@ +package com.aucma.base.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.aucma.common.utils.DateUtils; +import org.springframework.security.access.prepost.PreAuthorize; +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.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.aucma.common.annotation.Log; +import com.aucma.common.core.controller.BaseController; +import com.aucma.common.core.domain.AjaxResult; +import com.aucma.common.enums.BusinessType; +import com.aucma.base.domain.BaseQualityInspectionItem; +import com.aucma.base.service.IBaseQualityInspectionItemService; +import com.aucma.common.utils.poi.ExcelUtil; +import com.aucma.common.core.page.TableDataInfo; + +/** + * 质检项信息维护Controller + * + * @author Yinq + * @date 2023-10-16 + */ +@RestController +@RequestMapping("/base/qualityInspectionItem" ) +public class BaseQualityInspectionItemController extends BaseController { + @Autowired + private IBaseQualityInspectionItemService baseQualityInspectionItemService; + + /** + * 查询质检项信息维护列表 + */ + @PreAuthorize("@ss.hasPermi('base:qualityInspectionItem:list')" ) + @GetMapping("/list" ) + public TableDataInfo list(BaseQualityInspectionItem baseQualityInspectionItem) { + startPage(); + List list = baseQualityInspectionItemService.selectBaseQualityInspectionItemList(baseQualityInspectionItem); + return getDataTable(list); + } + + /** + * 导出质检项信息维护列表 + */ + @PreAuthorize("@ss.hasPermi('base:qualityInspectionItem:export')" ) + @Log(title = "质检项信息维护" , businessType = BusinessType.EXPORT) + @PostMapping("/export" ) + public void export(HttpServletResponse response, BaseQualityInspectionItem baseQualityInspectionItem) { + List list = baseQualityInspectionItemService.selectBaseQualityInspectionItemList(baseQualityInspectionItem); + ExcelUtil util = new ExcelUtil(BaseQualityInspectionItem. class); + util.exportExcel(response, list, "质检项信息维护数据" ); + } + + /** + * 获取质检项信息维护详细信息 + */ + @PreAuthorize("@ss.hasPermi('base:qualityInspectionItem:query')" ) + @GetMapping(value = "/{objId}" ) + public AjaxResult getInfo(@PathVariable("objId" ) Long objId) { + return success(baseQualityInspectionItemService.selectBaseQualityInspectionItemByObjId(objId)); + } + /** + * 查询所有父级以及名称 + * */ + @GetMapping("/getParent") + public AjaxResult getParent(){ + return success(baseQualityInspectionItemService.selectBaseQualityInspectionItemParent()); + } + + /** + * 新增质检项信息维护 + */ + @PreAuthorize("@ss.hasPermi('base:qualityInspectionItem:add')" ) + @Log(title = "质检项信息维护" , businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BaseQualityInspectionItem baseQualityInspectionItem) { + baseQualityInspectionItem.setCreatedBy(getUsername()); + baseQualityInspectionItem.setCreatedTime(DateUtils.getNowDate()); + return toAjax(baseQualityInspectionItemService.insertBaseQualityInspectionItem(baseQualityInspectionItem)); + } + + /** + * 修改质检项信息维护 + */ + @PreAuthorize("@ss.hasPermi('base:qualityInspectionItem:edit')" ) + @Log(title = "质检项信息维护" , businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BaseQualityInspectionItem baseQualityInspectionItem) { + baseQualityInspectionItem.setUpdatedBy(getUsername()); + baseQualityInspectionItem.setUpdatedTime(DateUtils.getNowDate()); + return toAjax(baseQualityInspectionItemService.updateBaseQualityInspectionItem(baseQualityInspectionItem)); + } + + /** + * 删除质检项信息维护 + */ + @PreAuthorize("@ss.hasPermi('base:qualityInspectionItem:remove')" ) + @Log(title = "质检项信息维护" , businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}" ) + public AjaxResult remove(@PathVariable Long[] objIds) { + return toAjax(baseQualityInspectionItemService.deleteBaseQualityInspectionItemByObjIds(objIds)); + } +} diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseQualityInspectionItem.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseQualityInspectionItem.java new file mode 100644 index 0000000..db41cde --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseQualityInspectionItem.java @@ -0,0 +1,196 @@ +package com.aucma.base.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.aucma.common.annotation.Excel; +import com.aucma.common.core.domain.BaseEntity; + +/** + * 质检项信息维护对象 base_quality_inspection_item + * + * @author Yinq + * @date 2023-10-16 + */ +public class BaseQualityInspectionItem extends BaseEntity + { +private static final long serialVersionUID=1L; + + /** 主键标识 */ + private Long objId; + + /** 质检项/质量缺陷编号 */ + @Excel(name = "质检项/质量缺陷编号") + private String qualityDefectCode; + + /** 质检项/质量缺陷描述 */ + @Excel(name = "质检项/质量缺陷描述") + private String qualityDefectName; + + /** 父级编号 */ + @Excel(name = "父级编号") + private String parentId; + + /** 物料大类 */ + @Excel(name = "物料大类") + private String materialCategories; + + /** 物料小类 */ + @Excel(name = "物料小类") + private String materialSubclass; + + /** 工厂编号 */ + @Excel(name = "工厂编号") + private String plantCode; + + /** 启用标识 */ + @Excel(name = "启用标识") + private Long isFlag; + + /** 创建人 */ + @Excel(name = "创建人") + private String createdBy; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; + + /** 更新人 */ + @Excel(name = "更新人") + private String updatedBy; + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date updatedTime; + + public void setObjId(Long objId) + { + this.objId = objId; + } + + public Long getObjId() + { + return objId; + } + public void setQualityDefectCode(String qualityDefectCode) + { + this.qualityDefectCode = qualityDefectCode; + } + + public String getQualityDefectCode() + { + return qualityDefectCode; + } + public void setQualityDefectName(String qualityDefectName) + { + this.qualityDefectName = qualityDefectName; + } + + public String getQualityDefectName() + { + return qualityDefectName; + } + public void setParentId(String parentId) + { + this.parentId = parentId; + } + + public String getParentId() + { + return parentId; + } + public void setMaterialCategories(String materialCategories) + { + this.materialCategories = materialCategories; + } + + public String getMaterialCategories() + { + return materialCategories; + } + public void setMaterialSubclass(String materialSubclass) + { + this.materialSubclass = materialSubclass; + } + + public String getMaterialSubclass() + { + return materialSubclass; + } + public void setPlantCode(String plantCode) + { + this.plantCode = plantCode; + } + + public String getPlantCode() + { + return plantCode; + } + public void setIsFlag(Long isFlag) + { + this.isFlag = isFlag; + } + + public Long getIsFlag() + { + return isFlag; + } + public void setCreatedBy(String createdBy) + { + this.createdBy = createdBy; + } + + public String getCreatedBy() + { + return createdBy; + } + public void setCreatedTime(Date createdTime) + { + this.createdTime = createdTime; + } + + public Date getCreatedTime() + { + return createdTime; + } + public void setUpdatedBy(String updatedBy) + { + this.updatedBy = updatedBy; + } + + public String getUpdatedBy() + { + return updatedBy; + } + public void setUpdatedTime(Date updatedTime) + { + this.updatedTime = updatedTime; + } + + public Date getUpdatedTime() + { + return updatedTime; + } + +@Override +public String toString(){ + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objId",getObjId()) + .append("qualityDefectCode",getQualityDefectCode()) + .append("qualityDefectName",getQualityDefectName()) + .append("parentId",getParentId()) + .append("materialCategories",getMaterialCategories()) + .append("materialSubclass",getMaterialSubclass()) + .append("plantCode",getPlantCode()) + .append("remark",getRemark()) + .append("isFlag",getIsFlag()) + .append("createdBy",getCreatedBy()) + .append("createdTime",getCreatedTime()) + .append("updatedBy",getUpdatedBy()) + .append("updatedTime",getUpdatedTime()) + .toString(); + } + } diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseQualityInspectionItemMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseQualityInspectionItemMapper.java new file mode 100644 index 0000000..63281e1 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/mapper/BaseQualityInspectionItemMapper.java @@ -0,0 +1,62 @@ +package com.aucma.base.mapper; + +import java.util.List; +import com.aucma.base.domain.BaseQualityInspectionItem; + +/** + * 质检项信息维护Mapper接口 + * + * @author Yinq + * @date 2023-10-16 + */ +public interface BaseQualityInspectionItemMapper +{ + /** + * 查询质检项信息维护 + * + * @param objId 质检项信息维护主键 + * @return 质检项信息维护 + */ + public BaseQualityInspectionItem selectBaseQualityInspectionItemByObjId(Long objId); + + /** + * 查询质检项信息维护列表 + * + * @param baseQualityInspectionItem 质检项信息维护 + * @return 质检项信息维护集合 + */ + public List selectBaseQualityInspectionItemList(BaseQualityInspectionItem baseQualityInspectionItem); + + List selectBaseQualityInspectionItemParent(); + /** + * 新增质检项信息维护 + * + * @param baseQualityInspectionItem 质检项信息维护 + * @return 结果 + */ + public int insertBaseQualityInspectionItem(BaseQualityInspectionItem baseQualityInspectionItem); + + /** + * 修改质检项信息维护 + * + * @param baseQualityInspectionItem 质检项信息维护 + * @return 结果 + */ + public int updateBaseQualityInspectionItem(BaseQualityInspectionItem baseQualityInspectionItem); + + /** + * 删除质检项信息维护 + * + * @param objId 质检项信息维护主键 + * @return 结果 + */ + public int deleteBaseQualityInspectionItemByObjId(Long objId); + + /** + * 批量删除质检项信息维护 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseQualityInspectionItemByObjIds(Long[] objIds); +} diff --git a/aucma-base/src/main/java/com/aucma/base/service/IBaseQualityInspectionItemService.java b/aucma-base/src/main/java/com/aucma/base/service/IBaseQualityInspectionItemService.java new file mode 100644 index 0000000..50c6536 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/service/IBaseQualityInspectionItemService.java @@ -0,0 +1,62 @@ +package com.aucma.base.service; + +import java.util.List; +import com.aucma.base.domain.BaseQualityInspectionItem; + +/** + * 质检项信息维护Service接口 + * + * @author Yinq + * @date 2023-10-16 + */ +public interface IBaseQualityInspectionItemService +{ + /** + * 查询质检项信息维护 + * + * @param objId 质检项信息维护主键 + * @return 质检项信息维护 + */ + public BaseQualityInspectionItem selectBaseQualityInspectionItemByObjId(Long objId); + + List selectBaseQualityInspectionItemParent(); + /** + * 查询质检项信息维护列表 + * + * @param baseQualityInspectionItem 质检项信息维护 + * @return 质检项信息维护集合 + */ + public List selectBaseQualityInspectionItemList(BaseQualityInspectionItem baseQualityInspectionItem); + + /** + * 新增质检项信息维护 + * + * @param baseQualityInspectionItem 质检项信息维护 + * @return 结果 + */ + public int insertBaseQualityInspectionItem(BaseQualityInspectionItem baseQualityInspectionItem); + + /** + * 修改质检项信息维护 + * + * @param baseQualityInspectionItem 质检项信息维护 + * @return 结果 + */ + public int updateBaseQualityInspectionItem(BaseQualityInspectionItem baseQualityInspectionItem); + + /** + * 批量删除质检项信息维护 + * + * @param objIds 需要删除的质检项信息维护主键集合 + * @return 结果 + */ + public int deleteBaseQualityInspectionItemByObjIds(Long[] objIds); + + /** + * 删除质检项信息维护信息 + * + * @param objId 质检项信息维护主键 + * @return 结果 + */ + public int deleteBaseQualityInspectionItemByObjId(Long objId); +} diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMaterialinfoServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMaterialInfoServiceImpl.java similarity index 100% rename from aucma-base/src/main/java/com/aucma/base/service/impl/BaseMaterialinfoServiceImpl.java rename to aucma-base/src/main/java/com/aucma/base/service/impl/BaseMaterialInfoServiceImpl.java diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorWorkUnitServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorWorkUnitServiceImpl.java index 230a0fe..7c65bd6 100644 --- a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorWorkUnitServiceImpl.java +++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorWorkUnitServiceImpl.java @@ -9,19 +9,19 @@ import com.aucma.base.service.IBaseMonitorWorkUnitService; /** * 统计计量信息Service业务层处理 - * + * * @author Yinq * @date 2023-10-12 */ @Service -public class BaseMonitorWorkUnitServiceImpl implements IBaseMonitorWorkUnitService +public class BaseMonitorWorkUnitServiceImpl implements IBaseMonitorWorkUnitService { @Autowired private BaseMonitorWorkUnitMapper baseMonitorWorkUnitMapper; /** * 查询统计计量信息 - * + * * @param objId 统计计量信息主键 * @return 统计计量信息 */ @@ -33,7 +33,7 @@ public class BaseMonitorWorkUnitServiceImpl implements IBaseMonitorWorkUnitServi /** * 查询统计计量信息列表 - * + * * @param baseMonitorWorkUnit 统计计量信息 * @return 统计计量信息 */ @@ -45,19 +45,20 @@ public class BaseMonitorWorkUnitServiceImpl implements IBaseMonitorWorkUnitServi /** * 新增统计计量信息 - * + * * @param baseMonitorWorkUnit 统计计量信息 * @return 结果 */ @Override public int insertBaseMonitorWorkUnit(BaseMonitorWorkUnit baseMonitorWorkUnit) { + return baseMonitorWorkUnitMapper.insertBaseMonitorWorkUnit(baseMonitorWorkUnit); } /** * 修改统计计量信息 - * + * * @param baseMonitorWorkUnit 统计计量信息 * @return 结果 */ @@ -69,7 +70,7 @@ public class BaseMonitorWorkUnitServiceImpl implements IBaseMonitorWorkUnitServi /** * 批量删除统计计量信息 - * + * * @param objIds 需要删除的统计计量信息主键 * @return 结果 */ @@ -81,7 +82,7 @@ public class BaseMonitorWorkUnitServiceImpl implements IBaseMonitorWorkUnitServi /** * 删除统计计量信息信息 - * + * * @param objId 统计计量信息主键 * @return 结果 */ diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseQualityInspectionItemServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseQualityInspectionItemServiceImpl.java new file mode 100644 index 0000000..22d2a25 --- /dev/null +++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseQualityInspectionItemServiceImpl.java @@ -0,0 +1,98 @@ +package com.aucma.base.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.aucma.base.mapper.BaseQualityInspectionItemMapper; +import com.aucma.base.domain.BaseQualityInspectionItem; +import com.aucma.base.service.IBaseQualityInspectionItemService; + +/** + * 质检项信息维护Service业务层处理 + * + * @author Yinq + * @date 2023-10-16 + */ +@Service +public class BaseQualityInspectionItemServiceImpl implements IBaseQualityInspectionItemService +{ + @Autowired + private BaseQualityInspectionItemMapper baseQualityInspectionItemMapper; + + /** + * 查询质检项信息维护 + * + * @param objId 质检项信息维护主键 + * @return 质检项信息维护 + */ + @Override + public BaseQualityInspectionItem selectBaseQualityInspectionItemByObjId(Long objId) + { + return baseQualityInspectionItemMapper.selectBaseQualityInspectionItemByObjId(objId); + } + + @Override + public List selectBaseQualityInspectionItemParent() { + return baseQualityInspectionItemMapper.selectBaseQualityInspectionItemParent(); + } + + /** + * 查询质检项信息维护列表 + * + * @param baseQualityInspectionItem 质检项信息维护 + * @return 质检项信息维护 + */ + @Override + public List selectBaseQualityInspectionItemList(BaseQualityInspectionItem baseQualityInspectionItem) + { + return baseQualityInspectionItemMapper.selectBaseQualityInspectionItemList(baseQualityInspectionItem); + } + + /** + * 新增质检项信息维护 + * + * @param baseQualityInspectionItem 质检项信息维护 + * @return 结果 + */ + @Override + public int insertBaseQualityInspectionItem(BaseQualityInspectionItem baseQualityInspectionItem) + { + return baseQualityInspectionItemMapper.insertBaseQualityInspectionItem(baseQualityInspectionItem); + } + + /** + * 修改质检项信息维护 + * + * @param baseQualityInspectionItem 质检项信息维护 + * @return 结果 + */ + @Override + public int updateBaseQualityInspectionItem(BaseQualityInspectionItem baseQualityInspectionItem) + { + return baseQualityInspectionItemMapper.updateBaseQualityInspectionItem(baseQualityInspectionItem); + } + + /** + * 批量删除质检项信息维护 + * + * @param objIds 需要删除的质检项信息维护主键 + * @return 结果 + */ + @Override + public int deleteBaseQualityInspectionItemByObjIds(Long[] objIds) + { + return baseQualityInspectionItemMapper.deleteBaseQualityInspectionItemByObjIds(objIds); + } + + /** + * 删除质检项信息维护信息 + * + * @param objId 质检项信息维护主键 + * @return 结果 + */ + @Override + public int deleteBaseQualityInspectionItemByObjId(Long objId) + { + return baseQualityInspectionItemMapper.deleteBaseQualityInspectionItemByObjId(objId); + } +} diff --git a/aucma-base/src/main/resources/mapper/base/BaseMonitorWorkUnitMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseMonitorWorkUnitMapper.xml index 2ca850d..d8a460c 100644 --- a/aucma-base/src/main/resources/mapper/base/BaseMonitorWorkUnitMapper.xml +++ b/aucma-base/src/main/resources/mapper/base/BaseMonitorWorkUnitMapper.xml @@ -40,6 +40,7 @@ and updated_by = #{updatedBy} and updated_time = #{updatedTime} + order by OBJ_ID + + + and quality_defect_code = #{qualityDefectCode} + and quality_defect_name like concat(concat('%', #{qualityDefectName}), '%') + and parent_id = #{parentId} + and material_categories = #{materialCategories} + and material_subclass = #{materialSubclass} + and plant_code = #{plantCode} + and is_flag = #{isFlag} + and created_by = #{createdBy} + and created_time = #{createdTime} + and updated_by = #{updatedBy} + and updated_time = #{updatedTime} + + + + + + + + + SELECT seq_base_quality_inspection.NEXTVAL as objId FROM DUAL + + insert into base_quality_inspection_item + + obj_id, + quality_defect_code, + quality_defect_name, + parent_id, + material_categories, + material_subclass, + plant_code, + remark, + is_flag, + created_by, + created_time, + updated_by, + updated_time, + + + #{objId}, + #{qualityDefectCode}, + #{qualityDefectName}, + #{parentId}, + #{materialCategories}, + #{materialSubclass}, + #{plantCode}, + #{remark}, + #{isFlag}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + + + + + update base_quality_inspection_item + + quality_defect_code = #{qualityDefectCode}, + quality_defect_name = #{qualityDefectName}, + parent_id = #{parentId}, + material_categories = #{materialCategories}, + material_subclass = #{materialSubclass}, + plant_code = #{plantCode}, + remark = #{remark}, + is_flag = #{isFlag}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + + where obj_id = #{objId} + + + + delete from base_quality_inspection_item where obj_id = #{objId} + + + + delete from base_quality_inspection_item where obj_id in + + #{objId} + + +