Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/common/config/Global.java

@@ -31,12 +31,12 @@ public class Global {
 	 * 当前对象实例
 	 */
 	private static Global global = new Global();
-	
+
 	/**
 	 * 保存全局属性值
 	 */
 	private static Map<String, String> map = Maps.newHashMap();
-	
+
 	/**
 	 * 属性文件加载对象
 	 */
@@ -53,25 +53,25 @@ public class Global {
 	 */
 	public static final String YES = "1";
 	public static final String NO = "0";
-	
+
 	/**
 	 * 对/错
 	 */
 	public static final String TRUE = "true";
 	public static final String FALSE = "false";
-	
+
 	/**
 	 * 上传文件基础虚拟路径
 	 */
 	public static final String USERFILES_BASE_URL = "/userfiles/";
-	
+
 	/**
 	 * 获取当前对象实例
 	 */
 	public static Global getInstance() {
 		return global;
 	}
-	
+
 	/**
 	 * 获取配置
 	 * @see ${fns:getConfig('adminPath')}
@@ -84,7 +84,7 @@ public class Global {
 		}
 		return value;
 	}
-	
+
 	/**
 	 * 获取管理端根路径
 	 */
@@ -123,6 +123,11 @@ public class Global {
 	}
 	/**
 	 */
+	public static String getQzBucketName() {
+		return getConfig("qzBucketName");
+	}
+	/**
+	 */
 	public static String getAvatarDir() {
 		return getConfig("avatarDir");
 	}
@@ -281,7 +286,7 @@ public class Global {
 	public static String getFrontPath() {
 		return getConfig("frontPath");
 	}
-	
+
 	/**
 	 * 获取URL后缀
 	 */
@@ -311,7 +316,7 @@ public class Global {
 		String dm = getConfig("demoMode");
 		return "true".equals(dm) || "1".equals(dm);
 	}
-	
+
 	/**
 	 * 在修改系统用户和岗位时是否同步到Activiti
 	 */
@@ -319,7 +324,7 @@ public class Global {
 		String dm = getConfig("activiti.isSynActivitiIndetity");
 		return "true".equals(dm) || "1".equals(dm);
 	}
-    
+
 	/**
 	 * 页面获取常量
 	 * @see ${fns:getConst('YES')}
@@ -352,7 +357,7 @@ public class Global {
 //		System.out.println("userfiles.basedir: " + dir);
 		return dir;
 	}
-	
+
     /**
      * 获取工程路径
      * @return
@@ -384,10 +389,10 @@ public class Global {
 		}
 		return projectPath;
     }
-    
+
     /**
 	 * 写入properties信息
-	 * 
+	 *
 	 * @param key
 	 *            名称
 	 * @param value
@@ -407,11 +412,11 @@ public class Global {
 			e.printStackTrace();
 		}
 	}
-	
+
 	/**
 	 * 返回　Properties
 	 * @param fileName 文件名　(注意：加载的是src下的文件,如果在某个包下．请把包名加上)
-	 * @param 
+	 * @param
 	 * @return
 	 */
 	public static Properties getProperties(){

src/main/java/com/jeeplus/common/oss/OSSClientUtil.java

@@ -66,6 +66,7 @@ public class OSSClientUtil {
     private String oaAll = Global.getOaAll();
     private String im = Global.getIm();
     private String workContractInfo = Global.getWorkContractInfo();
+    private String qzBucketName = Global.getQzBucketName();;
     private OSSClient ossClient;
 
     public OSSClientUtil() {
@@ -811,6 +812,38 @@ public class OSSClientUtil {
     }
 
     /**
+     * 阿里云获取临时文件查看url
+     * 签章文件查看
+     * @param file
+     */
+    public String getQzFileTemporaryLookUrl(String file){
+        URL url = null;
+        try {
+
+            file = file.replace("amp;","");
+            String aliyunUrl = Global.getAliyunUrl();
+            String aliDownloadUrl = Global.getAliDownloadUrl();
+            String cons = "";
+            if (file.contains(aliyunUrl)){
+                cons = aliyunUrl;
+            }else if (file.contains("http://gangwan-app.oss-cn-hangzhou.aliyuncs.com")){
+                cons = "http://gangwan-app.oss-cn-hangzhou.aliyuncs.com";
+            }else {
+                cons = aliDownloadUrl;
+            }
+            String key = file.split(cons+"/")[1];
+            // 指定过期时间为24小时。
+            Date expiration = new Date(new Date().getTime() + 1000 * 60 * 60 * 24 );
+            url = ossClient.generatePresignedUrl(qzBucketName, key, expiration);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "";
+        }
+        return url.toString();
+    }
+
+    /**
      * 阿里云获取临时文件大小
      * @param file
      */

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/PresignCallBack.java

@@ -18,7 +18,7 @@ public class PresignCallBack {
     private String operatorMobile;  //操作人手机号
     private String operatorNumber;  //操作人员工编号
     private String receiverNumber;  //经办人员工编号
-    private String fileDownloadUrl;  //文件归档下载地址
+    private String storagePath;  //文件归档下载地址
 
     public String getContractId() {
         return contractId;
@@ -116,11 +116,11 @@ public class PresignCallBack {
         this.receiverNumber = receiverNumber;
     }
 
-    public String getFileDownloadUrl() {
-        return fileDownloadUrl;
+    public String getStoragePath() {
+        return storagePath;
     }
 
-    public void setFileDownloadUrl(String fileDownloadUrl) {
-        this.fileDownloadUrl = fileDownloadUrl;
+    public void setStoragePath(String storagePath) {
+        this.storagePath = storagePath;
     }
 }

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

@@ -246,6 +246,13 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		}
 		return projectRecords;
 	}
+
+	public RuralProjectRecords getNotifyQueryProjectUsers(String id) {
+		RuralProjectRecords projectRecords = super.get(id);
+		List<User> users = workProjectUserDao.queryProjectUsers(projectRecords.getId(), "1");
+		projectRecords.setLeaderNameStr(Collections3.extractToString(users, "name", ","));
+		return projectRecords;
+	}
 	public RuralProjectRecords getQueryProjectMasters(RuralProjectRecords projectRecords) {
 		List<User> users = workProjectUserDao.queryProjectUsers(projectRecords.getId(), "1");
 		projectRecords.setLeaderNameStr(Collections3.extractToString(users, "name", ","));
@@ -1490,6 +1497,22 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
         this.queryReportData(projectRecords);
     }
 
+    public void queryNotifyProjectDetail(RuralProjectRecords projectRecords) {
+		/*if(null != projectRecords.getWorkContractInfo() && StringUtils.isNotBlank(projectRecords.getWorkContractInfo().getId())){
+			this.queryContractInfos(projectRecords);
+		}*/
+        //设置项目组成员
+        //this.queryUserNames(projectRecords);
+        //设置项目组成员所属部门
+        this.queryOfficeName(projectRecords);
+        //设置委托方联系人信息
+        //this.queryLinkmanInfos(projectRecords);
+        //设置附件信息
+        //this.queryWorkAttachment(projectRecords);
+        //设置报告
+        //this.queryReportData(projectRecords);
+    }
+
     public void queryProjectDetailBySignature(RuralProjectRecords projectRecords,String fileType) {
 		if(null != projectRecords.getWorkContractInfo() && StringUtils.isNotBlank(projectRecords.getWorkContractInfo().getId())){
 			this.queryContractInfos(projectRecords);

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

@@ -151,16 +151,34 @@ public class RuralProjectMessageElectronicSealController extends BaseController
             RuralProjectRecords records1 = list.get(i);
             if(StringUtils.isNotBlank(records1.getReportSignatureUrl())){
                 records1.setReportSignatureUrlFlag(1);
-                records1.setReportSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + records1.getReportSignatureUrl()));
                 //处理文件路径
+                //如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+                if(records1.getReportSignatureUrl().contains("/xg-qz")){
+                    if(StringUtils.isNotBlank(records1.getReportSignatureUrl())){
+                        String signatureUrl = records1.getReportSignatureUrl().replace("/xg-qz","");
+                        records1.setReportSignatureUrl(signatureUrl);
+                    }
+                    records1.setReportSignatureUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + records1.getReportSignatureUrl()));
+                }else{
+                    records1.setReportSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + records1.getReportSignatureUrl()));
+                }
             }else{
                 records1.setReportSignatureUrlFlag(0);
             }
 
             if(StringUtils.isNotBlank(records1.getSignatureUrl())){
                 records1.setApprovalSignatureUrlFlag(1);
-                records1.setSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + records1.getSignatureUrl()));
                 //处理文件路径
+                //如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+                if(records1.getSignatureUrl().contains("/xg-qz")){
+                    if(StringUtils.isNotBlank(records1.getSignatureUrl())){
+                        String signatureUrl = records1.getSignatureUrl().replace("/xg-qz","");
+                        records1.setSignatureUrl(signatureUrl);
+                    }
+                    records1.setSignatureUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + records1.getSignatureUrl()));
+                }else{
+                    records1.setSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + records1.getSignatureUrl()));
+                }
             }else{
                 records1.setApprovalSignatureUrlFlag(0);
             }

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

