添加知识库文件上传

为工单添加工单详细信息页面
修改了部分搜索(改为模糊查询)
master
zhouhy 1 year ago
parent 9d24f43903
commit dca9fbbf84

@ -71,4 +71,10 @@ public class DmsConstants {
public static final String DMS_BILLS_LUBE_INSTANCE_STATUS_LUBING="2";//润滑中
public static final String DMS_BILLS_LUBE_INSTANCE_STATUS_COMPLETE="3";//润滑完成
/** 附件信息附件类别*/
public static final String MES_BASE_ATTACH_INFO_KNOWLEDGELUBE="3";//润滑知识库
public static final String MES_BASE_ATTACH_INFO_KNOWLEDGEMAINT="4";//保养知识库
public static final String MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR="5";//设备知识库
}

@ -105,6 +105,7 @@ public class DmsBillsInspectInstanceActivityController extends BaseController
@GetMapping("/selectUserIdByDmsBillsInspectInstanceActivityId/{lubeInstanceId}/userId/{userId}")
public boolean selectUserIdByDmsBillsInspectInstanceActivityId(@PathVariable("lubeInstanceId") Long lubeInstanceId,@PathVariable("userId") Long userId){
return dmsBillsInspectInstanceActivityService.selectUserIdByDmsBillsInspectInstanceActivityId(lubeInstanceId,userId);
boolean b = dmsBillsInspectInstanceActivityService.selectUserIdByDmsBillsInspectInstanceActivityId(lubeInstanceId, userId);
return b;
}
}

@ -0,0 +1,112 @@
package com.hw.dms.controller;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import org.apache.poi.ss.formula.functions.T;
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.hw.common.log.annotation.Log;
import com.hw.common.log.enums.BusinessType;
import com.hw.common.security.annotation.RequiresPermissions;
import com.hw.dms.domain.DmsInspectInstanceDetailProject;
import com.hw.dms.service.IDmsInspectInstanceDetailProjectService;
import com.hw.common.core.web.controller.BaseController;
import com.hw.common.core.web.domain.AjaxResult;
import com.hw.common.core.utils.poi.ExcelUtil;
import com.hw.common.core.web.page.TableDataInfo;
/**
* ;Controller
*
* @author xins
* @date 2024-04-10
*/
@RestController
@RequestMapping("/inspectinstancedetailproject")
public class DmsInspectInstanceDetailProjectController extends BaseController
{
@Autowired
private IDmsInspectInstanceDetailProjectService dmsInspectInstanceDetailProjectService;
/**
* ;
*/
@RequiresPermissions("dms:inspectinstancedetailproject:list")
@GetMapping("/list")
public TableDataInfo list(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
{
startPage();
List<DmsInspectInstanceDetailProject> list = dmsInspectInstanceDetailProjectService.selectDmsInspectInstanceDetailProjectList(dmsInspectInstanceDetailProject);
return getDataTable(list);
}
@GetMapping("/selectDmsInspectInstanceDetailProjectByInspectInstanceId/{inspectInstanceId}/{lineStep}")
public TableDataInfo selectDmsInspectInstanceDetailProjectByInspectInstanceId(@PathVariable("inspectInstanceId") Long inspectInstanceId,@PathVariable("lineStep") Long lineStep){
List<DmsInspectInstanceDetailProject> dmsInspectInstanceDetailProjects = dmsInspectInstanceDetailProjectService.selectDmsInspectInstanceDetailProjectByInspectInstanceId(inspectInstanceId, lineStep);
return getDataTable(dmsInspectInstanceDetailProjects);
}
/**
* ;
*/
@RequiresPermissions("dms:inspectinstancedetailproject:export")
@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
{
List<DmsInspectInstanceDetailProject> list = dmsInspectInstanceDetailProjectService.selectDmsInspectInstanceDetailProjectList(dmsInspectInstanceDetailProject);
ExcelUtil<DmsInspectInstanceDetailProject> util = new ExcelUtil<DmsInspectInstanceDetailProject>(DmsInspectInstanceDetailProject.class);
util.exportExcel(response, list, "点巡检工单明细项目信息;质检检查每个项目的质检结果详情数据");
}
/**
* ;
*/
@RequiresPermissions("dms:inspectinstancedetailproject:query")
@GetMapping(value = "/{instanceDetailProjectId}")
public AjaxResult getInfo(@PathVariable("instanceDetailProjectId") Long instanceDetailProjectId)
{
return success(dmsInspectInstanceDetailProjectService.selectDmsInspectInstanceDetailProjectByInstanceDetailProjectId(instanceDetailProjectId));
}
/**
* ;
*/
@RequiresPermissions("dms:inspectinstancedetailproject:add")
@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
{
return toAjax(dmsInspectInstanceDetailProjectService.insertDmsInspectInstanceDetailProject(dmsInspectInstanceDetailProject));
}
/**
* ;
*/
@RequiresPermissions("dms:inspectinstancedetailproject:edit")
@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
{
return toAjax(dmsInspectInstanceDetailProjectService.updateDmsInspectInstanceDetailProject(dmsInspectInstanceDetailProject));
}
/**
* ;
*/
@RequiresPermissions("dms:inspectinstancedetailproject:remove")
@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.DELETE)
@DeleteMapping("/{instanceDetailProjectIds}")
public AjaxResult remove(@PathVariable Long[] instanceDetailProjectIds)
{
return toAjax(dmsInspectInstanceDetailProjectService.deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectIds(instanceDetailProjectIds));
}
}

@ -3,6 +3,8 @@ package com.hw.dms.controller;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -47,6 +49,12 @@ public class DmsInspectRouteDetailController extends BaseController
return getDataTable(list);
}
/** 通过线路id查询线路明细列表*/
@GetMapping("/selectInspectRouteListByInspectRouteId/{inspectRouteId}")
public TableDataInfo selectInspectRouteListByInspectRouteId(@PathVariable("inspectRouteId") Long inspectRouteId){
List<DmsInspectRouteDetail> dmsInspectRouteDetails = dmsInspectRouteDetailService.selectInspectRouteListByInspectRouteId(inspectRouteId);
return getDataTable(dmsInspectRouteDetails);
}
/**
* 线
*/

@ -85,6 +85,15 @@ public class DmsPlanLubeDetailController extends BaseController
{
return success(dmsPlanLubeDetailService.selectDmsPlanLubeDetailByPlanLubeDetailId(planLubeDetailId));
}
/**
* id
* */
@GetMapping("/getDmsPlanDetailByPlanLubeId/{planLubeId}")
public TableDataInfo selectPlanLubeDetailByPlanLubeId(@PathVariable("planLubeId") Long planLubeId){
List<DmsPlanLubeDetail> dmsPlanLubeDetails = dmsPlanLubeDetailService.selectPlanLubeDetailByPlanLubeId(planLubeId);
return getDataTable(dmsPlanLubeDetails);
}
/**
*
@ -156,4 +165,6 @@ public class DmsPlanLubeDetailController extends BaseController
return success(dmsBaseDeviceLedgerService.selectDmsBaseDeviceLedgerList(dmsBaseDeviceLedger));
}
}

@ -69,6 +69,14 @@ public class DmsPlanMaintDetailController extends BaseController
{
return success(dmsPlanMaintDetailService.selectDmsPlanMaintDetailByPlanMaintDetailId(planMaintDetailId));
}
/**
* id
* */
@GetMapping("/getDmsPlanMaintDetail/{planMaintId}")
public TableDataInfo getDmsPlanMaintDetail(@PathVariable("planMaintId") Long planMaintId){
List<DmsPlanMaintDetail> dmsPlanMaintDetails = dmsPlanMaintDetailService.selectDmsPlanMaintDetailListByPlanMaintId(planMaintId);
return getDataTable(dmsPlanMaintDetails);
}
/**
*

@ -47,6 +47,14 @@ public class DmsPlanRepairDetailController extends BaseController
return getDataTable(list);
}
/** 根据计划id查询计划明细列表*/
@GetMapping("/selectPlanRepairDetailByPlanRepairId/{planRepairId}")
public TableDataInfo selectPlanRepairDetailByPlanRepairId(@PathVariable("planRepairId") Long planRepairId){
List<DmsPlanRepairDetail> dmsPlanRepairDetails = dmsPlanRepairDetailService.selectPlanRepairDetailByPlanRepairId(planRepairId);
return getDataTable(dmsPlanRepairDetails);
}
/**
*
*/

@ -0,0 +1,163 @@
package com.hw.dms.domain;
import com.hw.common.core.annotation.Excel;
import com.hw.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* mes_base_attach_info
*
* @author Yinq
* @date 2024-01-26
*/
public class BaseAttachInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
*
*/
private Long attachId;
/**
*
*/
@Excel(name = "附件编号")
private String attachCode;
/**
*
*/
@Excel(name = "附件名称")
private String attachName;
/**
* 1-2-SOP9-
*/
@Excel(name = "附件类别")
private String attachType;
/**
*
*/
@Excel(name = "附件路径")
private String attachPath;
/**
*
*/
@Excel(name = "所属工序")
private Long processId;
/**
*
*/
@Excel(name = "激活标识")
private String activeFlag;
/**附件ID,多个以,隔开*/
private String attachIdStr;
/** 是否已下发图纸下发dispatchFlag为true下发dispatchFlag为true,默认为false*/
private boolean dispatchFlag = false;
private String url;
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public void setAttachId(Long attachId) {
this.attachId = attachId;
}
public Long getAttachId() {
return attachId;
}
public void setAttachCode(String attachCode) {
this.attachCode = attachCode;
}
public String getAttachCode() {
return attachCode;
}
public void setAttachName(String attachName) {
this.attachName = attachName;
}
public String getAttachName() {
return attachName;
}
public void setAttachType(String attachType) {
this.attachType = attachType;
}
public String getAttachType() {
return attachType;
}
public void setAttachPath(String attachPath) {
this.attachPath = attachPath;
}
public String getAttachPath() {
return attachPath;
}
public void setProcessId(Long processId) {
this.processId = processId;
}
public Long getProcessId() {
return processId;
}
public void setActiveFlag(String activeFlag) {
this.activeFlag = activeFlag;
}
public String getActiveFlag() {
return activeFlag;
}
public String getAttachIdStr() {
return attachIdStr;
}
public void setAttachIdStr(String attachIdStr) {
this.attachIdStr = attachIdStr;
}
public boolean isDispatchFlag() {
return dispatchFlag;
}
public void setDispatchFlag(boolean dispatchFlag) {
this.dispatchFlag = dispatchFlag;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("attachId", getAttachId())
.append("attachCode", getAttachCode())
.append("attachName", getAttachName())
.append("attachType", getAttachType())
.append("attachPath", getAttachPath())
.append("processId", getProcessId())
.append("activeFlag", getActiveFlag())
.append("remark", getRemark())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

@ -43,6 +43,26 @@ public class DmsBaseDeviceInstall extends BaseEntity
private String deviceName;
private Date beginTime;
private Date endTime;
public Date getBeginTime() {
return beginTime;
}
public void setBeginTime(Date beginTime) {
this.beginTime = beginTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public String getDeviceName() {
return deviceName;
}

@ -38,6 +38,26 @@ public class DmsInspectRouteDetail extends BaseEntity
@Excel(name = "是否标识1-是0-否")
private String isFlag;
private String deviceName;
private String standardName;
public String getDeviceName() {
return deviceName;
}
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
public String getStandardName() {
return standardName;
}
public void setStandardName(String standardName) {
this.standardName = standardName;
}
public void setRouteDetailId(Long routeDetailId)
{
this.routeDetailId = routeDetailId;

@ -30,6 +30,17 @@ public class DmsInstanceFile extends BaseEntity
@Excel(name = "故障文件地址,一般是图片")
private String filePath;
//file-list中需要有url才能正确预览图片
private String url;
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public void setInstanceFileId(Long instanceFileId)
{
this.instanceFileId = instanceFileId;

@ -1,10 +1,13 @@
package com.hw.dms.domain;
import com.hw.system.api.domain.SysFile;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.hw.common.core.annotation.Excel;
import com.hw.common.core.web.domain.BaseEntity;
import java.util.List;
/**
* dms_knowledge_lube
*
@ -42,6 +45,36 @@ public class DmsKnowledgeLube extends BaseEntity
@Excel(name = "是否标识1-是0-否")
private String isFlag;
List<String> fileUrls;
List<SysFile> systemFiles;
List<BaseAttachInfo> attachments;
public List<BaseAttachInfo> getAttachments() {
return attachments;
}
public void setAttachments(List<BaseAttachInfo> attachments) {
this.attachments = attachments;
}
public List<SysFile> getSystemFiles() {
return systemFiles;
}
public void setSystemFiles(List<SysFile> systemFiles) {
this.systemFiles = systemFiles;
}
public List<String> getFileUrls() {
return fileUrls;
}
public void setFileUrls(List<String> fileUrls) {
this.fileUrls = fileUrls;
}
public void setKnowledgeLubeId(Long knowledgeLubeId)
{
this.knowledgeLubeId = knowledgeLubeId;

@ -1,10 +1,13 @@
package com.hw.dms.domain;
import com.hw.system.api.domain.SysFile;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.hw.common.core.annotation.Excel;
import com.hw.common.core.web.domain.BaseEntity;
import java.util.List;
/**
* dms_knowledge_maint
*
@ -42,6 +45,26 @@ public class DmsKnowledgeMaint extends BaseEntity
@Excel(name = "是否标识1-是0-否")
private String isFlag;
List<String> fileUrls;
List<SysFile> systemFiles;
public List<String> getFileUrls() {
return fileUrls;
}
public void setFileUrls(List<String> fileUrls) {
this.fileUrls = fileUrls;
}
public List<SysFile> getSystemFiles() {
return systemFiles;
}
public void setSystemFiles(List<SysFile> systemFiles) {
this.systemFiles = systemFiles;
}
public void setKnowledgeMaintId(Long knowledgeMaintId)
{
this.knowledgeMaintId = knowledgeMaintId;

@ -1,10 +1,13 @@
package com.hw.dms.domain;
import com.hw.system.api.domain.SysFile;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.hw.common.core.annotation.Excel;
import com.hw.common.core.web.domain.BaseEntity;
import java.util.List;
/**
* dms_knowledge_repair
*
@ -42,6 +45,26 @@ public class DmsKnowledgeRepair extends BaseEntity
@Excel(name = "是否标识1-是0-否")
private String isFlag;
List<String> fileUrls;
List<SysFile> systemFiles;
public List<String> getFileUrls() {
return fileUrls;
}
public void setFileUrls(List<String> fileUrls) {
this.fileUrls = fileUrls;
}
public List<SysFile> getSystemFiles() {
return systemFiles;
}
public void setSystemFiles(List<SysFile> systemFiles) {
this.systemFiles = systemFiles;
}
public void setKnowledgeRepairId(Long knowledgeRepairId)
{
this.knowledgeRepairId = knowledgeRepairId;

@ -42,6 +42,36 @@ public class DmsPlanLubeDetail extends BaseEntity
@Excel(name = "是否标识1-是2-否")
private Long isFlag;
private String deviceName;
private String lubeStationName;
private String lubeStandardCode;
public String getDeviceName() {
return deviceName;
}
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
public String getLubeStationName() {
return lubeStationName;
}
public void setLubeStationName(String lubeStationName) {
this.lubeStationName = lubeStationName;
}
public String getLubeStandardCode() {
return lubeStandardCode;
}
public void setLubeStandardCode(String lubeStandardCode) {
this.lubeStandardCode = lubeStandardCode;
}
public void setPlanLubeDetailId(Long planLubeDetailId)
{
this.planLubeDetailId = planLubeDetailId;

@ -45,6 +45,26 @@ public class DmsPlanMaintDetail extends BaseEntity
private String maintStationName;
private String deviceName;
private String maintStationCode;
public String getDeviceName() {
return deviceName;
}
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
public String getMaintStationCode() {
return maintStationCode;
}
public void setMaintStationCode(String maintStationCode) {
this.maintStationCode = maintStationCode;
}
public Long getMaintStandardId() {
return maintStandardId;
}

@ -22,9 +22,13 @@ public class DmsPlanRepairDetail extends BaseEntity
@Excel(name = "计划ID关联dms_plan_repair的plan_maint_id")
private Long planRepairId;
/** 设备ID关联dms_base_device_ledger的device_id */
@Excel(name = "设备ID关联dms_base_device_ledger的device_id")
private Long deviceId;
/** 检修计划明细ID,根据检修计划明细类型关联对应表的主键 */
@Excel(name = "检修计划明细ID,根据检修计划明细类型关联对应表的主键")
private Long repairDetailTargetId;
/** 检修计划明细类型(1设备2设备类型) */
@Excel(name = "检修计划明细类型(1设备2设备类型)")
private String repairDetailTargetType;
/** 故障类别1、设备损坏 */
@Excel(name = "故障类别", readConverterExp = "1=、设备损坏")
@ -42,6 +46,42 @@ public class DmsPlanRepairDetail extends BaseEntity
@Excel(name = "操作描述")
private String operationDescription;
private String deviceName;
private String planRepairCode;
public String getDeviceName() {
return deviceName;
}
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
public String getPlanRepairCode() {
return planRepairCode;
}
public void setPlanRepairCode(String planRepairCode) {
this.planRepairCode = planRepairCode;
}
public Long getRepairDetailTargetId() {
return repairDetailTargetId;
}
public void setRepairDetailTargetId(Long repairDetailTargetId) {
this.repairDetailTargetId = repairDetailTargetId;
}
public String getRepairDetailTargetType() {
return repairDetailTargetType;
}
public void setRepairDetailTargetType(String repairDetailTargetType) {
this.repairDetailTargetType = repairDetailTargetType;
}
public void setPlanRepairDetailId(Long planRepairDetailId)
{
this.planRepairDetailId = planRepairDetailId;
@ -60,15 +100,7 @@ public class DmsPlanRepairDetail extends BaseEntity
{
return planRepairId;
}
public void setDeviceId(Long deviceId)
{
this.deviceId = deviceId;
}
public Long getDeviceId()
{
return deviceId;
}
public void setFaultType(String faultType)
{
this.faultType = faultType;
@ -111,7 +143,6 @@ public class DmsPlanRepairDetail extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("planRepairDetailId", getPlanRepairDetailId())
.append("planRepairId", getPlanRepairId())
.append("deviceId", getDeviceId())
.append("faultType", getFaultType())
.append("repairDesc", getRepairDesc())
.append("repairProtocol", getRepairProtocol())

@ -0,0 +1,24 @@
package com.hw.dms.mapper;
import com.hw.dms.domain.BaseAttachInfo;
import com.hw.dms.domain.DmsInstanceFile;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @ClassName : BaseAttachInfo
* @Description :
* @Author :
* @Date: 2024-04-08 09:30
*/
public interface BaseAttachInfoMapper {
//知识库存储文件
int batchDmsKnowLedgeLubeFile(List<BaseAttachInfo> baseAttachInfos);
//根据知识库主键id查询文件路径
List<String> selectListBaseAttachInfos(@Param("attachType") String attachType,@Param("processId") Long processId);
//更新时删除原有的图片
int deleteListBaseAttachInfos(@Param("attachType") String attachType,@Param("processId") Long processId);
}

@ -2,6 +2,8 @@ package com.hw.dms.mapper;
import java.util.List;
import com.hw.dms.domain.DmsInspectInstanceDetailProject;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.PathVariable;
/**
* ;Mapper
@ -73,4 +75,9 @@ public interface DmsInspectInstanceDetailProjectMapper
public List<DmsInspectInstanceDetailProject> selectDmsInspectInstanceDetailProjectJoinList(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject);
/**
* id
* */
List<DmsInspectInstanceDetailProject> selectDmsInspectInstanceDetailProjectByInspectInstanceId(@Param("inspectInstanceId") Long inspectInstanceId, @Param("lineStep") Long lineStep);
}

@ -58,4 +58,7 @@ public interface DmsInspectRouteDetailMapper
* @return
*/
public int deleteDmsInspectRouteDetailByRouteDetailIds(Long[] routeDetailIds);
List<DmsInspectRouteDetail> selectInspectRouteListByInspectRouteId(Long inspectRouteId);
}

@ -69,4 +69,10 @@ public interface DmsInstanceFileMapper
* @return
*/
public int batchDmsInstanceFile(List<DmsInstanceFile> dmsInstanceFileList);
/**
*
* */
int deleteDmsInstanceFileByUpdate(Long targetId);
}

@ -58,4 +58,7 @@ public interface DmsPlanLubeDetailMapper
* @return
*/
public int deleteDmsPlanLubeDetailByPlanLubeDetailIds(Long[] planLubeDetailIds);
List<DmsPlanLubeDetail> selectPlanLubeDetailByPlanLubeId(Long planLubeId);
}

@ -68,4 +68,8 @@ public interface DmsPlanMaintDetailMapper
* @return
*/
public List<DmsPlanMaintDetail> selectDmsPlanMaintDetailJoinList(DmsPlanMaintDetail dmsPlanMaintDetail);
List<DmsPlanMaintDetail> selectDmsPlanMaintDetailListByPlanMaintId(Long planMaintId);
}

@ -58,4 +58,6 @@ public interface DmsPlanRepairDetailMapper
* @return
*/
public int deleteDmsPlanRepairDetailByPlanRepairDetailIds(Long[] planRepairDetailIds);
List<DmsPlanRepairDetail> selectPlanRepairDetailByPlanRepairId(Long planRepairId);
}

