修改问题

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

@@ -201,10 +201,10 @@
                     {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) {
+							if (rec.status==0 || rec.status == 1) {
 							    return "待复核";
 							}
-							if (rec.status==1 || rec.status == 2) {
+							if (rec.status == 2) {
 								return "是";
 							}
                         }},

src/com/jshx/jfzm/web/JfzmAction.java

@@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -53,6 +54,8 @@ public class JfzmAction extends BaseAction {
     @Autowired
     private WwjdclinfoService wwjdclinfoService;
 
+    private List<Wwjdclinfo> wwjdclinfos = new ArrayList<>();
+
 
     @Autowired
     private ZsdwService zsdwService;

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

@@ -302,6 +302,19 @@ public class Rfxm extends BaseModel
 	 */
 	private String sfxmlxdbh;
 
+	/**
+	 * 提前缴纳配套费
+	 */
+	private Integer tqjn;
+
+	public Integer getTqjn() {
+		return tqjn;
+	}
+
+	public void setTqjn(Integer tqjn) {
+		this.tqjn = tqjn;
+	}
+
 	public String getSfxmlxdbh() {
 		return sfxmlxdbh;
 	}

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

@@ -9,9 +9,7 @@ import com.jshx.core.json.DateJsonValueProcessor;
 
 import com.jshx.core.utils.*;
 import com.jshx.dxpz.service.DxpzService;
-import com.jshx.mobile.utils.JsonUtil;
 import com.jshx.module.admin.entity.User;
-import com.jshx.module.admin.web.action.CommonAction;
 import com.jshx.paymentItemHis.entity.PaymentItemHis;
 import com.jshx.paymentItemHis.service.PaymentItemHisService;
 import com.jshx.sdjd.entity.Sdjd;
@@ -20,15 +18,9 @@ import com.jshx.xmhf.entity.Xmhf;
 import com.jshx.xmhf.service.XmhfService;
 import com.jshx.xmxxb.entity.Xmxxb;
 import com.jshx.xmxxb.service.XmxxbService;
-import com.jshx.yzscw.yzscwjzpz.entity.Yzscwjzpz;
-import com.jshx.yzssfgl.entity.Yzsdicgl;
 import com.jshx.yzssfgl.entity.Yzssfgl;
-import com.jshx.yzssfgl.service.YzsdicglService;
 import com.jshx.yzssfgl.service.YzssfglService;
-import com.jshx.zzhkppj.entity.Zzhkppj;
 import com.jshx.zzhkppj.service.ZzhkppjService;
-import com.jshx.rfxm.entity.*;
-import com.jshx.zzhgl.entity.Zzh;
 import com.jshx.zzhgl.service.ZzhglService;
 import com.jshx.zzhqfdz.entity.Zzhqfdz;
 import com.jshx.zzhqfdz.service.ZzhqfdzService;
@@ -654,6 +646,7 @@ public class RfxmAction extends BaseAction
 				if(rfxm.getPaymentLink() != 3) {//提前缴纳选未选是
 					sfxx.setStatus(2);
 				} else if(sfxx.getTqjn() != 1) {
+					rfxm.setTqjn(sfxx.getTqjn());
 					sfxx.setStatus(2);
 				} else if(sfxx.getStatus() == 1) {//提前选是，并且复核过1次，页面显示补录
 					sfxx.setStatus(2);
@@ -670,6 +663,7 @@ public class RfxmAction extends BaseAction
 				//退回
 				rfxmSfxxService.deleteWithFlag(sfxx.getId());
 
+				rfxm.setTqjn(null);
 				rfxm.setSfxmlxdbh(null);
 				rfxmService.update(rfxm);
 			}