合同添加是否上传审定单查询功能。

苏州上报下载文件名称添加报告号信息

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

@@ -4534,7 +4534,12 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         signatureContract.setSend(true);
         signatureContract.setSignatories(signatories);
         signatureContract.setSn("");
-        signatureContract.setSubject(ruralProjectRecords.getProjectName());//添加项目名称
+        ProjectReportData reportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
+        if(null != reportData && StringUtils.isNotBlank(reportData.getNumber())){
+            signatureContract.setSubject(reportData.getNumber() + "。" + ruralProjectRecords.getProjectName());//添加项目名称
+        }else{
+            signatureContract.setSubject(ruralProjectRecords.getProjectName());//添加项目名称
+        }
         net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(signatureContract);
         String contractIdMapStr = SignaturePostUtil.sendPostApplicationJson(HTTPTOP + "/contract/createbycategory", json.toString());
         hashMap = JSON.parseObject(contractIdMapStr, HashMap.class);
@@ -5023,7 +5028,12 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         signatureContract.setSend(true);
         signatureContract.setSignatories(signatories);
         signatureContract.setSn("");
-        signatureContract.setSubject(ruralProjectRecords.getProjectName());//添加项目名称
+        ProjectReportData reportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
+        if(null != reportData && StringUtils.isNotBlank(reportData.getNumber())){
+            signatureContract.setSubject(reportData.getNumber() + "。" + ruralProjectRecords.getProjectName());//添加项目名称
+        }else{
+            signatureContract.setSubject(ruralProjectRecords.getProjectName());//添加项目名称
+        }
         net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(signatureContract);
         String contractIdMapStr = SignaturePostUtil.sendPostApplicationJson(HTTPTOP + "/contract/createbycategory", json.toString());
         hashMap = JSON.parseObject(contractIdMapStr, HashMap.class);
@@ -5149,7 +5159,12 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         signatureContract.setSend(true);
         signatureContract.setSignatories(signatories);
         signatureContract.setSn("");
-        signatureContract.setSubject(ruralProjectRecords.getProjectName());//添加项目名称
+        ProjectReportData reportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
+        if(null != reportData && StringUtils.isNotBlank(reportData.getNumber())){
+            signatureContract.setSubject(reportData.getNumber() + "。" + ruralProjectRecords.getProjectName());//添加项目名称
+        }else{
+            signatureContract.setSubject(ruralProjectRecords.getProjectName());//添加项目名称
+        }
         net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(signatureContract);
         String contractIdMapStr = SignaturePostUtil.sendPostApplicationJson(HTTPTOP + "/contract/createbycategory", json.toString());
         hashMap = JSON.parseObject(contractIdMapStr, HashMap.class);
@@ -5295,7 +5310,12 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         signatureContract.setSend(true);
         signatureContract.setSignatories(signatories);
         signatureContract.setSn("");
-        signatureContract.setSubject(ruralProjectRecords.getProjectName());//添加项目名称
+        ProjectReportData reportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
+        if(null != reportData && StringUtils.isNotBlank(reportData.getNumber())){
+            signatureContract.setSubject(reportData.getNumber() + "。" + ruralProjectRecords.getProjectName());//添加项目名称
+        }else{
+            signatureContract.setSubject(ruralProjectRecords.getProjectName());//添加项目名称
+        }
         net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(signatureContract);
         String contractIdMapStr = SignaturePostUtil.sendPostApplicationJson(HTTPTOP + "/contract/createbycategory", json.toString());
         hashMap = JSON.parseObject(contractIdMapStr, HashMap.class);
@@ -5423,7 +5443,12 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         signatureContract.setSend(true);
         signatureContract.setSignatories(signatories);
         signatureContract.setSn("");
