Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgMaintainNoticeService.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
+
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -64,7 +66,7 @@ public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> {
      * @param sequenceNbr 主键
      * @return pdf文件路径
      */
-    String generateMaintainNoticeReport(Long sequenceNbr);
+    void generateMaintainNoticeReport(Long sequenceNbr,HttpServletResponse response);
 
     boolean deleteBySequenceNbr(Long[] sequenceNbr);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgReformNoticeService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -65,5 +66,5 @@ public interface IJgReformNoticeService extends IService<JgReformNotice> {
      * @param sequenceNbr 主键
      * @return pdf文件路径
      */
-    String generateInstallationNoticeReport(Long sequenceNbr);
+    void generateInstallationNoticeReport(Long sequenceNbr,HttpServletResponse response);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgTransferNoticeService.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
 import jdk.nashorn.api.scripting.JSObject;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +30,6 @@ public interface IJgTransferNoticeService extends IService<JgTransferNotice> {
 
     List<JgTransferNotice> saveNotice(String submitType, Map<String, Object> model, ReginParams reginParams);
 
-    String generateTransferNoticeReport(Long sequenceNbr);
+    void generateTransferNoticeReport(Long sequenceNbr, HttpServletResponse response);
 
 }

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

@@ -19,6 +19,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -140,7 +141,7 @@ public class JgMaintainNoticeController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "维修告知列表全部数据查询", notes = "维修告知列表全部数据查询")
     @GetMapping(value = "/generate-report")
-    public ResponseModel<String> generateReport(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(iJgMaintainNoticeService.generateMaintainNoticeReport(sequenceNbr));
+    public void generateReport(HttpServletResponse response, @RequestParam("sequenceNbr") Long sequenceNbr) {
+        iJgMaintainNoticeService.generateMaintainNoticeReport(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/controller/JgReformNoticeController.java

@@ -18,6 +18,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 import java.util.Objects;
 
@@ -140,7 +141,7 @@ public class JgReformNoticeController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "改造告知列表全部数据查询", notes = "改造告知列表全部数据查询")
     @GetMapping(value = "/generate-report")
-    public ResponseModel<String> generateReport(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgReformNoticeService.generateInstallationNoticeReport(sequenceNbr));
+    public void generateReport(HttpServletResponse response, @RequestParam("sequenceNbr") Long sequenceNbr) {
+        jgReformNoticeService.generateInstallationNoticeReport(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/controller/JgTransferNoticeController.java

@@ -167,8 +167,8 @@ public class JgTransferNoticeController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "移装告知列表全部数据查询", notes = "移装造告知列表全部数据查询")
     @GetMapping(value = "/generate-report")
-    public ResponseModel<String> selectForList(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgTransferNoticeService.generateTransferNoticeReport(sequenceNbr));
+    public void selectForList(HttpServletResponse response,@RequestParam("sequenceNbr") Long sequenceNbr) {
+        jgTransferNoticeService.generateTransferNoticeReport(sequenceNbr,response);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -53,6 +53,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -365,7 +366,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
      * @return pdf文件路径
      */
     @Override
-    public String generateMaintainNoticeReport(Long sequenceNbr) {
+    public void generateMaintainNoticeReport(Long sequenceNbr, HttpServletResponse response) {
         if (Objects.isNull(sequenceNbr)) {
             throw new IllegalArgumentException("参数不能为空");
         }
@@ -377,11 +378,11 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName().substring(0,2));
 
         String tempFileName = "维修告知单_" + System.currentTimeMillis() + "_temp";
-        String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
-        // 更新到数据库
-        JgMaintainNotice.setNoticeReportUrl(url);
-        this.updateById(JgMaintainNotice);
-        return url;
+        // String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
+        // // 更新到数据库
+        // JgMaintainNotice.setNoticeReportUrl(url);
+        // this.updateById(JgMaintainNotice);
+        WordTemplateUtils.templateToPdfDownload(tempFileName, "installation-notification-report.ftl", placeholders, response);
     }
 
     @Override
@@ -805,7 +806,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                     jgMaintainNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                     jgMaintainNotice.setNextTaskId(workflowResultDto.getNextTaskId());
                     jgMaintainNoticeMapper.updateById(jgMaintainNotice);
-                    this.generateMaintainNoticeReport(jgMaintainNotice.getSequenceNbr());
                 } else {
                     jgMaintainNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                     if (!ObjectUtils.isEmpty(jgMaintainNotice.getInstanceStatus())) {

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

@@ -51,6 +51,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -321,7 +322,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
      * @return pdf文件路径
      */
     @Override
-    public String generateInstallationNoticeReport(Long sequenceNbr) {
+    public void generateInstallationNoticeReport(Long sequenceNbr, HttpServletResponse response) {
         if (Objects.isNull(sequenceNbr)) {
             throw new IllegalArgumentException("参数不能为空");
         }
@@ -334,13 +335,13 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName().substring(0, 2));
 
         String tempFileName = "改造告知单_" + System.currentTimeMillis() + "_temp";
-        String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
+        // String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
+        //
+        // // 更新到数据库
+        // JgReformNotice.setNoticeReportUrl(url);
+        // this.updateById(JgReformNotice);
 
-        // 更新到数据库
-        JgReformNotice.setNoticeReportUrl(url);
-        this.updateById(JgReformNotice);
-
-        return url;
+        WordTemplateUtils.templateToPdfDownload(tempFileName, "installation-notification-report.ftl", placeholders, response);
     }
 
 
@@ -754,7 +755,6 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                     jgReformNotice.setPromoter("");
                     this.updateLastTodo(jgReformNotice, FlowStatusEnum.TO_BE_FINISHED);
                     this.updateById(jgReformNotice);
-                    this.generateInstallationNoticeReport(jgReformNotice.getSequenceNbr());
                 } else {
                     jgReformNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                     if (!ObjectUtils.isEmpty(jgReformNotice.getInstanceStatus())) {

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

@@ -50,6 +50,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -209,7 +210,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
      * @return pdf文件路径
      */
     @Override
-    public String generateTransferNoticeReport(Long sequenceNbr) {
+    public void generateTransferNoticeReport(Long sequenceNbr, HttpServletResponse response) {
         if (Objects.isNull(sequenceNbr)) {
             throw new IllegalArgumentException("参数不能为空");
         }
@@ -223,13 +224,13 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_ADVICE_REMOVAL.getName().substring(0, 2));
 
         String tempFileName = "移装告知单_" + System.currentTimeMillis() + "_temp";
-        String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
+        // String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
+        //
+        // // 更新到数据库
+        // jgTransferNotice.setNoticeReportUrl(url);
+        // this.updateById(jgTransferNotice);
 
-        // 更新到数据库
-        jgTransferNotice.setNoticeReportUrl(url);
-        this.updateById(jgTransferNotice);
-
-        return url;
+        WordTemplateUtils.templateToPdfDownload(tempFileName, "installation-notification-report.ftl", placeholders, response);
     }
 
 
@@ -784,7 +785,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                     jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                     jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                     jgTransferNoticeMapper.updateById(jgTransferNotice);
-                    this.generateTransferNoticeReport(jgTransferNotice.getSequenceNbr());
                 } else {
                     jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                     jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());