111

WebRoot/WEB-INF/pages/fstzs/Fstzs_Dsc.jsp

@@ -8,7 +8,7 @@
         
         function addFstzs(id){
         	var dt=new Date();
-            createSimpleWindow("win_fstzs","生成非税通知书","${ctx}/jsp/fstzs/winAddFstzs.action?id=" + id,900,700);
+            createSimpleWindow("win_fstzs","生成非税通知书","${ctx}/jsp/fstzs/winAddFstzs.action?flag=add&id=" + id,900,700);
         	
         }
 

WebRoot/WEB-INF/pages/fstzs/Fstzs_Ysc.jsp

@@ -14,7 +14,7 @@
 
 		function edit(id){
 			var dt=new Date();
-			createSimpleWindow("win_fstzs","修改非税通知书","${ctx}/jsp/fstzs/winAddFstzs.action?id=" + id,900,700);
+			createSimpleWindow("win_fstzs","修改非税通知书","${ctx}/jsp/fstzs/winAddFstzs.action?flag=edit&id=" + id,900,700);
 
 		}
 

src/com/jshx/fstzs/web/FstzsAction.java

@@ -42,6 +42,11 @@ public class FstzsAction extends BaseAction {
      */
     Integer status;
     String id;
+    /**
+     * 区别新增与编辑
+     * add/edit
+     */
+    String flag;
     /**
      * 非税通知书项目生成通知书的时候，上传的列表
      */
@@ -171,27 +176,32 @@ public class FstzsAction extends BaseAction {
      * @return
      */
     public String addFstzs() {
-        FstzsXm dbXm = fstzsXmService.getById(id);
-        //更新数据库项目状态
-        dbXm.setStatus(1);//状态改为已生成、待复核
-        dbXm.setJbr(this.getLoginUser().getDisplayName());
-        dbXm.setBeizhu(fstzsXm.getBeizhu());
-        dbXm.setKhh(fstzsXm.getKhh());
-        dbXm.setMobile(fstzsXm.getMobile());
-        dbXm.setZhanghao(fstzsXm.getZhanghao());
-        //TODO 添加多条记录到fstzs表
-        if(fstzsList.size() > 0) {
-            fstzsList.stream().map(i -> {
-                i.setDelFlag(0);
-                i.setStatus(0);
-                i.setFstzsXm(fstzsXm);
-                i.setGcxmmc(fstzsXm.getGcxmmc());
-                i.setJsdwmc(fstzsXm.getJsdwmc());
-                i.setSlbh(fstzsXm.getSlbh());
-                return i;
-            }).forEach(i-> fstzsService.save(i));
-            fstzsXmService.update(dbXm);
-            return RELOAD;
+        if("add".equals(flag)) {
+            FstzsXm dbXm = fstzsXmService.getById(id);
+            //更新数据库项目状态
+            dbXm.setStatus(1);//状态改为已生成、待复核
+            dbXm.setJbr(this.getLoginUser().getDisplayName());
+            dbXm.setBeizhu(fstzsXm.getBeizhu());
+            dbXm.setKhh(fstzsXm.getKhh());
+            dbXm.setMobile(fstzsXm.getMobile());
+            dbXm.setZhanghao(fstzsXm.getZhanghao());
+            //TODO 添加多条记录到fstzs表
+            if(fstzsList.size() > 0) {
+                fstzsList.stream().map(i -> {
+                    i.setDelFlag(0);
+                    i.setStatus(0);
+                    i.setFstzsXm(fstzsXm);
+                    i.setGcxmmc(fstzsXm.getGcxmmc());
+                    i.setJsdwmc(fstzsXm.getJsdwmc());
+                    i.setSlbh(fstzsXm.getSlbh());
+                    return i;
+                }).forEach(i-> fstzsService.save(i));
+                fstzsXmService.update(dbXm);
+                return RELOAD;
+            }
+
+        } else {//edit
+
         }
         return ERROR;
     }