diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 60ee66c0..333187bf 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -346,6 +346,10 @@ public class SysDepartController { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, request.getParameterMap()); //Step.2 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + String selections = request.getParameter("selections"); + if(!oConvertUtils.isEmpty(selections)){ + queryWrapper.in("id",selections.split(",")); + } List pageList = sysDepartService.list(queryWrapper); //按字典排序 Collections.sort(pageList,(SysDepart arg0, SysDepart arg1)-> arg0.getOrgCode().compareTo(arg1.getOrgCode())); diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java index 72acb29c..fc5e50e5 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java @@ -16,7 +16,7 @@ import java.util.*; *

* 部门表 *

- * + * * @Author Steve * @Since 2019-01-22 */ @@ -24,7 +24,7 @@ import java.util.*; @TableName("sys_depart") public class SysDepart implements Serializable { private static final long serialVersionUID = 1L; - + /**ID,用机构编码作为ID*/ @TableId(type = IdType.ASSIGN_UUID) private String id; @@ -34,7 +34,7 @@ public class SysDepart implements Serializable { @Excel(name="机构/部门名称",width=15) private String departName; /**英文名*/ - @Excel(name="英文名",width=15) +// @Excel(name="英文名",width=15) private String departNameEn; /**缩写*/ private String departNameAbbr; @@ -42,7 +42,7 @@ public class SysDepart implements Serializable { @Excel(name="排序",width=15) private Integer departOrder; /**描述*/ - @Excel(name="描述",width=15) +// @Excel(name="描述",width=15) private String description; /**机构类别 1公司,2组织机构,2岗位*/ // IAM 1.单位 2.部门 @@ -57,7 +57,7 @@ public class SysDepart implements Serializable { @Excel(name="手机号",width=15) private String mobile; /**传真*/ - @Excel(name="传真",width=15) +// @Excel(name="传真",width=15) private String fax; /**地址*/ @Excel(name="地址",width=15) @@ -89,25 +89,25 @@ public class SysDepart implements Serializable { /** * 所属单位,10位HR机构编号 */ - @Excel(name="所属单位",width=15) +// @Excel(name="所属单位",width=15) private String company; /** * 部门负责人 */ - @Excel(name="部门负责人",width=15) +// @Excel(name="部门负责人",width=15) private String headOfDepartment; /** * 分管领导 */ - @Excel(name="分管领导",width=15) +// @Excel(name="分管领导",width=15) private String leadersInCharge; /** * 副职领导 */ - @Excel(name="副职领导",width=15) +// @Excel(name="副职领导",width=15) private String deputyLeader; /** @@ -157,9 +157,9 @@ public class SysDepart implements Serializable { @Override public int hashCode() { - return Objects.hash(super.hashCode(), id, parentId, departName, - departNameEn, departNameAbbr, departOrder, description,orgCategory, - orgType, orgCode, mobile, fax, address, memo, status, + return Objects.hash(super.hashCode(), id, parentId, departName, + departNameEn, departNameAbbr, departOrder, description,orgCategory, + orgType, orgCode, mobile, fax, address, memo, status, delFlag, createBy, createTime, updateBy, updateTime, company, headOfDepartment, leadersInCharge, deputyLeader); } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/vo/SysDictPage.java b/laws-module-system/src/main/java/com/jero/modules/system/vo/SysDictPage.java index 2647ebfa..eb50ca5d 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/vo/SysDictPage.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/vo/SysDictPage.java @@ -20,6 +20,12 @@ public class SysDictPage { @Excel(name = "字典名称", width = 20) private String dictName; + /** + * 字典英文名称 + */ + @Excel(name = "字典英文名称", width = 20) + private String dictEnName; + /** * 字典编码 */ diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java index 1427f433..e5a8cf87 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/dto/InstanceDto.java @@ -65,4 +65,7 @@ public class InstanceDto { @ApiModelProperty("审核人的移动端跳转地址,有几个审核人对应几条链接,逗号分割") private String reviewMobileLink; + @ApiModelProperty("审批定义的类型") + private Integer processType; + }