|
@@ -3933,6 +3933,17 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
|
|
|
//获取专业类型
|
|
//获取专业类型
|
|
|
List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("certificate_major");
|
|
List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("certificate_major");
|
|
|
for (WorkStaffCertificate certificateInfo: userCertificateList) {
|
|
for (WorkStaffCertificate certificateInfo: userCertificateList) {
|
|
|
|
|
+ //如果consultantInfoList中已经存在该负责人则跳过
|
|
|
|
|
+ boolean alreadyExists = false;
|
|
|
|
|
+ for (RuralReportConsultant c : consultantInfoList) {
|
|
|
|
|
+ if (projectRecords.getProjectMasterId().equals(c.getZixunyuan())) {
|
|
|
|
|
+ alreadyExists = true;
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ if (alreadyExists) {
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
currentConsultant.setZhucezigezhID(certificateInfo.getNum());
|
|
currentConsultant.setZhucezigezhID(certificateInfo.getNum());
|
|
|
currentConsultant.setZhucezigezhKey(certificateInfo.getName());
|
|
currentConsultant.setZhucezigezhKey(certificateInfo.getName());
|
|
|
for (MainDictDetail type : certificateMajor) {
|
|
for (MainDictDetail type : certificateMajor) {
|