@ -0,0 +1,63 @@
package com.hw.dms.service;
import java.util.List;
import com.hw.dms.domain.DmsInspectInstanceDetailProject;
/**
* ;Service
*
* @author xins
* @date 2024-04-10
*/
public interface IDmsInspectInstanceDetailProjectService
{
/**
* ;
*
* @param instanceDetailProjectId ;
* @return ;
*/
public DmsInspectInstanceDetailProject selectDmsInspectInstanceDetailProjectByInstanceDetailProjectId(Long instanceDetailProjectId);
/**
* ;
*
* @param dmsInspectInstanceDetailProject ;
* @return ;
*/
public List<DmsInspectInstanceDetailProject> selectDmsInspectInstanceDetailProjectList(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject);
/**
* ;
*
* @param dmsInspectInstanceDetailProject ;
* @return
*/
public int insertDmsInspectInstanceDetailProject(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject);
/**
* ;
*
* @param dmsInspectInstanceDetailProject ;
* @return
*/
public int updateDmsInspectInstanceDetailProject(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject);
/**
* ;
*
* @param instanceDetailProjectIds ;
* @return
*/
public int deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectIds(Long[] instanceDetailProjectIds);
/**
* ;
*
* @param instanceDetailProjectId ;
* @return
*/
public int deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectId(Long instanceDetailProjectId);
List<DmsInspectInstanceDetailProject> selectDmsInspectInstanceDetailProjectByInspectInstanceId(Long inspectInstanceId,Long lineStep);
}

@ -58,4 +58,6 @@ public interface IDmsInspectRouteDetailService
* @return
*/
public int deleteDmsInspectRouteDetailByRouteDetailId(Long routeDetailId);
List<DmsInspectRouteDetail> selectInspectRouteListByInspectRouteId(Long inspectRouteId);
}

@ -58,4 +58,6 @@ public interface IDmsPlanLubeDetailService
* @return
*/
public int deleteDmsPlanLubeDetailByPlanLubeDetailId(Long planLubeDetailId);
List<DmsPlanLubeDetail> selectPlanLubeDetailByPlanLubeId(Long planLubeId);
}

@ -67,4 +67,7 @@ public interface IDmsPlanMaintDetailService
* @return
*/
public List<DmsPlanMaintDetail> selectDmsPlanMaintDetailJoinList(DmsPlanMaintDetail dmsPlanMaintDetail);
List<DmsPlanMaintDetail> selectDmsPlanMaintDetailListByPlanMaintId(Long planMaintId);
}

@ -58,4 +58,7 @@ public interface IDmsPlanRepairDetailService
* @return
*/
public int deleteDmsPlanRepairDetailByPlanRepairDetailId(Long planRepairDetailId);
List<DmsPlanRepairDetail> selectPlanRepairDetailByPlanRepairId(Long planRepairId);
}

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseDeviceDepreciationServiceImpl implements IDmsBaseDeviceDepre
@Override
public int insertDmsBaseDeviceDepreciation(DmsBaseDeviceDepreciation dmsBaseDeviceDepreciation)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseDeviceDepreciation.setCreateBy(user.getUsername());
dmsBaseDeviceDepreciation.setIsFlag(1l);
dmsBaseDeviceDepreciation.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,7 @@ public class DmsBaseDeviceDepreciationServiceImpl implements IDmsBaseDeviceDepre
@Override
public int updateDmsBaseDeviceDepreciation(DmsBaseDeviceDepreciation dmsBaseDeviceDepreciation)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseDeviceDepreciation.setUpdateBy(user.getUsername());
dmsBaseDeviceDepreciation.setUpdateTime(DateUtils.getNowDate());
return dmsBaseDeviceDepreciationMapper.updateDmsBaseDeviceDepreciation(dmsBaseDeviceDepreciation);

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -64,7 +65,7 @@ public class DmsBaseDeviceFilesServiceImpl implements IDmsBaseDeviceFilesService
dmsBaseDeviceFiles.setFilesPath(url);
dmsBaseDeviceFiles.setCreateTime(DateUtils.getNowDate());
dmsBaseDeviceFiles.setIsFlag(1l);
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseDeviceFiles.setCreateBy(user.getUsername());
return dmsBaseDeviceFilesMapper.insertDmsBaseDeviceFiles(dmsBaseDeviceFiles);
}
@ -79,7 +80,8 @@ public class DmsBaseDeviceFilesServiceImpl implements IDmsBaseDeviceFilesService
public int updateDmsBaseDeviceFiles(DmsBaseDeviceFiles dmsBaseDeviceFiles)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
int index = dmsBaseDeviceFiles.getFilesPath().lastIndexOf("/");
String name = dmsBaseDeviceFiles.getFilesPath().substring(index+1);
dmsBaseDeviceFiles.setFilesName(name);

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseDeviceParamServiceImpl implements IDmsBaseDeviceParamService
@Override
public int insertDmsBaseDeviceParam(DmsBaseDeviceParam dmsBaseDeviceParam)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseDeviceParam.setCreateBy(user.getUsername());
dmsBaseDeviceParam.setIsFlag(1l);
dmsBaseDeviceParam.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,7 @@ public class DmsBaseDeviceParamServiceImpl implements IDmsBaseDeviceParamService
@Override
public int updateDmsBaseDeviceParam(DmsBaseDeviceParam dmsBaseDeviceParam)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseDeviceParam.setUpdateBy(user.getUsername());
dmsBaseDeviceParam.setIsFlag(1l);
dmsBaseDeviceParam.setUpdateTime(DateUtils.getNowDate());

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.dms.domain.DmsBaseDeviceBom;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
@ -55,7 +56,7 @@ public class DmsBaseDeviceTypeServiceImpl implements IDmsBaseDeviceTypeService
@Override
public int insertDmsBaseDeviceType(DmsBaseDeviceType dmsBaseDeviceType)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseDeviceType.setCreateBy(user.getUsername());
dmsBaseDeviceType.setIsFlag(1l);
dmsBaseDeviceType.setCreateTime(DateUtils.getNowDate());
@ -65,7 +66,7 @@ public class DmsBaseDeviceTypeServiceImpl implements IDmsBaseDeviceTypeService
}
else{
DmsBaseDeviceType dmsBaseDeviceType1 = new DmsBaseDeviceType();
dmsBaseDeviceType1.setParentId(dmsBaseDeviceType.getParentId());
dmsBaseDeviceType1.setDeviceTypeId(dmsBaseDeviceType.getParentId());
String ancestors = dmsBaseDeviceTypeMapper.selectDmsBaseDeviceTypeList(dmsBaseDeviceType1).get(0).getAncestors();
dmsBaseDeviceType.setAncestors(ancestors+","+dmsBaseDeviceType.getParentId());
}
@ -81,7 +82,7 @@ public class DmsBaseDeviceTypeServiceImpl implements IDmsBaseDeviceTypeService
@Override
public int updateDmsBaseDeviceType(DmsBaseDeviceType dmsBaseDeviceType)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseDeviceType.setUpdateBy(user.getUsername());
dmsBaseDeviceType.setUpdateTime(DateUtils.getNowDate());
//如果有父级 则查询父级祖籍列表 +父级编号

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -57,7 +58,7 @@ public class DmsBaseInspectProjectServiceImpl implements IDmsBaseInspectProjectS
if (dmsBaseInspectProject.getInspectType()==null){
dmsBaseInspectProject.setInspectType("1");
}
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseInspectProject.setIsFlag("1");
dmsBaseInspectProject.setCreateBy(user.getUsername());
dmsBaseInspectProject.setCreateTime(DateUtils.getNowDate());
@ -73,7 +74,7 @@ public class DmsBaseInspectProjectServiceImpl implements IDmsBaseInspectProjectS
@Override
public int updateDmsBaseInspectProject(DmsBaseInspectProject dmsBaseInspectProject)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseInspectProject.setUpdateBy(user.getUsername());
dmsBaseInspectProject.setUpdateTime(DateUtils.getNowDate());
return dmsBaseInspectProjectMapper.updateDmsBaseInspectProject(dmsBaseInspectProject);

