移装报废修改为移装注销，注销报废改为报废注销

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgScrapCancelDto.java

@@ -12,14 +12,14 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 设备注销报废
+ * 设备报废注销
  *
  * @author system_generator
  * @date 2023-12-20
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "JgScrapCancelDto", description = "设备注销报废")
+@ApiModel(value = "JgScrapCancelDto", description = "设备报废注销")
 public class JgScrapCancelDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgScrapCancelEqDto.java

@@ -8,14 +8,14 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 注销报废设备关系表
+ * 报废注销设备关系表
  *
  * @author system_generator
  * @date 2023-12-20
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgScrapCancelEqDto", description="注销报废设备关系表")
+@ApiModel(value="JgScrapCancelEqDto", description="报废注销设备关系表")
 public class JgScrapCancelEqDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancel.java

@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
 import java.util.Date;
 
 /**
- * 设备注销报废
+ * 设备报废注销
  *
  * @author system_generator
  * @date 2023-12-20

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancelEq.java

@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 import java.util.Date;
 
 /**
- * 注销报废设备关系表
+ * 报废注销设备关系表
  *
  * @author system_generator
  * @date 2023-12-20

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/BusinessTypeEnum.java

@@ -35,8 +35,8 @@ public enum BusinessTypeEnum {
     JG_EQUIPMENT_START("112-1", "设备启用"),
     JG_EQUIPMENT_STOP("112-2", "设备停用"),
 
-    JG_EQUIPMENT_MOVE("113-1", "移装报废"),
-    JG_EQUIPMENT_CANCEL("113-2", "注销报废"),
+    JG_EQUIPMENT_MOVE("113-1", "移装注销"),
+    JG_EQUIPMENT_CANCEL("113-2", "报废注销"),
 
     JY_OPENING_APPLICATION("114", "业务开通"),
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgScrapCancelEqMapper.java

@@ -4,7 +4,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancelEq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * 注销报废设备关系表 Mapper 接口
+ * 报废注销设备关系表 Mapper 接口
  *
  * @author system_generator
  * @date 2023-12-20

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgScrapCancelMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 设备注销报废 Mapper 接口
+ * 设备报废注销 Mapper 接口
  *
  * @author system_generator
  * @date 2023-12-20

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgScrapCancelEqService.java

@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.jg.api.service;
 
 
 /**
- * 注销报废设备关系表接口类
+ * 报废注销设备关系表接口类
  *
  * @author system_generator
  * @date 2023-12-20

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgScrapCancelService.java

@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.jg.api.service;
 
 
 /**
- * 设备注销报废接口类
+ * 设备报废注销接口类
  *
  * @author system_generator
  * @date 2023-12-20

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgScrapCancelController.java

@@ -21,13 +21,13 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import java.util.*;
 
 /**
- * 设备注销报废
+ * 设备报废注销
  *
  * @author system_generator
  * @date 2023-12-20
  */
 @RestController
