合同中标通知书功能调整

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

@@ -169,6 +169,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private String createOffice;   //创建人部门
 	private String createId;     //创建人id
 	private String letterOfAcceptanceFlag;     //是否上传审定单
+	private String letterOfAcceptanceRemarks;     //中标通知书描述说明
 
 	public String getBeginInvestmentAmount() {
 		return beginInvestmentAmount;
@@ -1254,4 +1255,12 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setLetterOfAcceptanceFlag(String letterOfAcceptanceFlag) {
 		this.letterOfAcceptanceFlag = letterOfAcceptanceFlag;
 	}
+
+	public String getLetterOfAcceptanceRemarks() {
+		return letterOfAcceptanceRemarks;
+	}
+
+	public void setLetterOfAcceptanceRemarks(String letterOfAcceptanceRemarks) {
+		this.letterOfAcceptanceRemarks = letterOfAcceptanceRemarks;
+	}
 }

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

@@ -65,7 +65,8 @@
 		a.contract_information AS "contractInformation",
 		a.describe_content AS "describeContent",
 		a.contract_record_state AS "contractRecordState",
-		a.over_due_status AS "overDueStatus"
+		a.over_due_status AS "overDueStatus",
+		a.letter_of_acceptance_remarks AS "letterOfAcceptanceRemarks"
 	</sql>
 
 	<sql id="workContractInfoJoins">
@@ -143,7 +144,8 @@
 		wcr.file_num_tow as "fileNumTow",
 		a.describe_content AS "describeContent",
 		a.contract_record_state AS "contractRecordState",
-		a.over_due_status AS "overDueStatus"
+		a.over_due_status AS "overDueStatus",
+		a.letter_of_acceptance_remarks AS "letterOfAcceptanceRemarks"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		LEFT JOIN work_contract_record wcr ON wcr.contract_info_id = a.id
@@ -265,6 +267,7 @@
 		a.charge_criterion as "chargeCriterion",
 		a.other_details as "otherDetails",
 		a.contract_information AS "contractInformation",
+		a.letter_of_acceptance_remarks AS "letterOfAcceptanceRemarks",
 		(CASE a.contract_information
 		WHEN '0' THEN '金额合同'
 		WHEN '1' THEN '费率合同'
@@ -325,11 +328,27 @@
 			<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 test="letterOfAcceptanceFlag != null and letterOfAcceptanceFlag != ''">
+				<if test="letterOfAcceptanceFlag == 1">
+					AND wa.attachment_flag = 45
+				</if>
+				<if test="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="letterOfAcceptanceFlag == 2">
+					AND wa.attachment_flag = 45 and (a.letter_of_acceptance_remarks is null or a.letter_of_acceptance_remarks = '')
+				</if>
+				<if test="letterOfAcceptanceFlag == 3">
+					AND wa.attachment_flag = 45 and a.letter_of_acceptance_remarks is not null and a.letter_of_acceptance_remarks != ''
+				</if>
+				<if test="letterOfAcceptanceFlag == 4">
+					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 )
+					and (a.letter_of_acceptance_remarks is null or a.letter_of_acceptance_remarks = '')
+				</if>
+				<if test="letterOfAcceptanceFlag == 5">
+					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 )
+					and a.letter_of_acceptance_remarks is not null and a.letter_of_acceptance_remarks != ''
+				</if>
 			</if>
 			<if test="contrractRecordStatus != null and contrractRecordStatus != ''">
 				<choose>
@@ -409,11 +428,27 @@
 			<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 test="letterOfAcceptanceFlag != null and letterOfAcceptanceFlag != ''">
+				<if test="letterOfAcceptanceFlag == 1">
+					AND wa.attachment_flag = 45
+				</if>
+				<if test="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="letterOfAcceptanceFlag == 2">
+					AND wa.attachment_flag = 45 and (a.letter_of_acceptance_remarks is null or a.letter_of_acceptance_remarks = '')
+				</if>
+				<if test="letterOfAcceptanceFlag == 3">
+					AND wa.attachment_flag = 45 and a.letter_of_acceptance_remarks is not null and a.letter_of_acceptance_remarks != ''
+				</if>
+				<if test="letterOfAcceptanceFlag == 4">
+					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 )
+					and (a.letter_of_acceptance_remarks is null or a.letter_of_acceptance_remarks = '')
+				</if>
+				<if test="letterOfAcceptanceFlag == 5">
+					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 )
+					and a.letter_of_acceptance_remarks is not null and a.letter_of_acceptance_remarks != ''
+				</if>
 			</if>
 			<if test="contrractRecordStatus != null and contrractRecordStatus != ''">
 				<choose>
@@ -1083,6 +1118,9 @@
 			<if test="contractRecordState != null and contractRecordState!= ''">
 				,contract_record_state = #{contractRecordState}
 			</if>
