合同动态汇总调整

src/main/java/com/jeeplus/common/bos/BOSClientUtil.java

@@ -137,33 +137,33 @@ public class BOSClientUtil {
 //        System.out.println(upload);
 //    }
 
-    @Test
-    public void uploadAll(){
-        ArrayList<String> listFileName = new ArrayList<String>();
-        String filePath = "D:/IDEA workspace/total_process/src/main/webapp/static/";
-       getAllFileName(filePath,listFileName);
-       int count = 1;
-       int total = listFileName.size();
-       System.out.println(total);
-     for(String name : listFileName){
-           if(name != null) {
-               int statice = name.indexOf("static");
-               String name1 = name.substring(statice + 6, name.length());
-               File file = new File(name);
-//               System.out.println("/static"+name1);
-               bosClient.putObject(bucketName, "/static"+name1, file);
-//               BOSClientUtil.upload("/static"+name1,file);
-               System.out.println("---------正在上传   "+file.getName()+"-------");
-               System.out.println("上传第"+count+"个资源,共"+total+"个资源");
-               count++;
-//               try {
-//                   bosClient.deleteObject(bucketName, " /static" + name1);
-//               }catch (Exception e){
-//                   e.printStackTrace();
-//               }
-           }
-       }
-    }
+//    @Test
+//    public void uploadAll(){
+//        ArrayList<String> listFileName = new ArrayList<String>();
+//        String filePath = "D:/IDEA workspace/total_process/src/main/webapp/static/";
+//       getAllFileName(filePath,listFileName);
+//       int count = 1;
+//       int total = listFileName.size();
+//       System.out.println(total);
+//     for(String name : listFileName){
+//           if(name != null) {
+//               int statice = name.indexOf("static");
+//               String name1 = name.substring(statice + 6, name.length());
+//               File file = new File(name);
+////               System.out.println("/static"+name1);
+//               bosClient.putObject(bucketName, "/static"+name1, file);
+////               BOSClientUtil.upload("/static"+name1,file);
+//               System.out.println("---------正在上传   "+file.getName()+"-------");
+//               System.out.println("上传第"+count+"个资源,共"+total+"个资源");
+//               count++;
+////               try {
+////                   bosClient.deleteObject(bucketName, " /static" + name1);
+////               }catch (Exception e){
+////                   e.printStackTrace();
+////               }
+//           }
+//       }
+//    }
 
 
 public  void getAllFileName(String path, ArrayList<String> listFileName){

src/main/java/com/jeeplus/common/mail/MailAuthenticator.java

@@ -2,7 +2,7 @@ package com.jeeplus.common.mail;
 /**   
  *  
  */ 
-import javax.mail.*;   
+import javax.mail.*;
 
 public class MailAuthenticator extends Authenticator{   
     String userName=null;   
@@ -14,7 +14,7 @@ public class MailAuthenticator extends Authenticator{
         this.userName = username;    
         this.password = password;    
     }    
-    protected PasswordAuthentication getPasswordAuthentication(){   
-        return new PasswordAuthentication(userName, password);   
+    protected PasswordAuthentication getPasswordAuthentication(){
+        return new PasswordAuthentication(userName, password);
     }   
 }   

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectcontentinfoController.java

@@ -769,6 +769,7 @@ public class ProjectcontentinfoController extends BaseController {
 			if( projectcontentinfo.getProjectContentData() != null && StringUtils.isNotBlank(projectcontentinfo.getProjectContentData().getType())){
 				ProjectContentData projectContentData = projectcontentinfo.getProjectContentData();
 				projectContentData.setId("");
+				//生成动态汇总
 				if("41".equals(projectcontentinfo.getProjectContentData().getType())){
 					projectContentData.setType("400");
 					projectContentData.setName(projectContentData.getName()+"动态汇总");

src/main/java/com/jeeplus/modules/workcontent/dao/WorkContentContractinfoDao.java

@@ -21,4 +21,5 @@ public interface WorkContentContractinfoDao extends CrudDao<WorkContentContracti
 
     List<WorkContentContractTerm> queryTerms(WorkContentContractinfo oldRecord);
     List<WorkContentContractinfo> findByType(String cnumber);
+    List<WorkContentContractinfo> findByConId(String id);
 }

src/main/java/com/jeeplus/modules/workcontent/entity/WorkContentContractSum.java

@@ -52,6 +52,16 @@ public class WorkContentContractSum extends DataEntity<WorkContentContractSum> {
 	private Double dynamicCost;          //动态成本
 	private Double withContractAmount;      //与合同金额相比增减
 	private Double withTargetCost;        //与目标成本相比增减
+	private List<WorkContentSummary> workContentSummaries;  //汇总信息
+
+
+	public List<WorkContentSummary> getWorkContentSummaries() {
+		return workContentSummaries;
+	}
+
+	public void setWorkContentSummaries(List<WorkContentSummary> workContentSummaries) {
+		this.workContentSummaries = workContentSummaries;
+	}
 
 	private WorkContentContractinfo contractinfo;    //合同信息
 

src/main/java/com/jeeplus/modules/workcontent/entity/WorkContentSummary.java

@@ -0,0 +1,54 @@
+package com.jeeplus.modules.workcontent.entity;
+
+import com.jeeplus.common.persistence.DataEntity;
+
+import java.util.Date;
+
+public class WorkContentSummary extends DataEntity<WorkContentSummary> {
+    private String type;  //类型
+    private Date date;  //时间
+    private Double money;  //钱
+    private String name;  //合同名称
+    private String userName;  //操作人
+
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public Double getMoney() {
+        return money;
+    }
+
+    public void setMoney(Double money) {
+        this.money = money;
+    }
+}

src/main/java/com/jeeplus/modules/workcontent/web/WorkContentContractSumController.java

@@ -14,9 +14,8 @@ import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.workcontent.dao.WorkContentAltermanageDao;
 import com.jeeplus.modules.workcontent.dao.WorkContentClaimDao;
-import com.jeeplus.modules.workcontent.entity.WorkContentAltermanage;
-import com.jeeplus.modules.workcontent.entity.WorkContentClaim;
-import com.jeeplus.modules.workcontent.entity.WorkContentContractSum;
+import com.jeeplus.modules.workcontent.dao.WorkContentContractinfoDao;
+import com.jeeplus.modules.workcontent.entity.*;
 import com.jeeplus.modules.workcontent.service.WorkContentContractSumService;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -33,6 +32,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -50,6 +50,8 @@ public class WorkContentContractSumController extends BaseController {
 	private WorkContentAltermanageDao workContentAltermanageDao;
 	@Autowired
 	private WorkContentClaimDao workContentClaimDao;
+	@Autowired
+	private WorkContentContractinfoDao workContentContractinfoDao;
 	
 	@ModelAttribute
 	public WorkContentContractSum get(@RequestParam(required=false) String id) {
@@ -80,6 +82,7 @@ public class WorkContentContractSumController extends BaseController {
 	@RequestMapping(value = "form")
 	public String form(WorkContentContractSum workContentContractSum,String view, Model model) {
 		WorkContentContractSum oldRecord = null;
+		String name = "";//合同名称
 		double alertFee = 0.00;
 		double claimFee = 0.00;
 		if(StringUtils.isNotBlank(workContentContractSum.getContentId())){
@@ -90,30 +93,63 @@ public class WorkContentContractSumController extends BaseController {
 		}
 		if(oldRecord!=null){
 			String conId = oldRecord.getContentId();
-			List<WorkContentAltermanage> byConId = workContentAltermanageDao.findByConId(conId);
-			List<WorkContentClaim> byConId1 = workContentClaimDao.findByConId(conId);
-			if(byConId != null && byConId.size()>0){
-                for(WorkContentAltermanage workContentAltermanage : byConId){
-                	alertFee += workContentAltermanage.getSetAmt();
+			List<WorkContentAltermanage> workContentAltermanages = workContentAltermanageDao.findByConId(conId);
+			List<WorkContentClaim> workContentClaims = workContentClaimDao.findByConId(conId);
+			List<WorkContentContractinfo> workContentContractinfos = workContentContractinfoDao.findByConId(conId);
+			List<WorkContentSummary> list = new ArrayList();
+			WorkContentSummary workContentSummary = null;
+			if(null != workContentContractinfos && workContentContractinfos.size() >0){
+				for(WorkContentContractinfo workContentContractinfo : workContentContractinfos) {
+					workContentSummary = new WorkContentSummary();
+					workContentSummary.setType("合同信息");
+					workContentSummary.setName(name);
+					workContentSummary.setDate(workContentContractinfo.getUpdateDate());
+					workContentSummary.setMoney(workContentContractinfo.getTrueAmt());
+					list.add(workContentSummary);
 				}
 			}
-			if(byConId1 != null && byConId1.size()>0){
-				for(WorkContentClaim workContentClaim : byConId1){
-					claimFee += workContentClaim.getSetAmt();
+			if(null != workContentAltermanages && workContentAltermanages.size() >0){
+				for(WorkContentAltermanage workContentAltermanage : workContentAltermanages) {
+					workContentSummary = new WorkContentSummary();
+					workContentSummary.setType("合同变更");
+					workContentSummary.setDate(workContentAltermanage.getUpdateDate());
+					workContentSummary.setMoney(workContentAltermanage.getSetAmt());
+					list.add(workContentSummary);
 				}
 			}
-			double contractAmount = oldRecord.getContractAmount();
-			double dynamicCost = contractAmount+alertFee+claimFee;
-			double withContractAmount = Math.abs(dynamicCost-contractAmount);
-			oldRecord.setContractAmount(contractAmount);
-			oldRecord.setDynamicCost(dynamicCost);
-			oldRecord.setWithContractAmount(withContractAmount);
-			oldRecord.setContractDifference(alertFee);
-			oldRecord.setClaimFee(claimFee);
-			if(oldRecord.getTargetCost() != null){
-				double withTargetCost = Math.abs( dynamicCost - oldRecord.getTargetCost());
-				oldRecord.setWithTargetCost(withTargetCost);
+			if(null != workContentClaims && workContentClaims.size() >0){
+				for(WorkContentClaim workContentClaim : workContentClaims) {
+					workContentSummary = new WorkContentSummary();
+					workContentSummary.setType("索赔");
+					workContentSummary.setDate(workContentClaim.getUpdateDate());
+					workContentSummary.setMoney(workContentClaim.getSetAmt());
+					list.add(workContentSummary);
+				}
 			}
+			oldRecord.setWorkContentSummaries(list);
+//			if(byConId != null && byConId.size()>0){
+//                for(WorkContentAltermanage workContentAltermanage : byConId){
+//                	alertFee += workContentAltermanage.getSetAmt();
+//				}
+//			}
+//			if(byConId1 != null && byConId1.size()>0){
+//				for(WorkContentClaim workContentClaim : byConId1){
+//					claimFee += workContentClaim.getSetAmt();
+//				}
+//			}
+//			double contractAmount = oldRecord.getContractAmount();
+//			double dynamicCost = contractAmount+alertFee+claimFee;
+//			double withContractAmount = Math.abs(dynamicCost-contractAmount);
+//			oldRecord.setContractAmount(contractAmount);
+//			oldRecord.setDynamicCost(dynamicCost);
+//			oldRecord.setWithContractAmount(withContractAmount);
+//			oldRecord.setContractDifference(alertFee);
+//			oldRecord.setClaimFee(claimFee);
+//			if(oldRecord.getTargetCost() != null){
+//				double withTargetCost = Math.abs( dynamicCost - oldRecord.getTargetCost());
+//				oldRecord.setWithTargetCost(withTargetCost);
+//			}
+
 			model.addAttribute("workContentContractSum", oldRecord);
 		}else {
 			model.addAttribute("workContentContractSum", workContentContractSum);

src/main/resources/mappings/modules/workcontent/WorkContentContractinfoDao.xml

@@ -73,6 +73,16 @@
 		</choose>
 	</select>
 
+	<select id="findByConId" resultType="WorkContentContractinfo" parameterType="String">
+		SELECT
+		<include refid="workContentContractinfoColumns"/>
+		FROM work_content_contractinfo a
+		<include refid="workContentContractinfoJoins"/>
+		<where>
+			content_id = #{id}
+		</where>
+	</select>
+
 	<select id="findByType" resultType="WorkContentContractinfo" parameterType="String">
 		SELECT
 		a.id

src/main/webapp/webpage/modules/workcontent/workContentContractSumFormView.jsp

@@ -1,140 +1,172 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
-<form:form id="subForm" modelAttribute="workContentContractSum" action="#" method="post" class="form-horizontal">
-    <form:hidden path="id"/>
-    <div class="form-group layui-row lw12">
-        <div class="layui-item layui-col-sm6">
-            <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
-            <div class="layui-input-block">
-                <form:input path="cnumber" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6">
-            <label class="layui-form-label"><span class="require-item">*</span>合同分类：</label>
-            <div class="layui-input-block">
-                <input htmlEscape="false" readonly="true" class="form-control layui-input"
-                   <c:forEach items="${fns:getDictList('content_contract_type')}" var="item">
-                        <c:set var="typename" value="content_contract_type_${item.value}"></c:set>
-                        <c:forEach items="${fns:getDictList(typename)}" var="item2">
-                            <c:if test="${workContentContractSum.contCate eq item2.value}">value="${item2.label}"</c:if>
-                        </c:forEach>
-                    </c:forEach>/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6">
-            <label class="layui-form-label"><span class="require-item">*</span>合同属性：</label>
-            <div class="layui-input-block">
-                <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContentContractSum.contAttr, 'content_contract_attr', '')}"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6">
-            <label class="layui-form-label"><span class="require-item">*</span>发包人：</label>
-            <div class="layui-input-block">
-                <form:input path="lettingAgent" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6">
-            <label class="layui-form-label"><span class="require-item">*</span>承包人：</label>
-            <div class="layui-input-block">
-                <form:input path="contractor" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
-            </div>
-        </div>
-    </div>
+<%--<form:form id="subForm" modelAttribute="workContentContractSum" action="#" method="post" class="form-horizontal">--%>
+    <%--<form:hidden path="id"/>--%>
+    <%--<div class="form-group layui-row lw12">--%>
+        <%--<div class="layui-item layui-col-sm6">--%>
+            <%--<label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<form:input path="cnumber" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6">--%>
+            <%--<label class="layui-form-label"><span class="require-item">*</span>合同分类：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<input htmlEscape="false" readonly="true" class="form-control layui-input"--%>
+                   <%--<c:forEach items="${fns:getDictList('content_contract_type')}" var="item">--%>
+                        <%--<c:set var="typename" value="content_contract_type_${item.value}"></c:set>--%>
+                        <%--<c:forEach items="${fns:getDictList(typename)}" var="item2">--%>
+                            <%--<c:if test="${workContentContractSum.contCate eq item2.value}">value="${item2.label}"</c:if>--%>
+                        <%--</c:forEach>--%>
+                    <%--</c:forEach>/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6">--%>
+            <%--<label class="layui-form-label"><span class="require-item">*</span>合同属性：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<input htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContentContractSum.contAttr, 'content_contract_attr', '')}"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6">--%>
+            <%--<label class="layui-form-label"><span class="require-item">*</span>发包人：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<form:input path="lettingAgent" htmlEscape="false" readonly="true" class="form-control layui-input required"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6">--%>
+            <%--<label class="layui-form-label"><span class="require-item">*</span>承包人：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<form:input path="contractor" htmlEscape="false" readonly="true" class="form-control layui-input required"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+    <%--</div>--%>
 
-    <div class="form-group layui-row lw12">
-        <div class="form-group-label"><h2>详情信息</h2></div>
-        <div class="layui-item layui-col-sm12 with-textarea">
-            <label class="layui-form-label">合同范围：</label>
-            <div class="layui-input-block">
-                <form:textarea path="scope" htmlEscape="false" rows="3" readonly="true" class="form-control required"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6">
-            <label class="layui-form-label">签约日期：</label>
-            <div class="layui-input-block">
-                <input type="text" maxlength="20" readonly="true" class="form-control layui-input"
-                       value="<fmt:formatDate value="${workContentContractSum.signDate}" pattern="yyyy-MM-dd"/>"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6">
-            <label class="layui-form-label ">目标成本(元)：</label>
-            <div class="layui-input-block">
-                <input name="titularAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.targetCost}" pattern="#,##0.00#"/>" class="form-control layui-input number"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6 double-line">
-            <label class="layui-form-label">合同金额(元)：</label>
-            <div class="layui-input-block">
-                <input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.contractAmount}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6 double-line">
-            <label class="layui-form-label">预算金额(元)：</label>
-            <div class="layui-input-block">
-                <input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.budgetFee}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6 double-line">
-            <label class="layui-form-label">结算金额(元)：</label>
-            <div class="layui-input-block">
-                <input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.settlementFee}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6 double-line">
-            <label class="layui-form-label">签证变更(元)：</label>
-            <div class="layui-input-block">
-                <input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.visaChangeFee}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6 double-line">
-            <label class="layui-form-label">补充协议(元)：</label>
-            <div class="layui-input-block">
-                <input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.supplementFee}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6 double-line">
-            <label class="layui-form-label">合同调差(元)：</label>
-            <div class="layui-input-block">
-                <input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.contractDifference}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6 double-line">
-            <label class="layui-form-label">索赔管理(元)：</label>
-            <div class="layui-input-block">
-                <input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.claimFee}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6 double-line">
-            <label class="layui-form-label">扣款台账(元)：</label>
-            <div class="layui-input-block">
-                <input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.deductionsParameter}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6 double-line">
-            <label class="layui-form-label double-line">动态成本金额(元)：</label>
-            <div class="layui-input-block">
-                <input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.dynamicCost}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6 double-line">
-            <label class="layui-form-label double-line">与合同金额相比增减(元)：</label>
-            <div class="layui-input-block">
-                <input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.withContractAmount}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>
-            </div>
-        </div>
-        <div class="layui-item layui-col-sm6 double-line">
-            <label class="layui-form-label double-line">与目标成本相比增减(元)：</label>
-            <div class="layui-input-block">
-                <input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.withTargetCost}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>
-            </div>
-        </div>
+    <%--<div class="form-group layui-row lw12">--%>
+        <%--<div class="form-group-label"><h2>详情信息</h2></div>--%>
+        <%--<div class="layui-item layui-col-sm12 with-textarea">--%>
+            <%--<label class="layui-form-label">合同范围：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<form:textarea path="scope" htmlEscape="false" rows="3" readonly="true" class="form-control required"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6">--%>
+            <%--<label class="layui-form-label">签约日期：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<input type="text" maxlength="20" readonly="true" class="form-control layui-input"--%>
+                       <%--value="<fmt:formatDate value="${workContentContractSum.signDate}" pattern="yyyy-MM-dd"/>"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6">--%>
+            <%--<label class="layui-form-label ">目标成本(元)：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<input name="titularAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.targetCost}" pattern="#,##0.00#"/>" class="form-control layui-input number"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6 double-line">--%>
+            <%--<label class="layui-form-label">合同金额(元)：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.contractAmount}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6 double-line">--%>
+            <%--<label class="layui-form-label">预算金额(元)：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.budgetFee}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6 double-line">--%>
+            <%--<label class="layui-form-label">结算金额(元)：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.settlementFee}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6 double-line">--%>
+            <%--<label class="layui-form-label">签证变更(元)：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.visaChangeFee}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6 double-line">--%>
+            <%--<label class="layui-form-label">补充协议(元)：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.supplementFee}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6 double-line">--%>
+            <%--<label class="layui-form-label">合同调差(元)：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.contractDifference}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6 double-line">--%>
+            <%--<label class="layui-form-label">索赔管理(元)：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.claimFee}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6 double-line">--%>
+            <%--<label class="layui-form-label">扣款台账(元)：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.deductionsParameter}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6 double-line">--%>
+            <%--<label class="layui-form-label double-line">动态成本金额(元)：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.dynamicCost}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6 double-line">--%>
+            <%--<label class="layui-form-label double-line">与合同金额相比增减(元)：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.withContractAmount}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm6 double-line">--%>
+            <%--<label class="layui-form-label double-line">与目标成本相比增减(元)：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<input name="trueAmt" htmlEscape="false" readonly="true" value="<fmt:formatNumber value="${workContentContractSum.withTargetCost}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
 
 
 
