合同添加合同规模和项目负责人信息

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

@@ -188,6 +188,14 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private String isProject;     //是否关联项目（0：否；1：是）
 	private String createUserMobile;
 
+	private String contractScale;	//合同规模
+
+	private String projectLeaderIds;	//项目负责人
+
+	private String leaderNameStr;
+
+	private String projectMasterId;		//项目负责人id
+
 	private Office office;
 
 	public Office getOffice() {
@@ -1402,4 +1410,36 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setIsProject(String isProject) {
 		this.isProject = isProject;
 	}
+
+	public String getContractScale() {
+		return contractScale;
+	}
+
+	public void setContractScale(String contractScale) {
+		this.contractScale = contractScale;
+	}
+
+	public String getProjectLeaderIds() {
+		return projectLeaderIds;
+	}
+
+	public void setProjectLeaderIds(String projectLeaderIds) {
+		this.projectLeaderIds = projectLeaderIds;
+	}
+
+	public String getProjectMasterId() {
+		return projectMasterId;
+	}
+
+	public void setProjectMasterId(String projectMasterId) {
+		this.projectMasterId = projectMasterId;
+	}
+
+	public String getLeaderNameStr() {
+		return leaderNameStr;
+	}
+
+	public void setLeaderNameStr(String leaderNameStr) {
+		this.leaderNameStr = leaderNameStr;
+	}
 }

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

@@ -66,7 +66,9 @@
 		a.describe_content AS "describeContent",
 		a.contract_record_state AS "contractRecordState",
 		a.over_due_status AS "overDueStatus",
-		a.letter_of_acceptance_remarks AS "letterOfAcceptanceRemarks"
+		a.letter_of_acceptance_remarks AS "letterOfAcceptanceRemarks",
+		a.contract_scale AS "contractScale",
+		a.project_leader_ids AS "projectLeaderIds"
 	</sql>
 
 	<sql id="workContractInfoJoins">
@@ -145,10 +147,14 @@
 		a.describe_content AS "describeContent",
 		a.contract_record_state AS "contractRecordState",
 		a.over_due_status AS "overDueStatus",
-		a.letter_of_acceptance_remarks AS "letterOfAcceptanceRemarks"
+		a.letter_of_acceptance_remarks AS "letterOfAcceptanceRemarks",
+		a.contract_scale AS "contractScale",
+		a.project_leader_ids AS "projectLeaderIds",
+		pu.name AS "leaderNameStr"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		LEFT JOIN work_contract_record wcr ON wcr.contract_info_id = a.id
+		LEFT JOIN sys_user pu on pu.id = a.project_leader_ids
 		WHERE a.id = #{id}
 	</select>
 
@@ -276,7 +282,9 @@
 		ifnull(wcr.file_num,"") as "recordNum",
 		wcr.id as "contrractRecordId",
 		a.describe_content AS "describeContent",
-		o.name as "createUserOfficeName"
+		o.name as "createUserOfficeName",
+		a.contract_scale AS "contractScale",
+		a.project_leader_ids AS "projectLeaderIds"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		left join work_contract_record wcr on wcr.contract_info_id = a.id
@@ -458,7 +466,9 @@
 		ifnull(wcr.file_num,"") as "recordNum",
 		wcr.id as "contrractRecordId",
 		a.describe_content AS "describeContent",
-		o.name as "createUserOfficeName"
+		o.name as "createUserOfficeName",
+		a.contract_scale AS "contractScale",
+		a.project_leader_ids AS "projectLeaderIds"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		left join work_contract_record wcr on wcr.contract_info_id = a.id
@@ -632,7 +642,9 @@
 		a.alterbefore_id AS "alterBeforeId",
 		(select name from work_contract_info where id  = a.total_contract_id) AS "totalContractName",
 		a.common_flag AS "commonFlag",
-		(select count(1) from work_contract_info c where c.total_contract_id = a.id)  cnt
+		(select count(1) from work_contract_info c where c.total_contract_id = a.id)  cnt,
+		a.contract_scale AS "contractScale",
+		a.project_leader_ids AS "projectLeaderIds"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		<where>
@@ -733,7 +745,9 @@
 		a.alterbefore_id AS "alterBeforeId",
 		(select name from work_contract_info where id  = a.total_contract_id) AS "totalContractName",
 		a.common_flag AS "commonFlag",
