机构导出字段处理，人员归属岗位

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)

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;
 
     /** 开始桩号 */

zc-business/src/main/java/com/zc/business/service/impl/DcEmployeesServiceImpl.java

@@ -131,6 +131,9 @@ public class DcEmployeesServiceImpl implements IDcEmployeesService {
         for (HashMap<String,Object>map: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;

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
     </select>
     <select id="selectJobInformation" resultType="java.util.HashMap">
-        select ifnull(employees_id,"") employeesId,ifnull(station,"")station from dc_shifts
+        select ifnull(employees_id,0) employeesId,ifnull(station,0)station from dc_shifts
         where date=#{date}
         group by employees_id
         order by create_time