Merge branch 'develop' of http://develop-gitlab.youlingrc.com/8timerv2/8timerapiv200.git into tzq

src/main/java/cn/timer/api/bean/yggl/YgglMainLzb.java

@@ -86,11 +86,29 @@ public class YgglMainLzb extends Model<YgglMainLzb> {
 	@ApiModelProperty(value="政治面貌 1:中共党员;2:中共预备党员;3共青团员;4:民革党员;5:民盟盟员;6:民建会员;7:民进会员;8:农工党党员;9:致公党党员;10:九三学社社员;11:台盟盟员;12:无党派人士;13:群众",example="101")
     private Integer zzmm;
     
-	@ApiModelProperty(value="籍贯 省/市/区 例：广东/广州/白云",example="101")
-    private Integer jg;
-    
-	@ApiModelProperty(value="户籍城市 省/市/区 例：广东/广州/白云",example="101")
-    private Integer city;
+//	@ApiModelProperty(value="籍贯 省/市/区 例：广东/广州/白云",example="101")
+//    private Integer jg;
+//    
+//	@ApiModelProperty(value="户籍城市 省/市/区 例：广东/广州/白云",example="101")
+//    private Integer city;
+	
+	@ApiModelProperty(value="籍贯 省",example="101")
+    private String jg;
+	@ApiModelProperty(value="籍贯 省id",example="101")
+    private String jgId;
+    
+	@ApiModelProperty(value = "省")
+	private String province;
+	@ApiModelProperty(value = "省id")
+	private String provinceId;
+	@ApiModelProperty(value = "市")
+	private String city;
+	@ApiModelProperty(value = "市id")
+	private String cityId;
+	@ApiModelProperty(value = "区")
+	private String district;
+	@ApiModelProperty(value = "区编号")
+	private String districtId;
     
 	@ApiModelProperty(value="户口性质 1:城镇户口;2:农村户口;3:居民户口",example="101")
     private Integer hkType;

src/main/java/cn/timer/api/controller/dzht/DzhtController2.java

@@ -172,17 +172,19 @@ public class DzhtController2 {
 			TokenHelper.getTokenData();
 			j = AccountHelper.createOrgAcct(thirdPartyUserId, creator, qyzc.getName(), qyzc.getIdType(),
 					qyzc.getIdNumber());
+			Integer code = j.getInteger("code");
+			if (code != null && code != 0)
+				return ResultUtil.error(j.getString("message"));
 		} catch (DefineException e) {
-			e.printStackTrace();
-			return ResultUtil.error();
+			e.getStackTrace();
 		}
 		String orgId = j.getString("orgId");
+		String accountId = j.getString("accountId");
 		qyzc.setOrgId(orgId);
 		qyzc.setOrgCode(userBean.getOrgCode());
 
-		if (j.getString("accountId") != null) {
+		if (accountId != null)
 			qyzc.insert();
-		}
 		return ResultUtil.data(orgId, "创建成功");
 	}
 
