diff --git a/zc-business/src/main/java/com/zc/business/domain/DcOrganizationExport.java b/zc-business/src/main/java/com/zc/business/domain/DcOrganizationExport.java index 26107c31..9ed5b184 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcOrganizationExport.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcOrganizationExport.java @@ -19,7 +19,7 @@ public class DcOrganizationExport extends TreeEntity { /** 1-运管中心2-驻点 */ @ApiModelProperty(value = "类型1-运管中心 2-驻点", required = true) - @Excel(name = "1-运管中心 2-驻点") + @Excel(name = "类型",readConverterExp = "1=运管中心,2=驻点") private Integer organizationType; /** 名称 */ @@ -48,7 +48,7 @@ public class DcOrganizationExport extends TreeEntity { private String description; /** 方向 */ @ApiModelProperty(value = "方向", required = true) - @Excel(name = "方向") + @Excel(name = "方向",readConverterExp = "1=菏泽方向,3=济南方向") private String direction; /** 机构人员数量 */ @ApiModelProperty(value = "机构人员数量", required = true) diff --git a/zc-business/src/main/java/com/zc/business/domain/DcRoadSection.java b/zc-business/src/main/java/com/zc/business/domain/DcRoadSection.java index a8ceb274..a2990fa3 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcRoadSection.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcRoadSection.java @@ -21,12 +21,12 @@ public class DcRoadSection extends BaseEntity /** 所属部门 */ @ApiModelProperty(value = "所属部门", required = true) - @Excel(name = "所属部门") +// @Excel(name = "所属部门") private Long deptId; /** 所属路线 */ @ApiModelProperty(value = "所属路线", required = true) - @Excel(name = "所属路线") +// @Excel(name = "所属路线" ) private Long roadId; /** 开始桩号 */ diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEmployeesServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEmployeesServiceImpl.java index ba50429b..d74bd76b 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEmployeesServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEmployeesServiceImpl.java @@ -131,6 +131,9 @@ public class DcEmployeesServiceImpl implements IDcEmployeesService { for (HashMapmap:mapList){ Long employeesId = (Long) map.get("employeesId"); Long station = (Long) map.get("station"); + if (employeesId==0||station==0){ + continue; + } dcEmployeesMapper.updateJobInformation(employeesId,station); } return 1; diff --git a/zc-business/src/main/resources/mapper/business/DcEmployeesMapper.xml b/zc-business/src/main/resources/mapper/business/DcEmployeesMapper.xml index 2f719135..df1b2dd0 100644 --- a/zc-business/src/main/resources/mapper/business/DcEmployeesMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEmployeesMapper.xml @@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_post as post on employees.post_id=post.post_id