Commit 7674a063 authored by 徐州's avatar 徐州

完成添加部分代码

parent 5a80ff9d
......@@ -74,8 +74,8 @@
<div class="inner6px">
<form name="myform1" method="post" enctype="multipart/form-data">
<s:token />
<input type="hidden" name="flag" value="${flag}">
<input type="hidden" name="fstzsXm.id" value="${fstzsXm.id}">
<input class="hflag" type="hidden" name="flag" value="${flag}">
<input class="hid" type="hidden" name="fstzsXm.id" value="${fstzsXm.id}">
<div class="cell" style="width: 100%">
<table width="100%" border="0" class="ta-tb">
......@@ -311,6 +311,7 @@
var yjmj = $(texts[i]).parent().parent().children().eq(4).text()
var yjje = $(texts[i]).parent().parent().children().eq(5).children().text()
objNums.push({ jkr: jkr, yjmj: yjmj, yjje: yjje })
// objNums.push({ 'fstzs.jkr': jkr, 'fstzs.yjmj': yjmj, 'fstzs.yjje': yjje })
}
}
......@@ -328,6 +329,7 @@
var yjmj = $(yjmjArr[i]).text()
var yjje = $(yjmjArr[i]).next().children().eq(0).text()
objNums.push({ jkr: jkr, yjmj: yjmj, yjje: yjje })
// objNums.push({ 'fstzs.jkr': jkr, 'fstzs.yjmj': yjmj, 'fstzs.yjje': yjje })
}
}
......@@ -343,6 +345,7 @@
var yjmj = $(nums[i]).parent().prev().text()
var yjje = $(nums[i]).text()
objNums.push({ jkr: jkr, yjmj: yjmj, yjje: yjje })
// objNums.push({ 'fstzs.jkr': jkr, 'fstzs.yjmj': yjmj, 'fstzs.yjje': yjje })
}
}
......@@ -398,7 +401,7 @@
var yjmj = $(nums[i]).parent().prev().text()
var yjje = $(nums[i]).text()
objNums.push({ jkr: jkr, yjmj: yjmj, yjje: yjje })
// objNums.push({ 'fstzs.jkr': jkr, 'fstzs.yjmj': yjmj, 'fstzs.yjje': yjje })
}
}
addyjmj()
......@@ -415,13 +418,19 @@
})
function tijiao() {
var flag = $(".hflag").val()
var id = $(".hid").val()
$.ajax({
async: false,
url: "${ctx}/jsp/rfxm/checkAddFstzs.action",
url: "${ctx}/jsp/fstzs/addFstzsCheck.action",
type: 'post',
dataType: 'json',
async: false,
data: {objNums : objNums},
data: {
jkrList:JSON.stringify(objNums),
flag:flag,
id:id
},
error: function (data) {
$.messager.alert('错误', data.message);
},
......
......@@ -12,6 +12,11 @@
}
function reloadDate(){
$('#pagination').datagrid('clearSelections');
search_fstzsXm();
}
function search_fstzsXm(){
var queryParams = {
"fstzsXm.slbh": $("#slbh").val(),
......
......@@ -207,7 +207,7 @@
<tbody class="add-tr">
<tr class="">
<td class="line-one line-xh">1</td>
<td class=" line-input"><span class="db-num db-num-text"></span><input class="db-input line-input-text" type="text" /></td>
<td class=" line-input"><span class="db-num db-num-text"></span>${fstzsList[0].jkr}</td>
<td class="line-one"></td>
<td class="line-one">150</td>
<td class="line-one line-yjmj"></td>
......
......@@ -21,6 +21,8 @@ public interface FstzsService extends BaseService
*/
public Pagination findByPage(Pagination page, Map<String, Object> paraMap);
public List findList(Map<String, Object> paraMap);
/**
* 根据主键ID查询信息
......
......@@ -44,6 +44,10 @@ public class FstzsServiceImpl extends BaseServiceImpl implements FstzsService
return fstzsDao.findByPage(page, paraMap);
}
@Override
public List findList(Map<String, Object> paraMap) {
return fstzsDao.findByPage(paraMap);
}
/**
* 根据主键ID查询信息
......
package com.jshx.fstzs.web;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.jshx.common.utils.NumberToCN;
import com.jshx.core.base.action.BaseAction;
import com.jshx.core.base.vo.Pagination;
......@@ -48,6 +50,7 @@ public class FstzsAction extends BaseAction {
* add/edit
*/
String flag;
String jkrList;
/**
* 非税通知书项目生成通知书的时候,上传的列表
*/
......@@ -168,6 +171,9 @@ public class FstzsAction extends BaseAction {
try {
//金额转中文
fstzsXm.setYjjedx(NumberToCN.number2CNMontrayUnit(new BigDecimal(fstzsXm.getYjje())));
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",fstzsXm.getSlbh());
fstzsList = fstzsService.findList(params);
} catch (Exception e) {}
return VIEW;
}
......@@ -186,20 +192,8 @@ public class FstzsAction extends BaseAction {
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
......@@ -213,10 +207,11 @@ public class FstzsAction extends BaseAction {
public void checkAddFstzs() throws IOException {
boolean result = true;
String message = "OK";
if(fstzsList == null || fstzsList.size() == 0) {
if(TextUtils.isEmpty(jkrList)) {
message = "请添加缴款人";
result = false;
} else {
fstzsList = new Gson().fromJson(jkrList,new TypeToken<List<Fstzs>>(){}.getType());
//校验输入
//1,校验是否为空
double amount = 0d;
......@@ -248,6 +243,16 @@ public class FstzsAction extends BaseAction {
} else {
message = "校验正确,添加进表,并提交表单";
result = true;
//TODO 添加多条记录到fstzs表
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));
}
}
......@@ -303,4 +308,20 @@ public class FstzsAction extends BaseAction {
public void setFlag(String flag) {
this.flag = flag;
}
public List<Fstzs> getFstzsList() {
return fstzsList;
}
public void setFstzsList(List<Fstzs> fstzsList) {
this.fstzsList = fstzsList;
}
public String getJkrList() {
return jkrList;
}
public void setJkrList(String jkrList) {
this.jkrList = jkrList;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment