Merge remote-tracking branch 'origin/master'

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

@@ -10,6 +10,7 @@ import javax.validation.constraints.NotNull;
 import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentData;
+import org.springframework.format.annotation.NumberFormat;
 
 /**
  * 认价管理Entity
@@ -26,7 +27,16 @@ public class WorkContentPricemanage extends DataEntity<WorkContentPricemanage> {
 	private Date priceDate;		// 认价时间
 	private String scope;		// 认价范围
 	private String explain;		// 使用说明
-	
+
+	@NumberFormat(style = NumberFormat.Style.CURRENCY)
+	private Double reviewAmt;		// 送审金额
+	@NumberFormat(style = NumberFormat.Style.CURRENCY)
+	private Double setAmt;		// 审定金额
+	private Date subDate;		// 报送日期
+	private Date setDate;		// 审定日期
+	private String inAccount;		// 计入台账
+	private String inPayment;		// 计入支付
+
 	public WorkContentPricemanage() {
 		super();
 	}
@@ -98,4 +108,54 @@ public class WorkContentPricemanage extends DataEntity<WorkContentPricemanage> {
     public void setContract(ProjectContentData contract) {
         this.contract = contract;
     }
+
+	public Double getReviewAmt() {
+		return reviewAmt;
+	}
+
+	public void setReviewAmt(Double reviewAmt) {
+		this.reviewAmt = reviewAmt;
+	}
+
+	public Double getSetAmt() {
+		return setAmt;
+	}
+
+	public void setSetAmt(Double setAmt) {
+		this.setAmt = setAmt;
+	}
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@NotNull(message="报送日期不能为空")
+	public Date getSubDate() {
+		return subDate;
+	}
+
+	public void setSubDate(Date subDate) {
+		this.subDate = subDate;
+	}
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@NotNull(message="报送日期不能为空")
+	public Date getSetDate() {
+		return setDate;
+	}
+
+	public void setSetDate(Date setDate) {
+		this.setDate = setDate;
+	}
+
+	public String getInAccount() {
+		return inAccount;
+	}
+
+	public void setInAccount(String inAccount) {
+		this.inAccount = inAccount;
+	}
+
+	public String getInPayment() {
+		return inPayment;
+	}
+
+	public void setInPayment(String inPayment) {
+		this.inPayment = inPayment;
+	}
 }

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

@@ -148,29 +148,6 @@ public class WorkContentContractSumController extends BaseController {
 				}
 			}
 			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/WorkContentPricemanageDao.xml

@@ -15,6 +15,12 @@
 		a.cont_id AS "contract.id",
 		a.price_type AS "priceType",
 		a.price_date AS "priceDate",
+		a.review_amt AS "reviewAmt",
+		a.set_amt AS "setAmt",
+		a.sub_date AS "subDate",
+		a.set_date AS "setDate",
+		a.in_account AS "inAccount",
+		a.in_payment AS "inPayment",
 		a.scope AS "scope",
 		a.explains AS "explain",
 		cd.name AS "contract.name"
@@ -90,6 +96,12 @@
 			price_type,
 			price_date,
 			scope,
+			review_amt,
+			set_amt,
+			sub_date,
+			set_date,
+			in_account,
+			in_payment,
 			explains
 		) VALUES (
 			#{id},
@@ -105,6 +117,12 @@
 			#{priceType},
 			#{priceDate},
 			#{scope},
+			#{reviewAmt},
+			#{setAmt},
+			#{subDate},
+			#{setDate},
+			#{inAccount},
+			#{inPayment},
 			#{explain}
 		)
 	</insert>
@@ -120,6 +138,12 @@
 			price_type = #{priceType},
 			price_date = #{priceDate},
 			scope = #{scope},
+			review_amt = #{reviewAmt},
+			set_amt = #{setAmt},
+			sub_date = #{subDate},
+			set_date = #{setDate},
+			in_account = #{inAccount},
+			in_payment = #{inPayment},
 			explains = #{explain}
 		WHERE id = #{id}
 	</update>

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

@@ -30,22 +30,72 @@
     </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-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"  maxlength="255"  class="form-control "/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm12 with-textarea">--%>
+            <%--<label class="layui-form-label">适用说明：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<form:textarea path="explain" htmlEscape="false" rows="3"  maxlength="255"  class="form-control "/>--%>
+            <%--</div>--%>
+        <%--</div>--%>
+        <%--<div class="layui-item layui-col-sm12 with-textarea">--%>
+            <%--<label class="layui-form-label">备注：</label>--%>
+            <%--<div class="layui-input-block">--%>
+                <%--<form:textarea path="remarks" htmlEscape="false" rows="3"  maxlength="255"  class="form-control "/>--%>
+            <%--</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:textarea path="scope" htmlEscape="false" rows="3"  maxlength="255"  class="form-control "/>
+                <input name="reviewAmt" htmlEscape="false"  value="<fmt:formatNumber value="${workContentPricemanage.reviewAmt}" pattern="#,##0.00#"/>" onchange="formatNum(this);" class="form-control layui-input required number"/>
             </div>
         </div>
-        <div class="layui-item layui-col-sm12 with-textarea">
-            <label class="layui-form-label">适用说明：</label>
+        <div class="layui-item layui-col-sm6">
+            <label class="layui-form-label"><span class="require-item">*</span>审定金额：</label>
+            <div class="layui-input-block">
+                <input name="setAmt" htmlEscape="false"  value="<fmt:formatNumber value="${workContentPricemanage.setAmt}" pattern="#,##0.00#"/>" onchange="formatNum(this);" class="form-control layui-input required number"/>
+            </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 id="subDate" name="subDate" type="text" maxlength="20" class="laydate-icondate form-control layui-input layer-date laydate-icon required"
+                       value="<fmt:formatDate value="${workContentPricemanage.subDate}" pattern="yyyy-MM-dd"/>"/>
+            </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:textarea path="explain" htmlEscape="false" rows="3"  maxlength="255"  class="form-control "/>
+                <input id="setDate" name="setDate" type="text" maxlength="20" class="laydate-icondate form-control layui-input layer-date laydate-icon required"
+                       value="<fmt:formatDate value="${workContentPricemanage.setDate}" pattern="yyyy-MM-dd"/>"/>
+            </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:select path="inAccount" class="form-control layui-input required">
+                    <form:option value="" label=""/>
+                    <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                </form:select>
+            </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:select path="inPayment" class="form-control layui-input required">
+                    <form:option value="" label=""/>
+                    <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                </form:select>
             </div>
         </div>
         <div class="layui-item layui-col-sm12 with-textarea">
-            <label class="layui-form-label">备注：</label>
+            <label class="layui-form-label">备注信息：</label>
             <div class="layui-input-block">
-                <form:textarea path="remarks" htmlEscape="false" rows="3"  maxlength="255"  class="form-control "/>
+                <form:textarea path="remarks" htmlEscape="false" rows="3"    class="form-control layui-area"/>
             </div>
         </div>
     </div>