@@ -152,6 +152,11 @@ public class RuralProjectSignatureCallBackController extends BaseController {
         projectReportData.setSignatureFlag(1);
         projectReportData.setSignatureContractId(presignCallBack.getContractId());
         projectReportData.setSignatureUploadDate(new Date());
+        //对文件回调路径进行处理并保存
+        if(StringUtils.isNotBlank(presignCallBack.getStoragePath())){
+            String signatureUrl = presignCallBack.getStoragePath().replace("oss:/","");
+            projectReportData.setSignatureUrl(signatureUrl);
+        }
         //修改签章对应信息文件
         projectReportDataService.updateSignatureInfo(projectReportData);
 
@@ -171,7 +176,9 @@ public class RuralProjectSignatureCallBackController extends BaseController {
     public String getSignatureCoordinates(PresignCallBack presignCallBack) {
         long t1 = System.currentTimeMillis();
         //根据contractId查询对应的报告信息
-        RuralProjectRecords records = projectRecordsService.getSignatureByDocumentId(presignCallBack.getDocumentId());
+        String[] documentIds = presignCallBack.getDocumentId().split(",");
+        //根据contractId查询对应的报告信息
+        RuralProjectRecords records = projectRecordsService.getSignatureByDocumentId(documentIds[0]);
         if(null == records){
             return null;
         }
@@ -231,9 +238,14 @@ public class RuralProjectSignatureCallBackController extends BaseController {
 
         //签章完成则进行数据的保存
         records.setReportSignatureFlag(1);
-        records.setReportSignatureDocumentId(presignCallBack.getDocumentId());
+        records.setReportSignatureDocumentId(documentIds[0]);
         records.setReportSignatureContractId(presignCallBack.getContractId());
         records.setReportSignatureUploadDate(new Date());
+        //对文件回调路径进行处理并保存
+        if(StringUtils.isNotBlank(presignCallBack.getStoragePath())){
+            String signatureUrl = presignCallBack.getStoragePath().replace("oss:/","");
+            records.setReportSignatureUrl(signatureUrl);
+        }
         //修改签章对应信息文件
         projectReportDataService.updateReportSignatureInfo(records);
 
@@ -301,8 +313,9 @@ public class RuralProjectSignatureCallBackController extends BaseController {
     @RequestMapping(value = "/getJudgementCoordinates", method=RequestMethod.POST)
     public String getJudgementCoordinates(PresignCallBack presignCallBack) {
         long t1 = System.currentTimeMillis();
+        String[] documentIds = presignCallBack.getDocumentId().split(",");
         //根据contractId查询对应的报告信息
-        RuralProjectRecords records = projectRecordsService.getJudgementSignatureByDocumentId(presignCallBack.getDocumentId());
+        RuralProjectRecords records = projectRecordsService.getJudgementSignatureByDocumentId(documentIds[0]);
         if(null == records){
             return null;
         }
@@ -344,7 +357,7 @@ public class RuralProjectSignatureCallBackController extends BaseController {
 
         //签章完成则进行数据的保存
         records.setQualitySignatureFlag(1);
-        records.setQualitySignatureDocumentId(presignCallBack.getDocumentId());
+        records.setQualitySignatureDocumentId(documentIds[0]);
         records.setQualitySignatureContractId(presignCallBack.getContractId());
         records.setQualitySignatureUploadDate(new Date());
         //修改签章对应信息文件

src/main/java/com/jeeplus/modules/statement/controller/StatementCompanyComprehensiveController.java

@@ -58,12 +58,12 @@ public class StatementCompanyComprehensiveController extends BaseController {
 
     //首页，展示所有公司级报表信息
     @RequestMapping(value = "list")
-    public String list(Model model){
+    public String list(Model model,String year,String bigDateType,String smallDateType){
 
         //这个会改，由它处传参
-        String year = "2022";//实际是他处传的参数  （0：年；1：季度；2：月份）
+        /*String year = "2022";//实际是他处传的参数  （0：年；1：季度；2：月份）
         String bigDateType = "2";//实际是他处传的参数  （0：年；1：季度；2：月份）
-        String smallDateType = "1";//实际是他处传的参数  （0：年；1：季度；2：月份）
+        String smallDateType = "1";//实际是他处传的参数  （0：年；1：季度；2：月份）*/
         String nyr = "";
         //根据传的参数：nyr进行匹配 方便传到前端显示
         switch (bigDateType){

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

@@ -172,6 +172,7 @@ public class WorkCalendarTaskService  {
      */
     //每个季度最后一天晚上23点推送
     //@Scheduled(cron= "0 0 23 28-31 3,6,9,12 ?")
+    //@Scheduled(cron= "0 0/2 * * * ?")
     public void getStatementCompanyComprehensiveOnQuarter() {
         final Calendar c = Calendar.getInstance();
         Integer month = c.get(Calendar.MONTH)+3; //第一个月从0开始，所以得到月份＋1

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

@@ -5,6 +5,7 @@ package com.jeeplus.modules.workprojectnotify.web;
 
 import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
+import com.jeeplus.common.oss.OSSClientUtil;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.MyBeanUtils;
@@ -245,6 +246,10 @@ import java.util.*;
 @RequestMapping(value = "${adminPath}/workprojectnotify/workProjectNotify")
 public class WorkProjectNotifyController extends BaseController {
 
+	/**
+	 * 阿里云文件服务器前缀
+	 */
+	private final static String aliyunUrl = Global.getConfig("aliyunUrl");
 	@Autowired
 	private WorkFullManageService workFullManageService;
 	@Autowired
@@ -1326,6 +1331,23 @@ public class WorkProjectNotifyController extends BaseController {
 							ruralProjectRecords.setProjectStatus(projectApprovalSignature.getStatus());
 							ruralProjectRecords.setProcessInstanceId(projectApprovalSignature.getProcessInstanceId());
 						}
+
+						if(StringUtils.isNotBlank(projectReportData.getSignatureUrl())){
+							ruralProjectRecords.setApprovalSignatureUrlFlag(1);
+							//处理文件路径
+							//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+							if(projectReportData.getSignatureUrl().contains("/xg-qz")){
+								if(StringUtils.isNotBlank(projectReportData.getSignatureUrl())){
+									String signatureUrl = projectReportData.getSignatureUrl().replace("/xg-qz","");
+									projectReportData.setSignatureUrl(signatureUrl);
+								}
+								ruralProjectRecords.setSignatureUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + projectReportData.getSignatureUrl()));
+							}else{
+								ruralProjectRecords.setSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + projectReportData.getSignatureUrl()));
+							}
+						}else{
+							ruralProjectRecords.setApprovalSignatureUrlFlag(0);
+						}
 					}
 					ruralProjectRecords.setAct(getByAct(ruralProjectRecords.getProcessInstanceId()));
 					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
@@ -1387,6 +1409,23 @@ public class WorkProjectNotifyController extends BaseController {
 							ruralProjectRecords.setProjectStatus(projectApprovalSignature.getStatus());
 							ruralProjectRecords.setProcessInstanceId(projectApprovalSignature.getProcessInstanceId());
 						}
+
+						if(StringUtils.isNotBlank(ruralProjectRecords.getReportSignatureUrl())){
+							ruralProjectRecords.setReportSignatureUrlFlag(1);
+							//处理文件路径
+							//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+							if(ruralProjectRecords.getReportSignatureUrl().contains("/xg-qz")){
+								if(StringUtils.isNotBlank(ruralProjectRecords.getReportSignatureUrl())){
+									String signatureUrl = ruralProjectRecords.getReportSignatureUrl().replace("/xg-qz","");
+									ruralProjectRecords.setReportSignatureUrl(signatureUrl);
+								}
+								ruralProjectRecords.setReportSignatureUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + ruralProjectRecords.getReportSignatureUrl()));
+							}else{
+								ruralProjectRecords.setReportSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + ruralProjectRecords.getReportSignatureUrl()));
+							}
+						}else{
+							ruralProjectRecords.setReportSignatureUrlFlag(0);
+						}
 					}
 					ruralProjectRecords.setAct(getByAct(ruralProjectRecords.getProcessInstanceId()));
 					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
@@ -5908,13 +5947,21 @@ public class WorkProjectNotifyController extends BaseController {
 							return "modules/processProjectReportRecord/projectReportRecordView";
 						}
 					}
+
+					long l1 = System.currentTimeMillis();
 					ProjectReportData projectReportData = projectReportDataService.getOnRural(projectReportRecord.getReport().getId());
 					projectReportRecord.setProjectReportData(projectReportData);
 					projectReportRecord.setReport(projectReportData);
 					Projectcontentinfo projectcontentinfo = projectcontentinfoService.getByInfoId(projectReportData.getId());
 					projectcontentinfo.setProjectReportData(projectReportData);
+					long l2 = System.currentTimeMillis();
+					System.out.println("==========第一个断点：" + (l2-l1));
 					//获取项目信息
-					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.getQueryProjectUsers(projectReportRecord.getReport().getProject().getId());
+					l1 = System.currentTimeMillis();
+					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.getNotifyQueryProjectUsers(projectReportRecord.getReport().getProject().getId());
+
+					l2 = System.currentTimeMillis();
+					System.out.println("==========获取项目信息：" + (l2-l1));
 					//获取复核标准
 					String reviewId="";
 					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
@@ -5926,11 +5973,19 @@ public class WorkProjectNotifyController extends BaseController {
 							reviewId="3";
 						}
 					}
