2023-06-15，设备和质量修改

src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java

@@ -1053,4 +1053,6 @@ public interface EamMapper {
     String selectDeptByObjectID(String site, String objectID);
 
     String selectDeptByUserName(String site, String username);
+
+    void defectReportWorkOrder(EamWorkOrderInData inData);
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xujie.sys.modules.pms.service.Impl;
 
+import cn.hutool.log.Log;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xujie.sys.common.exception.XJException;
@@ -20,6 +21,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Logger;
 
 /**
 * @description: 设备清单接口实现
@@ -180,6 +182,8 @@ public class EamObjectServiceImpl implements EamObjectService {
 
         //处理路径和名称
         List<SysOssEntity> getFileData= eamObjectMapper.getFileData(id);
+        Logger log = Logger.getLogger("tesglog");
+        log.info(getFileData.get(0).getUrl());
         if(getFileData.size()==0){
             throw new RuntimeException("该文件不存在，请刷新列表");
         }

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

@@ -954,6 +954,7 @@ public class EamServiceImpl implements EamService {
     public PageUtils eamWorkOrderSearch(EamWorkOrderInData inData){
         // 查出全部要执行的工单
         IPage<EamWorkOrderInData> resultList = this.eamMapper.eamWorkOrderSearch(new Page<EamWorkOrderInData>(inData.getPage(), inData.getLimit()), inData);
+        if (inData.getFunctionType().equals("C")){
             // 存放结果集
             LinkedList<EamWorkOrderInData> list = new LinkedList<>();
             // 过滤
@@ -967,6 +968,7 @@ public class EamServiceImpl implements EamService {
                 }
             }
             resultList.setRecords(list);
+        }
         return new PageUtils(resultList);
     }
 
@@ -1178,7 +1180,13 @@ public class EamServiceImpl implements EamService {
         }
         inData.setActualOperator(check.get(0).getAdminID());
         // 更新工单的信息
+        if("C".equals(inData.getFunctionType()) || "B".equals(inData.getFunctionType())){
+            // 故障/维保
+            eamMapper.defectReportWorkOrder(inData);
+        }else {
+            // 点检
             eamMapper.reportWorkOrder(inData);
+        }
         // 更新故障表的信息
         eamMapper.updateDefectResult(inData);
         // 添加实际维修人员
@@ -1576,7 +1584,7 @@ public class EamServiceImpl implements EamService {
         List<SysOssEntity> list = eamMapper.searchFileUrl(data);
         for (int i = 0; i < list.size(); i++) {
             String s = list.get(i).getUrl().replaceAll("\\\\", "/");
-            String s1 = s.replace("D:/", "http://127.26.68.17:8091/");
+            String s1 = s.replace("D:/", "http://localhost:8083/");
             list.get(i).setUrl(s1);
         }
         return list;

src/main/resources/mapper/pms/EamMapper.xml

@@ -810,6 +810,20 @@ b.MinValue,b.ItemRemark,b.ItemType
        where site = #{site}
        and orderNo = #{orderNo}
     </update>
+
+    <update id="defectReportWorkOrder" >
+        update eam_workOrder
+        set Status = '已完工',
+            ActualOperator = #{actualOperator},
+            ActualDate = GetDate(),
+            Remark = #{remark},
+            disposal_measures = #{disposalMeasures},
+            WorkTime = #{workTime},
+            result = #{result,jdbcType=VARCHAR},
+            checkResult = #{checkResult}
+        where site = #{site}
+          and orderNo = #{orderNo}
+    </update>
     <insert id="saveWorkOrderItem">
         INSERT into eam_workOrder_item
             (Site,OrderNo,ItemNo,ItemDesc,DefaultValue,ValueType,ValueType_DB,ValueChooseFlag,MaxValue,MinValue,ItemRemark,ItemType,TextValue,NumberValue,CreatedDate,CreatedBy,FinishFlag,itemResult)