-		(select count(1) from work_contract_info c where c.total_contract_id = a.id)  cnt
+		(select count(1) from work_contract_info c where c.total_contract_id = a.id)  cnt,
+		a.contract_scale AS "contractScale",
+		a.project_leader_ids AS "projectLeaderIds"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		<where>
@@ -854,7 +868,9 @@
 		a.completion_status AS "completionStatus",
 		(select name from work_contract_info where id  = a.total_contract_id) AS "totalContractName",
 		a.common_flag AS "commonFlag",
-		(select count(1) from work_contract_info c where c.total_contract_id = a.id)  cnt
+		(select count(1) from work_contract_info c where c.total_contract_id = a.id)  cnt,
+		a.contract_scale AS "contractScale",
+		a.project_leader_ids AS "projectLeaderIds"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		<where>
@@ -971,7 +987,9 @@
 		a.construction_project_type AS "constructionProjectType",
 		(select name from work_contract_info where id  = a.total_contract_id) AS "totalContractName",
 		a.common_flag AS "commonFlag",
-		(select count(1) from work_contract_info c where c.total_contract_id = a.id)  cnt
+		(select count(1) from work_contract_info c where c.total_contract_id = a.id)  cnt,
+		a.contract_scale AS "contractScale",
+		a.project_leader_ids AS "projectLeaderIds"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		<where>
@@ -1099,7 +1117,9 @@
 			charge_criterion,
 			other_details,
 			contract_information,
-			describe_content
+			describe_content,
+			contract_scale,
+			project_leader_ids
 		) VALUES (
 			#{id},
 			#{project.id},
@@ -1158,7 +1178,9 @@
 			#{chargeCriterion},
 			#{otherDetails},
 			#{contractInformation},
-			#{describeContent}
+			#{describeContent},
+			#{contractScale},
+			#{projectLeaderIds}
 		)
 	</insert>
 
@@ -1226,6 +1248,12 @@
 			<if test="letterOfAcceptanceRemarks != null and letterOfAcceptanceRemarks!= ''">
 				,letter_of_acceptance_remarks = #{letterOfAcceptanceRemarks}
 			</if>
+			<if test="contractScale != null and contractScale!= ''">
+				,contract_scale = #{contractScale}
+			</if>
+			<if test="projectLeaderIds != null and projectLeaderIds!= ''">
+				,project_leader_ids = #{projectLeaderIds}
+			</if>
 		WHERE id = #{id}
 	</update>
 
@@ -1411,7 +1439,9 @@
 		a.another_contract_num AS "anotherContractNum",
 		client.name AS "client.name",
 		a.is_total AS "isTotal",
-		a.total_contract_id AS "totalContractId"
+		a.total_contract_id AS "totalContractId",
+		a.contract_scale AS "contractScale",
+		a.project_leader_ids AS "projectLeaderIds"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		WHERE
@@ -1589,7 +1619,9 @@
 		wcr.file_num as "fileNum",
 		wcr.file_num_tow as "fileNumTow",
 		a.contract_record_state as "contrractRecordStatus",
-		a.describe_content AS "describeContent"
+		a.describe_content AS "describeContent",
+		a.contract_scale AS "contractScale",
+		a.project_leader_ids AS "projectLeaderIds"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		LEFT JOIN work_contract_record wcr ON wcr.contract_info_id = a.id
@@ -1672,7 +1704,9 @@
 		ifnull(wcr.file_num,"") as "recordNum",
 		wcr.id as "contrractRecordId",
 		a.describe_content AS "describeContent",
-		o.name as "createUserOfficeName"
+		o.name as "createUserOfficeName",
+		a.contract_scale AS "contractScale",
+		a.project_leader_ids AS "projectLeaderIds"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		left join work_contract_record wcr on wcr.contract_info_id = a.id
@@ -2105,7 +2139,9 @@
 		ifnull(wcr.file_num,"") as "recordNum",
 		wcr.id as "contrractRecordId",
 		a.describe_content AS "describeContent",
-		o.name as "createUserOfficeName"
+		o.name as "createUserOfficeName",
+		a.contract_scale AS "contractScale",
+		a.project_leader_ids AS "projectLeaderIds"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>
 		left join work_contract_record wcr on wcr.contract_info_id = a.id

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

@@ -140,6 +140,22 @@
                                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.anotherContractNum}"/>
                                     </div>
                                 </div>
