Merge remote-tracking branch 'origin/master'
mengjiao
1 year ago
commit
6b8420f87c
@ -0,0 +1,97 @@
|
||||
package com.op.device.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.op.common.log.annotation.Log;
|
||||
import com.op.common.log.enums.BusinessType;
|
||||
import com.op.common.security.annotation.RequiresPermissions;
|
||||
import com.op.device.domain.EquOperation;
|
||||
import com.op.device.service.IEquOperationService;
|
||||
import com.op.common.core.web.controller.BaseController;
|
||||
import com.op.common.core.web.domain.AjaxResult;
|
||||
import com.op.common.core.utils.poi.ExcelUtil;
|
||||
import com.op.common.core.web.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 设备运行记录Controller
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-12-13
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/operation")
|
||||
public class EquOperationController extends BaseController {
|
||||
@Autowired
|
||||
private IEquOperationService equOperationService;
|
||||
|
||||
/**
|
||||
* 查询设备运行记录列表
|
||||
*/
|
||||
@RequiresPermissions("device:operation:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(EquOperation equOperation) {
|
||||
startPage();
|
||||
List<EquOperation> list = equOperationService.selectEquOperationList(equOperation);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出设备运行记录列表
|
||||
*/
|
||||
@RequiresPermissions("device:operation:export")
|
||||
@Log(title = "设备运行记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, EquOperation equOperation) {
|
||||
List<EquOperation> list = equOperationService.selectEquOperationList(equOperation);
|
||||
ExcelUtil<EquOperation> util = new ExcelUtil<EquOperation>(EquOperation.class);
|
||||
util.exportExcel(response, list, "设备运行记录数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取设备运行记录详细信息
|
||||
*/
|
||||
@RequiresPermissions("device:operation:query")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") String id) {
|
||||
return success(equOperationService.selectEquOperationById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增设备运行记录
|
||||
*/
|
||||
@RequiresPermissions("device:operation:add")
|
||||
@Log(title = "设备运行记录", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody EquOperation equOperation) {
|
||||
return toAjax(equOperationService.insertEquOperation(equOperation));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改设备运行记录
|
||||
*/
|
||||
@RequiresPermissions("device:operation:edit")
|
||||
@Log(title = "设备运行记录", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody EquOperation equOperation) {
|
||||
return toAjax(equOperationService.updateEquOperation(equOperation));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除设备运行记录
|
||||
*/
|
||||
@RequiresPermissions("device:operation:remove")
|
||||
@Log(title = "设备运行记录", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable String[] ids) {
|
||||
return toAjax(equOperationService.deleteEquOperationByIds(ids));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,265 @@
|
||||
package com.op.device.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.op.common.core.annotation.Excel;
|
||||
import com.op.common.core.web.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 设备运行记录对象 equ_operation
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-12-13
|
||||
*/
|
||||
public class EquOperation extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键 */
|
||||
private String id;
|
||||
|
||||
/** 车间 */
|
||||
@Excel(name = "车间")
|
||||
private String workshop;
|
||||
|
||||
/** 组线 */
|
||||
@Excel(name = "组线")
|
||||
private String groupLine;
|
||||
|
||||
/** 设备 */
|
||||
@Excel(name = "设备")
|
||||
private String equipmentName;
|
||||
|
||||
/** 设备编码 */
|
||||
@Excel(name = "设备编码")
|
||||
private String equipmentCode;
|
||||
|
||||
/** 故障时间 */
|
||||
@Excel(name = "故障时间")
|
||||
private String faultTime;
|
||||
|
||||
/** 实际运行时间;运行时间-故障时间 */
|
||||
@Excel(name = "实际运行时间;运行时间-故障时间")
|
||||
private String actualOperationTime;
|
||||
|
||||
/** 运行时间 */
|
||||
@Excel(name = "运行时间")
|
||||
private String operationTime;
|
||||
|
||||
/** 故障率 */
|
||||
@Excel(name = "故障率")
|
||||
private String failureRate;
|
||||
|
||||
/** 故障描述 */
|
||||
@Excel(name = "故障描述")
|
||||
private String failureDescription;
|
||||
|
||||
/** 原因分析 */
|
||||
@Excel(name = "原因分析")
|
||||
private String reasonAnalyze;
|
||||
|
||||
/** 处理方式 */
|
||||
@Excel(name = "处理方式")
|
||||
private String handlingMethod;
|
||||
|
||||
/** 维修人 */
|
||||
@Excel(name = "维修人")
|
||||
private String repairPerson;
|
||||
|
||||
/** 设备状态描述 */
|
||||
@Excel(name = "设备状态描述")
|
||||
private String equStatusDes;
|
||||
|
||||
/** 更换备件 */
|
||||
@Excel(name = "更换备件")
|
||||
private String replaceSpare;
|
||||
|
||||
/** 工厂 */
|
||||
@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;
|
||||
|
||||
/** 删除标识 */
|
||||
private String delFlag;
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
public void setWorkshop(String workshop) {
|
||||
this.workshop = workshop;
|
||||
}
|
||||
|
||||
public String getWorkshop() {
|
||||
return workshop;
|
||||
}
|
||||
public void setGroupLine(String groupLine) {
|
||||
this.groupLine = groupLine;
|
||||
}
|
||||
|
||||
public String getGroupLine() {
|
||||
return groupLine;
|
||||
}
|
||||
public void setEquipmentName(String equipmentName) {
|
||||
this.equipmentName = equipmentName;
|
||||
}
|
||||
|
||||
public String getEquipmentName() {
|
||||
return equipmentName;
|
||||
}
|
||||
public void setEquipmentCode(String equipmentCode) {
|
||||
this.equipmentCode = equipmentCode;
|
||||
}
|
||||
|
||||
public String getEquipmentCode() {
|
||||
return equipmentCode;
|
||||
}
|
||||
public void setFaultTime(String faultTime) {
|
||||
this.faultTime = faultTime;
|
||||
}
|
||||
|
||||
public String getFaultTime() {
|
||||
return faultTime;
|
||||
}
|
||||
public void setActualOperationTime(String actualOperationTime) {
|
||||
this.actualOperationTime = actualOperationTime;
|
||||
}
|
||||
|
||||
public String getActualOperationTime() {
|
||||
return actualOperationTime;
|
||||
}
|
||||
public void setOperationTime(String operationTime) {
|
||||
this.operationTime = operationTime;
|
||||
}
|
||||
|
||||
public String getOperationTime() {
|
||||
return operationTime;
|
||||
}
|
||||
public void setFailureRate(String failureRate) {
|
||||
this.failureRate = failureRate;
|
||||
}
|
||||
|
||||
public String getFailureRate() {
|
||||
return failureRate;
|
||||
}
|
||||
public void setFailureDescription(String failureDescription) {
|
||||
this.failureDescription = failureDescription;
|
||||
}
|
||||
|
||||
public String getFailureDescription() {
|
||||
return failureDescription;
|
||||
}
|
||||
public void setReasonAnalyze(String reasonAnalyze) {
|
||||
this.reasonAnalyze = reasonAnalyze;
|
||||
}
|
||||
|
||||
public String getReasonAnalyze() {
|
||||
return reasonAnalyze;
|
||||
}
|
||||
public void setHandlingMethod(String handlingMethod) {
|
||||
this.handlingMethod = handlingMethod;
|
||||
}
|
||||
|
||||
public String getHandlingMethod() {
|
||||
return handlingMethod;
|
||||
}
|
||||
public void setRepairPerson(String repairPerson) {
|
||||
this.repairPerson = repairPerson;
|
||||
}
|
||||
|
||||
public String getRepairPerson() {
|
||||
return repairPerson;
|
||||
}
|
||||
public void setEquStatusDes(String equStatusDes) {
|
||||
this.equStatusDes = equStatusDes;
|
||||
}
|
||||
|
||||
public String getEquStatusDes() {
|
||||
return equStatusDes;
|
||||
}
|
||||
public void setReplaceSpare(String replaceSpare) {
|
||||
this.replaceSpare = replaceSpare;
|
||||
}
|
||||
|
||||
public String getReplaceSpare() {
|
||||
return replaceSpare;
|
||||
}
|
||||
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("id", getId())
|
||||
.append("workshop", getWorkshop())
|
||||
.append("groupLine", getGroupLine())
|
||||
.append("equipmentName", getEquipmentName())
|
||||
.append("equipmentCode", getEquipmentCode())
|
||||
.append("faultTime", getFaultTime())
|
||||
.append("actualOperationTime", getActualOperationTime())
|
||||
.append("operationTime", getOperationTime())
|
||||
.append("failureRate", getFailureRate())
|
||||
.append("failureDescription", getFailureDescription())
|
||||
.append("reasonAnalyze", getReasonAnalyze())
|
||||
.append("handlingMethod", getHandlingMethod())
|
||||
.append("repairPerson", getRepairPerson())
|
||||
.append("equStatusDes", getEquStatusDes())
|
||||
.append("replaceSpare", getReplaceSpare())
|
||||
.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();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,477 @@
|
||||
package com.op.device.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.op.common.core.annotation.Excel;
|
||||
import com.op.device.domain.EquCheckItemDetail;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
// 检查项维护页面DTO
|
||||
public class SummaryReportDTO {
|
||||
/** 主键 */
|
||||
private String itemId ;
|
||||
/** 检查项编码 */
|
||||
private String itemCode ;
|
||||
/** 检查项名称 */
|
||||
private String itemName ;
|
||||
/** 检查项方法/工具 */
|
||||
private String itemMethod ;
|
||||
/** 维护类型编码 */
|
||||
private String itemType ;
|
||||
/** 维护类型名称 */
|
||||
private String itemTypeName ;
|
||||
/** 检查项备注 */
|
||||
private String itemRemark ;
|
||||
// 检查工具
|
||||
private String itemTools;
|
||||
//标准类型
|
||||
private String standardType;
|
||||
//标准名称
|
||||
private String standardName;
|
||||
// 循环周期类型
|
||||
private String itemLoopType;
|
||||
// 循环周期
|
||||
private int itemLoop;
|
||||
/** 主键 */
|
||||
private String orderId;
|
||||
//设备
|
||||
private String equipmentCode;
|
||||
/** 维修前达标 */
|
||||
private String detailReach;
|
||||
//维修后是否达标
|
||||
private String repairReach;
|
||||
/** 主键 */
|
||||
private String detailId ;
|
||||
/** 主键 */
|
||||
private String id ;
|
||||
|
||||
//1号
|
||||
private String one ;
|
||||
//2号
|
||||
private String two ;
|
||||
//3号
|
||||
private String three ;
|
||||
//4号
|
||||
private String four ;
|
||||
//5号
|
||||
private String five ;
|
||||
//6号
|
||||
private String six ;
|
||||
//7号
|
||||
private String seven ;
|
||||
//8号
|
||||
private String eight ;
|
||||
//9号
|
||||
private String nine ;
|
||||
//10号
|
||||
private String ten ;
|
||||
//11号
|
||||
private String eleven ;
|
||||
//12号
|
||||
private String twelve ;
|
||||
//13号
|
||||
private String thirteen ;
|
||||
//14号
|
||||
private String fourteen;
|
||||
//15号
|
||||
private String fifteen;
|
||||
//16号
|
||||
private String sixteen;
|
||||
//17号
|
||||
private String seventeen;
|
||||
//18号
|
||||
private String eighteen;
|
||||
//19号
|
||||
private String nineteen;
|
||||
//20号
|
||||
private String twenty;
|
||||
//21号
|
||||
private String twentyOne;
|
||||
//22号
|
||||
private String twentyTwo;
|
||||
//23号
|
||||
private String twentyThree;
|
||||
//24号
|
||||
private String twentyFour;
|
||||
//25号
|
||||
private String twentyFive;
|
||||
//26号
|
||||
private String twentySix;
|
||||
//27号
|
||||
private String twentySeven;
|
||||
//28号
|
||||
private String twentyEight;
|
||||
//29号
|
||||
private String twentyNine;
|
||||
//30号
|
||||
private String thirty;
|
||||
//31号
|
||||
private String thirtyOne;
|
||||
|
||||
/** 实际结束时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date orderEnd;
|
||||
|
||||
/** 时间 */
|
||||
private String yearMouth;
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setOrderId(String orderId) {
|
||||
this.orderId = orderId;
|
||||
}
|
||||
public String getOrderId() {
|
||||
return orderId;
|
||||
}
|
||||
|
||||
public String getItemTools() {
|
||||
return itemTools;
|
||||
}
|
||||
public void setItemTools(String itemTools) {
|
||||
this.itemTools = itemTools;
|
||||
}
|
||||
|
||||
public String getItemId() {
|
||||
return itemId;
|
||||
}
|
||||
public void setItemId(String itemId) {
|
||||
this.itemId = itemId;
|
||||
}
|
||||
|
||||
public String getItemCode() {
|
||||
return itemCode;
|
||||
}
|
||||
public void setItemCode(String itemCode) {
|
||||
this.itemCode = itemCode;
|
||||
}
|
||||
|
||||
public String getItemName() {
|
||||
return itemName;
|
||||
}
|
||||
public void setItemName(String itemName) {
|
||||
this.itemName = itemName;
|
||||
}
|
||||
|
||||
public String getItemMethod() {
|
||||
return itemMethod;
|
||||
}
|
||||
public void setItemMethod(String itemMethod) {
|
||||
this.itemMethod = itemMethod;
|
||||
}
|
||||
|
||||
public String getItemType() {
|
||||
return itemType;
|
||||
}
|
||||
public void setItemType(String itemType) {
|
||||
this.itemType = itemType;
|
||||
}
|
||||
|
||||
public String getItemTypeName() {
|
||||
return itemTypeName;
|
||||
}
|
||||
public void setItemTypeName(String itemTypeName) {
|
||||
this.itemTypeName = itemTypeName;
|
||||
}
|
||||
|
||||
public String getItemRemark() {
|
||||
return itemRemark;
|
||||
}
|
||||
public void setItemRemark(String itemRemark) {
|
||||
this.itemRemark = itemRemark;
|
||||
}
|
||||
|
||||
public String getStandardType() {
|
||||
return standardType;
|
||||
}
|
||||
public void setStandardType(String standardType) {
|
||||
this.standardType = standardType;
|
||||
}
|
||||
|
||||
public String getStandardName() {
|
||||
return standardName;
|
||||
}
|
||||
public void setStandardName(String standardName) {
|
||||
this.standardName = standardName;
|
||||
}
|
||||
|
||||
public int getItemLoop() {
|
||||
return itemLoop;
|
||||
}
|
||||
public void setItemLoop(int itemLoop) {
|
||||
this.itemLoop = itemLoop;
|
||||
}
|
||||
|
||||
public String getItemLoopType() {
|
||||
return itemLoopType;
|
||||
}
|
||||
public void setItemLoopType(String itemLoopType) {
|
||||
this.itemLoopType = itemLoopType;
|
||||
}
|
||||
|
||||
public void setEquipmentCode(String equipmentCode) {
|
||||
this.equipmentCode = equipmentCode;
|
||||
}
|
||||
public String getEquipmentCode() {
|
||||
return equipmentCode;
|
||||
}
|
||||
|
||||
public void setDetailId(String detailId) {
|
||||
this.detailId = detailId;
|
||||
}
|
||||
public String getDetailId() {
|
||||
return detailId;
|
||||
}
|
||||
|
||||
public String getRepairReach() {
|
||||
return repairReach;
|
||||
}
|
||||
public void setRepairReach(String repairReach) {
|
||||
this.repairReach = repairReach;
|
||||
}
|
||||
|
||||
public String getDetailReach() {
|
||||
return detailReach;
|
||||
}
|
||||
public void setDetailReach(String detailReach) {
|
||||
this.detailReach = detailReach;
|
||||
}
|
||||
|
||||
public void setOrderEnd(Date orderEnd) {
|
||||
this.orderEnd = orderEnd;
|
||||
}
|
||||
public Date getOrderEnd() {
|
||||
return orderEnd;
|
||||
}
|
||||
|
||||
public void setYearMouth(String yearMouth) {
|
||||
this.yearMouth = yearMouth;
|
||||
}
|
||||
public String getYearMouth() {
|
||||
return yearMouth;
|
||||
}
|
||||
|
||||
public void setOne(String one) {
|
||||
this.one = one;
|
||||
}
|
||||
public String getOne() {
|
||||
return one;
|
||||
}
|
||||
|
||||
public void setTwo(String two) {
|
||||
this.two = two;
|
||||
}
|
||||
public String getTwo() {
|
||||
return two;
|
||||
}
|
||||
|
||||
public void setThree(String three) {
|
||||
this.three = three;
|
||||
}
|
||||
public String getThree() {
|
||||
return three;
|
||||
}
|
||||
|
||||
public void setFour(String four) {
|
||||
this.four = four;
|
||||
}
|
||||
public String getFour() {
|
||||
return four;
|
||||
}
|
||||
|
||||
public void setFive(String five) {
|
||||
this.five = five;
|
||||
}
|
||||
public String getFive() {
|
||||
return five;
|
||||
}
|
||||
|
||||
public void setSix(String six) {
|
||||
this.six = six;
|
||||
}
|
||||
public String getSix() {
|
||||
return six;
|
||||
}
|
||||
|
||||
public void setSeven(String seven) {
|
||||
this.seven = seven;
|
||||
}
|
||||
public String getSeven() {
|
||||
return seven;
|
||||
}
|
||||
|
||||
public void setEight(String eight) {
|
||||
this.eight = eight;
|
||||
}
|
||||
public String getEight() {
|
||||
return eight;
|
||||
}
|
||||
|
||||
public void setNine(String nine) {
|
||||
this.nine = nine;
|
||||
}
|
||||
public String getNine() {
|
||||
return nine;
|
||||
}
|
||||
|
||||
public void setTen(String ten) {
|
||||
this.ten = ten;
|
||||
}
|
||||
public String getTen() {
|
||||
return ten;
|
||||
}
|
||||
|
||||
public void setEleven(String eleven) {
|
||||
this.eleven = eleven;
|
||||
}
|
||||
public String getEleven() {
|
||||
return eleven;
|
||||
}
|
||||
|
||||
public void setTwelve(String twelve) {
|
||||
this.twelve = twelve;
|
||||
}
|
||||
public String getTwelve() {
|
||||
return twelve;
|
||||
}
|
||||
|
||||
public void setThirteen(String thirteen) {
|
||||
this.thirteen = thirteen;
|
||||
}
|
||||
public String getThirteen() {
|
||||
return thirteen;
|
||||
}
|
||||
|
||||
public void setFourteen(String fourteen) {
|
||||
this.fourteen = fourteen;
|
||||
}
|
||||
public String getFourteen() {
|
||||
return fourteen;
|
||||
}
|
||||
|
||||
public void setFifteen(String fifteen) {
|
||||
this.fifteen = fifteen;
|
||||
}
|
||||
public String getFifteen() {
|
||||
return fifteen;
|
||||
}
|
||||
|
||||
public void setSixteen(String sixteen) {
|
||||
this.sixteen = sixteen;
|
||||
}
|
||||
public String getSixteen() {
|
||||
return sixteen;
|
||||
}
|
||||
|
||||
public void setSeventeen(String seventeen) {
|
||||
this.seventeen = seventeen;
|
||||
}
|
||||
public String getSeventeen() {
|
||||
return seventeen;
|
||||
}
|
||||
|
||||
public void setEighteen(String eighteen) {
|
||||
this.eighteen = eighteen;
|
||||
}
|
||||
public String getEighteen() {
|
||||
return eighteen;
|
||||
}
|
||||
|
||||
public void setNineteen(String nineteen) {
|
||||
this.nineteen = nineteen;
|
||||
}
|
||||
public String getNineteen() {
|
||||
return nineteen;
|
||||
}
|
||||
|
||||
public void setTwenty(String twenty) {
|
||||
this.twenty = twenty;
|
||||
}
|
||||
public String getTwenty() {
|
||||
return twenty;
|
||||
}
|
||||
|
||||
public void setTwentyOne(String twentyOne) {
|
||||
this.twentyOne = twentyOne;
|
||||
}
|
||||
public String getTwentyOne() {
|
||||
return twentyOne;
|
||||
}
|
||||
|
||||
public void setTwentyTwo(String twentyTwo) {
|
||||
this.twentyTwo = twentyTwo;
|
||||
}
|
||||
public String getTwentyTwo() {
|
||||
return twentyTwo;
|
||||
}
|
||||
|
||||
public void setTwentyThree(String twentyThree) {
|
||||
this.twentyThree = twentyThree;
|
||||
}
|
||||
public String getTwentyThree() {
|
||||
return twentyThree;
|
||||
}
|
||||
|
||||
public void setTwentyFour(String twentyFour) {
|
||||
this.twentyFour = twentyFour;
|
||||
}
|
||||
public String getTwentyFour() {
|
||||
return twentyFour;
|
||||
}
|
||||
|
||||
public void setTwentyFive(String twentyFive) {
|
||||
this.twentyFive = twentyFive;
|
||||
}
|
||||
public String getTwentyFive() {
|
||||
return twentyFive;
|
||||
}
|
||||
|
||||
public void setTwentySix(String twentySix) {
|
||||
this.twentySix = twentySix;
|
||||
}
|
||||
public String getTwentySix() {
|
||||
return twentySix;
|
||||
}
|
||||
|
||||
public void setTwentySeven(String twentySeven) {
|
||||
this.twentySeven = twentySeven;
|
||||
}
|
||||
public String getTwentySeven() {
|
||||
return twentySeven;
|
||||
}
|
||||
|
||||
public void setTwentyEight(String twentyEight) {
|
||||
this.twentyEight = twentyEight;
|
||||
}
|
||||
public String getTwentyEight() {
|
||||
return twentyEight;
|
||||
}
|
||||
|
||||
public void setTwentyNine(String twentyNine) {
|
||||
this.twentyNine = twentyNine;
|
||||
}
|
||||
public String getTwentyNine() {
|
||||
return twentyNine;
|
||||
}
|
||||
|
||||
public void setThirty(String thirty) {
|
||||
this.thirty = thirty;
|
||||
}
|
||||
public String getThirty() {
|
||||
return thirty;
|
||||
}
|
||||
|
||||
public void setThirtyOne(String thirtyOne) {
|
||||
this.thirtyOne = thirtyOne;
|
||||
}
|
||||
public String getThirtyOne() {
|
||||
return thirtyOne;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.op.device.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.op.device.domain.EquOperation;
|
||||
|
||||
/**
|
||||
* 设备运行记录Mapper接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-12-13
|
||||
*/
|
||||
public interface EquOperationMapper {
|
||||
/**
|
||||
* 查询设备运行记录
|
||||
*
|
||||
* @param id 设备运行记录主键
|
||||
* @return 设备运行记录
|
||||
*/
|
||||
public EquOperation selectEquOperationById(String id);
|
||||
|
||||
/**
|
||||
* 查询设备运行记录列表
|
||||
*
|
||||
* @param equOperation 设备运行记录
|
||||
* @return 设备运行记录集合
|
||||
*/
|
||||
public List<EquOperation> selectEquOperationList(EquOperation equOperation);
|
||||
|
||||
/**
|
||||
* 新增设备运行记录
|
||||
*
|
||||
* @param equOperation 设备运行记录
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertEquOperation(EquOperation equOperation);
|
||||
|
||||
/**
|
||||
* 修改设备运行记录
|
||||
*
|
||||
* @param equOperation 设备运行记录
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateEquOperation(EquOperation equOperation);
|
||||
|
||||
/**
|
||||
* 删除设备运行记录
|
||||
*
|
||||
* @param id 设备运行记录主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteEquOperationById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除设备运行记录
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteEquOperationByIds(String[] ids);
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
package com.op.device.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.op.device.domain.EquOperation;
|
||||
|
||||
/**
|
||||
* 设备运行记录Service接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-12-13
|
||||
*/
|
||||
public interface IEquOperationService {
|
||||
/**
|
||||
* 查询设备运行记录
|
||||
*
|
||||
* @param id 设备运行记录主键
|
||||
* @return 设备运行记录
|
||||
*/
|
||||
public EquOperation selectEquOperationById(String id);
|
||||
|
||||
/**
|
||||
* 查询设备运行记录列表
|
||||
*
|
||||
* @param equOperation 设备运行记录
|
||||
* @return 设备运行记录集合
|
||||
*/
|
||||
public List<EquOperation> selectEquOperationList(EquOperation equOperation);
|
||||
|
||||
/**
|
||||
* 新增设备运行记录
|
||||
*
|
||||
* @param equOperation 设备运行记录
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertEquOperation(EquOperation equOperation);
|
||||
|
||||
/**
|
||||
* 修改设备运行记录
|
||||
*
|
||||
* @param equOperation 设备运行记录
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateEquOperation(EquOperation equOperation);
|
||||
|
||||
/**
|
||||
* 批量删除设备运行记录
|
||||
*
|
||||
* @param ids 需要删除的设备运行记录主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteEquOperationByIds(String[] ids);
|
||||
|
||||
/**
|
||||
* 删除设备运行记录信息
|
||||
*
|
||||
* @param id 设备运行记录主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteEquOperationById(String id);
|
||||
}
|
||||
@ -0,0 +1,97 @@
|
||||
package com.op.device.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.baomidou.dynamic.datasource.annotation.DS;
|
||||
import com.op.common.core.utils.DateUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.op.device.mapper.EquOperationMapper;
|
||||
import com.op.device.domain.EquOperation;
|
||||
import com.op.device.service.IEquOperationService;
|
||||
|
||||
/**
|
||||
* 设备运行记录Service业务层处理
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-12-13
|
||||
*/
|
||||
@Service
|
||||
public class EquOperationServiceImpl implements IEquOperationService {
|
||||
@Autowired
|
||||
private EquOperationMapper equOperationMapper;
|
||||
|
||||
/**
|
||||
* 查询设备运行记录
|
||||
*
|
||||
* @param id 设备运行记录主键
|
||||
* @return 设备运行记录
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public EquOperation selectEquOperationById(String id) {
|
||||
return equOperationMapper.selectEquOperationById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询设备运行记录列表
|
||||
*
|
||||
* @param equOperation 设备运行记录
|
||||
* @return 设备运行记录
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public List<EquOperation> selectEquOperationList(EquOperation equOperation) {
|
||||
return equOperationMapper.selectEquOperationList(equOperation);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增设备运行记录
|
||||
*
|
||||
* @param equOperation 设备运行记录
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int insertEquOperation(EquOperation equOperation) {
|
||||
equOperation.setCreateTime(DateUtils.getNowDate());
|
||||
return equOperationMapper.insertEquOperation(equOperation);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改设备运行记录
|
||||
*
|
||||
* @param equOperation 设备运行记录
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int updateEquOperation(EquOperation equOperation) {
|
||||
equOperation.setUpdateTime(DateUtils.getNowDate());
|
||||
return equOperationMapper.updateEquOperation(equOperation);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除设备运行记录
|
||||
*
|
||||
* @param ids 需要删除的设备运行记录主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int deleteEquOperationByIds(String[] ids) {
|
||||
return equOperationMapper.deleteEquOperationByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除设备运行记录信息
|
||||
*
|
||||
* @param id 设备运行记录主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int deleteEquOperationById(String id) {
|
||||
return equOperationMapper.deleteEquOperationById(id);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,163 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.op.device.mapper.EquOperationMapper">
|
||||
|
||||
<resultMap type="EquOperation" id="EquOperationResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="workshop" column="workshop" />
|
||||
<result property="groupLine" column="group_Line" />
|
||||
<result property="equipmentName" column="equipment_name" />
|
||||
<result property="equipmentCode" column="equipment_code" />
|
||||
<result property="faultTime" column="fault_time" />
|
||||
<result property="actualOperationTime" column="actual_operation_time" />
|
||||
<result property="operationTime" column="operation_time" />
|
||||
<result property="failureRate" column="failure_rate" />
|
||||
<result property="failureDescription" column="failure_description" />
|
||||
<result property="reasonAnalyze" column="reason_analyze" />
|
||||
<result property="handlingMethod" column="handling_method" />
|
||||
<result property="repairPerson" column="repair_person" />
|
||||
<result property="equStatusDes" column="equ_status_des" />
|
||||
<result property="replaceSpare" column="replace_spare" />
|
||||
<result property="factoryCode" column="factory_code" />
|
||||
<result property="attr1" column="attr1" />
|
||||
<result property="attr2" column="attr2" />
|
||||
<result property="attr3" column="attr3" />
|
||||
<result property="delFlag" column="del_flag" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectEquOperationVo">
|
||||
select id, workshop, group_Line, equipment_name, equipment_code, fault_time, actual_operation_time, operation_time, failure_rate, failure_description, reason_analyze, handling_method, repair_person, equ_status_des, replace_spare, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_operation
|
||||
</sql>
|
||||
|
||||
<select id="selectEquOperationList" parameterType="EquOperation" resultMap="EquOperationResult">
|
||||
<include refid="selectEquOperationVo"/>
|
||||
<where>
|
||||
<if test="workshop != null and workshop != ''"> and workshop = #{workshop}</if>
|
||||
<if test="groupLine != null and groupLine != ''"> and group_Line = #{groupLine}</if>
|
||||
<if test="equipmentName != null and equipmentName != ''"> and equipment_name like concat('%', #{equipmentName}, '%')</if>
|
||||
<if test="equipmentCode != null and equipmentCode != ''"> and equipment_code = #{equipmentCode}</if>
|
||||
<if test="faultTime != null and faultTime != ''"> and fault_time = #{faultTime}</if>
|
||||
<if test="actualOperationTime != null and actualOperationTime != ''"> and actual_operation_time = #{actualOperationTime}</if>
|
||||
<if test="operationTime != null and operationTime != ''"> and operation_time = #{operationTime}</if>
|
||||
<if test="failureRate != null and failureRate != ''"> and failure_rate = #{failureRate}</if>
|
||||
<if test="failureDescription != null and failureDescription != ''"> and failure_description = #{failureDescription}</if>
|
||||
<if test="reasonAnalyze != null and reasonAnalyze != ''"> and reason_analyze = #{reasonAnalyze}</if>
|
||||
<if test="handlingMethod != null and handlingMethod != ''"> and handling_method = #{handlingMethod}</if>
|
||||
<if test="repairPerson != null and repairPerson != ''"> and repair_person = #{repairPerson}</if>
|
||||
<if test="equStatusDes != null and equStatusDes != ''"> and equ_status_des = #{equStatusDes}</if>
|
||||
<if test="replaceSpare != null and replaceSpare != ''"> and replace_spare = #{replaceSpare}</if>
|
||||
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
|
||||
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
|
||||
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
|
||||
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectEquOperationById" parameterType="String" resultMap="EquOperationResult">
|
||||
<include refid="selectEquOperationVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertEquOperation" parameterType="EquOperation">
|
||||
insert into equ_operation
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="workshop != null">workshop,</if>
|
||||
<if test="groupLine != null">group_Line,</if>
|
||||
<if test="equipmentName != null">equipment_name,</if>
|
||||
<if test="equipmentCode != null">equipment_code,</if>
|
||||
<if test="faultTime != null">fault_time,</if>
|
||||
<if test="actualOperationTime != null">actual_operation_time,</if>
|
||||
<if test="operationTime != null">operation_time,</if>
|
||||
<if test="failureRate != null">failure_rate,</if>
|
||||
<if test="failureDescription != null">failure_description,</if>
|
||||
<if test="reasonAnalyze != null">reason_analyze,</if>
|
||||
<if test="handlingMethod != null">handling_method,</if>
|
||||
<if test="repairPerson != null">repair_person,</if>
|
||||
<if test="equStatusDes != null">equ_status_des,</if>
|
||||
<if test="replaceSpare != null">replace_spare,</if>
|
||||
<if test="factoryCode != null">factory_code,</if>
|
||||
<if test="attr1 != null">attr1,</if>
|
||||
<if test="attr2 != null">attr2,</if>
|
||||
<if test="attr3 != null">attr3,</if>
|
||||
<if test="delFlag != null and delFlag != ''">del_flag,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
<if test="workshop != null">#{workshop},</if>
|
||||
<if test="groupLine != null">#{groupLine},</if>
|
||||
<if test="equipmentName != null">#{equipmentName},</if>
|
||||
<if test="equipmentCode != null">#{equipmentCode},</if>
|
||||
<if test="faultTime != null">#{faultTime},</if>
|
||||
<if test="actualOperationTime != null">#{actualOperationTime},</if>
|
||||
<if test="operationTime != null">#{operationTime},</if>
|
||||
<if test="failureRate != null">#{failureRate},</if>
|
||||
<if test="failureDescription != null">#{failureDescription},</if>
|
||||
<if test="reasonAnalyze != null">#{reasonAnalyze},</if>
|
||||
<if test="handlingMethod != null">#{handlingMethod},</if>
|
||||
<if test="repairPerson != null">#{repairPerson},</if>
|
||||
<if test="equStatusDes != null">#{equStatusDes},</if>
|
||||
<if test="replaceSpare != null">#{replaceSpare},</if>
|
||||
<if test="factoryCode != null">#{factoryCode},</if>
|
||||
<if test="attr1 != null">#{attr1},</if>
|
||||
<if test="attr2 != null">#{attr2},</if>
|
||||
<if test="attr3 != null">#{attr3},</if>
|
||||
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateEquOperation" parameterType="EquOperation">
|
||||
update equ_operation
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="workshop != null">workshop = #{workshop},</if>
|
||||
<if test="groupLine != null">group_Line = #{groupLine},</if>
|
||||
<if test="equipmentName != null">equipment_name = #{equipmentName},</if>
|
||||
<if test="equipmentCode != null">equipment_code = #{equipmentCode},</if>
|
||||
<if test="faultTime != null">fault_time = #{faultTime},</if>
|
||||
<if test="actualOperationTime != null">actual_operation_time = #{actualOperationTime},</if>
|
||||
<if test="operationTime != null">operation_time = #{operationTime},</if>
|
||||
<if test="failureRate != null">failure_rate = #{failureRate},</if>
|
||||
<if test="failureDescription != null">failure_description = #{failureDescription},</if>
|
||||
<if test="reasonAnalyze != null">reason_analyze = #{reasonAnalyze},</if>
|
||||
<if test="handlingMethod != null">handling_method = #{handlingMethod},</if>
|
||||
<if test="repairPerson != null">repair_person = #{repairPerson},</if>
|
||||
<if test="equStatusDes != null">equ_status_des = #{equStatusDes},</if>
|
||||
<if test="replaceSpare != null">replace_spare = #{replaceSpare},</if>
|
||||
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
|
||||
<if test="attr1 != null">attr1 = #{attr1},</if>
|
||||
<if test="attr2 != null">attr2 = #{attr2},</if>
|
||||
<if test="attr3 != null">attr3 = #{attr3},</if>
|
||||
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteEquOperationById" parameterType="String">
|
||||
delete from equ_operation where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteEquOperationByIds" parameterType="String">
|
||||
delete from equ_operation where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -0,0 +1,89 @@
|
||||
package com.op.quality.controller;
|
||||
|
||||
import com.op.common.core.utils.StringUtils;
|
||||
import com.op.quality.domain.QcCheckType;
|
||||
import com.op.quality.domain.QcInterface;
|
||||
import com.op.quality.service.IQcInterfaceService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 质量看板接口
|
||||
*
|
||||
* @author zxl
|
||||
* @date 2023-11-15
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/qcInterface")
|
||||
public class QcInterfaceController {
|
||||
|
||||
@Autowired
|
||||
private IQcInterfaceService qcInterfaceService;
|
||||
|
||||
|
||||
/**
|
||||
*/
|
||||
@GetMapping("/getDictData")
|
||||
public List<QcInterface> getDictData(QcInterface qcInterface) {
|
||||
return qcInterfaceService.getDictData(qcInterface);
|
||||
}
|
||||
|
||||
/**
|
||||
* 来料--订单异常信息
|
||||
* @param qcInterface
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/getOverallInfo")
|
||||
public List<QcInterface> getOverallInfo(@RequestBody QcInterface qcInterface) {
|
||||
return qcInterfaceService.getOverallInfo(qcInterface);
|
||||
}
|
||||
|
||||
/**
|
||||
* 来料--异常分布
|
||||
* @param qcInterface
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/getCheckProjectsPie")
|
||||
public List<QcInterface> getCheckProjectsPie(@RequestBody QcInterface qcInterface) {
|
||||
return qcInterfaceService.getCheckProjectsPie(qcInterface);
|
||||
}
|
||||
|
||||
/**
|
||||
* 来料--供应商来料订单批次不良详情
|
||||
* @param qcInterface
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/getSupplierBadTOP5")
|
||||
public List<QcInterface> getSupplierBadTOP5(@RequestBody QcInterface qcInterface) {
|
||||
return qcInterfaceService.getSupplierBadTOP5(qcInterface);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/getSupplierNoOkList")
|
||||
public List<QcInterface> getSupplierNoOkList(@RequestBody QcInterface qcInterface) {
|
||||
return qcInterfaceService.getSupplierNoOkList(qcInterface);
|
||||
}
|
||||
|
||||
/**
|
||||
* 来料--供应商来料及时性详情
|
||||
* @param qcInterface
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/getSupplierTaskList")
|
||||
public List<QcInterface> getSupplierTaskList(@RequestBody QcInterface qcInterface) {
|
||||
return qcInterfaceService.getSupplierTaskList(qcInterface);
|
||||
}
|
||||
|
||||
/**
|
||||
* 过程检验-检验统计
|
||||
* @param qcInterface
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/getProduceStaticInfo")
|
||||
public List<QcInterface> getProduceStaticInfo(@RequestBody QcInterface qcInterface) {
|
||||
return qcInterfaceService.getProduceStaticInfo(qcInterface);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,180 @@
|
||||
package com.op.quality.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 看板
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-10-12
|
||||
*/
|
||||
public class QcInterface extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private String ymdType;
|
||||
private String ymdTypeName;
|
||||
private String dictType;
|
||||
private String factoryCode;
|
||||
private String quality;
|
||||
private String ymd;
|
||||
private String projectName;
|
||||
private String checkNo;
|
||||
private String incomeBatchNo;
|
||||
private String orderNo;
|
||||
private String materialName;
|
||||
private String unit;
|
||||
private String supplierName;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private String incomeTime;
|
||||
private String checkStatus;
|
||||
private String checkResult;
|
||||
private String checkManName;
|
||||
private String checkName;
|
||||
|
||||
public String getCheckNo() {
|
||||
return checkNo;
|
||||
}
|
||||
|
||||
public void setCheckNo(String checkNo) {
|
||||
this.checkNo = checkNo;
|
||||
}
|
||||
|
||||
public String getIncomeBatchNo() {
|
||||
return incomeBatchNo;
|
||||
}
|
||||
|
||||
public void setIncomeBatchNo(String incomeBatchNo) {
|
||||
this.incomeBatchNo = incomeBatchNo;
|
||||
}
|
||||
|
||||
public String getOrderNo() {
|
||||
return orderNo;
|
||||
}
|
||||
|
||||
public void setOrderNo(String orderNo) {
|
||||
this.orderNo = orderNo;
|
||||
}
|
||||
|
||||
public String getMaterialName() {
|
||||
return materialName;
|
||||
}
|
||||
|
||||
public void setMaterialName(String materialName) {
|
||||
this.materialName = materialName;
|
||||
}
|
||||
|
||||
public String getUnit() {
|
||||
return unit;
|
||||
}
|
||||
|
||||
public void setUnit(String unit) {
|
||||
this.unit = unit;
|
||||
}
|
||||
|
||||
public String getSupplierName() {
|
||||
return supplierName;
|
||||
}
|
||||
|
||||
public void setSupplierName(String supplierName) {
|
||||
this.supplierName = supplierName;
|
||||
}
|
||||
|
||||
public String getIncomeTime() {
|
||||
return incomeTime;
|
||||
}
|
||||
|
||||
public void setIncomeTime(String incomeTime) {
|
||||
this.incomeTime = incomeTime;
|
||||
}
|
||||
|
||||
public String getCheckStatus() {
|
||||
return checkStatus;
|
||||
}
|
||||
|
||||
public void setCheckStatus(String checkStatus) {
|
||||
this.checkStatus = checkStatus;
|
||||
}
|
||||
|
||||
public String getCheckResult() {
|
||||
return checkResult;
|
||||
}
|
||||
|
||||
public void setCheckResult(String checkResult) {
|
||||
this.checkResult = checkResult;
|
||||
}
|
||||
|
||||
public String getCheckManName() {
|
||||
return checkManName;
|
||||
}
|
||||
|
||||
public void setCheckManName(String checkManName) {
|
||||
this.checkManName = checkManName;
|
||||
}
|
||||
|
||||
public String getCheckName() {
|
||||
return checkName;
|
||||
}
|
||||
|
||||
public void setCheckName(String checkName) {
|
||||
this.checkName = checkName;
|
||||
}
|
||||
|
||||
public String getProjectName() {
|
||||
return projectName;
|
||||
}
|
||||
|
||||
public void setProjectName(String projectName) {
|
||||
this.projectName = projectName;
|
||||
}
|
||||
|
||||
public String getYmd() {
|
||||
return ymd;
|
||||
}
|
||||
|
||||
public void setYmd(String ymd) {
|
||||
this.ymd = ymd;
|
||||
}
|
||||
|
||||
public String getQuality() {
|
||||
return quality;
|
||||
}
|
||||
|
||||
public void setQuality(String quality) {
|
||||
this.quality = quality;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getYmdType() {
|
||||
return ymdType;
|
||||
}
|
||||
|
||||
public void setYmdType(String ymdType) {
|
||||
this.ymdType = ymdType;
|
||||
}
|
||||
|
||||
public String getYmdTypeName() {
|
||||
return ymdTypeName;
|
||||
}
|
||||
|
||||
public void setYmdTypeName(String ymdTypeName) {
|
||||
this.ymdTypeName = ymdTypeName;
|
||||
}
|
||||
|
||||
public String getDictType() {
|
||||
return dictType;
|
||||
}
|
||||
|
||||
public void setDictType(String dictType) {
|
||||
this.dictType = dictType;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package com.op.quality.mapper;
|
||||
|
||||
import com.op.quality.domain.QcCheckProject;
|
||||
import com.op.quality.domain.QcCheckType;
|
||||
import com.op.quality.domain.QcInterface;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 质量看板Mapper接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-10-13
|
||||
*/
|
||||
@Mapper
|
||||
public interface QcInterfaceMapper {
|
||||
|
||||
List<QcInterface> getDictData(QcInterface qcInterface);
|
||||
|
||||
List<QcInterface> getOverallInfo(QcInterface qcInterface);
|
||||
|
||||
List<QcInterface> getCheckProjectsPie(QcInterface qcInterface);
|
||||
|
||||
List<QcInterface> getSupplierBadTOP5(QcInterface qcInterface);
|
||||
|
||||
List<QcInterface> getSupplierTaskList(QcInterface qcInterface);
|
||||
|
||||
List<QcInterface> getSupplierNoOkList(QcInterface qcInterface);
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package com.op.quality.service;
|
||||
|
||||
|
||||
import com.op.quality.domain.QcCheckType;
|
||||
import com.op.quality.domain.QcInterface;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-10-13
|
||||
*/
|
||||
public interface IQcInterfaceService {
|
||||
|
||||
List<QcInterface> getDictData(QcInterface qcInterface);
|
||||
|
||||
List<QcInterface> getOverallInfo(QcInterface qcInterface);
|
||||
|
||||
List<QcInterface> getCheckProjectsPie(QcInterface qcInterface);
|
||||
|
||||
List<QcInterface> getSupplierBadTOP5(QcInterface qcInterface);
|
||||
|
||||
List<QcInterface> getSupplierTaskList(QcInterface qcInterface);
|
||||
|
||||
List<QcInterface> getSupplierNoOkList(QcInterface qcInterface);
|
||||
|
||||
List<QcInterface> getProduceStaticInfo(QcInterface qcInterface);
|
||||
}
|
||||
@ -0,0 +1,127 @@
|
||||
package com.op.quality.service.impl;
|
||||
|
||||
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
||||
import com.op.common.core.utils.DateUtils;
|
||||
import com.op.quality.domain.QcCheckType;
|
||||
import com.op.quality.domain.QcInterface;
|
||||
import com.op.quality.mapper.QcInterfaceMapper;
|
||||
import com.op.quality.service.IQcInterfaceService;
|
||||
import com.op.system.api.domain.SysDictData;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.time.LocalDate;
|
||||
import java.util.Calendar;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 检验项目维护Service业务层处理
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-10-13
|
||||
*/
|
||||
@Service
|
||||
public class QcInterfaceServiceImpl implements IQcInterfaceService {
|
||||
@Autowired
|
||||
private QcInterfaceMapper qcInterfaceMapper;
|
||||
|
||||
@Override
|
||||
public List<QcInterface> getDictData(QcInterface qcInterface) {
|
||||
DynamicDataSourceContextHolder.push("master");
|
||||
return qcInterfaceMapper.getDictData(qcInterface);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<QcInterface> getOverallInfo(QcInterface qcInterface) {
|
||||
DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode());
|
||||
|
||||
String nowYMD = DateUtils.getDate();
|
||||
qcInterface.setYmd(nowYMD);
|
||||
List<QcInterface> dtos = qcInterfaceMapper.getOverallInfo(qcInterface);
|
||||
if(!CollectionUtils.isEmpty(dtos)&&dtos.size()==2){
|
||||
QcInterface qif = new QcInterface();
|
||||
qif.setYmdTypeName("okRate");
|
||||
if(dtos.get(1).getQuality().equals("0")){
|
||||
qif.setQuality("100%");
|
||||
}else{
|
||||
BigDecimal okRate = (new BigDecimal(dtos.get(0).getQuality())
|
||||
.subtract(new BigDecimal(dtos.get(1).getQuality())))
|
||||
.multiply(new BigDecimal("100"))
|
||||
.divide(new BigDecimal(dtos.get(0).getQuality()),2, RoundingMode.HALF_UP);
|
||||
qif.setQuality(okRate.toString()+"%");
|
||||
}
|
||||
dtos.add(qif);
|
||||
}
|
||||
return dtos;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<QcInterface> getCheckProjectsPie(QcInterface qcInterface) {
|
||||
DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode());
|
||||
|
||||
String nowYMD = DateUtils.getDate();
|
||||
qcInterface.setYmd(nowYMD);
|
||||
List<QcInterface> dtos = qcInterfaceMapper.getCheckProjectsPie(qcInterface);
|
||||
return dtos;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<QcInterface> getSupplierBadTOP5(QcInterface qcInterface) {
|
||||
DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode());
|
||||
|
||||
String nowYMD = DateUtils.getDate();
|
||||
qcInterface.setYmd(nowYMD);
|
||||
List<QcInterface> dtos = qcInterfaceMapper.getSupplierBadTOP5(qcInterface);
|
||||
return dtos;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<QcInterface> getSupplierTaskList(QcInterface qcInterface) {
|
||||
DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode());
|
||||
String nowYMD = DateUtils.getDate();
|
||||
qcInterface.setYmd(nowYMD);
|
||||
List<QcInterface> dtos = qcInterfaceMapper.getSupplierTaskList(qcInterface);
|
||||
for(QcInterface dto:dtos){
|
||||
String[] ymdArray = dto.getIncomeTime().split("-");
|
||||
LocalDate date1 = LocalDate.of(Integer.parseInt(ymdArray[0]),
|
||||
Integer.parseInt(ymdArray[1]),
|
||||
Integer.parseInt(ymdArray[2]));
|
||||
LocalDate date2 = LocalDate.now();
|
||||
if(date1.compareTo(date2)<0){
|
||||
dto.setCheckStatus("逾期未检");
|
||||
}else {
|
||||
dto.setCheckStatus("0".equals(dto.getCheckStatus()) ? "待检测" : "检测完成");
|
||||
}
|
||||
dto.setCheckResult("Y".equals(dto.getCheckResult())?"合格":"不合格");
|
||||
}
|
||||
return dtos;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<QcInterface> getSupplierNoOkList(QcInterface qcInterface) {
|
||||
DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode());
|
||||
String nowYMD = DateUtils.getDate();
|
||||
qcInterface.setYmd(nowYMD);
|
||||
List<QcInterface> dtos = qcInterfaceMapper.getSupplierNoOkList(qcInterface);
|
||||
for(QcInterface dto:dtos){
|
||||
dto.setCheckStatus("0".equals(dto.getCheckStatus())?"待检测":"检测完成");
|
||||
dto.setCheckResult("Y".equals(dto.getCheckResult())?"合格":"不合格");
|
||||
}
|
||||
return dtos;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<QcInterface> getProduceStaticInfo(QcInterface qcInterface) {
|
||||
DynamicDataSourceContextHolder.push(qcInterface.getFactoryCode());
|
||||
String nowYMD = DateUtils.getDate();
|
||||
qcInterface.setYmd(nowYMD);
|
||||
List<QcInterface> dtos = qcInterfaceMapper.getSupplierNoOkList(qcInterface);
|
||||
|
||||
return dtos;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,157 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.op.quality.mapper.QcInterfaceMapper">
|
||||
|
||||
|
||||
<select id="getDictData" resultType="com.op.quality.domain.QcInterface">
|
||||
select dict_label ymdTypeName,
|
||||
dict_value ymdType
|
||||
from sys_dict_data
|
||||
where dict_type = #{dictType} and status = '0'
|
||||
</select>
|
||||
<select id="getOverallInfo" resultType="com.op.quality.domain.QcInterface">
|
||||
select count(0) quality,'all' ymdTypeName
|
||||
from wms_raw_order_in
|
||||
where active_flag = '1'
|
||||
<if test='ymdType=="yyyy"'>
|
||||
and CONVERT(varchar(4),receipt_time, 120) = SUBSTRING(#{ymd},0,5)
|
||||
</if>
|
||||
<if test='ymdType=="mm"'>
|
||||
and CONVERT(varchar(7),receipt_time, 120) =SUBSTRING(#{ymd},0,8)
|
||||
</if>
|
||||
<if test='ymdType=="dd"'>
|
||||
and CONVERT(varchar(10),receipt_time, 120) = SUBSTRING(#{ymd},0,11)
|
||||
</if>
|
||||
union ALL
|
||||
select count(0),'unOk'
|
||||
from qc_check_unqualified qcu
|
||||
left join qc_check_type qct on qcu.type = qct.order_code
|
||||
where qct.type_code = #{typeCode} and qcu.del_flag = '0'
|
||||
<if test='ymdType=="yyyy"'>
|
||||
and CONVERT(varchar(4),qcu.create_time, 120) = SUBSTRING(#{ymd},0,5)
|
||||
</if>
|
||||
<if test='ymdType=="mm"'>
|
||||
and CONVERT(varchar(7),qcu.create_time, 120) = SUBSTRING(#{ymd},0,8)
|
||||
</if>
|
||||
<if test='ymdType=="dd"'>
|
||||
and CONVERT(varchar(10),qcu.create_time, 120) = SUBSTRING(#{ymd},0,11)
|
||||
</if>
|
||||
</select>
|
||||
<select id="getCheckProjectsPie" resultType="com.op.quality.domain.QcInterface">
|
||||
select count(0) quality,
|
||||
qctd.project_no,
|
||||
qctd.rule_name projectName
|
||||
from qc_check_task_detail qctd
|
||||
left join qc_check_task qct on qctd.belong_to = qct.record_id
|
||||
where qct.check_result = 'N' and qct.type_code = #{typeCode}
|
||||
<if test='ymdType=="yyyy"'>
|
||||
and CONVERT(varchar(4),qctd.update_time, 120) = SUBSTRING(#{ymd},0,5)
|
||||
</if>
|
||||
<if test='ymdType=="mm"'>
|
||||
and CONVERT(varchar(7),qcu.update_time, 120) = SUBSTRING(#{ymd},0,8)
|
||||
</if>
|
||||
<if test='ymdType=="dd"'>
|
||||
and CONVERT(varchar(10),qcu.update_time, 120) = SUBSTRING(#{ymd},0,11)
|
||||
</if>
|
||||
group by qctd.project_no,qctd.rule_name
|
||||
</select>
|
||||
<select id="getSupplierBadTOP5" resultType="com.op.quality.domain.QcInterface">
|
||||
select top 5 * from(
|
||||
select
|
||||
concat(t1.supplier_name,'-',t1.material_name) supplierName,
|
||||
ROUND(t2.noOkNum*100.00/t1.allNum, 2) quality
|
||||
from (
|
||||
select count(0) allNum,
|
||||
qct.supplier_code,qct.supplier_name,qct.material_code,qct.material_name
|
||||
from qc_check_task qct
|
||||
where qct.type_code = #{typeCode}
|
||||
<if test='ymdType=="yyyy"'>
|
||||
and CONVERT(varchar(4),qct.income_time, 120) = SUBSTRING(#{ymd},0,5)
|
||||
</if>
|
||||
<if test='ymdType=="mm"'>
|
||||
and CONVERT(varchar(7),qct.income_time, 120) = SUBSTRING(#{ymd},0,8)
|
||||
</if>
|
||||
<if test='ymdType=="dd"'>
|
||||
and CONVERT(varchar(10),qct.income_time, 120) = SUBSTRING(#{ymd},0,11)
|
||||
</if>
|
||||
group by
|
||||
qct.supplier_code,qct.supplier_name,qct.material_code,qct.material_name
|
||||
) t1
|
||||
left join (
|
||||
select
|
||||
count(0) noOkNum,qct.supplier_code,qct.supplier_name,qct.material_code,qct.material_name
|
||||
from qc_check_task qct
|
||||
where qct.type_code = #{typeCode} and qct.check_result = 'N'
|
||||
<if test='ymdType=="yyyy"'>
|
||||
and CONVERT(varchar(4),qct.income_time, 120) = SUBSTRING(#{ymd},0,5)
|
||||
</if>
|
||||
<if test='ymdType=="mm"'>
|
||||
and CONVERT(varchar(7),qct.income_time, 120) = SUBSTRING(#{ymd},0,8)
|
||||
</if>
|
||||
<if test='ymdType=="dd"'>
|
||||
and CONVERT(varchar(10),qct.income_time, 120) = SUBSTRING(#{ymd},0,11)
|
||||
</if>
|
||||
group by
|
||||
qct.supplier_code,qct.supplier_name,qct.material_code,qct.material_name
|
||||
) t2 on t1.supplier_code = t2.supplier_code and t1.material_code = t2.material_code
|
||||
) t order by t.quality desc
|
||||
</select>
|
||||
<select id="getSupplierTaskList" resultType="com.op.quality.domain.QcInterface">
|
||||
select
|
||||
qct.check_no checkNo,
|
||||
qct.income_batch_no incomeBatchNo,
|
||||
qct.order_no orderNo,
|
||||
qct.material_name materialName,
|
||||
qct.quality,
|
||||
qct.unit,
|
||||
qct.supplier_name supplierName,
|
||||
qct.income_time incomeTime,
|
||||
qct.check_status checkStatus,
|
||||
qct.check_result checkResult,
|
||||
qct.check_man_name checkManName,
|
||||
qc.check_name checkName
|
||||
from qc_check_task qct
|
||||
left join qc_check_type qc on qct.check_type = qc.order_code
|
||||
where qct.del_flag = '0' and qct.status = '1'
|
||||
and qct.type_code = #{typeCode}
|
||||
<if test='ymdType=="yyyy"'>
|
||||
and CONVERT(varchar(4),qct.income_time, 120) = SUBSTRING(#{ymd},0,5)
|
||||
</if>
|
||||
<if test='ymdType=="mm"'>
|
||||
and CONVERT(varchar(7),qct.income_time, 120) = SUBSTRING(#{ymd},0,8)
|
||||
</if>
|
||||
<if test='ymdType=="dd"'>
|
||||
and CONVERT(varchar(10),qct.income_time, 120) = SUBSTRING(#{ymd},0,11)
|
||||
</if>
|
||||
order by qct.income_time desc,qct.check_status asc
|
||||
</select>
|
||||
<select id="getSupplierNoOkList" resultType="com.op.quality.domain.QcInterface">
|
||||
select
|
||||
qct.check_no checkNo,
|
||||
qct.income_batch_no incomeBatchNo,
|
||||
qct.order_no orderNo,
|
||||
qct.material_name materialName,
|
||||
qct.quality,
|
||||
qct.unit,
|
||||
qct.supplier_name supplierName,
|
||||
qct.income_time incomeTime,
|
||||
qct.check_result checkResult,
|
||||
qct.check_man_name checkManName,
|
||||
qc.check_name checkName
|
||||
from qc_check_task qct
|
||||
left join qc_check_type qc on qct.check_type = qc.order_code
|
||||
where qct.type_code = #{typeCode} and qct.check_result = 'N'
|
||||
<if test='ymdType=="yyyy"'>
|
||||
and CONVERT(varchar(4),qct.income_time, 120) = SUBSTRING(#{ymd},0,5)
|
||||
</if>
|
||||
<if test='ymdType=="mm"'>
|
||||
and CONVERT(varchar(7),qct.income_time, 120) = SUBSTRING(#{ymd},0,8)
|
||||
</if>
|
||||
<if test='ymdType=="dd"'>
|
||||
and CONVERT(varchar(10),qct.income_time, 120) = SUBSTRING(#{ymd},0,11)
|
||||
</if>
|
||||
order by qct.income_time desc
|
||||
</select>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue