1

src/main/java/com/chinaitop/depot/basic/controller/BasicKeeperController.java

@@ -175,10 +175,11 @@ public class BasicKeeperController {
 		@ApiImplicitParam(name = "zyjsJson", value = "员工职业技术等级数据对象", paramType = "form"),
 		@ApiImplicitParam(name = "zyzgJson", value = "员工专业资格数据对象", paramType = "form"),
 		@ApiImplicitParam(name = "sgzJson", value = "员工上岗证数据对象", paramType = "form"),
-		@ApiImplicitParam(name = "userInfo", value = "登录信息数据对象", paramType = "form")
+		@ApiImplicitParam(name = "userInfo", value = "登录信息数据对象", paramType = "form"),
+		@ApiImplicitParam(name = "jllgJson", value = "交流轮岗数据对象", paramType = "form"),
 	})
 	public Map<String, Object> edit(String keeper, String xwxlJson, 
-			String zyjsJson, String zyzgJson, String sgzJson, String userInfo) throws Exception {
+			String zyjsJson, String zyzgJson, String sgzJson, String userInfo, String jllgJson) throws Exception {
 		Map<String, Object> modelMap = new HashMap<String, Object>();
 		ObjectMapper mappers = new ObjectMapper();
 		BasicKeeper basicKeeper = mappers.readValue(keeper, BasicKeeper.class);
@@ -192,11 +193,11 @@ public class BasicKeeperController {
 			List<BasicKeeper> kList = keeperService.findCondition(keeperExample);
 			if (null != kList && kList.size() > 0) {
 				modelMap.put("status", "success");
-				modelMap.put("msg", "当前职员在当前岗位的信息已经存在，请不要重复添加！");
+				modelMap.put("msg", "当前员工在当前角色的信息已经存在，请不要重复添加！");
 				return modelMap;
 			}
 		}
-		keeperService.editKeeper(userInfo, keeper, xwxlJson, zyjsJson, zyzgJson, sgzJson);
+		keeperService.editKeeper(userInfo, keeper, xwxlJson, zyjsJson, zyzgJson, sgzJson, jllgJson);
 		modelMap.put("status", "success");
 		modelMap.put("msg", "保存成功！");
 		return modelMap;

src/main/java/com/chinaitop/depot/basic/model/BasicKeeper.java

@@ -704,4 +704,20 @@ public class BasicKeeper {
 		this.cjgzsj = cjgzsj;
 	}
 
+	/**
+	 * 领导班子成员/关键部门负责人
+	 * @return
+	 */
+	public String getCyfzr() {
+		return cyfzr;
+	}
+
+	/**
+	 * 领导班子成员/关键部门负责人
+	 * @param cyfzr
+	 */
+	public void setCyfzr(String cyfzr) {
+		this.cyfzr = cyfzr;
+	}
+
 }

src/main/java/com/chinaitop/depot/basic/service/BasicKeeperService.java

