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
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)
@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));
}
@ -100,12 +89,7 @@ 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));
}

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) {
return success(baseQualityInspectionItemService.selectBaseQualityInspectionItemByObjId(objId));
}
/**
* 查询所有父级以及名称
* */

47
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
*/
@RestController
@RequestMapping("/base/workUnit" )
@RequestMapping("/base/workUnit")
public class BaseWorkUnitController extends BaseController {
@Autowired
private IBaseWorkUnitService baseWorkUnitService;
@ -43,23 +43,16 @@ public class BaseWorkUnitController extends BaseController {
/**
* 查询统计单元信息列表
*/
@PreAuthorize("@ss.hasPermi('base:workUnit:list')" )
@GetMapping("/list" )
@PreAuthorize("@ss.hasPermi('base:workUnit:list')")
@GetMapping("/list")
public AjaxResult list(BaseWorkUnit baseWorkUnit) {
List<BaseWorkUnit> list = baseWorkUnitService.selectBaseWorkUnitList(baseWorkUnit);
BaseProductLine baseProductLine = new BaseProductLine();
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")
public AjaxResult getMonitorInfoTree(BaseWorkUnit baseWorkUnit) {
List<TreeSelects> list = baseWorkUnitService.selectBaseWorkUnitTreeList(baseWorkUnit);
@ -69,29 +62,29 @@ public class BaseWorkUnitController extends BaseController {
/**
* 导出统计单元信息列表
*/
@PreAuthorize("@ss.hasPermi('base:workUnit:export')" )
@Log(title = "统计单元信息" , businessType = BusinessType.EXPORT)
@PostMapping("/export" )
@PreAuthorize("@ss.hasPermi('base:workUnit:export')")
@Log(title = "统计单元信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BaseWorkUnit baseWorkUnit) {
List<BaseWorkUnit> list = baseWorkUnitService.selectBaseWorkUnitList(baseWorkUnit);
ExcelUtil<BaseWorkUnit> util = new ExcelUtil<BaseWorkUnit>(BaseWorkUnit. class);
util.exportExcel(response, list, "统计单元信息数据" );
ExcelUtil<BaseWorkUnit> util = new ExcelUtil<BaseWorkUnit>(BaseWorkUnit.class);
util.exportExcel(response, list, "统计单元信息数据");
}
/**
* 获取统计单元信息详细信息
*/
@PreAuthorize("@ss.hasPermi('base:workUnit:query')" )
@GetMapping(value = "/{objId}" )
public AjaxResult getInfo(@PathVariable("objId" ) Long objId) {
@PreAuthorize("@ss.hasPermi('base:workUnit:query')")
@GetMapping(value = "/{objId}")
public AjaxResult getInfo(@PathVariable("objId") Long objId) {
return success(baseWorkUnitService.selectBaseWorkUnitByObjId(objId));
}
/**
* 新增统计单元信息
*/
@PreAuthorize("@ss.hasPermi('base:workUnit:add')" )
@Log(title = "统计单元信息" , businessType = BusinessType.INSERT)
@PreAuthorize("@ss.hasPermi('base:workUnit:add')")
@Log(title = "统计单元信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BaseWorkUnit baseWorkUnit) {
baseWorkUnit.setCreatedBy(getUsername());
@ -102,8 +95,8 @@ public class BaseWorkUnitController extends BaseController {
/**
* 修改统计单元信息
*/
@PreAuthorize("@ss.hasPermi('base:workUnit:edit')" )
@Log(title = "统计单元信息" , businessType = BusinessType.UPDATE)
@PreAuthorize("@ss.hasPermi('base:workUnit:edit')")
@Log(title = "统计单元信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BaseWorkUnit baseWorkUnit) {
baseWorkUnit.setUpdatedBy(getUsername());
@ -114,9 +107,9 @@ public class BaseWorkUnitController extends BaseController {
/**
* 删除统计单元信息
*/
@PreAuthorize("@ss.hasPermi('base:workUnit:remove')" )
@Log(title = "统计单元信息" , businessType = BusinessType.DELETE)
@DeleteMapping("/{objIds}" )
@PreAuthorize("@ss.hasPermi('base:workUnit:remove')")
@Log(title = "统计单元信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{objIds}")
public AjaxResult remove(@PathVariable Long[] objIds) {
return toAjax(baseWorkUnitService.deleteBaseWorkUnitByObjIds(objIds));
}

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

@ -1,6 +1,7 @@
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;
@ -13,185 +14,223 @@ import com.aucma.common.core.domain.BaseEntity;
* @author Yinq
* @date 2023-10-12
*/
public class BaseMonitorWorkUnit extends BaseEntity
{
private static final long serialVersionUID=1L;
public class BaseMonitorWorkUnit extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 主键标识 */
/**
* 主键标识
*/
@Excel(name = "主键标识")
private Long objId;
/** 计量设备编号 */
/**
* 计量设备编号
*/
@Excel(name = "计量设备编号")
private String monitorCode;
/** 统计单元编号 */
/**
* 计量设备名称
*/
@Excel(name = "计量设备名称")
private String monitorName;
/**
* 统计单元编号
*/
@Excel(name = "统计单元编号")
private String workUnitCode;
/** 计量设备状态 */
/**
* 统计单元名称
*/
@Excel(name = "统计单元名称")
private String workUnitName;
/**
* 计量设备状态
*/
@Excel(name = "计量设备状态")
private Long monitorStatus;
/** 计量设备类型 */
/**
* 计量设备类型
*/
@Excel(name = "计量设备类型")
private Long monitorType;
/** 计算方式（0-加，1-减） */
/**
* 计算方式（0-加，1-减）
*/
@Excel(name = "计算方式", readConverterExp = "0=-加，1-减")
private Long formulaMode;
/** 比率 */
/**
* 比率
*/
@Excel(name = "比率")
private Long proportion;
/** 启用标识 */
/**
* 启用标识
*/
@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)
{
public String getMonitorName() {
return monitorName;
}
public void setMonitorName(String monitorName) {
this.monitorName = monitorName;
}
public String getWorkUnitName() {
return workUnitName;
}
public void setWorkUnitName(String workUnitName) {
this.workUnitName = workUnitName;
}
public void setObjId(Long objId) {
this.objId = objId;
}
public Long getObjId()
{
public Long getObjId() {
return objId;
}
public void setMonitorCode(String monitorCode)
{
public void setMonitorCode(String monitorCode) {
this.monitorCode = monitorCode;
}
public String getMonitorCode()
{
public String getMonitorCode() {
return monitorCode;
}
public void setWorkUnitCode(String workUnitCode)
{
public void setWorkUnitCode(String workUnitCode) {
this.workUnitCode = workUnitCode;
}
public String getWorkUnitCode()
{
public String getWorkUnitCode() {
return workUnitCode;
}
public void setMonitorStatus(Long monitorStatus)
{
public void setMonitorStatus(Long monitorStatus) {
this.monitorStatus = monitorStatus;
}
public Long getMonitorStatus()
{
public Long getMonitorStatus() {
return monitorStatus;
}
public void setMonitorType(Long monitorType)
{
public void setMonitorType(Long monitorType) {
this.monitorType = monitorType;
}
public Long getMonitorType()
{
public Long getMonitorType() {
return monitorType;
}
public void setFormulaMode(Long formulaMode)
{
public void setFormulaMode(Long formulaMode) {
this.formulaMode = formulaMode;
}
public Long getFormulaMode()
{
public Long getFormulaMode() {
return formulaMode;
}
public void setProportion(Long proportion)
{
public void setProportion(Long proportion) {
this.proportion = proportion;
}
public Long getProportion()
{
public Long getProportion() {
return proportion;
}
public void setIsFlag(Long isFlag)
{
public void setIsFlag(Long isFlag) {
this.isFlag = isFlag;
}
public Long getIsFlag()
{
public Long getIsFlag() {
return isFlag;
}
public void setCreatedBy(String createdBy)
{
public void setCreatedBy(String createdBy) {
this.createdBy = createdBy;
}
public String getCreatedBy()
{
public String getCreatedBy() {
return createdBy;
}
public void setCreatedTime(Date createdTime)
{
public void setCreatedTime(Date createdTime) {
this.createdTime = createdTime;
}
public Date getCreatedTime()
{
public Date getCreatedTime() {
return createdTime;
}
public void setUpdatedBy(String updatedBy)
{
public void setUpdatedBy(String updatedBy) {
this.updatedBy = updatedBy;
}
public String getUpdatedBy()
{
public String getUpdatedBy() {
return updatedBy;
}
public void setUpdatedTime(Date updatedTime)
{
public void setUpdatedTime(Date updatedTime) {
this.updatedTime = updatedTime;
}
public Date getUpdatedTime()
{
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())
@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();
}
}
}

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

@ -17,31 +17,42 @@ import com.aucma.common.core.domain.TreeEntity;
* @author Yinq
* @date 2023-10-12
*/
public class BaseWorkUnit extends BaseEntity
{
private static final long serialVersionUID=1L;
public class BaseWorkUnit extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 主键标识 */
/**
* 主键标识
*/
@Excel(name = "主键标识")
private Long objId;
/** 统计单元编号 */
/**
* 统计单元编号
*/
@Excel(name = "统计单元编号")
private String workUnitCode;
/** 统计单元名称 */
/**
* 统计单元名称
*/
@Excel(name = "统计单元名称")
private String workUnitName;
/** 统计区域 */
/**
* 统计区域
*/
@Excel(name = "统计区域")
private String workUnitAddress;
/** 排序 */
/**
* 排序
*/
@Excel(name = "排序")
private Long workUnitSort;
/** 产线/工位 */
/**
* 产线/工位
*/
@Excel(name = "产线/工位")
private String productLineCode;
@ -55,31 +66,44 @@ private static final long serialVersionUID=1L;
this.productLineName = productLineName;
}
/** 统计单元类型 */
/**
* 统计单元类型
*/
@Excel(name = "统计单元类型")
private Long workUnitType;
/** 启用标识 */
/**
* 启用标识
*/
@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;
private List<BaseWorkUnit> children = new ArrayList<BaseWorkUnit>();
private String parentName;
@ -130,112 +154,99 @@ private static final long serialVersionUID=1L;
this.ancestors = ancestors;
}
public void setObjId(Long objId)
{
public void setObjId(Long objId) {
this.objId = objId;
}
public Long getObjId()
{
public Long getObjId() {
return objId;
}
public void setWorkUnitCode(String workUnitCode)
{
public void setWorkUnitCode(String workUnitCode) {
this.workUnitCode = workUnitCode;
}
public String getWorkUnitCode()
{
public String getWorkUnitCode() {
return workUnitCode;
}
public void setWorkUnitName(String workUnitName)
{
public void setWorkUnitName(String workUnitName) {
this.workUnitName = workUnitName;
}
public String getWorkUnitName()
{
public String getWorkUnitName() {
return workUnitName;
}
public void setWorkUnitAddress(String workUnitAddress)
{
public void setWorkUnitAddress(String workUnitAddress) {
this.workUnitAddress = workUnitAddress;
}
public String getWorkUnitAddress()
{
public String getWorkUnitAddress() {
return workUnitAddress;
}
public void setWorkUnitSort(Long workUnitSort)
{
public void setWorkUnitSort(Long workUnitSort) {
this.workUnitSort = workUnitSort;
}
public Long getWorkUnitSort()
{
public Long getWorkUnitSort() {
return workUnitSort;
}
public void setProductLineCode(String productLineCode)
{
public void setProductLineCode(String productLineCode) {
this.productLineCode = productLineCode;
}
public String getProductLineCode()
{
public String getProductLineCode() {
return productLineCode;
}
public void setWorkUnitType(Long workUnitType)
{
public void setWorkUnitType(Long workUnitType) {
this.workUnitType = workUnitType;
}
public Long getWorkUnitType()
{
public Long getWorkUnitType() {
return workUnitType;
}
public void setIsFlag(Long isFlag)
{
public void setIsFlag(Long isFlag) {
this.isFlag = isFlag;
}
public Long getIsFlag()
{
public Long getIsFlag() {
return isFlag;
}
public void setCreatedBy(String createdBy)
{
public void setCreatedBy(String createdBy) {
this.createdBy = createdBy;
}
public String getCreatedBy()
{
public String getCreatedBy() {
return createdBy;
}
public void setCreatedTime(Date createdTime)
{
public void setCreatedTime(Date createdTime) {
this.createdTime = createdTime;
}
public Date getCreatedTime()
{
public Date getCreatedTime() {
return createdTime;
}
public void setUpdatedBy(String updatedBy)
{
public void setUpdatedBy(String updatedBy) {
this.updatedBy = updatedBy;
}
public String getUpdatedBy()
{
public String getUpdatedBy() {
return updatedBy;
}
public void setUpdatedTime(Date updatedTime)
{
public void setUpdatedTime(Date updatedTime) {
this.updatedTime = updatedTime;
}
public Date getUpdatedTime()
{
public Date getUpdatedTime() {
return updatedTime;
}
@ -262,4 +273,4 @@ private static final long serialVersionUID=1L;
", 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);
/**
* 查询所有父级以及名称
* */
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);
/**
* 查询所有父级以及名称
* */
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;
import java.util.List;
import com.aucma.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aucma.base.mapper.BaseMonitorWorkUnitMapper;
@ -52,7 +54,7 @@ public class BaseMonitorWorkUnitServiceImpl implements IBaseMonitorWorkUnitServi
@Override
public int insertBaseMonitorWorkUnit(BaseMonitorWorkUnit baseMonitorWorkUnit)
{
baseMonitorWorkUnit.setCreatedTime(DateUtils.getNowDate());
return baseMonitorWorkUnitMapper.insertBaseMonitorWorkUnit(baseMonitorWorkUnit);
}
@ -65,6 +67,7 @@ public class BaseMonitorWorkUnitServiceImpl implements IBaseMonitorWorkUnitServi
@Override
public int updateBaseMonitorWorkUnit(BaseMonitorWorkUnit baseMonitorWorkUnit)
{
baseMonitorWorkUnit.setUpdatedTime(DateUtils.getNowDate());
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);
}
/**
* 查询所有父级以及名称
* */
@Override
public List<BaseQualityInspectionItem> 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
public List<BaseWorkUnit> buildWorkUnitTree(List<BaseWorkUnit> baseWorkUnits) {
List<BaseWorkUnit> returnList = new ArrayList<BaseWorkUnit>();
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);
returnList.add(baseWorkUnit);
recursionFn(baseWorkUnits, baseMonitorInfo);
returnList.add(baseMonitorInfo);
}
}
if (returnList.isEmpty())

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

@ -5,47 +5,63 @@
<mapper namespace="com.aucma.base.mapper.BaseMonitorWorkUnitMapper">
<resultMap type="BaseMonitorWorkUnit" id="BaseMonitorWorkUnitResult">
<result property="objId" column="obj_id" />
<result property="monitorCode" column="monitor_code" />
<result property="workUnitCode" column="work_unit_code" />
<result property="monitorStatus" column="monitor_status" />
<result property="monitorType" column="monitor_type" />
<result property="formulaMode" column="formula_mode" />
<result property="proportion" column="proportion" />
<result property="remark" column="remark" />
<result property="isFlag" column="is_flag" />
<result property="createdBy" column="created_by" />
<result property="createdTime" column="created_time" />
<result property="updatedBy" column="updated_by" />
<result property="updatedTime" column="updated_time" />
<result property="objId" column="obj_id"/>
<result property="monitorCode" column="monitor_code"/>
<result property="monitorName" column="monitor_name"/>
<result property="workUnitCode" column="work_unit_code"/>
<result property="workUnitName" column="work_unit_name"/>
<result property="monitorStatus" column="monitor_status"/>
<result property="monitorType" column="monitor_type"/>
<result property="formulaMode" column="formula_mode"/>
<result property="proportion" column="proportion"/>
<result property="remark" column="remark"/>
<result property="isFlag" column="is_flag"/>
<result property="createdBy" column="created_by"/>
<result property="createdTime" column="created_time"/>
<result property="updatedBy" column="updated_by"/>
<result property="updatedTime" column="updated_time"/>
</resultMap>
<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>
<select id="selectBaseMonitorWorkUnitList" parameterType="BaseMonitorWorkUnit" resultMap="BaseMonitorWorkUnitResult">
<select id="selectBaseMonitorWorkUnitList" parameterType="BaseMonitorWorkUnit"
resultMap="BaseMonitorWorkUnitResult">
<include refid="selectBaseMonitorWorkUnitVo"/>
<where>
<if test="objId != null "> and obj_id = #{objId}</if>
<if test="monitorCode != null and monitorCode != ''"> and monitor_code = #{monitorCode}</if>
<if test="workUnitCode != null and workUnitCode != ''"> and work_unit_code = #{workUnitCode}</if>
<if test="monitorStatus != null "> and monitor_status = #{monitorStatus}</if>
<if test="monitorType != null "> and monitor_type = #{monitorType}</if>
<if test="formulaMode != null "> and formula_mode = #{formulaMode}</if>
<if test="proportion != null "> and proportion = #{proportion}</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>
<if test="objId != null ">and bmwu.obj_id = #{objId}</if>
<if test="monitorCode != null and monitorCode != ''">and bmwu.monitor_code = #{monitorCode}</if>
<if test="workUnitCode != null and workUnitCode != ''">and bmwu.work_unit_code = #{workUnitCode}</if>
<if test="monitorStatus != null ">and bmwu.monitor_status = #{monitorStatus}</if>
<if test="monitorType != null ">and bmwu.monitor_type = #{monitorType}</if>
<if test="formulaMode != null ">and bmwu.formula_mode = #{formulaMode}</if>
<if test="proportion != null ">and bmwu.proportion = #{proportion}</if>
<if test="isFlag != null ">and bmwu.is_flag = #{isFlag}</if>
</where>
order by OBJ_ID
</select>
<select id="selectBaseMonitorWorkUnitByObjId" parameterType="Long" resultMap="BaseMonitorWorkUnitResult">
<include refid="selectBaseMonitorWorkUnitVo"/>
where obj_id = #{objId}
where bmwu.obj_id = #{objId}
</select>
<insert id="insertBaseMonitorWorkUnit" parameterType="BaseMonitorWorkUnit">
@ -105,7 +121,9 @@
</update>
<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 id="deleteBaseMonitorWorkUnitByObjIds" parameterType="String">

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

@ -5,49 +5,74 @@
<mapper namespace="com.aucma.base.mapper.BaseQualityInspectionItemMapper">
<resultMap type="BaseQualityInspectionItem" id="BaseQualityInspectionItemResult">
<result property="objId" column="obj_id" />
<result property="qualityDefectCode" column="quality_defect_code" />
<result property="qualityDefectName" column="quality_defect_name" />
<result property="parentId" column="parent_id" />
<result property="materialCategories" column="material_categories" />
<result property="materialSubclass" column="material_subclass" />
<result property="plantCode" column="plant_code" />
<result property="remark" column="remark" />
<result property="isFlag" column="is_flag" />
<result property="createdBy" column="created_by" />
<result property="createdTime" column="created_time" />
<result property="updatedBy" column="updated_by" />
<result property="updatedTime" column="updated_time" />
<result property="objId" column="obj_id"/>
<result property="qualityDefectCode" column="quality_defect_code"/>
<result property="qualityDefectName" column="quality_defect_name"/>
<result property="parentId" column="parent_id"/>
<result property="materialCategories" column="material_categories"/>
<result property="materialSubclass" column="material_subclass"/>
<result property="plantCode" column="plant_code"/>
<result property="remark" column="remark"/>
<result property="isFlag" column="is_flag"/>
<result property="createdBy" column="created_by"/>
<result property="createdTime" column="created_time"/>
<result property="updatedBy" column="updated_by"/>
<result property="updatedTime" column="updated_time"/>
</resultMap>
<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>
<select id="selectBaseQualityInspectionItemList" parameterType="BaseQualityInspectionItem" resultMap="BaseQualityInspectionItemResult">
<select id="selectBaseQualityInspectionItemList" parameterType="BaseQualityInspectionItem"
resultMap="BaseQualityInspectionItemResult">
<include refid="selectBaseQualityInspectionItemVo"/>
<where>
<if test="qualityDefectCode != null and qualityDefectCode != ''"> and quality_defect_code = #{qualityDefectCode}</if>
<if test="qualityDefectName != null and qualityDefectName != ''"> and quality_defect_name like concat(concat('%', #{qualityDefectName}), '%')</if>
<if test="parentId != null and parentId != ''"> and parent_id = #{parentId}</if>
<if test="materialCategories != null and materialCategories != ''"> and material_categories = #{materialCategories}</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>
<if test="qualityDefectCode != null and qualityDefectCode != ''">and quality_defect_code =
#{qualityDefectCode}
</if>
<if test="qualityDefectName != null and qualityDefectName != ''">and quality_defect_name like
concat(concat('%', #{qualityDefectName}), '%')
</if>
<if test="parentId != null and parentId != ''">and parent_id = #{parentId}</if>
<if test="materialCategories != null and materialCategories != ''">and material_categories =
#{materialCategories}
</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>
order by quality_defect_code
</select>
<select id="selectBaseQualityInspectionItemByObjId" parameterType="Long" resultMap="BaseQualityInspectionItemResult">
<select id="selectBaseQualityInspectionItemByObjId" parameterType="Long"
resultMap="BaseQualityInspectionItemResult">
<include refid="selectBaseQualityInspectionItemVo"/>
where obj_id = #{objId}
</select>
<select id="selectBaseQualityInspectionItemParent" resultMap="BaseQualityInspectionItemResult">
<include refid="selectBaseQualityInspectionItemVo"/>
where PARENT_ID = 0
order by quality_defect_code
</select>
<insert id="insertBaseQualityInspectionItem" parameterType="BaseQualityInspectionItem">
@ -107,7 +132,9 @@
</update>
<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 id="deleteBaseQualityInspectionItemByObjIds" parameterType="String">

Write Preview
Loading…
Cancel
Save