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

src/main/java/cn/timer/api/controller/LoginController.java

@@ -842,7 +842,9 @@ public class LoginController {
 		// 需要更新最后一次登陆信息
 		// 用户信息缓存
 		session.setAttribute("ui", qyzxEmpLogin1);
-
+		
+		System.err.println(session.getId());
+		
 		return ResultUtil.data(qyzxEmpLogin1);
 	}
 
@@ -1060,7 +1062,7 @@ public class LoginController {
 	}
 	
 	
-	@GetMapping(value = "/switch/{orgcodeid}")
+	@GetMapping(value = "/switching_enterprises/{orgcodeid}")
 	@ApiOperation(value = "切换企业", httpMethod = "GET", notes = "是否有账号")
 	public Result<QyzxEmpLogin> Switching_Enterprises(@CurrentUser UserBean userBean,@PathVariable("orgcodeid") Integer orgcodeid,HttpServletRequest request) {
 		//

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

@@ -16,6 +16,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 /**
  * @author lal 2020-05-11
  *
@@ -24,6 +26,23 @@ public class ClockInTool {
 
 	static SimpleDateFormat famt = new SimpleDateFormat("yyyy-MM-dd");
 	
+	public static boolean useArrayUtils(String[] arr, String targetValue) {
+	    return ArrayUtils.contains(arr,targetValue);
+	}
+	
+	// 获得上个月月份年份
+	public static String getYearMonth() {
+		Calendar now = Calendar.getInstance();
+		int month = now.get(Calendar.MONTH);
+		String m;
+		if (month < 10) {
+			m = "0" + month;
+		} else {
+			m = month + "";
+		}
+		return now.get(Calendar.YEAR) + "-" + m;
+	}
+	
 	/**
      * 将传入的日期的年月得到一个值
      * @param date 日期

src/main/java/cn/timer/api/dto/kqmk/KqglAssoMonthPunchSummaryDto.java

@@ -235,5 +235,8 @@ public class KqglAssoMonthPunchSummaryDto implements Serializable{
 	
 	@ApiModelProperty(value = "表数据", example = "字段说明")
 	List<BalanceSheetDataDto> balanceTo;
+	
+	@ApiModelProperty(value = "表数据", example = "离职状态")
+	private Integer turnover_status;
 
 }
\ No newline at end of file

src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml

@@ -133,6 +133,7 @@
 			LEFT JOIN zzgl_bmgw_m as gw on gw.id = emp.bmgw_id
 			LEFT JOIN zzgl_bmgw_m as c ON c.id = gw.up_id
 			where emp.org_code = #{orgcode} 
+			<!-- and emp.emp_num = 12 -->
 			<!-- and emp.job_status != 3 -->
     </select>
     

src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml

@@ -139,6 +139,8 @@
                 <result column="org_code" property="orgCode" />
                 <result column="last_modified" property="lastModified" />
                 
+                <result column="turnover_status" property="turnover_status" />
+                
                 <collection property="balanceTo" ofType="cn.timer.api.dto.kqmk.BalanceSheetDataDto">
                 	<id column="yzid" property="yzid"/>
 			   		<result column="leaverulesid" property="leaverulesid"/>
@@ -276,7 +278,8 @@
     
      <select id="AttendanceSummaryData" resultMap="SummarydataMap">
 			select sum.*,
-     	       (select kqz.name from kqgl_main_kqz kqz where kqz.id = sum.att_group) as attname
+     	       (select kqz.name from kqgl_main_kqz kqz where kqz.id = sum.att_group) as attname,
+     	       IFNULL((select em.job_status from yggl_main_lzb em where em.emp_num = sum.num and em.org_code = sum.org_code),0) as turnover_status
 			from kqgl_asso_month_punch_summary sum
 			where sum.org_code = #{param.orgCode}
 			and sum.belong_year = #{param.year}