项目技术负责人获取更新

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

@@ -506,7 +506,23 @@ public class RuralCostProjectMessageController extends BaseController {
                 consultant.setRole("咨询员");
                 consultant.setZixunyuanName(user.getName());
                 if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+                    User chenHongXing=UserUtils.getByLoginName("陈红星");
+                    List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+                    //获取陈红星的造价师信息
+                    WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+                    //根据用户查询技能信息
+                    List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                    for (WorkStaffCertificate certificateInfo: certificateBList) {
+                        for (MainDictDetail type : certificateMajor) {
+                            if(certificateInfo.getMajor().equals(type.getValue())){
+                                bzshbConsultant.setMajor(type.getLabel());
+                            }
+                        }
+                    }
+
                     bzshbConsultant = consultant;
+                    bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
                     bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
                     bzshbConsultant.setRole("技术负责人");
                     it.remove();

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

@@ -6,9 +6,7 @@ import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
-import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.historical.entity.HistoricalData;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
@@ -39,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
@@ -308,7 +305,23 @@ public class RuralProjectMessageAllController extends BaseController {
                 consultant.setRole("咨询员");
                 consultant.setZixunyuanName(user.getName());
                 if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+                    User chenHongXing=UserUtils.getByLoginName("陈红星");
+                    List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+                    //获取陈红星的造价师信息
+                    WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+                    //根据用户查询技能信息
+                    List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                    for (WorkStaffCertificate certificateInfo: certificateBList) {
+                        for (MainDictDetail type : certificateMajor) {
+                            if(certificateInfo.getMajor().equals(type.getValue())){
+                                bzshbConsultant.setMajor(type.getLabel());
+                            }
+                        }
+                    }
+
                     bzshbConsultant = consultant;
+                    bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
                     bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
                     bzshbConsultant.setRole("技术负责人");
                     it.remove();

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
-import com.jeeplus.common.bos.BOSClientUtil;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.MyBeanUtils;
@@ -37,7 +36,10 @@ import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordsReportedDao;
-import com.jeeplus.modules.ruralprojectrecords.entity.*;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsReported;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageElectronicSealService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
@@ -49,7 +51,6 @@ import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.tools.utils.SignaturePostUtil;
-import com.jeeplus.modules.utils.SftpClientUtil;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
@@ -64,14 +65,11 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
+import java.io.File;
 import java.util.*;
 
 /**
@@ -518,7 +516,24 @@ public class RuralProjectMessageController extends BaseController {
                 consultant.setRole("咨询员");
                 consultant.setZixunyuanName(user.getName());
                 if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+
+                    User chenHongXing=UserUtils.getByLoginName("陈红星");
+                    List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+                    //获取陈红星的造价师信息
+                    WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+                    //根据用户查询技能信息
+                    List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                    for (WorkStaffCertificate certificateInfo: certificateBList) {
+                        for (MainDictDetail type : certificateMajor) {
+                            if(certificateInfo.getMajor().equals(type.getValue())){
+                                bzshbConsultant.setMajor(type.getLabel());
+                            }
+                        }
+                    }
+
                     bzshbConsultant = consultant;
+                    bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
                     bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
                     bzshbConsultant.setRole("技术负责人");
                     it.remove();

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

@@ -7,11 +7,9 @@ import com.jeeplus.common.utils.Collections3;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.alterinfo.entity.AlterInfo;
 import com.jeeplus.modules.alterinfo.service.AlterInfoService;
-import com.jeeplus.modules.act.entity.Act;
-import com.jeeplus.modules.act.service.ActTaskService;
-import com.jeeplus.modules.project.entity.Project;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryRelationService;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
@@ -35,10 +33,9 @@ import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import com.jeeplus.modules.workactivity.service.ActivityService;
-import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
 import com.jeeplus.modules.workbidproject.service.WorkBidProjectService;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
@@ -46,20 +43,15 @@ import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
 import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
-import org.activiti.engine.runtime.ProcessInstance;
-import org.activiti.engine.task.Task;
-import org.apache.shiro.authz.annotation.Logical;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -422,7 +414,23 @@ public class RuralProjectViewController extends BaseController {
                 consultant.setRole("咨询员");
                 consultant.setZixunyuanName(user.getName());
                 if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+                    User chenHongXing=UserUtils.getByLoginName("陈红星");
+                    List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+                    //获取陈红星的造价师信息
+                    WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+                    //根据用户查询技能信息
+                    List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                    for (WorkStaffCertificate certificateInfo: certificateBList) {
+                        for (MainDictDetail type : certificateMajor) {
+                            if(certificateInfo.getMajor().equals(type.getValue())){
+                                bzshbConsultant.setMajor(type.getLabel());
+                            }
+                        }
+                    }
+
                     bzshbConsultant = consultant;
+                    bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
                     bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
                     bzshbConsultant.setRole("技术负责人");
                     it.remove();

src/main/java/com/jeeplus/modules/workfullmanage/service/WorkFullManageService.java

@@ -19,6 +19,7 @@ import com.jeeplus.modules.ruralprojectrecords.entity.ProjectReportSignatureInfo
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageNewService;
+import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.dao.AreaDao;
 import com.jeeplus.modules.sys.dao.RoleDao;
@@ -60,8 +61,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -130,6 +129,8 @@ public class WorkFullManageService extends CrudService<WorkFullManageDao, WorkFu
 	private UserService userService;
 	@Autowired
 	private WorkStaffBasicInfoService workStaffBasicInfoService;
+	@Autowired
+	private RuralProjectMessageService ruralProjectMessageService;
 
 	@Autowired
 	private RuralProjectMessageElectronicSealDao ruralProjectMessageElectronicSealDao;
@@ -627,7 +628,23 @@ public class WorkFullManageService extends CrudService<WorkFullManageDao, WorkFu
 				consultant.setZixunyuanName(user.getName());
 				consultant.setRole("咨询员");
 				if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+					User chenHongXing=UserUtils.getByLoginName("陈红星");
+					List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+					//获取陈红星的造价师信息
+					WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+					//根据用户查询技能信息
+					List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+					for (WorkStaffCertificate certificateInfo: certificateBList) {
+						for (MainDictDetail type : certificateMajor) {
+							if(certificateInfo.getMajor().equals(type.getValue())){
+								bzshbConsultant.setMajor(type.getLabel());
+							}
+						}
+					}
+
 					bzshbConsultant = consultant;
+					bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
 					bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
 					bzshbConsultant.setRole("技术负责人");
 					it.remove();

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

@@ -237,7 +237,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
-import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -6552,7 +6551,23 @@ public class WorkProjectNotifyController extends BaseController {
 									consultant.setRole("咨询员");
 									consultant.setZixunyuanName(user.getName());
 									if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+										User chenHongXing=UserUtils.getByLoginName("陈红星");
+										List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+										//获取陈红星的造价师信息
+										WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+										//根据用户查询技能信息
+										List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+										for (WorkStaffCertificate certificateInfo: certificateBList) {
+											for (MainDictDetail type1 : certificateMajor) {
+												if(certificateInfo.getMajor().equals(type1.getValue())){
+													bzshbConsultant.setMajor(type1.getLabel());
+												}
+											}
+										}
+
 										bzshbConsultant = consultant;
+										bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
 										bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
 										bzshbConsultant.setRole("技术负责人");
 										it.remove();
@@ -8624,7 +8639,23 @@ public class WorkProjectNotifyController extends BaseController {
 				consultant.setRole("咨询员");
 				consultant.setZixunyuanName(user.getName());
 				if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+					User chenHongXing=UserUtils.getByLoginName("陈红星");
+					List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
+					//获取陈红星的造价师信息
+					WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+					//根据用户查询技能信息
+					List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+					for (WorkStaffCertificate certificateInfo: certificateBList) {
+						for (MainDictDetail type : certificateMajor) {
+							if(certificateInfo.getMajor().equals(type.getValue())){
+								bzshbConsultant.setMajor(type.getLabel());
+							}
+						}
+					}
+
 					bzshbConsultant = consultant;
+					bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
 					bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
 					bzshbConsultant.setRole("技术负责人");
 					it.remove();

src/main/resources/mappings/modules/projectGuidang/ProjectFilingBatchDao.xml

@@ -102,6 +102,9 @@
 			<if test="filingName!=null and filingName != ''">
 				,filing_name=#{filingName}
 			</if>
+			<if test="information!=null and information != ''">
+				,information=#{information}
+			</if>
 		</set>
 		where id =#{id}
 	</update>