Merge branch 'wdz' into 'develop'

删除冲突

See merge request 8timerv2/8timerapiv200!17

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

@@ -1737,14 +1737,14 @@ public class YgglController {
 		//平均年龄
 		//平均年龄
 		Integer nianlin = age.get("平均年龄").intValue();
 		Integer nianlin = age.get("平均年龄").intValue();
 		YgCartogramDto ybp = new YgCartogramDto();
 		YgCartogramDto ybp = new YgCartogramDto();
-		ybp.setZaizhi(zaizhi);
-		ybp.setXinruzhi(xinruzhi);
-		ybp.setLizhi(lizhi);
-		ybp.setZhuanzhen(zhuanzhen);
-		ybp.setNianlin(nianlin);
+		ybp.setOnTheJob(zaizhi);
+		ybp.setNewRecruits(xinruzhi);
+		ybp.setDimission(lizhi);
+		ybp.setRegularization(zhuanzhen);
+		ybp.setAverageAge(nianlin);
 		
 		
-		ybp.setBm(bmList);
-		ybp.setGw(gwList);
+		ybp.setDepartment(bmList);
+		ybp.setPosition(gwList);
 		ybp.setEdu(eduList);
 		ybp.setEdu(eduList);
 		ybp.setJobStatus(jobStatusList);
 		ybp.setJobStatus(jobStatusList);
 		ybp.setProname(pronameList);
 		ybp.setProname(pronameList);

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

-diff a/src/main/java/cn/timer/api/controller/yggl/YgglController.java b/src/main/java/cn/timer/api/controller/yggl/YgglController.java	(rejected hunks)
-@@ -76,6 +76,7 @@
- import cn.timer.api.dto.yggl.YgQueryDto;
- import cn.timer.api.dto.yggl.YgglCartogramDto;
- import cn.timer.api.dto.yggl.YgjgDto;
-+import cn.timer.api.dto.yggl.YgmzDto;
- import cn.timer.api.dto.yggl.YgProDto;
- import cn.timer.api.dto.yggl.YgzzDto;
- import cn.timer.api.utils.Md5;

src/main/java/cn/timer/api/dto/yggl/YgCartogramDto.java

@@ -33,25 +33,25 @@ public class YgCartogramDto implements Serializable{
 	private static final long serialVersionUID = 1L;
 	private static final long serialVersionUID = 1L;
 
 
 	@ApiModelProperty(value="在职人数")
 	@ApiModelProperty(value="在职人数")
-    private Integer zaizhi;
+    private Integer onTheJob;
     
     
 	@ApiModelProperty(value="本月新入职 ")
 	@ApiModelProperty(value="本月新入职 ")
-    private Integer xinruzhi;
+    private Integer newRecruits;
     
     
 	@ApiModelProperty(value="本月离职")
 	@ApiModelProperty(value="本月离职")
-    private Integer lizhi;
+    private Integer dimission;
 	
 	
 	@ApiModelProperty(value="本月转正")
 	@ApiModelProperty(value="本月转正")
-    private Integer zhuanzhen;
+    private Integer regularization;
 	
 	
 	@ApiModelProperty(value="平均年龄")
 	@ApiModelProperty(value="平均年龄")
-    private Integer nianlin;
+    private Integer averageAge;
 	
 	
 	@ApiModelProperty(value="部门")
 	@ApiModelProperty(value="部门")
-    private List<YgKVDto> bm;
+    private List<YgKVDto> department;
 	
 	
 	@ApiModelProperty(value="岗位")
 	@ApiModelProperty(value="岗位")
-	private List<YgKVDto> gw;
+	private List<YgKVDto> position;
 	
 	
 	@ApiModelProperty(value="学历")
 	@ApiModelProperty(value="学历")
 	private List<YgKVDto> edu;
 	private List<YgKVDto> edu;

src/main/resources/mapping/yggl/YgglMainEmpMapper.xml

@@ -169,13 +169,15 @@
     </sql>
     </sql>
      <!-- rsybp人事仪表盘 -->
      <!-- rsybp人事仪表盘 -->
     <select id="rsybp" resultMap="Bintu">
     <select id="rsybp" resultMap="Bintu">
-    	SELECT e.id AS id,IFNULL(e.age,0) AS age,IFNULL(e.bmgw_id,0) AS bmgwId,IFNULL(b.`name`,'null') AS gw,IFNULL(bb.`name`,'null') AS bm,IFNULL( p.`name`,'null') AS proname,IFNULL(d.`name` ,'null')AS eduname,IFNULL(e.job_status,0) AS jobStatus,IFNULL(datediff(CURDATE(),e.rz_time),0)AS workage
+    	SELECT e.id AS id,IFNULL(e.age,0) AS age,IFNULL(e.bmgw_id,0) AS bmgwId,IFNULL(b.`name`,'null') AS gw,
+    	IFNULL(bb.`name`,'null') AS bm,IFNULL( p.`name`,'null') AS proname,IFNULL(d.`name` ,'null')AS eduname,
+    	IFNULL(e.job_status,0) AS jobStatus,IFNULL(datediff(CURDATE(),e.rz_time),0)AS workage
 		FROM yggl_main_emp e 
 		FROM yggl_main_emp e 
 		LEFT JOIN zzgl_bmgw_m b ON b.id = e.bmgw_id 
 		LEFT JOIN zzgl_bmgw_m b ON b.id = e.bmgw_id 
 		LEFT JOIN zzgl_bmgw_m bb ON bb.id = b.up_id
 		LEFT JOIN zzgl_bmgw_m bb ON bb.id = b.up_id
 		LEFT JOIN province_class p ON  left (e.`jg`,2) = p.province
 		LEFT JOIN province_class p ON  left (e.`jg`,2) = p.province
 		LEFT JOIN education_class d ON d.number = e.edu
 		LEFT JOIN education_class d ON d.number = e.edu
-		WHERE e.org_code = 117
+		WHERE e.org_code = #{orgCode}
     </select>
     </select>
     
     
     <!-- benyueLz本月离职人数 -->
     <!-- benyueLz本月离职人数 -->