参数变更

src/main/java/com/jeeplus/modules/bzshbExamine/web/BzshbExaminController.java

@@ -1,7 +1,6 @@
 package com.jeeplus.modules.bzshbExamine.web;
 
 import com.google.common.collect.Lists;
-import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
@@ -9,7 +8,6 @@ import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.bzshbExamine.entity.BzshbExaminInfo;
 import com.jeeplus.modules.bzshbExamine.service.BzshbExaminService;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
-import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
 import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
@@ -229,8 +227,10 @@ public class BzshbExaminController extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setZixunyuanName(user.getName());
-                consultant.setRole("咨询员");
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                    consultant.setRole("咨询员");
+                }
             }
         }
         consultants.addAll(consultantList);

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageElectronicSealService.java

@@ -1,6 +1,5 @@
 package com.jeeplus.modules.ruralprojectrecords.service;
 
-import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.jeeplus.common.config.Global;
@@ -16,7 +15,6 @@ import com.jeeplus.modules.ruralprojectrecords.entity.*;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.thread.ApprovalThread;
 import com.jeeplus.modules.ruralprojectrecords.thread.SignatureThread;
-import com.jeeplus.modules.ruralprojectrecords.utils.FileUtil;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
@@ -26,7 +24,6 @@ import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import com.jeeplus.modules.tools.utils.SignaturePostUtil;
 import com.jeeplus.modules.tools.utils.TwoDimensionCode;
 import com.jeeplus.modules.utils.SftpClientUtil;
 import com.jeeplus.modules.workactivity.dao.WorkActivityProcessDao;
@@ -1745,7 +1742,9 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                }
             }
         }
         consultants.addAll(consultantList);

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewService.java

@@ -2923,15 +2923,18 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                         }
                     }
                     User user=userService.get(consultant.getZixunyuan());
-                    consultant.setRole("咨询员");
-                    consultant.setZixunyuanName(user.getName());
-                    //查询用户身份证号
-                    WorkStaffBasicInfo userInfo = workStaffBasicInfoService.getByUserId(user.getId());
-                    if(null != userInfo){
-                        consultant.setIdCard(userInfo.getIdCard());
-                    }
-                    if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
-                        it.remove();
+                    if(null != user){
+                        consultant.setZixunyuanName(user.getName());
+                        consultant.setRole("咨询员");
+
+                        //查询用户身份证号
+                        WorkStaffBasicInfo userInfo = workStaffBasicInfoService.getByUserId(user.getId());
+                        if(null != userInfo){
+                            consultant.setIdCard(userInfo.getIdCard());
+                        }
+                        if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+                            it.remove();
+                        }
                     }
                 }
             }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -3564,15 +3564,18 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                         }
                     }
                     User user=userService.get(consultant.getZixunyuan());
-                    consultant.setRole("咨询员");
-                    consultant.setZixunyuanName(user.getName());
-                    //查询用户身份证号
-                    WorkStaffBasicInfo userInfo = workStaffBasicInfoService.getByUserId(user.getId());
-                    if(null != userInfo){
-                        consultant.setIdCard(userInfo.getIdCard());
-                    }
-                    if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
-                        it.remove();
+                    if(null != user){
+                        consultant.setZixunyuanName(user.getName());
+                        consultant.setRole("咨询员");
+
+                        //查询用户身份证号
+                        WorkStaffBasicInfo userInfo = workStaffBasicInfoService.getByUserId(user.getId());
+                        if(null != userInfo){
+                            consultant.setIdCard(userInfo.getIdCard());
+                        }
+                        if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
+                            it.remove();
+                        }
                     }
                 }
             }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/yanChengSignature/RuralProjectMessageElectronicSealYCService.java

@@ -16,9 +16,7 @@ import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageNewService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
-import com.jeeplus.modules.ruralprojectrecords.thread.ApprovalThread;
 import com.jeeplus.modules.ruralprojectrecords.thread.ApprovalYCThread;
-import com.jeeplus.modules.ruralprojectrecords.thread.SignatureThread;
 import com.jeeplus.modules.ruralprojectrecords.thread.SignatureYCThread;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Office;
@@ -1565,7 +1563,9 @@ public class RuralProjectMessageElectronicSealYCService extends CrudService<Rura
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                }
             }
         }
         consultants.addAll(consultantList);

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

@@ -27,27 +27,23 @@ import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportRecordService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
+import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsReported;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
-import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.entity.Area;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
-import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import com.jeeplus.modules.workactivity.entity.Activity;
-import com.jeeplus.modules.workactivitymenu.entity.WorkActivityMenu;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
-import com.jeeplus.modules.workcontractrecord.entity.WorkContractRecord;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
@@ -61,12 +57,14 @@ import org.json.JSONArray;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -503,8 +501,10 @@ public class RuralCostProjectMessageController extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setRole("咨询员");
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                    consultant.setRole("咨询员");
+                }
                 if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
                     User chenHongXing=UserUtils.getByLoginName("陈红星");
                     List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
