代码修改

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workflowworknode/vo/ApprovalNodeReqVO.java

@@ -19,4 +19,10 @@ public class ApprovalNodeReqVO {
     @Schema(description = "表单内容")
     private String formData;
 
+    @Schema(description = "盲板设备编号")
+    private String deviceNumber;
+
+    @Schema(description = "附件文件")
+    private String attachments;
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workflowworknode/vo/WorkflowWorkNodeRespVO.java

@@ -155,6 +155,12 @@ public class WorkflowWorkNodeRespVO {
     @Schema(description = "紧急程度")
     private String urgencyLevel;
 
+    @Schema(description = "盲板设备编号")
+    private String deviceNumber;
+
+    @Schema(description = "附件文件")
+    private String attachments;
+
     @Schema(description = "作业单号")
     private String orderNo;
 

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/dataobject/workdesign/WorkflowWorkNodeDO.java

@@ -160,5 +160,13 @@ public class WorkflowWorkNodeDO extends BaseDO {
      * 任务进度(1取设备 /解除共锁 2上锁/取设备解锁 3共锁/还设备)
      */
     private String nodeProgress;
+    /**
+     * 盲板设备编号
+     */
+    private String deviceNumber;
+    /**
+     * 附件文件
+     */
+    private String attachments;
 
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/isolationpoint/IsolationPointServiceImpl.java

@@ -10,8 +10,6 @@ import cn.iocoder.yudao.module.iscs.controller.admin.isolationpoint.vo.Isolation
 import cn.iocoder.yudao.module.iscs.controller.admin.isolationpoint.vo.IsolationPointSaveReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.isolationpoint.vo.PointDetailVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.isolationpoint.IsolationPointDO;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.lotostation.LotoStationDO;
-import cn.iocoder.yudao.module.iscs.dal.dataobject.mappoint.MapPointDO;
 import cn.iocoder.yudao.module.iscs.dal.dto.hardwareApi.UpdateSwitchStatusDTO;
 import cn.iocoder.yudao.module.iscs.dal.mysql.isolationpoint.IsolationPointMapper;
 import cn.iocoder.yudao.module.iscs.service.lotostation.LotoStationService;
@@ -72,12 +70,12 @@ public class IsolationPointServiceImpl extends ServiceImpl<IsolationPointMapper,
                 .eq(IsolationPointDO::getPointNfc, createReqVO.getPointNfc()));
         Assert.isTrue(list2.isEmpty(), "该NFC已被使用!");
         // 检查isc_rfid_token中有没有改点位如果没有则新增一个
-        Long l = rfidTokenService.insertRfidByRfid(createReqVO.getPointNfc());
-        createReqVO.setRfidId(l);
+        // Long l = rfidTokenService.insertRfidByRfid(createReqVO.getPointNfc());
+        // createReqVO.setRfidId(l);
         IsolationPointDO isolationPointDO = BeanUtils.toBean(createReqVO, IsolationPointDO.class);
         save(isolationPointDO);
         // 如果绑定的loto站已经绑定了mapId,则需要往is_map_point插入数据
-        if (createReqVO.getLotoId() != null) {
+        /*if (createReqVO.getLotoId() != null) {
             LotoStationDO lotoStation = lotoStationService.getById(createReqVO.getLotoId());
             if (lotoStation.getMapId() != null) {
                 MapPointDO point = new MapPointDO();
@@ -86,7 +84,7 @@ public class IsolationPointServiceImpl extends ServiceImpl<IsolationPointMapper,
                 point.setEntityId(isolationPointDO.getId());
                 mapPointService.save(point);
             }
-        }
+        }*/
 
         // 返回
         return isolationPointDO.getId();
@@ -112,8 +110,8 @@ public class IsolationPointServiceImpl extends ServiceImpl<IsolationPointMapper,
                 .ne(IsolationPointDO::getId, updateReqVO.getId()));
         Assert.isTrue(list2.isEmpty(), "该NFC已被使用!");
         // 检查isc_rfid_token中有没有改点位如果没有则新增一个
-        Long l = rfidTokenService.insertRfidByRfid(updateReqVO.getPointNfc());
-        updateReqVO.setRfidId(l);
+        // Long l = rfidTokenService.insertRfidByRfid(updateReqVO.getPointNfc());
+        // updateReqVO.setRfidId(l);
         // 更新
         IsolationPointDO updateObj = BeanUtils.toBean(updateReqVO, IsolationPointDO.class);
         isolationPointMapper.updateById(updateObj);

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkServiceImpl.java

@@ -88,8 +88,6 @@ public class WorkflowWorkServiceImpl extends ServiceImpl<WorkflowWorkMapper, Wor
         workflowWork.setInitiatorId(loginUser.getId());
         workflowWork.setInitiatorName(loginUser.getInfo().get("nickname"));
         workflowWork.setInitiationTime(LocalDateTime.now());
-        // 插入之前检查生成的orderNo是否唯一
-
         workflowWorkMapper.insert(workflowWork);
 
         // 开始生成节点信息
@@ -406,8 +404,9 @@ public class WorkflowWorkServiceImpl extends ServiceImpl<WorkflowWorkMapper, Wor
                     .set(WorkflowWorkNodeDO::getApprovalStatus, vo.getApprovalStatus())
                     .set(WorkflowWorkNodeDO::getApprovalOpinion, vo.getApprovalOpinion())
                     .set(WorkflowWorkNodeDO::getFormData, vo.getFormData())
-                    .set(WorkflowWorkNodeDO::getEndTime, now)
-            );
+                    .set(WorkflowWorkNodeDO::getDeviceNumber, vo.getDeviceNumber())
+                    .set(WorkflowWorkNodeDO::getAttachments, vo.getAttachments())
+                    .set(WorkflowWorkNodeDO::getEndTime, now));
         } else if ("approved".equals(vo.getApprovalStatus())) {
             // 如果是通过，需要更新node状态，开启后面的节点
             workflowWorkNodeService.update(Wrappers.<WorkflowWorkNodeDO>lambdaUpdate()
@@ -415,8 +414,9 @@ public class WorkflowWorkServiceImpl extends ServiceImpl<WorkflowWorkMapper, Wor
                     .set(WorkflowWorkNodeDO::getApprovalStatus, vo.getApprovalStatus())
                     .set(WorkflowWorkNodeDO::getApprovalOpinion, vo.getApprovalOpinion())
                     .set(WorkflowWorkNodeDO::getFormData, vo.getFormData())
-                    .set(WorkflowWorkNodeDO::getEndTime, now)
-            );
+                    .set(WorkflowWorkNodeDO::getDeviceNumber, vo.getDeviceNumber())
+                    .set(WorkflowWorkNodeDO::getAttachments, vo.getAttachments())
+                    .set(WorkflowWorkNodeDO::getEndTime, now));
 
             // isc_workflow_work_log日志记录
             workflowWorkLogService.createWorkflowWorkLog(nodeDO.getId(), null);