修改问题

WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp

@@ -473,7 +473,7 @@
 								<tr>
 									<th width="15%">反馈日期</th>
 									<td width="35%" >
-										<input style="width: 75%;" name="zzhkppjList[${st.index}].kprq" id="kprq" style="width: 140px"
+										<input style="width: 75%;" name="rfxmsfxx.fkTime" id="kprq" style="width: 140px"
 											   type="text" class="Wdate" value="${item1.kprq}"
 											   onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" datatype="*1-30" errormsg='此项为必填'><font style='color:red'>*</font>
 

WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Edit.jsp

@@ -463,7 +463,7 @@
                                 <tr>
                                     <th width="15%">反馈日期</th>
                                     <td width="35%" >
-                                        <input style="width: 75%;" name="rfxmsfxx.fkTime" id="kprq" style="width: 140px"
+                                        <input style="width: 75%;" name="rfxmsfxx.fkTime" id="kprq" style="width: 140px" value="${rfxmsfxx.fkTime}"
                                                type="text" class="Wdate" value="${item1.kprq}"
                                                onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" datatype="*1-30" errormsg='此项为必填'><font style='color:red'>*</font>
 

WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_View.jsp

@@ -411,10 +411,10 @@
 							<tr>
 								<th width="15">复核意见</th>
 								<td width="85%">
-									<c:if test="${rfxmsfxx.status==3}">
+									<c:if test="${rfxmsfxx.status==10}">
 										<textarea id="sfxxfhyj" name="rfxmsfxx.sfxxfhyj" style="width: 95%" readonly>${rfxmsfxx.sfxxfhyj}</textarea>
 									</c:if>
-									<c:if test="${rfxmsfxx.status!=3}">
+									<c:if test="${rfxmsfxx.status!=10}">
 										<textarea id="sfxxfhyj" name="rfxmsfxx.sfxxfhyj" style="width: 95%">${rfxmsfxx.sfxxfhyj}</textarea>
 									</c:if>
 								</td>
@@ -424,11 +424,11 @@
 						<table width="100%" border="0">
 							<tr>
 								<td colspan="4" height="100px" style="text-align:center">
-									<c:if test="${rfxmsfxx.status == 2}">
+									<c:if test="${rfxmsfxx.status == 10}">
 										<a href="javascript:return false;" class="btn_01" type="button" ><i class="edit" style="opacity: 0.5">已通过</i><b></b></a>&nbsp;
 										<%--<a href="javascript:return false;" class="btn_01" type="button" ><i class="edit" style="opacity: 0.5">退回中</i><b></b></a>&nbsp;--%>
 									</c:if>
-									<c:if test="${rfxmsfxx.status == 0 || rfxmsfxx.status == 1}">
+									<c:if test="${rfxmsfxx.status == 0 || rfxmsfxx.status == 2}">
 										<a href="#" class="btn_01" type="button" onclick="review(this, 2)">通过<b></b></a>&nbsp;
 										<a href="#" class="btn_01" type="button" onclick="review(this, 1)">退回<b></b></a>&nbsp;
 									</c:if>

src/com/jshx/paymentItemHis/entity/PaymentItemHis.java

@@ -286,6 +286,9 @@ public class PaymentItemHis extends BaseModel
 	 * 是否财务用章
 	 */
 	private String isCwyz;
+
+	/** 财务用章时间 */
+	protected Date yzTime;
 	
 	public PaymentItemHis(){
 	}
@@ -964,4 +967,12 @@ public class PaymentItemHis extends BaseModel
 	public void setJfpzTime(Date jfpzTime) {
 		this.jfpzTime = jfpzTime;
 	}
+
+	public Date getYzTime() {
+		return yzTime;
+	}
+
+	public void setYzTime(Date yzTime) {
+		this.yzTime = yzTime;
+	}
 }

src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java

@@ -250,6 +250,7 @@ public class PaymentItemHisAction extends BaseAction
 		PaymentItemHis model = paymentItemHisService.getById(id);
 		model.setIsCwyz("1");
 		model.setJbr(this.getLoginUser().getDisplayName());
