xins
/
HwMes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备维修不能一次完成维修问题和维修后图片问题，设备供应商查询修改

Browse Source
master
马雪伟 5 days ago
parent 7627a7f6ef
commit 9a2046683a
5 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java
Unescape Escape View File

@ -42,7 +42,7 @@ public class DmsBaseDeviceSuplierController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(DmsBaseDeviceSuplier dmsBaseDeviceSuplier) public TableDataInfo list(DmsBaseDeviceSuplier dmsBaseDeviceSuplier)
{ {
startPage(); // startPage();
List<DmsBaseDeviceSuplier> list = dmsBaseDeviceSuplierService.selectDmsBaseDeviceSuplierList(dmsBaseDeviceSuplier); List<DmsBaseDeviceSuplier> list = dmsBaseDeviceSuplierService.selectDmsBaseDeviceSuplierList(dmsBaseDeviceSuplier);
return getDataTable(list); return getDataTable(list);
} }

1
hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMobileController.java
Unescape Escape View File

@ -110,7 +110,6 @@ public class DmsMobileController extends BaseController {
fileUrls.add(sysFile.getUrl()); fileUrls.add(sysFile.getUrl());
} }
} }
dmsBillsFaultInstance.setFileUrls(fileUrls); dmsBillsFaultInstance.setFileUrls(fileUrls);
return success(dmsBillsFaultInstanceService.insertDmsBillsFaultInstance(dmsBillsFaultInstance)); return success(dmsBillsFaultInstanceService.insertDmsBillsFaultInstance(dmsBillsFaultInstance));
} }

32
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java
Unescape Escape View File

@ -228,6 +228,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
DmsFaultInstanceActivity dmsFaultInstanceActivity; DmsFaultInstanceActivity dmsFaultInstanceActivity;
if (dmsBillsFaultInstanceActivityList.size() == 1) { if (dmsBillsFaultInstanceActivityList.size() == 1) {
dmsFaultInstanceActivity = firstStepActivity; dmsFaultInstanceActivity = firstStepActivity;
dmsBillsFaultInstance.setInstanceActivityId(firstStepActivity.getInstanceActivityId());
} else { } else {
dmsFaultInstanceActivity = dmsBillsFaultInstanceActivityList.get(1); dmsFaultInstanceActivity = dmsBillsFaultInstanceActivityList.get(1);
dmsBillsFaultInstance.setInstanceActivityId(dmsFaultInstanceActivity.getInstanceActivityId()); dmsBillsFaultInstance.setInstanceActivityId(dmsFaultInstanceActivity.getInstanceActivityId());
@ -236,12 +237,23 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
DmsFaultInstanceActivity instanceActivity = dmsFaultInstanceActivityMapper.selectDmsFaultInstanceActivityByInstanceActivityId(activity.getInstanceActivityId()); DmsFaultInstanceActivity instanceActivity = dmsFaultInstanceActivityMapper.selectDmsFaultInstanceActivityByInstanceActivityId(activity.getInstanceActivityId());
if (instanceActivity.getProcessActivityId()==1021l){ if (instanceActivity.getProcessActivityId()==1021l){
dmsBillsFaultInstance.setCheckedFault(instanceActivity.getCheckedFault()); dmsBillsFaultInstance.setCheckedFault(instanceActivity.getCheckedFault());
}else { DmsInstanceFile queryInstanceFile = new DmsInstanceFile();
// queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY);
queryInstanceFile.setTargetId(activity.getInstanceActivityId());
queryInstanceFile.setTargetType("1");
List<DmsInstanceFile> dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile);
dmsBillsFaultInstance.setDmsInstanceFiles(dmsInstanceFiles);
dmsBillsFaultInstance.setConfirmTime(instanceActivity.getConfirmTime()); dmsBillsFaultInstance.setConfirmTime(instanceActivity.getConfirmTime());
dmsBillsFaultInstance.setRepairContent(instanceActivity.getRepairContent()); dmsBillsFaultInstance.setRepairContent(instanceActivity.getRepairContent());
dmsBillsFaultInstance.setProtectedMethod(instanceActivity.getProtectedMethod()); dmsBillsFaultInstance.setProtectedMethod(instanceActivity.getProtectedMethod());
dmsBillsFaultInstance.setRepairer(instanceActivity.getRepairer()); dmsBillsFaultInstance.setRepairer(instanceActivity.getRepairer());
dmsBillsFaultInstance.setRepairConfirm(instanceActivity.getRepairConfirm()); dmsBillsFaultInstance.setRepairConfirm(instanceActivity.getRepairConfirm());
dmsBillsFaultInstance.setProcessHandleResolution(instanceActivity.getProcessHandleResolution());
DmsInstanceFile queryInstanceFile1 = new DmsInstanceFile();
queryInstanceFile1.setTargetId(activity.getInstanceActivityId());
queryInstanceFile1.setTargetType("2");
List<DmsInstanceFile> dmsInstanceFiles1 = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile1);
dmsBillsFaultInstance.setDmsInstanceFiles1(dmsInstanceFiles1);
} }
} }
dmsBillsFaultInstance.setFaultType(dmsFaultInstanceActivity.getFaultType()); dmsBillsFaultInstance.setFaultType(dmsFaultInstanceActivity.getFaultType());
@ -250,19 +262,19 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
dmsBillsFaultInstance.setDeviceId(dmsFaultInstanceActivity.getDeviceId()); dmsBillsFaultInstance.setDeviceId(dmsFaultInstanceActivity.getDeviceId());
dmsBillsFaultInstance.setRepairType(dmsFaultInstanceActivity.getRepairType()); dmsBillsFaultInstance.setRepairType(dmsFaultInstanceActivity.getRepairType());
dmsBillsFaultInstance.setOutsrcId(dmsFaultInstanceActivity.getOutsrcId()); dmsBillsFaultInstance.setOutsrcId(dmsFaultInstanceActivity.getOutsrcId());
dmsBillsFaultInstance.setProcessHandleResolution(dmsFaultInstanceActivity.getProcessHandleResolution());
dmsBillsFaultInstance.setDmsFaultInstanceActivityList(null); dmsBillsFaultInstance.setDmsFaultInstanceActivityList(null);
DmsInstanceFile queryInstanceFile = new DmsInstanceFile(); // DmsInstanceFile queryInstanceFile = new DmsInstanceFile();
// queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY); //// queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY);
queryInstanceFile.setTargetId(dmsBillsFaultInstanceActivityList.get(0).getInstanceActivityId()); // queryInstanceFile.setTargetId(dmsBillsFaultInstanceActivityList.get(0).getInstanceActivityId());
queryInstanceFile.setTargetType("1"); // queryInstanceFile.setTargetType("1");
List<DmsInstanceFile> dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile); // List<DmsInstanceFile> dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile);
// queryInstanceFile.setTargetId(dmsBillsFaultInstanceActivityList.get(1).getInstanceActivityId()); // queryInstanceFile.setTargetId(dmsBillsFaultInstanceActivityList.get(1).getInstanceActivityId());
// queryInstanceFile.setTargetType("2"); // queryInstanceFile.setTargetType("2");
// List<DmsInstanceFile> dmsInstanceFiles1 = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile); // List<DmsInstanceFile> dmsInstanceFiles1 = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile);
dmsBillsFaultInstance.setDmsInstanceFiles(dmsInstanceFiles); // dmsBillsFaultInstance.setDmsInstanceFiles(dmsInstanceFiles);
// dmsBillsFaultInstance.setDmsInstanceFiles1(dmsInstanceFiles1); // dmsBillsFaultInstance.setDmsInstanceFiles1(dmsInstanceFiles1);
return dmsBillsFaultInstance; return dmsBillsFaultInstance;
} }
@ -377,8 +389,8 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
List<DmsFaultInstanceActivity> list = dmsBillsFaultInstanceMapper.selectFaults(repairInstanceId); List<DmsFaultInstanceActivity> list = dmsBillsFaultInstanceMapper.selectFaults(repairInstanceId);
List<DmsFaultCompentsParts> parts = dmsBillsFaultInstanceMapper.selectParts(repairInstanceId); List<DmsFaultCompentsParts> parts = dmsBillsFaultInstanceMapper.selectParts(repairInstanceId);
DmsFaultInstanceActivity activity = new DmsFaultInstanceActivity(); DmsFaultInstanceActivity activity = new DmsFaultInstanceActivity();
BeanUtils.copyProperties(list.get(1),activity); BeanUtils.copyProperties(list.get(0),activity);
activity.setCheckedFault(list.get(0).getCheckedFault()); // activity.setCheckedFault(list.get(0).getCheckedFault());
activity.setParts(parts); activity.setParts(parts);
return activity; return activity;
} }