@ -3,6 +3,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.log.annotation.Log;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -58,7 +59,7 @@ public class DmsBaseInspectRouteServiceImpl implements IDmsBaseInspectRouteServi
if (dmsBaseInspectRoute.getInspectType()==null){
dmsBaseInspectRoute.setInspectType("1");
}
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseInspectRoute.setCreateBy(user.getUsername());
dmsBaseInspectRoute.setIsFlag("1");
dmsBaseInspectRoute.setCreateTime(DateUtils.getNowDate());
@ -74,7 +75,7 @@ public class DmsBaseInspectRouteServiceImpl implements IDmsBaseInspectRouteServi
@Override
public int updateDmsBaseInspectRoute(DmsBaseInspectRoute dmsBaseInspectRoute)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseInspectRoute.setUpdateBy(user.getUsername());
dmsBaseInspectRoute.setUpdateTime(DateUtils.getNowDate());
return dmsBaseInspectRouteMapper.updateDmsBaseInspectRoute(dmsBaseInspectRoute);

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -55,7 +56,7 @@ public class DmsBaseInspectStandardServiceImpl implements IDmsBaseInspectStandar
public int insertDmsBaseInspectStandard(DmsBaseInspectStandard dmsBaseInspectStandard)
{
dmsBaseInspectStandard.setIsFlag("1");
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseInspectStandard.setCreateBy(user.getUsername());
dmsBaseInspectStandard.setCreateTime(DateUtils.getNowDate());
return dmsBaseInspectStandardMapper.insertDmsBaseInspectStandard(dmsBaseInspectStandard);
@ -70,7 +71,7 @@ public class DmsBaseInspectStandardServiceImpl implements IDmsBaseInspectStandar
@Override
public int updateDmsBaseInspectStandard(DmsBaseInspectStandard dmsBaseInspectStandard)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseInspectStandard.setUpdateBy(user.getUsername());
dmsBaseInspectStandard.setUpdateTime(DateUtils.getNowDate());
return dmsBaseInspectStandardMapper.updateDmsBaseInspectStandard(dmsBaseInspectStandard);

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseLubeStandardServiceImpl implements IDmsBaseLubeStandardServi
@Override
public int insertDmsBaseLubeStandard(DmsBaseLubeStandard dmsBaseLubeStandard)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseLubeStandard.setIsFlag("1");
dmsBaseLubeStandard.setCreateBy(user.getUsername());
dmsBaseLubeStandard.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,8 @@ public class DmsBaseLubeStandardServiceImpl implements IDmsBaseLubeStandardServi
@Override
public int updateDmsBaseLubeStandard(DmsBaseLubeStandard dmsBaseLubeStandard)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseLubeStandard.setUpdateBy(user.getUsername());
dmsBaseLubeStandard.setUpdateTime(DateUtils.getNowDate());
return dmsBaseLubeStandardMapper.updateDmsBaseLubeStandard(dmsBaseLubeStandard);

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -70,7 +71,7 @@ public class DmsBaseLubeStationServiceImpl implements IDmsBaseLubeStationService
@Override
public int updateDmsBaseLubeStation(DmsBaseLubeStation dmsBaseLubeStation)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseLubeStation.setUpdateBy(user.getUsername());
dmsBaseLubeStation.setUpdateTime(DateUtils.getNowDate());
return dmsBaseLubeStationMapper.updateDmsBaseLubeStation(dmsBaseLubeStation);

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -55,7 +56,7 @@ public class DmsBaseMaintStandardServiceImpl implements IDmsBaseMaintStandardSer
public int insertDmsBaseMaintStandard(DmsBaseMaintStandard dmsBaseMaintStandard)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseMaintStandard.setIsFlag(1l);
dmsBaseMaintStandard.setDeviceTypeId(0l);
dmsBaseMaintStandard.setCreateBy(user.getUsername());
@ -72,7 +73,7 @@ public class DmsBaseMaintStandardServiceImpl implements IDmsBaseMaintStandardSer
@Override
public int updateDmsBaseMaintStandard(DmsBaseMaintStandard dmsBaseMaintStandard)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseMaintStandard.setUpdateBy(user.getUsername());
dmsBaseMaintStandard.setUpdateTime(DateUtils.getNowDate());

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseMaintStationServiceImpl implements IDmsBaseMaintStationServi
@Override
public int insertDmsBaseMaintStation(DmsBaseMaintStation dmsBaseMaintStation)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseMaintStation.setIsFlag(1l);
dmsBaseMaintStation.setCreateBy(user.getUsername());
dmsBaseMaintStation.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,7 @@ public class DmsBaseMaintStationServiceImpl implements IDmsBaseMaintStationServi
@Override
public int updateDmsBaseMaintStation(DmsBaseMaintStation dmsBaseMaintStation)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseMaintStation.setUpdateBy(user.getUsername());
dmsBaseMaintStation.setUpdateTime(DateUtils.getNowDate());
return dmsBaseMaintStationMapper.updateDmsBaseMaintStation(dmsBaseMaintStation);

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseOutsrcInfoServiceImpl implements IDmsBaseOutsrcInfoService
@Override
public int insertDmsBaseOutsrcInfo(DmsBaseOutsrcInfo dmsBaseOutsrcInfo)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseOutsrcInfo.setIsFlag(1l);
dmsBaseOutsrcInfo.setCreateBy(user.getUsername());
dmsBaseOutsrcInfo.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,7 @@ public class DmsBaseOutsrcInfoServiceImpl implements IDmsBaseOutsrcInfoService
@Override
public int updateDmsBaseOutsrcInfo(DmsBaseOutsrcInfo dmsBaseOutsrcInfo)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseOutsrcInfo.setUpdateBy(user.getUsername());
dmsBaseOutsrcInfo.setUpdateTime(DateUtils.getNowDate());
return dmsBaseOutsrcInfoMapper.updateDmsBaseOutsrcInfo(dmsBaseOutsrcInfo);

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseShutReasonServiceImpl implements IDmsBaseShutReasonService
@Override
public int insertDmsBaseShutReason(DmsBaseShutReason dmsBaseShutReason)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseShutReason.setIsFlag("1");
dmsBaseShutReason.setCreateBy(user.getUsername());
dmsBaseShutReason.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,7 @@ public class DmsBaseShutReasonServiceImpl implements IDmsBaseShutReasonService
@Override
public int updateDmsBaseShutReason(DmsBaseShutReason dmsBaseShutReason)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseShutReason.setUpdateBy(user.getUsername());
dmsBaseShutReason.setUpdateTime(DateUtils.getNowDate());
return dmsBaseShutReasonMapper.updateDmsBaseShutReason(dmsBaseShutReason);

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseShutTypeServiceImpl implements IDmsBaseShutTypeService
@Override
public int insertDmsBaseShutType(DmsBaseShutType dmsBaseShutType)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseShutType.setIsFlag("1");
dmsBaseShutType.setCreateBy(user.getUsername());
dmsBaseShutType.setCreateTime(DateUtils.getNowDate());

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsBaseSpecialdeviceParamServiceImpl implements IDmsBaseSpecialdevi
@Override
public int insertDmsBaseSpecialdeviceParam(DmsBaseSpecialdeviceParam dmsBaseSpecialdeviceParam)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBaseSpecialdeviceParam.setCreateBy(user.getUsername());
dmsBaseSpecialdeviceParam.setIsFlag(1l);
dmsBaseSpecialdeviceParam.setCreateTime(DateUtils.getNowDate());

@ -1,5 +1,6 @@
package com.hw.dms.service.impl;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -54,7 +55,13 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY);
queryInstanceFile.setTargetId(dmsBillsFaultInstance.getInstanceActivityId());
List<DmsInstanceFile> dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile);
for (DmsInstanceFile dmsInstanceFile : dmsInstanceFiles){
dmsInstanceFile.setUrl(dmsInstanceFile.getFilePath());
}
dmsBillsFaultInstance.setDmsInstanceFiles(dmsInstanceFiles);
// dmsBillsFaultInstance.setFaultType(dmsFaultInstanceActivity.getFaultType());
// dmsBillsFaultInstance.setFaultDescription(dmsFaultInstanceActivity.getFaultDescription());
// dmsBillsFaultInstance.setDesignOperations(dmsFaultInstanceActivity.getDesignOperations());
@ -128,8 +135,14 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
*/
@Override
public int updateDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance) {
dmsBillsFaultInstance.setUpdateTime(DateUtils.getNowDate());
return dmsBillsFaultInstanceMapper.updateDmsBillsFaultInstance(dmsBillsFaultInstance);
dmsInstanceFileMapper.deleteDmsInstanceFileByUpdate(dmsBillsFaultInstance.getRepairInstanceId());
int i = dmsBillsFaultInstanceMapper.updateDmsBillsFaultInstance(dmsBillsFaultInstance);
//存储图片
List<String> fileUrls = dmsBillsFaultInstance.getFileUrls();
batchInsertInstanceFiles(fileUrls, dmsBillsFaultInstance.getInstanceActivityId());
return i;
}
/**
@ -238,9 +251,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
@Override
@Transactional(rollbackFor = Exception.class)
public int updateDmsFaultInstanceActivity(DmsFaultInstanceActivity dmsFaultInstanceActivity) {
//存储图片
List<String> fileUrls = dmsFaultInstanceActivity.getFileUrls();
batchInsertInstanceFiles(fileUrls, dmsFaultInstanceActivity.getInstanceActivityId());
return dmsFaultInstanceActivityMapper.updateDmsFaultInstanceActivity(dmsFaultInstanceActivity);
}

@ -89,7 +89,7 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta
*/
@Override
public int insertDmsBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance) {
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
//写死105也可根据传入对象的wfprocessid作为传参。
Long aLong = dmsRepairInstanceMapper.selectWfProcessActivityId(105l);
if (dmsBillsInspectInstance.getInspectType().equals("1")) {
@ -99,12 +99,13 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta
}
dmsBillsInspectInstance.setCreateTime(DateUtils.getNowDate());
dmsBillsInspectInstance.setIsFlag("1");
dmsBillsInspectInstance.setInspectStatus(DmsConstants.DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_TO_INSPECT);
dmsBillsInspectInstance.setCreateBy(user.getUsername());
int i = dmsBillsInspectInstanceMapper.insertDmsBillsInspectInstance(dmsBillsInspectInstance);
List<DmsBillsInspectInstance> dmsBillsInspectInstances = dmsBillsInspectInstanceMapper.selectDmsBillsInspectInstanceList(dmsBillsInspectInstance);
//新建第一步工单实例节点
DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity = new DmsBillsInspectInstanceActivity();
dmsBillsInspectInstanceActivity.setInspectInstanceId(dmsBillsInspectInstances.get(0).getInspectInstanceId());
dmsBillsInspectInstanceActivity.setInspectInstanceId(dmsBillsInspectInstance.getInspectInstanceId());
dmsBillsInspectInstanceActivity.setInspectRouteId(dmsBillsInspectInstance.getInspectRouteId());
dmsBillsInspectInstanceActivity.setDeviceAmount(dmsBillsInspectInstance.getDeviceAmount());
dmsBillsInspectInstanceActivity.setPerformer(dmsBillsInspectInstance.getPerformer());

@ -3,6 +3,7 @@ package com.hw.dms.service.impl;
import java.util.Arrays;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.dms.domain.*;
import com.hw.dms.mapper.DmsBillsLubeInstanceMapper;
import com.hw.dms.service.IDmsPlanLubeService;
@ -61,7 +62,7 @@ public class DmsBillsLubeInstanceActivityServiceImpl implements IDmsBillsLubeIns
@Override
public int insertDmsBillsLubeInstanceActivity(DmsBillsLubeInstanceActivity dmsBillsLubeInstanceActivity)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsBillsLubeInstanceActivity.setCreateBy(user.getUsername());
dmsBillsLubeInstanceActivity.setStartTime(DateUtils.getNowDate());
dmsBillsLubeInstanceActivity.setCreateTime(DateUtils.getNowDate());

@ -3,6 +3,7 @@ package com.hw.dms.service.impl;
import java.util.Arrays;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.dms.domain.*;
import com.hw.dms.mapper.DmsBillsFaultInstanceMapper;
import com.hw.system.api.model.LoginUser;
@ -58,7 +59,7 @@ public class DmsFaultInstanceActivityServiceImpl implements IDmsFaultInstanceAct
@Override
public int insertDmsFaultInstanceActivity(DmsFaultInstanceActivity dmsFaultInstanceActivity)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsFaultInstanceActivity.setCreateBy(user.getUsername());
dmsFaultInstanceActivity.setStartTime(DateUtils.getNowDate());
dmsFaultInstanceActivity.setCreateTime(DateUtils.getNowDate());

@ -0,0 +1,101 @@
package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.hw.dms.mapper.DmsInspectInstanceDetailProjectMapper;
import com.hw.dms.domain.DmsInspectInstanceDetailProject;
import com.hw.dms.service.IDmsInspectInstanceDetailProjectService;
/**
* ;Service
*
* @author xins
* @date 2024-04-10
*/
@Service
public class DmsInspectInstanceDetailProjectServiceImpl implements IDmsInspectInstanceDetailProjectService
{
@Autowired
private DmsInspectInstanceDetailProjectMapper dmsInspectInstanceDetailProjectMapper;
/**
* ;
*
* @param instanceDetailProjectId ;
* @return ;
*/
@Override
public DmsInspectInstanceDetailProject selectDmsInspectInstanceDetailProjectByInstanceDetailProjectId(Long instanceDetailProjectId)
{
return dmsInspectInstanceDetailProjectMapper.selectDmsInspectInstanceDetailProjectByInstanceDetailProjectId(instanceDetailProjectId);
}
/**
* ;
*
* @param dmsInspectInstanceDetailProject ;
* @return ;
*/
@Override
public List<DmsInspectInstanceDetailProject> selectDmsInspectInstanceDetailProjectList(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
{
return dmsInspectInstanceDetailProjectMapper.selectDmsInspectInstanceDetailProjectList(dmsInspectInstanceDetailProject);
}
/**
* ;
*
* @param dmsInspectInstanceDetailProject ;
* @return
*/
@Override
public int insertDmsInspectInstanceDetailProject(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
{
dmsInspectInstanceDetailProject.setCreateTime(DateUtils.getNowDate());
return dmsInspectInstanceDetailProjectMapper.insertDmsInspectInstanceDetailProject(dmsInspectInstanceDetailProject);
}
/**
* ;
*
* @param dmsInspectInstanceDetailProject ;
* @return
*/
@Override
public int updateDmsInspectInstanceDetailProject(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
{
dmsInspectInstanceDetailProject.setUpdateTime(DateUtils.getNowDate());
return dmsInspectInstanceDetailProjectMapper.updateDmsInspectInstanceDetailProject(dmsInspectInstanceDetailProject);
}
/**
* ;
*
* @param instanceDetailProjectIds ;
* @return
*/
@Override
public int deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectIds(Long[] instanceDetailProjectIds)
{
return dmsInspectInstanceDetailProjectMapper.deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectIds(instanceDetailProjectIds);
}
/**
* ;
*
* @param instanceDetailProjectId ;
* @return
*/
@Override
public int deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectId(Long instanceDetailProjectId)
{
return dmsInspectInstanceDetailProjectMapper.deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectId(instanceDetailProjectId);
}
@Override
public List<DmsInspectInstanceDetailProject> selectDmsInspectInstanceDetailProjectByInspectInstanceId(Long inspectInstanceId, Long lineStep) {
return dmsInspectInstanceDetailProjectMapper.selectDmsInspectInstanceDetailProjectByInspectInstanceId(inspectInstanceId,lineStep);
}
}

@ -90,4 +90,9 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS
{
return dmsInspectRouteDetailMapper.deleteDmsInspectRouteDetailByRouteDetailId(routeDetailId);
}
@Override
public List<DmsInspectRouteDetail> selectInspectRouteListByInspectRouteId(Long inspectRouteId) {
return dmsInspectRouteDetailMapper.selectInspectRouteListByInspectRouteId(inspectRouteId);
}
}

@ -1,15 +1,23 @@
package com.hw.dms.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.hw.common.core.constant.DmsConstants;
import com.hw.common.core.utils.DateUtils;
import com.hw.dms.domain.DmsBaseLubeStation;
import com.hw.dms.domain.BaseAttachInfo;
import com.hw.dms.domain.DmsInstanceFile;
import com.hw.dms.mapper.BaseAttachInfoMapper;
import com.hw.dms.mapper.DmsBaseLubeStationMapper;
import com.hw.system.api.domain.SysFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.hw.dms.mapper.DmsKnowledgeLubeMapper;
import com.hw.dms.domain.DmsKnowledgeLube;
import com.hw.dms.service.IDmsKnowledgeLubeService;
import javax.security.auth.login.Configuration;
/**
* Service
*
@ -23,6 +31,8 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService
private DmsKnowledgeLubeMapper dmsKnowledgeLubeMapper;
@Autowired
private DmsBaseLubeStationMapper dmsBaseLubeStationMapper;
@Autowired
private BaseAttachInfoMapper baseAttachInfoMapper;
/**
*
@ -33,7 +43,17 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService
@Override
public DmsKnowledgeLube selectDmsKnowledgeLubeByKnowledgeLubeId(Long knowledgeLubeId)
{
return dmsKnowledgeLubeMapper.selectDmsKnowledgeLubeByKnowledgeLubeId(knowledgeLubeId);
DmsKnowledgeLube dmsKnowledgeLube = dmsKnowledgeLubeMapper.selectDmsKnowledgeLubeByKnowledgeLubeId(knowledgeLubeId);
List<String> baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGELUBE,dmsKnowledgeLube.getKnowledgeLubeId());
List<SysFile> sysFiles = new ArrayList<SysFile>();
for (String string:baseAttachInfos){
SysFile sysFile = new SysFile();
sysFile.setUrl(string);
sysFiles.add(sysFile);
}
dmsKnowledgeLube.setSystemFiles(sysFiles);
return dmsKnowledgeLube;
}
/**
@ -60,7 +80,13 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService
dmsKnowledgeLube.setCreateTime(DateUtils.getNowDate());
dmsKnowledgeLube.setIsFlag("1");
return dmsKnowledgeLubeMapper.insertDmsKnowledgeLube(dmsKnowledgeLube);
int i = dmsKnowledgeLubeMapper.insertDmsKnowledgeLube(dmsKnowledgeLube);
//存储图片
List<String> fileUrls = dmsKnowledgeLube.getFileUrls();
batchInsertInstanceFiles(fileUrls,dmsKnowledgeLube.getKnowledgeLubeId());
return i;
}
/**
@ -73,7 +99,14 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService
public int updateDmsKnowledgeLube(DmsKnowledgeLube dmsKnowledgeLube)
{
dmsKnowledgeLube.setUpdateTime(DateUtils.getNowDate());
return dmsKnowledgeLubeMapper.updateDmsKnowledgeLube(dmsKnowledgeLube);
int i = dmsKnowledgeLubeMapper.updateDmsKnowledgeLube(dmsKnowledgeLube);
baseAttachInfoMapper.deleteListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGELUBE,dmsKnowledgeLube.getKnowledgeLubeId());
//存储图片
List<String> fileUrls = dmsKnowledgeLube.getFileUrls();
if (fileUrls!=null) {
batchInsertInstanceFiles(fileUrls, dmsKnowledgeLube.getKnowledgeLubeId());
}
return i;
}
/**
@ -99,4 +132,26 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService
{
return dmsKnowledgeLubeMapper.deleteDmsKnowledgeLubeByKnowledgeLubeId(knowledgeLubeId);
}
public void batchInsertInstanceFiles(List<String> fileUrls, Long knowledgeLubeId ) {
if (fileUrls != null && !fileUrls.isEmpty()) {
// List<DmsInstanceFile> dmsInstanceFiles = new ArrayList<>();
// for (String fileUrl : fileUrls) {
// DmsInstanceFile dmsInstanceFile = new DmsInstanceFile();
// dmsInstanceFile.setTargetId(instanceActivityId);
// dmsInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY);
// dmsInstanceFile.setFilePath(fileUrl);
// dmsInstanceFiles.add(dmsInstanceFile);
// }
List<BaseAttachInfo> baseAttachInfos = new ArrayList<>();
for (String fileUrl : fileUrls){
BaseAttachInfo baseAttachInfo = new BaseAttachInfo();
baseAttachInfo.setAttachType(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGELUBE);
baseAttachInfo.setAttachName("name");
baseAttachInfo.setAttachPath(fileUrl);
baseAttachInfo.setProcessId(knowledgeLubeId);
baseAttachInfos.add(baseAttachInfo);
}
baseAttachInfoMapper.batchDmsKnowLedgeLubeFile(baseAttachInfos);
}
}
}

@ -1,9 +1,15 @@
package com.hw.dms.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.hw.common.core.constant.DmsConstants;
import com.hw.common.core.utils.DateUtils;
import com.hw.dms.domain.BaseAttachInfo;
import com.hw.dms.domain.DmsBaseMaintStation;
import com.hw.dms.mapper.BaseAttachInfoMapper;
import com.hw.dms.mapper.DmsBaseMaintStationMapper;
import com.hw.system.api.domain.SysFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.hw.dms.mapper.DmsKnowledgeMaintMapper;
@ -24,6 +30,8 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService
@Autowired
private DmsBaseMaintStationMapper dmsBaseMaintStationMapper;
@Autowired
private BaseAttachInfoMapper baseAttachInfoMapper;
/**
*
*
@ -33,7 +41,17 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService
@Override
public DmsKnowledgeMaint selectDmsKnowledgeMaintByKnowledgeMaintId(Long knowledgeMaintId)
{
return dmsKnowledgeMaintMapper.selectDmsKnowledgeMaintByKnowledgeMaintId(knowledgeMaintId);
DmsKnowledgeMaint dmsKnowledgeMaint = dmsKnowledgeMaintMapper.selectDmsKnowledgeMaintByKnowledgeMaintId(knowledgeMaintId);
List<String> baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEMAINT,dmsKnowledgeMaint.getKnowledgeMaintId());
List<SysFile> sysFiles = new ArrayList<SysFile>();
for (String string:baseAttachInfos){
SysFile sysFile = new SysFile();
sysFile.setUrl(string);
sysFiles.add(sysFile);
}
dmsKnowledgeMaint.setSystemFiles(sysFiles);
return dmsKnowledgeMaint;
}
/**
@ -60,7 +78,11 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService
dmsKnowledgeMaint.setCreateTime(DateUtils.getNowDate());
dmsKnowledgeMaint.setIsFlag("1");
return dmsKnowledgeMaintMapper.insertDmsKnowledgeMaint(dmsKnowledgeMaint);
int i = dmsKnowledgeMaintMapper.insertDmsKnowledgeMaint(dmsKnowledgeMaint);
//存储图片
List<String> fileUrls = dmsKnowledgeMaint.getFileUrls();
batchInsertInstanceFiles(fileUrls, dmsKnowledgeMaint.getKnowledgeMaintId());
return i;
}
/**
@ -73,7 +95,13 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService
public int updateDmsKnowledgeMaint(DmsKnowledgeMaint dmsKnowledgeMaint)
{
dmsKnowledgeMaint.setUpdateTime(DateUtils.getNowDate());
return dmsKnowledgeMaintMapper.updateDmsKnowledgeMaint(dmsKnowledgeMaint);
int i = dmsKnowledgeMaintMapper.updateDmsKnowledgeMaint(dmsKnowledgeMaint);
baseAttachInfoMapper.deleteListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEMAINT,dmsKnowledgeMaint.getKnowledgeMaintId());
List<String> fileUrls = dmsKnowledgeMaint.getFileUrls();
if (fileUrls!=null) {
batchInsertInstanceFiles(fileUrls, dmsKnowledgeMaint.getKnowledgeMaintId());
}
return i;
}
/**
@ -99,4 +127,19 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService
{
return dmsKnowledgeMaintMapper.deleteDmsKnowledgeMaintByKnowledgeMaintId(knowledgeMaintId);
}
public void batchInsertInstanceFiles(List<String> fileUrls, Long knowledgeLubeId ) {
if (fileUrls != null && !fileUrls.isEmpty()) {
List<BaseAttachInfo> baseAttachInfos = new ArrayList<>();
for (String fileUrl : fileUrls){
BaseAttachInfo baseAttachInfo = new BaseAttachInfo();
baseAttachInfo.setAttachType(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEMAINT);
baseAttachInfo.setAttachName("name");
baseAttachInfo.setAttachPath(fileUrl);
baseAttachInfo.setProcessId(knowledgeLubeId);
baseAttachInfos.add(baseAttachInfo);
}
baseAttachInfoMapper.batchDmsKnowLedgeLubeFile(baseAttachInfos);
}
}
}

@ -1,7 +1,13 @@
package com.hw.dms.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.hw.common.core.constant.DmsConstants;
import com.hw.common.core.utils.DateUtils;
import com.hw.dms.domain.BaseAttachInfo;
import com.hw.dms.mapper.BaseAttachInfoMapper;
import com.hw.system.api.domain.SysFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.hw.dms.mapper.DmsKnowledgeRepairMapper;
@ -20,6 +26,9 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
@Autowired
private DmsKnowledgeRepairMapper dmsKnowledgeRepairMapper;
@Autowired
private BaseAttachInfoMapper baseAttachInfoMapper;
/**
*
*
@ -29,7 +38,17 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
@Override
public DmsKnowledgeRepair selectDmsKnowledgeRepairByKnowledgeRepairId(Long knowledgeRepairId)
{
return dmsKnowledgeRepairMapper.selectDmsKnowledgeRepairByKnowledgeRepairId(knowledgeRepairId);
DmsKnowledgeRepair dmsKnowledgeRepair = dmsKnowledgeRepairMapper.selectDmsKnowledgeRepairByKnowledgeRepairId(knowledgeRepairId);
List<String> baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId());
List<SysFile> sysFiles = new ArrayList<SysFile>();
for (String string:baseAttachInfos){
SysFile sysFile = new SysFile();
sysFile.setUrl(string);
sysFiles.add(sysFile);
}
dmsKnowledgeRepair.setSystemFiles(sysFiles);
return dmsKnowledgeRepair;
}
/**
@ -55,7 +74,12 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
{
dmsKnowledgeRepair.setCreateTime(DateUtils.getNowDate());
dmsKnowledgeRepair.setIsFlag("1");
return dmsKnowledgeRepairMapper.insertDmsKnowledgeRepair(dmsKnowledgeRepair);
int i = dmsKnowledgeRepairMapper.insertDmsKnowledgeRepair(dmsKnowledgeRepair);
//存储图片
List<String> fileUrls = dmsKnowledgeRepair.getFileUrls();
batchInsertInstanceFiles(fileUrls, dmsKnowledgeRepair.getKnowledgeRepairId());
return i;
}
/**
@ -68,7 +92,15 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
public int updateDmsKnowledgeRepair(DmsKnowledgeRepair dmsKnowledgeRepair)
{
dmsKnowledgeRepair.setUpdateTime(DateUtils.getNowDate());
return dmsKnowledgeRepairMapper.updateDmsKnowledgeRepair(dmsKnowledgeRepair);
int i = dmsKnowledgeRepairMapper.updateDmsKnowledgeRepair(dmsKnowledgeRepair);
baseAttachInfoMapper.deleteListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId());
//存储图片
List<String> fileUrls = dmsKnowledgeRepair.getFileUrls();
if(fileUrls!=null) {
batchInsertInstanceFiles(fileUrls, dmsKnowledgeRepair.getKnowledgeRepairId());
}
return i;
}
/**
@ -94,4 +126,20 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
{
return dmsKnowledgeRepairMapper.deleteDmsKnowledgeRepairByKnowledgeRepairId(knowledgeRepairId);
}
public void batchInsertInstanceFiles(List<String> fileUrls, Long knowledgeLubeId ) {
if (fileUrls != null && !fileUrls.isEmpty()) {
List<BaseAttachInfo> baseAttachInfos = new ArrayList<>();
for (String fileUrl : fileUrls){
BaseAttachInfo baseAttachInfo = new BaseAttachInfo();
baseAttachInfo.setAttachType(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR);
baseAttachInfo.setAttachName("name");
baseAttachInfo.setAttachPath(fileUrl);
baseAttachInfo.setProcessId(knowledgeLubeId);
baseAttachInfos.add(baseAttachInfo);
}
baseAttachInfoMapper.batchDmsKnowLedgeLubeFile(baseAttachInfos);
}
}
}

@ -3,6 +3,7 @@ package com.hw.dms.service.impl;
import java.util.Arrays;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.dms.domain.DmsBillsMaintInstance;
import com.hw.dms.domain.DmsRepairInstance;
import com.hw.dms.domain.DmsRepairInstanceActivity;
@ -61,7 +62,7 @@ public class DmsMaintInstanceActivityServiceImpl implements IDmsMaintInstanceAct
@Override
public int insertDmsMaintInstanceActivity(DmsMaintInstanceActivity dmsMaintInstanceActivity)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsMaintInstanceActivity.setCreateBy(user.getUsername());
dmsMaintInstanceActivity.setCreateTime(DateUtils.getNowDate());
dmsMaintInstanceActivity.setStartTime(DateUtils.getNowDate());

@ -6,6 +6,7 @@ import java.util.List;
import com.hw.common.core.constant.SecurityConstants;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.core.web.domain.AjaxResult;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.job.api.RemoteJobService;
import com.hw.job.api.domain.SysJob;
import com.hw.job.api.util.CronUtils;
@ -67,7 +68,7 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService
//通过cron表达式获取下一次执行时间
Date nextExecution = CronUtils.getNextExecution(time);
dmsPlanInspect.setPlanTime(nextExecution);
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsPlanInspect.setCreateBy(user.getUsername());
dmsPlanInspect.setIsFlag("1");
dmsPlanInspect.setCreateTime(DateUtils.getNowDate());
@ -97,7 +98,7 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService
@Override
public int updateDmsPlanInspect(DmsPlanInspect dmsPlanInspect)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsPlanInspect.setUpdateBy(user.getUsername());
dmsPlanInspect.setUpdateTime(DateUtils.getNowDate());
return dmsPlanInspectMapper.updateDmsPlanInspect(dmsPlanInspect);

@ -97,4 +97,9 @@ public class DmsPlanLubeDetailServiceImpl implements IDmsPlanLubeDetailService
{
return dmsPlanLubeDetailMapper.deleteDmsPlanLubeDetailByPlanLubeDetailId(planLubeDetailId);
}
@Override
public List<DmsPlanLubeDetail> selectPlanLubeDetailByPlanLubeId(Long planLubeId) {
return dmsPlanLubeDetailMapper.selectPlanLubeDetailByPlanLubeId(planLubeId);
}
}

@ -113,4 +113,9 @@ public class DmsPlanMaintDetailServiceImpl implements IDmsPlanMaintDetailService
{
return dmsPlanMaintDetailMapper.selectDmsPlanMaintDetailJoinList(dmsPlanMaintDetail);
}
@Override
public List<DmsPlanMaintDetail> selectDmsPlanMaintDetailListByPlanMaintId(Long planMaintId) {
return dmsPlanMaintDetailMapper.selectDmsPlanMaintDetailListByPlanMaintId(planMaintId);
}
}

@ -208,12 +208,13 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService {
public void insertDmsPlanMaintDetail(DmsPlanMaint dmsPlanMaint) {
List<DmsPlanMaintDetail> dmsPlanMaintDetailList = dmsPlanMaint.getDmsPlanMaintDetailList();
Long planMaintId = dmsPlanMaint.getPlanMaintId();
LoginUser user = new LoginUser();
LoginUser loginUser = SecurityUtils.getLoginUser();
if (StringUtils.isNotNull(dmsPlanMaintDetailList)) {
List<DmsPlanMaintDetail> list = new ArrayList<DmsPlanMaintDetail>();
for (DmsPlanMaintDetail dmsPlanMaintDetail : dmsPlanMaintDetailList) {
dmsPlanMaintDetail.setIsFlag(1l);
dmsPlanMaintDetail.setCreateBy(user.getUsername());
dmsPlanMaintDetail.setCreateBy(loginUser.getUsername());
dmsPlanMaintDetail.setPlanMaintId(planMaintId);
list.add(dmsPlanMaintDetail);
}

@ -93,4 +93,9 @@ public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailServi
{
return dmsPlanRepairDetailMapper.deleteDmsPlanRepairDetailByPlanRepairDetailId(planRepairDetailId);
}
@Override
public List<DmsPlanRepairDetail> selectPlanRepairDetailByPlanRepairId(Long planRepairId) {
return dmsPlanRepairDetailMapper.selectPlanRepairDetailByPlanRepairId(planRepairId);
}
}

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService
@Override
public int insertDmsRecordInspect(DmsRecordInspect dmsRecordInspect)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsRecordInspect.setIsFlag("1");
dmsRecordInspect.setCreateBy(user.getUsername());
dmsRecordInspect.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,7 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService
@Override
public int updateDmsRecordInspect(DmsRecordInspect dmsRecordInspect)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsRecordInspect.setUpdateBy(user.getUsername());
dmsRecordInspect.setUpdateTime(DateUtils.getNowDate());
return dmsRecordInspectMapper.updateDmsRecordInspect(dmsRecordInspect);

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsRecordLubeServiceImpl implements IDmsRecordLubeService
@Override
public int insertDmsRecordLube(DmsRecordLube dmsRecordLube)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsRecordLube.setCreateBy(user.getUsername());
dmsRecordLube.setCreateTime(DateUtils.getNowDate());
dmsRecordLube.setIsFlag("1");
@ -70,7 +71,7 @@ public class DmsRecordLubeServiceImpl implements IDmsRecordLubeService
@Override
public int updateDmsRecordLube(DmsRecordLube dmsRecordLube)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsRecordLube.setUpdateBy(user.getUsername());
dmsRecordLube.setUpdateTime(DateUtils.getNowDate());
return dmsRecordLubeMapper.updateDmsRecordLube(dmsRecordLube);

@ -2,6 +2,7 @@ package com.hw.dms.service.impl;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -54,7 +55,7 @@ public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService
@Override
public int insertDmsRecordShutDown(DmsRecordShutDown dmsRecordShutDown)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsRecordShutDown.setIsFlag(1l);
dmsRecordShutDown.setCreateBy(user.getUsername());
dmsRecordShutDown.setCreateTime(DateUtils.getNowDate());
@ -70,7 +71,7 @@ public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService
@Override
public int updateDmsRecordShutDown(DmsRecordShutDown dmsRecordShutDown)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsRecordShutDown.setUpdateBy(user.getUsername());
dmsRecordShutDown.setUpdateTime(DateUtils.getNowDate());
return dmsRecordShutDownMapper.updateDmsRecordShutDown(dmsRecordShutDown);

@ -5,6 +5,7 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.dms.domain.DmsPlanRepair;
import com.hw.dms.domain.DmsRepairInstance;
import com.hw.dms.mapper.DmsPlanRepairMapper;
@ -67,7 +68,7 @@ public class DmsRepairInstanceActivityServiceImpl implements IDmsRepairInstanceA
public int insertDmsRepairInstanceActivity(DmsRepairInstanceActivity dmsRepairInstanceActivity)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
dmsRepairInstanceActivity.setCreateTime(DateUtils.getNowDate());
dmsRepairInstanceActivity.setCreateBy(user.getUsername());
dmsRepairInstanceActivity.setStartTime(DateUtils.getNowDate());
@ -131,7 +132,7 @@ public class DmsRepairInstanceActivityServiceImpl implements IDmsRepairInstanceA
@Override
public int updateDmsRepairInstanceActivity(DmsRepairInstanceActivity dmsRepairInstanceActivity)
{
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
//第一步
if (dmsRepairInstanceActivity.getProcessStepOrder()==1){
dmsRepairInstanceActivity.setProcessHandleStatus("2");

@ -7,6 +7,7 @@ import java.util.List;
import com.hw.common.core.constant.SecurityConstants;
import com.hw.common.core.domain.R;
import com.hw.common.core.utils.DateUtils;
import com.hw.common.security.utils.SecurityUtils;
import com.hw.dms.domain.DmsPlanRepair;
import com.hw.dms.domain.DmsRepairInstanceActivity;
import com.hw.dms.mapper.DmsPlanRepairMapper;
@ -101,7 +102,7 @@ public class DmsRepairInstanceServiceImpl implements IDmsRepairInstanceService
String dailyCode = format + serialNumberStr;
dmsRepairInstance.setBillsRepairCode(dailyCode);
LoginUser user = new LoginUser();
LoginUser user = SecurityUtils.getLoginUser();
if (dmsRepairInstance.getPlanBeginTime()!=null){
DmsPlanRepair dmsPlanRepair = dmsPlanRepairMapper.selectDmsPlanRepairByPlanRepairId(dmsRepairInstance.getPlanRepairId());
Long timeLimit = dmsPlanRepair.getTimeLimit();

@ -0,0 +1,39 @@
<?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.hw.dms.mapper.BaseAttachInfoMapper">
<resultMap type="BaseAttachInfo" id="BaseAttachInfoResult">
<result property="attachId" column="attach_id"/>
<result property="attachCode" column="attach_code"/>
<result property="attachName" column="attach_name"/>
<result property="attachType" column="attach_type"/>
<result property="attachPath" column="attach_path"/>
<result property="processId" column="process_id"/>
<result property="activeFlag" column="active_flag"/>
<result property="remark" column="remark"/>
<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>
<insert id="batchDmsKnowLedgeLubeFile" >
insert into mes_base_attach_info( attach_type, attach_name, attach_path, process_id) values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.attachType}, #{item.attachName}, #{item.attachPath}, #{item.processId})
</foreach>
</insert>
<select id="selectListBaseAttachInfos" >
select attach_path
from mes_base_attach_info
where attach_type = #{attachType} and process_id = #{processId}
</select>
<delete id="deleteListBaseAttachInfos" >
delete from mes_base_attach_info
where attach_type = #{attachType} and process_id = #{processId}
</delete>
</mapper>

@ -28,8 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join dms_base_device_ledger b on a.device_id = b.device_id
<where>
<if test="deviceId != null "> and a.device_id = #{deviceId}</if>
<if test="installPosition != null and installPosition != ''"> and a.install_position = #{installPosition}</if>
<if test="installTime != null "> and a.install_time = #{installTime}</if>
<if test="installPosition != null and installPosition != ''"> and a.install_position like concat( '%',#{installPosition},'%')</if>
<if test="params.beginTime != null and params.endTime !=null"> and a.install_time between #{params.beginTime} and #{params.endTime}</if>
<if test="installPersion != null and installPersion != ''"> and a.install_persion = #{installPersion}</if>
<if test="workOrder != null and workOrder != ''"> and a.work_order = #{workOrder}</if>
<if test="deviceName != null and deviceName != ''"> and b.device_name like concat('%', #{deviceName},'%')</if>

@ -28,13 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from dms_base_specialdevice_param a
left join dms_base_device_ledger b on a.device_id = b.device_id
<where>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="deviceName != null "> and device_name like concat('%', #{deviceName},'%')</if>
<if test="paramCode != null and paramCode != ''"> and param_code = #{paramCode}</if>
<if test="paramName != null and paramName != ''"> and param_name like concat('%', #{paramName}, '%')</if>
<if test="paramValue != null and paramValue != ''"> and param_value = #{paramValue}</if>
<if test="paramUnit != null and paramUnit != ''"> and param_unit = #{paramUnit}</if>
<if test="isFlag != null "> and is_flag = #{isFlag}</if>
<if test="deviceId != null "> and a.device_id = #{deviceId}</if>
<if test="deviceName != null "> and b.device_name like concat('%', #{deviceName},'%')</if>
<if test="paramCode != null and paramCode != ''"> and a.param_code = #{paramCode}</if>
<if test="paramName != null and paramName != ''"> and a.param_name like concat('%', #{paramName}, '%')</if>
<if test="paramValue != null and paramValue != ''"> and a.param_value = #{paramValue}</if>
<if test="paramUnit != null and paramUnit != ''"> and a.param_unit = #{paramUnit}</if>
<if test="isFlag != null "> and a.is_flag = #{isFlag}</if>
</where>
</select>

@ -29,11 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join dms_base_device_ledger b on a.device_id = b.device_id
<where>
<if test="deviceId != null "> and a.device_id = #{deviceId}</if>
<if test="devicePosition != null and devicePosition != ''"> and a.device_position = #{devicePosition}</if>
<if test="devicePositionNew != null and devicePositionNew != ''"> and a.device_position_new = #{devicePositionNew}</if>
<if test="devicePosition != null and devicePosition != ''"> and a.device_position like concat('%',#{devicePosition},'%') </if>
<if test="devicePositionNew != null and devicePositionNew != ''"> and a.device_position_new like concat('%',#{devicePositionNew},'%') </if>
<if test="devicePositionOperator != null and devicePositionOperator != ''"> and a.device_position_operator = #{devicePositionOperator}</if>
<if test="devicePositionReason != null and devicePositionReason != ''"> and a.device_position_reason = #{devicePositionReason}</if>
<if test="deviceTransferTime != null "> and a.device_transfer_time = #{deviceTransferTime}</if>
<if test="params.beginTime != null and params.endTime !=null"> and a.device_transfer_time between #{params.beginTime} and #{params.endTime}</if>
<if test="deviceName != null "> and b.device_name like concat('%', #{deviceName},'%')</if>
</where>
</select>

@ -143,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectUserIdByDmsBillsInspectInstanceActivityId" parameterType="Long" resultType="java.lang.Long">
select auth_target_id from wf_process_activity_auth where process_activity_id =(
select process_activity_id from wf_process_activity
where wf_process_id = 106
where wf_process_id = 105
and process_activity_order = (1+(select max(process_step_order)
from dms_bills_inspect_instance_activity
where inspect_instance_id=#{instanceActivityId})))

@ -32,15 +32,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDmsBillsInspectInstanceList" parameterType="DmsBillsInspectInstance" resultMap="DmsBillsInspectInstanceResult">
<include refid="selectDmsBillsInspectInstanceVo"/>
<where>
<if test="planInspectId != null "> and plan_inspect_id = #{planInspectId}</if>
<if test="planInspectId != null "> and plan_inspect_id like concat('%',#{planInspectId},'%') </if>
<if test="inspectInstanceId != null "> and inspect_instance_id = #{inspectInstanceId}</if>
<if test="wfProcessId != null "> and wf_process_id = #{wfProcessId}</if>
<if test="inspectType != null and inspectType != ''"> and inspect_type = #{inspectType}</if>
<if test="billsInspectCode != null and billsInspectCode != ''"> and bills_inspect_code = #{billsInspectCode}</if>
<if test="planBeginTime != null "> and plan_begin_time = #{planBeginTime}</if>
<if test="planEndTime != null "> and plan_end_time = #{planEndTime}</if>
<if test="realBeginTime != null "> and real_begin_time = #{realBeginTime}</if>
<if test="realEndTime != null "> and real_end_time = #{realEndTime}</if>
<if test="planBeginTime != null "> and plan_begin_time > #{planBeginTime}</if>
<if test="planEndTime != null "> and #{planEndTime}>plan_end_time </if>
<if test="realBeginTime != null "> and real_begin_time > #{realBeginTime}</if>
<if test="realEndTime != null "> and #{realEndTime}>real_end_time</if>
<if test="inspectStatus != null and inspectStatus != ''"> and inspect_status = #{inspectStatus}</if>
<if test="isFlag != null and isFlag != ''"> and is_flag = #{isFlag}</if>
</where>

@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectDmsBillsLubeInstanceVo"/>
<where>
<if test="planLubeId != null "> and plan_lube_id = #{planLubeId}</if>
<if test="lubeInstanceId != null "> and lube_instance_id = #{lubeInstanceId}</if>
<if test="billsLubeCode != null and billsLubeCode != ''"> and bills_lube_code = #{billsLubeCode}</if>
<if test="planBeginTime != null "> and plan_begin_time = #{planBeginTime}</if>
<if test="realBeginTime != null "> and real_begin_time = #{realBeginTime}</if>

@ -36,12 +36,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectDmsBillsMaintInstanceVo"/>
<where>
<if test="planMaintId != null "> and plan_maint_id = #{planMaintId}</if>
<if test="maintInstanceId != null "> and maint_instance_id = #{maintInstanceId}</if>
<if test="wfProcessId != null "> and wf_process_id = #{wfProcessId}</if>
<if test="billsMaintCode != null and billsMaintCode != ''"> and bills_maint_code = #{billsMaintCode}</if>
<if test="planBeginTime != null "> and plan_begin_time = #{planBeginTime}</if>
<if test="realBeginTime != null "> and real_begin_time = #{realBeginTime}</if>
<if test="planEndTime != null "> and plan_end_time = #{planEndTime}</if>
<if test="realEndTime != null "> and real_end_time = #{realEndTime}</if>
<if test="billsMaintCode != null and billsMaintCode != ''"> and bills_maint_code like concat('%',#{billsMaintCode},'%') </if>
<if test="planBeginTime != null "> and plan_begin_time > #{planBeginTime}</if>
<if test="planEndTime != null "> and #{planEndTime}>plan_end_time</if>
<if test="realBeginTime != null "> and real_begin_time > #{realBeginTime}</if>
<if test="realEndTime != null "> and #{realEndTime} > real_end_time</if>
<if test="maintStatus != null "> and maint_status = #{maintStatus}</if>
<if test="maintCompRate != null "> and maint_comp_rate = #{maintCompRate}</if>
<if test="isFlag != null "> and is_flag = #{isFlag}</if>

@ -146,4 +146,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectDmsInspectInstanceDetailProjectByInspectInstanceId" parameterType="Long" resultMap="DmsInspectInstanceDetailProjectResult">
select instance_detail_project_id, instance_detail_id, inspect_project_id, inspect_project_status, inspect_project_result, project_step_order, def_value, inspect_project_name, inspect_project_property, up_limit, low_limit, create_by, create_time, update_by, update_time from dms_inspect_instance_detail_project
where instance_detail_id =(
select instance_detail_id from dms_inspect_instance_detail where inspect_instance_id = #{inspectInstanceId} and line_step = #{lineStep})
</select>
</mapper>

@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="inspectStandard" column="inspect_standard" />
<result property="isFlag" column="is_flag" />
<result property="remark" column="remark" />
<result property="deviceName" column="device_name" />
<result property="standardName" column="standard_name" />
</resultMap>
<sql id="selectDmsInspectRouteDetailVo">
@ -77,4 +79,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{routeDetailId}
</foreach>
</delete>
<select id="selectInspectRouteListByInspectRouteId" parameterType="Long" resultMap="DmsInspectRouteDetailResult">
select a.route_detail_id, a.inspect_route_id, a.line_step, a.device_id, a.inspect_standard,
a.is_flag, a.remark,b.device_name,c.standard_name
from dms_inspect_route_detail a
left join dms_base_device_ledger b on a.device_id = b.device_id
left join dms_base_inspect_standard c on a.inspect_standard = c.inspect_standard_id
where a.inspect_route_id = #{inspectRouteId}
</select>
</mapper>

@ -73,4 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
( #{item.instanceFileId}, #{item.targetType}, #{item.targetId}, #{item.filePath})
</foreach>
</insert>
<delete id="deleteDmsInstanceFileByUpdate">
delete from dms_instance_file where target_type = 1 and target_id =#{targetId}
</delete>
</mapper>

@ -17,6 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="deviceName" column="device_name" />
<result property="lubeStationName" column="lube_station_name" />
<result property="lubeStandardCode" column="lube_standard_code" />
</resultMap>
<sql id="selectDmsPlanLubeDetailVo">
@ -98,4 +101,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{planLubeDetailId}
</foreach>
</delete>
<select id="selectPlanLubeDetailByPlanLubeId" parameterType="Long" resultMap="DmsPlanLubeDetailResult">
select a.plan_lube_detail_id, a.plan_lube_id, a.device_id, a.lube_station_id,
a.lube_standard_id, a.operation_description,b.device_name,c.lube_station_name,d.lube_standard_code
from dms_plan_lube_detail a
left join dms_base_device_ledger b on a.device_id = b.device_id
left join dms_base_lube_station c on b.device_type_id = c.device_type_id
left join dms_base_lube_standard d on d.lube_standard_id = a.lube_standard_id
where plan_lube_id = #{planLubeId}
</select>
</mapper>

@ -20,6 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="maintProtocol" column="maint_protocol" />
<result property="maintStationName" column="maint_station_name" />
<result property="maintStationCode" column="maint_station_code" />
<result property="deviceName" column="device_name" />
</resultMap>
<sql id="selectDmsPlanMaintDetailVo">
@ -132,5 +134,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isFlag != null "> and is_flag = #{isFlag}</if>
</where>
</select>
<select id="selectDmsPlanMaintDetailListByPlanMaintId" parameterType="Long" resultMap="DmsPlanMaintDetailResult">
select a.plan_maint_detail_id, a.plan_maint_id, a.device_id, a.maint_station_id,
a.maint_standard_id, a.operation_description,b.device_name,c.maint_station_name,d.maint_protocol
from dms_plan_maint_detail a
left join dms_base_device_ledger b on a.device_id = b.device_id
left join dms_base_maint_station c on b.device_type_id = c.device_type_id
left join dms_base_maint_standard d on a.maint_station_id = d.maint_standard_id
where a.plan_maint_id = #{planMaintId}
</select>
</mapper>

@ -7,7 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="DmsPlanRepairDetail" id="DmsPlanRepairDetailResult">
<result property="planRepairDetailId" column="plan_repair_detail_id" />
<result property="planRepairId" column="plan_repair_id" />
<result property="deviceId" column="device_id" />
<result property="repairDetailTargetType" column="repair_detail_target_type" />
<result property="repairDetailTargetId" column="repair_detail_target_id" />
<result property="faultType" column="fault_type" />
<result property="repairDesc" column="repair_desc" />
<result property="repairProtocol" column="repair_protocol" />
@ -16,17 +17,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="deviceName" column="device_name" />
<result property="planRepairCode" column="plan_repair_code" />
</resultMap>
<sql id="selectDmsPlanRepairDetailVo">
select plan_repair_detail_id, plan_repair_id, device_id, fault_type, repair_desc, repair_protocol, operation_description, create_by, create_time, update_by, update_time from dms_plan_repair_detail
select plan_repair_detail_id, plan_repair_id, repair_detail_target_type, repair_detail_target_id , fault_type, repair_desc, repair_protocol, operation_description, create_by, create_time, update_by, update_time from dms_plan_repair_detail
</sql>
<select id="selectDmsPlanRepairDetailList" parameterType="DmsPlanRepairDetail" resultMap="DmsPlanRepairDetailResult">
<include refid="selectDmsPlanRepairDetailVo"/>
<where>
<if test="planRepairId != null "> and plan_repair_id = #{planRepairId}</if>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="faultType != null and faultType != ''"> and fault_type = #{faultType}</if>
<if test="repairDesc != null and repairDesc != ''"> and repair_desc = #{repairDesc}</if>
<if test="repairProtocol != null and repairProtocol != ''"> and repair_protocol = #{repairProtocol}</if>
@ -43,8 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into dms_plan_repair_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="planRepairId != null">plan_repair_id,</if>
<if test="deviceId != null">device_id,</if>
<if test="faultType != null">fault_type,</if>
<if test="repairDetailTargetType != null">repair_detail_target_type,</if>
<if test="repairDetailTargetId != null">repair_detail_target_id,</if>
<if test="repairDesc != null">repair_desc,</if>
<if test="repairProtocol != null">repair_protocol,</if>
<if test="operationDescription != null">operation_description,</if>
@ -55,8 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="planRepairId != null">#{planRepairId},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="faultType != null">#{faultType},</if>
<if test="repairDetailTargetType != null">#{repairDetailTargetType},</if>
<if test="repairDetailTargetId != null">#{repairDetailTargetId},</if>
<if test="repairDesc != null">#{repairDesc},</if>
<if test="repairProtocol != null">#{repairProtocol},</if>
<if test="operationDescription != null">#{operationDescription},</if>
@ -71,8 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update dms_plan_repair_detail
<trim prefix="SET" suffixOverrides=",">
<if test="planRepairId != null">plan_repair_id = #{planRepairId},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="faultType != null">fault_type = #{faultType},</if>
<if test="repairDetailTargetType != null">repair_detail_target_type = #{repairDetailTargetType},</if>
<if test="repairDetailTargetId != null">repair_detail_target_id = #{repairDetailTargetId},</if>
<if test="repairDesc != null">repair_desc = #{repairDesc},</if>
<if test="repairProtocol != null">repair_protocol = #{repairProtocol},</if>
<if test="operationDescription != null">operation_description = #{operationDescription},</if>
@ -94,4 +99,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{planRepairDetailId}
</foreach>
</delete>
<select id="selectPlanRepairDetailByPlanRepairId" parameterType="Long" resultMap="DmsPlanRepairDetailResult">
select a.plan_repair_detail_id, a.plan_repair_id, a.repair_detail_target_type,
a.repair_detail_target_id , a.fault_type,a.repair_desc, a.repair_protocol,
a.operation_description,b.device_name,c.plan_repair_code
from dms_plan_repair_detail a
left join dms_base_device_ledger b on a.repair_detail_target_id = b.device_id
left join dms_plan_repair c on c.plan_repair_id = a.plan_repair_id
where a.plan_repair_id = #{planReapirId}
</select>
</mapper>

@ -31,7 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="DmsPlanRepairDetail" id="DmsPlanRepairDetailResult">
<result property="planRepairDetailId" column="sub_plan_repair_detail_id" />
<result property="planRepairId" column="sub_plan_repair_id" />
<result property="deviceId" column="sub_device_id" />
<result property="repairDetailTargetType" column="repair_detail_target_type" />
<result property="repairDetailTargetId" column="repair_detail_target_id" />
<result property="faultType" column="sub_fault_type" />
<result property="repairDesc" column="sub_repair_desc" />
<result property="repairProtocol" column="sub_repair_protocol" />
@ -62,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDmsPlanRepairByPlanRepairId" parameterType="Long" resultMap="DmsPlanRepairDmsPlanRepairDetailResult">
select a.plan_repair_id, a.plan_repair_code, a.repair_type, a.repair_group, a.repair_supervisor, a.repair_time, a.cycle_period, a.create_method, a.is_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time,a.time_limit,
b.plan_repair_detail_id as sub_plan_repair_detail_id, b.plan_repair_id as sub_plan_repair_id, b.repair_detail_target_type as sub_repair_detail_target_type,b.repair_detail_target_id as sub_device_id, b.fault_type as sub_fault_type, b.repair_desc as sub_repair_desc, b.repair_protocol as sub_repair_protocol, b.operation_description as sub_operation_description, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time
b.plan_repair_detail_id as sub_plan_repair_detail_id, b.plan_repair_id as sub_plan_repair_id, b.repair_detail_target_type as sub_repair_detail_target_type,b.repair_detail_target_id as repair_detail_target_id, b.fault_type as sub_fault_type, b.repair_desc as sub_repair_desc, b.repair_protocol as sub_repair_protocol, b.operation_description as sub_operation_description, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time
from dms_plan_repair a
left join dms_plan_repair_detail b on b.plan_repair_id = a.plan_repair_id
where a.plan_repair_id = #{planRepairId}

@ -17,6 +17,15 @@ export function getDmsBillsMaintInstance(maintInstanceId) {
})
}
// //根据计划id查询润滑计划明细
export function selectPlanMaintDetailByPlanMaintId(planMaintId) {
// alert(planLubeId)
return request({
url:`/dms/maintDetail/getDmsPlanMaintDetail/${planMaintId}`,
method:'get'
})
}
// 新增保养工单
export function addDmsBillsMaintInstance(data) {
return request({

@ -42,3 +42,10 @@ export function delDmsInspectRouteDetail(routeDetailId) {
method: 'delete'
})
}
//通过线路id查询明细列表
export function selectInspectRouteListByInspectRouteId(inspectRouteId){
return request({
url:`/dms/dmsInspectRouteDetail/selectInspectRouteListByInspectRouteId/${inspectRouteId}`,
method:'get',
})
}

@ -17,6 +17,21 @@ export function getDmsPlanLubeDetail(planLubeDetailId) {
})
}
// //根据计划id查询润滑计划明细
// export function selectPlanLubeDetailByPlanLubeId(planLubeId){
// return request({
// url:`/dms/dmsPlanLubeDetail/getDmsPlanDetailByPlanLubeId/${planLubeId}`,
// method: 'get',
// })
// }
export function selectPlanLubeDetailByPlanLubeId(planLubeId) {
// alert(planLubeId)
return request({
url:`/dms/dmsPlanLubeDetail/getDmsPlanDetailByPlanLubeId/${planLubeId}`,
method:'get'
})
}
// 新增润滑计划明细
export function addDmsPlanLubeDetail(data) {
return request({
@ -73,3 +88,4 @@ export function getBaseDeviceLedgers(query) {
params: query
})
}

@ -42,3 +42,11 @@ export function delDmsRepairDetail(planRepairDetailId) {
method: 'delete'
})
}
//根据计划id查询计划明细列表
export function selectPlanRepairDetailByPlanRepairId(planRepairId) {
return request({
url:`/dms/dmsRepairDetail/selectPlanRepairDetailByPlanRepairId/${planRepairId}`,
method:'get'
})
}

@ -0,0 +1,52 @@
import request from '@/utils/request'
// 查询点巡检工单明细项目信息;质检检查每个项目的质检结果详情列表
export function listInspectinstancedetailproject(query) {
return request({
url: '/dms/inspectinstancedetailproject/list',
method: 'get',
params: query
})
}
// 查询点巡检工单明细项目信息;质检检查每个项目的质检结果详情详细
export function getInspectinstancedetailproject(instanceDetailProjectId) {
return request({
url: '/dms/inspectinstancedetailproject/' + instanceDetailProjectId,
method: 'get'
})
}
// 新增点巡检工单明细项目信息;质检检查每个项目的质检结果详情
export function addInspectinstancedetailproject(data) {
return request({
url: '/dms/inspectinstancedetailproject',
method: 'post',
data: data
})
}
// 修改点巡检工单明细项目信息;质检检查每个项目的质检结果详情
export function updateInspectinstancedetailproject(data) {
return request({
url: '/dms/inspectinstancedetailproject',
method: 'put',
data: data
})
}
// 删除点巡检工单明细项目信息;质检检查每个项目的质检结果详情
export function delInspectinstancedetailproject(instanceDetailProjectId) {
return request({
url: '/dms/inspectinstancedetailproject/' + instanceDetailProjectId,
method: 'delete'
})
}
//根据计划id查询计划明细列表
export function selectDmsInspectInstanceDetailProjectByInspectInstanceId(inspectInstanceId,lineStep) {
return request({
url:`/dms/inspectinstancedetailproject/selectDmsInspectInstanceDetailProjectByInspectInstanceId/${inspectInstanceId}/${lineStep}`,
method:'get'
})
}

@ -10,7 +10,7 @@
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="报修来源" >
<el-input v-model="this.dmsBillsFaultInstanceList[0].faultSourceType" disabled />
<el-input v-model="this.faultSourceTypeCheck" disabled />
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
@ -50,7 +50,7 @@
<el-col :span="8" >
<el-form-item label="故障类型" prop="faultType">
<!-- <el-input v-model="form.faultType" placeholder="" :disabled="true"/>-->
<el-select v-model="form.faultType" placeholder="故障类型" :disabled="true">
<el-select v-model="form.faultType" placeholder="" :disabled="true">
<el-option
v-for="item in dict.type.dms_fault_type"
:key="item.value"
@ -63,7 +63,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="故障描述" prop="faultDescription">
<el-input v-model="form.faultDescription" placeholder="故障描述" :disabled=true />
<el-input v-model="form.faultDescription" placeholder="" :disabled=true />
</el-form-item>
</el-col>
<el-col :span="8">
@ -73,7 +73,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="设备名称" prop="deviceId">
<el-select v-model="form.deviceId" placeholder="设备名称" :disabled=true >
<el-select v-model="form.deviceId" placeholder="" :disabled=true >
<el-option
v-for="item in ledgerList"
:key="item.deviceId"
@ -106,7 +106,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="外协单位" prop="outsrcId">
<el-select v-model="form.outsrcId" placeholder="外协单位" :disabled=true>
<el-select v-model="form.outsrcId" placeholder="" :disabled=true>
<el-option
v-for="item in dmsInfoList"
:key="item.outsrcId"
@ -130,7 +130,7 @@
<h4 class="form-header h4">{{activity.processActivityName}}</h4>
<el-col :span="8">
<el-form-item label="故障类型" prop="faultType">
<el-select v-model="activity.faultType" placeholder="故障类型" :disabled="true">
<el-select v-model="activity.faultType" placeholder="" :disabled="true">
<el-option
v-bind:disabled="activity.processStepOrder!=activityList.length+1"
v-for="item in dict.type.dms_fault_type"
@ -158,7 +158,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="设备名称" prop="deviceId">
<el-select v-model="activity.deviceId" placeholder="设备名称" :disabled=true >
<el-select v-model="activity.deviceId" placeholder="" :disabled=true >
<el-option
v-bind:disabled="activity.processStepOrder!=activityList.length+1"
v-for="item in ledgerList"
@ -187,7 +187,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="外协单位" prop="outsrcId">
<el-select v-model="activity.outsrcId" placeholder="外协单位" :disabled=true>
<el-select v-model="activity.outsrcId" placeholder="" :disabled=true>
<el-option
v-bind:disabled="activity.processStepOrder!=activityList.length+1"
v-for="item in dmsInfoList"
@ -319,9 +319,11 @@ import { listDmsInfo } from '@/api/dms/dmsInfo'
export default {
name: "Activity",
dicts:['dms_fault_type','dms_repair_type','dms_bills_status','dms_inspect_type'],
dicts:['dms_fault_type','dms_repair_type','dms_bills_status','dms_inspect_type','dms_fault_source_type'],
data() {
return {
//
faultSourceTypeCheck:"",
//
dmsInfoList:[],
//
@ -459,6 +461,11 @@ export default {
this.dmsBillsFaultInstanceList = response.rows;
console.log(this.dmsBillsFaultInstanceList)
//0/1label
for (let i = 0; i < this.dict.type.dms_fault_source_type.length;i++){
if (this.dmsBillsFaultInstanceList[0].faultSourceType==i){
this.faultSourceTypeCheck = this.dict.type.dms_fault_source_type[i].label;
}
}
for (let i = 0; i < this.dict.type.dms_bills_status.length;i++){
if (this.dmsBillsInstanceList[0].inspectStatus==i){
this.billsStatusCheck = this.dict.type.dms_bills_status[i].label;

@ -371,6 +371,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.isDis = false;
this.open = true;
this.title = "添加设备盘点明细";
},

@ -399,7 +399,7 @@ export default {
isShow3:false,
isShow9:false,
isShowOut:false,
imgAddress:"",
imgAddress:[],
//
dmsInfoList:[],
//
@ -525,10 +525,13 @@ export default {
let currentFile = { name: '', url: '' };
currentFile.name = file.name;
currentFile.url = imgObjectUrl;
this.imgAddress = res.data.url;
this.imgAddress.push(res.data.url);
//
this.fileListPut.push(currentFile);
console.log(this.fileListPut)
},
getJump(row){
this.$router.push('/dms/activity/index/'+row.repairInstanceId)
},
@ -560,20 +563,26 @@ export default {
this.isShow2=false
this.isShow3=false
this.isShow9=false
this.form.faultSourceId=null
}else if (this.form.faultSourceType==2){
this.isShow1=false
this.isShow2=true
this.isShow1=false
this.isShow3=false
this.isShow9=false
this.form.faultSourceId=null
}else if (this.form.faultSourceType==3){
this.isShow3=true
this.isShow1=false
this.isShow2=false
this.isShow3=true
this.isShow9=false
this.form.faultSourceId=null
}else if (this.form.faultSourceType==9){
this.isShow1=false
this.isShow2=false
this.isShow3=false
this.form.faultSourceId=null
this.isShow9=true
}
@ -673,7 +682,9 @@ export default {
const repairInstanceId = row.repairInstanceId || this.ids
getDmsBillsFaultInstance(repairInstanceId).then(response => {
this.form = response.data;
this.fileListShow = response.data.sysFiles
this.fileListShow = response.data.dmsInstanceFiles
// this.fileListShow = response.data.sysFiles
console.log(this.fileListShow)
this.open = true;
this.title = "修改报修工单";
});
@ -691,7 +702,7 @@ export default {
} else {
this.form.wfProcessId = 102;
this.form.isFlag = 1;
this.form.imgUrl = this.imgAddress;
this.form.fileUrls = this.imgAddress;
alert(this.imgAddress)
addDmsBillsFaultInstance(this.form).then(response => {
this.$modal.msgSuccess("新增成功");

@ -8,11 +8,11 @@
<el-input v-model="this.dmsBillsInstanceList[0].billsInspectCode" disabled />
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="当前流程" >
<el-input v-model="this.dmsBillsInstanceList[0].wfProcessId" disabled />
</el-form-item>
</el-col>
<!-- <el-col :span="8" :offset="2">-->
<!-- <el-form-item label="当前流程" >-->
<!-- <el-input v-model="this.dmsBillsInstanceList[0].wfProcessId" disabled />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8" :offset="2">
<el-form-item label="工单状态" >
<el-input v-model="this.billsStatusCheck" disabled />
@ -159,6 +159,30 @@
</div>
</el-form>
</el-form>
<!--润滑计划明细列表-->
<h4 class="form-header h4" align="center">点巡检线路详细信息</h4>
<!-- 从这里 点击跳转通过巡检步骤与设备id查询出点巡检工单明细的主键 将主键传入后台
通过主键查询点巡检工单明细项目信息的列表将列表返回到新的页面
-->
<el-table v-loading="loading" :data="this.inspectRouteLists" >
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="巡检步骤" align="center" prop="lineStep" />
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="巡检标准" align="center" prop="standardName" />
<el-table-column label="操作描述" align="center" prop="operationDescription" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
style="float: none"
size="mini"
type="text"
icon="el-icon-bell"
@click="getJump(scope.row)"
v-hasPermi="['dms:dmsInspectRouteDetail:edit']"
>查看详情</el-button>
</template>
</el-table-column>
</el-table>
@ -173,12 +197,19 @@ import { listWfprocessactivity } from '@/api/system/common/wfprocessactivity'
import { listDmsBillsInstance } from '@/api/dms/dmsBillsInstance'
import { listDmsBaseInspectRoute } from '@/api/dms/dmsBaseInspectRoute'
import {selectUserIdByInspectInstanceId} from '@/api/dms/dmsBillsInspectActivity'
import { selectInspectRouteListByInspectRouteId} from '@/api/dms/dmsInspectRouteDetail'
export default {
name: "DmsBillsInspectActivity",
dicts:['dms_bills_status','dms_instance_type','dms_repair_type','dms_inspect_type'],
dicts:['dms_inspect_status','dms_instance_type','dms_repair_type','dms_inspect_type'],
data() {
return {
//id
inspectInstanceId:"",
//线
inspectRouteLists:[],
//线id
selectInspectRouteId:"",
queryParamWfProcessActivity:{
wfProcessId:null,
},
@ -249,6 +280,7 @@ export default {
created() {
const inspectInstanceId = this.$route.params && this.$route.params.inspectInstanceId;
this.form.inspectInstanceId = inspectInstanceId;
this.inspectInstanceId = inspectInstanceId;
this.queryParams.inspectInstanceId = inspectInstanceId;
this.queryParamWfProcessActivity.wfProcessId = 105;
let flag=1;
@ -270,16 +302,24 @@ export default {
this.getWfprocessActivity();
},
methods: {
getJump(row){
// alert(row)
row.inspectInstanceId =this.inspectInstanceId;
console.log(row)
this.$router.push({path:'/dms/inspect/dmsInspectInstanceDetailProject',query:{inspectInstanceId:row.inspectInstanceId,lineStep:row.lineStep}})
},
getselectUserIdByInspectInstanceId(){
if (this.nowPorcessStepOrder==this.wfProcessActivityList.length){
selectUserIdByInspectInstanceId(this.form.inspectInstanceId,this.$store.state.user.id).then(response=>{
console.log(response)
console.log("=========================================================")
if (response == false) {
alert("无权限")
this.$store.dispatch("tagsView/delView",this.$route)
this.$router.replace({path:"/dms/planRepair/dmsBillsInstance"})
this.$router.replace({path:"/dms/inspect/dmsBillsInstance"})
}
})
},
}},
getRoute() {
listDmsBaseInspectRoute(this.queryParams).then(response => {
this.dmsBaseInspectRouteList = response.rows;
@ -290,10 +330,11 @@ export default {
this.loading = true;
listDmsBillsInstance(this.queryParams).then(response => {
this.dmsBillsInstanceList = response.rows;
// this.
//0/1label
for (let i = 0; i < this.dict.type.dms_bills_status.length;i++){
for (let i = 0; i < this.dict.type.dms_inspect_status.length;i++){
if (this.dmsBillsInstanceList[0].inspectStatus==i){
this.billsStatusCheck = this.dict.type.dms_bills_status[i].label;
this.billsStatusCheck = this.dict.type.dms_inspect_status[i].label;
}
}
for (let j = 0; j < this.dict.type.dms_inspect_type.length;j++){
@ -319,14 +360,27 @@ export default {
}
}
}
this.loading = false;
})
},
/** 通过线路id查询线路明细信息*/
// inspectRouteLists
getInspectRouteLists(){
selectInspectRouteListByInspectRouteId(this.selectInspectRouteId).then(response=>{
this.inspectRouteLists = response.rows
this.loading = false;
})
},
/** 查询点巡检工单实例节点列表 */
getList() {
this.loading = true;
listDmsBillsInspectActivity(this.queryParams).then(response => {
this.dmsBillsInspectActivityList = response.rows;
this.selectInspectRouteId = response.rows[0].inspectRouteId;
console.log("=========================================================")
console.log(this.selectInspectRouteId)
this.getInspectRouteLists();
// console.log(this.dmsBillsInspectActivityList)
this.total = response.total;
this.form.inspectRouteId = this.dmsBillsInspectActivityList[0].inspectRouteId;
@ -340,10 +394,10 @@ export default {
listWfprocessactivity(this.queryParamWfProcessActivity).then(response=>{
this.wfProcessActivityList = response.rows;
this.getselectUserIdByInspectInstanceId();
}),
})
this.loading = false;
});
},
//

@ -1,86 +1,55 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="计划ID,关联dms_plan_inspect的plan_inspect_id" prop="planInspectId">
<el-form-item label="计划ID" prop="planInspectId">
<el-input
v-model="queryParams.planInspectId"
placeholder="请输入计划ID,关联dms_plan_inspect的plan_inspect_id"
placeholder="请输入计划"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工单流程ID关联wf_process的wf_process_id" prop="wfProcessId">
<el-input
v-model="queryParams.wfProcessId"
placeholder="请输入工单流程ID关联wf_process的wf_process_id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="巡检编号" prop="billsInspectCode">
<el-input
v-model="queryParams.billsInspectCode"
placeholder="请输入巡检编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="巡检线路,关联dms_base_inspect_route的inspect_route_id" prop="inspectRouteId">
<el-input
v-model="queryParams.inspectRouteId"
placeholder="请输入巡检线路,关联dms_base_inspect_route的inspect_route_id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备总数" prop="deviceAmount">
<el-input
v-model="queryParams.deviceAmount"
placeholder="请输入设备总数"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="计划巡检时间" prop="planTime">
<!-- <el-form-item label="巡检线路" prop="inspectRouteId">-->
<!-- <el-input-->
<!-- v-model="queryParams.inspectRouteId"-->
<!-- placeholder="请输入巡检线路"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="计划时间" prop="planBeginTime">
<el-date-picker clearable
v-model="queryParams.planTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择计划巡检时间">
v-model="queryParams.planBeginTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择实际开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="实际开始时间" prop="realBeginTime">
<el-form-item><div>-</div></el-form-item>
<el-form-item label="" prop="planEndTime">
<el-date-picker clearable
v-model="queryParams.realBeginTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择实际开始时间">
v-model="queryParams.planEndTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择实际结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="实际结束时间" prop="realEndTime">
<el-date-picker clearable
v-model="queryParams.realEndTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择实际结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="执行人员" prop="performer">
<el-input
v-model="queryParams.performer"
placeholder="请输入执行人员"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否标识1-是0-否" prop="isFlag">
<el-input
v-model="queryParams.isFlag"
placeholder="请输入是否标识1-是0-否"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="实际开始时间" prop="realBeginTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.realBeginTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择实际开始时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="-" prop="realEndTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.realEndTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择实际结束时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
@ -178,8 +147,11 @@
</template>
</el-table-column>
<el-table-column label="执行人员" align="center" prop="performer" />
<el-table-column label="巡检状态1-待巡检2-巡检中3-完成" align="center" prop="inspectStatus" />
<el-table-column label="是否标识1-是0-否" align="center" prop="isFlag" />
<el-table-column label="巡检状态" align="center" prop="inspectStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.dms_inspect_status" :value="scope.row.inspectStatus"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@ -302,7 +274,7 @@ import { listDmsPlanInspect} from '@/api/dms/dmsPlanInspect'
export default {
name: "DmsBillsInstance",
dicts:['dms_inspect_type'],
dicts:['dms_inspect_type','dms_inspect_status'],
data() {
return {
dmsRepairList:[],

@ -8,11 +8,11 @@
<el-input v-model="this.dmsBillsLubeInstanceList[0].billsLubeCode" disabled />
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="当前流程" >
<el-input v-model="this.dmsBillsLubeInstanceList[0].wfProcessId" disabled />
</el-form-item>
</el-col>
<!-- <el-col :span="8" :offset="2">-->
<!-- <el-form-item label="当前流程" >-->
<!-- <el-input v-model="this.dmsBillsLubeInstanceList[0].wfProcessId" disabled />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8" :offset="2">
<el-form-item label="工单状态" >
<el-input v-model="this.billsStatusCheck" disabled />
@ -20,19 +20,19 @@
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="申请人" >
<el-input v-model="this.dmsBillsLubeInstanceList[0].applyBy" disabled />
<el-input v-model="this.dmsBillsLubeInstanceList[0].createBy" disabled />
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="申请时间" >
<el-input v-model="this.dmsBillsLubeInstanceList[0].applyTime" disabled />
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="工单类型" >
<el-input v-model="this.instanceTypeCheck" disabled />
<el-input v-model="this.dmsBillsLubeInstanceList[0].createTime" disabled />
</el-form-item>
</el-col>
<!-- <el-col :span="8" :offset="2">-->
<!-- <el-form-item label="工单类型" >-->
<!-- <el-input v-model="this.instanceTypeCheck" disabled />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="16" :offset="2">
<el-form-item label="备注" >
<el-input v-model="this.dmsBillsLubeInstanceList[0].remark" disabled />
@ -202,8 +202,19 @@
</div>
</el-form>
</el-row>
<!--润滑计划明细列表-->
<h4 class="form-header h4" align="center">润滑计划详细信息</h4>
<el-table v-loading="loading" :data="this.planLubeDetail" >
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="计划ID" align="center" prop="planLubeId" />
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="润滑部位" align="center" prop="lubeStationName" />
<el-table-column label="润滑标准" align="center" prop="lubeStandardCode" />
<el-table-column label="操作描述" align="center" prop="operationDescription" />
</el-table>
@ -217,12 +228,15 @@ import { listDmsBillsLubeInstanceActivity, getDmsBillsLubeInstanceActivity, delD
import { listWfprocessactivity } from '@/api/system/common/wfprocessactivity'
import { listDmsBillsLubeInstance } from '@/api/dms/dmsBillsLubeInstance'
import { selectUserIdByDmsBillsLubeInstanceActivityId } from '@/api/dms/dmsBillsLubeInstanceActivity'
import { selectPlanLubeDetailByPlanLubeId} from '@/api/dms/dmsPlanLubeDetail'
export default {
name: "DmsBillsLubeInstanceActivity",
dicts:['dms_bills_status','dms_instance_type','dms_repair_type','dms_lube_level'],
dicts:['dms_lube_status','dms_instance_type','dms_repair_type','dms_lube_level'],
data() {
return {
planLubeDetail:[],
planLubeId:"",
lubeInstanceIdCheck:"",
nowPorcessStepOrder:"",
isUpdate:"",
@ -274,6 +288,9 @@ export default {
queryParamWfProcessActivity:{
wfProcessId:null,
},
// queryParamDetail:{
// lubeInstanceId: null,
// },
//
form: {},
form1: {},
@ -293,10 +310,13 @@ export default {
this.lubeInstanceIdCheck = lubeInstanceIdCheck;
this.form.lubeInstanceId = lubeInstanceIdCheck;
this.queryParams.lubeInstanceId = lubeInstanceIdCheck;
// alert(this.queryParams.lubeInstanceId)
// this.queryParamDetail.lubeInstanceId = lubeInstanceIdCheck;
this.queryParamWfProcessActivity.wfProcessId = 106;
this.getWfprocessActivity();
this.getDmsBillsLubeInstance();
this.getList();
// this.selectDmsBillsLubeDetail();
if(this.$route.name == "childDmsBillsLubeInstanceActivity"){
this.isUpdate = true;
}
@ -307,6 +327,7 @@ export default {
console.log(this.form)
},
methods: {
getselectUserIdByRepairInstanceId(){
// alert(this.wfProcessActivityList.length)
// alert(this.nowPorcessStepOrder)
@ -314,6 +335,7 @@ export default {
// alert("??????????")
selectUserIdByDmsBillsLubeInstanceActivityId(this.lubeInstanceIdCheck,this.$store.state.user.id).then(response=>{
console.log(response)
alert(response)
if (response == false) {
alert("无权限")
@ -324,23 +346,39 @@ export default {
}
},
/** 查询润滑工单明细*/
selectDmsBillsLubeDetail(){
selectPlanLubeDetailByPlanLubeId(this.planLubeId).then(response=>{
console.log("===================================================================================")
console.log(response)
this.planLubeDetail = response.rows;
console.log("===================================================================================")
this.loading = false
})
},
/** 查询润滑工单*/
getDmsBillsLubeInstance() {
listDmsBillsLubeInstance(this.queryParams).then(response => {
this.dmsBillsLubeInstanceList = response.rows;
for (let i = 0; i < this.dict.type.dms_bills_status.length;i++){
if (this.dmsBillsLubeInstanceList[0].billsStatus==i){
this.billsStatusCheck = this.dict.type.dms_bills_status[i].label;
}
}
for (let j = 0; j < this.dict.type.dms_instance_type.length;j++){
//dms_instance_type0==j+1
if (this.dmsBillsLubeInstanceList[0].instanceType==j+1){
console.log(this.dmsBillsLubeInstanceList)
this.instanceTypeCheck = this.dict.type.dms_instance_type[j].label;
console.log(this.instanceTypeCheck)
this.planLubeId = response.rows[0].planLubeId;
console.log(this.planLubeId)
// alert(this.response.rows[0].planLubeId)
this.selectDmsBillsLubeDetail();
for (let i = 0; i < this.dict.type.dms_lube_status.length;i++){
if (this.dmsBillsLubeInstanceList[0].lubeStatus==i){
this.billsStatusCheck = this.dict.type.dms_lube_status[i].label;
}
}
// for (let j = 0; j < this.dict.type.dms_instance_type.length;j++){
// //dms_instance_type0==j+1
// if (this.dmsBillsLubeInstanceList[0].instanceType==j+1){
// console.log(this.dmsBillsLubeInstanceList)
// this.instanceTypeCheck = this.dict.type.dms_instance_type[j].label;
// console.log(this.instanceTypeCheck)
// }
// }
this.getWfprocessActivity();
});
},

@ -1,22 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="保养计划ID,关联dms_plan_maint的plan_maint_id" prop="planMaintId">
<el-input
v-model="queryParams.planMaintId"
placeholder="请输入保养计划ID,关联dms_plan_maint的plan_maint_id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工单流程ID关联wf_process的wf_process_id" prop="wfProcessId">
<el-input
v-model="queryParams.wfProcessId"
placeholder="请输入工单流程ID关联wf_process的wf_process_id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="保养单号" prop="billsMaintCode">
<el-input
v-model="queryParams.billsMaintCode"
@ -33,46 +17,16 @@
placeholder="请选择计划保养时间">
</el-date-picker>
</el-form-item>
<el-form-item label="实际开始时间" prop="realBeginTime">
<el-date-picker clearable
v-model="queryParams.realBeginTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择实际开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="计划完成时间;根据计划的时限计算" prop="planEndTime">
<el-form-item> - </el-form-item>
<el-form-item label="" prop="planEndTime">
<el-date-picker clearable
v-model="queryParams.planEndTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择计划完成时间;根据计划的时限计算">
placeholder="请选择计划完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="实际完成时间" prop="realEndTime">
<el-date-picker clearable
v-model="queryParams.realEndTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择实际完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="保养完成率" prop="maintCompRate">
<el-input
v-model="queryParams.maintCompRate"
placeholder="请输入保养完成率"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否标识1-是2-否" prop="isFlag">
<el-input
v-model="queryParams.isFlag"
placeholder="请输入是否标识1-是2-否"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
@ -127,9 +81,9 @@
<el-table v-loading="loading" :data="dmsBillsMaintInstanceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="maintInstanceId" />
<el-table-column label="保养计划ID,关联dms_plan_maint的plan_maint_id" align="center" prop="planMaintId" />
<el-table-column label="工单流程ID关联wf_process的wf_process_id" align="center" prop="wfProcessId" />
<!-- <el-table-column label="主键标识" align="center" prop="maintInstanceId" />-->
<!-- <el-table-column label="保养计划ID,关联dms_plan_maint的plan_maint_id" align="center" prop="planMaintId" />-->
<!-- <el-table-column label="工单流程ID关联wf_process的wf_process_id" align="center" prop="wfProcessId" />-->
<el-table-column label="保养单号" align="center" prop="billsMaintCode" />
<el-table-column label="计划保养时间" align="center" prop="planBeginTime" width="180">
<template slot-scope="scope">
@ -141,7 +95,7 @@
<span>{{ parseTime(scope.row.realBeginTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="计划完成时间;根据计划的时限计算" align="center" prop="planEndTime" width="180">
<el-table-column label="计划完成时间" align="center" prop="planEndTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>
</template>
@ -151,9 +105,14 @@
<span>{{ parseTime(scope.row.realEndTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="保养状态1-待保养2-保养中3-已完成" align="center" prop="maintStatus" />
<!-- <el-table-column label="保养状态1-待保养2-保养中3-已完成" align="center" prop="maintStatus" />-->
<el-table-column label="保养状态" align="center" prop="inspectStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.dms_maint_status" :value="scope.row.maintStatus"/>
</template>
</el-table-column>
<el-table-column label="保养完成率" align="center" prop="maintCompRate" />
<el-table-column label="是否标识1-是2-否" align="center" prop="isFlag" />
<!-- <el-table-column label="是否标识1-是2-否" align="center" prop="isFlag" />-->
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@ -228,7 +187,7 @@ import { listMaint } from '@/api/dms/maint'
export default {
name: "DmsBillsMaintInstance",
dicts:['dms_maint_level'],
dicts:['dms_maint_level','dms_maint_status'],
data() {
return {
//

@ -0,0 +1,258 @@
<template>
<div class="app-container">
<el-table v-loading="loading" :data="inspectinstancedetailprojectList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- <el-table-column label="项目信息ID" align="center" prop="instanceDetailProjectId" />-->
<el-table-column label="巡检项目名称" align="center" prop="inspectProjectName" />
<!-- <el-table-column label="点巡检工单明细ID" align="center" prop="instanceDetailId" />-->
<!-- <el-table-column label="巡检项目ID关联dms_base_inspect_project主键" align="center" prop="inspectProjectId" />-->
<!-- <el-table-column label="巡检结果(1正常,0异常)" align="center" prop="inspectProjectStatus" />-->
<el-table-column label="巡检结果" align="center" prop="repairType">
<template slot-scope="scope">
<dict-tag :options="dict.type.inspect_project_status" :value="scope.row.inspectProjectStatus"/>
</template>
</el-table-column>
<el-table-column label="巡检值" align="center" prop="inspectProjectResult" />
<el-table-column label="巡检顺序" align="center" prop="projectStepOrder" />
<el-table-column label="标准值" align="center" prop="standardValue" />
<!-- <el-table-column label="巡检项目属性(1定性,2定量),冗余字段" align="center" prop="inspectProjectProperty" />-->
<el-table-column label="巡检项目属性" align="center" prop="inspectProjectProperty">
<template slot-scope="scope">
<dict-tag :options="dict.type.inspect_check_project_property" :value="scope.row.inspectProjectProperty"/>
</template>
</el-table-column>
<el-table-column label="上差值" align="center" prop="upLimit" />
<el-table-column label="下差值" align="center" prop="lowLimit" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['dms:inspectinstancedetailproject:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['dms:inspectinstancedetailproject:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改点巡检工单明细项目信息;质检检查每个项目的质检结果详情对话框 -->
<!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>-->
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
<!-- <el-form-item label="点巡检工单明细ID关联dms_inspect_instance_detail主键" prop="instanceDetailId">-->
<!-- <el-input v-model="form.instanceDetailId" placeholder="请输入点巡检工单明细ID关联dms_inspect_instance_detail主键" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="巡检项目ID关联dms_base_inspect_project主键" prop="inspectProjectId">-->
<!-- <el-input v-model="form.inspectProjectId" placeholder="请输入巡检项目ID关联dms_base_inspect_project主键" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="巡检结果,具体值" prop="inspectProjectResult">-->
<!-- <el-input v-model="form.inspectProjectResult" placeholder="请输入巡检结果,具体值" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="巡检顺序" prop="projectStepOrder">-->
<!-- <el-input v-model="form.projectStepOrder" placeholder="请输入巡检顺序" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="标准值" prop="standardValue">-->
<!-- <el-input v-model="form.standardValue" placeholder="请输入标准值" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="巡检项目名称" prop="inspectProjectName">-->
<!-- <el-input v-model="form.inspectProjectName" placeholder="请输入巡检项目名称" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="巡检项目属性(1定性,2定量),冗余字段" prop="checkProjectProperty">-->
<!-- <el-input v-model="form.checkProjectProperty" placeholder="请输入巡检项目属性(1定性,2定量),冗余字段" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="上差值,检验时从检验项目复制过来的值" prop="upLimit">-->
<!-- <el-input v-model="form.upLimit" placeholder="请输入上差值,检验时从检验项目复制过来的值" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="下差值,检验时从检验项目复制过来的值" prop="lowLimit">-->
<!-- <el-input v-model="form.lowLimit" placeholder="请输入下差值,检验时从检验项目复制过来的值" />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitForm"> </el-button>-->
<!-- <el-button @click="cancel"> </el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
</div>
</template>
<script>
import { listInspectinstancedetailproject, getInspectinstancedetailproject, delInspectinstancedetailproject, addInspectinstancedetailproject, updateInspectinstancedetailproject ,selectDmsInspectInstanceDetailProjectByInspectInstanceId } from "@/api/dms/inspectinstancedetailproject";
export default {
name: "Inspectinstancedetailproject",
dicts:['inspect_project_status','inspect_check_project_property'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// ;
inspectinstancedetailprojectList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
instanceDetailId: null,
inspectProjectId: null,
inspectProjectStatus: null,
inspectProjectResult: null,
projectStepOrder: null,
standardValue: null,
inspectProjectName: null,
checkProjectProperty: null,
upLimit: null,
lowLimit: null,
},
//
form: {},
//
rules: {
instanceDetailId: [
{ required: true, message: "点巡检工单明细ID关联dms_inspect_instance_detail主键不能为空", trigger: "blur" }
],
}
};
},
created() {
console.log(this.$route.query)
// this.getInspectInstanceDetails();
this.getList();
},
methods: {
/** 查询点巡检工单明细项目信息;质检检查每个项目的质检结果详情列表 */
getList() {
this.loading = true;
selectDmsInspectInstanceDetailProjectByInspectInstanceId(this.$route.query.inspectInstanceId,this.$route.query.lineStep).
then(response=>{
console.log(response)
this.inspectinstancedetailprojectList = response.rows;
this.total = response.total;
this.loading = false;
})
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
instanceDetailProjectId: null,
instanceDetailId: null,
inspectProjectId: null,
inspectProjectStatus: null,
inspectProjectResult: null,
projectStepOrder: null,
standardValue: null,
inspectProjectName: null,
checkProjectProperty: null,
upLimit: null,
lowLimit: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.instanceDetailProjectId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加点巡检工单明细项目信息;质检检查每个项目的质检结果详情";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const instanceDetailProjectId = row.instanceDetailProjectId || this.ids
getInspectinstancedetailproject(instanceDetailProjectId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改点巡检工单明细项目信息;质检检查每个项目的质检结果详情";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.instanceDetailProjectId != null) {
updateInspectinstancedetailproject(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addInspectinstancedetailproject(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const instanceDetailProjectIds = row.instanceDetailProjectId || this.ids;
this.$modal.confirm('是否确认删除点巡检工单明细项目信息;质检检查每个项目的质检结果详情编号为"' + instanceDetailProjectIds + '"的数据项?').then(function() {
return delInspectinstancedetailproject(instanceDetailProjectIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('dms/inspectinstancedetailproject/export', {
...this.queryParams
}, `inspectinstancedetailproject_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -144,7 +144,19 @@
</template>
</el-table-column>
<!-- <el-table-column label="巡检设备ID关联dms_base_device_ledger的device_id" align="center" prop="deviceId" />-->
<el-table-column label="巡检标准" align="center" prop="inspectStandard" />
<!-- <el-table-column label="巡检标准" align="center" prop="inspectStandard" />-->
<el-table-column label="巡检标准" align="center" prop="inspectStandard" >
<template slot-scope="scope">
<span
v-for="(item, index) in dmsBaseInspectStandardList"
:key="index"
:value="item.dmsBaseInspectRouteList"
v-if="scope.row.inspectStandard == item.inspectStandardId"
>
{{ item.standardName }}
</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<!-- <el-table-column label="是否标识1-是0-否" align="center" prop="isFlag" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -204,8 +216,18 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="巡检标准" prop="inspectStandard">
<el-input v-model="form.inspectStandard" placeholder="请输入巡检标准" />
<!-- <el-form-item label="巡检标准" prop="inspectStandard">-->
<!-- <el-input v-model="form.inspectStandard" placeholder="请输入巡检标准" />-->
<!-- </el-form-item>-->
<el-form-item label="巡检标准" prop="inspectStandard" >
<el-select v-model="form.inspectStandard" placeholder="请输入巡检标准">
<el-option
v-for="item in dmsBaseInspectStandardList"
:key="item.inspectStandardId"
:label="item.standardName"
:value="item.inspectStandardId">
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="是否标识1-是0-否" prop="isFlag">-->
<!-- <el-input v-model="form.isFlag" placeholder="请输入是否标识1-是0-否" />-->
@ -227,11 +249,14 @@ import { listDmsInspectRouteDetail, getDmsInspectRouteDetail, delDmsInspectRoute
import { listDmsBaseInspectRoute } from '@/api/dms/dmsBaseInspectRoute'
import { listLedger } from '@/api/dms/ledger'
import { addDmsRepairDetail, updateDmsRepairDetail } from '@/api/dms/dmsRepairDetail'
import { listDmsBaseInspectStandard } from '@/api/dms/dmsBaseInspectStandard'
export default {
name: "DmsInspectRouteDetail",
data() {
return {
//
dmsBaseInspectStandardList:[],
inspectRouteIdCheck:'',
routeCheck:'',
dmsBaseInspectRouteList:[],
@ -289,8 +314,15 @@ export default {
this.getList();
this.getRoute();
this.getDevice();
this.getInspectStandard();
},
methods: {
/** 查询巡检标准信息列表 */
getInspectStandard() {
listDmsBaseInspectStandard(this.queryParams).then(response => {
this.dmsBaseInspectStandardList = response.rows;
});
},
//
getDevice(){
listLedger().then(response => {

@ -8,11 +8,11 @@
<el-input v-model="this.dmsBillsMaintInstanceList[0].billsMaintCode" disabled />
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="当前流程" >
<el-input v-model="this.dmsBillsMaintInstanceList[0].wfProcessId" disabled />
</el-form-item>
</el-col>
<!-- <el-col :span="8" :offset="2">-->
<!-- <el-form-item label="当前流程" >-->
<!-- <el-input v-model="this.dmsBillsMaintInstanceList[0].wfProcessId" disabled />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8" :offset="2">
<el-form-item label="工单状态" >
<el-input v-model="this.billsStatusCheck" disabled />
@ -28,11 +28,11 @@
<el-input v-model="this.dmsBillsMaintInstanceList[0].createTime" disabled />
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="工单类型" >
<el-input v-model="this.instanceTypeCheck" disabled />
</el-form-item>
</el-col>
<!-- <el-col :span="8" :offset="2">-->
<!-- <el-form-item label="工单类型" >-->
<!-- <el-input v-model="this.instanceTypeCheck" disabled />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="16" :offset="2">
<el-form-item label="备注" >
<el-input v-model="this.dmsBillsMaintInstanceList[0].remark" disabled />
@ -192,6 +192,18 @@
</el-row>
<!--保养计划明细列表-->
<h4 class="form-header h4" align="center">保养计划详细信息</h4>
<el-table v-loading="loading" :data="this.planMaintDetailLists" >
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="计划ID" align="center" prop="planMaintId" />
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="保养部位" align="center" prop="maintStationName" />
<el-table-column label="保养标准" align="center" prop="maintProtocol" />
<el-table-column label="操作描述" align="center" prop="operationDescription" />
</el-table>
@ -204,12 +216,15 @@ import { selectUserIdByDmsMaintInstanceActivityId,listDmsMaintInstanceActivity,
import { listWfprocessactivity } from '@/api/system/common/wfprocessactivity'
import { listDmsBillsMaintInstance } from '@/api/dms/dmsBillsMaintInstance'
import { selectUserIdByDmsBillsLubeInstanceActivityId } from '@/api/dms/dmsBillsLubeInstanceActivity'
import { selectPlanMaintDetailByPlanMaintId } from '@/api/dms/dmsBillsMaintInstance'
export default {
name: "DmsMaintInstanceActivity",
dicts:['dms_bills_status','dms_instance_type','dms_maint_level'],
dicts:['dms_maint_status','dms_instance_type','dms_maint_level'],
data() {
return {
planMaintDetail:"",
//
planMaintDetailLists:[],
nowPorcessStepOrder:"",
ListLength:"",
//
@ -306,24 +321,39 @@ export default {
}
},
/** 查询保养计划明细列表*/
getDmsMaintDetaileByPlanId(){
selectPlanMaintDetailByPlanMaintId(this.planMaintDetail).then(response =>{
this.planMaintDetailLists = response.rows;
console.log("-==-=-=-===-=-===========================================")
console.log(this.planMaintDetailLists)
console.log("-==-=-=-===-=-===========================================")
this.loading = false
})
},
/** 查询保养工单列表 */
getDmsBillsMaintInstance() {
this.loading = true;
listDmsBillsMaintInstance(this.queryParams).then(response => {
this.dmsBillsMaintInstanceList = response.rows;
for (let i = 0; i < this.dict.type.dms_bills_status.length;i++){
if (this.dmsBillsMaintInstanceList[0].billsStatus==i){
this.billsStatusCheck = this.dict.type.dms_bills_status[i].label;
}
}
for (let j = 0; j < this.dict.type.dms_instance_type.length;j++){
//dms_instance_type0==j+1
if (this.dmsBillsMaintInstanceList[0].instanceType==j+1){
// console.log(this.dmsBillsMaintInstanceList)
this.instanceTypeCheck = this.dict.type.dms_instance_type[j].label;
// console.log(this.instanceTypeCheck)
this.planMaintDetail = response.rows[0].planMaintId;
this.getDmsMaintDetaileByPlanId();
// console.log(response.rows[0])
// console.log(this.planMaintDetail)
// console.log("==================================--------------------------==============================")
for (let i = 0; i < this.dict.type.dms_maint_status.length;i++){
if (this.dmsBillsMaintInstanceList[0].maintStatus==i){
this.billsStatusCheck = this.dict.type.dms_maint_status[i].label;
}
}
// for (let j = 0; j < this.dict.type.dms_instance_type.length;j++){
// //dms_instance_type0==j+1
// if (this.dmsBillsMaintInstanceList[0].instanceType==j+1){
// // console.log(this.dmsBillsMaintInstanceList)
// this.instanceTypeCheck = this.dict.type.dms_instance_type[j].label;
// // console.log(this.instanceTypeCheck)
// }
// }
this.total = response.total;
this.loading = false;
});

@ -181,6 +181,13 @@
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-right"
@click="getJump(scope.row)"
>计划明细
</el-button>
<el-button
size="mini"
type="text"
@ -378,7 +385,9 @@ export default {
},
methods: {
getJump(row){
this.$router.push('/dms/dmsRepairDetail/index/' + row.planRepairId)
},
/** cron表达式按钮操作 */
handleShowCron() {
this.expression = this.form.cronExpression;
@ -498,7 +507,7 @@ export default {
/** 检修计划明细添加按钮操作 */
handleAddDmsPlanRepairDetail() {
let obj = {};
obj.deviceId = "";
// obj.deviceId = "";
obj.faultType = "";
obj.repairDesc = "";
obj.repairProtocol = "";

@ -136,13 +136,13 @@
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="设备名称" align="center" prop="deviceId" >
<el-table-column label="设备名称" align="center" prop="repairDetailTargetId" >
<template slot-scope="scope">
<span
v-for="(item, index) in ledgerList"
:key="index"
:value="item.ledgerList"
v-if="scope.row.deviceId == item.deviceId"
v-if="scope.row.repairDetailTargetId == item.deviceId"
>
{{ item.deviceName }}
</span>
@ -166,6 +166,7 @@
<!-- @click="addRepairDetaile(scope.row)"-->
<!-- v-hasPermi="['dms:dmsRepairDetail:edit']"-->
<!-- >确定/修改</el-button>-->
<el-button
size="mini"
type="text"
@ -211,8 +212,8 @@
<!-- <el-form-item label="设备ID关联dms_base_device_ledger的device_id" prop="deviceId">-->
<!-- <el-input v-model="form.deviceId" placeholder="请输入设备ID关联dms_base_device_ledger的device_id" />-->
<!-- </el-form-item>-->
<el-form-item label="巡检设备" prop="deviceId" >
<el-select v-model="form.deviceId" placeholder="请输入设备类型">
<el-form-item label="巡检设备" prop="repairDetailTargetId" >
<el-select v-model="form.repairDetailTargetId" placeholder="请输入设备类型">
<el-option
v-for="item in ledgerList"
:key="item.deviceId"
@ -221,6 +222,17 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="保养等级" prop="faultType">
<el-select v-model="form.faultType" placeholder="保养等级" >
<el-option
v-for="item in dict.type.dms_fault_type"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="检修说明" prop="repairDesc">
<el-input v-model="form.repairDesc" placeholder="请输入检修说明" />
</el-form-item>
@ -254,6 +266,8 @@ export default {
repairType:'',
repairSupervisor:'',
ledgerList:[],
//
dmsRepairList:[],
//
loading: true,
//
@ -277,7 +291,8 @@ export default {
pageNum: 1,
pageSize: 10,
planRepairId: null,
deviceId: null,
repairDetailTargetId:null,
repairDetailTargetType:null,
faultType: null,
repairDesc: null,
repairProtocol: null,
@ -312,8 +327,6 @@ export default {
this.dmsRepairList = response.rows;
this.repairType = response.rows[0].repairType;
this.repairSupervisor = response.rows[0].repairSupervisor;
});
},
/** 查询设备台账信息列表 */
@ -343,7 +356,8 @@ export default {
this.form = {
planRepairDetailId: null,
planRepairId: null,
deviceId: null,
repairDetailTargetType:null,
repairDetailTargetId:null,
faultType: null,
repairDesc: null,
repairProtocol: null,
@ -398,7 +412,7 @@ export default {
this.getList();
});
} else {
this.form.planRepairDetailId = this.planMaintIdCheck;
this.form.planRepairId = this.planMaintIdCheck
addDmsRepairDetail(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;

@ -50,14 +50,34 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="设备转移时间" prop="deviceTransferTime">
<el-date-picker clearable
v-model="queryParams.deviceTransferTime"
<!-- <el-form-item label="设备转移时间" prop="deviceTransferTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.deviceTransferTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择设备转移时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item label="设备转移时间">
<el-date-picker
v-model="queryParams.params.beginTime"
style="width: 240px"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择设备转移时间">
</el-date-picker>
placeholder="选择日期时间"
value-format="yyyy-MM-dd "
></el-date-picker>
</el-form-item>
<el-form-item><div>-</div></el-form-item>
<el-form-item
><el-date-picker
v-model="queryParams.params.endTime"
value-format="yyyy-MM-dd "
style="width: 240px"
type="date"
placeholder="选择日期时间"
></el-date-picker
></el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
@ -255,6 +275,10 @@ export default {
deviceTransferTime: null,
deviceLocation: null,
deviceName: null,
params:{
beginTime:null,
endTime:null,
}
},
//
form: {},
@ -330,6 +354,8 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams.params.beginTime = null;
this.queryParams.params.endTime = null;
this.resetForm("queryForm");
this.handleQuery();
},

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="92px">
<el-form-item label="设备ID" prop="deviceId">
<el-input
v-model="queryParams.deviceId"
@ -25,14 +25,26 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="安装时间" prop="installTime">
<el-date-picker clearable
v-model="queryParams.installTime"
<el-form-item label="安装时间">
<el-date-picker
v-model="queryParams.params.beginTime"
style="width: 240px"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择安装时间">
</el-date-picker>
placeholder="选择日期时间"
value-format="yyyy-MM-dd "
></el-date-picker>
</el-form-item>
<el-form-item><div>-</div></el-form-item>
<el-form-item
><el-date-picker
v-model="queryParams.params.endTime"
value-format="yyyy-MM-dd "
style="width: 240px"
type="date"
placeholder="选择日期时间"
></el-date-picker
></el-form-item>
<el-form-item label="安装人员" prop="installPersion">
<el-input
v-model="queryParams.installPersion"
@ -238,6 +250,10 @@ export default {
installPersion: null,
workOrder: null,
deviceName: null,
params:{
beginTime: null,
endTime: null,
}
},
//
form: {},
@ -289,7 +305,11 @@ export default {
createBy: null,
updateTime: null,
updateBy: null,
deviceName :null
deviceName :null,
params:{
beginTime: null,
endTime: null
}
};
this.resetForm("form");
},
@ -300,6 +320,8 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams.params.beginTime = null;
this.queryParams.params.endTime = null;
this.resetForm("queryForm");
this.handleQuery();
},

@ -195,7 +195,25 @@
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item prop="pictureUrl">
<el-upload
:action="imgUpload.url"
:headers="imgUpload.headers"
:on-success="handlePictureSuccess"
:before-upload="beforePictureUpload"
list-type="picture-card"
:file-list="fileListShow"
:on-preview="handlePictureCardPreview"
:on-remove="handleRemove">
<i class="el-icon-plus"></i>
</el-upload>
<!--图片预览的dialog-->
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl">
</el-dialog>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
@ -209,11 +227,30 @@ import { listKnowledgeLube, getKnowledgeLube, delKnowledgeLube, addKnowledgeLube
import { listDevicetype } from '@/api/dms/devicetype'
import { listLubeStation } from '@/api/dms/lubeStation'
import { listLubeStandard } from '@/api/dms/lubeStandard'
import { getToken } from '@/utils/auth'
export default {
name: "KnowledgeLube",
data() {
return {
//
isCommonName: true,
//list
fileListShow: [],
//List
fileListPut: [],
dialogImageUrl: '',
dialogVisible: false,
imgUpload: {
//
headers: {
Authorization: "Bearer " + getToken()
},
// :
url: process.env.VUE_APP_BASE_API + "/file/upload",
url2: process.env.VUE_APP_BASE_API,
},
imgAddress:[],
//
lubeStandardList:[],
//
@ -276,6 +313,59 @@ export default {
this.getLubeStandard();
},
methods: {
//
beforePictureUpload(file){
// isCommonName true
this.isCommonName = true;
const isJPG = file.type === 'image/jpeg';
const isLt2M = file.size / 1024 / 1024 < 2;
//
if(this.fileListPut.length > 0){
this.fileListPut.forEach((item,index)=>{
if(item.name == file.name){
this.$message.error('已存在相同的图片!');
this.isCommonName = false;
}
})
}
if (!isJPG) {
this.$message.error('请上传图片格式的文件!');
}
if (!isLt2M) {
this.$message.error('上传的图片不能超过2MB!');
}
return isJPG && isLt2M && this.isCommonName;
},
//
handleRemove(file, fileList) {
//filefileListPut
if(this.fileListPut.length > 0){
this.fileListPut = this.fileListPut.filter((item, index)=>{
return item.name != file.name;
})
}
},
//
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
//
handlePictureSuccess(res, file) {
//访
const imgObjectUrl = this.imgUpload.url2 + file.response.imgUrl;
//JSON
let currentFile = { name: '', url: '' };
currentFile.name = file.name;
currentFile.url = imgObjectUrl;
this.imgAddress.push(res.data.url);
//
this.fileListPut.push(currentFile);
console.log(this.fileListPut)
},
/** 查询润滑标准信息列表 */
getLubeStandard() {
listLubeStandard(this.queryParams).then(response => {
@ -345,6 +435,7 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
this.fileListShow = [];
this.reset();
this.open = true;
this.title = "添加润滑知识库";
@ -354,7 +445,9 @@ export default {
this.reset();
const knowledgeLubeId = row.knowledgeLubeId || this.ids
getKnowledgeLube(knowledgeLubeId).then(response => {
console.log(response)
this.form = response.data;
this.fileListShow = response.data.systemFiles
this.open = true;
this.title = "修改润滑知识库";
});
@ -364,12 +457,14 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.knowledgeLubeId != null) {
this.form.fileUrls = this.imgAddress;
updateKnowledgeLube(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
this.form.fileUrls = this.imgAddress;
addKnowledgeLube(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save