@@ -812,7 +812,9 @@ public class RuralCostProjectMessageController extends BaseController {
                 }
             }
             User user=userService.get(consultant.getZixunyuan());
-            consultant.setZixunyuanName(user.getName());
+            if(null != user){
+                consultant.setZixunyuanName(user.getName());
+            }
         }
 
         //根据条件查询附件必填项
@@ -2223,7 +2225,9 @@ public class RuralCostProjectMessageController extends BaseController {
         List<RuralReportConsultant> consultants = ruralProjectMessageService.getConsultantsList(projectRecords.getId());
         for (RuralReportConsultant consultant:consultants){
             User user=userService.get(consultant.getZixunyuan());
-            consultant.setZixunyuanName(user.getName());
+            if(null != user){
+                consultant.setZixunyuanName(user.getName());
+            }
         }
         model.addAttribute("ruralProjectRecordsReported", reported);
         model.addAttribute("consultantInfo", consultants);

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

@@ -374,7 +374,9 @@ public class RuralCostProjectMessageNewController extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                }
             }
         }
         if(StringUtils.isNotBlank(consultantBzshb.getId())){
@@ -578,7 +580,9 @@ public class RuralCostProjectMessageNewController extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                }
             }
         }
         consultants.addAll(consultantList);
@@ -1746,7 +1750,9 @@ public class RuralCostProjectMessageNewController extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                }
             }
         }
         consultants.addAll(consultantList);
@@ -2232,7 +2238,9 @@ public class RuralCostProjectMessageNewController extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                }
             }
         }
         consultants.addAll(consultantList);

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

@@ -345,7 +345,7 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
         //查询报告文件、依据性文件、其他文件必填列表以及数据
         List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
         //文件处理
-        projectTemplateService.disposeProjectTemplateFile(mainDictDetails,relateInfo,engineeringId,ruralProjectRecords,projectReportRecord,"");
+        projectTemplateService.disposeProjectTemplateFile(mainDictDetails,relateInfo,engineeringId,ruralProjectRecords,projectReportRecord,"1000");
         /*for (MainDictDetail mainDict : mainDictDetails) {
             relateInfo.setAttachType(mainDict.getValue());
             switch (mainDict.getValue()) {
@@ -505,8 +505,10 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setRole("咨询员");
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                    consultant.setRole("咨询员");
+                }
                 if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
 
                     User chenHongXing=UserUtils.getByLoginName("陈红星");
@@ -795,7 +797,10 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                    consultant.setRole("咨询员");
+                }
             }
         }
         consultants.addAll(consultantList);

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

@@ -302,8 +302,10 @@ public class RuralProjectMessageAllController extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setRole("咨询员");
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                    consultant.setRole("咨询员");
+                }
                 if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
                     User chenHongXing=UserUtils.getByLoginName("陈红星");
                     List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());

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

@@ -53,6 +53,7 @@ import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.tools.utils.SignaturePostUtil;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.history.HistoricProcessInstance;
@@ -513,8 +514,10 @@ public class RuralProjectMessageController extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setRole("咨询员");
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                    consultant.setRole("咨询员");
+                }
                 if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
 
                     User chenHongXing=UserUtils.getByLoginName("陈红星");
@@ -820,7 +823,9 @@ public class RuralProjectMessageController extends BaseController {
                 }
             }
             User user=userService.get(consultant.getZixunyuan());
-            consultant.setZixunyuanName(user.getName());
+            if(null != user){
+                consultant.setZixunyuanName(user.getName());
+            }
         }
         //根据条件查询附件必填项
         //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
@@ -939,7 +944,9 @@ public class RuralProjectMessageController extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                }
             }
             model.addAttribute("consultantinfo", consultantList);
             return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify";

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

@@ -384,7 +384,9 @@ public class RuralProjectMessageNewController extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                }
             }
         }
         if(StringUtils.isNotBlank(consultantBzshb.getId())){
@@ -551,7 +553,9 @@ public class RuralProjectMessageNewController extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                }
             }
         }
         consultants.addAll(consultantList);
@@ -1938,7 +1942,9 @@ public class RuralProjectMessageNewController extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                }
             }
         }
         consultants.addAll(consultantList);

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

@@ -308,7 +308,9 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                }
             }
         }
         consultants.addAll(consultantList);

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

@@ -188,9 +188,12 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         logger.info("-----------部门级—月度报表（开始）------------------");
         statementCompanyComprehensiveService.disposeStatementOffice(2022,2,2);
         logger.info("------------部门级—月度报表（结束）------------------");
-        logger.info("-----------张静—月度报表（开始）------------------");
+        logger.info("------------公司级—年度报表（开始)------------------");
+        statementCompanyComprehensiveService.disposeStatementCompanyByYear(2022,0,5);
+        logger.info("------------公司级—年度报表（结束）------------------");
+        /*logger.info("-----------张静—月度报表（开始）------------------");
         statementCompanyComprehensiveService.disposeReportDataStatementCompany(2022,2,7);
-        logger.info("------------张静—月度报表（结束）------------------");
+        logger.info("------------张静—月度报表（结束）------------------");*/
         //}
 
         map.put("msgMonth","月度报表处理完成");

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