+					l1 = System.currentTimeMillis();
 					List<WorkReviewAudit> workReviewAudits = projectContentDataService.findListReview(reviewId,"紧急项目");
 					model.addAttribute("list", workReviewAudits);
 
+					l2 = System.currentTimeMillis();
+					System.out.println("==========获取复核标准：" + (l2-l1));
+					l1 = System.currentTimeMillis();
 					//获取子项目列表信息
 					List<SubProjectInfo> subProjectInfos=this.queryReportDetails(ruralProjectRecords.getId());
+					l2 = System.currentTimeMillis();
+					System.out.println("==========获取子项目列表信息：" + (l2-l1));
+
+					l1 = System.currentTimeMillis();
 					//获取合同信息
 					WorkContractInfo workContractInfo=this.queryWorkContract(ruralProjectRecords.getId());
 					if(null != workContractInfo){
@@ -5946,6 +6001,8 @@ public class WorkProjectNotifyController extends BaseController {
 							projectReportRecord.setChargeCriterionList(chargeCriterionList);
 						}
 					}
+					l2 = System.currentTimeMillis();
+					System.out.println("==========获取合同信息：" + (l2-l1));
 
 					Act act = getByAct(projectReportRecord.getProcessInstanceId());
 					projectReportRecord.setAct(act);