-@Api(tags = "设备注销报废Api")
+@Api(tags = "设备报废注销Api")
 @RequestMapping(value = "/jg-scrap-cancel")
 public class JgScrapCancelController extends BaseController {
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgScrapCancelEqController.java

@@ -18,13 +18,13 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
 /**
- * 注销报废设备关系表
+ * 报废注销设备关系表
  *
  * @author system_generator
  * @date 2023-12-20
  */
 @RestController
-@Api(tags = "注销报废设备关系表Api")
+@Api(tags = "报废注销设备关系表Api")
 @RequestMapping(value = "/jg-scrap-cancel-eq")
 public class JgScrapCancelEqController extends BaseController {
 
@@ -32,13 +32,13 @@ public class JgScrapCancelEqController extends BaseController {
     JgScrapCancelEqServiceImpl jgScrapCancelEqServiceImpl;
 
     /**
-     * 新增注销报废设备关系表
+     * 新增报废注销设备关系表
      *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增注销报废设备关系表", notes = "新增注销报废设备关系表")
+	@ApiOperation(httpMethod = "POST", value = "新增报废注销设备关系表", notes = "新增报废注销设备关系表")
 	public ResponseModel<JgScrapCancelEqDto> save(@RequestBody JgScrapCancelEqDto model) {
 	    model = jgScrapCancelEqServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
@@ -52,7 +52,7 @@ public class JgScrapCancelEqController extends BaseController {
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新注销报废设备关系表", notes = "根据sequenceNbr更新注销报废设备关系表")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新报废注销设备关系表", notes = "根据sequenceNbr更新报废注销设备关系表")
 	public ResponseModel<JgScrapCancelEqDto> updateBySequenceNbrJgScrapCancelEq(@RequestBody JgScrapCancelEqDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(jgScrapCancelEqServiceImpl.updateWithModel(model));
@@ -66,7 +66,7 @@ public class JgScrapCancelEqController extends BaseController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除注销报废设备关系表", notes = "根据sequenceNbr删除注销报废设备关系表")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除报废注销设备关系表", notes = "根据sequenceNbr删除报废注销设备关系表")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
         return ResponseHelper.buildResponse(jgScrapCancelEqServiceImpl.removeById(sequenceNbr));
     }
@@ -79,7 +79,7 @@ public class JgScrapCancelEqController extends BaseController {
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个注销报废设备关系表",  notes = "根据sequenceNbr查询单个注销报废设备关系表")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个报废注销设备关系表",  notes = "根据sequenceNbr查询单个报废注销设备关系表")
 	public ResponseModel<JgScrapCancelEqDto> selectOne(@PathVariable Long sequenceNbr) {
 	    return ResponseHelper.buildResponse(jgScrapCancelEqServiceImpl.queryBySeq(sequenceNbr));
 	}
@@ -93,7 +93,7 @@ public class JgScrapCancelEqController extends BaseController {
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "注销报废设备关系表分页查询",  notes = "注销报废设备关系表分页查询")
+	@ApiOperation(httpMethod = "GET",value = "报废注销设备关系表分页查询",  notes = "报废注销设备关系表分页查询")
 	public ResponseModel<Page<JgScrapCancelEqDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
                     (value = "size") int size) {
 	    Page<JgScrapCancelEqDto> page = new Page<JgScrapCancelEqDto>();
@@ -108,7 +108,7 @@ public class JgScrapCancelEqController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "注销报废设备关系表列表全部数据查询",   notes = "注销报废设备关系表列表全部数据查询")
+	@ApiOperation(httpMethod = "GET",value = "报废注销设备关系表列表全部数据查询",   notes = "报废注销设备关系表列表全部数据查询")
 	@GetMapping(value = "/list")
 	public ResponseModel<List<JgScrapCancelEqDto>> selectForList() {
 	    return ResponseHelper.buildResponse(jgScrapCancelEqServiceImpl.queryForJgScrapCancelEqList());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelEqServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
 
 /**
- * 注销报废设备关系表服务实现类
+ * 报废注销设备关系表服务实现类
  *
  * @author system_generator
  * @date 2023-12-20

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java

@@ -54,7 +54,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import java.util.*;
 
 /**
- * 设备注销报废服务实现类
+ * 设备报废注销服务实现类
  *
  * @author system_generator
  * @date 2023-12-20
@@ -94,7 +94,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     private IdxBizJgUseInfoMapper idxBizJgUseInfoMapper;
 
     /**
-     * 移装移装报废/注销报废判断
+     * 移装移装注销/报废注销判断
      *
      * @return BusinessTypeEnum 业务对应枚举
      */

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -236,37 +236,37 @@
   {
     "type": "113-1",
     "pageType": "draft",
-    "name": "移装报废",
+    "name": "移装注销",
     "url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "113-1",
     "pageType": "look",
-    "name": "移装报废",
+    "name": "移装注销",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "113-1",
     "pageType": "edit",
-    "name": "移装报废",
+    "name": "移装注销",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "113-2",
     "pageType": "draft",
-    "name": "注销报废",
+    "name": "报废注销",
     "url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "113-2",
     "pageType": "look",
-    "name": "注销报废",
+    "name": "报废注销",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "113-2",
     "pageType": "edit",
-    "name": "注销报废",
+    "name": "报废注销",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=edit"
   }
 ]
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/BusinessTypeEnum.java

@@ -35,8 +35,8 @@ public enum BusinessTypeEnum {
     JG_EQUIPMENT_START("112-1", "设备启用"),
     JG_EQUIPMENT_STOP("112-2", "设备停用"),
 
-    JG_EQUIPMENT_MOVE("113-1", "移装报废"),
-    JG_EQUIPMENT_CANCEL("113-2", "注销报废"),
+    JG_EQUIPMENT_MOVE("113-1", "移装注销"),
+    JG_EQUIPMENT_CANCEL("113-2", "报废注销"),
 
     JY_OPENING_APPLICATION("114", "业务开通"),
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

@@ -30,8 +30,8 @@ public enum ApplicationFormTypeEnum {
     DWBG("DWBG", "DJ_DW"),//单位变更登记
     JY("JY", ""),
     JG("JG", ""),// 检验结果
-    YZBF("YZBF", "BF_YZ"),//电梯（设备）移装报废
-    ZXBF("ZXBF", "BF_ZX"),//电梯（设备）注销报废
+    YZBF("YZBF", "BF_YZ"),//电梯（设备）移装注销
+    ZXBF("ZXBF", "BF_ZX"),//电梯（设备）报废注销
     GMBG("GMBG", "DJ_GM"),//更名变更
     SBQY("SBQY", "SB_QY"),//设备启用
     SBTY("SBTY", "SB_TY")//设备启用