@@ -44,6 +44,7 @@ import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
 import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
+import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -412,8 +413,10 @@ public class RuralProjectViewController extends BaseController {
                     }
                 }
                 User user=userService.get(consultant.getZixunyuan());
-                consultant.setRole("咨询员");
-                consultant.setZixunyuanName(user.getName());
+                if(null != user){
+                    consultant.setZixunyuanName(user.getName());
+                    consultant.setRole("咨询员");
+                }
                 if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
                     User chenHongXing=UserUtils.getByLoginName("陈红星");
                     List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());

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

@@ -221,7 +221,7 @@ public class WorkCalendarTaskService  {
      * B类项目批量归档 质量复核后6个月提醒通知
      */
     //设置每日凌晨20分调用通知方法
-    @Scheduled(cron= "0 20 0 * * ?")
+    //@Scheduled(cron= "0 20 0 * * ?")
     @Transactional(readOnly = false)
     public void getPaperArchiveNotify() {
         logger.info("-----------项目纸质归档和批量归档长期未处理通知（开始）------------------");

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

@@ -625,8 +625,10 @@ public class WorkFullManageService extends CrudService<WorkFullManageDao, WorkFu
 					}
 				}
 				User user=userService.get(consultant.getZixunyuan());
-				consultant.setZixunyuanName(user.getName());
-				consultant.setRole("咨询员");
+				if(null != user){
+					consultant.setZixunyuanName(user.getName());
+					consultant.setRole("咨询员");
+				}
 				if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
 					User chenHongXing=UserUtils.getByLoginName("陈红星");
 					List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());

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

@@ -51,6 +51,7 @@ import com.jeeplus.modules.workproject.entity.WorkProject;
 import com.jeeplus.modules.workproject.service.WorkProjectService;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
+import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
@@ -1118,8 +1119,10 @@ public class WorkFullManageController extends BaseController {
 					}
 				}
 				User user=userService.get(consultant.getZixunyuan());
-				consultant.setZixunyuanName(user.getName());
-				consultant.setRole("咨询员");
+				if(null != user){
+					consultant.setZixunyuanName(user.getName());
+					consultant.setRole("咨询员");
+				}
 			}
 		}
 		consultants.addAll(consultantList);
@@ -1479,7 +1482,9 @@ public class WorkFullManageController extends BaseController {
 					}
 				}
 				User user=userService.get(consultant.getZixunyuan());
-				consultant.setZixunyuanName(user.getName());
+				if(null != user){
+					consultant.setZixunyuanName(user.getName());
+				}
 			}
 		}
 		consultants.addAll(consultantList);

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceTwoController.java

@@ -554,6 +554,7 @@ public class WorkInvoiceTwoController extends BaseController {
 		if (!beanValidator(model, workInvoice)){
 			return form(workInvoice, model);
 		}
+		System.out.println(workInvoice.getInvoiceDate());
 
 		User user = workInvoice.getCreateBy();
 		User loginUser = UserUtils.getUser();

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

@@ -3563,8 +3563,10 @@ public class WorkProjectNotifyController extends BaseController {
 								}
 							}
 							User user=userService.get(consultant.getZixunyuan());
-							consultant.setZixunyuanName(user.getName());
-							consultant.setRole("咨询员");
+							if(null != user){
+								consultant.setZixunyuanName(user.getName());
+								consultant.setRole("咨询员");
+							}
 						}
 					}
 					consultants.addAll(consultantList);
@@ -3991,8 +3993,10 @@ public class WorkProjectNotifyController extends BaseController {
 								}
 							}
 							User user=userService.get(consultant.getZixunyuan());
-							consultant.setZixunyuanName(user.getName());
-							consultant.setRole("咨询员");
+							if(null != user){
+								consultant.setZixunyuanName(user.getName());
+								consultant.setRole("咨询员");
+							}
 						}
 					}
 					consultants.addAll(consultantList);
