移装变更登记，流程操作代码修改

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

@@ -122,13 +122,19 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
     /**
      * 创建人ID
      */
-    @TableField(value = "create_user_id", fill = FieldFill.INSERT_UPDATE)
+    @TableField(value = "create_user_id")
     private String createUserId;
 
     /**
+     * 创建人名称
+     */
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
      * 创建时间
      */
-	@TableField(value = "create_date", fill = FieldFill.INSERT_UPDATE)
+	@TableField(value = "create_date")
     private Date createDate;
 
     /**
@@ -198,8 +204,32 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
     private String promoter;
 
     /**
+     * 使用登记证书附件
+     */
+    @TableField("use_registration_certificate")
+    private String useRegistrationCertificate;
+
+    /**
+     * 流程状态
+     */
+    @TableField("instance_status")
+    private String instanceStatus;
+
+    /**
      *工作流下一节点任务id
      */
     @TableField(value = "next_task_id")
     private String nextTaskId;
+
+    /**
+     * 创建单位名称
+     */
+    @TableField(value = "create_user_company_name")
+    private String createUserCompanyName;
+
+    /**
+     * 设备种类名称
+     */
+    @TableField(value = "equip_list_name")
+    private String equipListName;
 }

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

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationTransferDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransfer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
@@ -20,4 +21,7 @@ public interface JgChangeRegistrationTransferMapper extends BaseMapper<JgChangeR
     void updatePromoter(@Param ("id")Long id);
 
     Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationTransferDto dto , @Param("roleIds") List<String> roleIds);
+
+    @Select("select name from tz_equipment_category  where code=#{code}")
+    String getEquiplistNameByEquiplist(String code);
 }

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

@@ -55,7 +55,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增移装变更登记登记", notes = "新增移装变更登记登记")
-	public ResponseModel<Boolean> save(@RequestParam(value = "submitType", required = false) String submitType,
+	public ResponseModel<Boolean> save(@RequestParam(value = "submitType") String submitType,
 									   @RequestBody JSONObject map) {
 		Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
 		if(ValidationUtil.isEmpty(tableData)){
@@ -78,7 +78,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/update")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新移装变更登记登记", notes = "根据sequenceNbr更新移装变更登记登记")
-	public ResponseModel<Boolean> updateBySequenceNbr(@RequestParam(value = "submitType", required = false) String submitType,
+	public ResponseModel<Boolean> updateBySequenceNbr(@RequestParam(value = "submitType") String submitType,
 													 @RequestBody JSONObject map) {
 		Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
 		if(ValidationUtil.isEmpty(tableData)){