|
|
@@ -7,7 +7,6 @@ import com.keao.edu.common.page.PageInfo;
|
|
|
import com.keao.edu.common.service.impl.BaseServiceImpl;
|
|
|
import com.keao.edu.user.dao.ExamManualLedgerDao;
|
|
|
import com.keao.edu.user.dao.ExamOrganizationRelationDao;
|
|
|
-import com.keao.edu.user.dao.ExaminationBasicDao;
|
|
|
import com.keao.edu.user.dto.ExamManualLedgerStatisticsDto;
|
|
|
import com.keao.edu.user.entity.ExamManualLedger;
|
|
|
import com.keao.edu.user.entity.ExamOrganizationRelation;
|
|
|
@@ -19,6 +18,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Isolation;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.*;
|
|
|
|
|
|
@Service
|
|
|
@@ -28,8 +28,6 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
|
|
|
private ExamManualLedgerDao examManualLedgerDao;
|
|
|
@Autowired
|
|
|
private ExamOrganizationRelationDao examOrganizationRelationDao;
|
|
|
- @Autowired
|
|
|
- private ExaminationBasicDao examinationBasicDao;
|
|
|
|
|
|
@Override
|
|
|
public BaseDAO<Long, ExamManualLedger> getDAO() {
|
|
|
@@ -91,7 +89,11 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
|
|
|
if(Objects.isNull(examOrganizationRelation)){
|
|
|
throw new BizException("合作单位信息异常");
|
|
|
}
|
|
|
- examOrganizationRelation.setTotalTransAmount(examManualLedgerDao.countOrganLedgerWithExam(examManualLedger.getExaminationBasicId(), examManualLedger.getTargetOrganId()));
|
|
|
+ BigDecimal amount = examManualLedgerDao.countOrganLedgerWithExam(examManualLedger.getExaminationBasicId(), examManualLedger.getTargetOrganId());
|
|
|
+ if(Objects.isNull(amount)){
|
|
|
+ amount=BigDecimal.ZERO;
|
|
|
+ }
|
|
|
+ examOrganizationRelation.setTotalTransAmount(amount);
|
|
|
examOrganizationRelationDao.update(examOrganizationRelation);
|
|
|
}
|
|
|
}
|
Joburgess