@@ -204,8 +206,8 @@ public class DzhtController2 {
 	@GetMapping("/getOrganizations")
 	@ApiOperation(value = "查询企业信息s", httpMethod = "GET", notes = "接口发布说明")
 	public Result<Object> getOrganizations(@CurrentUser UserBean userBean) {
-		List<QyzxEmpEntAsso> list = QyzxEmpEntAsso.builder().build()
-				.selectList(new QueryWrapper<QyzxEmpEntAsso>().eq("emp_num", userBean.getEmpNum()));
+		List<QyzxEmpEntAsso> list = QyzxEmpEntAsso.builder().build().selectList(
+				new QueryWrapper<QyzxEmpEntAsso>().lambda().eq(QyzxEmpEntAsso::getEmpNum, userBean.getEmpNum()));
 		List<Integer> orgCodeList = Lists.transform(list, newList -> newList.getOrgCode());
 		List<String> orgIds = new ArrayList<String>();
 		for (Integer orgCode : orgCodeList) {

src/main/java/cn/timer/api/controller/dzht/cn/tign/hz/helper/AccountHelper.java

@@ -207,7 +207,8 @@ public class AccountHelper {
 
 		String param = AccountParamUtil.createOrgAcctParam(thirdPartyUserId, creatorId, name, idType, idNumber);
 		JSONObject json = HttpHelper.doCommHttp(RequestType.POST, ConfigConstant.createOrgAcc_URL(), param);
-		return JSONHelper.castDataJson(json,JSONObject.class);
+		return json;
+//		return JSONHelper.castDataJson(json,JSONObject.class);
 	}
 
 	/**

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

@@ -1224,7 +1224,7 @@ public class YgglController {
 	}
 
 	/**
-	 * 员工转正
+	 * 员工转正 0-1
 	 * 
 	 * @param
 	 * @return
@@ -1241,7 +1241,7 @@ public class YgglController {
 	}
 
 	/**
-	 * 计划离职 type2-3
+	 * 计划离职 type1-2
 	 * 
 	 * @param
 	 * @return
@@ -1271,7 +1271,7 @@ public class YgglController {
 	}
 
 	/**
-	 * 确认离职 type3-4
+	 * 确认离职 type2-3
 	 * 
 	 * @param
 	 * @return
@@ -1307,7 +1307,7 @@ public class YgglController {
 	}
 
 	/**
-	 * 放弃离职 type3-2
+	 * 放弃离职 type 2-1
 	 * 
 	 * @param
 	 * @return

src/main/java/cn/timer/api/controller/yggl/service/YgglServiceImpl.java

@@ -12,8 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.yggl.YgglMainLzb;
 import cn.timer.api.bean.zzgl.ZzglBmgwM;

src/main/java/cn/timer/api/dao/yggl/YgglMainEmpMapper.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import org.springframework.web.bind.annotation.PathVariable;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,7 +12,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.config.annotation.UserBean;
 import cn.timer.api.dto.yggl.EmpQuery;
-import cn.timer.api.dto.yggl.YgCartogramDto;
 import cn.timer.api.dto.yggl.YgQueryDto;
 import cn.timer.api.dto.yggl.YgbintuDto;
 import cn.timer.api.dto.yggl.YgglCartogramDto;

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

@@ -16,7 +16,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @date 2019年11月16日  
+ * @date 2019年11月16日
  * @author 翁东州
  * @方法中文名称:
  */
@@ -24,49 +24,52 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class YgQueryDto extends Page implements Serializable{
-	
+public class YgQueryDto extends Page implements Serializable {
+
 	private static final long serialVersionUID = -1230023773946170942L;
 
-	@ApiModelProperty(value="员工姓名",example="华仔")
+	@ApiModelProperty(value = "员工姓名", example = "华仔")
 	private String empName;
-	
-	@ApiModelProperty(value="员工号",example="1")
+
+	@ApiModelProperty(value = "员工号", example = "1")
 	private Integer empNum;
-	
-	@ApiModelProperty(value="部门名",example="1")
+
+	@ApiModelProperty(value = "部门名", example = "1")
 	private String deptName;
-	
-	@ApiModelProperty(value="上级部门名",example="1")
+
+	@ApiModelProperty(value = "上级部门名", example = "1")
 	private String upName;
-	
-	@ApiModelProperty(value="入职时间",example="1")
+
+	@ApiModelProperty(value = "入职时间", example = "1")
 	private Date rzTime;
-	
-	@ApiModelProperty(value="应离职时间",example="1")
+
+	@ApiModelProperty(value = "应离职时间", example = "1")
 	private Date ylzTime;
-	
-	@ApiModelProperty(value="工作性质1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘",example="1")
+
+	@ApiModelProperty(value = "工作性质1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘", example = "1")
 	private Integer jobType;
-	
-	@ApiModelProperty(value="手机号",example="1")
+
+	@ApiModelProperty(value = "手机号", example = "1")
 	private String phone;
-	
-	@ApiModelProperty(value="部门id",example="101")
+
+	@ApiModelProperty(value = "部门id", example = "101")
 	private Integer bmgwid;
-	
-	@ApiModelProperty(value="员工状态1正式、2试用、3离职中、4已离职",example="2")
+
+	@ApiModelProperty(value = "员工状态1正式、2试用、3离职中、4已离职", example = "2")
 	private Integer jobStatus;
-	
-	@ApiModelProperty(value="手机号、姓名",example="1388888888 or 张三")
+
+	@ApiModelProperty(value = "手机号、姓名", example = "1388888888 or 张三")
 	private String query;
-	
-	@ApiModelProperty(value="备注",example="123")
+
+	@ApiModelProperty(value = "备注", example = "123")
 	private String bz;
-	
-	@ApiModelProperty(value="离职原因",example="123")
+
+	@ApiModelProperty(value = "离职原因", example = "123")
 	private String lzyy;
-	
-	@ApiModelProperty(value="头像url",example="url")
+
+	@ApiModelProperty(value = "头像url", example = "url")
 	private String headUrl;
+
+	@ApiModelProperty(value = "性别", example = "1")
+	private Integer sex;
 }

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

@@ -257,7 +257,8 @@
 			a.job_type jobType,
 			a.phone phone,
 			a.job_status jobStatus,
-			a.head_url headUrl
+			a.head_url headUrl,
+			a.sex sex
 		FROM
 			yggl_main_emp a
 		LEFT JOIN zzgl_bmgw_m b ON a.bmgw_id = b.id
@@ -384,17 +385,17 @@
 	<!-- 籍贯统计（省份）查询 -->
 	<select id="queryNativeplace" resultType="cn.timer.api.dto.yggl.YgglCartogramDto">
 		SELECT
-			IFNULL(c.name,'null') province,count(y.jg) provinceNum
+			IFNULL(c.city_name,'null') province,count(y.jg_id) provinceNum
 		FROM
 			yggl_main_emp y
 		LEFT JOIN
-			city_class c
+			common_area c
 		ON
-			y.jg = c.id
+			y.jg_id = c.code_id
 		WHERE
 			org_code = #{orgCode}
 		GROUP BY
-			c.name
+			c.city_name
 	</select>
 	
 	<!-- 员工工龄分布查询 -->