@@ -5957,6 +6014,7 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 
 
+					l1 = System.currentTimeMillis();
 					WorkContractInfo projectContractInfo = ruralProjectMessageService.getProjectContractInfo(ruralProjectRecords.getWorkContractInfo().getId());
 					ruralProjectRecords.setWorkContractInfo(projectContractInfo);
 					MyBeanUtils.copyBeanNotNull2Bean(ruralProjectRecords,projectReportRecord.getReport().getProject());//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -6045,9 +6103,11 @@ public class WorkProjectNotifyController extends BaseController {
 							}
 
 						}
+					l2 = System.currentTimeMillis();
+					System.out.println("==========获取附件信息：" + (l2-l1));
 					projectReportRecord.setUploadMode(uploadMode);
 					//获取项目基础信息
-					ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
+					ruralProjectRecordsService.queryNotifyProjectDetail(ruralProjectRecords);
 					//工程咨询
 					List<MainDictDetail> mainDictList = Lists.newArrayList();
 					if("1".equals(ruralProjectRecords.getProjectType())){

src/main/resources/jeeplus.properties

@@ -155,6 +155,8 @@ accessKeySecret=84dDIx4edT1n78KUOqqSmDZ35pchJv
 bucketName=xgxm-test
 #\u751F\u4EA7\u73AF\u5883
 #bucketName=xg-ccpm
+#禰嫗bucketName
+qzBucketName=xg-qz
 avatarDir=app-img/avatar/
 notifyDir=app-img/notify/
 reportDir=app-img/report/

src/main/resources/mappings/modules/oa/OaNotifyDao.xml

@@ -122,7 +122,7 @@
 			AND (a.start_date <= #{nowDate} or a.start_date is null) AND (a.end_date >= #{nowDate} or a.end_date is null)
 		</if>
 
-		ORDER BY wo.id asc, a.update_date DESC
+		ORDER BY /*wo.id asc,*/ a.update_date DESC
 	</select>
 
 	<select id="findUnReadList" resultType="OaNotify">

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

@@ -888,10 +888,10 @@ END) as projectScale*/
 			<choose>
 				<when test="emergencyProject != null and emergencyProject != '' and emergencyProject == 1">
 					/*B类紧急*/
-					/*and a.emergency_project = 1*/ and (timestampdiff(day,prd.audit_pass_date,now()) &lt;#{endingCount} or prd.audit_pass_date is null)
+					/*and a.emergency_project = 1*/ and (timestampdiff(day,prd.audit_pass_date,now()) &lt;#{endingCount} or prd.audit_pass_date is null) and a.submit_money = 1
 				</when>
 				<otherwise>
-					and prdt.status = 5 and prdt.audit_pass_date is not null and (timestampdiff(day,prdt.audit_pass_date,now())&lt;#{endingCount} or prdt.audit_pass_date is null)
+					and prdt.status = 5 and prdt.audit_pass_date is not null and (timestampdiff(day,prdt.audit_pass_date,now())&lt;#{endingCount} or prdt.audit_pass_date is null) and a.submit_money = 2
 				</otherwise>
 			</choose>
 		</where>
@@ -924,10 +924,10 @@ END) as projectScale*/
 			<choose>
 				<when test="emergencyProject != null and emergencyProject != '' and emergencyProject == 1">
 					/*B类紧急*/
-					/*and a.emergency_project = 1*/ and timestampdiff(day,prd.audit_pass_date,prr.record_date) &lt; #{endingCount}
+					/*and a.emergency_project = 1*/ and timestampdiff(day,prd.audit_pass_date,prr.record_date) &lt; #{endingCount} and a.submit_money = 1
 				</when>
 				<otherwise>
-					and prdt.status = 5 and prdt.audit_pass_date is not null and timestampdiff(day,prdt.audit_pass_date,prr.record_date) &lt; #{endingCount}
+					and prdt.status = 5 and prdt.audit_pass_date is not null and timestampdiff(day,prdt.audit_pass_date,prr.record_date) &lt; #{endingCount} and a.submit_money = 2
 				</otherwise>
 			</choose>
 		</where>
@@ -958,10 +958,10 @@ END) as projectScale*/
 			<choose>
 				<when test="emergencyProject != null and emergencyProject != '' and emergencyProject == 1">
 				/*B类紧急*/
-					/*and a.emergency_project = 1*/ and timestampdiff(day,prd.audit_pass_date,now())>=#{endingCount}
+					/*and a.emergency_project = 1*/ and timestampdiff(day,prd.audit_pass_date,now())>=#{endingCount} and a.submit_money = 1
 				</when>
 				<otherwise>
-					and prdt.status = 5 and prdt.audit_pass_date is not null and timestampdiff(day,prdt.audit_pass_date,now())>=#{endingCount}
+					and prdt.status = 5 and prdt.audit_pass_date is not null and timestampdiff(day,prdt.audit_pass_date,now())>=#{endingCount} and a.submit_money = 2
 				</otherwise>
 			</choose>
 			<if test="beginDate !=null">
@@ -999,10 +999,10 @@ END) as projectScale*/
 			<choose>
 				<when test="emergencyProject != null and emergencyProject != '' and emergencyProject == 1">
 				/*B类紧急*/
-					/*and a.emergency_project = 1*/ and timestampdiff(day,prd.audit_pass_date,prr.record_date)>=#{endingCount}
+					/*and a.emergency_project = 1*/ and timestampdiff(day,prd.audit_pass_date,prr.record_date)>=#{endingCount} and a.submit_money = 1
 				</when>
 				<otherwise>
-					and prdt.status = 5 and prdt.audit_pass_date is not null and timestampdiff(day,prdt.audit_pass_date,prr.record_date)>=#{endingCount}
+					and prdt.status = 5 and prdt.audit_pass_date is not null and timestampdiff(day,prdt.audit_pass_date,prr.record_date)>=#{endingCount} and a.submit_money = 2
 				</otherwise>
 			</choose>
 			<if test="beginDate !=null">
@@ -1055,10 +1055,10 @@ END) as projectScale*/
 			<choose>
 				<when test="emergencyProject != null and emergencyProject != '' and emergencyProject == 1">
 					/*B类紧急*/
-					/*and a.emergency_project = 1*/ and (timestampdiff(day,prd.audit_pass_date,now()) &lt;#{endingCount} or prd.audit_pass_date is null)
+					/*and a.emergency_project = 1*/ and (timestampdiff(day,prd.audit_pass_date,now()) &lt;#{endingCount} or prd.audit_pass_date is null) and a.submit_money = 1
 				</when>
 				<otherwise>
-					and prdt.status = 5 and prdt.audit_pass_date is not null and (timestampdiff(day,prdt.audit_pass_date,now())&lt;#{endingCount} or prdt.audit_pass_date is null)
+					and prdt.status = 5 and prdt.audit_pass_date is not null and (timestampdiff(day,prdt.audit_pass_date,now())&lt;#{endingCount} or prdt.audit_pass_date is null) and a.submit_money = 2
 				</otherwise>
 			</choose>
 		</where>
@@ -1095,12 +1095,12 @@ END) as projectScale*/
 					/*B类紧急*/
 					/*and a.emergency_project = 1*/ and timestampdiff(day,prd.audit_pass_date,(select create_date from work_activity_process wap where wap.process_instance_id = rprr.process_instance_id
 					order by create_date
-					limit 1))&lt;#{endingCount}
+					limit 1))&lt;#{endingCount} and a.submit_money = 1
 				</when>
 				<otherwise>
 					and prdt.status = 5 and prdt.audit_pass_date is not null and timestampdiff(day,prdt.audit_pass_date,(select create_date from work_activity_process wap where wap.process_instance_id = rprr.process_instance_id
 					order by create_date
-					limit 1))&lt;#{endingCount}
+					limit 1))&lt;#{endingCount} and a.submit_money = 2
 				</otherwise>
 			</choose>
 		</where>
