代码更改

src/main/java/com/jeeplus/modules/filePreview/PreviewController.java

@@ -1,9 +1,6 @@
 package com.jeeplus.modules.filePreview;
 
 
-import com.aliyun.oss.OSSClient;
-import com.aliyun.oss.common.utils.BinaryUtil;
-import com.aliyun.oss.model.PolicyConditions;
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.http.MethodType;
@@ -146,11 +143,11 @@ public class PreviewController extends BaseController {
         // 只有 RAM用户（子账号）才能调用 AssumeRole 接口
         // 阿里云主账号的AccessKeys不能用于发起AssumeRole请求
         // 请首先在RAM控制台创建一个RAM用户，并为这个用户创建AccessKeys
-        String accessKeyId =  "LTAI5tBBnQdpZapU28Ds89fb";//Global.getAccessKeyId();
-        String accessKeySecret = "A37CuoALjoxCjPolzRm3ct5o8UHILF"; //Global.getAccessKeySecret();
+        String accessKeyId =  "LTAI5t9w87Wz9d7RHfUKhRS1";//Global.getAccessKeyId();
+        String accessKeySecret = "XYzngvUWRPw1aSiUyVnsAwPUP7USnT"; //Global.getAccessKeySecret();
 
         // RoleArn 需要在 RAM 控制台上获取
-        String roleArn = "acs:ram::1132186699724035:role/yf";
+        String roleArn = "acs:ram::1104056401131833:role/yd";
         long durationSeconds = Long.parseLong("3600");
         String policy = "{\n" +
                 "  \"Version\": \"1\",\n" +
@@ -171,7 +168,7 @@ public class PreviewController extends BaseController {
         // RoleSessionName 是临时Token的会话名称，自己指定用于标识你的用户，主要用于审计，或者用于区分Token颁发给谁
         // 但是注意RoleSessionName的长度和规则，不要有空格，只能有'-' '_' 字母和数字等字符
         // 具体规则请参考API文档中的格式要求
-        String roleSessionName = "yf";
+        String roleSessionName = "yd";
         // 此处必须为 HTTPS
         ProtocolType protocolType = ProtocolType.HTTPS;
         try {

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectReportRecordController.java

@@ -3,22 +3,26 @@
  */
 package com.jeeplus.modules.projectcontentinfo.web;
 
-import java.util.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolationException;
-
+import com.google.common.collect.Lists;
+import com.jeeplus.common.config.Global;
+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.excel.ExportExcel;
+import com.jeeplus.common.utils.excel.ImportExcel;
+import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.projectType.service.ProjectResultsFileTemplateService;
 import com.jeeplus.modules.projectType.service.ProjectTypeService;
-import com.jeeplus.modules.projectcontentinfo.entity.*;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectBasedData;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentData;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectcontentinfo.service.*;
 import com.jeeplus.modules.projectcontroltable.entity.ProjectControlTable;
 import com.jeeplus.modules.projectcontroltable.service.ProjectControlTableService;
-import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
-import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.projectrecord.service.early.ProjectEarlyReviewService;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
@@ -37,9 +41,7 @@ import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
 import org.activiti.engine.HistoryService;
 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;
@@ -47,15 +49,10 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import com.google.common.collect.Lists;
-import com.jeeplus.common.utils.DateUtils;
-import com.jeeplus.common.utils.MyBeanUtils;
-import com.jeeplus.common.config.Global;
-import com.jeeplus.common.persistence.Page;
-import com.jeeplus.common.web.BaseController;
-import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.utils.excel.ExportExcel;
-import com.jeeplus.common.utils.excel.ImportExcel;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.ConstraintViolationException;
+import java.util.*;
 
 /**
  * 报告归档Controller
@@ -827,6 +824,7 @@ public class ProjectReportRecordController extends BaseController {
 	@RequestMapping(value = {"newAuditSaveTwo"})
 	public String newAuditSaveTwo(ProjectReportRecord projectReportRecord, HttpServletRequest request, HttpServletResponse response, Model model,
 							   RedirectAttributes redirectAttributes) {
+		String companyType = projectReportRecord.getCompanyType();
 		try {
 			Office office = UserUtils.getSelectOffice();
 			//查询项目新增报告信息
@@ -925,9 +923,9 @@ public class ProjectReportRecordController extends BaseController {
 					return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
 				}
 				if("1".equals(ruralProjectRecords.getProjectType())){
-					return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+					return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
 				}else if("2".equals(ruralProjectRecords.getProjectType())){
-					return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+					return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
 				}
 			}
 			return "redirect:"+Global.getAdminPath()+"/project/projectEarlyPigeonhole/?repage";

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

@@ -531,7 +531,7 @@ public class RuralCostProjectMessageController extends BaseController {
 
                     bzshbConsultant = consultant;
                     bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
-                    bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
+                    bzshbConsultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
                     bzshbConsultant.setRole("技术负责人");
                     it.remove();
                 }
@@ -568,7 +568,7 @@ public class RuralCostProjectMessageController extends BaseController {
                     if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
                         try {
                             MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
                             bzshbConsultant.setRole("技术负责人");
                         } catch (Exception e) {
                             e.printStackTrace();
@@ -579,7 +579,7 @@ public class RuralCostProjectMessageController extends BaseController {
                     if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
                         try {
                             MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
                             bzshbConsultant.setRole("技术负责人");
                         } catch (Exception e) {
                             e.printStackTrace();
@@ -592,7 +592,7 @@ public class RuralCostProjectMessageController extends BaseController {
                 consultants.add(bzshbConsultant);
             }else{
                 User user=userService.get(projectReportData.getBzshbUserId());
-                bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+                bzshbConsultant.setZixunyuanName(""+user.getName()+"");
                 bzshbConsultant.setZixunyuan(user.getId());
                 bzshbConsultant.setRole("技术负责人");
                 consultants.add(bzshbConsultant);
@@ -1618,7 +1618,7 @@ public class RuralCostProjectMessageController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "getWorkUserBYJudgement")
     public WorkStaffCertificate getWorkUserBYJudgement(WorkStaffBasicInfo workStaffBasicInfo){
-        User byUserName = UserUtils.getByUserName("陈红星");
+        User byUserName = UserUtils.getByUserName("姜国祥");
         User user = UserUtils.get(workStaffBasicInfo.getId());
 
         workStaffBasicInfo = workStaffBasicInfoService.getWorkStaffBasicInfoByUserId(byUserName.getId());
@@ -1639,7 +1639,7 @@ public class RuralCostProjectMessageController extends BaseController {
         }
         workStaffCertificate.setIdCard(workStaffBasicInfo.getIdCard());
         workStaffCertificate.setZixunyuanId(user.getId());
-        workStaffCertificate.setZixunyuanName("陈红星("+user.getName()+"代)");
+        workStaffCertificate.setZixunyuanName(""+user.getName()+"");
         return workStaffCertificate;
     }
 

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

@@ -338,7 +338,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
             }else if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
                 if("8".equals(records.getAttachmentProjectSort()) || "1".equals(records.getSubmitMoney())){
 
-                    User chenHongXing=UserUtils.getByLoginName("陈红星");
+                    /*User chenHongXing=UserUtils.getByLoginName("陈红星");
                     List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
                     //获取陈红星的造价师信息
                     WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
@@ -352,9 +352,9 @@ public class RuralCostProjectMessageNewController extends BaseController {
                                 consultant.setMajor(type.getLabel());
                             }
                         }
-                    }
+                    }*/
                     User user=userService.get(consultant.getZixunyuan());
-                    consultant.setZixunyuanName("陈红星("+user.getName() + "代)");
+                    consultant.setZixunyuanName(""+user.getName() + "");
                     consultant.setZixunyuanId(user.getId());
                     consultant.setRole("技术负责人");
                     consultantBzshb = consultant;
@@ -409,7 +409,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
                         }
                     }
                     User user=userService.get(consultant.getZixunyuan());
-                    consultant.setZixunyuanName("陈红星("+user.getName() + "代)");
+                    consultant.setZixunyuanName(""+user.getName() + "");
                     consultant.setZixunyuanId(user.getId());
                     consultant.setRole("技术负责人");
                     consultants.add(consultant);
@@ -568,7 +568,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
                         }
                     }
                     User user=userService.get(consultant.getZixunyuan());
-                    consultant.setZixunyuanName("陈红星("+user.getName() + "代)");
+                    consultant.setZixunyuanName(""+user.getName() + "");
                     consultant.setZixunyuanId(user.getId());
                     consultant.setRole("技术负责人");
                     consultantBzshb = consultant;
@@ -624,7 +624,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
                         }
                     }
                     User user=userService.get(consultant.getZixunyuan());
-                    consultant.setZixunyuanName("陈红星("+user.getName() + "代)");
+                    consultant.setZixunyuanName(""+user.getName() + "");
                     consultant.setZixunyuanId(user.getId());
                     consultant.setRole("技术负责人");
                     consultants.add(consultant);

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

@@ -463,31 +463,34 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
                 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());
+                    User userZS=userService.get(projectReportData.getBzshbUserId());
+                    List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(userZS.getId());
+                    if(chenHongXingCertificateList.size()>0){
+
+                        //获取陈红星的造价师信息
+                        WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+                        //根据用户查询技能信息
+                        List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(userZS.getId());
+                        for (WorkStaffCertificate certificateInfo: certificateBList) {
+                            for (MainDictDetail type1 : certificateMajor) {
+                                if(certificateInfo.getMajor().equals(type1.getValue())){
+                                    consultant.setMajor(type1.getLabel());
+                                }
                             }
                         }
-                    }
 
-                    bzshbConsultant = consultant;
-                    bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
-                    bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
-                    bzshbConsultant.setRole("技术负责人");
-                    it.remove();
+
+                        consultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
+                    }
+                    consultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
+                    consultant.setRole("技术负责人");
+                    //it.remove();
                 }
             }
         }
 
