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

edu-auth/edu-auth-server/src/main/resources/application.yml

@@ -86,7 +86,7 @@ ribbon:
   ConnectTimeout: 60000
 
 message:
-  debugMode: false
+  debugMode: true
 
 logging:
   level:

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

@@ -40,22 +40,23 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
 		if(Objects.isNull(examManualLedger.getExaminationBasicId())){
 			throw new BizException("请指定考级项目");
 		}
+		if(Objects.isNull(examManualLedger.getOrganId())){
+			throw new BizException("暂无权限");
+		}
 		if(Objects.isNull(examManualLedger.getAmount())){
 			throw new BizException("请指定交易金额");
 		}
-//		examinationBasicDao.lockExam(examManualLedger.getExaminationBasicId());
 		if(Objects.nonNull(examManualLedger.getTargetOrganId())&&examManualLedger.getTargetOrganId()<=0){
 			examManualLedger.setTargetOrganId(null);
 		}
 		examManualLedgerDao.insert(examManualLedger);
-		if(Objects.nonNull(examManualLedger.getTargetOrganId())&&examManualLedger.getTargetOrganId()>0){
-			ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(examManualLedger.getExaminationBasicId(), examManualLedger.getTargetOrganId());
-			if(Objects.isNull(examOrganizationRelation)){
-				throw new BizException("合作单位信息异常");
-			}
-			examOrganizationRelation.setTotalTransAmount(examManualLedgerDao.countOrganLedgerWithExam(examManualLedger.getExaminationBasicId(), examManualLedger.getTargetOrganId()));
-			examOrganizationRelationDao.update(examOrganizationRelation);
+
+		ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(examManualLedger.getExaminationBasicId(), examManualLedger.getOrganId());
+		if(Objects.isNull(examOrganizationRelation)){
+			throw new BizException("合作单位信息异常");
 		}
+		examOrganizationRelation.setTotalTransAmount(examManualLedgerDao.countOrganLedgerWithExam(examManualLedger.getExaminationBasicId(), examManualLedger.getOrganId()));
+		examOrganizationRelationDao.update(examOrganizationRelation);
 	}
 
 	@Override
@@ -82,20 +83,18 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
 			throw new BizException("请指定需要删除的支出记录");
 		}
 		ExamManualLedger examManualLedger = examManualLedgerDao.get(id);
-//		examinationBasicDao.lockExam(examManualLedger.getExaminationBasicId());
 		examManualLedgerDao.delete(id);
-		if(Objects.nonNull(examManualLedger.getTargetOrganId())&&examManualLedger.getTargetOrganId()>0){
-			ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(examManualLedger.getExaminationBasicId(), examManualLedger.getTargetOrganId());
-			if(Objects.isNull(examOrganizationRelation)){
-				throw new BizException("合作单位信息异常");
-			}
-			BigDecimal amount = examManualLedgerDao.countOrganLedgerWithExam(examManualLedger.getExaminationBasicId(), examManualLedger.getTargetOrganId());
-			if(Objects.isNull(amount)){
-				amount=BigDecimal.ZERO;
-			}
-			examOrganizationRelation.setTotalTransAmount(amount);
-			examOrganizationRelationDao.update(examOrganizationRelation);
+
+		ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(examManualLedger.getExaminationBasicId(), examManualLedger.getOrganId());
+		if(Objects.isNull(examOrganizationRelation)){
+			throw new BizException("合作单位信息异常");
+		}
+		BigDecimal amount = examManualLedgerDao.countOrganLedgerWithExam(examManualLedger.getExaminationBasicId(), examManualLedger.getOrganId());
+		if(Objects.isNull(amount)){
+			amount=BigDecimal.ZERO;
 		}
+		examOrganizationRelation.setTotalTransAmount(amount);
+		examOrganizationRelationDao.update(examOrganizationRelation);
 	}
 
 	@Override

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

@@ -37,7 +37,7 @@ public class ShortUrlServiceImpl extends BaseServiceImpl<Long, ShortUrl> impleme
 		SysConfig baseUrlConfig = sysConfigService.findByParamName(SysConfigService.BASE_API_URL);
 
 		StringBuffer returnUrl=new StringBuffer(baseUrlConfig.getParanValue());
-		returnUrl.append("/su/");
+		returnUrl.append("/api-user/su/");
 		returnUrl.append(shortUrl.getId());
 
 		return returnUrl.toString();

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

@@ -154,7 +154,7 @@
 			exam_manual_ledger
 		WHERE
 			examination_basic_id_ = #{examId}
-			AND target_organ_id_ = #{organId}
+			AND organ_id_ = #{organId}
 			AND trans_direction_ = 'EXPENDITURE'
 	</select>
 </mapper>

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

@@ -387,10 +387,12 @@
 		LEFT JOIN organization a ON ear.organ_id_=a.id_
 		WHERE
 		ear.examination_basic_id_=#{examId}
-		AND ear.organ_id_ IN
-		<foreach collection="organIds" item="organId" separator="," open="(" close=")">
-			#{organId}
-		</foreach>
+		<if test="organIds!=null">
+			AND ear.organ_id_ IN
+			<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+				#{organId}
+			</foreach>
+		</if>
 	</select>
 
 </mapper>