上报咨询员专业获取方式修改修改

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

@@ -487,10 +487,17 @@ public class RuralCostProjectMessageController extends BaseController {
         for (RuralReportConsultant consultant:consultants){
             //根据用户查询技能信息
             List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+            //获取专业类型
+            List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("certificate_major");
             for (WorkStaffCertificate certificateInfo: certificateList) {
                 if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
                     consultant.setZhucezigezhID(certificateInfo.getNum());
                 }
+                for (MainDictDetail type : certificateMajor) {
+                    if(certificateInfo.getMajor().equals(type.getValue())){
+                        consultant.setMajor(type.getLabel());
+                    }
+                }
             }
             User user=userService.get(consultant.getZixunyuan());
             consultant.setZixunyuanName(user.getName());

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

@@ -496,10 +496,17 @@ public class RuralProjectMessageController extends BaseController {
         for (RuralReportConsultant consultant:consultants){
             //根据用户查询技能信息
             List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+            //获取专业类型
+            List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("certificate_major");
             for (WorkStaffCertificate certificateInfo: certificateList) {
                 if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
                     consultant.setZhucezigezhID(certificateInfo.getNum());
                 }
+                for (MainDictDetail type : certificateMajor) {
+                    if(certificateInfo.getMajor().equals(type.getValue())){
+                        consultant.setMajor(type.getLabel());
+                    }
+                }
             }
             User user=userService.get(consultant.getZixunyuan());
             consultant.setZixunyuanName(user.getName());

src/main/resources/mappings/modules/projectcontentinfo/ProjectcontentinfoDao.xml

@@ -601,7 +601,7 @@
 	</select>
 
 	<select id="getCertificateByUser" resultType="com.jeeplus.modules.workstaff.entity.WorkStaffCertificate">
-		select a.name,a.num from work_staff_certificate a
+		select a.name,a.num,a.major from work_staff_certificate a
 		left join work_staff_achives wsa on a.staff_id = wsa.id
 		where wsa.user_id = #{userId} and a.del_flag=0
 	</select>