@@ -71,9 +71,10 @@ public interface BasicKeeperService {
 	 * @param zyjsJson
 	 * @param zyzgJson
 	 * @param sgzJson
+	 * @param jllgJson
 	 * @throws Exception 
 	 */
-	public void editKeeper(String userInfo, String keeper, String xwxlJson, String zyjsJson, String zyzgJson, String sgzJson) throws Exception;
+	public void editKeeper(String userInfo, String keeper, String xwxlJson, String zyjsJson, String zyzgJson, String sgzJson, String jllgJson) throws Exception;
 
 	/**
 	 * 根据移交人的id更新保管员的仓号

src/main/java/com/chinaitop/depot/basic/service/impl/BasicKeeperServiceImpl.java

@@ -71,7 +71,7 @@ public class BasicKeeperServiceImpl implements BasicKeeperService {
 		List<BasicKeeperEducation> zyjsList = new ArrayList<BasicKeeperEducation>(); //专业技术职称2
 		List<BasicKeeperEducation> zyzgList = new ArrayList<BasicKeeperEducation>(); //职业资格及等级3
 		List<BasicKeeperEducation> sgzList = new ArrayList<BasicKeeperEducation>(); //上岗证4
-		List<BasicKeeperEducation> zswjList = new ArrayList<BasicKeeperEducation>(); //证书附件5
+		List<BasicKeeperEducation> jllgList = new ArrayList<BasicKeeperEducation>(); //交流轮岗5
 		BasicKeeperEducation ekeObje = null;
 		
 		if (id != null) {
@@ -133,6 +133,9 @@ public class BasicKeeperServiceImpl implements BasicKeeperService {
 					} else if (4 == bke.getDatatype()) {
 						bke.setDatatype(4);
 						sgzList.add(bke);
+					} else if (5 == bke.getDatatype()) {
+						bke.setDatatype(4);
+						jllgList.add(bke);
 					}
 				}
 			}
@@ -170,18 +173,18 @@ public class BasicKeeperServiceImpl implements BasicKeeperService {
 			ekeObje.setDatatype(4);
 			sgzList.add(ekeObje);
 		}
-		if (null == zswjList || zswjList.size() == 0) {
+		if (null == jllgList || jllgList.size() == 0) {
 			ekeObje = new BasicKeeperEducation();
 			ekeObje.setKeeperId(keeper.getId());
 			ekeObje.setDatatype(5);
-			zswjList.add(ekeObje);
+			jllgList.add(ekeObje);
 		}
 
 		map.put("xlxwList", xlxwList);
 		map.put("zyjsList", zyjsList);
 		map.put("zyzgList", zyzgList);
 		map.put("sgzList", sgzList);
-		map.put("zswjList", zswjList);
+		map.put("jllgList", jllgList);
 
 		return map;
 	}
@@ -270,7 +273,7 @@ public class BasicKeeperServiceImpl implements BasicKeeperService {
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void editKeeper(String userInfo, String keeper, 
-			String xwxlJson, String zyjsJson, String zyzgJson, String sgzJson) throws Exception {
+			String xwxlJson, String zyjsJson, String zyzgJson, String sgzJson, String jllgJson) throws Exception {
 		Date date = new Date();
 		JSONObject user = null;
 		Integer orgId = null;
@@ -314,16 +317,19 @@ public class BasicKeeperServiceImpl implements BasicKeeperService {
 		//更新子表数据
 		//学历学位信息1
 		List<BasicKeeperEducation> xlxwList = mappers.readValue(xwxlJson, new TypeReference<List<BasicKeeperEducation>>(){});
-		editEducation(xlxwList, id);
-		//专业技术职称2
+		editEducation(xlxwList, id, basicKeeper.getOrgId());
+		//技能等级2
 		List<BasicKeeperEducation> zyjsList = mappers.readValue(zyjsJson, new TypeReference<List<BasicKeeperEducation>>(){});
-		editEducation(zyjsList, id);
-		//职业资格及等级3
+		editEducation(zyjsList, id, basicKeeper.getOrgId());
+		//职称和荣誉称号3
 		List<BasicKeeperEducation> zyzgList = mappers.readValue(zyzgJson, new TypeReference<List<BasicKeeperEducation>>(){});
-		editEducation(zyzgList, id);
+		editEducation(zyzgList, id, basicKeeper.getOrgId());
 		//上岗证4
 		List<BasicKeeperEducation> sgzList = mappers.readValue(sgzJson, new TypeReference<List<BasicKeeperEducation>>(){});
-		editEducation(sgzList, id);
+		editEducation(sgzList, id, basicKeeper.getOrgId());
+		//交流轮岗5
+		List<BasicKeeperEducation> jllgList = mappers.readValue(jllgJson, new TypeReference<List<BasicKeeperEducation>>(){});
+		editEducation(jllgList, id, basicKeeper.getOrgId());
 
 	}
 
@@ -334,33 +340,39 @@ public class BasicKeeperServiceImpl implements BasicKeeperService {
 	 * @param id
 	 */
 	@Transactional(rollbackFor = Exception.class)
-	public void editEducation(List<BasicKeeperEducation> edcationList, Integer id) {
+	public void editEducation(List<BasicKeeperEducation> edcationList, Integer id, Integer orgId) {
 		Integer dataType = 0; //数据类型
 		for (BasicKeeperEducation bke : edcationList) {
 			if (null == bke.getId() || "".equals(bke.getId())) {
 				bke.setKeeperId(id);
 				dataType = bke.getDatatype();
-				if ("1".equals(dataType) || dataType == 1) {
-					Integer type = bke.getType();
-					if (type == null) {
+				if ("1".equals(dataType) || dataType == 1) {//学历
+//					Integer education = bke.getEducation();
+//					if (education == null) {
+//						continue;
+//					}
+				} else if ("2".equals(dataType) || dataType == 2) {//技能等级
+					String departMent = bke.getDepartment();
+					if (departMent == null || "".equals(departMent)) {
 						continue;
 					}
-				} else if ("2".equals(dataType) || dataType == 2) {
+				} else if ("3".equals(dataType) || dataType == 3) {//职称和荣誉称号
 					String departMent = bke.getDepartment();
 					if (departMent == null || "".equals(departMent)) {
 						continue;
 					}
-				} else if ("3".equals(dataType) || dataType == 3) {
-					Integer occupation = bke.getOccupation();
-					if (occupation == null) {
+				} if ("4".equals(dataType) || dataType == 3) {//上岗证
+					String departMent = bke.getDepartment();
+					if (departMent == null || "".equals(departMent)) {
 						continue;
 					}
-				} else if ("5".equals(dataType) || dataType == 5) {
-					String department = bke.getDepartment();
-					if (department == null) {
+				} else if ("5".equals(dataType) || dataType == 5) {//交流轮岗
+					String fzywlx = bke.getFzywlx();
+					if (fzywlx == null) {
 						continue;
 					}
 				}
+				bke.setOrgId(orgId);
 				eduMapper.insertSelective(bke);
 			} else {
 				eduMapper.updateByPrimaryKeySelective(bke);