-        if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+        /*if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
             consultants.add(bzshbConsultant);
         }else{
             //查询总审人员信息
@@ -516,7 +519,7 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
                     if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
                         try {
                             MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
                             bzshbConsultant.setRole("技术负责人");
                         } catch (Exception e) {
                             e.printStackTrace();
@@ -527,7 +530,7 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
                     if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
                         try {
                             MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
                             bzshbConsultant.setRole("技术负责人");
                         } catch (Exception e) {
                             e.printStackTrace();
@@ -541,30 +544,32 @@ 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());
+                    List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(user.getId());
+                    if(chenHongXingCertificateList.size()>0){
+
+                        //获取陈红星的造价师信息
+                        WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+                        //根据用户查询技能信息
+                        List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(user.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.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
+                    }
+                    bzshbConsultant.setZixunyuanName(""+user.getName()+"");
                     bzshbConsultant.setZixunyuan(user.getId());
                     bzshbConsultant.setRole("技术负责人");
                     consultants.add(bzshbConsultant);
                 }
             }
-        }
+        }*/
 
         consultants.addAll(consultantList);
 
@@ -661,7 +666,7 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
         model.addAttribute("projectReportData", projectReportData);
         model.addAttribute("projectReportRecord", projectReportRecord);
         model.addAttribute("workClientInfoName", projectReportRecord.getClientName());
