Merge branch 'master' of http://47.112.200.206:3000/shenhao/sys

src/main/java/com/ssj/service/sys/imlibuser/service/impl/TbClassTeacherTempServiceImpl.java

@@ -11,6 +11,7 @@ import com.ssj.dao.sys.imlibuser.dao.TbClassQueryDao;
 import com.ssj.dao.sys.imlibuser.dao.TbClassTeacherTempDao;
 import com.ssj.framework.core.common.service.BaseServiceImpl;
 import com.ssj.framework.core.util.Constant;
+import com.ssj.framework.core.util.PasswordUtil;
 import com.ssj.framework.idworker.IdWorker;
 import com.ssj.service.sys.imlibuser.service.TbClassService;
 import com.ssj.service.sys.imlibuser.service.TbClassStudentService;
@@ -132,6 +133,9 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					user.setUserName(tbLibImTeacherTemp.getTeacherName());
 					user.setMobile(tbLibImTeacherTemp.getTeacherPhone());
 					user.setCreateTime(new Date());
+					user.setPassword("123456");
+					user.setPwdSalt(PasswordUtil.generateSalt());
+					user.setPassword(PasswordUtil.initPassword(user.getPassword(), user.getPwdSalt()));
 					user=userService.save(user);
 				}
 				
@@ -339,6 +343,9 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					user.setUserName(tbLibImTeacherTemp.getTeacherName());
 					user.setMobile(tbLibImTeacherTemp.getTeacherPhone());
 					user.setCreateTime(new Date());
+					user.setPassword("123456");
+					user.setPwdSalt(PasswordUtil.generateSalt());
+					user.setPassword(PasswordUtil.initPassword(user.getPassword(), user.getPwdSalt()));
 					user=userService.save(user);
 				}
 				//如果之前有这个老师的，就统一使用用旧老师的名称，如果没有就使用新的名称。
@@ -462,6 +469,9 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					user.setUserName(tbLibImTeacherTemp.getTeacherName());
 					user.setMobile(tbLibImTeacherTemp.getTeacherPhone());
 					user.setCreateTime(new Date());
+					user.setPassword("123456");
+					user.setPwdSalt(PasswordUtil.generateSalt());
+					user.setPassword(PasswordUtil.initPassword(user.getPassword(), user.getPwdSalt()));
 					user=userService.save(user);
 				}
 				//如果之前有这个老师的，就统一使用用旧老师的名称，如果没有就使用新的名称。
@@ -555,6 +565,9 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					user.setUserName(tbLibImTeacherTemp.getTeacherName());
 					user.setMobile(tbLibImTeacherTemp.getTeacherPhone());
 					user.setCreateTime(new Date());
+					user.setPassword("123456");
+					user.setPwdSalt(PasswordUtil.generateSalt());
+					user.setPassword(PasswordUtil.initPassword(user.getPassword(), user.getPwdSalt()));
 					user=userService.save(user);
 				}
 				tbLibImTeacherTemp.setTeacherId(user.getId());

src/main/java/com/ssj/sys/controller/FxController.java

@@ -380,7 +380,7 @@ public class FxController  extends BaseController {
 	 	Map<String, Object> params = new HashMap<String, Object>();
         params.put("LIKE_unitName", request.getParameter("LIKE_unitName")==null?"":request.getParameter("LIKE_unitName"));
         params.put("LIKE_posCode", request.getParameter("LIKE_posCode")==null?"":request.getParameter("LIKE_posCode"));
-        params.put("EQ_backupMonth", request.getParameter("EQ_backupMonth")==null||StringUtils.isEmpty(request.getParameter("EQ_backupMonth").toString())? DateHelper.format(new Date(),"yyyy-MM") :request.getParameter("EQ_backupMonth").toString());
+        params.put("EQ_backupMonth", request.getParameter("EQ_backupMonth")==null||StringUtils.isEmpty(request.getParameter("EQ_backupMonth").toString())? DateHelper.format(DateHelper.getLastMonthFirstDay(new Date()),"yyyy-MM") :request.getParameter("EQ_backupMonth").toString());
         
         if(request.getParameter("signType")!=null ) {
         	if("0".equals(request.getParameter("signType").toString())){