-    </div>
+    <%--</div>--%>
 
-</form:form>
+<%--</form:form>--%>
+<table class="oa-table layui-table" id="contentTable"></table>
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+    layui.use('table', function(){
+        layui.table.render({
+            elem: '#contentTable'
+            ,page: false
+            ,cols: [[
+                {field:'index',align:'center', title: '序号',width:40}
+                ,{field:'type',align:'center', title: '类型',minWidth:200}
+                ,{field:'date',align:'center', title: '操作时间',width:150}
+                ,{field:'money',align:'center', title: '变更金额',width:150}
+            ]]
+            ,data: [
+                <c:if test="${ not empty workContentContractSum.workContentSummaries}">
+                <c:forEach items="${workContentContractSum.workContentSummaries}" var="w" varStatus="index">
+                <c:if test="${index.index != 0}">,</c:if>
+                {
+                    "index":"${index.index+1}"
+                    ,"type":"${w.type}"
+                    ,"date":"<fmt:formatDate value="${w.date}" pattern="yyyy-MM-dd"/>"
+                    ,"money":"${w.money}"
+                }
+                </c:forEach>
+                </c:if>
+            ]
+        });
 
+    })
+
+    resizeListTable();/*消除由于有竖向滚动条造成table出现横向滚动条*/
+    $("a").on("click",addLinkVisied);
+</script>
 
 <script type="text/template" id="termTpl">//<!--
         <tr id="termList{{idx}}">