+
+                                <div class="layui-item layui-col-sm6">
+                                    <label class="layui-form-label">合同规模：</label>
+                                    <div class="layui-input-block">
+                                        <form:input path="contractScale" placeholder="请输入合同规模" readonly="true" htmlEscape="false" class="form-control layui-input"/>
+                                    </div>
+                                </div>
+
+                                <div class="layui-item layui-col-sm6 lw7">
+                                    <label class="layui-form-label">项目负责人：</label>
+                                    <div class="layui-input-block ">
+                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.leaderNameStr}"/>
+                                    </div>
+                                </div>
+
+
                                 <div class="layui-item layui-col-sm12" id="chargeCriterionList" >
                                     <label class="layui-form-label">收费标准</label>
                                     <div class="layui-input-block">

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

@@ -736,6 +736,22 @@
 									<form:input path="anotherContractNum" placeholder="请输入对方合同编号" htmlEscape="false" class="form-control layui-input"/>
 								</div>
 							</div>
+
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">合同规模：</label>
+								<div class="layui-input-block">
+									<form:input path="contractScale" placeholder="请输入合同规模" htmlEscape="false" class="form-control layui-input"/>
+								</div>
+							</div>
+
+							<div class="layui-item layui-col-sm6 lw7">
+								<label class="layui-form-label">项目负责人：</label>
+								<div class="layui-input-block  with-icon">
+									<sys:treeselect id="master" name="projectLeaderIds" value="${workContractInfo.projectLeaderIds}" labelName="leaderNameStr" labelValue="${workContractInfo.leaderNameStr}"
+													cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+								</div>
+							</div>
+
 							<div class="layui-item layui-col-sm12" id="chargeCriterionList" >
 								<label class="layui-form-label">收费标准：</label>
 								<div class="layui-input-block">

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

@@ -693,6 +693,22 @@
 								<form:input placeholder="请输入对方合同编号" path="anotherContractNum" htmlEscape="false" class="form-control layui-input"/>
 							</div>
 						</div>
+
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label">合同规模：</label>
+							<div class="layui-input-block">
+								<form:input path="contractScale" placeholder="请输入合同规模" htmlEscape="false" class="form-control layui-input"/>
+							</div>
+						</div>
+
+						<div class="layui-item layui-col-sm6 lw7">
+							<label class="layui-form-label">项目负责人：</label>
+							<div class="layui-input-block  with-icon">
+								<sys:treeselect id="master" name="projectLeaderIds" value="${workContractInfo.projectLeaderIds}" labelName="leaderNameStr" labelValue="${workContractInfo.leaderNameStr}"
+												cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+							</div>
+						</div>
+
 						<div class="layui-item layui-col-sm12" id="chargeCriterionList">
 							<label class="layui-form-label">收费标准</label>
 							<div class="layui-input-block">

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

@@ -195,6 +195,23 @@
 								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.anotherContractNum}"/>
 							</div>
 						</div>
+
+
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label">合同规模：</label>
+							<div class="layui-input-block">
+								<form:input path="contractScale" placeholder="请输入合同规模" readonly="true" htmlEscape="false" class="form-control layui-input"/>
+							</div>
+						</div>
+
+						<div class="layui-item layui-col-sm6 lw7">
+							<label class="layui-form-label">项目负责人：</label>
+							<div class="layui-input-block ">
+								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.leaderNameStr}"/>
+							</div>
+						</div>
+
+
 						<div class="layui-item layui-col-sm12">
 							<label class="layui-form-label">收费标准</label>
 							<div class="layui-input-block">

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

@@ -117,6 +117,22 @@
 										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.anotherContractNum}"/>
 									</div>
 								</div>
+
+								<div class="layui-item layui-col-sm6">
+									<label class="layui-form-label">合同规模：</label>
+									<div class="layui-input-block">
+										<form:input path="contractScale" placeholder="请输入合同规模" readonly="true" htmlEscape="false" class="form-control layui-input"/>
+									</div>
+								</div>
+
+								<div class="layui-item layui-col-sm6 lw7">
+									<label class="layui-form-label">项目负责人：</label>
+									<div class="layui-input-block ">
+										<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.leaderNameStr}"/>
+									</div>
+								</div>
+
+
 								<div class="layui-item layui-col-sm12">
 									<label class="layui-form-label">收费标准</label>
 									<div class="layui-input-block">