Merge branch 'master' of http://192.168.2.4:3000/user5/simple_xg_total_process_master

pom.xml

@@ -74,8 +74,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.3</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>8</source>
+                    <target>8</target>
                     <compilerArguments>
                         <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar</bootclasspath>
                         <extdirs>${project.basedir}/src/main/webapp/WEB-INF/jar</extdirs>

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

@@ -3,26 +3,19 @@
  */
 package com.jeeplus.modules.workstaff.service;
 
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigDecimal;
-import java.text.NumberFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-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.oss.OSSClientUtil;
-import com.jeeplus.common.utils.FileUtils;
-import com.jeeplus.common.utils.IdGen;
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.MenuStatusEnum;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.sys.dao.AreaDao;
-import com.jeeplus.modules.sys.dao.UserDao;
-import com.jeeplus.modules.sys.entity.*;
+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.*;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -36,21 +29,28 @@ import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
 import com.jeeplus.modules.workrelationship.dao.WorkRelationshipDao;
 import com.jeeplus.modules.workrelationship.entity.WorkRelationship;
 import com.jeeplus.modules.workstaff.dao.*;
-import com.jeeplus.modules.workstaff.entity.*;
+import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfoExcel;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import com.jeeplus.modules.workstaffachiveslog.dao.WorkStaffAchivesLogDao;
 import com.jeeplus.modules.workstaffachiveslog.entity.WorkStaffAchivesLog;
 import com.jeeplus.modules.workstaffachiveslog.service.WorkStaffAchivesLogService;
-import com.sun.corba.se.spi.orbutil.threadpool.Work;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import com.jeeplus.common.persistence.Page;
-import com.jeeplus.common.service.CrudService;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 员工基本信息Service
@@ -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;
 	}

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

@@ -16,7 +16,6 @@ import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
-import com.jeeplus.modules.projectAccessory.entity.CollectAccessoryInfo;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
@@ -51,7 +50,10 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -735,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/workinvoice/WorkInvoiceDao.xml

@@ -327,7 +327,7 @@
 				AND a.invoice_state = #{invoiceState}
 			</if>
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
-				AND a.create_date BETWEEN #{beginContractDate} AND #{endContractDate}
+				AND a.invoice_date BETWEEN #{beginContractDate} AND #{endContractDate}
 			</if>
 
 			<if test="receiptBeginDate != null and receiptBeginDate != ''">
@@ -479,7 +479,7 @@
 				AND a.invoice_state = #{invoiceState}
 			</if>
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
-				AND a.create_date BETWEEN #{beginContractDate} AND #{endContractDate}
+				AND a.invoice_date BETWEEN #{beginContractDate} AND #{endContractDate}
 			</if>
 
 			<if test="receiptBeginDate != null and receiptBeginDate != ''">
@@ -683,7 +683,7 @@
 				AND a.invoice_state = #{invoiceState}
 			</if>
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
-				AND a.create_date BETWEEN #{beginContractDate} AND #{endContractDate}
+				AND a.invoice_date BETWEEN #{beginContractDate} AND #{endContractDate}
 			</if>
 			<if test="officeIdList!=null and officeIdList.size!=0">
 				and a.office_id in
@@ -783,7 +783,7 @@
 				AND a.invoice_state = #{invoiceState}
 			</if>
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
-				AND a.create_date BETWEEN #{beginContractDate} AND #{endContractDate}
+				AND a.invoice_date BETWEEN #{beginContractDate} AND #{endContractDate}
 			</if>
 			<if test="officeIdList!=null and officeIdList.size!=0">
 				and a.office_id in
@@ -928,7 +928,7 @@
 				AND a.invoice_state = #{invoiceState}
 			</if>
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
-				AND a.create_date BETWEEN #{beginContractDate} AND #{endContractDate}
+				AND a.invoice_date BETWEEN #{beginContractDate} AND #{endContractDate}
 			</if>
 
 			<if test="receiptBeginDate != null and receiptBeginDate != ''">
@@ -1070,7 +1070,7 @@
 				<if test="dbName == 'mysql'">concat('%',#{number},'%')</if>
 			</if>
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
-				AND a.create_date BETWEEN #{beginContractDate} AND #{endContractDate}
+				AND a.invoice_date BETWEEN #{beginContractDate} AND #{endContractDate}
 			</if>
 			<if test="client != null and client.id != null and client.id != ''">
 				AND a.client_id = #{client.id}
@@ -1198,7 +1198,7 @@
 				AND a.invoice_state = #{invoiceState}
 			</if>
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
-				AND a.create_date BETWEEN #{beginContractDate} AND #{endContractDate}
+				AND a.invoice_date BETWEEN #{beginContractDate} AND #{endContractDate}
 			</if>
 
 			<if test="receiptBeginDate != null and receiptBeginDate != ''">
@@ -1371,7 +1371,7 @@
 				AND a.invoice_state = #{invoiceState}
 			</if>
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
-				AND a.create_date BETWEEN #{beginContractDate} AND #{endContractDate}
+				AND a.invoice_date BETWEEN #{beginContractDate} AND #{endContractDate}
 			</if>
 
 			<if test="receiptBeginDate != null and receiptBeginDate != ''">
@@ -1873,7 +1873,7 @@
 				AND a.invoice_state = #{invoiceState}
 			</if>
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
-				AND a.create_date BETWEEN #{beginContractDate} AND #{endContractDate}
+				AND a.invoice_date BETWEEN #{beginContractDate} AND #{endContractDate}
 			</if>
 			<if test="client != null and client.id != null and client.id != ''">
 				AND a.client_id = #{client.id}

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp

@@ -314,7 +314,7 @@
                             return false;
                         }*/
 
-						var BaoGaoShuQianFaDate = $("#BaoGaoShuQianFaDate").val();
+						/*var BaoGaoShuQianFaDate = $("#BaoGaoShuQianFaDate").val();
 						var s = BaoGaoShuQianFaDate.replace(/-/g,"/");
 						var baogaoDate = new Date(s );
 						var nowDate = new Date();
@@ -323,7 +323,7 @@
 						if(days >37){
 							parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
 							return false;
-						}
+						}*/
 
 						var beginDateTime = $("#beginDate").val();
 						var endDateTime = $("#endDate").val();

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms.jsp

@@ -313,7 +313,7 @@
                             return false;
                         }*/
 
-						var BaoGaoShuQianFaDate = $("#BaoGaoShuQianFaDate").val();
+						/*var BaoGaoShuQianFaDate = $("#BaoGaoShuQianFaDate").val();
 						var s = BaoGaoShuQianFaDate.replace(/-/g,"/");
 						var baogaoDate = new Date(s );
 						var nowDate = new Date();
@@ -322,7 +322,7 @@
 						if(days >37){
 							parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
 							return false;
-						}
+						}*/
 
 						var beginDateTime = $("#beginDate").val();
 						var endDateTime = $("#endDate").val();