From 45c3b2b7c9a0cea2db3344ad8c9c99054786a2c2 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Wed, 25 Oct 2023 10:17:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E6=8E=A5=E5=8F=A3-=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=E5=B7=A5=E5=8D=95-=E6=8F=90=E4=BA=A4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/mapper/EquOrderStandardMapper.java |  7 +++
 .../service/impl/DevicePDAServiceImpl.java    | 45 +++++++++++++++++++
 .../mapper/device/EquOrderMapper.xml          |  2 +-
 .../mapper/device/EquOrderStandardMapper.xml  | 16 +++++++
 4 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java
index 591682880..f2ae00591 100644
--- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java
+++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java
@@ -2,6 +2,7 @@ package com.op.device.mapper;
 
 import java.util.List;
 
+import com.op.common.core.domain.BaseFileData;
 import com.op.device.domain.EquOrderStandard;
 
 /**
@@ -65,4 +66,10 @@ public interface EquOrderStandardMapper {
      * @return
      */
     List<EquOrderStandard> selectEquOrderStandardByParentCode(String code);
+
+    /**
+     * 图片数据绑定
+     * @param files
+     */
+    void insertBaseFileBatch(List<BaseFileData> files);
 }
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
index 7469adbb8..9c6604d6f 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
@@ -1,7 +1,13 @@
 package com.op.device.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.op.common.core.context.SecurityContextHolder;
+import com.op.common.core.domain.BaseFileData;
+import com.op.common.core.utils.DateUtils;
+import com.op.common.core.utils.StringUtils;
+import com.op.common.core.utils.uuid.IdUtils;
 import com.op.common.core.web.domain.AjaxResult;
+import com.op.common.security.utils.SecurityUtils;
 import com.op.device.domain.EquOrder;
 import com.op.device.domain.EquOrderDetail;
 import com.op.device.domain.EquOrderEqu;
@@ -121,12 +127,51 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
 
     /**
      * TODO 填写巡检记录工单
+     *
      * @param equOrder
      * @return
      */
     @Override
     @DS("#header.poolName")
     public AjaxResult updateInspectionRecord(EquOrder equOrder) {
+        // 改变工单状态-已完成
+        equOrder.setOrderStatus("1");
+
+        EquOrderEqu equ = equOrder.getEqu();
+        List<EquOrderDetail> detailList = equ.getDetailList();
+        for (EquOrderDetail detail : detailList) {
+            List<EquOrderStandard> standardList = detail.getStandardList();
+            for (EquOrderStandard standard : standardList) {
+
+                //上传附件
+                if (StringUtils.isNotEmpty(standard.getPicturePath())) {
+                    String[] ids = standard.getPicturePath().split(",");
+                    List<BaseFileData> files = new ArrayList<>();
+                    BaseFileData file = null;
+                    for (String id : ids) {
+                        file = new BaseFileData();
+                        file.setFileId(IdUtils.fastSimpleUUID());
+                        file.setFileName(id.split("&fileName=")[1]);
+                        file.setFileAddress(id);
+                        file.setSourceId(standard.getId());
+                        file.setCreateBy(SecurityUtils.getUsername());
+                        file.setCreateTime(new Date());
+                        files.add(file);
+                    }
+                    equOrderStandardMapper.insertBaseFileBatch(files);
+                }
+
+                // 更新标准
+                standard.setUpdateTime(DateUtils.getNowDate());
+                equOrderStandardMapper.updateEquOrderStandard(standard);
+
+            }
+        }
+
+        // 更新工单信息
+        equOrder.setUpdateTime(DateUtils.getNowDate());
+        equOrderMapper.updateEquOrder(equOrder);
+
         return success(equOrder);
     }
 }
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
index 331e1b559..79067b5b4 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
@@ -88,7 +88,7 @@
 
 	<select id="selectTodayTask" resultType="java.lang.Integer" resultMap="EquOrderResult">
 		<include refid="selectEquOrderVo"/>
-		where CONVERT(date,GETDATE()) > order_start and plan_type = 'inspection' and del_flag = '0' and order_status != '1' and order_code in (
+		where CONVERT(date,GETDATE()) > plan_loop_start and plan_type = 'inspection' and del_flag = '0' and order_status != '1' and order_code in (
 		select order_code from equ_order_person where del_flag = '0' and user_id = #{userId} GROUP BY order_code
 		)
 	</select>
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml
index bbe4b54f0..0aaa77396 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml
@@ -117,6 +117,22 @@
         </trim>
     </insert>
 
+    <insert id="insertBaseFileBatch">
+        INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time)
+        VALUES
+        <foreach collection="baseFiles" index="" item="baseFile" separator=",">
+            (
+            #{baseFile.fileId},
+            #{baseFile.fileName},
+            #{baseFile.fileAddress},
+            #{baseFile.sourceId},
+            #{baseFile.remark},
+            #{baseFile.createBy},
+            #{baseFile.createTime}
+            )
+        </foreach>
+    </insert>
+
     <update id="updateEquOrderStandard" parameterType="EquOrderStandard">
         update equ_order_standard
         <trim prefix="SET" suffixOverrides=",">