Merge remote-tracking branch 'origin/master'

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/filter/UsernameAuthenticationFilter.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.authentication.AuthenticationServiceException;
+import org.springframework.security.authentication.LockedException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
@@ -80,6 +81,15 @@ public class UsernameAuthenticationFilter extends AbstractAuthenticationProcessi
 		if (userInfo == null) {
 			throw new UsernameNotFoundException("404.9");
 		}
+
+		if(!userInfo.getSysUser().getIsSuperAdmin()){
+			if(clientId.equalsIgnoreCase("system")){
+				Integer lockFlag = sysUserService.queryEmployeeLockFlag(userInfo.getSysUser().getId());
+				if(lockFlag == 1){
+					throw new LockedException("账户被锁定");
+				}
+			}
+		}
 	
 		if (!StringUtils.upperCase(userInfo.getSysUser().getUserType()).contains(StringUtils.upperCase(clientId))) {
 			throw new UsernameNotFoundException("用户不存在");

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -22,6 +22,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.common.exceptions.UnapprovedClientAuthenticationException;

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/page/ExamManualLedgerQueryInfo.java

@@ -1,9 +1,9 @@
 package com.keao.edu.user.page;
 
-import java.util.Date;
-
 import com.keao.edu.common.page.QueryInfo;
 
+import java.util.Date;
+
 /**
  * @Author Joburgess
  * @Date 2020.07.07
@@ -12,11 +12,7 @@ public class ExamManualLedgerQueryInfo extends QueryInfo {
 
     private Integer targetOrganId;
 
-    private String examId;
-    
-    private String tenantId;
-    
-    private Integer organId;
+    private Long examId;
     
     private Date startTime;
     
@@ -32,28 +28,12 @@ public class ExamManualLedgerQueryInfo extends QueryInfo {
         this.targetOrganId = targetOrganId;
     }
 
-    public String getExamId() {
-        return examId;
-    }
-
-    public void setExamId(String examId) {
-        this.examId = examId;
-    }
-
-	public String getTenantId() {
-		return tenantId;
-	}
-
-	public void setTenantId(String tenantId) {
-		this.tenantId = tenantId;
-	}
-
-	public Integer getOrganId() {
-		return organId;
+	public Long getExamId() {
+		return examId;
 	}
 
-	public void setOrganId(Integer organId) {
-		this.organId = organId;
+	public void setExamId(Long examId) {
+		this.examId = examId;
 	}
 
 	public Date getStartTime() {

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamManualLedgerMapper.xml

@@ -138,7 +138,7 @@
 		LEFT JOIN sys_user su ON eml.operator_user_id_ = su.id_
 		left join examination_basic eb on eb.id_ = eml.examination_basic_id_
 		<include refid="queryExamManualLedgersCondition"/>
-		ORDER BY eml.id_
+		ORDER BY eml.id_ DESC
 		<include refid="global.limit"/>
 	</select>
 
@@ -168,7 +168,10 @@
 				AND organ_id_=#{organId}
 			</if>
 			AND trans_direction_ = 'EXPENDITURE'
-			<if test="targetOrganId!=null">
+			<if test="targetOrganId!=null and targetOrganId==-99">
+				AND target_organ_id_ IS NULL
+			</if>
+			<if test="targetOrganId!=null and targetOrganId!=-99">
 				AND target_organ_id_=#{targetOrganId}
 			</if>
 	</select>

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamManualLedgerController.java

@@ -41,6 +41,7 @@ public class ExamManualLedgerController extends BaseController {
 		ModelMap model = new ModelMap();
 		model.put("pageInfo", pageInfo);
 		model.put("totalAmount", examManualLedgerService.queryTotalAmount(queryInfo));
+		model.put("statistics", examManualLedgerService.getExamManualLedgerStatistics(OrganContextHolder.getOrganId(),queryInfo.getExamId(),queryInfo.getTargetOrganId()));
 		return succeed(model);
 	}