diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartDTO.java new file mode 100644 index 000000000..0f795e1b6 --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartDTO.java @@ -0,0 +1,45 @@ +package com.op.system.api.domain.quality; + +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; +import java.util.List; + +/** + * + *echart 图标实体 + * @author zxl + * @date 2023-07-18 + */ +public class ChartDTO { + private String name; + private String type; + private List data; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java new file mode 100644 index 000000000..980096f2f --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeController.java @@ -0,0 +1,92 @@ +package com.op.quality.controller; + +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.web.page.TableDataInfo; +import com.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; + +import com.op.quality.domain.QcDefectType; +import com.op.quality.service.IQcDefectTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 不良类型维护Controller + * + * @author wws + * @date 2023-10-12 + */ +@RestController +@RequestMapping("/defectType") +public class QcDefectTypeController extends BaseController { + @Autowired + private IQcDefectTypeService qcDefectTypeService; + + /** + * 查询不良类型维护列表 + */ + @RequiresPermissions("quality:defectType:list") + @GetMapping("/list") + public TableDataInfo list(QcDefectType qcDefectType) { + startPage(); + List list = qcDefectTypeService.selectQcDefectTypeList(qcDefectType); + return getDataTable(list); + } + + /** + * 导出不良类型维护列表 + */ + @RequiresPermissions("quality:defectType:export") + @Log(title = "不良类型维护", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QcDefectType qcDefectType) { + List list = qcDefectTypeService.selectQcDefectTypeList(qcDefectType); + ExcelUtil util = new ExcelUtil(QcDefectType.class); + util.exportExcel(response, list, "不良类型维护数据"); + } + + /** + * 获取不良类型维护详细信息 + */ + @RequiresPermissions("quality:defectType:query") + @GetMapping(value = "/{defectId}") + public AjaxResult getInfo(@PathVariable("defectId") String defectId) { + return success(qcDefectTypeService.selectQcDefectTypeByDefectId(defectId)); + } + + /** + * 新增不良类型维护 + */ + @RequiresPermissions("quality:defectType:add") + @Log(title = "不良类型维护", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QcDefectType qcDefectType) { + return qcDefectTypeService.insertQcDefectType(qcDefectType); + } + + /** + * 修改不良类型维护 + */ + @RequiresPermissions("quality:defectType:edit") + @Log(title = "不良类型维护", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QcDefectType qcDefectType) { + return qcDefectTypeService.updateQcDefectType(qcDefectType); + } + + /** + * 删除不良类型维护 + */ + @RequiresPermissions("quality:defectType:remove") + @Log(title = "不良类型维护", businessType = BusinessType.DELETE) + @DeleteMapping("/{defectIds}") + public AjaxResult remove(@PathVariable String[] defectIds) { + return toAjax(qcDefectTypeService.deleteQcDefectTypeByDefectIds(defectIds)); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java index 71b5a8b18..d9d480d1e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java @@ -1,9 +1,11 @@ package com.op.quality.controller; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.util.Arrays; -import java.util.List; +import java.util.*; import javax.servlet.http.HttpServletResponse; import com.op.common.core.utils.DateUtils; @@ -72,18 +74,86 @@ public class QcStaticTableController extends BaseController { * 生产过程质量报表 */ @RequiresPermissions("quality:gcTableProduce:list") - @GetMapping("/getProduceTableList") - public TableDataInfo getProduceList(QcStaticTable qcStaticTable) { - startPage(); - List list = qcStaticTableService.selectQcStaticTableList(qcStaticTable); - return getDataTable(list); + @GetMapping("/getProduceChartData") + public QcStaticTable getProduceList(QcStaticTable qcStaticTable) { + QcStaticTable resultdto = new QcStaticTable(); + //默认时间范围T 00:00:00~T+1 00:00:00 + if(StringUtils.isEmpty(qcStaticTable.getYmArrayStart())){ + LocalDate date = LocalDate.now(); + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM"); + String ymStr = dtf.format(date); + qcStaticTable.setYmArrayStart(ymStr); + qcStaticTable.setYmArrayEnd(ymStr); + } + //xAxis; + if(qcStaticTable.getYmArrayStart().equals(qcStaticTable.getYmArrayEnd())){ + /**月内每日**/ + List days = this.getXNames(qcStaticTable.getYmArrayStart(),qcStaticTable.getYmArrayEnd(),"ymd"); + resultdto.setxAxis(days); + }else{ + /**年内各月**/ + List months = this.getXNames(qcStaticTable.getYmArrayStart(),qcStaticTable.getYmArrayEnd(),"ym"); + resultdto.setxAxis(months); + } + + List seriesdto= qcStaticTableService.selectQcStaticTableList(qcStaticTable); + //legend.data + + //series; + resultdto.setSeries(null); + + return resultdto; } + + public List getXNames(String startMonth,String endMonth,String type){ + // 返回的日期集合 + List days = new ArrayList(); + DateFormat dateFormat = null; + try { + if("ymd".equals(type)){ + dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + }else{ + dateFormat = new SimpleDateFormat("yyyy-MM"); + } + + Date start = dateFormat.parse(startMonth);//开始 + Date end = dateFormat.parse(endMonth);//结束 + + String endTimeStr1 = endMonth; + String[] endTime2 = endTimeStr1.split(" "); + String endTime3 = endTime2[1].split(":")[1]; + if(Integer.parseInt(endTime3)!=0){ + Calendar calendar = Calendar.getInstance(); + calendar.setTime(end); + calendar.add(Calendar.MONTH, 1); + end = calendar.getTime(); + } + + Calendar tempStart = Calendar.getInstance(); + tempStart.setTime(start); + + Calendar tempEnd = Calendar.getInstance(); + tempEnd.setTime(end); + while (tempStart.before(tempEnd)) { + days.add(dateFormat.format(tempStart.getTime())); + if("ymd".equals(type)) { + tempStart.add(Calendar.DAY_OF_MONTH, 1); + }else{ + tempStart.add(Calendar.MONTH, 1); + } + } + } catch (ParseException e) { + e.printStackTrace(); + } + return days; + } + @RequiresPermissions("quality:gcTableProduce:list") - @Log(title = "质量系统报", businessType = BusinessType.EXPORT) @PostMapping("/exportTableList") public void exportTableList(HttpServletResponse response, QcStaticTable qcStaticTable) { List list = qcStaticTableService.selectQcStaticTableList(qcStaticTable); ExcelUtil util = new ExcelUtil(QcStaticTable.class); util.exportExcel(response, list, "质量系统报数据"); } + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java new file mode 100644 index 000000000..e25463184 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectType.java @@ -0,0 +1,215 @@ +package com.op.quality.domain; + +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; +import java.util.List; + +/** + * 不良类型维护对象 qc_defect_type + * + * @author wws + * @date 2023-10-12 + */ +public class QcDefectType extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String defectId; + + /** 不良类型编码 */ + @Excel(name = "不良类型编码") + private String defectCode; + + /** 不良类型 */ + @Excel(name = "不良类型") + private String defectType; + + /** 不良子类 */ + @Excel(name = "不良子类") + private String defectSubclass; + + /** 备注 */ + @Excel(name = "备注") + private String defectRemark; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + @Excel(name = "删除标志") + private String delFlag; + + // 创建日期范围list + private List createTimeArray; + + // 更新日期范围list + private List updateTimeArray; + + // 更新日期开始 + private String updateTimeStart; + + // 更新日期结束 + private String updateTimeEnd; + + // 创建日期开始 + private String createTimeStart; + + // 创建日期结束 + private String createTimeEnd; + + public List getCreateTimeArray() { + return createTimeArray; + } + + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; + } + + public List getUpdateTimeArray() { + return updateTimeArray; + } + + public void setUpdateTimeArray(List updateTimeArray) { + this.updateTimeArray = updateTimeArray; + } + + public String getUpdateTimeStart() { + return updateTimeStart; + } + + public void setUpdateTimeStart(String updateTimeStart) { + this.updateTimeStart = updateTimeStart; + } + + public String getUpdateTimeEnd() { + return updateTimeEnd; + } + + public void setUpdateTimeEnd(String updateTimeEnd) { + this.updateTimeEnd = updateTimeEnd; + } + + public String getCreateTimeStart() { + return createTimeStart; + } + + public void setCreateTimeStart(String createTimeStart) { + this.createTimeStart = createTimeStart; + } + + public String getCreateTimeEnd() { + return createTimeEnd; + } + + public void setCreateTimeEnd(String createTimeEnd) { + this.createTimeEnd = createTimeEnd; + } + + public void setDefectId(String defectId) { + this.defectId = defectId; + } + + public String getDefectId() { + return defectId; + } + public void setDefectCode(String defectCode) { + this.defectCode = defectCode; + } + + public String getDefectCode() { + return defectCode; + } + public void setDefectType(String defectType) { + this.defectType = defectType; + } + + public String getDefectType() { + return defectType; + } + public void setDefectSubclass(String defectSubclass) { + this.defectSubclass = defectSubclass; + } + + public String getDefectSubclass() { + return defectSubclass; + } + public void setDefectRemark(String defectRemark) { + this.defectRemark = defectRemark; + } + + public String getDefectRemark() { + return defectRemark; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAttr1() { + return attr1; + } + public void setAttr2(String attr2) { + this.attr2 = attr2; + } + + public String getAttr2() { + return attr2; + } + public void setAttr3(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("defectId", getDefectId()) + .append("defectCode", getDefectCode()) + .append("defectType", getDefectType()) + .append("defectSubclass", getDefectSubclass()) + .append("defectRemark", getDefectRemark()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java index 8fd2e8a39..caabd47fc 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java @@ -2,6 +2,7 @@ package com.op.quality.domain; import com.op.common.core.annotation.Excel; import com.op.common.core.web.domain.BaseEntity; +import com.op.system.api.domain.quality.ChartDTO; import java.util.List; @@ -36,6 +37,51 @@ public class QcStaticTable extends BaseEntity { private String checkResult; private String noOkBatchRate; private String noOkNumRate; + private String ymArrayStart; + private String ymArrayEnd; + private List legendData; + private List xAxis; + private List series; + + public String getYmArrayStart() { + return ymArrayStart; + } + + public void setYmArrayStart(String ymArrayStart) { + this.ymArrayStart = ymArrayStart; + } + + public String getYmArrayEnd() { + return ymArrayEnd; + } + + public void setYmArrayEnd(String ymArrayEnd) { + this.ymArrayEnd = ymArrayEnd; + } + + public List getSeries() { + return series; + } + + public void setSeries(List series) { + this.series = series; + } + + public List getxAxis() { + return xAxis; + } + + public void setxAxis(List xAxis) { + this.xAxis = xAxis; + } + + public List getLegendData() { + return legendData; + } + + public void setLegendData(List legendData) { + this.legendData = legendData; + } public String getNoOkNumRate() { return noOkNumRate; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java new file mode 100644 index 000000000..156516a03 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeMapper.java @@ -0,0 +1,70 @@ +package com.op.quality.mapper; + +import com.op.quality.domain.QcDefectType; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 不良类型维护Mapper接口 + * + * @author wws + * @date 2023-10-12 + */ +@Mapper +public interface QcDefectTypeMapper { + /** + * 查询不良类型维护 + * + * @param faultId 不良类型维护主键 + * @return 不良类型维护 + */ + public QcDefectType selectQcDefectTypeByDefectId(String faultId); + + /** + * 查询不良类型维护列表 + * + * @param qcDefectType 不良类型维护 + * @return 不良类型维护集合 + */ + public List selectQcDefectTypeList(QcDefectType qcDefectType); + + /** + * 新增不良类型维护 + * + * @param qcDefectType 不良类型维护 + * @return 结果 + */ + public int insertQcDefectType(QcDefectType qcDefectType); + + /** + * 修改不良类型维护 + * + * @param qcDefectType 不良类型维护 + * @return 结果 + */ + public int updateQcDefectType(QcDefectType qcDefectType); + + /** + * 删除不良类型维护-逻辑 + * + * @param faultId 不良类型维护主键 + * @return 结果 + */ + public int deleteQcDefectTypeByDefectId(String faultId); + + /** + * 批量删除不良类型维护-逻辑 + * + * @param faultIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQcDefectTypeByDefectIds(String[] faultIds); + + /** + * 获取流水号 + * @return + */ + int selectSerialNumber(); + +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java new file mode 100644 index 000000000..e1f4f2d28 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeService.java @@ -0,0 +1,62 @@ +package com.op.quality.service; + +import com.op.common.core.web.domain.AjaxResult; +import com.op.quality.domain.QcDefectType; + +import java.util.List; + +/** + * 不良类型维护Service接口 + * + * @author zxl + * @date 2023-10-12 + */ +public interface IQcDefectTypeService { + /** + * 查询不良类型维护 + * + * @param defectId 不良类型维护主键 + * @return 不良类型维护 + */ + public QcDefectType selectQcDefectTypeByDefectId(String defectId); + + /** + * 查询不良类型维护列表 + * + * @param equDefectType 不良类型维护 + * @return 不良类型维护集合 + */ + public List selectQcDefectTypeList(QcDefectType equDefectType); + + /** + * 新增不良类型维护 + * + * @param equDefectType 不良类型维护 + * @return 结果 + */ + public AjaxResult insertQcDefectType(QcDefectType equDefectType); + + /** + * 修改不良类型维护 + * + * @param equDefectType 不良类型维护 + * @return 结果 + */ + public AjaxResult updateQcDefectType(QcDefectType equDefectType); + + /** + * 批量删除不良类型维护 + * + * @param defectIds 需要删除的不良类型维护主键集合 + * @return 结果 + */ + public int deleteQcDefectTypeByDefectIds(String[] defectIds); + + /** + * 删除不良类型维护信息 + * + * @param defectId 不良类型维护主键 + * @return 结果 + */ + public int deleteQcDefectTypeByDefectId(String defectId); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java new file mode 100644 index 000000000..8f69798a4 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeServiceImpl.java @@ -0,0 +1,169 @@ +package com.op.quality.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.context.SecurityContextHolder; +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.core.web.domain.AjaxResult; +import com.op.quality.domain.QcDefectType; +import com.op.quality.mapper.QcDefectTypeMapper; +import com.op.quality.service.IQcDefectTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; +import java.util.List; + +import static com.op.common.core.web.domain.AjaxResult.error; +import static com.op.common.core.web.domain.AjaxResult.success; + +/** + * 不良类型维护Service业务层处理 + * + * @author wws + * @date 2023-10-12 + */ +@Service +public class QcDefectTypeServiceImpl implements IQcDefectTypeService { + @Autowired + private QcDefectTypeMapper qcDefectTypeMapper; + + /** + * 查询不良类型维护 + * + * @param defectId 不良类型维护主键 + * @return 不良类型维护 + */ + @Override + @DS("#header.poolName") + public QcDefectType selectQcDefectTypeByDefectId(String defectId) { + return qcDefectTypeMapper.selectQcDefectTypeByDefectId(defectId); + } + + /** + * 查询不良类型维护列表 + * + * @param qcDefectType 不良类型维护 + * @return 不良类型维护 + */ + @Override + @DS("#header.poolName") + public List selectQcDefectTypeList(QcDefectType qcDefectType) { + if (qcDefectType.getCreateTimeArray() != null) { + // 设置创建日期开始和结束值 + if (qcDefectType.getCreateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + qcDefectType.setCreateTimeStart(formatter.format(qcDefectType.getCreateTimeArray().get(0))); + qcDefectType.setCreateTimeEnd(formatter.format(qcDefectType.getCreateTimeArray().get(1))); + } + } + if (qcDefectType.getUpdateTimeArray() != null) { + // 设置更新日期开始和结束 + if (qcDefectType.getUpdateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + qcDefectType.setUpdateTimeStart(formatter.format(qcDefectType.getUpdateTimeArray().get(0))); + qcDefectType.setUpdateTimeEnd(formatter.format(qcDefectType.getUpdateTimeArray().get(1))); + } + } + return qcDefectTypeMapper.selectQcDefectTypeList(qcDefectType); + } + + /** + * 新增不良类型维护 + * + * @param qcDefectType 不良类型维护 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult insertQcDefectType(QcDefectType qcDefectType) { + + // 检验 + QcDefectType checkQuery = new QcDefectType(); + checkQuery.setDefectType(qcDefectType.getDefectType()); + checkQuery.setDefectSubclass(qcDefectType.getDefectSubclass()); + List check = qcDefectTypeMapper.selectQcDefectTypeList(checkQuery); + if (check.size() > 0) { + return error(500,"不良子类已存在！不可添加！"); + } + + //获取当前所选工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String str = request.getHeader(key.substring(8)); + int index = str.indexOf("_"); + String factory = str.substring(index + 1); + + // 获取检查项流水号 + String serialNum = String.format("%03d", qcDefectTypeMapper.selectSerialNumber()); + + // 处理不良信息 + qcDefectType.setDefectId(IdUtils.fastSimpleUUID()); + qcDefectType.setDefectCode(DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + serialNum); + qcDefectType.setFactoryCode(factory); + qcDefectType.setCreateBy(SecurityContextHolder.getUserName()); + qcDefectType.setCreateTime(DateUtils.getNowDate()); + qcDefectType.setUpdateBy(SecurityContextHolder.getUserName()); + qcDefectType.setUpdateTime(DateUtils.getNowDate()); + + // 插入数据库 + qcDefectTypeMapper.insertQcDefectType(qcDefectType); + + return success(); + } + + /** + * 修改不良类型维护 + * + * @param qcDefectType 不良类型维护 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult updateQcDefectType(QcDefectType qcDefectType) { + + // 检验 + QcDefectType checkQuery = new QcDefectType(); + checkQuery.setDefectType(qcDefectType.getDefectType()); + checkQuery.setDefectSubclass(qcDefectType.getDefectSubclass()); + List check = qcDefectTypeMapper.selectQcDefectTypeList(checkQuery); + if (check.size() > 0) { + if (!check.get(0).equals(qcDefectType.getDefectCode())) { + return error(500,"不良子类已存在！修改失败！"); + } + } + qcDefectType.setUpdateBy(SecurityContextHolder.getUserName()); + qcDefectType.setUpdateTime(DateUtils.getNowDate()); + // 插入数据库 + qcDefectTypeMapper.updateQcDefectType(qcDefectType); + + return success("修改成功"); + } + + /** + * 批量删除不良类型维护 + * + * @param defectIds 需要删除的不良类型维护主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteQcDefectTypeByDefectIds(String[] defectIds) { + return qcDefectTypeMapper.deleteQcDefectTypeByDefectIds(defectIds); + } + + /** + * 删除不良类型维护信息 + * + * @param defectId 不良类型维护主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteQcDefectTypeByDefectId(String defectId) { + return qcDefectTypeMapper.deleteQcDefectTypeByDefectId(defectId); + } +} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml new file mode 100644 index 000000000..9bc55f475 --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeMapper.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + select defect_id, defect_code, defect_type, defect_subclass, defect_remark, + factory_code, attr1, attr2, attr3, + del_flag, create_by, create_time, update_by, update_time + from qc_defect_type + + + + + + + + + + insert into qc_defect_type + + defect_id, + defect_code, + defect_type, + defect_subclass, + defect_remark, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{defectId}, + #{defectCode}, + #{defectType}, + #{defectSubclass}, + #{defectRemark}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update qc_defect_type + + defect_code = #{defectCode}, + defect_type = #{defectType}, + defect_subclass = #{defectSubclass}, + defect_remark = #{defectRemark}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where defect_id = #{defectId} and del_flag = '0' + + + + delete qc_defect_type set del_flag = '1' where defect_id = #{defectId} + + + + update qc_defect_type set del_flag = '1' where defect_id in + + #{defectId} + + +