@@ -1134,10 +1134,10 @@ END) as projectScale*/
 			<choose>
 				<when test="emergencyProject != null and emergencyProject != '' and emergencyProject == 1">
 					/*B类紧急*/
-					/*and a.emergency_project = 1*/ and timestampdiff(day,prd.audit_pass_date,now())>=#{endingCount}
+					/*and a.emergency_project = 1*/ and timestampdiff(day,prd.audit_pass_date,now())>=#{endingCount} and a.submit_money = 1
 				</when>
 				<otherwise>
-					and prdt.status = 5 and prdt.audit_pass_date is not null and timestampdiff(day,prdt.audit_pass_date,now())>=#{endingCount}
+					and prdt.status = 5 and prdt.audit_pass_date is not null and timestampdiff(day,prdt.audit_pass_date,now())>=#{endingCount} and a.submit_money = 2
 				</otherwise>
 			</choose>
 			<if test="beginDate !=null">
@@ -1184,12 +1184,12 @@ END) as projectScale*/
 					/*B类紧急*/
 					/*and a.emergency_project = 1*/ and timestampdiff(day,prd.audit_pass_date,(select create_date from work_activity_process wap where wap.process_instance_id = rprr.process_instance_id
 					order by create_date
-					limit 1))>=#{endingCount}
+					limit 1))>=#{endingCount} and a.submit_money = 1
 				</when>
 				<otherwise>
 					and prdt.status = 5 and prdt.audit_pass_date is not null and timestampdiff(day,prdt.audit_pass_date,(select create_date from work_activity_process wap where wap.process_instance_id = rprr.process_instance_id
 					order by create_date
-					limit 1))>=#{endingCount}
+					limit 1))>=#{endingCount} and a.submit_money = 2
 				</otherwise>
 			</choose>
 			<if test="beginDate !=null">