+			<if test="letterOfAcceptanceRemarks != null and letterOfAcceptanceRemarks!= ''">
+				,letter_of_acceptance_remarks = #{letterOfAcceptanceRemarks}
+			</if>
 		WHERE id = #{id}
 	</update>
 

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -999,7 +999,7 @@
 				if(d.projectReportStatusTwo == 5){
 					if(d.submitMoney == "2"){
 						/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
-						if(d.paperFilingStatus == 0){
+						if(d.paperFilingStatus == 0 || d.paperFilingStatus == 6){
 							xml+="<a href=\"#\" onclick=\"openDialogre('新增纸质归档信息', '${ctx}/paperFiling/paperFiling/form?projectId=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 纸质归档</a>";
 						}
 						if(d.paperFilingStatus == 2){
@@ -1030,7 +1030,7 @@
 			if ('0'!=d.projectReportStatus && '1'!=d.projectReportStatus){
 				xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralCostProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
 			}
-			if(d.paperFilingStatus == 5){
+			if(d.paperFilingStatus == 5 || d.paperFilingStatus == 7){
 				xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?id=" + d.ppfId + "&projectId=" + d.id +" ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改纸质归档</a>";
 			}
 			if(d.projectReportStatus == 5 || d.projectReportStatus == 7){
@@ -1294,7 +1294,7 @@
 		table.on('tool(test)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
 			var data = obj.data //获得当前行数据
 					, layEvent = obj.event; //获得 lay-event 对应的值
-			if (layEvent === 'more' && (data.falg == 1 || ('0'!=data.projectReportStatus && '1'!=data.projectReportStatus) || data.paperFilingStatus == 5 || data.projectReportStatus == 5 || data.submitMoney==1 || data.reportedState == 5 || data.reportedState == 7) ){
+			if (layEvent === 'more' && (data.falg == 1 || ('0'!=data.projectReportStatus && '1'!=data.projectReportStatus) || data.paperFilingStatus == 5 || data.paperFilingStatus == 7 || data.projectReportStatus == 5 || data.submitMoney==1 || data.reportedState == 5 || data.reportedState == 7) ){
 				//下拉菜单
 				dropdown.render({
 					elem: this //触发事件的 DOM 对象

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -1323,7 +1323,7 @@
 							if(d.projectReportStatusTwo == 5){
 								if(d.submitMoney == "2"){
 									/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
-									if(d.paperFilingStatus == 0){
+									if(d.paperFilingStatus == 0 || d.paperFilingStatus == 6){
 										xml+="<a href=\"#\" onclick=\"openDialogre('新增纸质归档信息', '${ctx}/paperFiling/paperFiling/form?projectId=" + d.id +"&view=filing','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 纸质归档</a>";
 									}
 									if(d.paperFilingStatus == 2){
@@ -1355,7 +1355,7 @@
 						if ('0'!=d.projectReportStatus && '6'!=d.projectReportStatus && '1'!=d.projectReportStatus){
 							xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改质量复核</a>";
 						}
-						if(d.paperFilingStatus == 5){
+						if(d.paperFilingStatus == 5 || d.paperFilingStatus == 7){
 							xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?id=" + d.ppfId + "&projectId=" + d.id +"&view=filing ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改纸质归档</a>";
 						}
 						//项目升级按钮

src/main/webapp/webpage/modules/workcontractinfo/newWorkContract/workContractAudit.jsp

@@ -351,7 +351,7 @@
                             </div>
 
                             <div class="form-group layui-row">
-                                <div class="form-group-label"><h2>中标通知书信息</h2><span style="color: red;">注：有中标通知书必填，否则无法纸质归档。</span></div>
+                                <div class="form-group-label"><h2>中标通知书信息</h2><%--<span style="color: red;">注：有中标通知书必填，否则无法纸质归档。</span>--%></div>
                                 <div class="layui-item layui-col-xs12 form-table-container" >
                                     <table id="contentTable" class="table table-bordered table-condensed no-bottom-margin details">
                                         <thead>

src/main/webapp/webpage/modules/workcontractinfo/newWorkContract/workContractInfoFormAdd.jsp

@@ -1048,7 +1048,7 @@
 
 
 						<div class="form-group layui-row">
-							<div class="form-group-label"><h2>中标通知书信息</h2><span style="color: red;">注：有中标通知书必填，否则无法纸质归档。</span></div>
+							<div class="form-group-label"><h2>中标通知书信息</h2><%--<span style="color: red;">注：有中标通知书必填，否则无法纸质归档。</span>--%></div>
 							<div class="layui-item nav-btns">
 								<a id="attachment_btn_letterOfAcceptance" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
 								<sys:collectSelectTwo  id="linkmanLetterOfAcceptance" url="${ctx}/workclientinfo/workClientInfo/linkmanList"

src/main/webapp/webpage/modules/workcontractinfo/newWorkContract/workContractInfoFormEdit.jsp

@@ -1004,7 +1004,7 @@
 				</div>
 
 					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>中标通知书信息</h2><span style="color: red;">注：有中标通知书必填，否则无法纸质归档。</span></div>
+						<div class="form-group-label"><h2>中标通知书信息</h2><%--<span style="color: red;">注：有中标通知书必填，否则无法纸质归档。</span>--%></div>
 						<div class="layui-item nav-btns">
 							<a id="attachment_btn_letterOfAcceptance" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
 							<sys:collectSelectTwo  id="linkmanLetterOfAcceptance" url="${ctx}/workclientinfo/workClientInfo/linkmanList"

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

@@ -991,7 +991,7 @@
 						</div>
 
 						<div class="form-group layui-row">
-							<div class="form-group-label"><h2>中标通知书信息</h2><span style="color: red;">注：有中标通知书必填，否则无法纸质归档。</span></div>
+							<div class="form-group-label"><h2>中标通知书信息</h2><%--<span style="color: red;">注：有中标通知书必填，否则无法纸质归档。</span>--%></div>
 							<div class="layui-item nav-btns">
 								<a id="attachment_btn_letterOfAcceptance" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
 								<sys:collectSelectTwo  id="linkmanLetterOfAcceptance" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
@@ -1177,6 +1177,16 @@
 									</tbody>
 								</table>
 							</div>
+
+
+							<shiro:hasPermission name="workcontractinfo:workContractInfo:adminDel">
+								<div class="layui-item layui-col-sm12 with-textarea">
+									<label class="layui-form-label double-line">中标通知书描述说明：</label>
+									<div class="layui-input-block">
+										<form:textarea path="letterOfAcceptanceRemarks" id="letterOfAcceptanceRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+									</div>
+								</div>
+							</shiro:hasPermission>
 						</div>
 
 						<div class="form-group layui-row page-end"></div>

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

@@ -618,11 +618,16 @@
 						</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">
+						<label class="layui-form-label">中标通知书：</label>
+						<div class="layui-input-block with-icon">
+							<form:select path="letterOfAcceptanceFlag" class="form-control simple-select">
 								<form:option value="" label=""/>
-								<form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								<form:option value="1" label="已上传"/>
+								<form:option value="0" label="未上传"/>
+								<form:option value="2" label="已上传未描述"/>
+								<form:option value="3" label="已上传已描述"/>
+								<form:option value="4" label="未上传未描述"/>
+								<form:option value="5" label="未上传已描述"/>
 							</form:select>
 						</div>
 					</div>

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

@@ -1003,7 +1003,7 @@
 				</div>
 
 					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>中标通知书信息</h2><span style="color: red;">注：有中标通知书必填，否则无法纸质归档。</span></div>
+						<div class="form-group-label"><h2>中标通知书信息</h2><%--<span style="color: red;">注：有中标通知书必填，否则无法纸质归档。</span>--%></div>
 						<div class="layui-item nav-btns">
 							<a id="attachment_btn_letterOfAcceptance" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
 							<sys:collectSelectTwo  id="linkmanLetterOfAcceptance" url="${ctx}/workclientinfo/workClientInfo/linkmanList"

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

@@ -623,11 +623,16 @@
 						</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">
+						<label class="layui-form-label">中标通知书：</label>
+						<div class="layui-input-block with-icon">
+							<form:select path="letterOfAcceptanceFlag" class="form-control simple-select">
 								<form:option value="" label=""/>
-								<form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+								<form:option value="1" label="已上传"/>
+								<form:option value="0" label="未上传"/>
+								<form:option value="2" label="已上传未描述"/>
+								<form:option value="3" label="已上传已描述"/>
+								<form:option value="4" label="未上传未描述"/>
+								<form:option value="5" label="未上传已描述"/>
 							</form:select>
 						</div>
 					</div>

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

@@ -579,7 +579,7 @@
 					</div>
 
 					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>中标通知书信息</h2><span style="color: red;">注：有中标通知书必填，否则无法纸质归档。</span></div>
+						<div class="form-group-label"><h2>中标通知书信息</h2><%--<span style="color: red;">注：有中标通知书必填，否则无法纸质归档。</span>--%></div>
 						<div class="layui-item layui-col-xs12 form-table-container" >
 							<table id="contentTable" class="table table-bordered table-condensed no-bottom-margin details">
 								<thead>
@@ -781,6 +781,15 @@
 								</tbody>
 							</table>
 						</div>
+
+
+						<div class="layui-item layui-col-sm12 with-textarea" style="margin-top: 10px;">
+							<label class="layui-form-label double-line">中标通知书描述说明：</label>
+							<div class="layui-input-block">
+								<form:textarea path="letterOfAcceptanceRemarks" id="letterOfAcceptanceRemarks" readonly="true" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+							</div>
+						</div>
+
 					</div>
 				</div>