+		model.setYzTime(new Date());
 		paymentItemHisService.update(model);
 		//TODO 新增表人防费，把他加入人防费表内
 		if(model.getXmxxb() != null) {

src/com/jshx/rfxm/entity/Rfxm.java

@@ -307,6 +307,19 @@ public class Rfxm extends BaseModel
 	private Integer tqjn;
 	private Integer sfxxStatus;
 
+	/**
+	 * 人防用章时间
+	 */
+	private Date yzTime;
+
+	public Date getYzTime() {
+		return yzTime;
+	}
+
+	public void setYzTime(Date yzTime) {
+		this.yzTime = yzTime;
+	}
+
 	public Integer getTqjn() {
 		return tqjn;
 	}

src/com/jshx/rfxm/entity/RfxmSfxx.java

@@ -279,6 +279,8 @@ public class RfxmSfxx extends BaseModel {
 
     private String paymentHisId;
 
+    private Date fkTime;
+
     public RfxmSfxx() {}
 
     // 2019-6-27 v4
@@ -948,4 +950,12 @@ public class RfxmSfxx extends BaseModel {
     public void setZslxdbh(String zslxdbh) {
         this.zslxdbh = zslxdbh;
     }
+
+    public Date getFkTime() {
+        return fkTime;
+    }
+
+    public void setFkTime(Date fkTime) {
+        this.fkTime = fkTime;
+    }
 }

src/com/jshx/rfxm/web/RfxmAction.java

@@ -373,6 +373,7 @@ public class RfxmAction extends BaseAction
 		if(pagination.totalCount > 0) {
 			//如果缴费金额为0（或0.0、0.00），则反馈单编号应为空缺。如果缴费金额不为0，则反馈单编号与联系单编号相同。
 			RfxmSfxx s = (RfxmSfxx) pagination.list.get(0);
+			s.setUpdateTime(rfxm.getYzTime());
 			try {
 				double b = Double.parseDouble(s.getYjjemx());
 				if(b != 0) {
@@ -391,7 +392,7 @@ public class RfxmAction extends BaseAction
 			sfxx.setYjjemx(paymentItemHis.getZyjje());
 			sfxx.setShbm(paymentItemHis.getZsdw());
 			sfxx.setZslxdbh(paymentItemHis.getZslxdbh());
-			sfxx.setUpdateTime(paymentItemHis.getUpdateTime());
+			sfxx.setUpdateTime(paymentItemHis.getYzTime());
 			sfxx.setCnjfhj(rfxm.getPaymentLink() != null && rfxm.getPaymentLink() == 3 ? "30日内" : "施工许可前");
 			sfxx.setStatus(10);//审核通过
 			sfxx.setSfxxjbr(paymentItemHis.getJbr());
@@ -400,6 +401,7 @@ public class RfxmAction extends BaseAction
 			pagination.totalCount ++;
 		}
 
+
 		convObjectToJson(pagination, config);
 	}
 
@@ -1254,6 +1256,7 @@ public class RfxmAction extends BaseAction
 	public void rfyz() throws Exception {
 		Rfxm rfxm = rfxmService.getById(ids);
 		rfxm.setIsRfyz(1);
+		rfxm.setYzTime(new Date());
 		rfxm.setJbr(this.getLoginUser().getDisplayName());//盖章的经办人
 		rfxmService.update(rfxm);
 	}
@@ -1290,64 +1293,64 @@ public class RfxmAction extends BaseAction
 					if(file1 != null && file1.size() > 0) {
 						fileName = FileUtils.uploadFile(file1.get(0),file1FileName.get(0), path,UUID.randomUUID().toString());
 						String attachType = fileName.substring(fileName.lastIndexOf(".")+1);
-						rfxmsfxx.setAttachname(file1FileName.get(0));
-						rfxmsfxx.setUrldz(fileName);
-						rfxmsfxx.setFilePath(path);
-						rfxmsfxx.setAttachType(attachType);
-						rfxmsfxx.setXmType("征收联系单");
+						sfxx.setAttachname(file1FileName.get(0));
+						sfxx.setUrldz(fileName);
+						sfxx.setFilePath(path);
+						sfxx.setAttachType(attachType);
+						sfxx.setXmType("征收联系单");
 						//前台显示名称,目前方案为 缴费项目名称.扩展名 eg:配套费.xlsx
-						if (StringUtils.isNotBlank(rfxmsfxx.getAttachType())) {
-							rfxmsfxx.setShowName(rfxmsfxx.getXmType()+"."+rfxmsfxx.getAttachType());
+						if (StringUtils.isNotBlank(sfxx.getAttachType())) {
+							sfxx.setShowName(sfxx.getXmType()+"."+sfxx.getAttachType());
 						} else {
-							rfxmsfxx.setShowName("");
+							sfxx.setShowName("");
 						}
 					}
 
 					if(file2 != null && file2.size() > 0) {
 						fileName = FileUtils.uploadFile(file2.get(0),file2FileName.get(0), path,UUID.randomUUID().toString());
 						String attachType = fileName.substring(fileName.lastIndexOf(".")+1);
-						rfxmsfxx.setAttachnameFk(file2FileName.get(0));
-						rfxmsfxx.setUrldzFk(fileName);
-						rfxmsfxx.setFilePathFk(path);
-						rfxmsfxx.setAttachTypeFk(attachType);
-						rfxmsfxx.setXmTypeFk("税务反馈单");
+						sfxx.setAttachnameFk(file2FileName.get(0));
+						sfxx.setUrldzFk(fileName);
+						sfxx.setFilePathFk(path);
+						sfxx.setAttachTypeFk(attachType);
+						sfxx.setXmTypeFk("税务反馈单");
 						//前台显示名称,目前方案为 缴费项目名称.扩展名 eg:配套费.xlsx
-						if (StringUtils.isNotBlank(rfxmsfxx.getAttachTypeFk())) {
-							rfxmsfxx.setShowNameFk(rfxmsfxx.getXmTypeFk()+"."+rfxmsfxx.getAttachTypeFk());
+						if (StringUtils.isNotBlank(sfxx.getAttachTypeFk())) {
+							sfxx.setShowNameFk(sfxx.getXmTypeFk()+"."+sfxx.getAttachTypeFk());
 						} else {
-							rfxmsfxx.setShowNameFk("");
+							sfxx.setShowNameFk("");
 						}
 					}
 
 					if(file3 != null && file3.size() > 0) {
 						fileName = FileUtils.uploadFile(file3.get(0),file3FileName.get(0), path,UUID.randomUUID().toString());
 						String attachType = fileName.substring(fileName.lastIndexOf(".")+1);
-						rfxmsfxx.setAttachnameSq(file3FileName.get(0));
-						rfxmsfxx.setUrldzSq(fileName);
-						rfxmsfxx.setFilePathSq(path);
-						rfxmsfxx.setAttachTypeSq(attachType);
-						rfxmsfxx.setXmTypeSq("先行缴纳配套费申请");
+						sfxx.setAttachnameSq(file3FileName.get(0));
+						sfxx.setUrldzSq(fileName);
+						sfxx.setFilePathSq(path);
+						sfxx.setAttachTypeSq(attachType);
+						sfxx.setXmTypeSq("先行缴纳配套费申请");
 						//前台显示名称,目前方案为 缴费项目名称.扩展名 eg:配套费.xlsx
-						if (StringUtils.isNotBlank(rfxmsfxx.getAttachTypeSq())) {
-							rfxmsfxx.setShowNameSq(rfxmsfxx.getXmTypeSq()+"."+rfxmsfxx.getAttachTypeSq());
+						if (StringUtils.isNotBlank(sfxx.getAttachTypeSq())) {
+							sfxx.setShowNameSq(sfxx.getXmTypeSq()+"."+sfxx.getAttachTypeSq());
 						} else {
-							rfxmsfxx.setShowNameSq("");
+							sfxx.setShowNameSq("");
 						}
 					}
 
 					if(file4 != null && file4.size() > 0) {
 						fileName = FileUtils.uploadFile(file4.get(0),file4FileName.get(0), path,UUID.randomUUID().toString());
 						String attachType = fileName.substring(fileName.lastIndexOf(".")+1);
-						rfxmsfxx.setAttachnameZm(file4FileName.get(0));
-						rfxmsfxx.setUrldzZm(fileName);
-						rfxmsfxx.setFilePathZm(path);
-						rfxmsfxx.setAttachTypeZm(attachType);
-						rfxmsfxx.setXmTypeZm("完税证明");
+						sfxx.setAttachnameZm(file4FileName.get(0));
+						sfxx.setUrldzZm(fileName);
+						sfxx.setFilePathZm(path);
+						sfxx.setAttachTypeZm(attachType);
+						sfxx.setXmTypeZm("完税证明");
 						//前台显示名称,目前方案为 缴费项目名称.扩展名 eg:配套费.xlsx
-						if (StringUtils.isNotBlank(rfxmsfxx.getAttachTypeZm())) {
-							rfxmsfxx.setShowNameZm(rfxmsfxx.getXmTypeZm()+"."+rfxmsfxx.getAttachTypeZm());
+						if (StringUtils.isNotBlank(sfxx.getAttachTypeZm())) {
+							sfxx.setShowNameZm(sfxx.getXmTypeZm()+"."+sfxx.getAttachTypeZm());
 						} else {
-							rfxmsfxx.setShowNameZm("");
+							sfxx.setShowNameZm("");
 						}
 					}
 				}catch (Exception e) {
@@ -1366,6 +1369,7 @@ public class RfxmAction extends BaseAction
 				if (null != rfxmsfxx.getYjjemx() && !(rfxmsfxx.getYjjemx()).equalsIgnoreCase(sfxx.getYjjemx())) {
 					sfxx.setYjjemx(rfxmsfxx.getYjjemx());
 				}
+				sfxx.setFkTime(rfxmsfxx.getFkTime());
 
 
 				if (null != rfxmsfxx.getBeizhu() && !(rfxmsfxx.getBeizhu()).equalsIgnoreCase(sfxx.getBeizhu())) {