-        model.addAttribute("project", projectReportRecord.getReport().getProject());
+        model.addAttribute("projectRecords", projectReportRecord.getReport().getProject());
         model.addAttribute("projectGrade", ruralProjectRecords.getSubmitMoney());
 
         if(StringUtils.isNotBlank(projectReportRecord.getProcessInstanceId())){

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

@@ -322,7 +322,7 @@ public class RuralProjectMessageAllController extends BaseController {
 
                     bzshbConsultant = consultant;
                     bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
-                    bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
+                    bzshbConsultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
                     bzshbConsultant.setRole("技术负责人");
                     it.remove();
                 }
@@ -359,7 +359,7 @@ public class RuralProjectMessageAllController extends BaseController {
                     if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
                         try {
                             MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
                             bzshbConsultant.setRole("技术负责人");
                         } catch (Exception e) {
                             e.printStackTrace();
@@ -370,7 +370,7 @@ public class RuralProjectMessageAllController extends BaseController {
                     if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
                         try {
                             MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
                             bzshbConsultant.setRole("技术负责人");
                         } catch (Exception e) {
                             e.printStackTrace();
@@ -383,7 +383,7 @@ public class RuralProjectMessageAllController extends BaseController {
                 consultants.add(bzshbConsultant);
             }else{
                 User user=userService.get(projectReportData.getBzshbUserId());
-                bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+                bzshbConsultant.setZixunyuanName(""+user.getName()+"");
                 bzshbConsultant.setZixunyuan(user.getId());
                 bzshbConsultant.setRole("技术负责人");
                 consultants.add(bzshbConsultant);

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

@@ -545,7 +545,7 @@ public class RuralProjectMessageController extends BaseController {
 
                     bzshbConsultant = consultant;
                     bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
-                    bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
+                    bzshbConsultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
                     bzshbConsultant.setRole("技术负责人");
                     it.remove();
                 }
@@ -582,7 +582,7 @@ public class RuralProjectMessageController extends BaseController {
                     if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
                         try {
                             MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
                             bzshbConsultant.setRole("技术负责人");
                         } catch (Exception e) {
                             e.printStackTrace();
@@ -593,7 +593,7 @@ public class RuralProjectMessageController extends BaseController {
                     if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
                         try {
                             MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
                             bzshbConsultant.setRole("技术负责人");
                         } catch (Exception e) {
                             e.printStackTrace();
@@ -606,7 +606,7 @@ public class RuralProjectMessageController extends BaseController {
                 consultants.add(bzshbConsultant);
             }else{
                 User user=userService.get(projectReportData.getBzshbUserId());
-                bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+                bzshbConsultant.setZixunyuanName(""+user.getName()+"");
                 bzshbConsultant.setZixunyuan(user.getId());
                 bzshbConsultant.setRole("技术负责人");
                 consultants.add(bzshbConsultant);

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

@@ -349,27 +349,28 @@ public class RuralProjectMessageNewController extends BaseController {
             }else if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
                 if("1".equals(records.getSubmitMoney())){
 
-                    User chenHongXing=UserUtils.getByLoginName("陈红星");
+                    User chenHongXing=UserUtils.get(projectReportData.getBzshbUserId());
                     List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
-                    //获取陈红星的造价师信息
-                    WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
-
-                    //根据用户查询技能信息
-                    List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
-                    consultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
-                    for (WorkStaffCertificate certificateInfo: certificateList) {
-                        for (MainDictDetail type : certificateMajor) {
-                            if(certificateInfo.getMajor().equals(type.getValue())){
-                                consultant.setMajor(type.getLabel());
+                    if(chenHongXingCertificateList.size()>0){
+                        //获取陈红星的造价师信息
+                        WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+                        //根据用户查询技能信息
+                        List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                        consultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
+                        for (WorkStaffCertificate certificateInfo: certificateList) {
+                            for (MainDictDetail type : certificateMajor) {
+                                if(certificateInfo.getMajor().equals(type.getValue())){
+                                    consultant.setMajor(type.getLabel());
+                                }
                             }
                         }
                     }
                     User user=userService.get(consultant.getZixunyuan());
-                    consultant.setZixunyuanName("陈红星("+user.getName() + "代)");
+                    consultant.setZixunyuanName(""+user.getName() + "");
                     consultant.setZixunyuanId(user.getId());
                     consultant.setRole("技术负责人");
-                    consultantBzshb = consultant;
-                    it.remove();
+                    //it.remove();
                 }else{
                     it.remove();
                 }
@@ -394,7 +395,7 @@ public class RuralProjectMessageNewController extends BaseController {
             consultants.add(consultantBzshb);
         }
 
-        if("1".equals(records.getSubmitMoney())){
+        /*if("1".equals(records.getSubmitMoney())){
             Integer jsfzrCount = 0;
             for (RuralReportConsultant consultant: consultants) {
                 if("技术负责人".equals(consultant.getRole())){
@@ -420,13 +421,13 @@ public class RuralProjectMessageNewController extends BaseController {
                         }
                     }
                     User user=userService.get(consultant.getZixunyuan());
-                    consultant.setZixunyuanName("陈红星("+user.getName() + "代)");
+                    consultant.setZixunyuanName(""+user.getName() + "");
                     consultant.setZixunyuanId(user.getId());
                     consultant.setRole("技术负责人");
                     consultants.add(consultant);
                 }
             }
-        }
+        }*/
 
         consultants.addAll(consultantList);
         model.addAttribute("info", consultants);
@@ -542,7 +543,7 @@ public class RuralProjectMessageNewController extends BaseController {
                         }
                     }
                     User user=userService.get(consultant.getZixunyuan());
-                    consultant.setZixunyuanName("陈红星("+user.getName() + "代)");
+                    consultant.setZixunyuanName(""+user.getName() + "");
                     consultant.setZixunyuanId(user.getId());
                     consultant.setRole("技术负责人");
                     consultantBzshb = consultant;
@@ -598,7 +599,7 @@ public class RuralProjectMessageNewController extends BaseController {
                         }
                     }
                     User user=userService.get(consultant.getZixunyuan());
-                    consultant.setZixunyuanName("陈红星("+user.getName() + "代)");
+                    consultant.setZixunyuanName(""+user.getName() + "");
                     consultant.setZixunyuanId(user.getId());
                     consultant.setRole("技术负责人");
                     consultants.add(consultant);

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

@@ -281,6 +281,9 @@ public class RuralProjectRecordsController extends BaseController {
             model.addAttribute("projectStartDate", "");
             model.addAttribute("projectEndDate", "");
         }
+        //根据归属部门Id查询归属部门名称显示
+        String belongingDepartmentName = projectRecordsService.getBelongingDepartmentNameByBelongingDepartment(projectRecords.getBelongingDepartment());
+        model.addAttribute("belongingDepartmentName",belongingDepartmentName);
 
         model.addAttribute("ruralProjectRecords", projectRecords);
         return "modules/ruralprojectrecords/ruralProjectRecordsForm";

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

@@ -37,7 +37,6 @@ 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.entity.WorkClientLinkman;
-import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
@@ -435,32 +434,33 @@ public class RuralProjectViewController extends BaseController {
                 consultant.setRole("咨询员");
                 consultant.setZixunyuanName(user.getName());
                 if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
-                    User chenHongXing=UserUtils.getByLoginName("陈红星");
+                    User chenHongXing=UserUtils.get(projectReportData.getBzshbUserId());
                     List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
-                    //获取陈红星的造价师信息
-                    WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+                    if(chenHongXingCertificateList.size()>0){
+
+                        //获取陈红星的造价师信息
+                        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());
+                        //根据用户查询技能信息
+                        List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                        for (WorkStaffCertificate certificateInfo: certificateBList) {
+                            for (MainDictDetail type : certificateMajor) {
+                                if(certificateInfo.getMajor().equals(type.getValue())){
+                                    consultant.setMajor(type.getLabel());
+                                }
                             }
                         }
+                        consultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
                     }
-
-                    bzshbConsultant = consultant;
-                    bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
-                    bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
-                    bzshbConsultant.setRole("技术负责人");
-                    it.remove();
+                    consultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
+                    consultant.setRole("技术负责人");
+                    //it.remove();
                 }
             }
         }
         consultants.addAll(consultantList);
 
-        if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+        /*if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
             consultants.add(bzshbConsultant);
         }else{
             //查询总审人员信息
@@ -489,7 +489,7 @@ public class RuralProjectViewController extends BaseController {
                     if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
                         try {
                             MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
                             bzshbConsultant.setRole("技术负责人");
                         } catch (Exception e) {
                             e.printStackTrace();
@@ -500,7 +500,7 @@ public class RuralProjectViewController extends BaseController {
                     if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
                         try {
                             MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-                            bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+                            bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
                             bzshbConsultant.setRole("技术负责人");
                         } catch (Exception e) {
                             e.printStackTrace();
@@ -514,13 +514,13 @@ public class RuralProjectViewController extends BaseController {
             }else{
                 if(StringUtils.isNotBlank(projectReportData.getBzshbUserId())){
                     User user=userService.get(projectReportData.getBzshbUserId());
-                    bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+                    bzshbConsultant.setZixunyuanName(""+user.getName()+"");
                     bzshbConsultant.setZixunyuan(user.getId());
                     bzshbConsultant.setRole("技术负责人");
                     consultants.add(bzshbConsultant);
                 }
             }
-        }
+        }*/
         //展示
         //获取自检的质量复核标准
         String reviewId="";

src/main/java/com/jeeplus/modules/sys/web/OfficeController.java

@@ -624,7 +624,7 @@ public class OfficeController extends BaseController {
                 mapList.add(map);
             }
         }
-        if(mapList.size()>0){
+        /*if(mapList.size()>0){
             Map<String, Object> map = Maps.newHashMap();
             map.put("id", "其他");
             map.put("pId", "ffe5af5b557e46f28b000c94716e228b");
@@ -632,7 +632,7 @@ public class OfficeController extends BaseController {
             map.put("name", "其他");
             map.put("selectName", selectName);
             mapList.add(map);
-        }
+        }*/
 
 
         return mapList;

src/main/java/com/jeeplus/modules/workcalendar/service/WorkCalendarTaskService.java

@@ -8,7 +8,6 @@ import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsServic
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectSignatureOldMessageDisposeService;
 import com.jeeplus.modules.statement.service.StatementCompanyComprehensiveService;
 import com.jeeplus.modules.workcalendar.entity.WorkCalendar;
-import com.jeeplus.modules.workcontractrecord.service.WorkContractRecordService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +16,8 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Calendar;
+import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -113,7 +113,7 @@ public class WorkCalendarTaskService  {
      * 获取项目即将超期还未上报并进行通知
      */
     //设置每日凌晨10分调用通知方法
-    @Scheduled(cron= "0 10 0 * * ?")
+    //@Scheduled(cron= "0 10 0 * * ?")
     @Transactional(readOnly = false)
     public void getProjectReportedListByAdvent() {
         logger.info("-----------项目超期未上报定时任务开始------------------");
@@ -146,7 +146,7 @@ public class WorkCalendarTaskService  {
      * 月度报表
      */
     //每个月最后一天晚上23点推送
-    @Scheduled(cron= "0 0 23 28-31 * ?")
+    //@Scheduled(cron= "0 0 23 28-31 * ?")
     //@Scheduled(cron= "0 0/2 * * * ?")
     @Transactional(readOnly = false)
     public void getStatementCompanyComprehensiveOnMonth() {
@@ -172,7 +172,7 @@ public class WorkCalendarTaskService  {
      * 季度报表
      */
     //每个季度最后一天晚上23点推送
-    @Scheduled(cron= "0 0 23 28-31 3,6,9,12 ?")
+    //@Scheduled(cron= "0 0 23 28-31 3,6,9,12 ?")
     //@Scheduled(cron= "0 0/2 * * * ?")
     @Transactional(readOnly = false)
     public void getStatementCompanyComprehensiveOnQuarter() {
@@ -195,7 +195,7 @@ public class WorkCalendarTaskService  {
      * 年度报表
      */
     //每年最后一天晚上23点推送
-    @Scheduled(cron= "0 0 23 31 12 ?")
+    //@Scheduled(cron= "0 0 23 31 12 ?")
     //@Scheduled(cron= "0 0/2 * * * ?")
     @Transactional(readOnly = false)
     public void getStatementCompanyComprehensiveOnYear() {

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

@@ -645,7 +645,7 @@ public class WorkFullManageService extends CrudService<WorkFullManageDao, WorkFu
 
 					bzshbConsultant = consultant;
 					bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
-					bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
+					bzshbConsultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
 					bzshbConsultant.setRole("技术负责人");
 					it.remove();
 				}

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -6,7 +6,6 @@ package com.jeeplus.modules.workfullmanage.web;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.jeeplus.common.bos.BOSClientUtil;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.mapper.JsonMapper;
 import com.jeeplus.common.oss.OSSClientUtil;
@@ -15,8 +14,6 @@ import com.jeeplus.common.utils.*;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
-import com.jeeplus.modules.contractclient.entity.WorkContractClient;
-import com.jeeplus.modules.contractclient.service.WorkContractClientService;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatchExcel;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatchProInfo;
@@ -31,15 +28,12 @@ import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageNewSer
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Office;
-import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.service.SystemService;
 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.TwoDimensionCode;
-import com.jeeplus.modules.utils.SftpClientUtil;
 import com.jeeplus.modules.workactivity.entity.WorkActivityProcess;
 import com.jeeplus.modules.workactivity.service.WorkActivityProcessService;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
@@ -59,6 +53,7 @@ import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import freemarker.template.Configuration;
+import freemarker.template.Template;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.shiro.authz.annotation.Logical;
@@ -74,13 +69,15 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import javax.validation.ConstraintViolationException;
-import java.io.*;
-import java.net.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import freemarker.template.Template;
 
 /**
  * 全过程管理Controller
@@ -1199,8 +1196,8 @@ public class WorkFullManageController extends BaseController {
 		data.put("consultType",consultType);
 		//委托单位
 		if(null != workContractInfo){
-			if (null != workContractInfo.getClient()) {
-				data.put("entrustUnit",workContractInfo.getClient().getName());
+			if (StringUtils.isNotBlank(workContractInfo.getClientName())) {
+				data.put("entrustUnit",workContractInfo.getClientName());
 			}else{
 				data.put("entrustUnit","");
 			}

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

@@ -3518,7 +3518,7 @@ public class WorkProjectNotifyController extends BaseController {
 								if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
 									try {
 										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+										bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 										bzshbConsultant.setRole("技术负责人");
 									} catch (Exception e) {
 										e.printStackTrace();
@@ -3529,7 +3529,7 @@ public class WorkProjectNotifyController extends BaseController {
 								if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
 									try {
 										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+										bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 										bzshbConsultant.setRole("技术负责人");
 									} catch (Exception e) {
 										e.printStackTrace();
@@ -3543,7 +3543,7 @@ public class WorkProjectNotifyController extends BaseController {
 							consultants.add(bzshbConsultant);
 						}else{
 							User user=userService.get(projectReportData.getBzshbUserId());
-							bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+							bzshbConsultant.setZixunyuanName(""+user.getName()+"");
 							bzshbConsultant.setZixunyuan(user.getId());
 							bzshbConsultant.setRole("技术负责人");
 							consultants.add(bzshbConsultant);
@@ -3581,7 +3581,7 @@ public class WorkProjectNotifyController extends BaseController {
 								if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
 									try {
 										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+										bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 										bzshbConsultant.setRole("技术负责人");
 									} catch (Exception e) {
 										e.printStackTrace();
@@ -3592,7 +3592,7 @@ public class WorkProjectNotifyController extends BaseController {
 								if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
 									try {
 										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+										bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 										bzshbConsultant.setRole("技术负责人");
 									} catch (Exception e) {
 										e.printStackTrace();
@@ -3606,7 +3606,7 @@ public class WorkProjectNotifyController extends BaseController {
 							consultants.add(bzshbConsultant);
 						}else{
 							User user=userService.get(projectReportData.getBzshbUserId());
-							bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+							bzshbConsultant.setZixunyuanName(""+user.getName()+"");
 							bzshbConsultant.setZixunyuan(user.getId());
 							bzshbConsultant.setRole("技术负责人");
 							consultants.add(bzshbConsultant);
@@ -3655,7 +3655,7 @@ public class WorkProjectNotifyController extends BaseController {
 								if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
 									try {
 										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+										bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 										bzshbConsultant.setRole("技术负责人");
 									} catch (Exception e) {
 										e.printStackTrace();
@@ -3666,7 +3666,7 @@ public class WorkProjectNotifyController extends BaseController {
 								if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
 									try {
 										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+										bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 										bzshbConsultant.setRole("技术负责人");
 									} catch (Exception e) {
 										e.printStackTrace();
@@ -3680,7 +3680,7 @@ public class WorkProjectNotifyController extends BaseController {
 							consultants.add(bzshbConsultant);
 						}else{
 							User user=userService.get(projectReportData.getBzshbUserId());
-							bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+							bzshbConsultant.setZixunyuanName(""+user.getName()+"");
 							bzshbConsultant.setZixunyuan(user.getId());
 							bzshbConsultant.setRole("技术负责人");
 							consultants.add(bzshbConsultant);
@@ -3814,7 +3814,7 @@ public class WorkProjectNotifyController extends BaseController {
 
 								bzshbConsultant = consultant;
 								bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
-								bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
+								bzshbConsultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
 								bzshbConsultant.setRole("技术负责人");
 								it.remove();
 							}
@@ -3850,7 +3850,7 @@ public class WorkProjectNotifyController extends BaseController {
 								if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
 									try {
 										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+										bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 										bzshbConsultant.setRole("技术负责人");
 									} catch (Exception e) {
 										e.printStackTrace();
@@ -3861,7 +3861,7 @@ public class WorkProjectNotifyController extends BaseController {
 								if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
 									try {
 										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+										bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 										bzshbConsultant.setRole("技术负责人");
 									} catch (Exception e) {
 										e.printStackTrace();
@@ -3894,7 +3894,7 @@ public class WorkProjectNotifyController extends BaseController {
 
 								bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
 
-								bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+								bzshbConsultant.setZixunyuanName(""+user.getName()+"");
 								bzshbConsultant.setZixunyuan(user.getId());
 								bzshbConsultant.setRole("技术负责人");
 								consultants.add(bzshbConsultant);
@@ -4262,7 +4262,7 @@ public class WorkProjectNotifyController extends BaseController {
 								}
 							}
 							User user=userService.get(consultant.getZixunyuan());
-							consultant.setZixunyuanName("陈红星("+user.getName() + "代)");
+							consultant.setZixunyuanName(""+user.getName() + "");
 							consultant.setZixunyuanId(user.getId());
 
 						}else{
@@ -4484,7 +4484,7 @@ public class WorkProjectNotifyController extends BaseController {
 								if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
 									try {
 										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+										bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 										bzshbConsultant.setRole("技术负责人");
 									} catch (Exception e) {
 										e.printStackTrace();
@@ -4495,7 +4495,7 @@ public class WorkProjectNotifyController extends BaseController {
 								if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
 									try {
 										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+										bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 										bzshbConsultant.setRole("技术负责人");
 									} catch (Exception e) {
 										e.printStackTrace();
@@ -4509,7 +4509,7 @@ public class WorkProjectNotifyController extends BaseController {
 							consultants.add(bzshbConsultant);
 						}else{
 							User user=userService.get(projectReportData.getBzshbUserId());
-							bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+							bzshbConsultant.setZixunyuanName(""+user.getName()+"");
 							bzshbConsultant.setZixunyuan(user.getId());
 							bzshbConsultant.setRole("技术负责人");
 							consultants.add(bzshbConsultant);
@@ -4638,7 +4638,7 @@ public class WorkProjectNotifyController extends BaseController {
 								if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
 									try {
 										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+										bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 										bzshbConsultant.setRole("技术负责人");
 									} catch (Exception e) {
 										e.printStackTrace();
@@ -4649,7 +4649,7 @@ public class WorkProjectNotifyController extends BaseController {
 								if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
 									try {
 										MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-										bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+										bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 										bzshbConsultant.setRole("技术负责人");
 									} catch (Exception e) {
 										e.printStackTrace();
@@ -4663,7 +4663,7 @@ public class WorkProjectNotifyController extends BaseController {
 							consultants.add(bzshbConsultant);
 						}else{
 							User user=userService.get(projectReportData.getBzshbUserId());
-							bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+							bzshbConsultant.setZixunyuanName(""+user.getName()+"");
 							bzshbConsultant.setZixunyuan(user.getId());
 							bzshbConsultant.setRole("技术负责人");
 							consultants.add(bzshbConsultant);
@@ -4974,7 +4974,7 @@ public class WorkProjectNotifyController extends BaseController {
 							if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
 								try {
 									MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-									bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+									bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 									bzshbConsultant.setRole("技术负责人");
 								} catch (Exception e) {
 									e.printStackTrace();
@@ -4985,7 +4985,7 @@ public class WorkProjectNotifyController extends BaseController {
 							if(consultant.getZixunyuan().equals(data.getBzshbUserId())){
 								try {
 									MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-									bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+									bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 									bzshbConsultant.setRole("技术负责人");
 								} catch (Exception e) {
 									e.printStackTrace();
@@ -4999,7 +4999,7 @@ public class WorkProjectNotifyController extends BaseController {
 						consultants.add(bzshbConsultant);
 					}else{
 						User bzshUser=userService.get(data.getBzshbUserId());
-						bzshbConsultant.setZixunyuanName("陈红星("+bzshUser.getName()+"代)");
+						bzshbConsultant.setZixunyuanName(""+bzshUser.getName()+"");
 						bzshbConsultant.setZixunyuan(bzshUser.getId());
 						bzshbConsultant.setRole("技术负责人");
 						consultants.add(bzshbConsultant);
@@ -6366,7 +6366,7 @@ public class WorkProjectNotifyController extends BaseController {
 
 										bzshbConsultant = consultant;
 										bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
-										bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
+										bzshbConsultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
 										bzshbConsultant.setRole("技术负责人");
 										it.remove();
 									}
@@ -6402,7 +6402,7 @@ public class WorkProjectNotifyController extends BaseController {
 										if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
 											try {
 												MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-												bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+												bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 												bzshbConsultant.setRole("技术负责人");
 											} catch (Exception e) {
 												e.printStackTrace();
@@ -6413,7 +6413,7 @@ public class WorkProjectNotifyController extends BaseController {
 										if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
 											try {
 												MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-												bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+												bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 												bzshbConsultant.setRole("技术负责人");
 											} catch (Exception e) {
 												e.printStackTrace();
@@ -6446,7 +6446,7 @@ public class WorkProjectNotifyController extends BaseController {
 
 										bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
 
-										bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+										bzshbConsultant.setZixunyuanName(""+user.getName()+"");
 										bzshbConsultant.setZixunyuan(user.getId());
 										bzshbConsultant.setRole("技术负责人");
 										consultants.add(bzshbConsultant);
@@ -8154,32 +8154,35 @@ 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());
+					User userZS=userService.get(projectReportData.getBzshbUserId());
+					List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(userZS.getId());
+					if(chenHongXingCertificateList.size()>0){
+
+						//获取陈红星的造价师信息
+						WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+						//根据用户查询技能信息
+						List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(userZS.getId());
+						for (WorkStaffCertificate certificateInfo: certificateBList) {
+							for (MainDictDetail type1 : certificateMajor) {
+								if(certificateInfo.getMajor().equals(type1.getValue())){
+									consultant.setMajor(type1.getLabel());
+								}
 							}
 						}
-					}
 
-					bzshbConsultant = consultant;
-					bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
-					bzshbConsultant.setZixunyuanName("陈红星("+consultant.getZixunyuanName()+"代)");
-					bzshbConsultant.setRole("技术负责人");
-					it.remove();
+
+						consultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
+					}
+					consultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
+					consultant.setRole("技术负责人");
+					//it.remove();
 				}
 			}
 		}
 		consultantinfo.addAll(consultantList);
 
-		if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+		/*if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
 			consultantinfo.add(bzshbConsultant);
 		}else{
 			//查询总审人员信息
@@ -8208,7 +8211,7 @@ public class WorkProjectNotifyController extends BaseController {
 					if(consultant.getZixunyuan().equals(bzshbConsultant.getZixunyuan())){
 						try {
 							MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-							bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+							bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 							bzshbConsultant.setRole("技术负责人");
 						} catch (Exception e) {
 							e.printStackTrace();
@@ -8219,7 +8222,7 @@ public class WorkProjectNotifyController extends BaseController {
 					if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
 						try {
 							MyBeanUtils.copyBeanNotNull2Bean(consultant, bzshbConsultant);
-							bzshbConsultant.setZixunyuanName("陈红星("+bzshbConsultant.getZixunyuanName()+"代)");
+							bzshbConsultant.setZixunyuanName(""+bzshbConsultant.getZixunyuanName()+"");
 							bzshbConsultant.setRole("技术负责人");
 						} catch (Exception e) {
 							e.printStackTrace();
@@ -8232,12 +8235,12 @@ public class WorkProjectNotifyController extends BaseController {
 				consultantinfo.add(bzshbConsultant);
 			}else{
 				User user=userService.get(projectReportData.getBzshbUserId());
-				bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+				bzshbConsultant.setZixunyuanName(""+user.getName()+"");
 				bzshbConsultant.setZixunyuan(user.getId());
 				bzshbConsultant.setRole("技术负责人");
 				consultantinfo.add(bzshbConsultant);
 			}
-		}
+		}*/
 		return consultantinfo;
 	}
 

src/main/java/com/jeeplus/modules/workstaff/entity/WorkStaffBasicInfo.java

@@ -3,21 +3,17 @@
  */
 package com.jeeplus.modules.workstaff.entity;
 
-import com.jeeplus.modules.sys.entity.Office;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jeeplus.modules.sys.entity.Area;
-
 import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
+import com.jeeplus.modules.sys.entity.Area;
+import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.workjobgrade.entity.WorkJobGrade;
 import com.jeeplus.modules.workrelationship.entity.WorkRelationship;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 员工基本信息Entity
@@ -324,7 +320,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.birthday = birthday;
 	}
 
-	@ExcelField(title="公历/农历", dictType="calendar_type", align=2, sort=9)
 	public String getCalendar() {
 		return calendar;
 	}
@@ -351,7 +346,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.mobile = mobile;
 	}
 
-	@ExcelField(title="座机", align=2, sort=11)
 	public String getPhone() {
 		return phone;
 	}
@@ -360,7 +354,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.phone = phone;
 	}
 
-	@ExcelField(title="婚姻状况", align=2, sort=12,valiName = "marriage_status")
 	public String getMarriage() {
 		return marriage;
 	}
@@ -369,7 +362,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.marriage = marriage;
 	}
 
-	@ExcelField(title="政治面貌", align=2, sort=13, valiName = "politics_type")
 	public String getPolitics() {
 		return politics;
 	}
@@ -378,7 +370,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.politics = politics;
 	}
 
-	@ExcelField(title="是否退伍军人", dictType="yes_no", align=2, sort=14)
 	public String getExSoldier() {
 		return exSoldier;
 	}
@@ -387,7 +378,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.exSoldier = exSoldier;
 	}
 
-	@ExcelField(title="常住地址", align=2, sort=15)
 	public String getAddress() {
 		return address;
 	}
@@ -396,7 +386,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.address = address;
 	}
 
-	@ExcelField(title="籍    贯", fieldType=Area.class, value="", align=2, sort=16)
 	public Area getNativePlace() {
 		return nativePlace;
 	}
@@ -405,7 +394,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.nativePlace = nativePlace;
 	}
 
-	@ExcelField(title="户口所在地", align=2, sort=17)
 	public String getHousehold() {
 		return household;
 	}
@@ -414,7 +402,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.household = household;
 	}
 
-	@ExcelField(title="职务", align=2, sort=18,valiName = "staff_duty")
 	public String getDuty() {
 		return duty;
 	}
@@ -423,7 +410,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.duty = duty;
 	}
 
-	@ExcelField(title="职    级", align=2, value="jobGrade.name", sort=19, valiName = "WorkJobGrade")
 	public WorkJobGrade getJobGrade() {
 		return jobGrade;
 	}
@@ -432,7 +418,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.jobGrade = jobGrade;
 	}
 
-	@ExcelField(title="员工状态", align=2, sort=20, valiName = "staff_status")
 	public String getStatus() {
 		return status;
 	}
@@ -451,8 +436,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.entryDate = entryDate;
 	}
 
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	@ExcelField(title="参加工作日期", align=2, sort=22)
 	public Date getWorkDate() {
 		return workDate;
 	}
@@ -461,7 +444,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.workDate = workDate;
 	}
 
-	@ExcelField(title="开户银行", align=2, sort=23, valiName = "bank_type")
 	public String getBankName() {
 		return bankName;
 	}
@@ -470,7 +452,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.bankName = bankName;
 	}
 
-	@ExcelField(title="银行卡号", align=2, sort=24)
 	public String getBankCard() {
 		return bankCard;
 	}
@@ -479,8 +460,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.bankCard = bankCard;
 	}
 
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	@ExcelField(title="从事本行业日期", align=2, sort=25)
 	public Date getIndustryDate() {
 		return industryDate;
 	}
@@ -489,7 +468,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.industryDate = industryDate;
 	}
 
