Merge branch 'master' of http://gitlab.house365.com/xuzhou/njzsb

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

@@ -187,8 +187,10 @@
 						var btnTag = "";
 						if(rec.id.length > 0) {
 							btnTag += "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a>";
-							if (rec.status == 1) {//延后缴纳并且已通过核验，显示补录
+							if (rec.status == 1 || rec.status == 3) {//延后缴纳并且已通过核验，显示补录或者补录被退回
 								btnTag += "<a class='btn_01_mini' onclick=edit(1,'"+rec.id+"') >补录<b></b></a>"
+							} else if(rec.status == 2) {//补录过未复核
+								btnTag += "<a class='btn_01_mini' style='opacity: 0.5' >补录<b></b></a>"
 							}
 						} else {
 							btnTag += "<a class='btn_01_mini' onclick=view2('"+rec.paymentHisId+"') >查看<b></b></a>";
@@ -207,10 +209,15 @@
                     {field:'sfxxjbr',title:'信息录入人',width:160},
                     {field:'jbTime',title:'录入时间',width:fixWidth(0.16)},
                     {field:'status',title:'是否复核',width:160,formatter:function (value, rec) {
-							if (rec.status==0 || rec.status == 1) {
+							if (rec.status==0) {
 							    return "待复核";
-							}
-							if (rec.status == 2) {
+							} else if(rec.status == 1) {
+								return "待补录";
+							} else if(rec.status == 2) {
+								return "待复核";
+							} else if(rec.status == 3) {
+								return "已退回";
+							} else if (rec.status == 10) {
 								return "是";
 							}
                         }},

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

@@ -210,7 +210,9 @@ public class RfxmSfxx extends BaseModel {
      * 经办复核状态
      * 0 待审核
      * 1 已通过可补录
-     * 2，已通过，不可以补录
+     * 2,已补录
+     * 3,补录被退回
+     * 10，已通过，不可以补录
      */
     private Integer status;
 

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

@@ -393,7 +393,7 @@ public class RfxmAction extends BaseAction
 			sfxx.setZslxdbh(paymentItemHis.getZslxdbh());
 			sfxx.setUpdateTime(paymentItemHis.getUpdateTime());
 			sfxx.setCnjfhj(rfxm.getPaymentLink() != null && rfxm.getPaymentLink() == 3 ? "30日内" : "施工许可前");
-			sfxx.setStatus(2);
+			sfxx.setStatus(10);//审核通过
 			sfxx.setSfxxjbr(paymentItemHis.getJbr());
 			sfxx.setPaymentHisId(paymentItemHis.getId());
 			pagination.list.add(0,sfxx);
@@ -641,11 +641,11 @@ public class RfxmAction extends BaseAction
 
 			if ("2".equalsIgnoreCase(flag)) {
 				if(rfxm.getPaymentLink() != 3) {//提前缴纳选未选是
-					sfxx.setStatus(2);
+					sfxx.setStatus(10);
 				} else if(sfxx.getTqjn() != 1) {
-					sfxx.setStatus(2);
-				} else if(sfxx.getStatus() == 1) {//提前选是，并且复核过1次，页面显示补录
-					sfxx.setStatus(2);
+					sfxx.setStatus(10);
+				} else if(sfxx.getStatus() == 2) {//提前选是，并且复核过1次，不路过了
+					sfxx.setStatus(10);
 				} else {//提前选是，1次未复核
 					sfxx.setStatus(1);
 				}
@@ -658,13 +658,19 @@ public class RfxmAction extends BaseAction
 				}
 				rfxmService.update(rfxm);
 				rfxmSfxxService.update(sfxx);
+			} else {
+				if(sfxx.getStatus() == 2) {//补录未复核
+					sfxx.setStatus(3);//补录拒绝
+					rfxm.setSfxxStatus(sfxx.getStatus());
+					rfxmSfxxService.update(sfxx);
 				} else {
 					//退回
 					rfxmSfxxService.deleteWithFlag(sfxx.getId());
-
 					rfxm.setTqjn(null);
 					rfxm.setSfxxStatus(null);
 					rfxm.setSfxmlxdbh(null);
+				}
+
 				rfxmService.update(rfxm);
 			}
 		}
@@ -1369,7 +1375,7 @@ public class RfxmAction extends BaseAction
 				rfxm.setSfxmlxdbh(rfxmsfxx.getSfxmlxdbh());
 				rfxmService.update(rfxm);
 
-				sfxx.setStatus(1);
+				sfxx.setStatus(2);//2补录之后，不可以补录了
 				sfxx.setJbTime(new Date());
 				rfxmSfxxService.update(sfxx);
 			}