Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -189,24 +189,7 @@ public class JgChangeRegistrationUnitController extends BaseController {
 	@GetMapping(value = "/export")
 	@ApiOperation(httpMethod = "GET", value = "导出使用登记证", notes = "导出使用登记证")
 	public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr)  throws IOException {
-		File file = jgChangeRegistrationUnitServiceImpl.exportUseRegistrationCertificate(sequenceNbr);
-		if(ValidationUtil.isEmpty(file)){
-			throw new BadRequest("使用登记证导出失败,请稍后重试!");
-		}
-		FileInputStream in = new FileInputStream(file);
-		response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("使用登记证", "UTF-8") + ".pdf");
-		response.setHeader("content-Type", "application/msword");
-		response.setCharacterEncoding("utf-8");
-
-		OutputStream out = new BufferedOutputStream(response.getOutputStream());
-		int b = 0;
-		byte[] buffer = new byte[2048];
-		while ((b = in.read(buffer)) != -1) {
-			out.write(buffer, 0, b);
-		}
-		in.close();
-		out.flush();
-		out.close();
+		jgChangeRegistrationUnitServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response);
 	}
 
 }

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

@@ -46,6 +46,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -692,7 +693,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
      *
      * @param sequenceNbr
      */
-    public File exportUseRegistrationCertificate(String sequenceNbr) {
+    public void exportUseRegistrationCertificate(String sequenceNbr , HttpServletResponse response) {
         Map<String, Object> exportParamsMap = new HashMap<>();
         //查询移装变更详情
         JgChangeRegistrationUnit transfer = this.getById(sequenceNbr);
@@ -766,7 +767,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum());
         }
         //调用生成使用登记证
-        return commonService.generateCertificateReport(exportParamsMap);
+       commonService.generateCertificateReport(exportParamsMap, response);
     }
 
 }
\ No newline at end of file