Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/Projectcontentinfo.java

@@ -62,6 +62,8 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	private List<ProjectTemplateInfo> fileGistdataList;   //依据性文件
 	private List<ProjectTemplateInfo> fileOtherList;   //其他文件
 
+	private List<String> chargeCriterionList;	//合同收费标准
+
 
 	public RuralProjectRecords getProjectOnRural() {
 		return projectOnRural;
@@ -332,4 +334,12 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	public void setReportedConsultantList(List<RuralReportConsultant> reportedConsultantList) {
 		this.reportedConsultantList = reportedConsultantList;
 	}
+
+	public List<String> getChargeCriterionList() {
+		return chargeCriterionList;
+	}
+
+	public void setChargeCriterionList(List<String> chargeCriterionList) {
+		this.chargeCriterionList = chargeCriterionList;
+	}
 }

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

@@ -2062,6 +2062,13 @@ public class WorkProjectNotifyController extends BaseController {
 					List<SubProjectInfo> subProjectInfos=this.queryReportDetails(projectcontentinfo.getProject().getId());
 					//获取合同信息
 					WorkContractInfo workContractInfo=this.queryWorkContract(projectcontentinfo.getProject().getId());
+					//收费标准
+					String [] biao=workContractInfo.getChargeCriterion().split(",");
+					List<String> chargeCriterionList=new ArrayList<>();
+					for (int i=0;i<biao.length;i++){
+						chargeCriterionList.add(biao[i]);
+					}
+					projectcontentinfo.setChargeCriterionList(chargeCriterionList);
 					//查询合同对应委托方客户信息
 					if(null != workContractInfo){
 						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
@@ -2437,6 +2444,13 @@ public class WorkProjectNotifyController extends BaseController {
 					List<SubProjectInfo> subProjectInfos=this.queryReportDetails(projectcontentinfo.getProject().getId());
 					//获取合同信息
 					WorkContractInfo workContractInfo=this.queryWorkContract(projectcontentinfo.getProject().getId());
+					//收费标准
+					String [] biao=workContractInfo.getChargeCriterion().split(",");
+					List<String> chargeCriterionList=new ArrayList<>();
+					for (int i=0;i<biao.length;i++){
+						chargeCriterionList.add(biao[i]);
+					}
+					projectcontentinfo.setChargeCriterionList(chargeCriterionList);
 					//查询合同对应委托方客户信息
 					if(null != workContractInfo){
 						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp

@@ -971,17 +971,17 @@
 								<div class="layui-item layui-col-sm12">
 									<label class="layui-form-label">收费标准</label>
 									<div class="layui-input-block">
-										<c:forEach items="${fns:getMainDictList('charge_criterion')}" var="var">
-											<c:forEach items="${workContractInfo.chargeCriterion.split(',')}" var="s">
-													<c:if test="${s==var.label}">
-														<input type="checkbox" name="chargeCriterionList" lay-skin="primary" title="${var.label}" checked>
-													</c:if>
-													<c:if test="${s!=var.label}">
-														<input type="checkbox" name="chargeCriterionList" lay-skin="primary" title="${var.label}">
-													</c:if>
-											</c:forEach>
-										</c:forEach>
-<%--										<form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="" />--%>
+<%--										<c:forEach items="${fns:getMainDictList('charge_criterion')}" var="var">--%>
+<%--											<c:forEach items="${workContractInfo.chargeCriterion.split(',')}" var="s">--%>
+<%--													<c:if test="${s==var.label}">--%>
+<%--														<input type="checkbox" name="chargeCriterionList" lay-skin="primary" title="${var.label}" checked>--%>
+<%--													</c:if>--%>
+<%--													<c:if test="${s!=var.label}">--%>
+<%--														<input type="checkbox" name="chargeCriterionList" lay-skin="primary" title="${var.label}">--%>
+<%--													</c:if>--%>
+<%--											</c:forEach>--%>
+<%--										</c:forEach>--%>
+										<form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
 									</div>
 								</div>
 								<div class="layui-item layui-col-sm12">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit.jsp

@@ -975,18 +975,17 @@
 								<div class="layui-item layui-col-sm12">
 									<label class="layui-form-label">收费标准</label>
 									<div class="layui-input-block">
-										<c:forEach items="${fns:getMainDictList('charge_criterion')}" var="var">
-											<c:forEach items="${workContractInfo.chargeCriterion.split(',')}" var="s">
-												<c:if test="${s!=var.label}">
-													<input type="checkbox" name="chargeCriterionList" lay-skin="primary" title="${var.label}">
-												</c:if>
-												<c:if test="${s==var.label}">
-													<input type="checkbox" name="chargeCriterionList" lay-skin="primary" title="${var.label}" checked>
-												</c:if>
-											</c:forEach>
-										</c:forEach>
-
-											<%--							<form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="" />--%>
+<%--										<c:forEach items="${fns:getMainDictList('charge_criterion')}" var="var">--%>
+<%--											<c:forEach items="${workContractInfo.chargeCriterion.split(',')}" var="s">--%>
+<%--												<c:if test="${s!=var.label}">--%>
+<%--													<input type="checkbox" name="chargeCriterionList" lay-skin="primary" title="${var.label}">--%>
+<%--												</c:if>--%>
+<%--												<c:if test="${s==var.label}">--%>
+<%--													<input type="checkbox" name="chargeCriterionList" lay-skin="primary" title="${var.label}" checked>--%>
+<%--												</c:if>--%>
+<%--											</c:forEach>--%>
+<%--										</c:forEach>--%>
+										<form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
 									</div>
 								</div>
 								<div class="layui-item layui-col-sm12">