diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquCheckItemController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquCheckItemController.java index 31d8a3c3..9ff9a90a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquCheckItemController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquCheckItemController.java @@ -35,6 +35,26 @@ public class EquCheckItemController extends BaseController { @Autowired private IEquCheckItemService equCheckItemService; + /** + * 通过检查项code查询关联设备code列表 + * @return + */ + @RequiresPermissions("device:item:list") + @GetMapping(value = "/getEquipmentCodeList/{itemCode}") + public AjaxResult getEquipmentCodeListByItemCode(@PathVariable("itemCode") String itemCode) { + return equCheckItemService.getEquipmentCodeListByItemCode(itemCode); + } + + /** + * 获取全部设备list信息 + * @return + */ + @RequiresPermissions("device:item:list") + @GetMapping("/getEquipmentList") + public AjaxResult getEquipmentList() { + return equCheckItemService.getEquipmentList(); + } + /** * 查询检查项维护列表 */ diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultTypeController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultTypeController.java new file mode 100644 index 00000000..a2a66249 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultTypeController.java @@ -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.EquFaultType; +import com.op.device.service.IEquFaultTypeService; +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 wws + * @date 2023-10-12 + */ +@RestController +@RequestMapping("/faultType") +public class EquFaultTypeController extends BaseController { + @Autowired + private IEquFaultTypeService equFaultTypeService; + + /** + * 查询故障类型维护列表 + */ + @RequiresPermissions("device:faultType:list") + @GetMapping("/list") + public TableDataInfo list(EquFaultType equFaultType) { + startPage(); + List list = equFaultTypeService.selectEquFaultTypeList(equFaultType); + return getDataTable(list); + } + + /** + * 导出故障类型维护列表 + */ + @RequiresPermissions("device:faultType:export") + @Log(title = "故障类型维护", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquFaultType equFaultType) { + List list = equFaultTypeService.selectEquFaultTypeList(equFaultType); + ExcelUtil util = new ExcelUtil(EquFaultType.class); + util.exportExcel(response, list, "故障类型维护数据"); + } + + /** + * 获取故障类型维护详细信息 + */ + @RequiresPermissions("device:faultType:query") + @GetMapping(value = "/{faultId}") + public AjaxResult getInfo(@PathVariable("faultId") String faultId) { + return success(equFaultTypeService.selectEquFaultTypeByFaultId(faultId)); + } + + /** + * 新增故障类型维护 + */ + @RequiresPermissions("device:faultType:add") + @Log(title = "故障类型维护", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquFaultType equFaultType) { + return toAjax(equFaultTypeService.insertEquFaultType(equFaultType)); + } + + /** + * 修改故障类型维护 + */ + @RequiresPermissions("device:faultType:edit") + @Log(title = "故障类型维护", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquFaultType equFaultType) { + return toAjax(equFaultTypeService.updateEquFaultType(equFaultType)); + } + + /** + * 删除故障类型维护 + */ + @RequiresPermissions("device:faultType:remove") + @Log(title = "故障类型维护", businessType = BusinessType.DELETE) + @DeleteMapping("/{faultIds}") + public AjaxResult remove(@PathVariable String[] faultIds) { + return toAjax(equFaultTypeService.deleteEquFaultTypeByFaultIds(faultIds)); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java new file mode 100644 index 00000000..064a7dfb --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java @@ -0,0 +1,146 @@ +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_fault_type + * + * @author wws + * @date 2023-10-12 + */ +public class EquFaultType extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String faultId; + + /** 故障类型编码 */ + @Excel(name = "故障类型编码") + private String faultCode; + + /** 故障类型 */ + @Excel(name = "故障类型") + private String faultType; + + /** 故障子类 */ + @Excel(name = "故障子类") + private String faultSubclass; + + /** 备注 */ + @Excel(name = "备注") + private String faultRemark; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + @Excel(name = "删除标志") + private String delFlag; + + public void setFaultId(String faultId) { + this.faultId = faultId; + } + + public String getFaultId() { + return faultId; + } + public void setFaultCode(String faultCode) { + this.faultCode = faultCode; + } + + public String getFaultCode() { + return faultCode; + } + public void setFaultType(String faultType) { + this.faultType = faultType; + } + + public String getFaultType() { + return faultType; + } + public void setFaultSubclass(String faultSubclass) { + this.faultSubclass = faultSubclass; + } + + public String getFaultSubclass() { + return faultSubclass; + } + public void setFaultRemark(String faultRemark) { + this.faultRemark = faultRemark; + } + + public String getFaultRemark() { + return faultRemark; + } + 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("faultId", getFaultId()) + .append("faultCode", getFaultCode()) + .append("faultType", getFaultType()) + .append("faultSubclass", getFaultSubclass()) + .append("faultRemark", getFaultRemark()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquItemEquipment.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquItemEquipment.java new file mode 100644 index 00000000..99f7d1f0 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquItemEquipment.java @@ -0,0 +1,181 @@ +package com.op.device.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 检查项/设备关联对象 equ_item_equipment + * + * @author wws + * @date 2023-10-12 + */ +public class EquItemEquipment extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String id; + + /** 关联code */ + @Excel(name = "关联code") + private String connCode; + + /** 检查项code */ + @Excel(name = "检查项code") + private String itemCode; + + /** 设备code */ + @Excel(name = "设备code") + private String equipmentCode; + + /** 工厂 */ + @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; + + /** 创建人 */ + @Excel(name = "创建人") + private String createdBy; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date createdTime; + + /** 更新人 */ + @Excel(name = "更新人") + private String updatedBy; + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date updatedTime; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setConnCode(String connCode) { + this.connCode = connCode; + } + + public String getConnCode() { + return connCode; + } + public void setItemCode(String itemCode) { + this.itemCode = itemCode; + } + + public String getItemCode() { + return itemCode; + } + public void setEquipmentCode(String equipmentCode) { + this.equipmentCode = equipmentCode; + } + + public String getEquipmentCode() { + return equipmentCode; + } + 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; + } + 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("id", getId()) + .append("connCode", getConnCode()) + .append("itemCode", getItemCode()) + .append("equipmentCode", getEquipmentCode()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createdBy", getCreatedBy()) + .append("createdTime", getCreatedTime()) + .append("updatedBy", getUpdatedBy()) + .append("updatedTime", getUpdatedTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/dto/EquCheckItemDTO.java b/op-modules/op-device/src/main/java/com/op/device/domain/dto/EquCheckItemDTO.java index acae10b4..cdc9204f 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/dto/EquCheckItemDTO.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/dto/EquCheckItemDTO.java @@ -59,6 +59,17 @@ public class EquCheckItemDTO { // 创建日期结束 private String createTimeEnd; + // 设备编码list + private List equipmentCodeList; + + public List getEquipmentCodeList() { + return equipmentCodeList; + } + + public void setEquipmentCodeList(List equipmentCodeList) { + this.equipmentCodeList = equipmentCodeList; + } + public List getCreatedTimeArray() { return createdTimeArray; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquCheckItemVO.java b/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquCheckItemVO.java index 5f4eb3e3..4c98a617 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquCheckItemVO.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquCheckItemVO.java @@ -41,6 +41,26 @@ public class EquCheckItemVO { private String updatedBy ; // 标准列表 private List formStandard; + // 设备名称 + private String equipmentName; + // 设备编码 + private String equipmentCode; + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentCode() { + return equipmentCode; + } + + public void setEquipmentCode(String equipmentCode) { + this.equipmentCode = equipmentCode; + } public String getItemId() { return itemId; diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemDetailMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemDetailMapper.java index f741f429..31308191 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemDetailMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemDetailMapper.java @@ -78,4 +78,10 @@ public interface EquCheckItemDetailMapper { * @param itemId */ void deleteEquCheckItemDetailByItemId(String itemId); + + /** + * 逻辑删除-通过检查项id删除标准信息 + * @param itemId + */ + void delEquCheckItemDetailByItemId(String itemId); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java index 27e64548..892c7133 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java @@ -3,6 +3,7 @@ package com.op.device.mapper; import java.util.List; import com.op.device.domain.EquCheckItem; +import com.op.device.domain.vo.EquCheckItemVO; /** * 检查项维护Mapper接口 @@ -71,4 +72,10 @@ public interface EquCheckItemMapper { * @return */ int selectSerialNumber(); + + /** + * 获取全部设备信息name、code + * @return + */ + List selectAllEquipmentList(); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java new file mode 100644 index 00000000..af25869e --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquFaultType; + +/** + * 故障类型维护Mapper接口 + * + * @author wws + * @date 2023-10-12 + */ +public interface EquFaultTypeMapper { + /** + * 查询故障类型维护 + * + * @param faultId 故障类型维护主键 + * @return 故障类型维护 + */ + public EquFaultType selectEquFaultTypeByFaultId(String faultId); + + /** + * 查询故障类型维护列表 + * + * @param equFaultType 故障类型维护 + * @return 故障类型维护集合 + */ + public List selectEquFaultTypeList(EquFaultType equFaultType); + + /** + * 新增故障类型维护 + * + * @param equFaultType 故障类型维护 + * @return 结果 + */ + public int insertEquFaultType(EquFaultType equFaultType); + + /** + * 修改故障类型维护 + * + * @param equFaultType 故障类型维护 + * @return 结果 + */ + public int updateEquFaultType(EquFaultType equFaultType); + + /** + * 删除故障类型维护 + * + * @param faultId 故障类型维护主键 + * @return 结果 + */ + public int deleteEquFaultTypeByFaultId(String faultId); + + /** + * 批量删除故障类型维护 + * + * @param faultIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquFaultTypeByFaultIds(String[] faultIds); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquItemEquipmentMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquItemEquipmentMapper.java new file mode 100644 index 00000000..def69bba --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquItemEquipmentMapper.java @@ -0,0 +1,86 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquItemEquipment; + +/** + * 检查项/设备关联Mapper接口 + * + * @author wws + * @date 2023-10-12 + */ +public interface EquItemEquipmentMapper { + /** + * 查询检查项/设备关联 + * + * @param id 检查项/设备关联主键 + * @return 检查项/设备关联 + */ + public EquItemEquipment selectEquItemEquipmentById(String id); + + /** + * 查询检查项/设备关联列表 + * + * @param equItemEquipment 检查项/设备关联 + * @return 检查项/设备关联集合 + */ + public List selectEquItemEquipmentList(EquItemEquipment equItemEquipment); + + /** + * 新增检查项/设备关联 + * + * @param equItemEquipment 检查项/设备关联 + * @return 结果 + */ + public int insertEquItemEquipment(EquItemEquipment equItemEquipment); + + /** + * 修改检查项/设备关联 + * + * @param equItemEquipment 检查项/设备关联 + * @return 结果 + */ + public int updateEquItemEquipment(EquItemEquipment equItemEquipment); + + /** + * 删除检查项/设备关联 + * + * @param id 检查项/设备关联主键 + * @return 结果 + */ + public int deleteEquItemEquipmentById(String id); + + /** + * 批量删除检查项/设备关联 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquItemEquipmentByIds(String[] ids); + + /** + * 获取流水号 + * @return + */ + int selectSerialNumber(); + + /** + * 通过检查项code查询关联设备code列表 + * @param itemCode + * @return + */ + List selectEquipmentCodeList(String itemCode); + + /** + * 通过检查项code删除关联信息 + * @param itemCode + */ + void deleteEquItemEquipmentByItemCode(String itemCode); + + /** + * 逻辑删除-通过itemId删除设备关联信息 + * @param itemId + */ + void delEquItemEquipmentByItemId(String itemId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquCheckItemService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquCheckItemService.java index b093e800..d493ec69 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquCheckItemService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquCheckItemService.java @@ -41,7 +41,7 @@ public interface IEquCheckItemService { /** * 修改检查项维护 * - * @param equCheckItem 检查项维护 + * @param equCheckItemDTO 检查项维护 * @return 结果 */ public AjaxResult updateEquCheckItem(EquCheckItemDTO equCheckItemDTO); @@ -61,4 +61,16 @@ public interface IEquCheckItemService { * @return 结果 */ public int deleteEquCheckItemByItemId(String itemId); + + /** + * 获取全部设备list信息 + * @return + */ + AjaxResult getEquipmentList(); + + /** + * 通过检查项code查询关联设备code列表 + * @return + */ + AjaxResult getEquipmentCodeListByItemCode(String itemCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultTypeService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultTypeService.java new file mode 100644 index 00000000..f7181501 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultTypeService.java @@ -0,0 +1,60 @@ +package com.op.device.service; + +import java.util.List; +import com.op.device.domain.EquFaultType; + +/** + * 故障类型维护Service接口 + * + * @author wws + * @date 2023-10-12 + */ +public interface IEquFaultTypeService { + /** + * 查询故障类型维护 + * + * @param faultId 故障类型维护主键 + * @return 故障类型维护 + */ + public EquFaultType selectEquFaultTypeByFaultId(String faultId); + + /** + * 查询故障类型维护列表 + * + * @param equFaultType 故障类型维护 + * @return 故障类型维护集合 + */ + public List selectEquFaultTypeList(EquFaultType equFaultType); + + /** + * 新增故障类型维护 + * + * @param equFaultType 故障类型维护 + * @return 结果 + */ + public int insertEquFaultType(EquFaultType equFaultType); + + /** + * 修改故障类型维护 + * + * @param equFaultType 故障类型维护 + * @return 结果 + */ + public int updateEquFaultType(EquFaultType equFaultType); + + /** + * 批量删除故障类型维护 + * + * @param faultIds 需要删除的故障类型维护主键集合 + * @return 结果 + */ + public int deleteEquFaultTypeByFaultIds(String[] faultIds); + + /** + * 删除故障类型维护信息 + * + * @param faultId 故障类型维护主键 + * @return 结果 + */ + public int deleteEquFaultTypeByFaultId(String faultId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java index 3838a68a..8f95d4cf 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java @@ -12,9 +12,11 @@ import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.common.log.annotation.Log; import com.op.device.domain.EquCheckItemDetail; +import com.op.device.domain.EquItemEquipment; import com.op.device.domain.dto.EquCheckItemDTO; import com.op.device.domain.vo.EquCheckItemVO; import com.op.device.mapper.EquCheckItemDetailMapper; +import com.op.device.mapper.EquItemEquipmentMapper; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,6 +44,8 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { private EquCheckItemMapper equCheckItemMapper; @Autowired private EquCheckItemDetailMapper equCheckItemDetailMapper; + @Autowired + private EquItemEquipmentMapper equItemEquipmentMapper; /** * 查询检查项维护 @@ -96,7 +100,6 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { * * @param equCheckItemDTO 检查项维护 * @return 结果 - * TODO 加事务锁 */ @Override @DS("#header.poolName") @@ -160,6 +163,27 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { equCheckItemDetailMapper.insertEquCheckItemDetail(detail); } + // 处理关联设备信息 + for (String code : equCheckItemDTO.getEquipmentCodeList()) { + EquItemEquipment equItemEquipment = new EquItemEquipment(); + + // 获取流水号 + String cnnSerialNum = String.format("%03d", equItemEquipmentMapper.selectSerialNumber()); + + equItemEquipment.setId(IdUtils.fastSimpleUUID()); + equItemEquipment.setConnCode(DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+cnnSerialNum); + equItemEquipment.setItemCode(equCheckItem.getItemCode()); + equItemEquipment.setEquipmentCode(code); + equItemEquipment.setFactoryCode(factory); + equItemEquipment.setCreatedBy(SecurityContextHolder.getUserName()); + equItemEquipment.setCreatedTime(DateUtils.getNowDate()); + equItemEquipment.setUpdatedBy(SecurityContextHolder.getUserName()); + equItemEquipment.setUpdatedTime(DateUtils.getNowDate()); + + // 插入数据库 + equItemEquipmentMapper.insertEquItemEquipment(equItemEquipment); + } + return success("新增成功"); } @@ -191,9 +215,10 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { equCheckItemMapper.updateEquCheckItem(equCheckItem); - // 删除所有标准 + // 删除所有该检查项标准 equCheckItemDetailMapper.deleteEquCheckItemDetailByItemId(equCheckItem.getItemId()); + // 处理检查项详情信息 for (EquCheckItemDetail detail : equCheckItemDTO.getFormStandard()) { // 获取标准流水号 String detailSerialNum = String.format("%03d", equCheckItemDetailMapper.selectSerialNumber(equCheckItem.getItemCode())); @@ -210,6 +235,30 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { // 插入到数据库 equCheckItemDetailMapper.insertEquCheckItemDetail(detail); } + + // 删除所有该检查项关联设备 + equItemEquipmentMapper.deleteEquItemEquipmentByItemCode(equCheckItemDTO.getItemCode()); + + // 处理关联设备信息 + for (String code : equCheckItemDTO.getEquipmentCodeList()) { + EquItemEquipment equItemEquipment = new EquItemEquipment(); + + // 获取流水号 + String cnnSerialNum = String.format("%03d", equItemEquipmentMapper.selectSerialNumber()); + + equItemEquipment.setId(IdUtils.fastSimpleUUID()); + equItemEquipment.setConnCode(DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+cnnSerialNum); + equItemEquipment.setItemCode(equCheckItem.getItemCode()); + equItemEquipment.setEquipmentCode(code); + equItemEquipment.setFactoryCode(equCheckItemDTO.getFactoryCode()); + equItemEquipment.setCreatedBy(SecurityContextHolder.getUserName()); + equItemEquipment.setCreatedTime(DateUtils.getNowDate()); + equItemEquipment.setUpdatedBy(SecurityContextHolder.getUserName()); + equItemEquipment.setUpdatedTime(DateUtils.getNowDate()); + + // 插入数据库 + equItemEquipmentMapper.insertEquItemEquipment(equItemEquipment); + } return success("修改成功"); } @@ -223,7 +272,10 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { @DS("#header.poolName") public int deleteEquCheckItemByItemIds(String[] itemIds) { for (String data : itemIds) { - equCheckItemDetailMapper.deleteEquCheckItemDetailByItemId(data); + // 逻辑删除检查项详情信息 + equCheckItemDetailMapper.delEquCheckItemDetailByItemId(data); + // 逻辑删除设备关联 + equItemEquipmentMapper.delEquItemEquipmentByItemId(data); } return equCheckItemMapper.deleteEquCheckItemByItemIds(itemIds); } @@ -237,8 +289,32 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { @Override @DS("#header.poolName") public int deleteEquCheckItemByItemId(String itemId) { - // 通过id删除标准信息 - equCheckItemDetailMapper.deleteEquCheckItemDetailByItemId(itemId); + // 逻辑删除标准 + equCheckItemDetailMapper.delEquCheckItemDetailByItemId(itemId); + // 逻辑删除设备关联 + equItemEquipmentMapper.delEquItemEquipmentByItemId(itemId); + return equCheckItemMapper.deleteEquCheckItemByItemId(itemId); } + + /** + * 获取全部设备信息 + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult getEquipmentList() { + List equipmentList = equCheckItemMapper.selectAllEquipmentList(); + return success(equipmentList); + } + + /** + * 通过检查项code查询关联设备code列表 + * @return + */ + @Override + public AjaxResult getEquipmentCodeListByItemCode(String itemCode) { + List equipmentCodeList = equItemEquipmentMapper.selectEquipmentCodeList(itemCode); + return success(equipmentCodeList); + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultTypeServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultTypeServiceImpl.java new file mode 100644 index 00000000..82fa9579 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultTypeServiceImpl.java @@ -0,0 +1,89 @@ +package com.op.device.service.impl; + +import java.util.List; +import com.op.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.EquFaultTypeMapper; +import com.op.device.domain.EquFaultType; +import com.op.device.service.IEquFaultTypeService; + +/** + * 故障类型维护Service业务层处理 + * + * @author wws + * @date 2023-10-12 + */ +@Service +public class EquFaultTypeServiceImpl implements IEquFaultTypeService { + @Autowired + private EquFaultTypeMapper equFaultTypeMapper; + + /** + * 查询故障类型维护 + * + * @param faultId 故障类型维护主键 + * @return 故障类型维护 + */ + @Override + public EquFaultType selectEquFaultTypeByFaultId(String faultId) { + return equFaultTypeMapper.selectEquFaultTypeByFaultId(faultId); + } + + /** + * 查询故障类型维护列表 + * + * @param equFaultType 故障类型维护 + * @return 故障类型维护 + */ + @Override + public List selectEquFaultTypeList(EquFaultType equFaultType) { + return equFaultTypeMapper.selectEquFaultTypeList(equFaultType); + } + + /** + * 新增故障类型维护 + * + * @param equFaultType 故障类型维护 + * @return 结果 + */ + @Override + public int insertEquFaultType(EquFaultType equFaultType) { + equFaultType.setCreateTime(DateUtils.getNowDate()); + return equFaultTypeMapper.insertEquFaultType(equFaultType); + } + + /** + * 修改故障类型维护 + * + * @param equFaultType 故障类型维护 + * @return 结果 + */ + @Override + public int updateEquFaultType(EquFaultType equFaultType) { + equFaultType.setUpdateTime(DateUtils.getNowDate()); + return equFaultTypeMapper.updateEquFaultType(equFaultType); + } + + /** + * 批量删除故障类型维护 + * + * @param faultIds 需要删除的故障类型维护主键 + * @return 结果 + */ + @Override + public int deleteEquFaultTypeByFaultIds(String[] faultIds) { + return equFaultTypeMapper.deleteEquFaultTypeByFaultIds(faultIds); + } + + /** + * 删除故障类型维护信息 + * + * @param faultId 故障类型维护主键 + * @return 结果 + */ + @Override + public int deleteEquFaultTypeByFaultId(String faultId) { + return equFaultTypeMapper.deleteEquFaultTypeByFaultId(faultId); + } +} diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml index 41fc3985..0cb9d421 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemDetailMapper.xml @@ -132,18 +132,24 @@ where detail_id = #{detailId} and del_flag = '0' + + delete from equ_check_item_detail + where parent_code = ( + select item_code from equ_check_item where item_id = #{itemId} ) + + - update equ_check_item_detail set del_flag = '1' where detail_id = #{detailId} + delete from equ_check_item_detail where detail_id = #{detailId} - update equ_check_item_detail set del_flag = '1' where detail_id in + delete from equ_check_item_detail where detail_id in #{detailId} - + update equ_check_item_detail set del_flag = '1' where parent_code = ( diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml index 06687e34..5439d400 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml @@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -68,7 +68,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE CONVERT(date, GETDATE()) = CONVERT(date,created_time) and del_flag = '0' - + + + insert into equ_check_item item_id, diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml new file mode 100644 index 00000000..abee114c --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + select fault_id, fault_code, fault_type, fault_subclass, fault_remark, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_fault_type + + + + + + + + insert into equ_fault_type + + fault_id, + fault_code, + fault_type, + fault_subclass, + fault_remark, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{faultId}, + #{faultCode}, + #{faultType}, + #{faultSubclass}, + #{faultRemark}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_fault_type + + fault_code = #{faultCode}, + fault_type = #{faultType}, + fault_subclass = #{faultSubclass}, + fault_remark = #{faultRemark}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where fault_id = #{faultId} + + + + delete from equ_fault_type where fault_id = #{faultId} + + + + delete from equ_fault_type where fault_id in + + #{faultId} + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquItemEquipmentMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquItemEquipmentMapper.xml new file mode 100644 index 00000000..10298b93 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquItemEquipmentMapper.xml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + select id, conn_code, item_code, equipment_code, factory_code, attr1, attr2, attr3, del_flag, created_by, created_time, updated_by, updated_time from equ_item_equipment + + + + + + + + + + + + insert into equ_item_equipment + + id, + conn_code, + item_code, + equipment_code, + factory_code, + attr1, + attr2, + attr3, + del_flag, + created_by, + created_time, + updated_by, + updated_time, + + + #{id}, + #{connCode}, + #{itemCode}, + #{equipmentCode}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + + + + + update equ_item_equipment + + conn_code = #{connCode}, + item_code = #{itemCode}, + equipment_code = #{equipmentCode}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + + where id = #{id} and del_flag = '0' + + + + delete from equ_item_equipment where id = #{id} + + + + delete from equ_item_equipment where id in + + #{id} + + + + + delete from equ_item_equipment where item_code = #{itemCode} + + + + update equ_item_equipment + set del_flag = '1' + where item_code = + (select item_code from equ_check_item where item_id = #{itemId}) + + \ No newline at end of file diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java index f6b1216a..a0891629 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java @@ -7,11 +7,13 @@ import com.op.common.core.web.domain.AjaxResult; import com.op.common.log.annotation.Log; import com.op.common.log.enums.BusinessType; import com.op.mes.domain.dto.BaseEquipmentDto; +import com.op.mes.domain.dto.LGInfoDto; import com.op.system.api.domain.dto.BoardDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.mes.service.IWCSInterfaceService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -55,6 +57,18 @@ public class WCSInterfaceController extends BaseController { return success(WCInterfaceService.requestDestinationStations(wcsdto)); } + @Log(title = "获取料罐用量", businessType = BusinessType.GRANT) + @PostMapping("/saveLGusedLog") + public AjaxResult saveLGusedLog(@RequestBody List lgdtos) { + if(CollectionUtils.isEmpty(lgdtos)){ + return error("参数信息为空"); + } + if(StringUtils.isBlank(lgdtos.get(0).getFactoryCode())){ + return error("工厂信息为空"); + } + return success(WCInterfaceService.saveLGusedLog(lgdtos)); + } + /** * MES看板 */ @@ -72,6 +86,14 @@ public class WCSInterfaceController extends BaseController { if(StringUtils.isEmpty(boardDTO.getYmd())){ boardDTO.setYmd(DateUtils.getDate()); } + + if(StringUtils.isEmpty(boardDTO.getEquTypeCode())){//设备类型 + return error("[equTypeCode] is not null"); + } return success(WCInterfaceService.getMesBoardEquProductionToday(boardDTO)); } + + public static void main(String args[]){ + System.out.println(DateUtils.getDate()); + } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/LGInfoDto.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/LGInfoDto.java new file mode 100644 index 00000000..b6d1a0b5 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/LGInfoDto.java @@ -0,0 +1,104 @@ +package com.op.mes.domain.dto; + +import java.util.Date; +import java.util.List; + +/** + * 料罐接口数据 + * + * @author Open Platform + * @date 2023-07-03 + */ +public class LGInfoDto { + + private String deviceCode; + private String deviceName; + private String id; + private String used; + private String usedUnit; + private String createDate; + private Date lgCreateTime; + private Date createTime; + private String factoryCode; + private String delFlag; + + public Date getLgCreateTime() { + return lgCreateTime; + } + + public void setLgCreateTime(Date lgCreateTime) { + this.lgCreateTime = lgCreateTime; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getUsed() { + return used; + } + + public void setUsed(String used) { + this.used = used; + } + + public String getUsedUnit() { + return usedUnit; + } + + public void setUsedUnit(String usedUnit) { + this.usedUnit = usedUnit; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getFactoryCode() { + return factoryCode; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java index f32158f4..b19af438 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java @@ -1,11 +1,13 @@ package com.op.mes.mapper; import com.op.mes.domain.dto.BaseEquipmentDto; +import com.op.mes.domain.dto.LGInfoDto; import com.op.system.api.domain.SysDept; import com.op.system.api.domain.dto.BoardDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WCSDataItemsDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +32,10 @@ public interface MesMapper { List getEveryNum(BoardDTO boardDTO); List getBoardFactory(BoardDTO boardDTO); + + int addBatchLGInfo(@Param("list") List lgdtos); + + List getTotalNumL(BoardDTO boardDTO); + + List getEveryNumL(BoardDTO boardDTO); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java index a1bfd1e3..9c74e4be 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java @@ -2,6 +2,7 @@ package com.op.mes.service; import com.op.common.core.web.domain.AjaxResult; import com.op.mes.domain.dto.BaseEquipmentDto; +import com.op.mes.domain.dto.LGInfoDto; import com.op.system.api.domain.SysDept; import com.op.system.api.domain.dto.BoardDTO; import com.op.system.api.domain.dto.WCSDTO; @@ -22,4 +23,6 @@ public interface IWCSInterfaceService { Map getMesBoardEquProductionToday(BoardDTO boardDTO); List getBoardFactory(BoardDTO boardDTO); + + String saveLGusedLog(List lgdtos); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index aecdfd31..a58c50d7 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -8,6 +8,7 @@ import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; import com.op.mes.domain.MesStationArrive; import com.op.mes.domain.dto.BaseEquipmentDto; +import com.op.mes.domain.dto.LGInfoDto; import com.op.mes.mapper.MesMapper; import com.op.mes.mapper.MesStationArriveMapper; import com.op.mes.mapper.ProRfidProcessDetailMapper; @@ -146,10 +147,17 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { public Map getMesBoardEquProductionToday(BoardDTO boardDTO) { DynamicDataSourceContextHolder.push("ds_"+boardDTO.getFactory());// 这是数据源的key Map boardMap = new HashMap(); + List totals = null; + List everys = null; + if("equ_type_lg".equals(boardDTO.getEquTypeCode())){//equ_type_lg 湿料罐 + boardDTO.setYmd(boardDTO.getYmd().replace("-","")); + totals = mesMapper.getTotalNumL(boardDTO); + everys = mesMapper.getEveryNumL(boardDTO); + }else{//成型机、烘房、收坯机 + totals = mesMapper.getTotalNum(boardDTO); + everys = mesMapper.getEveryNum(boardDTO); + } - List totals = mesMapper.getTotalNum(boardDTO);// - - List everys = mesMapper.getEveryNum(boardDTO);// boardMap.put("totalNum", totals); boardMap.put("everyNum", everys); @@ -158,10 +166,24 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { @Override public List getBoardFactory(BoardDTO boardDTO) { - //DynamicDataSourceContextHolder.push("master");// 这是数据源的key + DynamicDataSourceContextHolder.push("master");// 这是数据源的key return mesMapper.getBoardFactory(boardDTO); } + @Override + public String saveLGusedLog(List lgdtos) { + DynamicDataSourceContextHolder.push("ds_"+lgdtos.get(0).getFactoryCode());// 这是数据源的key + Date nowTime = DateUtils.getNowDate(); + for(LGInfoDto lgdto:lgdtos){ + lgdto.setId(IdUtils.simpleUUID()); + lgdto.setCreateTime(nowTime); + lgdto.setDeviceCode("L"+lgdto.getDeviceCode()); + } + int saveNum = mesMapper.addBatchLGInfo(lgdtos); + + return "保存成功条数："+saveNum; + } + public static void main(String args[]){ System.out.println(DateUtils.getDate()); diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index 785a10f5..04cd7632 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml @@ -39,6 +39,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{factoryCode}, + + insert into pro_lg_used_log( + id,device_code, + used,used_unit, + createDate,lg_create_time, + factory_code,create_time + ) values + + ( + #{item.id},#{item.deviceCode}, + #{item.used},#{item.usedUnit}, + #{item.createDate},#{item.lgCreateTime}, + #{item.factoryCode},#{item.createTime} + ) + + @@ -84,7 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" equ.equipment_type_code equTypeCode from mes_material_transfer_result mt left join base_equipment equ on mt.equipmentCode = equ.equipment_code - where CONVERT(varchar(10),mt.create_time, 120) = #{ymd} and equ.equipment_name is not null + where CONVERT(varchar(10),mt.update_time, 120) = #{ymd} and equ.equipment_name is not null + and equ.equipment_type_code = #{equTypeCode} group by mt.equipmentCode, equ.equipment_name, equ.equipment_type_code @@ -94,6 +112,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_name deptName from sys_dept where parent_id = '1' and del_flag = '0' + +