From c0d081c9c4f356b8de26a0398d1f1f97e6ad7ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=81=E7=91=9E=E8=B6=85?= <281809423@qq.com> Date: Tue, 3 Nov 2020 16:14:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../front/ContractTemplateController.java | 13 ++++++-- .../com/ruoyi/common/constant/Constants.java | 15 +++++++++ .../front/service/IContractTypeService.java | 8 +++++ .../service/impl/ContractTypeServiceImpl.java | 15 +++++++++ .../mapper/front/ClasssicCasesMapper.xml | 4 +-- .../mapper/front/ContractTemplateMapper.xml | 4 +-- .../front/contract_template/add.html | 31 ++++++++----------- .../front/contract_template/edit.html | 25 ++++++++------- .../front/contract_template/template.html | 16 +++++----- 9 files changed, 87 insertions(+), 44 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ContractTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ContractTemplateController.java index dc7aabb00..93f449bf0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ContractTemplateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ContractTemplateController.java @@ -1,6 +1,9 @@ package com.ruoyi.web.controller.front; import java.util.List; +import java.util.stream.Collectors; + +import com.ruoyi.front.service.IContractTypeService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -34,10 +37,14 @@ public class ContractTemplateController extends BaseController @Autowired private IContractTemplateService contractTemplateService; + @Autowired + private IContractTypeService contractTypeService; + @RequiresPermissions("front:contract_template:view") @GetMapping() - public String template() + public String template(ModelMap mmap) { + mmap.put("contractTypes", contractTypeService.getNormalContractTypeList()); return prefix + "/template"; } @@ -72,8 +79,9 @@ public class ContractTemplateController extends BaseController * 新增合同模板 */ @GetMapping("/add") - public String add() + public String add(ModelMap mmap) { + mmap.put("contractTypes", contractTypeService.getNormalContractTypeList()); return prefix + "/add"; } @@ -97,6 +105,7 @@ public class ContractTemplateController extends BaseController { ContractTemplate contractTemplate = contractTemplateService.selectContractTemplateById(id); mmap.put("contractTemplate", contractTemplate); + mmap.put("contractTypes", contractTypeService.getNormalContractTypeList()); return prefix + "/edit"; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index 109511b18..51aeca4f3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -91,4 +91,19 @@ public class Constants * 资源映射路径 前缀 */ public static final String RESOURCE_PREFIX = "/profile"; + + /** + * 正常. + */ + public static final String NORMAL = "0"; + + /** + * 停用 + */ + public static final String DISABLE = "1"; + + /** + * 未删除 + */ + public static final String NO_DELETE = "0"; } diff --git a/ruoyi-front/src/main/java/com/ruoyi/front/service/IContractTypeService.java b/ruoyi-front/src/main/java/com/ruoyi/front/service/IContractTypeService.java index aa35fb79e..f3c407df4 100644 --- a/ruoyi-front/src/main/java/com/ruoyi/front/service/IContractTypeService.java +++ b/ruoyi-front/src/main/java/com/ruoyi/front/service/IContractTypeService.java @@ -58,4 +58,12 @@ public interface IContractTypeService * @return 结果 */ public int deleteContractTypeById(Long id); + + + /** + * 查询 正常的合同分类列表 + * + * @return 合同分类 + */ + public List getNormalContractTypeList(); } diff --git a/ruoyi-front/src/main/java/com/ruoyi/front/service/impl/ContractTypeServiceImpl.java b/ruoyi-front/src/main/java/com/ruoyi/front/service/impl/ContractTypeServiceImpl.java index ecbb25e1b..5105bce7b 100644 --- a/ruoyi-front/src/main/java/com/ruoyi/front/service/impl/ContractTypeServiceImpl.java +++ b/ruoyi-front/src/main/java/com/ruoyi/front/service/impl/ContractTypeServiceImpl.java @@ -1,6 +1,9 @@ package com.ruoyi.front.service.impl; import java.util.List; + +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.enums.UserStatus; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,6 +24,18 @@ public class ContractTypeServiceImpl implements IContractTypeService @Autowired private ContractTypeMapper contractTypeMapper; + /** + * 查询 正常的合同分类列表 + * + * @return 合同分类 + */ + @Override + public List getNormalContractTypeList() { + ContractType contractType = new ContractType(); + contractType.setDelFlag(Constants.NO_DELETE); + return this.selectContractTypeList(contractType); + } + /** * 查询合同分类 * diff --git a/ruoyi-front/src/main/resources/mapper/front/ClasssicCasesMapper.xml b/ruoyi-front/src/main/resources/mapper/front/ClasssicCasesMapper.xml index 2fb2a227c..d0cbee455 100644 --- a/ruoyi-front/src/main/resources/mapper/front/ClasssicCasesMapper.xml +++ b/ruoyi-front/src/main/resources/mapper/front/ClasssicCasesMapper.xml @@ -27,8 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - 代码生成请选择字典属性
@@ -35,40 +34,34 @@
-
- -
- -
-
- +
- + +
-
- - +
+ +
- 代码生成请选择字典属性
-
+
@@ -81,6 +74,8 @@ function submitHandler() { if ($.validate.form()) { + //同步上传图片，并且将上传图片返回的地址，赋值到pictureUrl对应的隐藏域上 + uploadFile(false, "enclosureUrl"); $.operate.save(prefix + "/add", $('#form-template-add').serialize()); } } diff --git a/ruoyi-front/src/main/resources/templates/front/contract_template/edit.html b/ruoyi-front/src/main/resources/templates/front/contract_template/edit.html index 7fc1f1f98..4a665f1fb 100644 --- a/ruoyi-front/src/main/resources/templates/front/contract_template/edit.html +++ b/ruoyi-front/src/main/resources/templates/front/contract_template/edit.html @@ -9,12 +9,11 @@
- +
- + - 代码生成请选择字典属性
@@ -36,26 +35,26 @@
-
+
- +
- + +
-
- - +
+ +
- 代码生成请选择字典属性
@@ -76,6 +75,8 @@ function submitHandler() { if ($.validate.form()) { + //同步上传图片，并且将上传图片返回的地址，赋值到pictureUrl对应的隐藏域上 + uploadFile(false, "enclosureUrl"); $.operate.save(prefix + "/edit", $('#form-template-edit').serialize()); } } diff --git a/ruoyi-front/src/main/resources/templates/front/contract_template/template.html b/ruoyi-front/src/main/resources/templates/front/contract_template/template.html index c1cab019b..c4ba25a9f 100644 --- a/ruoyi-front/src/main/resources/templates/front/contract_template/template.html +++ b/ruoyi-front/src/main/resources/templates/front/contract_template/template.html @@ -11,29 +11,29 @@
  • - - - +
    • -
  • +
  • - - +
  • @@ -46,7 +46,7 @@