diff --git a/src/main/java/cn/com/tenlion/operator/controller/api/agreementportal/AgreementPortalController.java b/src/main/java/cn/com/tenlion/operator/controller/api/agreementportal/AgreementPortalController.java index 28ec0a1..fc93ce5 100644 --- a/src/main/java/cn/com/tenlion/operator/controller/api/agreementportal/AgreementPortalController.java +++ b/src/main/java/cn/com/tenlion/operator/controller/api/agreementportal/AgreementPortalController.java @@ -109,7 +109,7 @@ public class AgreementPortalController extends DefaultBaseController { @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getByType/{agreementType}") public AgreementPortalDTO getByType(@PathVariable("agreementType") String agreementType) { - return agreementService.getByType(agreementType); + return agreementService.getByType(agreementType, null); } } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/operator/controller/app/api/agreementportal/AgreementPortalAppController.java b/src/main/java/cn/com/tenlion/operator/controller/app/api/agreementportal/AgreementPortalAppController.java index e461f00..9e6a422 100644 --- a/src/main/java/cn/com/tenlion/operator/controller/app/api/agreementportal/AgreementPortalAppController.java +++ b/src/main/java/cn/com/tenlion/operator/controller/app/api/agreementportal/AgreementPortalAppController.java @@ -123,7 +123,7 @@ public class AgreementPortalAppController extends DefaultBaseController { @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getrelease/{agreementType}") public AgreementPortalDTO getByType(@PathVariable("agreementType") String agreementType) { - return agreementService.getByType(agreementType); + return agreementService.getByType(agreementType, "yes"); } } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/operator/controller/resource/agreementportal/AgreementPortalResourceController.java b/src/main/java/cn/com/tenlion/operator/controller/resource/agreementportal/AgreementPortalResourceController.java index 27d3c75..71fd4df 100644 --- a/src/main/java/cn/com/tenlion/operator/controller/resource/agreementportal/AgreementPortalResourceController.java +++ b/src/main/java/cn/com/tenlion/operator/controller/resource/agreementportal/AgreementPortalResourceController.java @@ -123,7 +123,7 @@ public class AgreementPortalResourceController extends DefaultBaseController { @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getByType/{agreementType}") public AgreementPortalDTO getByType(@PathVariable("agreementType") String agreementType) { - return agreementService.getByType(agreementType); + return agreementService.getByType(agreementType, null); } } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/operator/controller/route/agreementportal/AgreementPortalRouteController.java b/src/main/java/cn/com/tenlion/operator/controller/route/agreementportal/AgreementPortalRouteController.java index 6bcde9c..7e860eb 100644 --- a/src/main/java/cn/com/tenlion/operator/controller/route/agreementportal/AgreementPortalRouteController.java +++ b/src/main/java/cn/com/tenlion/operator/controller/route/agreementportal/AgreementPortalRouteController.java @@ -35,4 +35,9 @@ public class AgreementPortalRouteController extends DefaultBaseController { return new ModelAndView("agreementportal/list"); } + @GetMapping("view") + public ModelAndView view() { + return new ModelAndView("agreementportal/view-agreement"); + } + } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/operator/service/agreementportal/IAgreementPortalService.java b/src/main/java/cn/com/tenlion/operator/service/agreementportal/IAgreementPortalService.java index 639d97f..ab3baa0 100644 --- a/src/main/java/cn/com/tenlion/operator/service/agreementportal/IAgreementPortalService.java +++ b/src/main/java/cn/com/tenlion/operator/service/agreementportal/IAgreementPortalService.java @@ -193,5 +193,5 @@ public interface IAgreementPortalService { * @param agreementType * @return */ - AgreementPortalDTO getByType(String agreementType); + AgreementPortalDTO getByType(String agreementType, String forPortal); } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/operator/service/agreementportal/impl/AgreementPortalServiceImpl.java b/src/main/java/cn/com/tenlion/operator/service/agreementportal/impl/AgreementPortalServiceImpl.java index 22c6b86..eb44af8 100644 --- a/src/main/java/cn/com/tenlion/operator/service/agreementportal/impl/AgreementPortalServiceImpl.java +++ b/src/main/java/cn/com/tenlion/operator/service/agreementportal/impl/AgreementPortalServiceImpl.java @@ -214,11 +214,20 @@ public class AgreementPortalServiceImpl extends DefaultBaseService implements IA } @Override - public AgreementPortalDTO getByType(String agreementType) { + public AgreementPortalDTO getByType(String agreementType, String forPortal) { Map params = new HashMap<>(); params.put("agreementType", agreementType); params.put("sendStatus", "published"); AgreementPortalDTO agreementDTO = agreementDao.getByType(params); + if(null != forPortal && null != agreementDTO) { + // System.out.println("-----" + newsDTO.getContent()); + if(null != agreementDTO.getContent()) { + String replacedText = agreementDTO.getContent().replaceAll("' + + ' 预览' + } + } /*, {field: 'isOpen', width: 180, title: '是否启用', align:'center', templet: function(row) { @@ -146,6 +154,19 @@ }); } + table.on('tool(dataTable)', function (obj) { + var data = obj.data; + // 添加说明 + if ('viewAgreement' == obj.event) { + viewAgreement(data); + } + }); + + function viewAgreement(data) { + var url = 'route/agreementportal/view?agreementId=' + data.agreementId; + window.open(url); + } + form.on('switch(switchEvent)', function () { let agreementportalId = $(this).attr("agreementportalId"); let checked = this.checked; diff --git a/src/main/resources/templates/agreementportal/view-agreement.html b/src/main/resources/templates/agreementportal/view-agreement.html new file mode 100644 index 0000000..4a5aa81 --- /dev/null +++ b/src/main/resources/templates/agreementportal/view-agreement.html @@ -0,0 +1,117 @@ + + + + + + + + + + + + + 用户服务协议 + + + + +
+

+
+
+ + + + + + + + \ No newline at end of file