compliance_management / ruoyi-flowable-plus · 提交

转到一个项目

作者 雷海东
提交 bbb4fca722ca3a1214a0d9bec54036c2aad1cfa6 2 个父辈 876171da c7ade42c

Merge branch 'dev' of http://39.105.222.208:1024/compliance_management/ruoyi-flowable-plus into dev

内嵌 并排对比
正在显示 2 个修改的文件 包含 7 行增加 和 7 行删除
@@ -121,7 +121,7 @@ public class TblComplianceReviewController extends BaseController { @@ -121,7 +121,7 @@ public class TblComplianceReviewController extends BaseController {
121 // 合同名称 121 // 合同名称
122 variables.put("contractName",bo.getContractName()); 122 variables.put("contractName",bo.getContractName());
123 // 合同类型 123 // 合同类型
124 - variables.put("contractType",Long.valueOf(bo.getContractType())); 124 + variables.put("contractType",bo.getContractType());
125 // 生效日期 125 // 生效日期
126 variables.put("effectiveDate", bo.getEffectiveDate()); 126 variables.put("effectiveDate", bo.getEffectiveDate());
127 // 到期日期 127 // 到期日期
@@ -42,7 +42,7 @@ public class TblOrginfoCertificateController extends BaseController { @@ -42,7 +42,7 @@ public class TblOrginfoCertificateController extends BaseController {
42 /** 42 /**
43 * 查询单位证照表列表 43 * 查询单位证照表列表
44 */ 44 */
45 - @SaCheckPermission("compliancemanagement:orginfoCertificate:list") 45 +// @SaCheckPermission("compliancemanagement:orginfoCertificate:list")
46 @GetMapping("/list") 46 @GetMapping("/list")
47 public TableDataInfo<TblOrginfoCertificateVo> list(TblOrginfoCertificateBo bo, PageQuery pageQuery) { 47 public TableDataInfo<TblOrginfoCertificateVo> list(TblOrginfoCertificateBo bo, PageQuery pageQuery) {
48 return iTblOrginfoCertificateService.queryPageList(bo, pageQuery); 48 return iTblOrginfoCertificateService.queryPageList(bo, pageQuery);
@@ -51,7 +51,7 @@ public class TblOrginfoCertificateController extends BaseController { @@ -51,7 +51,7 @@ public class TblOrginfoCertificateController extends BaseController {
51 /** 51 /**
52 * 导出单位证照表列表 52 * 导出单位证照表列表
53 */ 53 */
54 - @SaCheckPermission("compliancemanagement:orginfoCertificate:export") 54 +// @SaCheckPermission("compliancemanagement:orginfoCertificate:export")
55 @Log(title = "单位证照表", businessType = BusinessType.EXPORT) 55 @Log(title = "单位证照表", businessType = BusinessType.EXPORT)
56 @PostMapping("/export") 56 @PostMapping("/export")
57 public void export(TblOrginfoCertificateBo bo, HttpServletResponse response) { 57 public void export(TblOrginfoCertificateBo bo, HttpServletResponse response) {
@@ -64,7 +64,7 @@ public class TblOrginfoCertificateController extends BaseController { @@ -64,7 +64,7 @@ public class TblOrginfoCertificateController extends BaseController {
64 * 64 *
65 * @param id 主键 65 * @param id 主键
66 */ 66 */
67 - @SaCheckPermission("compliancemanagement:orginfoCertificate:query") 67 +// @SaCheckPermission("compliancemanagement:orginfoCertificate:query")
68 @GetMapping("/{id}") 68 @GetMapping("/{id}")
69 public R<TblOrginfoCertificateVo> getInfo(@NotNull(message = "主键不能为空") 69 public R<TblOrginfoCertificateVo> getInfo(@NotNull(message = "主键不能为空")
70 @PathVariable Long id) { 70 @PathVariable Long id) {
@@ -74,7 +74,7 @@ public class TblOrginfoCertificateController extends BaseController { @@ -74,7 +74,7 @@ public class TblOrginfoCertificateController extends BaseController {
74 /** 74 /**
75 * 新增单位证照表 75 * 新增单位证照表
76 */ 76 */
77 - @SaCheckPermission("compliancemanagement:orginfoCertificate:add") 77 +// @SaCheckPermission("compliancemanagement:orginfoCertificate:add")
78 @Log(title = "单位证照表", businessType = BusinessType.INSERT) 78 @Log(title = "单位证照表", businessType = BusinessType.INSERT)
79 @RepeatSubmit() 79 @RepeatSubmit()
80 @PostMapping() 80 @PostMapping()
@@ -85,7 +85,7 @@ public class TblOrginfoCertificateController extends BaseController { @@ -85,7 +85,7 @@ public class TblOrginfoCertificateController extends BaseController {
85 /** 85 /**
86 * 修改单位证照表 86 * 修改单位证照表
87 */ 87 */
88 - @SaCheckPermission("compliancemanagement:orginfoCertificate:edit") 88 +// @SaCheckPermission("compliancemanagement:orginfoCertificate:edit")
89 @Log(title = "单位证照表", businessType = BusinessType.UPDATE) 89 @Log(title = "单位证照表", businessType = BusinessType.UPDATE)
90 @RepeatSubmit() 90 @RepeatSubmit()
91 @PutMapping() 91 @PutMapping()
@@ -107,7 +107,7 @@ public class TblOrginfoCertificateController extends BaseController { @@ -107,7 +107,7 @@ public class TblOrginfoCertificateController extends BaseController {
107 * 107 *
108 * @param ids 主键串 108 * @param ids 主键串
109 */ 109 */
110 - @SaCheckPermission("compliancemanagement:orginfoCertificate:remove") 110 +// @SaCheckPermission("compliancemanagement:orginfoCertificate:remove")
111 @Log(title = "单位证照表", businessType = BusinessType.DELETE) 111 @Log(title = "单位证照表", businessType = BusinessType.DELETE)
112 @DeleteMapping("/{ids}") 112 @DeleteMapping("/{ids}")
113 public R<Void> remove(@NotEmpty(message = "主键不能为空") 113 public R<Void> remove(@NotEmpty(message = "主键不能为空")