数据优化

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewTwoController.java

@@ -587,6 +587,23 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
             }else{
                 if(StringUtils.isNotBlank(projectReportData.getBzshbUserId())){
                     User user=userService.get(projectReportData.getBzshbUserId());
+                    User chenHongXing=UserUtils.getByLoginName("陈红星");
+                    List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+                    //获取陈红星的造价师信息
+                    WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+                    //根据用户查询技能信息
+                    List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+                    for (WorkStaffCertificate certificateInfo: certificateBList) {
+                        for (MainDictDetail type1 : certificateMajor) {
+                            if(certificateInfo.getMajor().equals(type1.getValue())){
+                                bzshbConsultant.setMajor(type1.getLabel());
+                            }
+                        }
+                    }
+
+
+                    bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
                     bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
                     bzshbConsultant.setZixunyuan(user.getId());
                     bzshbConsultant.setRole("技术负责人");

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectSignatureCallBackController.java

@@ -135,7 +135,7 @@ public class RuralProjectSignatureCallBackController extends BaseController {
 
         //查询是否已经进行发送通知，没有发送则进行发送，否则  直接跳过
         List<WorkProjectNotify> byTitle = workProjectNotifyService.getByTitle(title);
-        if(byTitle.size() == 1 && "0".equals(byTitle.get(0).getCountNum())){
+        if(byTitle.size() == 0) {
             workProjectNotifyService
                     .save(UtilNotify
                             .saveNotify(projectApprovalSignature.getId(),
@@ -265,7 +265,7 @@ public class RuralProjectSignatureCallBackController extends BaseController {
 
         //查询是否已经进行发送通知，没有发送则进行发送，否则  直接跳过
         List<WorkProjectNotify> byTitle = workProjectNotifyService.getByTitle(title);
-        if(byTitle.size() == 1 && "0".equals(byTitle.get(0).getCountNum())){
+        if(byTitle.size() == 0) {
             workProjectNotifyService
                     .save(UtilNotify
                             .saveNotify(projectApprovalSignature.getId(),
@@ -363,7 +363,7 @@ public class RuralProjectSignatureCallBackController extends BaseController {
                 notify.setNotifyId(projectReportSignature.getId());
                 //查询是否已经进行发送通知，没有发送则进行发送，否则  直接跳过
                 List<WorkProjectNotify> byTitle = workProjectNotifyService.getByTitle(title);
-                if(byTitle.size() == 1 && "0".equals(byTitle.get(0).getCountNum())){
+                if(byTitle.size() == 0) {
                     workProjectNotifyService
                             .save(UtilNotify
                                     .saveNotify(projectReportSignature.getId(),
@@ -427,7 +427,7 @@ public class RuralProjectSignatureCallBackController extends BaseController {
         notify.setNotifyId(projectReportSignature.getId());
         //查询是否已经进行发送通知，没有发送则进行发送，否则  直接跳过
         List<WorkProjectNotify> byTitle = workProjectNotifyService.getByTitle(title);
-        if(byTitle.size() == 1 && "0".equals(byTitle.get(0).getCountNum())){
+        if(byTitle.size() == 0) {
             workProjectNotifyService
                     .save(UtilNotify
                             .saveNotify(projectReportSignature.getId(),
@@ -528,7 +528,7 @@ public class RuralProjectSignatureCallBackController extends BaseController {
                 notify.setNotifyId(projectReportSignature.getId());
                 //查询是否已经进行发送通知，没有发送则进行发送，否则  直接跳过
                 List<WorkProjectNotify> byTitle = workProjectNotifyService.getByTitle(title);
-                if(byTitle.size() == 1 && "0".equals(byTitle.get(0).getCountNum())){
+                if(byTitle.size() == 0) {
                     workProjectNotifyService
                             .save(UtilNotify
                                     .saveNotify(projectReportSignature.getId(),
@@ -592,7 +592,7 @@ public class RuralProjectSignatureCallBackController extends BaseController {
         notify.setNotifyId(projectReportSignature.getId());
         //查询是否已经进行发送通知，没有发送则进行发送，否则  直接跳过
         List<WorkProjectNotify> byTitle = workProjectNotifyService.getByTitle(title);
-        if(byTitle.size() == 1 && "0".equals(byTitle.get(0).getCountNum())){
+        if(byTitle.size() == 0) {
             workProjectNotifyService
                     .save(UtilNotify
                             .saveNotify(projectReportSignature.getId(),
@@ -693,7 +693,7 @@ public class RuralProjectSignatureCallBackController extends BaseController {
                 notify.setNotifyId(projectReportData.getId());
                 //查询是否已经进行发送通知，没有发送则进行发送，否则  直接跳过
                 List<WorkProjectNotify> byTitle = workProjectNotifyService.getByTitle(title);
-                if(byTitle.size() == 1 && "0".equals(byTitle.get(0).getCountNum())){
+                if(byTitle.size() == 0) {
                     workProjectNotifyService
                             .save(UtilNotify
                                     .saveNotify(projectReportData.getId(),
@@ -733,7 +733,7 @@ public class RuralProjectSignatureCallBackController extends BaseController {
         notify.setNotifyId(projectReportData.getId());
         //查询是否已经进行发送通知，没有发送则进行发送，否则  直接跳过
         List<WorkProjectNotify> byTitle = workProjectNotifyService.getByTitle(title);
-        if(byTitle.size() == 1 && "0".equals(byTitle.get(0).getCountNum())){
+        if(byTitle.size() == 0) {
             projectReportData.setStatus("5");
             workProjectNotifyService
                     .save(UtilNotify

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -6629,6 +6629,25 @@ public class WorkProjectNotifyController extends BaseController {
 								}else{
 									if(StringUtils.isNotBlank(projectReportData.getBzshbUserId())){
 										user=userService.get(projectReportData.getBzshbUserId());
+
+										User chenHongXing=UserUtils.getByLoginName("陈红星");
+										List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+										//获取陈红星的造价师信息
+										WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+										//根据用户查询技能信息
+										List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+										for (WorkStaffCertificate certificateInfo: certificateBList) {
+											for (MainDictDetail type1 : certificateMajor) {
+												if(certificateInfo.getMajor().equals(type1.getValue())){
+													bzshbConsultant.setMajor(type1.getLabel());
+												}
+											}
+										}
+
+
+										bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
+
 										bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
 										bzshbConsultant.setZixunyuan(user.getId());
 										bzshbConsultant.setRole("技术负责人");