-	@ExcelField(title="是否TS人员", dictType="yes_no", align=2, sort=26)
 	public String getTs() {
 		return ts;
 	}
@@ -698,7 +676,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		this.roleId = roleId;
 	}
 
-    @ExcelField(title="导入时间", align=2, sort=27)
     public String getNowDate() {
         return nowDate;
     }
@@ -707,7 +684,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
         this.nowDate = nowDate;
     }
 
-    @ExcelField(title="导入用户", align=2, sort=28)
     public String getUserName() {
         return userName;
     }
@@ -716,7 +692,6 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
         this.userName = userName;
     }
 
-    @ExcelField(title="失败原因", align=2, sort=29)
     public String getErrInfo() {
         return errInfo;
     }

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -142,8 +142,10 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
 
     public WorkStaffBasicInfo get(String id) {
         WorkStaffBasicInfo workStaffBasicInfo = super.get(id);
-        if(StringUtils.isNotBlank(workStaffBasicInfo.getHandSignature())){
-            workStaffBasicInfo.setHandSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + workStaffBasicInfo.getHandSignature()));
+        if(null != workStaffBasicInfo){
+            if(StringUtils.isNotBlank(workStaffBasicInfo.getHandSignature())){
+                workStaffBasicInfo.setHandSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + workStaffBasicInfo.getHandSignature()));
+            }
         }
 		return workStaffBasicInfo;
 	}