@@ -1237,12 +1237,12 @@ END) as projectScale*/
 					/*B类紧急*/
 					/*and a.emergency_project = 1*/ and timestampdiff(day,prd.audit_pass_date,(select create_date from work_activity_process wap where wap.process_instance_id = rprr.process_instance_id
 					order by create_date
-					limit 1))>=#{endingCount}
+					limit 1))>=#{endingCount} and a.submit_money = 1
 				</when>
 				<otherwise>
 					and prdt.status = 5 and prdt.audit_pass_date is not null and timestampdiff(day,prdt.audit_pass_date,(select create_date from work_activity_process wap where wap.process_instance_id = rprr.process_instance_id
 					order by create_date
-					limit 1))>=#{endingCount}
+					limit 1))>=#{endingCount} and a.submit_money = 2
 				</otherwise>
 			</choose>
 			<if test="beginDate !=null">

src/main/resources/spring-context-jedis.xml

@@ -20,8 +20,8 @@
 		<constructor-arg index="0" ref="jedisPoolConfig" />
 		<constructor-arg index="1" value="${redis.host}" />
 		<constructor-arg index="2" value="${redis.port}" type="int" />
-		<!--<constructor-arg index="3" value="${redis.timeout}" type="int" />
-		<constructor-arg index="4" value="${redis.password}" />-->
+		<constructor-arg index="3" value="${redis.timeout}" type="int" />
+		<constructor-arg index="4" value="${redis.password}" />
 	</bean>
 
 </beans>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalView.jsp

