格克

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -31,10 +31,7 @@ import org.jeecg.modules.message.websocket.WebSocket;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.model.SysLoginModel;
-import org.jeecg.modules.system.service.ISysDepartService;
-import org.jeecg.modules.system.service.ISysDictService;
-import org.jeecg.modules.system.service.ISysLogService;
-import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.service.*;
 import org.jeecg.modules.system.util.AES;
 import org.jeecg.modules.system.util.RandImageUtil;
 import org.jeecg.modules.system.util.RestTemplateUtil;
@@ -69,11 +66,11 @@ public class LoginController {
 	@Autowired
 	private ISysLogService logService;
 	@Autowired
-    private RedisUtil redisUtil;
+	private RedisUtil redisUtil;
 	@Autowired
-    private ISysDepartService sysDepartService;
+	private ISysDepartService sysDepartService;
 	@Autowired
-    private ISysDictService sysDictService;
+	private ISysDictService sysDictService;
 	@Resource
 	private BaseCommonService baseCommonService;
 
@@ -82,7 +79,8 @@ public class LoginController {
 
 	@Autowired
 	private WebSocket webSocket;
-
+	@Autowired
+	private IWeixinUserService weixinUserService;
 
 
 	private static final String BASE_CHECK_CODES = "qwertyuiplkjhgfdsazxcvbnmQWERTYUPLKJHGFDSAZXCVBNM1234567890";
@@ -99,12 +97,12 @@ public class LoginController {
 		//update-begin--Author:scott  Date:20190805 for：暂时注释掉密码加密逻辑，有点问题
 
 		//update-begin-author:taoyan date:20190828 for:校验验证码
-        String captcha = sysLoginModel.getCaptcha();
-        if(captcha==null){
+		String captcha = sysLoginModel.getCaptcha();
+		if(captcha==null){
 //            result.error500("验证码无效");
 //            return result;
-        }
-        String lowerCaseCaptcha = captcha.toLowerCase();
+		}
+		String lowerCaseCaptcha = captcha.toLowerCase();
 		String realKey = MD5Util.MD5Encode(lowerCaseCaptcha+sysLoginModel.getCheckKey(), "utf-8");
 		Object checkCode = redisUtil.get(realKey);
 		//当进入登录页时，有一定几率出现验证码错误 #1714
@@ -113,7 +111,7 @@ public class LoginController {
 //			return result;
 		}
 		//update-end-author:taoyan date:20190828 for:校验验证码
-		
+
 		//1. 校验用户是否有效
 		//update-begin-author:wangshuai date:20200601 for: 登录代码验证用户是否注销bug，if条件永远为false
 		LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
@@ -124,7 +122,7 @@ public class LoginController {
 		if(!result.isSuccess()) {
 			return result;
 		}
-		
+
 		//2. 校验用户名或密码是否正确
 		String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
 		String syspassword = sysUser.getPassword();
@@ -132,17 +130,17 @@ public class LoginController {
 			result.error500("用户名或密码错误");
 			return result;
 		}
-				
+
 		//用户登录信息
 		userInfo(sysUser, result);
 		//update-begin--Author:wangshuai  Date:20200714  for：登录日志没有记录人员
 		LoginUser loginUser = new LoginUser();
 		BeanUtils.copyProperties(sysUser, loginUser);
 		baseCommonService.addLog("用户名: " + username + ",登录成功！", CommonConstant.LOG_TYPE_1, null,loginUser);
-        //update-end--Author:wangshuai  Date:20200714  for：登录日志没有记录人员
+		//update-end--Author:wangshuai  Date:20200714  for：登录日志没有记录人员
 		return result;
 	}
-	
+
 	/**
 	 * 退出登录
 	 * @param request
@@ -152,32 +150,32 @@ public class LoginController {
 	@RequestMapping(value = "/logout")
 	public Result<Object> logout(HttpServletRequest request,HttpServletResponse response) {
 		//用户退出逻辑
-	    String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN);
-	    if(oConvertUtils.isEmpty(token)) {
-	    	return Result.error("退出登录失败！");
-	    }
-	    String username = JwtUtil.getUsername(token);
+		String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN);
+		if(oConvertUtils.isEmpty(token)) {
+			return Result.error("退出登录失败！");
+		}
+		String username = JwtUtil.getUsername(token);
 		LoginUser sysUser = sysBaseAPI.getUserByName(username);
-	    if(sysUser!=null) {
+		if(sysUser!=null) {
 			//update-begin--Author:wangshuai  Date:20200714  for：登出日志没有记录人员
 			baseCommonService.addLog("用户名: "+sysUser.getRealname()+",退出成功！", CommonConstant.LOG_TYPE_1, null,sysUser);
 			//update-end--Author:wangshuai  Date:20200714  for：登出日志没有记录人员
-	    	log.info(" 用户名:  "+sysUser.getRealname()+",退出成功！ ");
-	    	//清空用户登录Token缓存
-	    	redisUtil.del(CommonConstant.PREFIX_USER_TOKEN + token);
-	    	//清空用户登录Shiro权限缓存
+			log.info(" 用户名:  "+sysUser.getRealname()+",退出成功！ ");
+			//清空用户登录Token缓存
+			redisUtil.del(CommonConstant.PREFIX_USER_TOKEN + token);
+			//清空用户登录Shiro权限缓存
 			redisUtil.del(CommonConstant.PREFIX_USER_SHIRO_CACHE + sysUser.getId());
 			//清空用户的缓存信息（包括部门信息），例如sys:cache:user::<username>
 			redisUtil.del(String.format("%s::%s", CacheConstant.SYS_USERS_CACHE, sysUser.getUsername()));
 			//调用shiro的logout
 			SecurityUtils.getSubject().logout();
 
-	    	return Result.ok("退出登录成功！");
-	    }else {
-	    	return Result.error("Token无效!");
-	    }
+			return Result.ok("退出登录成功！");
+		}else {
+			return Result.error("Token无效!");
+		}
 	}
-	
+
 	/**
 	 * 获取访问量
 	 * @return
@@ -208,7 +206,7 @@ public class LoginController {
 		result.success("登录成功");
 		return result;
 	}
-	
+
 	/**
 	 * 获取访问量
 	 * @return
@@ -218,19 +216,19 @@ public class LoginController {
 		Result<List<Map<String,Object>>> result = new Result<List<Map<String,Object>>>();
 		Calendar calendar = new GregorianCalendar();
 		calendar.set(Calendar.HOUR_OF_DAY,0);
-        calendar.set(Calendar.MINUTE,0);
-        calendar.set(Calendar.SECOND,0);
-        calendar.set(Calendar.MILLISECOND,0);
-        calendar.add(Calendar.DAY_OF_MONTH, 1);
-        Date dayEnd = calendar.getTime();
-        calendar.add(Calendar.DAY_OF_MONTH, -7);
-        Date dayStart = calendar.getTime();
-        List<Map<String,Object>> list = logService.findVisitCount(dayStart, dayEnd);
+		calendar.set(Calendar.MINUTE,0);
+		calendar.set(Calendar.SECOND,0);
+		calendar.set(Calendar.MILLISECOND,0);
+		calendar.add(Calendar.DAY_OF_MONTH, 1);
+		Date dayEnd = calendar.getTime();
+		calendar.add(Calendar.DAY_OF_MONTH, -7);
+		Date dayStart = calendar.getTime();
+		List<Map<String,Object>> list = logService.findVisitCount(dayStart, dayEnd);
 		result.setResult(oConvertUtils.toLowerCasePageList(list));
 		return result;
 	}
-	
-	
+
+
 	/**
 	 * 登陆成功选择用户当前部门
 	 * @param user
@@ -255,7 +253,7 @@ public class LoginController {
 
 	/**
 	 * 短信登录接口
-	 * 
+	 *
 	 * @param jsonObject
 	 * @return
 	 */
@@ -281,7 +279,7 @@ public class LoginController {
 		//随机数
 		String captcha = RandomUtil.randomNumbers(6);
 		JSONObject obj = new JSONObject();
-    	obj.put("code", captcha);
+		obj.put("code", captcha);
 		try {
 			boolean b = false;
 			//注册模板
@@ -304,7 +302,7 @@ public class LoginController {
 					}
 					return result;
 				}
-				
+
 				/**
 				 * smsmode 短信模板方式  0 .登录模板、1.注册模板、2.忘记密码模板
 				 */
@@ -336,11 +334,11 @@ public class LoginController {
 		}
 		return result;
 	}
-	
+
 
 	/**
 	 * 手机号登录接口
-	 * 
+	 *
 	 * @param jsonObject
 	 * @return
 	 */
@@ -349,14 +347,14 @@ public class LoginController {
 	public Result<JSONObject> phoneLogin(@RequestBody JSONObject jsonObject) {
 		Result<JSONObject> result = new Result<JSONObject>();
 		String phone = jsonObject.getString("mobile");
-		
+
 		//校验用户有效性
 		SysUser sysUser = sysUserService.getUserByPhone(phone);
 		result = sysUserService.checkUserIsEffective(sysUser);
 		if(!result.isSuccess()) {
 			return result;
 		}
-		
+
 		String smscode = jsonObject.getString("captcha");
 		Object code = redisUtil.get(phone);
 		if (!smscode.equals(code)) {
@@ -384,7 +382,7 @@ public class LoginController {
 		String username = sysUser.getUsername();
 		// 生成token
 		String token = JwtUtil.sign(username, syspassword);
-        // 设置token缓存有效时间
+		// 设置token缓存有效时间
 		redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
 		redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME*2 / 1000);
 
@@ -452,7 +450,48 @@ public class LoginController {
 		}
 		return res;
 	}
-	
+	/**
+	 * app登录
+	 * @param
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/mLogins")
+	public Result<JSONObject> mLogins(String code, HttpSession session,HttpServletRequest request) throws Exception {
+		Result<JSONObject> result = new Result<JSONObject>();
+		System.out.println("============code= "+code+"=============");
+		String auts = weixinUserService.auts(code);
+		System.out.println(auts);
+		SysUser byId=null;
+		if (auts!=null){
+			byId = sysUserService.getById(auts);
+		}
+//		//1. 校验用户是否有效
+		result = sysUserService.checkUserIsEffective(byId);
+		if(!result.isSuccess()) {
+			return result;
+		}
+		String userpassword = PasswordUtil.encrypt(byId.getUsername(), byId.getPassword(), byId.getSalt());
+		JSONObject obj = new JSONObject();
+//		//用户登录信息
+		obj.put("userInfo", byId);
+//
+//		// 生成token
+		String token = JwtUtil.sign(byId.getUsername(), userpassword);
+//		// 设置超时时间
+		redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
+		//token 信息
+		obj.put("token", token);
+		obj.put("sessionId",session.getId());
+		result.setResult(obj);
+		result.setSuccess(true);
+		result.setCode(200);
+		Map<String,Object>map=new HashMap<>();
+		List<TokenInfo>list=new ArrayList<>();
+		TokenInfo tokenInfo=new TokenInfo();
+		return result;
+	}
+
 	/**
 	 * app登录
 	 * @param sysLoginModel
@@ -463,45 +502,27 @@ public class LoginController {
 	public Result<JSONObject> mLogin(@RequestBody SysLoginModel sysLoginModel, HttpSession session,HttpServletRequest request) throws Exception {
 		Result<JSONObject> result = new Result<JSONObject>();
 		String username = sysLoginModel.getUsername();
-		String password = sysLoginModel.getPassword();
-		
-		//1. 校验用户是否有效
-		SysUser sysUser = sysUserService.getUserByName(username);
-		result = sysUserService.checkUserIsEffective(sysUser);
-		if(!result.isSuccess()) {
-			return result;
+		System.out.println("============code= "+username+"=============");
+		String auts = weixinUserService.auts(username);
+		System.out.println(auts);
+		SysUser byId=null;
+		if (auts!=null){
+			byId = sysUserService.getById(auts);
 		}
-		
-		//2. 校验用户名或密码是否正确
-		String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
-		String syspassword = sysUser.getPassword();
-		if (!syspassword.equals(userpassword)) {
-			result.error500("用户名或密码错误");
+//		//1. 校验用户是否有效
+		result = sysUserService.checkUserIsEffective(byId);
+		if(!result.isSuccess()) {
 			return result;
 		}
-		
-		String orgCode = sysUser.getOrgCode();
-		if(oConvertUtils.isEmpty(orgCode)) {
-			//如果当前用户无选择部门 查看部门关联信息
-			List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
-			if (departs == null || departs.size() == 0) {
-				result.error500("用户暂未归属部门,不可登录!");
-				return result;
-			}
-			orgCode = departs.get(0).getOrgCode();
-			sysUser.setOrgCode(orgCode);
-			this.sysUserService.updateUserDepart(username, orgCode);
-		}
+		String userpassword = PasswordUtil.encrypt(byId.getUsername(), byId.getPassword(), byId.getSalt());
 		JSONObject obj = new JSONObject();
-		//用户登录信息
-		obj.put("userInfo", sysUser);
-		
-		// 生成token
-		String token = JwtUtil.sign(username, syspassword);
-		// 设置超时时间
+//		//用户登录信息
+		obj.put("userInfo", byId);
+//
+//		// 生成token
+		String token = JwtUtil.sign(byId.getUsername(), userpassword);
+//		// 设置超时时间
 		redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
-		redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME*2 / 1000);
-
 		//token 信息
 		obj.put("token", token);
 		obj.put("sessionId",session.getId());
@@ -511,7 +532,54 @@ public class LoginController {
 		Map<String,Object>map=new HashMap<>();
 		List<TokenInfo>list=new ArrayList<>();
 		TokenInfo tokenInfo=new TokenInfo();
-		baseCommonService.addLog("用户名: " + username + ",登录成功[移动端]！", CommonConstant.LOG_TYPE_1, null);
+//		String password = sysLoginModel.getPassword();
+		//1. 校验用户是否有效
+//		SysUser sysUser = sysUserService.getUserByName(username);
+//		result = sysUserService.checkUserIsEffective(sysUser);
+//		if(!result.isSuccess()) {
+//			return result;
+//		}
+//
+//		//2. 校验用户名或密码是否正确
+//		String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
+//		String syspassword = sysUser.getPassword();
+//		if (!syspassword.equals(userpassword)) {
+//			result.error500("用户名或密码错误");
+//			return result;
+//		}
+//
+//		String orgCode = sysUser.getOrgCode();
+//		if(oConvertUtils.isEmpty(orgCode)) {
+//			//如果当前用户无选择部门 查看部门关联信息
+//			List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
+//			if (departs == null || departs.size() == 0) {
+//				result.error500("用户暂未归属部门,不可登录!");
+//				return result;
+//			}
+//			orgCode = departs.get(0).getOrgCode();
+//			sysUser.setOrgCode(orgCode);
+//			this.sysUserService.updateUserDepart(username, orgCode);
+//		}
+//		JSONObject obj = new JSONObject();
+//		//用户登录信息
+//		obj.put("userInfo", sysUser);
+//
+//		// 生成token
+//		String token = JwtUtil.sign(username, syspassword);
+//		// 设置超时时间
+//		redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
+//		redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME*2 / 1000);
+//
+//		//token 信息
+//		obj.put("token", token);
+//		obj.put("sessionId",session.getId());
+//		result.setResult(obj);
+//		result.setSuccess(true);
+//		result.setCode(200);
+//		Map<String,Object>map=new HashMap<>();
+//		List<TokenInfo>list=new ArrayList<>();
+//		TokenInfo tokenInfo=new TokenInfo();
+//		baseCommonService.addLog("用户名: " + username + ",登录成功[移动端]！", CommonConstant.LOG_TYPE_1, null);
 		return result;
 	}
 
@@ -618,17 +686,17 @@ public class LoginController {
 	 * @return
 	 * @throws Exception
 	 */
-//	@RequestMapping(value = "/kjLogin", method = RequestMethod.POST)
-//	public Result<JSONObject> kjLogin(@RequestBody WeixinXCX weixinXCX) throws Exception {
-//		Result<JSONObject> result = new Result<JSONObject>();
-//		JSONObject obj = new JSONObject();
-//		String tokenUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=APPID&secret=SECRET&js_code=JSCODE&grant_type=authorization_code";
-//		tokenUrl = tokenUrl.replace("APPID","wx4a24204875735130").replace("SECRET","09316748df749be5f0232c0b280a0f8f").replace("JSCODE", weixinXCX.getCode());
-//		ObjectMapper mapper = new ObjectMapper();
-//		WeixinXCX weixinXCX1 = mapper.readValue(restTemplateUtil.doGet(tokenUrl).getBody(), new TypeReference<WeixinXCX>() {
-//		});
-//		String phoneNumber = null;
-//
+	@RequestMapping(value = "/kjLogin", method = RequestMethod.POST)
+	public Result<JSONObject> kjLogin(@RequestBody WeixinXCX weixinXCX) throws Exception {
+		Result<JSONObject> result = new Result<JSONObject>();
+		JSONObject obj = new JSONObject();
+		String tokenUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=APPID&secret=SECRET&js_code=JSCODE&grant_type=authorization_code";
+		tokenUrl = tokenUrl.replace("APPID","wx4a24204875735130").replace("SECRET","09316748df749be5f0232c0b280a0f8f").replace("JSCODE", weixinXCX.getCode());
+		ObjectMapper mapper = new ObjectMapper();
+		WeixinXCX weixinXCX1 = mapper.readValue(restTemplateUtil.doGet(tokenUrl).getBody(), new TypeReference<WeixinXCX>() {
+		});
+		String phoneNumber = null;
+
 //		cn.hutool.json.JSONObject userencryptedData = AES.wxDecrypt(weixinXCX.getEncryptedData(),weixinXCX1.getSession_key(),weixinXCX.getIv());
 //		if (StringUtils.isNotBlank((String) userencryptedData.get("phoneNumber"))){
 //			phoneNumber = (String) userencryptedData.get("phoneNumber");
@@ -638,8 +706,8 @@ public class LoginController {
 //		if(!result.isSuccess()) {
 //			return result;
 //		}
-//		userInfo(sysUser, result);
-//		return result;
-//	}
+		//	userInfo(sysUser, result);
+		return result;
+	}
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/WeixinUserImpl.java

@@ -49,6 +49,7 @@ import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -216,6 +217,7 @@ public class WeixinUserImpl implements IWeixinUserService{
             sysUser.setDepartIds(depids);
             sysUser.setCategory(101);
             sysUser.setEmploymentStatus(10);
+            sysUser.setInfoSy(3);
             Boolean add = sysUserService.add(sysUser,sysUserRole);
         }catch (Exception e){
             e.printStackTrace();
@@ -1289,10 +1291,14 @@ public class WeixinUserImpl implements IWeixinUserService{
                     map.put("rEmployState", ls.getEmploymentStatus());
                     parm.put("person", map);
                     String s = JSONObject.toJSONString(parm);
-                    String s1 = PersonAdd(s);
-                    if (!s1.equals("0")){
-                        msg=s1;
-                    }
+                   try {
+                       String s1 = PersonAdd(s);
+                   }catch (Exception e){
+                       e.printStackTrace();
+                   }
+//                    if (!s1.equals("0")){
+//                        msg=s1;
+//                    }
                     sysUserService.updateTpUser(ls.getId());
             }
         }
@@ -1351,10 +1357,14 @@ public class WeixinUserImpl implements IWeixinUserService{
             if (jsonObject.get("errcode").equals("0")){
                 Object salary = jsonObject.get("salary");
                 list.addAll(mapper.readValue(salary.toString(), new TypeReference<List<JSONObject>>() {}));
-                if (page<Integer.parseInt(jsonObject.get("page_count").toString())){
-                    page++;
+                if(jsonObject.get("page_count")!=null&&!jsonObject.get("page_count").equals("")) {
+                    if (page < Integer.parseInt(jsonObject.get("page_count").toString())) {
+                        page++;
+                    } else {
+                        page = 0;
+                    }
                 }else {
-                    page=0;
+                    page = 0;
                 }
             }
         }
@@ -1372,59 +1382,64 @@ public class WeixinUserImpl implements IWeixinUserService{
             for (JSONObject js:salary) {
                 Salary salarys = new Salary();
                 salarys.setUserId(js.get("personno").toString());
-                salarys.setWagesDate(sdf.parse(js.get("year").toString()+js.get("month").toString()+"-01"));
-                List<U8Wages> entry = mapper.readValue(js.get("entry").toString(), new TypeReference<List<U8Wages>>() {
+                salarys.setId(UUIDGenerator.generate());
+                salarys.setWagesDate(sdf.parse(js.get("year").toString()+"-"+js.get("month").toString()+"-01 00:00:00"));
+                System.out.println(js.get("entry"));
+                List<Map> st=(List<Map>) js.get("entry");
+                st.forEach(lt->{
+                    if (lt.get("name").equals("基本工资")){
+                       salarys.setSrWages(lt.get("content").toString());
+                   }else if (lt.get("name").equals("考勤工资")){
+                       salarys.setKqWages(lt.get("content").toString());
+                   }else if (lt.get("name").equals("考勤天数")){
+                       salarys.setKqCount(lt.get("content").toString());
+                   }else if (lt.get("name").equals("累计病假天数")){
+                       salarys.setBjCount(lt.get("content").toString());
+                   }else if (lt.get("name").equals("病假扣款")){
+                       salarys.setKkLack(lt.get("content").toString());
+                   }else if (lt.get("name").equals("扣款合计")){
+                       salarys.setKkOther(lt.get("content").toString());
+                   }else if (lt.get("name").equals("绩效工资")){
+                        salarys.setSrJxWages(lt.get("content").toString());
+                   }else if (lt.get("name").equals("加班费")){
+                        salarys.setSrJbWages(lt.get("content").toString());
+                   }else if (lt.get("name").equals("加班天数")){
+                        salarys.setJbCount(lt.get("content").toString());
+                   }else if (lt.get("name").equals("高温费")){
+                       salarys.setSrGwWages(lt.get("content").toString());
+                   }else if (lt.get("name").equals("工资代扣税")){
+                       salarys.setSdPersonal(lt.get("content").toString());
+                   }else if (lt.get("name").equals("应发合计")){
+                       salarys.setYingfa(lt.get("content").toString());
+                   }else if (lt.get("name").equals("实发合计")){
+                       salarys.setShifa(lt.get("content").toString());
+                   }else if (lt.get("name").equals("养老金")){
+                        salarys.setGrPension(lt.get("content").toString());
+                   }else if (lt.get("name").equals("医保")){
+                       salarys.setGrMedical(lt.get("content").toString());
+                   }else if (lt.get("name").equals("失业险")){
+                       salarys.setGrCause(lt.get("content").toString());
+                   }else if (lt.get("name").equals("公积金")){
+                       salarys.setGrFund(lt.get("content").toString());
+                   }else if (lt.get("name").equals("公司养老保险")){
+                       salarys.setGsPension(lt.get("content").toString());
+                   }else if (lt.get("name").equals("公司医疗保险")) {
+                       salarys.setGsMedical(lt.get("content").toString());
+                   }else if (lt.get("name").equals("公司失业险")){
+                       salarys.setGsCause(lt.get("content").toString());
+                   }else if (lt.get("name").equals("公司公积金")){
+                       salarys.setGsFund(lt.get("content").toString());
+                   }else if (lt.get("name").equals("公司生育险")){
+                       salarys.setGsBirth(lt.get("content").toString());
+                   }else if (lt.get("name").equals("公司工伤险")){
+                       salarys.setGsInjury(lt.get("content").toString());
+                   }else if (lt.get("name").equals("应发合计")){
+                        salarys.setYingfa(lt.get("content").toString());
+                    }else if (lt.get("name").equals("实发合计")){
+                        salarys.setShifa(lt.get("content").toString());
+                    }
                 });
-                for (U8Wages lt:entry){
-                   if (lt.getName().equals("基本工资")){
-                       salarys.setSrWages(lt.getContent());
-                   }else if (lt.getName().equals("考勤工资")){
-                       salarys.setKqWages(lt.getContent());
-                   }else if (lt.getName().equals("考勤天数")){
-                       salarys.setKqCount(lt.getContent());
-                   }else if (lt.getName().equals("累计病假天数")){
-                       salarys.setBjCount(lt.getContent());
-                   }else if (lt.getName().equals("病假扣款")){
-                       salarys.setKkLack(lt.getContent());
-                   }else if (lt.getName().equals("扣款合计")){
-                       salarys.setKkOther(lt.getContent());
-                   }else if (lt.getName().equals("绩效工资")){
-                        salarys.setSrJxWages(lt.getContent());
-                   }else if (lt.getName().equals("加班费")){
-                        salarys.setSrJbWages(lt.getContent());
-                   }else if (lt.getName().equals("加班天数")){
-                        salarys.setJbCount(lt.getContent());
-                   }else if (lt.getName().equals("高温费")){
-                       salarys.setSrGwWages(lt.getContent());
-                   }else if (lt.getName().equals("工资代扣税")){
-                       salarys.setSdPersonal(lt.getContent());
-                   }else if (lt.getName().equals("应发合计")){
-                       salarys.setYingfa(lt.getContent());
-                   }else if (lt.getName().equals("实发合计")){
-                       salarys.setShifa(lt.getContent());
-                   }else if (lt.getName().equals("养老保险（个人）")){
-                        salarys.setGrPension(lt.getContent());
-                   }else if (lt.getName().equals("医疗保险（个人）")){
-                       salarys.setGrMedical(lt.getContent());
-                   }else if (lt.getName().equals("失业保险（个人）")){
-                       salarys.setGrCause(lt.getContent());
-                   }else if (lt.getName().equals("住房公积金（个人）")){
-                       salarys.setGrFund(lt.getContent());
-                   }else if (lt.getName().equals("养老保险（公司）")){
-                       salarys.setGsPension(lt.getContent());
-                   }else if (lt.getName().equals("医疗保险（公司）")) {
-                       salarys.setGsMedical(lt.getContent());
-                   }else if (lt.getName().equals("失业保险（公司）")){
-                       salarys.setGsCause(lt.getContent());
-                   }else if (lt.getName().equals("住房公积金（公司）")){
-                       salarys.setGsFund(lt.getContent());
-                   }else if (lt.getName().equals("生育保险（公司）")){
-                       salarys.setGsBirth(lt.getContent());
-                   }else if (lt.getName().equals("工伤保险（公司）")){
-                       salarys.setGsInjury(lt.getContent());
-                   }
 
-                   }
                 salaries.add(salarys);
             }