@@ -687,14 +689,14 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         if(StringUtils.isBlank(achiveIds)){
             return;
         }
-        String[] split = achiveIds.split(",");
+        /*String[] split = achiveIds.split(",");
         String contentStr = "待处理，请及时完善员工档案信息。";
         String titleStr = "完善档案信息，待处理";
         String remark = "待处理";
         for (String s : split) {
             WorkStaffBasicInfo workStaffBasicInfo = workStaffAchivesDao.get(s);
             this.sendMessage(workStaffBasicInfo,contentStr,titleStr,remark);
-        }
+        }*/
     }
 
     @Transactional(readOnly = false)
@@ -721,12 +723,12 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
             workProjectNotifyService.readByNotifyId(workProjectNotify);
             return;
         }
-        if("1".equals(workStaffBasicInfo.getNotifyFlag())){
+        /*if("1".equals(workStaffBasicInfo.getNotifyFlag())){
             String contentStr = "待处理，请及时完善员工档案信息。";
             String titleStr = "完善档案信息，待处理";
             String remark = "待处理";
             this.sendMessage(workStaffBasicInfo,contentStr,titleStr,remark);
-        }
+        }*/
     }
 
     public WorkStaffBasicInfo getAchive(WorkStaffBasicInfo workStaffBasicInfo) {
@@ -849,12 +851,12 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
             workProjectNotifyService.readByNotifyId(workProjectNotify);
             return;
         }
-        if("1".equals(workStaffBasicInfo.getNotifyFlag())){
+        /*if("1".equals(workStaffBasicInfo.getNotifyFlag())){
             String contentStr = "待处理，请及时完善员工档案信息。";
             String titleStr = "完善档案信息，待处理";
             String remark = "待处理";
             this.sendMessage(workStaffBasicInfo,contentStr,titleStr,remark);
-        }
+        }*/
     }
     private static Map<String,String> CODE_MAP = Maps.newHashMap();//基本信息
     static{//基本信息

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -737,7 +737,7 @@ public class WorkStaffBasicInfoController extends BaseController {
 		if (workStaffBasicInfo.getPictureFile() == null || workStaffBasicInfo.getPictureFile().getSize() < 0) {
 			workStaffBasicInfo.setPicture("");
 		}
-		workStaffBasicInfoService.completeApply(workStaffBasicInfo.getId());
+		//workStaffBasicInfoService.completeApply(workStaffBasicInfo.getId());
 		workStaffBasicInfoService.saveLog(workStaffBasicInfo);
 		addMessage(redirectAttributes, "申请员工档案信息成功");
 		return "redirect:" + Global.getAdminPath() + "/home/?repage";

src/main/resources/mappings/modules/sys/UserDao.xml

@@ -437,7 +437,6 @@
 		<if test="company != null and company.id != null and company.id !='' ">
 			AND uo.company_id = #{company.id}
 		</if>
-		AND uo.status IN ('试用','正式','劳务')
 		ORDER BY a.name
 	</select>
 
@@ -461,7 +460,6 @@
 		<if test="company != null and company.id != null and company.id !='' ">
 			AND uo.company_id = #{company.id}
 		</if>
-		AND uo.status IN ('试用','正式','劳务')
 		ORDER BY a.name
 	</select>
 
@@ -488,7 +486,6 @@
 		<if test="company != null and company.id != null and company.id !='' ">
 			AND uo.company_id = #{company.id}
 		</if>
-		AND uo.status IN ('试用','正式','劳务')
 		ORDER BY a.name
 	</select>
 
@@ -515,7 +512,6 @@
 		<if test="company != null and company.id != null and company.id !='' ">
 			AND uo.company_id = #{company.id}
 		</if>
-		AND uo.status IN ('试用','正式','劳务')
 		ORDER BY a.name
 	</select>
 
@@ -530,7 +526,6 @@
 		AND uo.del_flag = #{DEL_FLAG_NORMAL}
 		AND o.useable = '1'
 		AND o.del_flag = #{DEL_FLAG_NORMAL}
-		AND uo.status IN ('试用','正式','劳务')
 		AND o.id = #{office.id} OR o.parent_ids LIKE
 		<if test="dbName == 'oracle'">'%,'||#{office.id}||',%'</if>
 		<if test="dbName == 'mysql'">CONCAT('%,', #{office.id}, ',%')</if>
@@ -1139,7 +1134,6 @@
         AND uo.del_flag = #{DEL_FLAG_NORMAL}
         AND o.useable = '1'
         AND o.del_flag = #{DEL_FLAG_NORMAL}
-        AND uo.status IN ('试用','正式','劳务')
         AND (o.id = #{office.id} OR find_in_set(#{office.id},o.parent_ids))
     </select>
 

src/main/webapp/static/oss/ossupload.js

@@ -62,6 +62,7 @@ function ftlUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,d
     fileName = fileName.replace(/%/g,"")
     fileName = fileName.replace(/Π/g,"")
     fileName = fileName.replace(/π/g,"")
+    fileName = fileName.replace(/·/g,".")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
     /*console.log(file.name.indexOf("—")!=-1);
@@ -88,6 +89,7 @@ function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,upload
     fileName = fileName.replace(/%/g,"")
     fileName = fileName.replace(/Π/g,"")
     fileName = fileName.replace(/π/g,"")
+    fileName = fileName.replace(/·/g,".")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
     /*console.log(file.name.indexOf("—")!=-1);
@@ -120,6 +122,7 @@ function CollectUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPa
     fileName = fileName.replace(/%/g,"")
     fileName = fileName.replace(/Π/g,"")
     fileName = fileName.replace(/π/g,"")
+    fileName = fileName.replace(/·/g,".")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -181,6 +184,7 @@ function multipartUploadWithStsOnProcessAccessory(storeAs, file,attachmentId,att
     fileName = fileName.replace(/%/g,"")
     fileName = fileName.replace(/Π/g,"")
     fileName = fileName.replace(/π/g,"")
+    fileName = fileName.replace(/·/g,".")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -242,6 +246,7 @@ function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,upload
     fileName = fileName.replace(/%/g,"")
     fileName = fileName.replace(/Π/g,"")
     fileName = fileName.replace(/π/g,"")
+    fileName = fileName.replace(/·/g,".")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -304,6 +309,7 @@ function multipartUploadWorkOrder(storeAs, file,attachmentId,attachmentFlag,uplo
     fileName = fileName.replace(/%/g,"")
     fileName = fileName.replace(/Π/g,"")
     fileName = fileName.replace(/π/g,"")
+    fileName = fileName.replace(/·/g,".")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -442,12 +448,12 @@ function ftlMultitest (storeAs, file,attachmentId,attachmentFlag,uploadPath,divI
                                 '</td>'+
                                 '<td class="op-td">'+
                                 '<div class="op-btn-box">' ;
-                                if(2 == fileLocation){
-                                    str = str +'<a href="'+lookUrl+'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
-                                }else{
-                                    str = str +'<a href="javascript:location.href=\''+realPath+'/a/workfullmanage/workFullManage/downLoadAttach?file=\'+encodeURIComponent(\''+data.url+'\');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
-                                }
-                                str = str +'<a href="javascript:void(0)" onclick="deleteFileFromAliyun1(this,\''+realPath+'/sys/workattachment/deleteFileFromAliyun?url='+data.url+'&id='+data.id+'&type=2\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>'+
+                            if(2 == fileLocation){
+                                str = str +'<a href="'+lookUrl+'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
+                            }else{
+                                str = str +'<a href="javascript:location.href=\''+realPath+'/a/workfullmanage/workFullManage/downLoadAttach?file=\'+encodeURIComponent(\''+data.url+'\');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
+                            }
+                            str = str +'<a href="javascript:void(0)" onclick="deleteFileFromAliyun1(this,\''+realPath+'/sys/workattachment/deleteFileFromAliyun?url='+data.url+'&id='+data.id+'&type=2\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>'+
                                 '</div>' +
                                 '</td>'+
                                 '</tr>';
@@ -549,6 +555,7 @@ function multipartUploadWithStsCollection(storeAs, file,attachmentId,attachmentF
     fileName = fileName.replace(/%/g,"")
     fileName = fileName.replace(/Π/g,"")
     fileName = fileName.replace(/π/g,"")
+    fileName = fileName.replace(/·/g,".")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -613,6 +620,7 @@ function multipartUploadWithStsCollectionCollect(storeAs, file,attachmentId,atta
     fileName = fileName.replace(/%/g,"")
     fileName = fileName.replace(/Π/g,"")
     fileName = fileName.replace(/π/g,"")
+    fileName = fileName.replace(/·/g,".")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -1469,6 +1477,7 @@ function multipartUploadWithStsRecordsReported(storeAs, file,attachmentId,attach
     fileName = fileName.replace(/%/g,"")
     fileName = fileName.replace(/Π/g,"")
     fileName = fileName.replace(/π/g,"")
+    fileName = fileName.replace(/·/g,".")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -1752,7 +1761,7 @@ function multitestOnProcessAccessory (ossClient, storeAs, file,attachmentId,atta
                     }else{
                         str = str +'<a href="javascript:location.href=\''+realPath+'/a/workfullmanage/workFullManage/downLoadAttach?file=\'+encodeURIComponent(\''+data.url+'\');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
                     }
-                   /* str = str + '<a href="javascript:void(0)" onclick="ossCollectingAccessory(this,\''+realPath+'/projectAccessory/projectAccessory/saveCollectAccessory?url='+data.url+'&fileName='+data.attachmentName+'\',\''+addFile+'\',\''+data.createBy+'\')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>'+*/
+                    /* str = str + '<a href="javascript:void(0)" onclick="ossCollectingAccessory(this,\''+realPath+'/projectAccessory/projectAccessory/saveCollectAccessory?url='+data.url+'&fileName='+data.attachmentName+'\',\''+addFile+'\',\''+data.createBy+'\')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>'+*/
                     str = str + '<a href="javascript:void(0)" onclick="deleteFileFromAliyun1(this,\''+realPath+'/sys/workattachment/deleteFileFromAliyun?url='+encodeURIComponent(data.url)+'&id='+data.id+'&type=2\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>'+
                         '</div>' +
                         '</td>'+
@@ -2077,6 +2086,7 @@ function fileCollectAccessory(storeAs, file,attachmentId,attachmentFlag,uploadPa
     fileName = fileName.replace(/%/g,"")
     fileName = fileName.replace(/Π/g,"")
     fileName = fileName.replace(/π/g,"")
+    fileName = fileName.replace(/·/g,".")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
     requestUrl = realPath+"/previewController/getAccess";

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -929,25 +929,25 @@
                             <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                         </div>
                     </div>--%>
-				<div class="layui-item layui-col-sm6 lw7">
+				<%--<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label double-line">建筑面积或规模：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.buildingScale}"/>
-<%--						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>--%>
+&lt;%&ndash;						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>&ndash;%&gt;
 					</div>
-				</div>
+				</div>--%>
 					<%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">计量单位：</label>
                         <div class="layui-input-block">
                             <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
                         </div>
                     </div>--%>
-				<div class="layui-item layui-col-sm6 lw7">
+				<%--<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label">工程用途：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
 					</div>
-				</div>
+				</div>--%>
 					<%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元)：</label>
                         <div class="layui-input-block">
@@ -978,7 +978,7 @@
                             <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                         </div>
                     </div>--%>
-				<div class="layui-item layui-col-sm6 lw7">
+				<%--<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label">单位造价(元)：</label>
 					<div class="layui-input-block">
 						<input value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
@@ -995,7 +995,7 @@
 					<div class="layui-input-block">
 						<input  value="<fmt:formatNumber value="${projectRecords.installUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="readonly"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
 					<label class="layui-form-label">工程概况：</label>
 					<div class="layui-input-block">
@@ -1003,7 +1003,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
-					<label class="layui-form-label">特殊要求：</label>
+					<label class="layui-form-label">备注：</label>
 					<div class="layui-input-block">
 						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.remarks}</textarea>
 					</div>
@@ -1364,10 +1364,10 @@
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="技术负责人" readonly="true" class="form-control"/>
 									</td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control"/>
                                     </td>
                                     <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportModify.jsp

@@ -1185,10 +1185,10 @@
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="技术负责人" readonly="true" class="form-control"/>
 									</td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control"/>
                                     </td>
                                     <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -181,12 +181,10 @@
 					<div class="list-form-tab contentShadow list-form-tab" id="tabDiv">
 						<ul class="list-tabs" >
 							<li class="active"><a>基本信息</a><span class="hide">projectInfo</span></li>
-							<li><a>子项目列表</a><span class="hide">subProjectInfo</span></li>
+							<%--<li><a>子项目列表</a><span class="hide">subProjectInfo</span></li>--%>
 							<li><a>合同信息</a><span class="hide">workContractInfo</span></li>
-							<li><a>客户信息</a><span class="hide">workClientInfo</span></li>
 							<li><a>项目计划信息</a><span class="hide">planView</span></li>
 							<li><a>质量复核信息</a><span class="hide">qualityView</span></li>
-							<li><a>报告签发信息</a><span class="hide">issueView</span></li>
 							<li><a>档案信息</a><span class="hide">AccessoryView</span></li>
 						</ul>
 					</div>
@@ -273,7 +271,7 @@
 									</select>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6 lw6">
+							<%--<div class="layui-item layui-col-sm6 lw6">
 								<label class="layui-form-label">项目等级：</label>
 								<div class="layui-input-block">
 									<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
@@ -281,7 +279,7 @@
 									</c:forEach>
 									<p style="color: red;font-size: 12px;">500万及500万以上为A级，500万以下为B级</p>
 								</div>
-							</div>
+							</div>--%>
 							<div class="layui-item layui-col-sm6 lw6">
 								<label class="layui-form-label double-line">送审规模（万元）：</label>
 								<div class="layui-input-block">
@@ -377,6 +375,8 @@
 						<c:otherwise>
 							<div id="tab-12" class="tab-pane active">
 								<div class="form-group-label"><h2>客户基础信息</h2>
+
+
 									<div class="layui-item layui-col-sm6 lw7">
 										<br>
 										<label class="layui-form-label">客户名称：</label>
@@ -391,20 +391,48 @@
 											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.telephone}"/>
 										</div>
 									</div>
+										<%--<div class="layui-item layui-col-sm6 lw7">
+                                            <br>
+                                            <label class="layui-form-label double-line">拥有统一社会信用代码：</label>
+                                            <div class="layui-input-block">
+                                        <span class="radio-box">&nbsp;&nbsp;
+                                            <input type="radio" class="usccClass" name="hasUscc" label="是" disabled="true" <c:if test="${workContractRecord.workContractInfo.hasUscc eq 1}">checked="true"</c:if> />是
+                                            &nbsp;&nbsp;
+                                            <input type="radio" class="usccClass" name="hasUscc" label="否" disabled="true" <c:if test="${workContractRecord.workContractInfo.hasUscc eq 2}">checked="true"</c:if> />否
+                                        </span>
+                                            </div>
+                                        </div>--%>
 									<div class="layui-item layui-col-sm6 lw7">
-										<label class="layui-form-label double-line">拥有统一社会信用代码：</label>
+										<br>
+										<label class="layui-form-label double-line">统一社会信用代码：</label>
 										<div class="layui-input-block">
-											<input type="radio" name="hasUscc" value="1" title="是" disabled <c:if test="${workContractInfo.hasUscc=='1'}">checked</c:if>>
-											<input type="radio" name="hasUscc" value="2" title="否" disabled <c:if test="${workContractInfo.hasUscc=='2'}">checked</c:if> >
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.uscCode}"/>
 										</div>
 									</div>
 									<div class="layui-item layui-col-sm6 lw7">
 										<br>
-										<label class="layui-form-label double-line">统一社会信用代码：</label>
+										<label class="layui-form-label">公司地址：</label>
 										<div class="layui-input-block">
-											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.uscCode}"/>
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.address}"/>
 										</div>
 									</div>
