更名变更登记业务调整

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

@@ -58,4 +58,15 @@ public class JgChangeRegistrationNameEq extends BaseEntity {
 	@TableField("create_user_name")
     private String createUserName;
 
+	/**
+     * 使用登记证id
+     */
+	@TableField("certificate_seq")
+    private String certificateSeq;
+
+    /**
+     * 使用登记证id
+     */
+    @TableField("equip_info")
+    private String equipInfo;
 }

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

@@ -36,7 +36,9 @@
     ur.create_user_id as createUserId,
     ur.next_executor_ids as nextExecutorIds,
     ur.next_execute_user_ids as nextExecuteUserIds,
-    ur.next_task_id as nextTaskId
+    ur.next_task_id as nextTaskId,
+    (SELECT group_concat(use_registration_code) from  tzs_jg_use_registration_manage where sequence_nbr in (SELECT
+    certificate_seq	from tzs_jg_change_registration_name_eq where name_change_registration_id = ur.sequence_nbr)) as certificateCodes
     from tzs_jg_change_registration_name ur
     <where>
         and  ur.is_delete = 0

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationNameDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationNameServiceImpl;
 import io.swagger.annotations.Api;
@@ -13,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -95,7 +97,7 @@ public class JgChangeRegistrationNameController extends BaseController {
         jgChangeRegistrationNameService.flowExecute(Long.valueOf(String.valueOf(jgScrapCancelDto.getSequenceNbr())),
                 jgScrapCancelDto.getInstanceId(),
                 String.valueOf(map.get("operate")),
-                String.valueOf(map.get("operate")),
+                String.valueOf(map.get("remark")),
                 String.valueOf(map.get("nextTaskId")));
         return ResponseHelper.buildResponse("ok");
     }
@@ -131,6 +133,23 @@ public class JgChangeRegistrationNameController extends BaseController {
         return ResponseHelper.buildResponse(jgChangeRegistrationNameService.queryBySequenceNbr(sequenceNbr));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getTableData")
+    @ApiOperation(httpMethod = "GET", value = "获取", notes = "根据sequenceNbr查询单个详情")
+    public ResponseModel<Map<String, Object>> getTableData(JgUseRegistrationManageDto dto) {
+        if (ValidationUtil.isEmpty(dto.getUseUnitCreditCode())) {
+            // 不传的话取当前登录单位的统一信用代码
+            dto.setUseUnitCreditCode(getSelectedOrgInfo().getCompany().getCompanyCode());
+        }
+        if (!ValidationUtil.isEmpty(dto.getReceiveCompanyCode())){
+            String[] codes = dto.getReceiveCompanyCode().split("_");
+            if (!ValidationUtil.isEmpty(codes)){
+                dto.setReceiveCompanyCode(codes[0]);
+            }
+        }
+        return ResponseHelper.buildResponse(jgChangeRegistrationNameService.getTableData(dto));
+    }
+
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)