From 2ad0135114c5fa9dfa0602a12681531d09b170f0 Mon Sep 17 00:00:00 2001 From: admin <149470858@qq.com> Date: Sat, 13 Apr 2024 18:10:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E4=B8=8E=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=9A=84=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DepartmentController.java | 31 ++++++++++++++++++- .../admin/service/DepartmentService.java | 2 +- .../service/impl/DepartmentServiceImpl.java | 4 +-- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/controller/DepartmentController.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/controller/DepartmentController.java index d85bbfa..879b366 100644 --- a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/controller/DepartmentController.java +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/controller/DepartmentController.java @@ -101,7 +101,36 @@ public class DepartmentController extends BaseController{ this.departmentService.clearDeptCacheById(tab.getId().toString()); return ResultVoUtil.success(); } - + + /** + *方法描述：根据页面form传来的对象修改数据 + *创建人：mail.zhangyong@gmail.com + *创建时间：2021-11-30 18:01:02 + **/ + @PostMapping("/updateflowable") + public ResultVo updateflowable(HttpServletResponse response,HttpServletRequest request) throws IOException{ + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + //流程主键 + String processdefinitionid = request.getParameter("Processdefinitionid"); + //机构主键 + String deptid = request.getParameter("deptid"); + //流程关键，对应流程的”目标命名空间“ + String category = request.getParameter("category"); + + Department department = this.departmentService.selectDeptById(deptid); + department.setProcessdefinitionid(processdefinitionid); + department.setCategory(category); + + department.setUpdatetime(System.currentTimeMillis()); + department.setUpdateuser(userToken.getLoginname()); + if(this.departmentService.updateById(department)){ + //清理缓存信息 + this.departmentService.clearDeptCacheById(department.getId().toString()); + return ResultVoUtil.success(); + } + return ResultVoUtil.error(); + } + /** *方法描述：通过主键获得对象信息 *创建人：mail.zhangyong@gmail.com diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/DepartmentService.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/DepartmentService.java index 1c99180..e43c1b5 100644 --- a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/DepartmentService.java +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/DepartmentService.java @@ -38,7 +38,7 @@ public interface DepartmentService extends BaseService { * @param category * @return */ - List listByDeptNo(String deptno); + List listByDeptNo(String category); /** * 根据机构主键，查询机构对象,并且保存到缓存中 * @param id 机构主键 diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/DepartmentServiceImpl.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/DepartmentServiceImpl.java index 2783356..564971f 100644 --- a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/DepartmentServiceImpl.java +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/DepartmentServiceImpl.java @@ -211,9 +211,9 @@ public class DepartmentServiceImpl extends BaseServiceImpl listByDeptNo(String deptno){ + public List listByDeptNo(String category){ QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("DEPTNO",deptno); + queryWrapper.eq("CATEGORY",category); return this.selectSearchList(queryWrapper); } From 252efdc4580696a202dea0f998d1c67c1268631e Mon Sep 17 00:00:00 2001 From: admin <149470858@qq.com> Date: Sat, 13 Apr 2024 18:11:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E4=B8=8E=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=9A=84=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/backstage/system/department/list.html | 57 ++++++++++++++++--- runstart/doc/sql/update.sql | 3 + 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/htmlweb/web/backstage/system/department/list.html b/htmlweb/web/backstage/system/department/list.html index 2e56de0..55764f4 100644 --- a/htmlweb/web/backstage/system/department/list.html +++ b/htmlweb/web/backstage/system/department/list.html @@ -102,8 +102,8 @@
- - + +
@@ -154,15 +154,39 @@ $("#collapes_linkopen").show(); }); - - function playFlow(cc,dd){ - + function isNull(data){ + return (data == "" || data == undefined || data == null || data == 'null') ? true : false; + } + function playFlow(processdefinitionid,deptid){ + $("#caProcessdefinitionid").val(processdefinitionid); + $("#deptid").val(deptid); $("#modal_flowable_list").modal(); $("#modal_flowable_list").css("z-index",(parent.getMaxZIndex() + 1)); - _tableListDefinition.bootstrapTable('refreshOptions',{pageNumber:1}); } - var _tableListDepartment; + function saveUserCandidateForm(){ + //流程主键 + var Processdefinitionid = $("#caProcessdefinitionid").val(); + //机构主键 + var deptid = $("#deptid").val(); + //流程关键，对应流程的”目标命名空间“ + var category = $("#category").val(); + + if(isNull(category)){ + parent.toastr.error("未选择流程。"); + }else{ + parent.axpostXiaoyao("${ctx}/backstage/admin/department/updateflowable",{"Processdefinitionid":Processdefinitionid,"deptid":deptid,"category":category},true ,function (data) { + if(data.code == "OK"){ + refreshTable(); + } + }); + } + } + function changeFlowRadio(category,processdefinitionid){ + $("#caProcessdefinitionid").val(processdefinitionid); + $("#category").val(category); + } + var _tableListDepartment; var jsptoolbar = ''; var jspOperation = ''; jQuery(document).ready(function($){ @@ -188,7 +212,23 @@ responseHandler:function(res){ return{"rows": res.data.list, "total": res.data.totalCount}; }, + onLoadSuccess: function(data) { + + $(data.rows).each(function (fli, fldata) { + if (fldata.id == $("#caProcessdefinitionid").val()) { + $("input[type='radio'][value='" + $("#caProcessdefinitionid").val() + "']").prop('checked', true); + $("#category").val(fldata.category); + } + }); + }, columns: [ + { + width:10, + field: 'radio', + formatter: function(value, row, index) { + return ''; + } + }, { width:150,valign: "middle",field:'id',title:'流程定义ID',sortable:false}, { width:150,valign: "middle",field:'name',title:'流程名称',sortable:false}, { width:150,valign: "middle",field:'flowKey',title:'流程key',sortable:false}, @@ -202,7 +242,8 @@ var listOperation = '无'; if($("#caProcessdefinitionid").val() == oData.id){ - listOperation = ' '; + + listOperation = '关联'; } return listOperation; } diff --git a/runstart/doc/sql/update.sql b/runstart/doc/sql/update.sql index 0552a0c..0dfc7d1 100644 --- a/runstart/doc/sql/update.sql +++ b/runstart/doc/sql/update.sql @@ -209,3 +209,6 @@ ALTER TABLE S_DEPARTMENT_T ADD COLUMN TYPEDEPT int default 1 comment ALTER TABLE S_DEPARTMENT_T ADD COLUMN CATEGORY varchar(190) not null comment '对应的工作流编码，与工作流中的命名空间对应'; INSERT INTO S_BACKSTAGEOPENURL_T(ID,URL,REMARK) VALUES(1196092352600928213, '/flow/definition/flowImg', '查看流程图'); + +INSERT INTO S_BACKSTAGEOPENURL_T(ID,URL,REMARK) VALUES(1196092352600928214, '/backstage/admin/department/updateflowable', '公司关联工作流'); +