+
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label">开户银行：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.ourBank}"/>
+										</div>
+									</div>
+
+									<div class="layui-item layui-col-sm6 lw7">
+										<br>
+										<label class="layui-form-label">银行账号：</label>
+										<div class="layui-input-block">
+											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.bankNumber}"/>
+										</div>
+									</div>
+
 								</div>
 
 							</div>
@@ -578,190 +606,6 @@
 						</c:otherwise>
 					</c:choose>
 				</div>
-				<div class="form-group layui-row first hide" id="workClientInfo">
-					<c:choose>
-						<c:when test="${workContractInfo==null}">
-							无客户信息
-						</c:when>
-						<c:otherwise>
-							<div class="form-group layui-row first">
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label">客户名称：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${workClientInfo.name}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label double-line">拥有统一社会信用代码：</label>
-									<div class="layui-input-block">
-						<span class="radio-box">&nbsp;&nbsp;
-							<input type="radio" class="usccClass" name="hasUscc" label="是" disabled="true" <c:if test="${workClientInfo.hasUscc eq 1}">checked="true"</c:if> />是
-							&nbsp;&nbsp;
-							<input type="radio" class="usccClass" name="hasUscc" label="否" disabled="true" <c:if test="${workClientInfo.hasUscc eq 2}">checked="true"</c:if> />否
-						</span>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label double-line">统一社会信用代码：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${workClientInfo.uscCode}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label">客户性质：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label">所在行业：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label">客户类型：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="<c:set value="${fn:split(workClientInfo.clientType, ',') }" var="clientTypes" /><c:forEach items="${clientTypes}" var="cType" varStatus="status">${fns:getMainDictLabel(cType, 'client_type', '')}<c:if test="${!status.last}">, </c:if></c:forEach>"/>
-									</div>
-								</div>
-									<%--            <div class="layui-item layui-col-sm6 lw7">--%>
-									<%--                <label class="layui-form-label">代表方：</label>--%>
-									<%--                <div class="layui-input-block">--%>
-									<%--                    <div class="input-group">--%>
-									<%--                        <div >--%>
-									<%--                            <div id="jobType" style="pointer-events: none;background-color: #f1f1f1" class="xm-select-demo" tabindex="0" contenteditable="true"></div>--%>
-									<%--                        </div>--%>
-									<%--                    </div>--%>
-									<%--                </div>--%>
-									<%--            </div>--%>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label">法人代表：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="${workClientInfo.lawerPresint}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label">邮政编码：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.zipCode}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label">传真：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.fax}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label">公司电话：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.telephone}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label">公司网址：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.companyUrl}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm6 lw7">
-									<label class="layui-form-label">所在地区：</label>
-									<div class="layui-input-block with-icon">
-										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.area.name}"/>
-									</div>
-								</div>
-
-								<div class="layui-item layui-col-sm12 lw7">
-									<label class="layui-form-label">注册地址：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.registerAddress}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm12 lw7">
-									<label class="layui-form-label">详细地址：</label>
-									<div class="layui-input-block">
-										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.address}"/>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm12 lw7">
-									<label class="layui-form-label">开户行信息：</label>
-									<div class="layui-input-block">
-
-										<table id="bankinfo" class="table table-bordered table-condensed details">
-											<thead>
-											<tr>
-												<th width="80px">序号</th>
-												<th ><%--<font color="red">*</font>--%>开户银行</th>
-												<th width="400px;"><%--<font color="red">*</font>--%>开户账号</th>
-
-											</tr>
-											</thead>
-											<tbody id="workClientBankList">
-											<c:forEach items="${workClientInfo.workClientBankList}" var="workClientBank" varStatus="status">
-												<tr>
-													<td>${status.index + 1}</td>
-													<td>${workClientBank.ourBank}</td>
-													<td>${workClientBank.bankNumber}</td>
-												</tr>
-											</c:forEach>
-											<c:if test="${bankSize == 0}">
-												<tr>
-													<td colspan="3">暂无数据</td>
-												</tr>
-											</c:if>
-											</tbody>
-										</table>
-									</div>
-								</div>
-								<div class="layui-item layui-col-sm12 with-textarea lw7">
-									<label class="layui-form-label">单位简介：</label>
-									<div class="layui-input-block">
-										<textarea htmlEscape="false" style="background-color: #f1f1f1" rows="4" readonly="true" maxlength="1000" class="form-control" >${workClientInfo.unitIntroduction}</textarea>
-									</div>
-								</div>
-							</div>
-							<div class="form-group layui-row">
-								<div class="form-group-label"><h2>联系人信息</h2></div>
-								<div class="layui-item layui-col-xs12 form-table-container" >
-									<table id="clientTable" class="table table-bordered table-condensed no-bottom-margin details">
-										<thead>
-										<tr>
-											<th class="hide"></th>
-											<th width="150px">联系人姓名</th>
-											<th >部门</th>
-											<th width="150px">职务</th>
-											<th width="150px">QQ</th>
-											<th width="150px">联系方式1</th>
-											<th width="150px">联系方式2</th>
-											<th width="150px">E-mail</th>
-										</tr>
-										</thead>
-										<tbody id="workClientLinkmanList">
-										<c:forEach items="${workClientInfo.workClientLinkmanList}" var="workClientLinkman" varStatus="status">
-											<tr>
-												<td class="hide">${status.index + 1}</td>
-												<td >${workClientLinkman.name}</td>
-												<td >${workClientLinkman.office}</td>
-												<td >${workClientLinkman.position}</td>
-												<td >${workClientLinkman.qq}</td>
-												<td >${workClientLinkman.linkPhone}</td>
-												<td >${workClientLinkman.linkMobile}</td>
-												<td >${workClientLinkman.email}</td>
-											</tr>
-										</c:forEach>
-										<c:if test="${linkManSize == 0}">
-											<tr>
-												<td colspan="8">暂无数据</td>
-											</tr>
-										</c:if>
-										</tbody>
-									</table>
-								</div>
-							</div>
-						</c:otherwise>
-					</c:choose>
-				</div>
 				<div class="form-group layui-row first hide" id="planView">
 					<div class="form-group layui-row">
 						<div class="form-group-label"><h2>项目计划信息</h2></div>
