Merge remote-tracking branch 'origin/dev_2307' into dev_2307

ant-design-vue-jeecg/src/views/requiremententity/RequirementEntityList.vue

@@ -95,15 +95,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
           <a @click="handleDetail(record)">详情</a>
           <a-divider type="vertical" />
           <a @click="fq(record.id)">废弃</a>
           <a-divider type="vertical" />
-          <a @click="zh(record)">转化</a>
+          <a :disabled="record.entityStatus!=9" @click="updateEntityStatus(record.id)">撤销</a>
           <a-divider type="vertical" />
-          <a :disabled="record.entityStatus!=9" @click="updateEntityStatus(record,'9')">撤销</a>
+          <a @click="zh(record)">转化</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
@@ -194,6 +193,7 @@
           importExcelUrl: "requiremententity/requirementEntity/importExcel",
           fq:"/requiremententity/requirementEntity/fq",
           hb:"/requiremententity/requirementEntity/hb",
+          cx:"/requiremententity/requirementEntity/cx",
 
         },
         dictOptions:{},
@@ -209,6 +209,16 @@
       },
     },
     methods: {
+      updateEntityStatus(id){
+        getAction(this.url.cx,{id:id}).then((res)=>{
+          if (res.success) {
+            this.$message.success(res.message);
+            this.loadData();
+          }else{
+            this.$message.warning(res.message);
+          }
+        });
+      },
       hb(hbsj){
         console.log(hbsj)
         if(hbsj.length<2){

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requiremententity/controller/RequirementEntityController.java

@@ -200,6 +200,26 @@ public class RequirementEntityController extends JeecgController<RequirementEnti
 		 return Result.OK("已废弃");
 	 }
 
+	 /**
+	  * 撤销废除
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "撤销废除")
+	 @ApiOperation(value="撤销废除", notes="撤销废除")
+	 @GetMapping(value = "/cx")
+	 public Result<?> cx(@RequestParam(name="id",required=true) String id) {
+		 RequirementEntity requirementEntity = requirementEntityService.getById(id);
+		 if(requirementEntity==null) {
+			 return Result.error("未找到对应数据");
+		 }else{
+			 requirementEntity.setEntityStatus(0);
+			 requirementEntityService.updateById(requirementEntity);
+		 }
+		 return Result.OK("已撤销废除");
+	 }
+
 	 /**
 	  *  合并
 	  *