-        signatureContract.setSubject(ruralProjectRecords.getProjectName());//添加项目名称
+        ProjectReportData reportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
+        if(null != reportData && StringUtils.isNotBlank(reportData.getNumber())){
+            signatureContract.setSubject(reportData.getNumber() + "。" + ruralProjectRecords.getProjectName());//添加项目名称
+        }else{
+            signatureContract.setSubject(ruralProjectRecords.getProjectName());//添加项目名称
+        }
         net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(signatureContract);
         String contractIdMapStr = SignaturePostUtil.sendPostApplicationJson(HTTPTOP + "/contract/createbycategory", json.toString());
         hashMap = JSON.parseObject(contractIdMapStr, HashMap.class);
@@ -6016,7 +6041,12 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         signatureContract.setSend(true);
         signatureContract.setSignatories(signatories);
         signatureContract.setSn("");
-        signatureContract.setSubject(ruralProjectRecords.getProjectName());//添加项目名称
+        ProjectReportData reportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
+        if(null != reportData && StringUtils.isNotBlank(reportData.getNumber())){
+            signatureContract.setSubject(reportData.getNumber() + "。" + ruralProjectRecords.getProjectName());//添加项目名称
+        }else{
+            signatureContract.setSubject(ruralProjectRecords.getProjectName());//添加项目名称
+        }
         net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(signatureContract);
         String contractIdMapStr = SignaturePostUtil.sendPostApplicationJson(HTTPTOP + "/contract/createbycategory", json.toString());
         hashMap = JSON.parseObject(contractIdMapStr, HashMap.class);
@@ -6319,7 +6349,12 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         signatureContract.setSend(true);
         signatureContract.setSignatories(signatories);
         signatureContract.setSn("");
-        signatureContract.setSubject(ruralProjectRecords.getProjectName());//添加项目名称
+        ProjectReportData reportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
+        if(null != reportData && StringUtils.isNotBlank(reportData.getNumber())){
+            signatureContract.setSubject(reportData.getNumber() + "。" + ruralProjectRecords.getProjectName());//添加项目名称
+        }else{
+            signatureContract.setSubject(ruralProjectRecords.getProjectName());//添加项目名称
+        }
         net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(signatureContract);
         String contractIdMapStr = SignaturePostUtil.sendPostApplicationJson(HTTPTOP + "/contract/createbycategory", json.toString());
         hashMap = JSON.parseObject(contractIdMapStr, HashMap.class);

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

@@ -3543,6 +3543,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				reportData.setStatus("1");
 				projectReportDataDao.updateStatus(reportData);
 			}
+			//删除原质量复核咨询员信息
+			projectcontentinfoDao.deleteConsultant(ruralProjectRecords.getId());
 		}
 		ProjectReportDataTwo projectReportDataTwo=projectReportDataTwoDao.getProjectReportDataTwoByProjectId(ruralProjectRecords.getId());
 		if (null != projectReportDataTwo){

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

@@ -1952,6 +1952,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
                 addMessage(redirectAttributes, "重新申请失败：上报管理员已关闭上报功能");
                 if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
                     return "redirect:" + Global.getAdminPath() + "/home/?repage";
+                }else if (StringUtils.isNotBlank(reported.getHome()) && "notifyList".equals(reported.getHome())){
+                    return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
                 }else {
                     return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
                 }

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -168,6 +168,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private String createNameStr;   //创建人
 	private String createOffice;   //创建人部门
 	private String createId;     //创建人id
+	private String letterOfAcceptanceFlag;     //是否上传审定单
 
 	public String getBeginInvestmentAmount() {
 		return beginInvestmentAmount;
@@ -1245,4 +1246,12 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setWorkAttachmentLetterOfAcceptances(List<WorkClientAttachment> workAttachmentLetterOfAcceptances) {
 		this.workAttachmentLetterOfAcceptances = workAttachmentLetterOfAcceptances;
 	}
+
+	public String getLetterOfAcceptanceFlag() {
+		return letterOfAcceptanceFlag;
+	}
+
+	public void setLetterOfAcceptanceFlag(String letterOfAcceptanceFlag) {
+		this.letterOfAcceptanceFlag = letterOfAcceptanceFlag;
+	}
 }

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -241,6 +241,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			workContractInfo.setUploadMode(uploadMode);
 			//数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
 			workattachmentService.clientAttachmentManageOnUrl(workContractInfo.getWorkAttachments());