@@ -1162,165 +1006,6 @@
 						</div>
 					</c:if>
 				</div>
-				<div class="form-group layui-row first hide" id="issueView">
-					<c:if test="${projectRecords.submitMoney=='1'}">
-						<div class="topMar">
-							<h2>B级紧急项目无报告签发信息</h2>
-						</div>
-					</c:if>
-					<c:if test="${projectRecords.submitMoney=='2'}">
-						<div class="form-group layui-row first lw12">
-							<div class="form-group-label">
-									<%--							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>--%>
-								<h2>质量复核信息</h2>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">报告号：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="reviewFee" path="projectReportData.number" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">送审价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">审定价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">合同类别：</label>
-								<div class="layui-input-block with-icon">
-									<div style="overflow: hidden">
-										<input type="radio" title="金额合同" lay-filter="jine"  id="jineer" value="0"  disabled <c:if test="${projectcontentinfo.projectReportData.contractCategory=='0'}">checked</c:if>>
-										<input type="radio" title="费率合同" lay-filter="jine" id="jineer1" value="1" disabled <c:if test="${projectcontentinfo.projectReportData.contractCategory=='1'}">checked</c:if>>
-											<%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
-									</div>
-									<span style="font-size: 12px;color: red;">施工合同</span>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">合同价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false" readonly="true" class="form-control layui-input number"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6" style="display: none;">
-								<label class="layui-form-label">费率(%)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">核增核减额(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">核增核减率(%)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">咨询标的额(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">土建造价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">安装造价(元)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">土建比例(%)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">安装比例(%)：</label>
-								<div class="layui-input-block with-icon">
-									<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
-								</div>
-							</div>
-
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">工作开始日期：</label>
-								<div class="layui-input-block with-icon">
-									<input class=" form-control layui-input" readonly="readonly"  value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6">
-								<label class="layui-form-label">工作结束日期：</label>
-								<div class="layui-input-block with-icon">
-									<input class=" form-control layui-input" readonly="readonly" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6 lw7">
-								<label class="layui-form-label double-line">造价咨询营业收入（万元）：</label>
-								<div class="layui-input-block">
-									<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
-								</div>
-							</div>
-						</div>
-						<div style="overflow: hidden">
-							<div class="form-group-label">
-								<h2>报告签发复核内容</h2>
-							</div>
-							<div>
-								<div class="layui-item layui-col-xs12" >
-									<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
-										<thead>
-										<tr>
-											<th width="40%">符合内容及评分标准</th>
-											<th width="10%">自校</th>
-											<th >意见</th>
-										</tr>
-										</thead>
-										<tbody>
-										<c:forEach items="${datalistTwo}" var="workReviewAudit" varStatus="index">
-											<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
-													<%--<td title="${workReviewAudit.orderNum}">--%>
-													<%--${workReviewAudit.orderNum}--%>
-													<%--</td>--%>
-												<td title="${workReviewAudit.standardDetail}">
-														${workReviewAudit.standardDetail}
-												</td>
-												<td>
-													<i class="fa fa-check"></i>
-												</td>
-													<%--									<td class="input-td">--%>
-													<%--										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
-													<%--									</td>--%>
-													<%--									<td class="input-td">--%>
-													<%--										<input id="deduct" style="text-align: center;background-color: #fff" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">--%>
-													<%--									</td>--%>
-												<td class="input-td">
-													<input id="deductOpinion" style="text-align: center;background-color: #fff" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
-												</td>
-											</tr>
-										</c:forEach>
-										</tbody>
-									</table>
-								</div>
-							</div>
-						</div>
-					</c:if>
-				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">
 					<div class="form-group layui-row">
 						<div class="form-group-label"><h2>成果文件</h2></div>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordForm.jsp

@@ -217,7 +217,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">委托方：</label>
 					<div class="layui-input-block">
-						<input id="clientName" name="clientName"  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workClientInfoName}"/>
+						<input id="clientName" name="clientName"  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${projectReportRecord.report.project.workContractInfo.clientName}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModify.jsp

