yinq
/
aucma-mes-back
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 统计计量、质检项逻辑

Browse Source
master
yinq 2 years ago
parent 8e06982e54
commit e8eca651d4
12 changed files with 612 additions and 524 deletions
Show Stats Download Patch File Download Diff File

16
aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorWorkUnitController.java
Unescape Escape View File

@ -39,12 +39,6 @@ public class BaseMonitorWorkUnitController extends BaseController {
@Autowired @Autowired
private IBaseMonitorWorkUnitService baseMonitorWorkUnitService; private IBaseMonitorWorkUnitService baseMonitorWorkUnitService;
@Autowired
private IBaseMonitorInfoService baseMonitorInfoService;
@Autowired
private IBaseWorkUnitService baseWorkUnitService;
/** /**
* 查询统计计量信息列表 * 查询统计计量信息列表
*/ */
@ -84,12 +78,7 @@ public class BaseMonitorWorkUnitController extends BaseController {
@Log(title = "统计计量信息" , businessType = BusinessType.INSERT) @Log(title = "统计计量信息" , businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody BaseMonitorWorkUnit baseMonitorWorkUnit) { 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.setCreatedBy(getUsername());
baseMonitorWorkUnit.setCreatedTime(DateUtils.getNowDate());
return toAjax(baseMonitorWorkUnitService.insertBaseMonitorWorkUnit(baseMonitorWorkUnit)); return toAjax(baseMonitorWorkUnitService.insertBaseMonitorWorkUnit(baseMonitorWorkUnit));
} }
@ -100,12 +89,7 @@ public class BaseMonitorWorkUnitController extends BaseController {
@Log(title = "统计计量信息" , businessType = BusinessType.UPDATE) @Log(title = "统计计量信息" , businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody BaseMonitorWorkUnit baseMonitorWorkUnit) { 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.setUpdatedBy(getUsername());
baseMonitorWorkUnit.setUpdatedTime(DateUtils.getNowDate());
return toAjax(baseMonitorWorkUnitService.updateBaseMonitorWorkUnit(baseMonitorWorkUnit)); return toAjax(baseMonitorWorkUnitService.updateBaseMonitorWorkUnit(baseMonitorWorkUnit));
} }

1
aucma-base/src/main/java/com/aucma/base/controller/BaseQualityInspectionItemController.java
Unescape Escape View File

@ -66,6 +66,7 @@ public class BaseQualityInspectionItemController extends BaseController {
public AjaxResult getInfo(@PathVariable("objId" ) Long objId) { public AjaxResult getInfo(@PathVariable("objId" ) Long objId) {
return success(baseQualityInspectionItemService.selectBaseQualityInspectionItemByObjId(objId)); return success(baseQualityInspectionItemService.selectBaseQualityInspectionItemByObjId(objId));
} }
/** /**
* 查询所有父级以及名称 * 查询所有父级以及名称
* */ * */

53
aucma-base/src/main/java/com/aucma/base/controller/BaseWorkUnitController.java
Unescape Escape View File

@ -33,7 +33,7 @@ import com.aucma.common.utils.poi.ExcelUtil;
* @date 2023-10-12 * @date 2023-10-12
*/ */
@RestController @RestController
@RequestMapping("/base/workUnit" ) @RequestMapping("/base/workUnit")
public class BaseWorkUnitController extends BaseController { public class BaseWorkUnitController extends BaseController {
@Autowired @Autowired
private IBaseWorkUnitService baseWorkUnitService; private IBaseWorkUnitService baseWorkUnitService;
@ -43,23 +43,16 @@ public class BaseWorkUnitController extends BaseController {
/** /**
* 查询统计单元信息列表 * 查询统计单元信息列表
*/ */
@PreAuthorize("@ss.hasPermi('base:workUnit:list')" ) @PreAuthorize("@ss.hasPermi('base:workUnit:list')")
@GetMapping("/list" ) @GetMapping("/list")
public AjaxResult list(BaseWorkUnit baseWorkUnit) { public AjaxResult list(BaseWorkUnit baseWorkUnit) {
List<BaseWorkUnit> list = baseWorkUnitService.selectBaseWorkUnitList(baseWorkUnit); List<BaseWorkUnit> list = baseWorkUnitService.selectBaseWorkUnitList(baseWorkUnit);
BaseProductLine baseProductLine = new BaseProductLine(); return success(list);
for (int i=0;i<list.size();i++){ }
if (list.get(i).getProductLineCode()!=null){
baseProductLine.setProductLineCode(list.get(i).getProductLineCode());
list.get(i).setProductLineName(baseProductLineService.selectBaseProductLineList(baseProductLine).get(0).getProductLineName());
}
}
return success(list);
}
/** /**
* 查询计量设备信息下拉树结构 * 查询计量设备信息下拉树结构
* */ */
@PostMapping("/workUnitTree") @PostMapping("/workUnitTree")
public AjaxResult getMonitorInfoTree(BaseWorkUnit baseWorkUnit) { public AjaxResult getMonitorInfoTree(BaseWorkUnit baseWorkUnit) {
List<TreeSelects> list = baseWorkUnitService.selectBaseWorkUnitTreeList(baseWorkUnit); List<TreeSelects> list = baseWorkUnitService.selectBaseWorkUnitTreeList(baseWorkUnit);
@ -69,29 +62,29 @@ public class BaseWorkUnitController extends BaseController {
/** /**
* 导出统计单元信息列表 * 导出统计单元信息列表
*/ */
@PreAuthorize("@ss.hasPermi('base:workUnit:export')" ) @PreAuthorize("@ss.hasPermi('base:workUnit:export')")
@Log(title = "统计单元信息" , businessType = BusinessType.EXPORT) @Log(title = "统计单元信息", businessType = BusinessType.EXPORT)
@PostMapping("/export" ) @PostMapping("/export")
public void export(HttpServletResponse response, BaseWorkUnit baseWorkUnit) { public void export(HttpServletResponse response, BaseWorkUnit baseWorkUnit) {
List<BaseWorkUnit> list = baseWorkUnitService.selectBaseWorkUnitList(baseWorkUnit); List<BaseWorkUnit> list = baseWorkUnitService.selectBaseWorkUnitList(baseWorkUnit);
ExcelUtil<BaseWorkUnit> util = new ExcelUtil<BaseWorkUnit>(BaseWorkUnit. class); ExcelUtil<BaseWorkUnit> util = new ExcelUtil<BaseWorkUnit>(BaseWorkUnit.class);
util.exportExcel(response, list, "统计单元信息数据" ); util.exportExcel(response, list, "统计单元信息数据");
} }
/** /**
* 获取统计单元信息详细信息 * 获取统计单元信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('base:workUnit:query')" ) @PreAuthorize("@ss.hasPermi('base:workUnit:query')")
@GetMapping(value = "/{objId}" ) @GetMapping(value = "/{objId}")
public AjaxResult getInfo(@PathVariable("objId" ) Long objId) { public AjaxResult getInfo(@PathVariable("objId") Long objId) {
return success(baseWorkUnitService.selectBaseWorkUnitByObjId(objId)); return success(baseWorkUnitService.selectBaseWorkUnitByObjId(objId));
} }
/** /**
* 新增统计单元信息 * 新增统计单元信息
*/ */
@PreAuthorize("@ss.hasPermi('base:workUnit:add')" ) @PreAuthorize("@ss.hasPermi('base:workUnit:add')")
@Log(title = "统计单元信息" , businessType = BusinessType.INSERT) @Log(title = "统计单元信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody BaseWorkUnit baseWorkUnit) { public AjaxResult add(@RequestBody BaseWorkUnit baseWorkUnit) {
baseWorkUnit.setCreatedBy(getUsername()); baseWorkUnit.setCreatedBy(getUsername());
@ -102,8 +95,8 @@ public class BaseWorkUnitController extends BaseController {
/** /**
* 修改统计单元信息 * 修改统计单元信息
*/ */
@PreAuthorize("@ss.hasPermi('base:workUnit:edit')" ) @PreAuthorize("@ss.hasPermi('base:workUnit:edit')")
@Log(title = "统计单元信息" , businessType = BusinessType.UPDATE) @Log(title = "统计单元信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody BaseWorkUnit baseWorkUnit) { public AjaxResult edit(@RequestBody BaseWorkUnit baseWorkUnit) {
baseWorkUnit.setUpdatedBy(getUsername()); baseWorkUnit.setUpdatedBy(getUsername());
@ -114,9 +107,9 @@ public class BaseWorkUnitController extends BaseController {
/** /**
* 删除统计单元信息 * 删除统计单元信息
*/ */
@PreAuthorize("@ss.hasPermi('base:workUnit:remove')" ) @PreAuthorize("@ss.hasPermi('base:workUnit:remove')")
@Log(title = "统计单元信息" , businessType = BusinessType.DELETE) @Log(title = "统计单元信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{objIds}" ) @DeleteMapping("/{objIds}")
public AjaxResult remove(@PathVariable Long[] objIds) { public AjaxResult remove(@PathVariable Long[] objIds) {
return toAjax(baseWorkUnitService.deleteBaseWorkUnitByObjIds(objIds)); return toAjax(baseWorkUnitService.deleteBaseWorkUnitByObjIds(objIds));
} }

327
aucma-base/src/main/java/com/aucma/base/domain/BaseMonitorWorkUnit.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.aucma.base.domain; package com.aucma.base.domain;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
@ -13,185 +14,223 @@ import com.aucma.common.core.domain.BaseEntity;
* @author Yinq * @author Yinq
* @date 2023-10-12 * @date 2023-10-12
*/ */
public class BaseMonitorWorkUnit extends BaseEntity public class BaseMonitorWorkUnit extends BaseEntity {
{ private static final long serialVersionUID = 1L;
private static final long serialVersionUID=1L;
/** 主键标识 */ /**
@Excel(name = "主键标识") * 主键标识
*/
@Excel(name = "主键标识")
private Long objId; private Long objId;
/** 计量设备编号 */ /**
@Excel(name = "计量设备编号") * 计量设备编号
*/
@Excel(name = "计量设备编号")
private String monitorCode; private String monitorCode;
/** 统计单元编号 */ /**
@Excel(name = "统计单元编号") * 计量设备名称
*/
@Excel(name = "计量设备名称")
private String monitorName;
/**
* 统计单元编号
*/
@Excel(name = "统计单元编号")
private String workUnitCode; private String workUnitCode;
/** 计量设备状态 */ /**
@Excel(name = "计量设备状态") * 统计单元名称
*/
@Excel(name = "统计单元名称")
private String workUnitName;
/**
* 计量设备状态
*/
@Excel(name = "计量设备状态")
private Long monitorStatus; private Long monitorStatus;
/** 计量设备类型 */ /**
@Excel(name = "计量设备类型") * 计量设备类型
*/
@Excel(name = "计量设备类型")
private Long monitorType; private Long monitorType;
/** 计算方式（0-加，1-减） */ /**
@Excel(name = "计算方式", readConverterExp = "0=-加，1-减") * 计算方式（0-加，1-减）
*/
@Excel(name = "计算方式", readConverterExp = "0=-加，1-减")
private Long formulaMode; private Long formulaMode;
/** 比率 */ /**
@Excel(name = "比率") * 比率
*/
@Excel(name = "比率")
private Long proportion; private Long proportion;
/** 启用标识 */ /**
@Excel(name = "启用标识") * 启用标识
*/
@Excel(name = "启用标识")
private Long isFlag; private Long isFlag;
/** 创建人 */ /**
@Excel(name = "创建人") * 创建人
*/
@Excel(name = "创建人")
private String createdBy; private String createdBy;
/** 创建时间 */ /**
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") * 创建时间
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createdTime; private Date createdTime;
/** 修改人 */ /**
@Excel(name = "修改人") * 修改人
*/
@Excel(name = "修改人")
private String updatedBy; private String updatedBy;
/** 修改时间 */ /**
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") * 修改时间
@Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date updatedTime; private Date updatedTime;
public void setObjId(Long objId) public String getMonitorName() {
{ return monitorName;
this.objId = objId; }
}
public Long getObjId() public void setMonitorName(String monitorName) {
{ this.monitorName = monitorName;
return objId; }
}
public void setMonitorCode(String monitorCode)
{
this.monitorCode = monitorCode;
}
public String getMonitorCode() public String getWorkUnitName() {
{ return workUnitName;
return monitorCode; }
}
public void setWorkUnitCode(String workUnitCode)
{
this.workUnitCode = workUnitCode;
}
public String getWorkUnitCode() public void setWorkUnitName(String workUnitName) {
{ this.workUnitName = workUnitName;
return workUnitCode; }
}
public void setMonitorStatus(Long monitorStatus)
{
this.monitorStatus = monitorStatus;
}
public Long getMonitorStatus() public void setObjId(Long objId) {
{ this.objId = objId;
return monitorStatus; }
}
public void setMonitorType(Long monitorType)
{
this.monitorType = monitorType;
}
public Long getMonitorType() public Long getObjId() {
{ return objId;
return monitorType; }
}
public void setFormulaMode(Long formulaMode)
{
this.formulaMode = formulaMode;
}
public Long getFormulaMode() public void setMonitorCode(String monitorCode) {
{ this.monitorCode = monitorCode;
return formulaMode; }
}
public void setProportion(Long proportion)
{
this.proportion = proportion;
}
public Long getProportion() public String getMonitorCode() {
{ return monitorCode;
return proportion; }
}
public void setIsFlag(Long isFlag)
{
this.isFlag = isFlag;
}
public Long getIsFlag() public void setWorkUnitCode(String workUnitCode) {
{ this.workUnitCode = workUnitCode;
return isFlag; }
}
public void setCreatedBy(String createdBy)
{
this.createdBy = createdBy;
}
public String getCreatedBy() public String getWorkUnitCode() {
{ return workUnitCode;
return createdBy; }
}
public void setCreatedTime(Date createdTime)
{
this.createdTime = createdTime;
}
public Date getCreatedTime() public void setMonitorStatus(Long monitorStatus) {
{ this.monitorStatus = monitorStatus;
return createdTime; }
}
public void setUpdatedBy(String updatedBy)
{
this.updatedBy = updatedBy;
}
public String getUpdatedBy() public Long getMonitorStatus() {
{ return monitorStatus;
return updatedBy; }
}
public void setUpdatedTime(Date updatedTime)
{
this.updatedTime = updatedTime;
}
public Date getUpdatedTime() public void setMonitorType(Long monitorType) {
{ this.monitorType = monitorType;
return updatedTime; }
}
@Override public Long getMonitorType() {
public String toString(){ return monitorType;
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) }
.append("objId",getObjId())
.append("monitorCode",getMonitorCode()) public void setFormulaMode(Long formulaMode) {
.append("workUnitCode",getWorkUnitCode()) this.formulaMode = formulaMode;
.append("monitorStatus",getMonitorStatus()) }
.append("monitorType",getMonitorType())
.append("formulaMode",getFormulaMode()) public Long getFormulaMode() {
.append("proportion",getProportion()) return formulaMode;
.append("remark",getRemark()) }
.append("isFlag",getIsFlag())
.append("createdBy",getCreatedBy()) public void setProportion(Long proportion) {
.append("createdTime",getCreatedTime()) this.proportion = proportion;
.append("updatedBy",getUpdatedBy()) }
.append("updatedTime",getUpdatedTime())
.toString(); public Long getProportion() {
} return proportion;
} }
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("monitorCode", getMonitorCode())
.append("workUnitCode", getWorkUnitCode())
.append("monitorStatus", getMonitorStatus())
.append("monitorType", getMonitorType())
.append("formulaMode", getFormulaMode())
.append("proportion", getProportion())
.append("remark", getRemark())
.append("isFlag", getIsFlag())
.append("createdBy", getCreatedBy())
.append("createdTime", getCreatedTime())
.append("updatedBy", getUpdatedBy())
.append("updatedTime", getUpdatedTime())
.toString();
}
}

391
aucma-base/src/main/java/com/aucma/base/domain/BaseWorkUnit.java
Unescape Escape View File

@ -17,249 +17,260 @@ import com.aucma.common.core.domain.TreeEntity;
* @author Yinq * @author Yinq
* @date 2023-10-12 * @date 2023-10-12
*/ */
public class BaseWorkUnit extends BaseEntity public class BaseWorkUnit extends BaseEntity {
{ private static final long serialVersionUID = 1L;
private static final long serialVersionUID=1L;
/** 主键标识 */ /**
@Excel(name = "主键标识") * 主键标识
*/
@Excel(name = "主键标识")
private Long objId; private Long objId;
/** 统计单元编号 */ /**
@Excel(name = "统计单元编号") * 统计单元编号
*/
@Excel(name = "统计单元编号")
private String workUnitCode; private String workUnitCode;
/** 统计单元名称 */ /**
@Excel(name = "统计单元名称") * 统计单元名称
*/
@Excel(name = "统计单元名称")
private String workUnitName; private String workUnitName;
/** 统计区域 */ /**
@Excel(name = "统计区域") * 统计区域
*/
@Excel(name = "统计区域")
private String workUnitAddress; private String workUnitAddress;
/** 排序 */ /**
@Excel(name = "排序") * 排序
*/
@Excel(name = "排序")
private Long workUnitSort; private Long workUnitSort;
/** 产线/工位 */ /**
@Excel(name = "产线/工位") * 产线/工位
*/
@Excel(name = "产线/工位")
private String productLineCode; private String productLineCode;
private String productLineName; private String productLineName;
public String getProductLineName() { public String getProductLineName() {
return productLineName; return productLineName;
} }
public void setProductLineName(String productLineName) { public void setProductLineName(String productLineName) {
this.productLineName = productLineName; this.productLineName = productLineName;
} }
/** 统计单元类型 */ /**
@Excel(name = "统计单元类型") * 统计单元类型
*/
@Excel(name = "统计单元类型")
private Long workUnitType; private Long workUnitType;
/** 启用标识 */ /**
@Excel(name = "启用标识") * 启用标识
*/
@Excel(name = "启用标识")
private Long isFlag; private Long isFlag;
/** 创建人 */ /**
@Excel(name = "创建人") * 创建人
*/
@Excel(name = "创建人")
private String createdBy; private String createdBy;
/** 创建时间 */ /**
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") * 创建时间
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createdTime; private Date createdTime;
/** 更新人 */ /**
@Excel(name = "更新人") * 更新人
*/
@Excel(name = "更新人")
private String updatedBy; private String updatedBy;
/** 更新时间 */ /**
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") * 更新时间
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date updatedTime; private Date updatedTime;
private List<BaseWorkUnit> children = new ArrayList<BaseWorkUnit>();
private String parentName; private List<BaseWorkUnit> children = new ArrayList<BaseWorkUnit>();
private Long parentId; private String parentName;
private Integer orderNum; private Long parentId;
private String ancestors; private Integer orderNum;
public List<BaseWorkUnit> getChildren() { private String ancestors;
return children;
}
public void setChildren(List<BaseWorkUnit> children) { public List<BaseWorkUnit> getChildren() {
this.children = children; return children;
} }
public String getParentName() { public void setChildren(List<BaseWorkUnit> children) {
return parentName; this.children = children;
} }
public void setParentName(String parentName) { public String getParentName() {
this.parentName = parentName; return parentName;
} }
public Long getParentId() { public void setParentName(String parentName) {
return parentId; this.parentName = parentName;
} }
public void setParentId(Long parentId) { public Long getParentId() {
this.parentId = parentId; return parentId;
} }
public Integer getOrderNum() { public void setParentId(Long parentId) {
return orderNum; this.parentId = parentId;
} }
public void setOrderNum(Integer orderNum) { public Integer getOrderNum() {
this.orderNum = orderNum; return orderNum;
} }
public String getAncestors() { public void setOrderNum(Integer orderNum) {
return ancestors; this.orderNum = orderNum;
} }
public void setAncestors(String ancestors) { public String getAncestors() {
this.ancestors = ancestors; return ancestors;
} }
public void setObjId(Long objId) public void setAncestors(String ancestors) {
{ this.ancestors = ancestors;
this.objId = objId; }
}
public Long getObjId() public void setObjId(Long objId) {
{ this.objId = objId;
return objId; }
}
public void setWorkUnitCode(String workUnitCode)
{
this.workUnitCode = workUnitCode;
}
public String getWorkUnitCode() public Long getObjId() {
{ return objId;
return workUnitCode; }
}
public void setWorkUnitName(String workUnitName)
{
this.workUnitName = workUnitName;
}
public String getWorkUnitName() public void setWorkUnitCode(String workUnitCode) {
{ this.workUnitCode = workUnitCode;
return workUnitName; }
}
public void setWorkUnitAddress(String workUnitAddress)
{
this.workUnitAddress = workUnitAddress;
}
public String getWorkUnitAddress() public String getWorkUnitCode() {
{ return workUnitCode;
return workUnitAddress; }
}
public void setWorkUnitSort(Long workUnitSort)
{
this.workUnitSort = workUnitSort;
}
public Long getWorkUnitSort() public void setWorkUnitName(String workUnitName) {
{ this.workUnitName = workUnitName;
return workUnitSort; }
}
public void setProductLineCode(String productLineCode)
{
this.productLineCode = productLineCode;
}
public String getProductLineCode() public String getWorkUnitName() {
{ return workUnitName;
return productLineCode; }
}
public void setWorkUnitType(Long workUnitType)
{
this.workUnitType = workUnitType;
}
public Long getWorkUnitType() public void setWorkUnitAddress(String workUnitAddress) {
{ this.workUnitAddress = workUnitAddress;
return workUnitType; }
}
public void setIsFlag(Long isFlag)
{
this.isFlag = isFlag;
}
public Long getIsFlag() public String getWorkUnitAddress() {
{ return workUnitAddress;
return isFlag; }
}
public void setCreatedBy(String createdBy)
{
this.createdBy = createdBy;
}
public String getCreatedBy() public void setWorkUnitSort(Long workUnitSort) {
{ this.workUnitSort = workUnitSort;
return createdBy; }
}
public void setCreatedTime(Date createdTime)
{
this.createdTime = createdTime;
}
public Date getCreatedTime() public Long getWorkUnitSort() {
{ return workUnitSort;
return createdTime; }
}
public void setUpdatedBy(String updatedBy)
{
this.updatedBy = updatedBy;
}
public String getUpdatedBy() public void setProductLineCode(String productLineCode) {
{ this.productLineCode = productLineCode;
return updatedBy; }
}
public void setUpdatedTime(Date updatedTime)
{
this.updatedTime = updatedTime;
}
public Date getUpdatedTime() public String getProductLineCode() {
{ return productLineCode;
return updatedTime; }
}
@Override public void setWorkUnitType(Long workUnitType) {
public String toString() { this.workUnitType = workUnitType;
return "BaseWorkUnit{" + }
"objId=" + objId +
", workUnitCode='" + workUnitCode + '\'' + public Long getWorkUnitType() {
", workUnitName='" + workUnitName + '\'' + return workUnitType;
", workUnitAddress='" + workUnitAddress + '\'' + }
", workUnitSort=" + workUnitSort +
", productLineCode='" + productLineCode + '\'' + public void setIsFlag(Long isFlag) {
", productLineName='" + productLineName + '\'' + this.isFlag = isFlag;
", workUnitType=" + workUnitType + }
", isFlag=" + isFlag +
", createdBy='" + createdBy + '\'' + public Long getIsFlag() {
", createdTime=" + createdTime + return isFlag;
", updatedBy='" + updatedBy + '\'' + }
", updatedTime=" + updatedTime +
", children=" + children + public void setCreatedBy(String createdBy) {
", parentName='" + parentName + '\'' + this.createdBy = createdBy;
", parentId=" + parentId + }
", orderNum=" + orderNum +
", ancestors='" + ancestors + '\'' + 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 "BaseWorkUnit{" +
"objId=" + objId +
", workUnitCode='" + workUnitCode + '\'' +
", workUnitName='" + workUnitName + '\'' +
", workUnitAddress='" + workUnitAddress + '\'' +
", workUnitSort=" + workUnitSort +
", productLineCode='" + productLineCode + '\'' +
", productLineName='" + productLineName + '\'' +
", workUnitType=" + workUnitType +
", isFlag=" + isFlag +
", createdBy='" + createdBy + '\'' +
", createdTime=" + createdTime +
", updatedBy='" + updatedBy + '\'' +
", updatedTime=" + updatedTime +
", children=" + children +
", parentName='" + parentName + '\'' +
", parentId=" + parentId +
", orderNum=" + orderNum +
", ancestors='" + ancestors + '\'' +
'}';
}
}

4
aucma-base/src/main/java/com/aucma/base/mapper/BaseQualityInspectionItemMapper.java
Unescape Escape View File

@ -27,7 +27,11 @@ public interface BaseQualityInspectionItemMapper
*/ */
public List<BaseQualityInspectionItem> selectBaseQualityInspectionItemList(BaseQualityInspectionItem baseQualityInspectionItem); public List<BaseQualityInspectionItem> selectBaseQualityInspectionItemList(BaseQualityInspectionItem baseQualityInspectionItem);
/**
* 查询所有父级以及名称
* */
List<BaseQualityInspectionItem> selectBaseQualityInspectionItemParent(); List<BaseQualityInspectionItem> selectBaseQualityInspectionItemParent();
/** /**
* 新增质检项信息维护 * 新增质检项信息维护
* *

4
aucma-base/src/main/java/com/aucma/base/service/IBaseQualityInspectionItemService.java
Unescape Escape View File

@ -19,7 +19,11 @@ public interface IBaseQualityInspectionItemService
*/ */
public BaseQualityInspectionItem selectBaseQualityInspectionItemByObjId(Long objId); public BaseQualityInspectionItem selectBaseQualityInspectionItemByObjId(Long objId);
/**
* 查询所有父级以及名称
* */
List<BaseQualityInspectionItem> selectBaseQualityInspectionItemParent(); List<BaseQualityInspectionItem> selectBaseQualityInspectionItemParent();
/** /**
* 查询质检项信息维护列表 * 查询质检项信息维护列表
* *

5
aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorWorkUnitServiceImpl.java
Unescape Escape View File

@ -1,6 +1,8 @@
package com.aucma.base.service.impl; package com.aucma.base.service.impl;
import java.util.List; import java.util.List;
import com.aucma.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.aucma.base.mapper.BaseMonitorWorkUnitMapper; import com.aucma.base.mapper.BaseMonitorWorkUnitMapper;
@ -52,7 +54,7 @@ public class BaseMonitorWorkUnitServiceImpl implements IBaseMonitorWorkUnitServi
@Override @Override
public int insertBaseMonitorWorkUnit(BaseMonitorWorkUnit baseMonitorWorkUnit) public int insertBaseMonitorWorkUnit(BaseMonitorWorkUnit baseMonitorWorkUnit)
{ {
baseMonitorWorkUnit.setCreatedTime(DateUtils.getNowDate());
return baseMonitorWorkUnitMapper.insertBaseMonitorWorkUnit(baseMonitorWorkUnit); return baseMonitorWorkUnitMapper.insertBaseMonitorWorkUnit(baseMonitorWorkUnit);
} }
@ -65,6 +67,7 @@ public class BaseMonitorWorkUnitServiceImpl implements IBaseMonitorWorkUnitServi
@Override @Override
public int updateBaseMonitorWorkUnit(BaseMonitorWorkUnit baseMonitorWorkUnit) public int updateBaseMonitorWorkUnit(BaseMonitorWorkUnit baseMonitorWorkUnit)
{ {
baseMonitorWorkUnit.setUpdatedTime(DateUtils.getNowDate());
return baseMonitorWorkUnitMapper.updateBaseMonitorWorkUnit(baseMonitorWorkUnit); return baseMonitorWorkUnitMapper.updateBaseMonitorWorkUnit(baseMonitorWorkUnit);
} }

3
aucma-base/src/main/java/com/aucma/base/service/impl/BaseQualityInspectionItemServiceImpl.java
Unescape Escape View File

@ -31,6 +31,9 @@ public class BaseQualityInspectionItemServiceImpl implements IBaseQualityInspect
return baseQualityInspectionItemMapper.selectBaseQualityInspectionItemByObjId(objId); return baseQualityInspectionItemMapper.selectBaseQualityInspectionItemByObjId(objId);
} }
/**
* 查询所有父级以及名称
* */
@Override @Override
public List<BaseQualityInspectionItem> selectBaseQualityInspectionItemParent() { public List<BaseQualityInspectionItem> selectBaseQualityInspectionItemParent() {
return baseQualityInspectionItemMapper.selectBaseQualityInspectionItemParent(); return baseQualityInspectionItemMapper.selectBaseQualityInspectionItemParent();

9
aucma-base/src/main/java/com/aucma/base/service/impl/BaseWorkUnitServiceImpl.java
Unescape Escape View File

@ -112,15 +112,16 @@ public class BaseWorkUnitServiceImpl implements IBaseWorkUnitService
@Override @Override
public List<BaseWorkUnit> buildWorkUnitTree(List<BaseWorkUnit> baseWorkUnits) { public List<BaseWorkUnit> buildWorkUnitTree(List<BaseWorkUnit> baseWorkUnits) {
List<BaseWorkUnit> returnList = new ArrayList<BaseWorkUnit>(); List<BaseWorkUnit> returnList = new ArrayList<BaseWorkUnit>();
List<Long> tempList = baseWorkUnits.stream().map(BaseWorkUnit::getObjId).collect(Collectors.toList()); List<Long> tempList = baseWorkUnits.stream().map(BaseWorkUnit::getObjId).collect(Collectors.toList());
for (BaseWorkUnit baseWorkUnit : baseWorkUnits) for (BaseWorkUnit baseMonitorInfo : baseWorkUnits)
{ {
// 如果是顶级节点, 遍历该父节点的所有子节点 // 如果是顶级节点, 遍历该父节点的所有子节点
if (!tempList.contains(baseWorkUnit.getParentId())) if (!tempList.contains(baseMonitorInfo.getParentId()))
{ {
recursionFn(baseWorkUnits, baseWorkUnit); recursionFn(baseWorkUnits, baseMonitorInfo);
returnList.add(baseWorkUnit); returnList.add(baseMonitorInfo);
} }
} }
if (returnList.isEmpty()) if (returnList.isEmpty())

154
aucma-base/src/main/resources/mapper/base/BaseMonitorWorkUnitMapper.xml
Unescape Escape View File

@ -5,47 +5,63 @@
<mapper namespace="com.aucma.base.mapper.BaseMonitorWorkUnitMapper"> <mapper namespace="com.aucma.base.mapper.BaseMonitorWorkUnitMapper">
<resultMap type="BaseMonitorWorkUnit" id="BaseMonitorWorkUnitResult"> <resultMap type="BaseMonitorWorkUnit" id="BaseMonitorWorkUnitResult">
<result property="objId" column="obj_id" /> <result property="objId" column="obj_id"/>
<result property="monitorCode" column="monitor_code" /> <result property="monitorCode" column="monitor_code"/>
<result property="workUnitCode" column="work_unit_code" /> <result property="monitorName" column="monitor_name"/>
<result property="monitorStatus" column="monitor_status" /> <result property="workUnitCode" column="work_unit_code"/>
<result property="monitorType" column="monitor_type" /> <result property="workUnitName" column="work_unit_name"/>
<result property="formulaMode" column="formula_mode" /> <result property="monitorStatus" column="monitor_status"/>
<result property="proportion" column="proportion" /> <result property="monitorType" column="monitor_type"/>
<result property="remark" column="remark" /> <result property="formulaMode" column="formula_mode"/>
<result property="isFlag" column="is_flag" /> <result property="proportion" column="proportion"/>
<result property="createdBy" column="created_by" /> <result property="remark" column="remark"/>
<result property="createdTime" column="created_time" /> <result property="isFlag" column="is_flag"/>
<result property="updatedBy" column="updated_by" /> <result property="createdBy" column="created_by"/>
<result property="updatedTime" column="updated_time" /> <result property="createdTime" column="created_time"/>
<result property="updatedBy" column="updated_by"/>
<result property="updatedTime" column="updated_time"/>
</resultMap> </resultMap>
<sql id="selectBaseMonitorWorkUnitVo"> <sql id="selectBaseMonitorWorkUnitVo">
select obj_id, monitor_code, work_unit_code, monitor_status, monitor_type, formula_mode, proportion, remark, is_flag, created_by, created_time, updated_by, updated_time from base_monitor_work_unit select bmwu.obj_id,
bmwu.monitor_code,
bmi.monitor_name,
bmwu.work_unit_code,
wu.work_unit_name,
bmwu.monitor_status,
bmwu.monitor_type,
bmwu.formula_mode,
bmwu.proportion,
bmwu.remark,
bmwu.is_flag,
bmwu.created_by,
bmwu.created_time,
bmwu.updated_by,
bmwu.updated_time
from base_monitor_work_unit bmwu
left join BASE_WORK_UNIT wu on wu.WORK_UNIT_CODE = bmwu.work_unit_code
left join BASE_MONITORINFO bmi on bmi.monitor_code = bmwu.monitor_code
</sql> </sql>
<select id="selectBaseMonitorWorkUnitList" parameterType="BaseMonitorWorkUnit" resultMap="BaseMonitorWorkUnitResult"> <select id="selectBaseMonitorWorkUnitList" parameterType="BaseMonitorWorkUnit"
resultMap="BaseMonitorWorkUnitResult">
<include refid="selectBaseMonitorWorkUnitVo"/> <include refid="selectBaseMonitorWorkUnitVo"/>
<where> <where>
<if test="objId != null "> and obj_id = #{objId}</if> <if test="objId != null ">and bmwu.obj_id = #{objId}</if>
<if test="monitorCode != null and monitorCode != ''"> and monitor_code = #{monitorCode}</if> <if test="monitorCode != null and monitorCode != ''">and bmwu.monitor_code = #{monitorCode}</if>
<if test="workUnitCode != null and workUnitCode != ''"> and work_unit_code = #{workUnitCode}</if> <if test="workUnitCode != null and workUnitCode != ''">and bmwu.work_unit_code = #{workUnitCode}</if>
<if test="monitorStatus != null "> and monitor_status = #{monitorStatus}</if> <if test="monitorStatus != null ">and bmwu.monitor_status = #{monitorStatus}</if>
<if test="monitorType != null "> and monitor_type = #{monitorType}</if> <if test="monitorType != null ">and bmwu.monitor_type = #{monitorType}</if>
<if test="formulaMode != null "> and formula_mode = #{formulaMode}</if> <if test="formulaMode != null ">and bmwu.formula_mode = #{formulaMode}</if>
<if test="proportion != null "> and proportion = #{proportion}</if> <if test="proportion != null ">and bmwu.proportion = #{proportion}</if>
<if test="isFlag != null "> and is_flag = #{isFlag}</if> <if test="isFlag != null ">and bmwu.is_flag = #{isFlag}</if>
<if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if>
<if test="createdTime != null "> and created_time = #{createdTime}</if>
<if test="updatedBy != null and updatedBy != ''"> and updated_by = #{updatedBy}</if>
<if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
</where> </where>
order by OBJ_ID order by OBJ_ID
</select> </select>
<select id="selectBaseMonitorWorkUnitByObjId" parameterType="Long" resultMap="BaseMonitorWorkUnitResult"> <select id="selectBaseMonitorWorkUnitByObjId" parameterType="Long" resultMap="BaseMonitorWorkUnitResult">
<include refid="selectBaseMonitorWorkUnitVo"/> <include refid="selectBaseMonitorWorkUnitVo"/>
where obj_id = #{objId} where bmwu.obj_id = #{objId}
</select> </select>
<insert id="insertBaseMonitorWorkUnit" parameterType="BaseMonitorWorkUnit"> <insert id="insertBaseMonitorWorkUnit" parameterType="BaseMonitorWorkUnit">
@ -54,58 +70,60 @@
</selectKey> </selectKey>
insert into base_monitor_work_unit insert into base_monitor_work_unit
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="objId != null">obj_id,</if> <if test="objId != null">obj_id,</if>
<if test="monitorCode != null and monitorCode != ''">monitor_code,</if> <if test="monitorCode != null and monitorCode != ''">monitor_code,</if>
<if test="workUnitCode != null">work_unit_code,</if> <if test="workUnitCode != null">work_unit_code,</if>
<if test="monitorStatus != null">monitor_status,</if> <if test="monitorStatus != null">monitor_status,</if>
<if test="monitorType != null">monitor_type,</if> <if test="monitorType != null">monitor_type,</if>
<if test="formulaMode != null">formula_mode,</if> <if test="formulaMode != null">formula_mode,</if>
<if test="proportion != null">proportion,</if> <if test="proportion != null">proportion,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
<if test="isFlag != null">is_flag,</if> <if test="isFlag != null">is_flag,</if>
<if test="createdBy != null">created_by,</if> <if test="createdBy != null">created_by,</if>
<if test="createdTime != null">created_time,</if> <if test="createdTime != null">created_time,</if>
<if test="updatedBy != null">updated_by,</if> <if test="updatedBy != null">updated_by,</if>
<if test="updatedTime != null">updated_time,</if> <if test="updatedTime != null">updated_time,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="objId != null">#{objId},</if> <if test="objId != null">#{objId},</if>
<if test="monitorCode != null and monitorCode != ''">#{monitorCode},</if> <if test="monitorCode != null and monitorCode != ''">#{monitorCode},</if>
<if test="workUnitCode != null">#{workUnitCode},</if> <if test="workUnitCode != null">#{workUnitCode},</if>
<if test="monitorStatus != null">#{monitorStatus},</if> <if test="monitorStatus != null">#{monitorStatus},</if>
<if test="monitorType != null">#{monitorType},</if> <if test="monitorType != null">#{monitorType},</if>
<if test="formulaMode != null">#{formulaMode},</if> <if test="formulaMode != null">#{formulaMode},</if>
<if test="proportion != null">#{proportion},</if> <if test="proportion != null">#{proportion},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
<if test="isFlag != null">#{isFlag},</if> <if test="isFlag != null">#{isFlag},</if>
<if test="createdBy != null">#{createdBy},</if> <if test="createdBy != null">#{createdBy},</if>
<if test="createdTime != null">#{createdTime},</if> <if test="createdTime != null">#{createdTime},</if>
<if test="updatedBy != null">#{updatedBy},</if> <if test="updatedBy != null">#{updatedBy},</if>
<if test="updatedTime != null">#{updatedTime},</if> <if test="updatedTime != null">#{updatedTime},</if>
</trim> </trim>
</insert> </insert>
<update id="updateBaseMonitorWorkUnit" parameterType="BaseMonitorWorkUnit"> <update id="updateBaseMonitorWorkUnit" parameterType="BaseMonitorWorkUnit">
update base_monitor_work_unit update base_monitor_work_unit
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="monitorCode != null and monitorCode != ''">monitor_code = #{monitorCode},</if> <if test="monitorCode != null and monitorCode != ''">monitor_code = #{monitorCode},</if>
<if test="workUnitCode != null">work_unit_code = #{workUnitCode},</if> <if test="workUnitCode != null">work_unit_code = #{workUnitCode},</if>
<if test="monitorStatus != null">monitor_status = #{monitorStatus},</if> <if test="monitorStatus != null">monitor_status = #{monitorStatus},</if>
<if test="monitorType != null">monitor_type = #{monitorType},</if> <if test="monitorType != null">monitor_type = #{monitorType},</if>
<if test="formulaMode != null">formula_mode = #{formulaMode},</if> <if test="formulaMode != null">formula_mode = #{formulaMode},</if>
<if test="proportion != null">proportion = #{proportion},</if> <if test="proportion != null">proportion = #{proportion},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="isFlag != null">is_flag = #{isFlag},</if> <if test="isFlag != null">is_flag = #{isFlag},</if>
<if test="createdBy != null">created_by = #{createdBy},</if> <if test="createdBy != null">created_by = #{createdBy},</if>
<if test="createdTime != null">created_time = #{createdTime},</if> <if test="createdTime != null">created_time = #{createdTime},</if>
<if test="updatedBy != null">updated_by = #{updatedBy},</if> <if test="updatedBy != null">updated_by = #{updatedBy},</if>
<if test="updatedTime != null">updated_time = #{updatedTime},</if> <if test="updatedTime != null">updated_time = #{updatedTime},</if>
</trim> </trim>
where obj_id = #{objId} where obj_id = #{objId}
</update> </update>
<delete id="deleteBaseMonitorWorkUnitByObjId" parameterType="Long"> <delete id="deleteBaseMonitorWorkUnitByObjId" parameterType="Long">
delete from base_monitor_work_unit where obj_id = #{objId} delete
from base_monitor_work_unit
where obj_id = #{objId}
</delete> </delete>
<delete id="deleteBaseMonitorWorkUnitByObjIds" parameterType="String"> <delete id="deleteBaseMonitorWorkUnitByObjIds" parameterType="String">

169
aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml
Unescape Escape View File

@ -5,109 +5,136 @@
<mapper namespace="com.aucma.base.mapper.BaseQualityInspectionItemMapper"> <mapper namespace="com.aucma.base.mapper.BaseQualityInspectionItemMapper">
<resultMap type="BaseQualityInspectionItem" id="BaseQualityInspectionItemResult"> <resultMap type="BaseQualityInspectionItem" id="BaseQualityInspectionItemResult">
<result property="objId" column="obj_id" /> <result property="objId" column="obj_id"/>
<result property="qualityDefectCode" column="quality_defect_code" /> <result property="qualityDefectCode" column="quality_defect_code"/>
<result property="qualityDefectName" column="quality_defect_name" /> <result property="qualityDefectName" column="quality_defect_name"/>
<result property="parentId" column="parent_id" /> <result property="parentId" column="parent_id"/>
<result property="materialCategories" column="material_categories" /> <result property="materialCategories" column="material_categories"/>
<result property="materialSubclass" column="material_subclass" /> <result property="materialSubclass" column="material_subclass"/>
<result property="plantCode" column="plant_code" /> <result property="plantCode" column="plant_code"/>
<result property="remark" column="remark" /> <result property="remark" column="remark"/>
<result property="isFlag" column="is_flag" /> <result property="isFlag" column="is_flag"/>
<result property="createdBy" column="created_by" /> <result property="createdBy" column="created_by"/>
<result property="createdTime" column="created_time" /> <result property="createdTime" column="created_time"/>
<result property="updatedBy" column="updated_by" /> <result property="updatedBy" column="updated_by"/>
<result property="updatedTime" column="updated_time" /> <result property="updatedTime" column="updated_time"/>
</resultMap> </resultMap>
<sql id="selectBaseQualityInspectionItemVo"> <sql id="selectBaseQualityInspectionItemVo">
select 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 from base_quality_inspection_item select 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
from base_quality_inspection_item
</sql> </sql>
<select id="selectBaseQualityInspectionItemList" parameterType="BaseQualityInspectionItem" resultMap="BaseQualityInspectionItemResult"> <select id="selectBaseQualityInspectionItemList" parameterType="BaseQualityInspectionItem"
resultMap="BaseQualityInspectionItemResult">
<include refid="selectBaseQualityInspectionItemVo"/> <include refid="selectBaseQualityInspectionItemVo"/>
<where> <where>
<if test="qualityDefectCode != null and qualityDefectCode != ''"> and quality_defect_code = #{qualityDefectCode}</if> <if test="qualityDefectCode != null and qualityDefectCode != ''">and quality_defect_code =
<if test="qualityDefectName != null and qualityDefectName != ''"> and quality_defect_name like concat(concat('%', #{qualityDefectName}), '%')</if> #{qualityDefectCode}
<if test="parentId != null and parentId != ''"> and parent_id = #{parentId}</if> </if>
<if test="materialCategories != null and materialCategories != ''"> and material_categories = #{materialCategories}</if> <if test="qualityDefectName != null and qualityDefectName != ''">and quality_defect_name like
<if test="materialSubclass != null and materialSubclass != ''"> and material_subclass = #{materialSubclass}</if> concat(concat('%', #{qualityDefectName}), '%')
<if test="plantCode != null and plantCode != ''"> and plant_code = #{plantCode}</if> </if>
<if test="isFlag != null "> and is_flag = #{isFlag}</if> <if test="parentId != null and parentId != ''">and parent_id = #{parentId}</if>
<if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if> <if test="materialCategories != null and materialCategories != ''">and material_categories =
<if test="createdTime != null "> and created_time = #{createdTime}</if> #{materialCategories}
<if test="updatedBy != null and updatedBy != ''"> and updated_by = #{updatedBy}</if> </if>
<if test="updatedTime != null "> and updated_time = #{updatedTime}</if> <if test="materialSubclass != null and materialSubclass != ''">and material_subclass =
#{materialSubclass}
</if>
<if test="plantCode != null and plantCode != ''">and plant_code = #{plantCode}</if>
<if test="isFlag != null ">and is_flag = #{isFlag}</if>
<if test="createdBy != null and createdBy != ''">and created_by = #{createdBy}</if>
<if test="createdTime != null ">and created_time = #{createdTime}</if>
<if test="updatedBy != null and updatedBy != ''">and updated_by = #{updatedBy}</if>
<if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
</where> </where>
order by quality_defect_code
</select> </select>
<select id="selectBaseQualityInspectionItemByObjId" parameterType="Long" resultMap="BaseQualityInspectionItemResult"> <select id="selectBaseQualityInspectionItemByObjId" parameterType="Long"
<include refid="selectBaseQualityInspectionItemVo"/> resultMap="BaseQualityInspectionItemResult">
where obj_id = #{objId} <include refid="selectBaseQualityInspectionItemVo"/>
where obj_id = #{objId}
</select> </select>
<select id="selectBaseQualityInspectionItemParent" resultMap="BaseQualityInspectionItemResult"> <select id="selectBaseQualityInspectionItemParent" resultMap="BaseQualityInspectionItemResult">
<include refid="selectBaseQualityInspectionItemVo"/> <include refid="selectBaseQualityInspectionItemVo"/>
where PARENT_ID = 0 where PARENT_ID = 0
order by quality_defect_code
</select> </select>
<insert id="insertBaseQualityInspectionItem" parameterType="BaseQualityInspectionItem"> <insert id="insertBaseQualityInspectionItem" parameterType="BaseQualityInspectionItem">
<selectKey keyProperty="objId" resultType="long" order="BEFORE"> <selectKey keyProperty="objId" resultType="long" order="BEFORE">
SELECT seq_base_quality_inspection.NEXTVAL as objId FROM DUAL SELECT seq_base_quality_inspection.NEXTVAL as objId FROM DUAL
</selectKey> </selectKey>
insert into base_quality_inspection_item insert into base_quality_inspection_item
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="objId != null">obj_id,</if> <if test="objId != null">obj_id,</if>
<if test="qualityDefectCode != null">quality_defect_code,</if> <if test="qualityDefectCode != null">quality_defect_code,</if>
<if test="qualityDefectName != null">quality_defect_name,</if> <if test="qualityDefectName != null">quality_defect_name,</if>
<if test="parentId != null">parent_id,</if> <if test="parentId != null">parent_id,</if>
<if test="materialCategories != null">material_categories,</if> <if test="materialCategories != null">material_categories,</if>
<if test="materialSubclass != null">material_subclass,</if> <if test="materialSubclass != null">material_subclass,</if>
<if test="plantCode != null">plant_code,</if> <if test="plantCode != null">plant_code,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
<if test="isFlag != null">is_flag,</if> <if test="isFlag != null">is_flag,</if>
<if test="createdBy != null">created_by,</if> <if test="createdBy != null">created_by,</if>
<if test="createdTime != null">created_time,</if> <if test="createdTime != null">created_time,</if>
<if test="updatedBy != null">updated_by,</if> <if test="updatedBy != null">updated_by,</if>
<if test="updatedTime != null">updated_time,</if> <if test="updatedTime != null">updated_time,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="objId != null">#{objId},</if> <if test="objId != null">#{objId},</if>
<if test="qualityDefectCode != null">#{qualityDefectCode},</if> <if test="qualityDefectCode != null">#{qualityDefectCode},</if>
<if test="qualityDefectName != null">#{qualityDefectName},</if> <if test="qualityDefectName != null">#{qualityDefectName},</if>
<if test="parentId != null">#{parentId},</if> <if test="parentId != null">#{parentId},</if>
<if test="materialCategories != null">#{materialCategories},</if> <if test="materialCategories != null">#{materialCategories},</if>
<if test="materialSubclass != null">#{materialSubclass},</if> <if test="materialSubclass != null">#{materialSubclass},</if>
<if test="plantCode != null">#{plantCode},</if> <if test="plantCode != null">#{plantCode},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
<if test="isFlag != null">#{isFlag},</if> <if test="isFlag != null">#{isFlag},</if>
<if test="createdBy != null">#{createdBy},</if> <if test="createdBy != null">#{createdBy},</if>
<if test="createdTime != null">#{createdTime},</if> <if test="createdTime != null">#{createdTime},</if>
<if test="updatedBy != null">#{updatedBy},</if> <if test="updatedBy != null">#{updatedBy},</if>
<if test="updatedTime != null">#{updatedTime},</if> <if test="updatedTime != null">#{updatedTime},</if>
</trim> </trim>
</insert> </insert>
<update id="updateBaseQualityInspectionItem" parameterType="BaseQualityInspectionItem"> <update id="updateBaseQualityInspectionItem" parameterType="BaseQualityInspectionItem">
update base_quality_inspection_item update base_quality_inspection_item
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="qualityDefectCode != null">quality_defect_code = #{qualityDefectCode},</if> <if test="qualityDefectCode != null">quality_defect_code = #{qualityDefectCode},</if>
<if test="qualityDefectName != null">quality_defect_name = #{qualityDefectName},</if> <if test="qualityDefectName != null">quality_defect_name = #{qualityDefectName},</if>
<if test="parentId != null">parent_id = #{parentId},</if> <if test="parentId != null">parent_id = #{parentId},</if>
<if test="materialCategories != null">material_categories = #{materialCategories},</if> <if test="materialCategories != null">material_categories = #{materialCategories},</if>
<if test="materialSubclass != null">material_subclass = #{materialSubclass},</if> <if test="materialSubclass != null">material_subclass = #{materialSubclass},</if>
<if test="plantCode != null">plant_code = #{plantCode},</if> <if test="plantCode != null">plant_code = #{plantCode},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="isFlag != null">is_flag = #{isFlag},</if> <if test="isFlag != null">is_flag = #{isFlag},</if>
<if test="createdBy != null">created_by = #{createdBy},</if> <if test="createdBy != null">created_by = #{createdBy},</if>
<if test="createdTime != null">created_time = #{createdTime},</if> <if test="createdTime != null">created_time = #{createdTime},</if>
<if test="updatedBy != null">updated_by = #{updatedBy},</if> <if test="updatedBy != null">updated_by = #{updatedBy},</if>
<if test="updatedTime != null">updated_time = #{updatedTime},</if> <if test="updatedTime != null">updated_time = #{updatedTime},</if>
</trim> </trim>
where obj_id = #{objId} where obj_id = #{objId}
</update> </update>
<delete id="deleteBaseQualityInspectionItemByObjId" parameterType="Long"> <delete id="deleteBaseQualityInspectionItemByObjId" parameterType="Long">
delete from base_quality_inspection_item where obj_id = #{objId} delete
from base_quality_inspection_item
where obj_id = #{objId}
</delete> </delete>
<delete id="deleteBaseQualityInspectionItemByObjIds" parameterType="String"> <delete id="deleteBaseQualityInspectionItemByObjIds" parameterType="String">

Write Preview
Loading…
Cancel
Save