@@ -4536,8 +4540,10 @@ public class WorkProjectNotifyController extends BaseController {
 								}
 							}
 							User user=userService.get(consultant.getZixunyuan());
-							consultant.setZixunyuanName(user.getName());
-							consultant.setRole("咨询员");
+							if(null != user){
+								consultant.setZixunyuanName(user.getName());
+								consultant.setRole("咨询员");
+							}
 						}
 					}
 					consultants.addAll(consultantList);
@@ -5197,8 +5203,10 @@ public class WorkProjectNotifyController extends BaseController {
 								}
 							}
 							User zixunyuanUser=userService.get(consultant.getZixunyuan());
-							consultant.setZixunyuanName(zixunyuanUser.getName());
-							consultant.setRole("咨询员");
+							if(null != user){
+								consultant.setZixunyuanName(user.getName());
+								consultant.setRole("咨询员");
+							}
 						}
 					}
 					consultants.addAll(consultantList);
@@ -6578,8 +6586,10 @@ public class WorkProjectNotifyController extends BaseController {
 										}
 									}
 									user=userService.get(consultant.getZixunyuan());
-									consultant.setRole("咨询员");
-									consultant.setZixunyuanName(user.getName());
+									if(null != user){
+										consultant.setZixunyuanName(user.getName());
+										consultant.setRole("咨询员");
+									}
 									if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
 										User chenHongXing=UserUtils.getByLoginName("陈红星");
 										List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
@@ -8646,7 +8656,9 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 				}
 				User user=userService.get(consultant.getZixunyuan());
-				consultant.setZixunyuanName(user.getName());
+				if(null != user){
+					consultant.setZixunyuanName(user.getName());
+				}
 			}
 		}
 		consultants.addAll(consultantList);
@@ -8708,8 +8720,10 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 				}
 				User user=userService.get(consultant.getZixunyuan());
-				consultant.setRole("咨询员");
-				consultant.setZixunyuanName(user.getName());
+				if(null != user){
+					consultant.setZixunyuanName(user.getName());
+					consultant.setRole("咨询员");
+				}
 				if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
 					User chenHongXing=UserUtils.getByLoginName("陈红星");
 					List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -1624,7 +1624,9 @@
 			drawer_id = #{drawer.id},
 			office_id = #{office.id},
 			invoice_number = #{invoiceNumber},
-			invoice_date = #{invoiceDate},
+			<if test="null != invoiceDate">
+				invoice_date = #{invoiceDate},
+			</if>
 			drawer_name = #{drawerName},
 			take_date = #{takeDate},
 			invoice_remarks = #{invoiceRemarks},

src/main/webapp/webpage/include/head.jsp

@@ -36,7 +36,7 @@
 
 <!-- jeeplus -->
 <link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-<script src="${ctxStatic}/common/jeeplus.js?2" type="text/javascript"></script>
+<script src="${ctxStatic}/common/jeeplus.js?3" type="text/javascript"></script>
 
 <!-- jquery ui -->
 <script src="${ctxStatic}/jquery-ui/jquery-ui.min.js"></script>

src/main/webapp/webpage/modules/sys/tagTreeselectReported.jsp

@@ -58,10 +58,10 @@
 				// 	tree.expandNode(nodes[i], true, false, false);
 				// }
 				//异步加载子节点（加载用户）
-				// var nodesOne = tree.getNodesByParam("isParent", true);
-				// for(var j=0; j<nodesOne.length; j++) {
-				// 	tree.reAsyncChildNodes(nodesOne[j],"!refresh",false);
-				// }
+				var nodesOne = tree.getNodesByParam("isParent", true);
+				for(var j=0; j<nodesOne.length; j++) {
+					tree.reAsyncChildNodes(nodesOne[j],"!refresh",true);
+				}
 				selectCheckNode();
 			});
 			key = $("#key");

src/main/webapp/webpage/modules/sys/tagTreeselectReportedZXY.jsp

@@ -58,10 +58,10 @@
 				// 	tree.expandNode(nodes[i], true, false, false);
 				// }
 				//异步加载子节点（加载用户）
-				// var nodesOne = tree.getNodesByParam("isParent", true);
-				// for(var j=0; j<nodesOne.length; j++) {
-				// 	tree.reAsyncChildNodes(nodesOne[j],"!refresh",false);
-				// }
+				var nodesOne = tree.getNodesByParam("isParent", true);
+				for(var j=0; j<nodesOne.length; j++) {
+					tree.reAsyncChildNodes(nodesOne[j],"!refresh",true);
+				}
 				selectCheckNode();
 			});
 			key = $("#key");