2
hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsFaultInstanceActivityServiceImpl.java
Unescape Escape View File

@ -63,7 +63,7 @@ public class DmsFaultInstanceActivityServiceImpl implements IDmsFaultInstanceAct
DmsFaultInstanceActivity dmsFaultInstanceActivity2 = dmsFaultInstanceActivities.get(1); DmsFaultInstanceActivity dmsFaultInstanceActivity2 = dmsFaultInstanceActivities.get(1);
DmsInstanceFile queryInstanceFile1 = new DmsInstanceFile(); DmsInstanceFile queryInstanceFile1 = new DmsInstanceFile();
queryInstanceFile1.setTargetType("2"); queryInstanceFile1.setTargetType("2");
queryInstanceFile1.setTargetId(dmsFaultInstanceActivity2.getInstanceActivityId()); queryInstanceFile1.setTargetId(dmsFaultInstanceActivity1.getInstanceActivityId());
List<DmsInstanceFile> dmsInstanceFiles2 = dmsInstanceFileMapper.selectDmsInstanceFileConvertList(queryInstanceFile1); List<DmsInstanceFile> dmsInstanceFiles2 = dmsInstanceFileMapper.selectDmsInstanceFileConvertList(queryInstanceFile1);
dmsFaultInstanceActivity2.setDmsInstanceFileList(dmsInstanceFiles2); dmsFaultInstanceActivity2.setDmsInstanceFileList(dmsInstanceFiles2);
List<DmsFaultInstanceActivity> dmsFaultInstanceActivities1 = new ArrayList<>(); List<DmsFaultInstanceActivity> dmsFaultInstanceActivities1 = new ArrayList<>();

1
hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml
Unescape Escape View File

@ -272,6 +272,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select select
x.fault_description , x.fault_description ,
x.checked_fault , x.checked_fault ,
x.process_handle_resolution,
x.repair_content , x.repair_content ,
x.protected_method , x.protected_method ,
x.repairer , x.repairer ,

Write Preview
Loading…
Cancel
Save