设备注销

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -78,10 +77,15 @@ public class JgScrapCancelDto extends BaseDto {
     @ApiModelProperty(value = "设备ID")
     private String SEQUENCE_NBR;
 
+    @ApiModelProperty(value = "任务发起人id")
+    private String promoter;
 
     @ApiModelProperty(value = "终审通过时间")
     private Date auditPassDate;
 
+    @ApiModelProperty(value = "下一步任务ID")
+    private String nextTaskId;
+
 
     private List<String> roleIds;
 

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

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
@@ -25,91 +26,91 @@ public class JgScrapCancel extends BaseEntity {
     /**
      * 注销类型（1报废注销，2移装注销）
      */
-	@TableField("cancel_type")
+    @TableField("cancel_type")
     private String cancelType;
 
     /**
      * 申请编号
      */
-	@TableField("apply_no")
+    @TableField("apply_no")
     private String applyNo;
 
     /**
      * 流程实例id
      */
-	@TableField("instance_id")
+    @TableField("instance_id")
     private String instanceId;
 
     /**
      * 办理状态
      */
-	@TableField("audit_status")
+    @TableField("audit_status")
     private String auditStatus;
 
     /**
      * 状态
      */
-	@TableField("status")
+    @TableField("status")
     private String status;
 
     /**
      * 备注
      */
-	@TableField("remark")
+    @TableField("remark")
     private String remark;
 
     /**
      * 创建人ID
      */
-	@TableField("create_user_id")
+    @TableField("create_user_id")
     private String createUserId;
 
     /**
      * 创建时间
      */
-	@TableField("create_date")
+    @TableField("create_date")
     private Date createDate;
 
     /**
      * 流程状态
      */
-	@TableField("instance_status")
+    @TableField("instance_status")
     private String instanceStatus;
 
     /**
      * 下一执行节点ids
      */
-	@TableField("next_execute_ids")
+    @TableField("next_execute_ids")
     private String nextExecuteIds;
 
     /**
      * 接收机构代码
      */
-	@TableField("receive_org_code")
+    @TableField("receive_org_code")
     private String receiveOrgCode;
 
     /**
      * 接收机构
      */
-	@TableField("receive_org_name")
+    @TableField("receive_org_name")
     private String receiveOrgName;
 
     /**
      * 接收机构公司代码
      */
-	@TableField("receive_company_code")
+    @TableField("receive_company_code")
     private String receiveCompanyCode;
 
     /**
      * 注销证明
      */
-	@TableField("cancel_certificate")
+    @TableField("cancel_certificate")
     private String cancelCertificate;
 
     /**
      * 终审通过时间
      */
-	@TableField("audit_pass_date")
+    @TableField("audit_pass_date")
     private Date auditPassDate;
 
 
@@ -129,5 +130,11 @@ public class JgScrapCancel extends BaseEntity {
     @TableField(value = "use_unit_name")
     private String useUnitName;
 
+    /**
+     * 下一步任务ID
+     */
+    @TableField(value = "next_task_id")
+    private String nextTaskId;
+
 
 }

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

@@ -50,7 +50,9 @@ public class JgScrapCancelController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/updateInfo")
     @ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<JgScrapCancelDto> updateInfo(@RequestParam String submitType, @RequestBody Map<String, Object> model, @RequestParam(value = "op", required = false) String op) {
+    public ResponseModel<JgScrapCancelDto> updateInfo(@RequestParam String submitType,
+                                                      @RequestBody Map<String, Object> model,
+                                                      @RequestParam(value = "op", required = false) String op) {
         JgScrapCancelDto jgScrapCancelDto = BeanUtil.mapToBean(((LinkedHashMap) model.get("jgScrapCancelAdd")), JgScrapCancelDto.class, true);
         if (Objects.isNull(jgScrapCancelDto)) {
             throw new IllegalArgumentException("参数jgScrapCancelAdd不能为空");
@@ -66,8 +68,8 @@ public class JgScrapCancelController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
     public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
 
-        LinkedHashMap model1 = (LinkedHashMap) map.get("model");
-        LinkedHashMap jgScrapCancelInfo = (LinkedHashMap) model1.get("jgScrapCancelAdd");
+        LinkedHashMap<?, ?> model1 = (LinkedHashMap<?, ?>) map.get("model");
+        LinkedHashMap<?, ?> jgScrapCancelInfo = (LinkedHashMap<?, ?>) model1.get("jgScrapCancelAdd");
         jgScrapCancelInfo.remove("SEQUENCE_NBR");
         JgScrapCancelDto jgScrapCancelDto = JSON.parseObject(JSON.toJSONString(jgScrapCancelInfo), JgScrapCancelDto.class);
 

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

@@ -165,12 +165,12 @@
     "type": "113-2",
     "pageType": "look",
     "name": "注销报废",
-    "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&formType=detail&noticeStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "113-2",
     "pageType": "edit",
     "name": "注销报废",
-    "url": "/mixuap?appId=1742358052905971713&id=1737358169170014210&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&formType=edit&noticeStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737358169170014210&roleIds={roleIds}&userId={userId}&pageType=edit"
   }
 ]
\ No newline at end of file

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

@@ -5,6 +5,7 @@ import lombok.Getter;
 
 /**
  * 申请单枚举
+ *
  * @author LiuLin
  */
 
@@ -14,21 +15,21 @@ public enum ApplicationFormTypeEnum {
     /**
      * 申请单枚举
      */
-    AZGZ("AZGZ","GZ_AZ"),//安装告知
-    WBBA("WBBA","WB_BA"),//维保备案
-    SYDJ("SYDJ","DJ_SY"),//使用登记
-    SBYJ("SBYJ","SB_YJ"),//设备移交
-    GZGZ("GZGZ","GZ_GZ"),//改造告知
-    WXGZ("WXGZ","GZ_WX"),//维修告知
-    YZGZ("YZGZ","GZ_YZ"),//移装告知
-    GZBG("GZBG","DJ_GZ"),//改造变更登记
-    YZBG("YZBG","DJ_YZ"),//移装变更登记
-    DWBG("DWBG","DJ_DW"),//单位变更登记
-    JY("JY",""),
-    JG("JG",""),// 检验结果
-    SBZX("SBZX","BF_YZ"),//电梯（设备）注销
-    GMBG("GMBG","DJ_GM"),//更名变更
-    TYQY("TYQY","SB_QY")//停用启用
+    AZGZ("AZGZ", "GZ_AZ"),//安装告知
+    WBBA("WBBA", "WB_BA"),//维保备案
+    SYDJ("SYDJ", "DJ_SY"),//使用登记
+    SBYJ("SBYJ", "SB_YJ"),//设备移交
+    GZGZ("GZGZ", "GZ_GZ"),//改造告知
+    WXGZ("WXGZ", "GZ_WX"),//维修告知
+    YZGZ("YZGZ", "GZ_YZ"),//移装告知
+    GZBG("GZBG", "DJ_GZ"),//改造变更登记
+    YZBG("YZBG", "DJ_YZ"),//移装变更登记
+    DWBG("DWBG", "DJ_DW"),//单位变更登记
+    JY("JY", ""),
+    JG("JG", ""),// 检验结果
+    SBZX("SBZX", "BF_ZX"),//电梯（设备）注销
+    GMBG("GMBG", "DJ_GM"),//更名变更
+    TYQY("TYQY", "SB_QY")//停用启用
     ;
 
     /**