Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!328

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -92,12 +92,14 @@ import cn.timer.api.config.validation.ValidList;
 import cn.timer.api.controller.kqgl.ClockInTool;
 import cn.timer.api.controller.zzgl.service.ZzglBmgwMService;
 import cn.timer.api.dao.clazz.CommonAreaMapper;
+import cn.timer.api.dao.kqmk.KqglAssoLeaveBalanceMapper;
 import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper;
 import cn.timer.api.dao.qyzx.QyzxEmpLoginMapper;
 import cn.timer.api.dao.yggl.YgMzDtoMapper;
 import cn.timer.api.dao.yggl.YgglMainEmpMapper;
 import cn.timer.api.dao.yggl.YgglMainLzbMapper;
 import cn.timer.api.dao.zzgl.ZzglBmgwMMapper;
+import cn.timer.api.dto.kqmk.AdditionalDto;
 import cn.timer.api.dto.yggl.AddygdaDto;
 import cn.timer.api.dto.yggl.EmpQuery;
 import cn.timer.api.dto.yggl.ImportEmpDto;
@@ -1837,4 +1839,18 @@ public class YgglController {
 		return ResultUtil.data(yglList);
 	}
 	
+	
+	@Autowired
+	private KqglAssoLeaveBalanceMapper kqglassoleavebalancemapper;
+	
+	@GetMapping(value = "/address_book")
+	@ApiOperation(value = "APP 获取通讯录", httpMethod = "GET", notes = "接口发布说明")
+	@ApiOperationSupport(order = 70)
+	public Result<Object> Getaddressbook(@CurrentUser UserBean userBean) {
+		
+		List<AdditionalDto> userlist = kqglassoleavebalancemapper.selectAdditionalList(userBean.getOrgCode());
+		
+		return ResultUtil.data(userlist);
+	}
+	
 }

src/main/java/cn/timer/api/dto/kqmk/AdditionalDto.java

@@ -18,6 +18,9 @@ public class AdditionalDto {
 	@ApiModelProperty(value = "员工名称 ", example = "字段说明")
 	private String empname;
 	
+	@ApiModelProperty(value = "员工电话 ", example = "字段说明")
+	private String phone;
+
 	@ApiModelProperty(value = "部门 ", example = "字段说明")
 	private String department;
 	

src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml

@@ -37,6 +37,7 @@
     <resultMap id="AdditionalMap" type="cn.timer.api.dto.kqmk.AdditionalDto" >
             <result column="empnum" property="empnum" />
             <result column="empname" property="empname" />
+            <result column="phone" property="phone" />
             <result column="department" property="department" />
             <result column="position" property="position" />
     </resultMap>
@@ -125,6 +126,7 @@
     <select id="selectAdditionalList" resultMap="AdditionalMap">
     	SELECT emp.emp_num as empnum,
 				   emp.`name` as empname,
+				   emp.phone,
 				   IFNULL(c.name,null) as department,
 			       IFNULL(gw.`name`,null) as position
 			from yggl_main_emp emp