@@ -1211,7 +1211,14 @@
                                     <div class="op-btn-box" >
                                         <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                         <c:if test="${not empty projectRecords.signatureContractId}">
-                                            <a href="javascript:location.href='${ctx}/ruralProject/signatureCallBack/downLoadAttach?contractId='+'${projectRecords.signatureContractId}'" class="op-btn  op-btn-download layui-bg-orange">审定单签章下载</a>
+                                            <c:choose>
+                                                <c:when test="${projectRecords.approvalSignatureUrlFlag == 1}">
+                                                    <a href="${projectRecords.signatureUrl}" class="op-btn  op-btn-download layui-bg-orange">审定单签章下载</a>
+                                                </c:when>
+                                                <c:otherwise>
+                                                    <a href="javascript:location.href='${ctx}/ruralProject/signatureCallBack/downLoadAttach?contractId='+'${projectRecords.signatureContractId}'" class="op-btn  op-btn-download layui-bg-orange">审定单签章下载</a>
+                                                </c:otherwise>
+                                            </c:choose>
                                         </c:if>
 
                                             <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureView.jsp

@@ -1215,7 +1215,15 @@
                                         <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                         <c:if test="${status.index == 0}">
                                             <c:if test="${not empty projectRecords.reportSignatureContractId}">
-                                                <a href="javascript:location.href='${ctx}/ruralProject/signatureCallBack/downLoadReportAttach?contractId='+'${projectRecords.reportSignatureContractId}'" class="op-btn  op-btn-download layui-bg-orange">报告签章下载</a>
+
+                                                <c:choose>
+                                                    <c:when test="${projectRecords.reportSignatureUrlFlag == 1}">
+                                                        <a href="${projectRecords.reportSignatureUrl}" class="op-btn  op-btn-download layui-bg-orange">报告签章下载</a>
+                                                    </c:when>
+                                                    <c:otherwise>
+                                                        <a href="javascript:location.href='${ctx}/ruralProject/signatureCallBack/downLoadReportAttach?contractId='+'${projectRecords.reportSignatureContractId}'" class="op-btn  op-btn-download layui-bg-orange">报告签章下载</a>
+                                                    </c:otherwise>
+                                                </c:choose>
                                             </c:if>
                                         </c:if>