diff --git a/aucma-common/src/main/java/com/aucma/common/constant/DmsConstants.java b/aucma-common/src/main/java/com/aucma/common/constant/DmsConstants.java index c24f50f..285dbe8 100644 --- a/aucma-common/src/main/java/com/aucma/common/constant/DmsConstants.java +++ b/aucma-common/src/main/java/com/aucma/common/constant/DmsConstants.java @@ -56,6 +56,7 @@ public class DmsConstants { /**工单文件关联类型*/ public static final String DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY = "1";//故障报修工单实例节点 + public static final String DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY_AFTER = "2";//故障报修完成阶段附件 diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsFaultInstance.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsFaultInstance.java index 38a43e8..5e6f85e 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsFaultInstance.java +++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsFaultInstance.java @@ -50,6 +50,10 @@ public class DmsBillsFaultInstance extends DmsBaseEntity /** 申请人 */ @Excel(name = "申请人") private String applyUser; + + /** 申请人手机 */ + @Excel(name = "申请人手机") + private String applyUserPhone; /** 申请时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -92,6 +96,9 @@ public class DmsBillsFaultInstance extends DmsBaseEntity private Long instanceActivityId; private String faultType; + + /** 故障等级（1一般 2紧急 3严重） */ + private String faultLevel; private String faultDescription; diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsFaultInstanceActivity.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsFaultInstanceActivity.java index f2b3c4c..874c141 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsFaultInstanceActivity.java +++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsFaultInstanceActivity.java @@ -106,6 +106,8 @@ public class DmsFaultInstanceActivity extends DmsBaseEntity private List fileUrls; private List dmsInstanceFileList; + private List dmsInstanceFiles; + private Integer fileCount; private String checkedFault; private String repairContent; private String protectedMethod; diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java index 6350426..29561ae 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java +++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java @@ -14,6 +14,7 @@ import com.aucma.dms.mapper.DmsBillsFaultInstanceMapper; import com.aucma.dms.mapper.DmsFaultInstanceActivityMapper; import com.aucma.dms.mapper.DmsInstanceFileMapper; import com.aucma.dms.service.IDmsBillsFaultInstanceService; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -55,62 +56,19 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS // 使用包含完整操作记录列表的查询方法 DmsBillsFaultInstance dmsBillsFaultInstance = dmsBillsFaultInstanceMapper.selectFaultInstanceJoinActivityByRepairInstanceId(repairInstanceId); - // 获取第一步操作记录的附件 + // 获取首条操作记录附件（合并前后阶段） if (dmsBillsFaultInstance.getInstanceActivityId() != null) { - DmsInstanceFile queryInstanceFile = new DmsInstanceFile(); - queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY); - queryInstanceFile.setTargetId(dmsBillsFaultInstance.getInstanceActivityId()); - List dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile); - - for (DmsInstanceFile dmsInstanceFile : dmsInstanceFiles){ - String filePath = dmsInstanceFile.getFilePath(); - log.info("filePath1:"+filePath); - if(!filePath.contains("7309")){ - if(filePath.contains("https")){ - filePath.replaceFirst("https","http"); - } - int index= filePath.indexOf("/statics"); - filePath = "http://172.16.12.100:7309"+filePath.substring(index); - log.info("filePath2:"+filePath); - dmsInstanceFile.setUrl(filePath); - dmsInstanceFile.setFilePath(filePath); - }else{ - dmsInstanceFile.setUrl(dmsInstanceFile.getFilePath()); - } - } - dmsBillsFaultInstance.setDmsInstanceFiles(dmsInstanceFiles); + List instanceFiles = loadActivityFiles(dmsBillsFaultInstance.getInstanceActivityId()); + dmsBillsFaultInstance.setDmsInstanceFiles(instanceFiles); } // 为每个操作记录加载附件 List activityList = dmsBillsFaultInstance.getDmsFaultInstanceActivityList(); if (!CollectionUtils.isEmpty(activityList)) { for (DmsFaultInstanceActivity activity : activityList) { - DmsInstanceFile queryFile = new DmsInstanceFile(); - queryFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY); - queryFile.setTargetId(activity.getInstanceActivityId()); - List activityFiles = dmsInstanceFileMapper.selectDmsInstanceFileList(queryFile); - - // 处理文件路径 - for (DmsInstanceFile file : activityFiles) { - String filePath = file.getFilePath(); - if(!filePath.contains("7309")){ - if(filePath.contains("https")){ - filePath = filePath.replaceFirst("https","http"); - } - int index= filePath.indexOf("/statics"); - if (index > -1) { - filePath = "http://172.16.12.100:7309"+filePath.substring(index); - } - file.setUrl(filePath); - file.setFilePath(filePath); - }else{ - file.setUrl(file.getFilePath()); - } - } - -// // 设置附件数量和文件列表 -// activity.setFileCount(activityFiles.size()); -// activity.setDmsInstanceFiles(activityFiles); + List activityFiles = loadActivityFiles(activity.getInstanceActivityId()); + activity.setFileCount(activityFiles.size()); + activity.setDmsInstanceFiles(activityFiles); } } @@ -141,7 +99,9 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS Date currentDate = new Date(); String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName() ; // dmsBillsFaultInstance.setWfProcessId(WfConstants.WF_BILLS_FAULT_INSTANCE_PROCESS_ID); - dmsBillsFaultInstance.setApplyUser(userName); + if (StringUtils.isBlank(dmsBillsFaultInstance.getApplyUser())) { + dmsBillsFaultInstance.setApplyUser(userName); + } dmsBillsFaultInstance.setApplyTime(currentDate); dmsBillsFaultInstance.setCreateTime(currentDate); dmsBillsFaultInstance.setCreateBy(SecurityUtils.getUserId()); @@ -149,6 +109,10 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS dmsBillsFaultInstance.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR); dmsBillsFaultInstance.setInstanceType(DmsConstants.DMS_BILLS_FAULT_INSTANCE_TYPE_MAUAL); dmsBillsFaultInstance.setIsFlag("1"); + // 设置默认审批状态为未审批（避免 NULL 导致查询时被过滤） + if (dmsBillsFaultInstance.getApproveStatus() == null || dmsBillsFaultInstance.getApproveStatus().isEmpty()) { + dmsBillsFaultInstance.setApproveStatus("0"); + } int rows = dmsBillsFaultInstanceMapper.insertDmsBillsFaultInstance(dmsBillsFaultInstance); @@ -228,6 +192,28 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS } } + // 兼容顶层字段：将故障信息与处理意见同步到第1步操作记录（便于前端直接从主对象读取展示） + DmsFaultInstanceActivity first = dmsFaultInstanceActivityMapper.selectDmsFaultInstanceActivityByRepairIdMin(dmsBillsFaultInstance.getRepairInstanceId()); + if (first != null) { + DmsFaultInstanceActivity updateFirst = new DmsFaultInstanceActivity(); + updateFirst.setInstanceActivityId(first.getInstanceActivityId()); + if (dmsBillsFaultInstance.getFaultType() != null) { + updateFirst.setFaultType(dmsBillsFaultInstance.getFaultType()); + } + if (dmsBillsFaultInstance.getFaultDescription() != null) { + updateFirst.setFaultDescription(dmsBillsFaultInstance.getFaultDescription()); + } + if (dmsBillsFaultInstance.getDesignOperations() != null) { + updateFirst.setDesignOperations(dmsBillsFaultInstance.getDesignOperations()); + } + if (dmsBillsFaultInstance.getProcessHandleResolution() != null) { + updateFirst.setProcessHandleResolution(dmsBillsFaultInstance.getProcessHandleResolution()); + } + updateFirst.setUpdateTime(currentDate); + updateFirst.setUpdateBy(SecurityUtils.getUserId()); + dmsFaultInstanceActivityMapper.updateDmsFaultInstanceActivity(updateFirst); + } + // 处理操作记录列表 List activityList = dmsBillsFaultInstance.getDmsFaultInstanceActivityList(); if (!CollectionUtils.isEmpty(activityList)) { @@ -342,10 +328,19 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS @Override public DmsBillsFaultInstance getDmsBillsFaultInstance4Repair(Long repairInstanceId) { DmsBillsFaultInstance dmsBillsFaultInstance = dmsBillsFaultInstanceMapper.selectFaultInstanceJoinActivityByRepairInstanceId(repairInstanceId); + if (dmsBillsFaultInstance == null) { + return null; + } + Long repairInstanceId1 = dmsBillsFaultInstance.getRepairInstanceId(); List parts = dmsFaultInstanceActivityMapper.selectPartsById(repairInstanceId1); dmsBillsFaultInstance.setParts(parts); + List dmsBillsFaultInstanceActivityList = dmsBillsFaultInstance.getDmsFaultInstanceActivityList(); + if (CollectionUtils.isEmpty(dmsBillsFaultInstanceActivityList)) { + return dmsBillsFaultInstance; + } + DmsFaultInstanceActivity firstStepActivity = dmsBillsFaultInstanceActivityList.get(0); DmsFaultInstanceActivity dmsFaultInstanceActivity; if (dmsBillsFaultInstanceActivityList.size() == 1) { @@ -355,60 +350,26 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS dmsFaultInstanceActivity = dmsBillsFaultInstanceActivityList.get(1); dmsBillsFaultInstance.setInstanceActivityId(dmsFaultInstanceActivity.getInstanceActivityId()); } + for (DmsFaultInstanceActivity activity : dmsBillsFaultInstanceActivityList) { DmsFaultInstanceActivity instanceActivity = dmsFaultInstanceActivityMapper.selectDmsFaultInstanceActivityByInstanceActivityId(activity.getInstanceActivityId()); - if (instanceActivity.getProcessActivityId()==1021l){ + // 添加空指针检查 + if (instanceActivity == null) { + continue; + } + + // 检查 processActivityId 是否为 1021 + if (instanceActivity.getProcessActivityId() != null && instanceActivity.getProcessActivityId() == 1021l) { dmsBillsFaultInstance.setCheckedFault(instanceActivity.getCheckedFault()); - DmsInstanceFile queryInstanceFile = new DmsInstanceFile(); -// queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY); - queryInstanceFile.setTargetId(activity.getInstanceActivityId()); - queryInstanceFile.setTargetType("1"); - List dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile); - dmsInstanceFiles.forEach(dif ->{ - String filePath = dif.getFilePath(); - log.info("filePath1:"+filePath); - if(!filePath.contains("7309")){ - if(filePath.contains("https")){ - filePath.replaceFirst("https","http"); - } - int index= filePath.indexOf("/statics"); - filePath = "http://172.16.12.100:7309"+filePath.substring(index); - log.info("filePath2:"+filePath); - dif.setUrl(filePath); - dif.setFilePath(filePath); - }else{ - dif.setUrl(dif.getFilePath()); - } - }); - dmsBillsFaultInstance.setDmsInstanceFiles(dmsInstanceFiles); + List instanceFiles = loadActivityFiles(activity.getInstanceActivityId()); + dmsBillsFaultInstance.setDmsInstanceFiles(instanceFiles); dmsBillsFaultInstance.setConfirmTime(instanceActivity.getConfirmTime()); dmsBillsFaultInstance.setRepairContent(instanceActivity.getRepairContent()); dmsBillsFaultInstance.setProtectedMethod(instanceActivity.getProtectedMethod()); dmsBillsFaultInstance.setRepairer(instanceActivity.getRepairer()); dmsBillsFaultInstance.setRepairConfirm(instanceActivity.getRepairConfirm()); dmsBillsFaultInstance.setProcessHandleResolution(instanceActivity.getProcessHandleResolution()); - DmsInstanceFile queryInstanceFile1 = new DmsInstanceFile(); - queryInstanceFile1.setTargetId(activity.getInstanceActivityId()); - queryInstanceFile1.setTargetType("2"); - List dmsInstanceFiles1 = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile1); - dmsInstanceFiles1.forEach(dif ->{ - String filePath = dif.getFilePath(); - log.info("filePath1:"+filePath); - if(!filePath.contains("7309")){ - if(filePath.contains("https")){ - filePath.replaceFirst("https","http"); - } - int index= filePath.indexOf("/statics"); - filePath = "http://172.16.12.100:7309"+filePath.substring(index); - log.info("filePath2:"+filePath); - dif.setUrl(filePath); - dif.setFilePath(filePath); - }else{ - dif.setUrl(dif.getFilePath()); - } - }); - - dmsBillsFaultInstance.setDmsInstanceFiles1(dmsInstanceFiles1); + dmsBillsFaultInstance.setDmsInstanceFiles1(null); } } dmsBillsFaultInstance.setFaultType(dmsFaultInstanceActivity.getFaultType()); @@ -561,82 +522,92 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS @Override @Transactional(rollbackFor = Exception.class) public int completeRepair(DmsFaultInstanceActivity dmsFaultInstanceActivity) { - batchInsertInstanceAfterFiles(dmsFaultInstanceActivity.getFileUrls(),dmsFaultInstanceActivity.getInstanceActivityId()); + batchInsertInstanceAfterFiles(dmsFaultInstanceActivity.getFileUrls(), dmsFaultInstanceActivity.getInstanceActivityId()); List parts = dmsFaultInstanceActivity.getParts(); - if (!CollectionUtils.isEmpty(parts)){ + if (!CollectionUtils.isEmpty(parts)) { for (DmsFaultCompentsParts part : parts) { part.setFaultId(dmsFaultInstanceActivity.getRepairInstanceId()); } dmsFaultInstanceActivityMapper.insertParts(parts); } - DmsBillsFaultInstance dmsBillsFaultInstance = dmsBillsFaultInstanceMapper. - selectDmsBillsFaultInstanceByRepairInstanceId(dmsFaultInstanceActivity.getRepairInstanceId()); + + DmsBillsFaultInstance dmsBillsFaultInstance = dmsBillsFaultInstanceMapper + .selectDmsBillsFaultInstanceByRepairInstanceId(dmsFaultInstanceActivity.getRepairInstanceId()); String dmsBillsStatus = dmsBillsFaultInstance.getBillsStatus(); - if (dmsBillsStatus.equals(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH)) {//维修完成 + if (DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH.equals(dmsBillsStatus)) { throw new ServiceException("已经维修完成"); } - if (dmsBillsStatus.equals(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR)) {//待维修 + if (DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR.equals(dmsBillsStatus)) { throw new ServiceException("请先开始维修"); - } Date currentDate = new Date(); - String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName(); + String userName = SecurityUtils.getLoginUser() == null ? SecurityUtils.getUsername() : SecurityUtils.getLoginUser().getUser().getNickName(); dmsBillsFaultInstance.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH); dmsBillsFaultInstance.setRealEndTime(currentDate); dmsBillsFaultInstance.setUpdateBy(SecurityUtils.getUserId()); dmsBillsFaultInstance.setUpdateTime(currentDate); - dmsBillsFaultInstanceMapper.updateDmsBillsFaultInstance(dmsBillsFaultInstance); dmsFaultInstanceActivity.setProcessHandleStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_FINISH); dmsFaultInstanceActivity.setEndTime(currentDate); - dmsFaultInstanceActivity.setRepairer(userName); - + if (StringUtils.isBlank(dmsFaultInstanceActivity.getRepairer())) { + dmsFaultInstanceActivity.setRepairer(userName); + } + if (dmsFaultInstanceActivity.getHandleUserId() == null) { + dmsFaultInstanceActivity.setHandleUserId(SecurityUtils.getUserId()); + dmsFaultInstanceActivity.setHandleBy(userName); + } + dmsFaultInstanceActivity.setHandleTime(currentDate); dmsFaultInstanceActivityMapper.updateDmsFaultInstanceActivity(dmsFaultInstanceActivity); return 1; } - - public void batchInsertInstanceFiles(List fileUrls, Long instanceActivityId) { - if (fileUrls != null && !fileUrls.isEmpty()) { - List 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); - } - dmsInstanceFileMapper.batchDmsInstanceFile(dmsInstanceFiles); - } - } - public void batchInsertInstanceAfterFiles(List fileUrls, Long instanceActivityId) { - if (fileUrls != null && !fileUrls.isEmpty()) { - List dmsInstanceFiles = new ArrayList<>(); - for (String fileUrl : fileUrls) { - DmsInstanceFile dmsInstanceFile = new DmsInstanceFile(); - dmsInstanceFile.setTargetId(instanceActivityId); - dmsInstanceFile.setTargetType("2"); - dmsInstanceFile.setFilePath(fileUrl); - dmsInstanceFiles.add(dmsInstanceFile); - } - dmsInstanceFileMapper.batchDmsInstanceFile(dmsInstanceFiles); + /** + * 加载指定操作记录的所有附件（含开始/完成阶段） + */ + private List loadActivityFiles(Long instanceActivityId) { + List result = new ArrayList<>(); + if (instanceActivityId == null) { + return result; } + result.addAll(loadFilesByType(instanceActivityId, DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY)); + result.addAll(loadFilesByType(instanceActivityId, DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY_AFTER)); + return result; } - - public static void main(String[] args) { - String filePath = "https://172.16.12.100/statics/2024/12/05/output_imgage20241205_215325_20241205215439A002.jpg"; - if(!filePath.contains("7309")){ - if(filePath.contains("https")){ - filePath.replaceFirst("https","http"); - } - int index= filePath.indexOf("/statics"); - filePath = "http://172.16.12.100:7309"+filePath.substring(index); + private List loadFilesByType(Long instanceActivityId, String targetType) { + DmsInstanceFile query = new DmsInstanceFile(); + query.setTargetId(instanceActivityId); + query.setTargetType(targetType); + List files = dmsInstanceFileMapper.selectDmsInstanceFileList(query); + for (DmsInstanceFile file : files) { + normalizeFilePath(file); + } + return files; + } + + private void normalizeFilePath(DmsInstanceFile file) { + String filePath = file.getFilePath(); + if (StringUtils.isBlank(filePath)) { + return; + } + log.info("filePath1:" + filePath); + if (!filePath.contains("7309")) { + if (filePath.contains("https")) { + filePath = filePath.replaceFirst("https", "http"); + } + int index = filePath.indexOf("/statics"); + if (index > -1) { + filePath = "http://172.16.12.100:7309" + filePath.substring(index); + } + log.info("filePath2:" + filePath); + file.setUrl(filePath); + file.setFilePath(filePath); + } else { + file.setUrl(filePath); } - System.out.println(filePath); } } diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml index 64aa5af..e187f69 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml @@ -26,20 +26,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + - @@ -67,17 +72,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + - - select repair_instance_id, fault_source_type, fault_source_id, bills_fault_code, bills_status, apply_user, apply_time, real_begin_time, real_end_time, require_end_time, instance_type, is_flag, remark, create_by, create_time, update_by, update_time,device_id,approveStatus from dms_bills_fault_instance + select repair_instance_id, fault_source_type, fault_source_id, bills_fault_code, bills_status, apply_user, apply_user_phone, apply_time, real_begin_time, real_end_time, require_end_time, instance_type, is_flag, remark, create_by, create_time, update_by, update_time, device_id, APPROVESTATUS AS approveStatus, knowledge_repair_id, verify_method, repair_confirm, confirm_user from dms_bills_fault_instance - - - - - - - - - - diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml index 566fd3e..9c5d469 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsFaultInstanceActivityMapper.xml @@ -27,7 +27,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + @@ -64,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" protected_method, repairer, repair_confirm, - confirm_time from dms_fault_instance_activity + confirm_time, components_parts_id from dms_fault_instance_activity where instance_activity_id = #{instanceActivityId} @@ -96,6 +102,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, transfer_user_id, attr1, + checked_fault, + repair_content, + protected_method, + repairer, + repair_confirm, + confirm_time, + components_parts_id, #{instanceActivityId}, @@ -120,6 +133,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{transferUserId}, #{attr1}, + #{checkedFault}, + #{repairContent}, + #{protectedMethod}, + #{repairer}, + #{repairConfirm}, + #{confirmTime}, + #{componentsPartsId}, diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsInstanceFileMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsInstanceFileMapper.xml index a271620..d690597 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsInstanceFileMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsInstanceFileMapper.xml @@ -3,18 +3,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + select instance_file_id, target_type, target_id, file_path from dms_instance_file - + - + - + insert into dms_instance_file @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{filePath}, - + update dms_instance_file @@ -52,21 +52,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where instance_file_id = #{instanceFileId} - + delete from dms_instance_file where instance_file_id = #{instanceFileId} - + delete from dms_instance_file where instance_file_id in #{instanceFileId} - - - - + + + + insert into dms_instance_file( instance_file_id, target_type, target_id, file_path) values @@ -74,13 +74,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from dms_instance_file where target_type = 1 and target_id =#{targetId} + delete from dms_instance_file where target_type = '1' and target_id = #{targetId} - + delete from dms_instance_file where target_id = #{targetId} - + - +