Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!395

src/main/java/cn/timer/api/controller/kqgl/ClockInTool.java

@@ -31,7 +31,7 @@ public class ClockInTool {
 	}
 	
 	// 获得上个月月份年份
-	public static String getYearMonth() {
+	public static String getLastYearMonth() {
 		Calendar now = Calendar.getInstance();
 		int month = now.get(Calendar.MONTH);
 		String m;

src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java

@@ -97,7 +97,7 @@ public class LastMonthtimingExport {
 		 cale.set(Calendar.DAY_OF_MONTH,0);//设置为1号,当前日期既为本月第一天 
 		 lastDay = format.format(cale.getTime());
 		
-		String lastmonth = ClockInTool.getYearMonth();//2020-07
+		String lastmonth = ClockInTool.getLastYearMonth();//2020-07
 
 		int year = Integer.valueOf(lastmonth.substring(0,4));//获取前一个年份
 		int month=Integer.valueOf(lastmonth.substring(5,7));//获取前一个月份

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

@@ -1379,6 +1379,7 @@ public class YgglController {
 			QyzxEmpLogin.builder().id(empNum).orgId(CollUtil.getFirst(listEEA).getOrgCode()).build().updateById();
 		}
 		
+		QyzxEmpLogin.builder().build().delete(new QueryWrapper<QyzxEmpLogin>().lambda().eq(QyzxEmpLogin::getOrgId, userBean.getOrgCode()).eq(QyzxEmpLogin::getId, empNum));
 		
 		KqglAssoYhkqz.builder().build().delete(new QueryWrapper<KqglAssoYhkqz>().lambda().eq(KqglAssoYhkqz::getUserid, empNum).eq(KqglAssoYhkqz::getQyid, userBean.getOrgCode()));