项目质量符合流程单下载bug修复

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

@@ -1092,10 +1092,16 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         if (projectcontentinfo.getProjectReportData()!=null){
             //保存工作报告相关数据
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
+            if(StringUtils.isNotBlank(projectReportData.getId())){
+                projectReportData = projectReportDataDao.get(projectReportData.getId());
+            }
             projectReportData.setName(projectcontentinfo.getProjectOnRural().getProjectName());
             projectReportData.setCompanyId(contentinfo.getCompanyId());
             projectReportData.setOfficeId(contentinfo.getOfficeId());
             projectReportData.setProject(contentinfo.getProject());
+            if(null == projectReportData.getAuditPassDate()){
+                projectReportData.setAuditPassDate(new Date());
+            }
             projectReportData.setReportDate(new Date());
             if (com.jeeplus.common.utils.StringUtils.isBlank(projectReportData.getId())){
                 projectReportData.setFileStatus("1");

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
@@ -1372,7 +1369,7 @@ public class WorkFullManageController extends BaseController {
 		}
 		//报告状态
 		String dataStatus=projectReportData.getStatus();
-		if (dataStatus.equals("5")){
+		if (dataStatus.equals("5") && null != projectReportData.getAuditPassDate()){
 			String ss = sdf.format(projectReportData.getAuditPassDate());
 			data.put("shenDate",ss);
 		}else{

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

@@ -574,6 +574,7 @@
 			contract_category,
 			contract_rate,
 			first_audit_date,
+			audit_pass_date,
 			ZiXunShouRu
 		) VALUES (
 			#{id},
@@ -692,6 +693,7 @@
 			#{contractCategory},
 			#{contractRate},
 			#{firstAuditDate},
+			#{auditPassDate},
 			<choose>
 				<when test="ZiXunShouRu != null and ZiXunShouRu !=''">
 					#{ZiXunShouRu}

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -531,7 +531,7 @@ END) as projectScale*/
 							</if>
 						</when>
 						<otherwise>
-							AND( (a.submit_money = 2 and pfp.status is null) or (a.submit_money = 1 and ppf.status is null) )
+							AND( (a.submit_money = 2 and ppf.status is null) or (a.submit_money = 1 and pfp.status is null) )
 						</otherwise>
 					</choose>
 				</when>
@@ -547,7 +547,7 @@ END) as projectScale*/
 								</if>
 							</when>
 							<otherwise>
-								and ppf.status = #{downProjectReportRecordStatus}
+								AND( (a.submit_money = 2 and ppf.status = #{downProjectReportRecordStatus}) or (a.submit_money = 1 and pfp.status = #{downProjectReportRecordStatus}) )
 							</otherwise>
 						</choose>
 
@@ -875,7 +875,7 @@ END) as projectScale*/
 							</if>
 						</when>
 						<otherwise>
-							AND( (a.submit_money = 2 and pfp.status is null) or (a.submit_money = 1 and ppf.status is null) )
+							AND( (a.submit_money = 2 and ppf.status is null) or (a.submit_money = 1 and pfp.status is null) )
 						</otherwise>
 					</choose>
 				</when>
@@ -891,7 +891,7 @@ END) as projectScale*/
 								</if>
 							</when>
 							<otherwise>
-								and ppf.status = #{downProjectReportRecordStatus}
+								AND( (a.submit_money = 2 and ppf.status = #{downProjectReportRecordStatus}) or (a.submit_money = 1 and pfp.status = #{downProjectReportRecordStatus}) )
 							</otherwise>
 						</choose>
 
@@ -1127,7 +1127,7 @@ END) as projectScale*/
 							</if>
 						</when>
 						<otherwise>
-							AND( (a.submit_money = 2 and pfp.status is null) or (a.submit_money = 1 and ppf.status is null) )
+							AND( (a.submit_money = 2 and ppf.status is null) or (a.submit_money = 1 and pfp.status is null) )
 						</otherwise>
 					</choose>
 				</when>
@@ -1143,7 +1143,7 @@ END) as projectScale*/
 								</if>
 							</when>
 							<otherwise>
-								and ppf.status = #{downProjectReportRecordStatus}
+								AND( (a.submit_money = 2 and ppf.status = #{downProjectReportRecordStatus}) or (a.submit_money = 1 and pfp.status = #{downProjectReportRecordStatus}) )
 							</otherwise>
 						</choose>