Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

@@ -151,12 +151,8 @@ public class JgUseRegistrationManageController extends BaseController {
         ReginParams info = getSelectedOrgInfo();
         if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
             dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
-            if (!ValidationUtil.isEmpty(dto.getOriginalUseUnitCreditCode())) {
-                dto.setUseUnitCreditCode(dto.getOriginalUseUnitCreditCode());
-            } else {
             dto.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(info.getCompany().getCompanyType()) ?
                 info.getCompany().getCompanyCode().split("_")[1] : info.getCompany().getCompanyCode());
-            }
         } else {
             dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
             dto.setReceiveCompanyCode(info.getCompany().getCompanyCode());
@@ -254,5 +250,21 @@ public class JgUseRegistrationManageController extends BaseController {
         jgUseRegistrationManageServiceImpl.printCertificate(response,printType, certificateSeq);
     }
 
-
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/unitChange/page")
+    @ApiOperation(httpMethod = "GET", value = "单位变更分页查询", notes = "单位变更分页查询")
+    public ResponseModel<Page<JgUseRegistrationManageDto>> queryForUnitChangePage(JgUseRegistrationManageDto dto,
+                                                                        @RequestParam(value = "sort", required = false) String sort,
+                                                                        @RequestParam(value = "current") int current,
+                                                                        @RequestParam(value = "size") int size) {
+        Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        if (!ValidationUtil.isEmpty(dto.getOriginalUseUnitCreditCode())) {
+            dto.setUseUnitCreditCode(dto.getOriginalUseUnitCreditCode());
+        } else {
+            return ResponseHelper.buildResponse(page);
+        }
+        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(page, dto, sort));
+    }
 }