1、修改设备申请中报废和回收设备的绑定ID

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/applicationform/service/impl/ApplicationFormServiceImpl.java

@@ -99,7 +99,7 @@ public class ApplicationFormServiceImpl implements IApplicationFormService {
         validateExists(updateReqVO.getId());
         ApplicationForm applicationForm = BeanUtil.copyProperties(updateReqVO, ApplicationForm.class);
         formMapper.updateById(applicationForm);
-        String id = updateReqVO.getId();
+        String id = applicationForm.getInstanceId();
         List<OaEquipmentInventoryList> scrapList = updateReqVO.getScrapList();
         List<ScrapList> newScrapList = new ArrayList<>();
         if (scrapList != null && !scrapList.isEmpty()) {
@@ -212,7 +212,7 @@ public class ApplicationFormServiceImpl implements IApplicationFormService {
         map.put("applicationTypeList", JSON.toJSONString(sourceList));
         List<Select> pickList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.NEW_EQUIPMENT_APPLICATION_TYPE).getCheckedData());
         map.put("newEquipmentList", JSON.toJSONString(pickList));
-        String id = entity.getId();
+        String id = entity.getInstanceId();
         List<ScrapList> scrapLists = scrapListMapper.selectList(new LambdaQueryWrapper<ScrapList>().eq(ScrapList::getApplicationNumber, id));
         map.put("scrapList", JSON.toJSONString(scrapLists));
         List<RecycleList> recycleLists = recycleListMapper.selectList(new LambdaQueryWrapper<RecycleList>().eq(RecycleList::getApplicationNumber, id));

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/mapper/OaEquipmentMapper.java

@@ -1,8 +1,13 @@
 package com.zjugis.module.business.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zjugis.framework.workflow.utils.Constant;
 import com.zjugis.module.business.flow.applicationform.entity.OaEquipmentInventoryList;
 import com.zjugis.module.business.flow.applicationform.vo.InputSelectVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -25,4 +30,5 @@ public interface OaEquipmentMapper extends BaseMapper<OaEquipmentInventoryList>
     List<InputSelectVO> getDeviceDepartList();
 
     List<InputSelectVO> getDeviceUserList();
+
 }

zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/ProjectInfo/js/index.js

@@ -89,6 +89,7 @@
     }
 
     function generateTableTrHtml(i) {
+        var btnDisabled = $("#addData").disabled ? disabled : ''
         var trDom = document.createElement("tr");
         trDom.style.backgroundColor = "#fff";
         trDom.id = "qjsj_" + i;
@@ -172,10 +173,10 @@
             + '</td>'
             + '<td>'
             + '<div style="display: flex;white-space: nowrap">'
-            + '<div id="editBtn_' + (i) + '" style="margin: 0 10px" class="table-btn editBtn_' + (i) + '" data-index="' + (i) + '">'
+            + '<div id="editBtn_' + (i) + '" style="margin: 0 10px" class="table-btn editBtn_' + (i) + '" data-index="' + (i) + '"' + btnDisabled + '>'
             + '<span>保存</span>'
             + '</div>'
-            + '<div id="delBtn_' + (i) + '" style="margin: 0 10px" class="table-btn delBtn_' + (i) + '" data-index="' + (i) + '">'
+            + '<div id="delBtn_' + (i) + '" style="margin: 0 10px" class="table-btn delBtn_' + (i) + '" data-index="' + (i) + '"' + btnDisabled + '>'
             + '<span>删除</span>'
             + '</div>'
             + '</div>'