维保备案修改bug

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -225,9 +226,15 @@ public class JgMaintenanceContract extends BaseEntity {
 	@TableField("create_date")
     private Date createDate;
 
+    /**
+     * 流程状态
+     */
     @TableField("instance_status")
     private String instanceStatus;
 
+    /**
+     * 下步执行角色/人id
+     */
     @TableField("next_execute_ids")
     private String nextExecuteIds;
 
@@ -235,7 +242,7 @@ public class JgMaintenanceContract extends BaseEntity {
     private String promoter;
 
     /**
-     * 状态
+     * 办理状态
      */
     @TableField("status")
     private String status;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintenanceContractMapper.xml

@@ -167,7 +167,10 @@
                jui.USE_INNER_CODE,
                jfi.FACTORY_NUM,
                jui.ADDRESS as ADDRESS,
-               other.SUPERVISORY_CODE,
+               jri.EQU_DEFINE,
+               jri.PRODUCT_NAME,
+               jri.EQU_CODE,
+            other.SUPERVISORY_CODE,
                (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as EQU_CATEGORY
         from tzs_jg_maintenance_contract_eq mc
                  LEFT JOIN idx_biz_jg_use_info jui on mc.equ_id = jui.RECORD

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/JgMaintenanceContractServiceImpl.java

@@ -191,8 +191,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);
         taskV2Model.setTaskStatus(flowStatusEnum.getCode());
         taskV2Model.setTaskStatusLabel(flowStatusEnum.getName());
-        taskV2Model.setFlowStatus(this.getTaskStatusByName(contract.getApplyStatus()));
-        taskV2Model.setFlowStatusLabel(contract.getApplyStatus());
+        taskV2Model.setFlowStatus(this.getTaskStatusByName(contract.getStatus()));
+        taskV2Model.setFlowStatusLabel(contract.getStatus());
         taskV2Model.setTaskType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
         taskV2Model.setStartUser(contract.getCreateUserName());
         taskV2Model.setTaskTypeLabel(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName());
@@ -226,7 +226,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         // 待调整
         String taskCode = processTaskDTO.getNextTask().get(0).getKey();
         if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
-            contract.setApplyStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
             contract.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
         }
         contract.setPromoter(RequestContext.getExeUserId());
@@ -279,7 +278,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             contractDto.setMaintenanceUnitCode(splitMaintenanceUnitCode[0]);
             contractDto.setMaintenanceUnitName(splitMaintenanceUnitCode[1]);
         }
-        contractDto.setApplyStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
+        contractDto.setStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
         JgMaintenanceContract contract = new JgMaintenanceContract();
         boolean hasId = StringUtils.isEmpty(contractDto.getSequenceNbr());//没有id说明是新增
         BeanUtils.copyProperties(contractDto, contract);
@@ -360,7 +359,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 }
                 contract.setPromoter(RequestContext.getExeUserId());
                 contract.setNextExecuteIds(String.join(",", roleListNext));
-                contract.setApplyStatus(String.valueOf(WorkFlowStatusEnum.MAIN_RECEIVE.getPass()));
                 contract.setStatus(String.valueOf(WorkFlowStatusEnum.MAIN_RECEIVE.getPass()));
                 contract.setNextTaskId(nextTaskId);
                 executeOneStep(contract, taskName, nextUserIds, "0");
@@ -441,8 +439,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         params.put("relationId", contract.getInstanceId());
         params.put("taskStatus", flowStatusEnum.getCode());
         params.put("taskStatusLabel", flowStatusEnum.getName());
-        params.put("flowStatus", this.getTaskStatusByName(contract.getApplyStatus()));
-        params.put("flowStatusLabel", contract.getApplyStatus());
+        params.put("flowStatus", this.getTaskStatusByName(contract.getStatus()));
+        params.put("flowStatusLabel", contract.getStatus());
         return commonService.updateTaskModelNew(params);
     }
 
@@ -471,8 +469,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName());
             taskModelDto.setRelationId(dto.getInstanceId());
             taskModelDto.setExecuteUserIds(nextUserIds);
-            taskModelDto.setTaskStatus(this.getTaskCodeByName(dto.getApplyStatus()));
-            taskModelDto.setTaskStatusLabel(dto.getApplyStatus());
+            taskModelDto.setTaskStatus(this.getTaskCodeByName(dto.getStatus()));
+            taskModelDto.setTaskStatusLabel(dto.getStatus());
             taskModelDto.setStartUserId(dto.getCreateUserId());
             taskModelDto.setStartUser(reginParams.getUserModel().getRealName());
             taskModelDto.setStartUserCompanyName(dto.getUseUnitName());

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

@@ -57,13 +57,13 @@
     "type": "106",
     "pageType": "look",
     "name": "维保备案",
-    "url": "/mixuap?appId=1742358052905971713&id=1734191433109237761&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&pageType=edit&applyStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1735612073380966402&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&pageType=look&applyStatus=%s&instanceId=%s"
   },
   {
     "type": "106",
     "pageType": "edit",
     "name": "维保备案",
-    "url": "/mixuap?appId=1742358052905971713&id=1737347718667333633&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&pageType=edit&applyStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1735612073380966402&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&pageType=edit&applyStatus=%s&instanceId=%s"
   },
   {
     "type": "107",