@@ -48,11 +48,11 @@
 					if(obj == 2){
 						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessageNew/holdSaveRecord");
 					}else{
-						var leng1 = $("#reportedConsultantList tr").length;
+						/*var leng1 = $("#reportedConsultantList tr").length;
 						if (leng1<=1){
 							top.layer.msg("请添加咨询员信息！", {icon: 0});
 							return false;
-						}
+						}*/
 						var leng = $("#file_attachment tr").length;
 						for(var i=0; i<leng; i++) {
 							var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
@@ -405,7 +405,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="form-group layui-row first lw12">
+			<%--<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>质量复核信息</h2></div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
@@ -501,8 +501,8 @@
 						<form:input path="report.ZiXunShouRu" placeholder="请输入造价咨询营业收入" htmlEscape="false" onblur="onblurNum(this)" onkeyup="num(this)" class="form-control layui-input"/>
 					</div>
 				</div>
-			</div>
-			<div class="form-group layui-row">
+			</div>--%>
+			<%--<div class="form-group layui-row">
 				<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员(质量控制流程)</h2></div>
 				<div class="layui-item layui-col-sm12 lw6">
 					<div class="layui-item nav-btns">
@@ -525,7 +525,7 @@
 							</tr>
 							</thead>
 							<tbody id="reportedConsultantList">
-								<%--<c:forEach items="${info}" var = "info" varStatus="status">
+								&lt;%&ndash;<c:forEach items="${info}" var = "info" varStatus="status">
 									<tr>
 										<td width="60px">
 											<input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
@@ -549,7 +549,7 @@
 											<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>
 										</td>
 									</tr>
-								</c:forEach>--%>
+								</c:forEach>&ndash;%&gt;
 							</tbody>
 						</table>
 						<script type="text/template" id="workClientBankTpl">//<!--
@@ -648,10 +648,10 @@
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="技术负责人" readonly="true" class="form-control"/>
 									</td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control"/>
                                     </td>
                                     <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control"/>
@@ -667,7 +667,7 @@
 						</script>
 					</div>
 				</div>
-			</div>
+			</div>--%>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModifyApply.jsp

@@ -618,10 +618,10 @@
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="技术负责人" readonly="true" class="form-control"/>
 									</td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control"/>
                                     </td>
                                     <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -52,71 +52,71 @@
                 //     return;
                 // }
 
-                var startDate = new Date($("#startDate").val());
-                var endingDate = new Date($("#endingDate").val());
-                var projectStartDate = new Date('${projectStartDate}');
-                var projectEndDate = new Date('${projectEndDate}');
-                if(null == startDate||undefined==startDate ||"Invalid Date"==startDate){
-                    parent.layer.msg("工作开始日期不能为空!", {icon: 5});
-                    return false;
-                }
-                if(null==endingDate||undefined==endingDate||"Invalid Date" == endingDate){
-                    parent.layer.msg("工作结束日期不能为空!", {icon: 5});
-                    return false;
-                }
-                if(startDate.getTime() > endingDate.getTime()){
-                    parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
-                    return false;
-                }
-                /*if($("#workConstructionLinkmanList tr").length==0){
-                    top.layer.alert('请至少选择一个施工方联系人！', {icon: 0});
-                    return;
-                }*/
-                if($("#workClientLinkmanList tr").length==0){
-                    top.layer.msg("请选择委托方联系人！", {icon: 5});
-                    return;
-                }
-                var startDate = new Date($("#startDate").val());
-                var endingDate = new Date($("#endingDate").val());
+                $("#clientName").val($("#contractClientName").val());
+                if(i==2){
+                    $("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectRecords/tstore");
+                }else if(i==1){
+                    var startDate = new Date($("#startDate").val());
+                    var endingDate = new Date($("#endingDate").val());
+                    var projectStartDate = new Date('${projectStartDate}');
+                    var projectEndDate = new Date('${projectEndDate}');
+                    if(null == startDate||undefined==startDate ||"Invalid Date"==startDate){
+                        parent.layer.msg("工作开始日期不能为空!", {icon: 5});
+                        return false;
+                    }
+                    if(null==endingDate||undefined==endingDate||"Invalid Date" == endingDate){
+                        parent.layer.msg("工作结束日期不能为空!", {icon: 5});
+                        return false;
+                    }
+                    if(startDate.getTime() > endingDate.getTime()){
+                        parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
+                        return false;
+                    }
+                    /*if($("#workConstructionLinkmanList tr").length==0){
+                        top.layer.alert('请至少选择一个施工方联系人！', {icon: 0});
+                        return;
+                    }*/
+                    if($("#workClientLinkmanList tr").length==0){
+                        top.layer.msg("请选择委托方联系人！", {icon: 5});
+                        return;
+                    }
+                    var startDate = new Date($("#startDate").val());
+                    var endingDate = new Date($("#endingDate").val());
 
-                if(startDate.getTime() > endingDate.getTime()){
-                    parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
-                    return false;
-                }
-                if(null != projectStartDate && undefined != projectStartDate && '' != projectStartDate){
-                    if(startDate.getTime() > projectStartDate.getTime()){
-                        parent.layer.msg("工作开始日期不得大于工作计划最早结束时间!", {icon: 5});
+                    if(startDate.getTime() > endingDate.getTime()){
+                        parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
                         return false;
                     }
-                }
-                if(null != projectEndDate && undefined != projectEndDate && '' != projectEndDate){
-                    if(endingDate.getTime() < projectEndDate.getTime()){
-                        parent.layer.msg("工作结束日期不得小于工作计划最晚开始时间!", {icon: 5});
+                    if(null != projectStartDate && undefined != projectStartDate && '' != projectStartDate){
+                        if(startDate.getTime() > projectStartDate.getTime()){
+                            parent.layer.msg("工作开始日期不得大于工作计划最早结束时间!", {icon: 5});
+                            return false;
+                        }
+                    }
+                    if(null != projectEndDate && undefined != projectEndDate && '' != projectEndDate){
+                        if(endingDate.getTime() < projectEndDate.getTime()){
+                            parent.layer.msg("工作结束日期不得小于工作计划最晚开始时间!", {icon: 5});
+                            return false;
+                        }
+                    }
+                    var contractsNum = $("#contractsNum").val();
+                    if(contractsNum==""||null==contractsNum||undefined==contractsNum||contractsNum.length==0){
+                        parent.layer.msg("登记数量不能为空!", {icon: 5});
+                        return false;
+                    }
+                    if(contractsNum<=0){
+                        parent.layer.msg("登记数量必须大于0!", {icon: 5});
+                        return false;
+                    }
+                    if(contractsNum%1!=0){
+                        parent.layer.msg("登记数量必须为整数!", {icon: 5});
+                        return false;
+                    }
+                    if(isNaN(contractsNum)){
+                        parent.layer.msg("请输入正确登记数量!", {icon: 5});
                         return false;
                     }
-                }
-                var contractsNum = $("#contractsNum").val();
-                if(contractsNum==""||null==contractsNum||undefined==contractsNum||contractsNum.length==0){
-                    parent.layer.msg("登记数量不能为空!", {icon: 5});
-                    return false;
-                }
-                if(contractsNum<=0){
-                    parent.layer.msg("登记数量必须大于0!", {icon: 5});
-                    return false;
-                }
-                if(contractsNum%1!=0){
-                    parent.layer.msg("登记数量必须为整数!", {icon: 5});
-                    return false;
-                }
-                if(isNaN(contractsNum)){
-                    parent.layer.msg("请输入正确登记数量!", {icon: 5});
-                    return false;
-                }
 
-                $("#clientName").val($("#contractClientName").val());
-                if(i==2){
-                    $("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectRecords/tstore");
-                }else if(i==1){
                     var projectProperties=$("#projectProperties").val();
                     if(projectProperties==''){
                         parent.layer.msg("投资性质未选择!", {icon: 5});
@@ -1170,13 +1170,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input placeholder="请选择开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请选择开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input judgment layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input placeholder="请选择结束日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请选择结束日期" style="background-color: #fff" class="laydate-icondate form-control layui-input judgment layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -1198,7 +1198,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>登记数量：</label>
                     <div class="layui-input-block">
-                        <form:input path="contractsNum" placeholder="登记数量" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input" id="contractsNum"/>
+                        <form:input path="contractsNum" placeholder="登记数量" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input" id="contractsNum"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7" style="display: none">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementForm.jsp

@@ -1093,10 +1093,10 @@
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="技术负责人" readonly="true" class="form-control"/>
 									</td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control"/>
                                     </td>
                                     <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementMessageModify.jsp

@@ -961,10 +961,10 @@
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="技术负责人" readonly="true" class="form-control"/>
 									</td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control"/>
                                     </td>
                                     <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModify.jsp

@@ -932,10 +932,10 @@
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="技术负责人" readonly="true" class="form-control"/>
 									</td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control"/>
                                     </td>
                                     <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp

@@ -820,25 +820,25 @@
                             <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                         </div>
                     </div>--%>
-				<div class="layui-item layui-col-sm6 lw7">
+				<%--<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label double-line">建筑面积或规模：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.buildingScale}"/>
-							<%--						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>--%>
+							&lt;%&ndash;						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>&ndash;%&gt;
 					</div>
-				</div>
+				</div>--%>
 					<%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">计量单位：</label>
                         <div class="layui-input-block">
                             <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
                         </div>
                     </div>--%>
-				<div class="layui-item layui-col-sm6 lw7">
+				<%--<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label">工程用途：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
 					</div>
-				</div>
+				</div>--%>
 					<%--<div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元)：</label>
                         <div class="layui-input-block">
@@ -869,7 +869,7 @@
                             <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                         </div>
                     </div>--%>
-				<div class="layui-item layui-col-sm6 lw7">
+				<%--<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label">单位造价(元)：</label>
 					<div class="layui-input-block">
 						<input value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
@@ -886,7 +886,7 @@
 					<div class="layui-input-block">
 						<input  value="<fmt:formatNumber value="${projectRecords.installUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="readonly"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
 					<label class="layui-form-label">工程概况：</label>
 					<div class="layui-input-block">
@@ -894,7 +894,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
-					<label class="layui-form-label">特殊要求：</label>
+					<label class="layui-form-label">备注：</label>
 					<div class="layui-input-block">
 						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.remarks}</textarea>
 					</div>
@@ -1261,10 +1261,10 @@
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="技术负责人" readonly="true" class="form-control"/>
 									</td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control"/>
                                     </td>
                                     <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control"/>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -873,7 +873,7 @@
                     ,"clientName":"${workContractInfo.clientName}"
                     ,"clientType":"${fns:getMainDictLabel(workContractInfo.contractType, 'contract_type', '')}"
                     ,"contractPrice":"${workContractInfo.contractPrice}"
-                    ,"contractPrice2":"<fmt:formatNumber value="${workContractInfo.contractPrice}" pattern="#,#00.00"/>"
+                    ,"contractPrice2":"${workContractInfo.contractPrice}"
                     ,"signDate":"<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy-MM-dd"/>"
                     ,"createBy":"${workContractInfo.createName}"
                     ,"status":"${workContractInfo.contractState}"

src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoForm.jsp

@@ -114,7 +114,7 @@
 				$(".count1").hide();
 				$(".count2").show();
 			}
-			setValuee('${workInvoice.client.id}')
+			//setValuee('${workInvoice.client.id}')
 
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;

src/main/webapp/webpage/modules/workstaff/qualificationForm.jsp

@@ -279,7 +279,7 @@
                                 <th width="10%">发证机关</th>
                                 <th width="11%">发证日期</th>
                                 <th width="11%">注册日期</th>
-                                <th width="11%"><span class="require-item">*</span>到期日期</th>
+                                <th width="11%">到期日期</th>
                                 <th width="9%">注册证书编号</th>
                                 <th width="10%" id="requireMajor">专业</th>
                                 <th width="10%">文件</th>
@@ -318,7 +318,7 @@
                                                value="<fmt:formatDate value="${certificate.registDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                     </td>
                                     <td>
-                                        <input id="certificateList${varStatus.index}_endDate" name="certificateList[${varStatus.index}].endDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
+                                        <input id="certificateList${varStatus.index}_endDate" name="certificateList[${varStatus.index}].endDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
                                                value="<fmt:formatDate value="${certificate.endDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                     </td>
                                     <td>
@@ -400,7 +400,7 @@
                             value="<fmt:formatDate value="${certificate.registDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td>
-                                <input id="certificateList{{idx}}_endDate" name="certificateList[{{idx}}].endDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate required"
+                                <input id="certificateList{{idx}}_endDate" name="certificateList[{{idx}}].endDate" type="text" maxlength="20" class="laydate-icon form-control layer-date laydate-icondate"
                                                value="<fmt:formatDate value="${certificate.endDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                 </td>
                                 <td>

src/main/webapp/webpage/modules/workstaff/qualificationList.jsp

@@ -237,7 +237,6 @@
                 ,{field:'mobile',align:'center', title: '移动电话', minWidth:100}
                 ,{field:'office',align:'center', title: '部门', minWidth:100}
                 ,{field:'role',align:'center', title: '岗位', minWidth:100}
-                ,{field:'highestEducation',align:'center', title: '最高学历', minWidth:100}
 
                 // ,{field:'jobGrade',align:'center', title: '职级', minWidth:100}
                 /*,{field:'auditUserName',align:'center', title: '校审人员', minWidth:100
@@ -251,7 +250,6 @@
                         }
                         return ''
                     }}*/
-                ,{field:'status',align:'center', title: '员工状态', minWidth:80}
                 ,{field:'entryDate', align:'center',sort:true,title: '入职日期',width:100}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoList.jsp

@@ -186,9 +186,9 @@
                         <shiro:hasPermission name="workstaff:workStaffBasicInfo:add">
                             <table:addRow url="${ctx}/workstaff/workStaffBasicInfo/form" title="员工信息"></table:addRow><!-- 增加按钮 -->
                         </shiro:hasPermission>
-                        <shiro:hasPermission name="workstaff:workStaffBasicInfo:import">
+                        <%--<shiro:hasPermission name="workstaff:workStaffBasicInfo:import">
                             <table:importExcelBasic url="${ctx}/workstaff/workStaffBasicInfo/import"></table:importExcelBasic><!-- 导入按钮 -->
-                        </shiro:hasPermission>
+                        </shiro:hasPermission>--%>
                         <shiro:hasPermission name="workstaff:workStaffBasicInfo:export">
                             <table:exportExcel url="${ctx}/workstaff/workStaffBasicInfo/exportAchive"></table:exportExcel><!-- 导出按钮 -->
                         </shiro:hasPermission>