+			workattachmentService.clientAttachmentManageOnUrl(workContractInfo.getWorkAttachmentLetterOfAcceptances());
 		}
 		return workContractInfo;
 	}

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -207,7 +207,7 @@
 
 	<select id="findList" resultType="WorkContractInfo" >
 		SELECT
-		a.id AS "id",
+		distinct a.id AS "id",
 		u.name AS "createBy.name",
 		u.name AS "createUser",
 		a.create_by AS "createBy.id",
@@ -277,6 +277,7 @@
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		left join work_contract_record wcr on wcr.contract_info_id = a.id
+		left join work_attachment wa on wa.attachment_id = a.id
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL} and (a.alter_state is null or a.alter_state ="")
 			<if test="id != null and id != ''">
@@ -324,6 +325,12 @@
 			<if test="isTotal != null and isTotal != ''">
 				AND a.is_total = #{isTotal}
 			</if>
+			<if test="letterOfAcceptanceFlag != null and letterOfAcceptanceFlag != '' and letterOfAcceptanceFlag == 1">
+				AND wa.attachment_flag = 45
+			</if>
+			<if test="letterOfAcceptanceFlag != null and letterOfAcceptanceFlag != '' and letterOfAcceptanceFlag == 0">
+				AND a.id  NOT IN ( SELECT DISTINCT aa.id FROM work_contract_info aa LEFT JOIN work_attachment waa ON aa.id = waa.attachment_id where waa.attachment_flag = 45 )
+			</if>
 			<if test="contrractRecordStatus != null and contrractRecordStatus != ''">
 				<choose>
 					<when test="contrractRecordStatus == 0">
@@ -351,9 +358,10 @@
 
 
 	<select id="queryCount" resultType="int" >
-		SELECT count(1)
+		SELECT count(distinct a.id)
 		FROM work_contract_info a
 		LEFT JOIN sys_user u on u.id = a.create_by
+		left join work_attachment wa on wa.attachment_id = a.id
 		<if test="client != null and client.name != null and client.name != ''">
 			LEFT JOIN work_client_info client ON client.id = a.client_id
 		</if>
@@ -401,6 +409,12 @@
 			<if test="isTotal != null and isTotal != ''">
 				AND a.is_total = #{isTotal}
 			</if>
+			<if test="letterOfAcceptanceFlag != null and letterOfAcceptanceFlag != '' and letterOfAcceptanceFlag == 1">
+				AND wa.attachment_flag = 45
+			</if>
+			<if test="letterOfAcceptanceFlag != null and letterOfAcceptanceFlag != '' and letterOfAcceptanceFlag == 0">
+				AND a.id  NOT IN ( SELECT DISTINCT aa.id FROM work_contract_info aa LEFT JOIN work_attachment waa ON aa.id = waa.attachment_id where waa.attachment_flag = 45 )
+			</if>
 			<if test="contrractRecordStatus != null and contrractRecordStatus != ''">
 				<choose>
 					<when test="contrractRecordStatus == 0">

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

@@ -617,6 +617,15 @@
 															  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 						</div>
 					</div>
+					<div class="layui-item query athird">
+						<label class="layui-form-label">审定单上传：</label>
+						<div class="layui-input-block">
+							<form:select path="letterOfAcceptanceFlag" class="form-control layui-input">
+								<form:option value="" label=""/>
+								<form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
 				</div>
 				</form:form>
 			</div>

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

@@ -622,6 +622,15 @@
 															  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 						</div>
 					</div>
+					<div class="layui-item query athird">
+						<label class="layui-form-label">是否上传审定单：</label>
+						<div class="layui-input-block">
+							<form:select path="letterOfAcceptanceFlag" class="form-control layui-input">
+								<form:option value="" label=""/>
+								<form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
 				</div>
 				</form:form>
 			</div>