Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

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

@@ -66,8 +66,8 @@ public class ExamManualLedgerController extends BaseController {
 
     @ApiOperation("获取考级项目支出统计信息")
     @GetMapping(value = "/getExamManualLedgerStatistics")
-    public HttpResponseResult<ExamManualLedgerStatisticsDto> getExamManualLedgerStatistics(Long examId){
-        return succeed(examManualLedgerService.getExamManualLedgerStatistics(OrganContextHolder.getOrganId(),examId));
+    public HttpResponseResult<ExamManualLedgerStatisticsDto> getExamManualLedgerStatistics(Long examId, Integer targetOrganId){
+        return succeed(examManualLedgerService.getExamManualLedgerStatistics(OrganContextHolder.getOrganId(),examId,targetOrganId));
     }
 
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamManualLedgerDao.java

@@ -22,7 +22,8 @@ public interface ExamManualLedgerDao extends BaseDAO<Long, ExamManualLedger> {
      * @return com.keao.edu.user.dto.ExamManualLedgerStatisticsDto
      */
     ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(@Param("organId") Integer organId,
-                                                                @Param("examId") Long examId);
+                                                                @Param("examId") Long examId,
+                                                                @Param("targetOrganId") Integer targetOrganId);
 
 
     List<ExamManualLedger> getExamOrganManualLedgers(@Param("organId") Integer organId,

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

@@ -8,8 +8,18 @@ import com.keao.edu.common.page.QueryInfo;
  */
 public class ExamManualLedgerQueryInfo extends QueryInfo {
 
+    private Integer targetOrganId;
+
     private Integer examId;
 
+    public Integer getTargetOrganId() {
+        return targetOrganId;
+    }
+
+    public void setTargetOrganId(Integer targetOrganId) {
+        this.targetOrganId = targetOrganId;
+    }
+
     public Integer getExamId() {
         return examId;
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamManualLedgerService.java

@@ -22,6 +22,6 @@ public interface ExamManualLedgerService extends BaseService<Long, ExamManualLed
      * @param examId:
      * @return com.keao.edu.user.dto.ExamManualLedgerStatisticsDto
      */
-    ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(Integer organId,Long examId);
+    ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(Integer organId,Long examId, Integer targetOrganId);
 
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamManualLedgerServiceImpl.java

@@ -98,10 +98,10 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
 	}
 
 	@Override
-	public ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(Integer organId, Long examId) {
+	public ExamManualLedgerStatisticsDto getExamManualLedgerStatistics(Integer organId, Long examId, Integer targetOrganId) {
 		if(Objects.isNull(examId)){
 			throw new BizException("请指定考级项目");
 		}
-		return examManualLedgerDao.getExamManualLedgerStatistics(organId, examId);
+		return examManualLedgerDao.getExamManualLedgerStatistics(organId, examId, targetOrganId);
 	}
 }

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

@@ -99,6 +99,9 @@
 			<if test="organId!=null and organId!=0">
 				AND organ_id_=#{organId}
 			</if>
+			<if test="targetOrganId!=null">
+				AND target_organ_id_=#{targetOrganId}
+			</if>
 		</where>
 	</sql>
 
@@ -133,6 +136,9 @@
 				AND organ_id_=#{organId}
 			</if>
 			AND trans_direction_ = 'EXPENDITURE'
+			<if test="targetOrganId!=null">
+				AND target_organ_id_=#{targetOrganId}
+			</if>
 	</select>
     <select id="getExamOrganManualLedgers" resultMap="ExamManualLedger">
 		SELECT

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -234,7 +234,7 @@
 				AND er.status_ = #{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
 			</if>
 			<if test="search!=null and search!=''">
-				AND (er.student_id_=#{search} OR su.real_name_ LIKE CONCAT('%', #{search}, '%') OR eb.name_ LIKE CONCAT('%', #{search}, '%'))
+				AND (er.student_id_=#{search} OR su.phone_ LIKE CONCAT('%', #{search}, '%') OR su.real_name_ LIKE CONCAT('%', #{search}, '%') OR eb.name_ LIKE CONCAT('%', #{search}, '%'))
 			</if>
 		</where>
 	</sql>