From a36568cb053817ccd50c1f3a56154eee51ca708a Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Tue, 10 May 2022 18:08:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A8=E5=8D=95=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/design/FormController.java | 26 +++ .../route/design/FormRouteController.java | 6 + .../module/form/dao/design/IFormDao.java | 2 + .../module/form/pojo/pos/design/FormPO.java | 9 + .../module/form/pojo/vos/design/FormVO.java | 10 + .../form/service/design/IFormService.java | 17 ++ .../design/impl/FormDesignServiceImpl.java | 18 ++ .../service/design/impl/FormServiceImpl.java | 17 ++ .../mybatis/mapper/design/form-mapper.xml | 23 +++ .../templates/form/get-print-page-code.html | 176 ++++++++++++++++++ .../main/resources/templates/form/list.html | 17 ++ .../templates/ftl/page/web/oa/form-print.ftl | 32 ++++ 12 files changed, 353 insertions(+) create mode 100644 module-form/src/main/resources/templates/form/get-print-page-code.html create mode 100644 module-form/src/main/resources/templates/ftl/page/web/oa/form-print.ftl diff --git a/module-form/src/main/java/ink/wgink/module/form/controller/api/design/FormController.java b/module-form/src/main/java/ink/wgink/module/form/controller/api/design/FormController.java index a0a8294e..4b9d262a 100644 --- a/module-form/src/main/java/ink/wgink/module/form/controller/api/design/FormController.java +++ b/module-form/src/main/java/ink/wgink/module/form/controller/api/design/FormController.java @@ -112,6 +112,19 @@ public class FormController extends DefaultBaseController { return new SuccessResult(); } + @ApiOperation(value = "修改打印页面代码", notes = "修改打印页面代码接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "formId", value = "表单ID", paramType = "path") + }) + @PutMapping("update-print-page-code/{formId}") + public SuccessResult updatePrintPageCode(@PathVariable("formId") String formId, @RequestBody FormVO formVO) { + if (StringUtils.isBlank(formVO.getPrintPageCode())) { + throw new ParamsException("代码不能为空"); + } + formService.updatePrintPageCode(formId, formVO.getPrintPageCode()); + return new SuccessResult(); + } + @ApiOperation(value = "修改App新增页面代码", notes = "修改App新增页面代码接口") @ApiImplicitParams({ @ApiImplicitParam(name = "formId", value = "表单ID", paramType = "path") @@ -219,6 +232,19 @@ public class FormController extends DefaultBaseController { return formDTO; } + @ApiOperation(value = "打印页面代码", notes = "打印页面代码接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "formCode", value = "表单编码", paramType = "path"), + @ApiImplicitParam(name = "formVersion", value = "表单版本", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get-print-page-code/code/{formCode}/version/{formVersion}") + public FormDTO getPrintPageCode(@PathVariable("formCode") String formCode, @PathVariable("formVersion") Integer formVersion) { + FormDTO formDTO = new FormDTO(); + formDTO.setPrintPageCode(formService.getPrintPageCodeByCodeAndVersion(formCode, formVersion)); + return formDTO; + } + @ApiOperation(value = "APP新增页面代码", notes = "APP新增页面代码接口") @ApiImplicitParams({ @ApiImplicitParam(name = "formCode", value = "表单编码", paramType = "path"), diff --git a/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormRouteController.java b/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormRouteController.java index 885d9adf..03191441 100644 --- a/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormRouteController.java +++ b/module-form/src/main/java/ink/wgink/module/form/controller/route/design/FormRouteController.java @@ -48,6 +48,12 @@ public class FormRouteController { return mv; } + @GetMapping("get-print-page-code") + public ModelAndView getPrintPageCode() { + ModelAndView mv = new ModelAndView("form/get-print-page-code"); + return mv; + } + @GetMapping("get-app-save-page-code") public ModelAndView getAppSavePageCode() { ModelAndView mv = new ModelAndView("form/get-app-save-page-code"); diff --git a/module-form/src/main/java/ink/wgink/module/form/dao/design/IFormDao.java b/module-form/src/main/java/ink/wgink/module/form/dao/design/IFormDao.java index 2b0ad62d..f1aafb6e 100644 --- a/module-form/src/main/java/ink/wgink/module/form/dao/design/IFormDao.java +++ b/module-form/src/main/java/ink/wgink/module/form/dao/design/IFormDao.java @@ -49,6 +49,8 @@ public interface IFormDao extends IInitBaseTable { String getShowPageCodeByCodeAndVersion(Map params) throws SearchException; + String getPrintPageCodeByCodeAndVersion(Map params) throws SearchException; + String getAppSavePageCodeByCodeAndVersion(Map params) throws SearchException; String getAppUpdatePageCodeByCodeAndVersion(Map params) throws SearchException; diff --git a/module-form/src/main/java/ink/wgink/module/form/pojo/pos/design/FormPO.java b/module-form/src/main/java/ink/wgink/module/form/pojo/pos/design/FormPO.java index f32e1f66..ad1a74f5 100644 --- a/module-form/src/main/java/ink/wgink/module/form/pojo/pos/design/FormPO.java +++ b/module-form/src/main/java/ink/wgink/module/form/pojo/pos/design/FormPO.java @@ -16,6 +16,7 @@ public class FormPO implements Serializable { private String savePageCode; private String updatePageCode; private String showPageCode; + private String printPageCode; private String appSavePageCode; private String appUpdatePageCode; private String appShowPageCode; @@ -116,6 +117,14 @@ public class FormPO implements Serializable { this.showPageCode = showPageCode; } + public String getPrintPageCode() { + return printPageCode == null ? "" : printPageCode.trim(); + } + + public void setPrintPageCode(String printPageCode) { + this.printPageCode = printPageCode; + } + public String getAppSavePageCode() { return appSavePageCode == null ? "" : appSavePageCode.trim(); } diff --git a/module-form/src/main/java/ink/wgink/module/form/pojo/vos/design/FormVO.java b/module-form/src/main/java/ink/wgink/module/form/pojo/vos/design/FormVO.java index e0ab7f0b..d65d79c4 100644 --- a/module-form/src/main/java/ink/wgink/module/form/pojo/vos/design/FormVO.java +++ b/module-form/src/main/java/ink/wgink/module/form/pojo/vos/design/FormVO.java @@ -28,6 +28,8 @@ public class FormVO { private String updatePageCode; @ApiModelProperty(name = "showPageCode", value = "展示页面代码") private String showPageCode; + @ApiModelProperty(name = "printPageCode", value = "打印页面代码") + private String printPageCode; @ApiModelProperty(name = "appSavePageCode", value = "APP新增页面代码") private String appSavePageCode; @ApiModelProperty(name = "appUpdatePageCode", value = "APP修改页面代码") @@ -125,6 +127,14 @@ public class FormVO { this.showPageCode = showPageCode; } + public String getPrintPageCode() { + return printPageCode == null ? "" : printPageCode.trim(); + } + + public void setPrintPageCode(String printPageCode) { + this.printPageCode = printPageCode; + } + public String getAppSavePageCode() { return appSavePageCode == null ? "" : appSavePageCode.trim(); } diff --git a/module-form/src/main/java/ink/wgink/module/form/service/design/IFormService.java b/module-form/src/main/java/ink/wgink/module/form/service/design/IFormService.java index a207e941..eb8d7f5f 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/design/IFormService.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/design/IFormService.java @@ -110,6 +110,14 @@ public interface IFormService { */ void updateShowPageCode(String formId, String showPageCode); + /** + * 修改打印页面代码 + * + * @param formId + * @param printPageCode + */ + void updatePrintPageCode(String formId, String printPageCode); + /** * 修改App新增页面代码 * @@ -218,6 +226,15 @@ public interface IFormService { */ String getShowPageCodeByCodeAndVersion(String formCode, Integer formVersion); + /** + * 打印页面代码 + * + * @param formCode + * @param formVersion + * @return + */ + String getPrintPageCodeByCodeAndVersion(String formCode, Integer formVersion); + /** * APP新增页面代码 * diff --git a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormDesignServiceImpl.java b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormDesignServiceImpl.java index 44177a7b..18691a6c 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormDesignServiceImpl.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormDesignServiceImpl.java @@ -129,6 +129,7 @@ public class FormDesignServiceImpl extends DefaultBaseService implements IFormDe formVO.setSavePageCode(getSavePageCode(model, formDesignVO.getFormType())); formVO.setUpdatePageCode(getUpdatePageCode(model, formDesignVO.getFormType())); formVO.setShowPageCode(getShowPageCode(model, formDesignVO.getFormType())); + formVO.setPrintPageCode(getPrintPageCode(model, formDesignVO.getFormType())); formVO.setAppSavePageCode(getAppSavePageCode(model, formDesignVO.getFormType())); formVO.setAppUpdatePageCode(getAppUpdatePageCode(model, formDesignVO.getFormType())); formVO.setAppShowPageCode(getAppShowPageCode(model, formDesignVO.getFormType())); @@ -200,6 +201,23 @@ public class FormDesignServiceImpl extends DefaultBaseService implements IFormDe throw new ParamsException("表单类型错误"); } + /** + * 打印页面模板 + * + * @param model + * @param formType + * @return + * @throws IOException + */ + private String getPrintPageCode(Map model, String formType) throws IOException { + if (StringUtils.equals(FormTypeEnum.DEFAULT.getValue(), formType)) { + return null; + } else if (StringUtils.equals(FormTypeEnum.OA.getValue(), formType)) { + return getTemplateCode("/page/web/oa/form-print.ftl", model); + } + throw new ParamsException("表单类型错误"); + } + /** * app新增页面模板 * diff --git a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java index 8d61be59..53d59db0 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java @@ -190,6 +190,15 @@ public class FormServiceImpl extends DefaultBaseService implements IFormService formDao.update(params); } + @Override + public void updatePrintPageCode(String formId, String printPageCode) { + Map params = getHashMap(4); + params.put("formId", formId); + params.put("printPageCode", printPageCode); + setUpdateInfo(params); + formDao.update(params); + } + @Override public void updateAppSavePageCode(String formId, String appSavePageCode) { Map params = getHashMap(4); @@ -292,6 +301,14 @@ public class FormServiceImpl extends DefaultBaseService implements IFormService return formDao.getShowPageCodeByCodeAndVersion(params); } + @Override + public String getPrintPageCodeByCodeAndVersion(String formCode, Integer formVersion) { + Map params = getHashMap(4); + params.put("formCode", formCode); + params.put("formVersion", formVersion); + return formDao.getPrintPageCodeByCodeAndVersion(params); + } + @Override public String getAppSavePageCodeByCodeAndVersion(String formCode, Integer formVersion) { Map params = getHashMap(4); diff --git a/module-form/src/main/resources/mybatis/mapper/design/form-mapper.xml b/module-form/src/main/resources/mybatis/mapper/design/form-mapper.xml index c4bc0010..0919fe1c 100644 --- a/module-form/src/main/resources/mybatis/mapper/design/form-mapper.xml +++ b/module-form/src/main/resources/mybatis/mapper/design/form-mapper.xml @@ -14,6 +14,7 @@ + @@ -38,6 +39,7 @@ + @@ -61,6 +63,7 @@ `save_page_code` longtext COMMENT '新增页面代码', `update_page_code` longtext COMMENT '更新页面代码', `show_page_code` longtext COMMENT '展示页面代码', + `print_page_code` longtext COMMENT '打印页面代码', `app_save_page_code` longtext COMMENT 'APP新增页面代码', `app_update_page_code` longtext COMMENT 'APP更新页面代码', `app_show_page_code` longtext COMMENT 'APP展示页面代码', @@ -119,6 +122,7 @@ save_page_code, update_page_code, show_page_code, + print_page_code, app_save_page_code, app_update_page_code, app_show_page_code, @@ -141,6 +145,7 @@ #{savePageCode}, #{updatePageCode}, #{showPageCode}, + #{printPageCode}, #{appSavePageCode}, #{appUpdatePageCode}, #{appShowPageCode}, @@ -213,6 +218,9 @@ show_page_code = #{showPageCode}, + + print_page_code = #{printPageCode}, + app_save_page_code = #{appSavePageCode}, @@ -277,6 +285,7 @@ save_page_code, update_page_code, show_page_code, + print_page_code, app_save_page_code, app_update_page_code, app_show_page_code, @@ -405,6 +414,20 @@ form_version = #{formVersion} + + + + + + +
+
+ +
+
+ + + + + + + + + + + + \ No newline at end of file diff --git a/module-form/src/main/resources/templates/form/list.html b/module-form/src/main/resources/templates/form/list.html index 41649442..a5d38d67 100644 --- a/module-form/src/main/resources/templates/form/list.html +++ b/module-form/src/main/resources/templates/form/list.html @@ -126,6 +126,14 @@ ''; } }, + + {field:'printPageCode', width:100, title: '打印代码', align:'center', + templet: function(item) { + return '
' + + '' + + '
'; + } + }, {field:'appPageCode', width:220, title: 'APP端代码', align:'center', templet: function(item) { return '
' + @@ -285,6 +293,15 @@ onClose: function () { } }) + } else if(event === 'printPageCodeEvent') { + top.dialog.open({ + title: '打印页面模板', + url: top.restAjax.path('route/form/get-print-page-code?formId={formId}&formCode={formCode}&formVersion={formVersion}', [data.formId, data.formCode, data.formVersion]), + width: '99%', + height: '99%', + onClose: function () { + } + }) } else if(event === 'appSavePageCodeEvent') { top.dialog.open({ title: 'APP新增页面模板', diff --git a/module-form/src/main/resources/templates/ftl/page/web/oa/form-print.ftl b/module-form/src/main/resources/templates/ftl/page/web/oa/form-print.ftl new file mode 100644 index 00000000..12b0e595 --- /dev/null +++ b/module-form/src/main/resources/templates/ftl/page/web/oa/form-print.ftl @@ -0,0 +1,32 @@ + + + + + + ${r'${formName}'} + + + + + + + + + + +
+ +
+ + + + \ No newline at end of file