Skip to content

N
njzsb
Commit ccb2ec37 authored by 徐州's avatar 徐州
Browse files
Options

修改部分问题

parent a1f3b07d
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 19 deletions
WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp
View file @ ccb2ec37
......@@ -599,7 +599,7 @@
field: 'op1', title: '关联操作', width: 300, align: 'center', formatter: function (value, rec) {
return "<a class='btn_01_mini' onclick=asy_tb()>同步施工许可<b></b></a>\n" +
" <a class='btn_01_mini' onclick=doPrint('pre')>打印缴费凭证<b></b></a>\n" +
" <a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n" +
" <a class='btn_01_mini' onclick=one_book()>一般缴款书<b></b></a>";
}
......@@ -641,16 +641,14 @@
</script>
<script>
function doPrint(type) {
function doPrint(id) {
var jatoolsPrinter = document.getElementById("jatoolsPrinter");
$.ajax({
url : "${ctx}/jsp/jfzm/queryDetail.action",
type: 'post',
dataType: 'json',
data:{
id : "${rfxm.id}",
zslxdbh : "${zslxdbh}"
id : id
},
async : false,
});
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp
View file @ ccb2ec37
......@@ -42,9 +42,10 @@
<%--createWindow("win_rfxmsfxx","添加收费信息","410px","210px",900,600,"${ctx}/jsp/rfxm/rfxmSfxxAdd.action?flag=add&rfxm.id="+row_id+"&dt="+dt.getTime())--%>
}
<%-- 修改收费信息 --%>
function edit(row_id) {
function edit(type,row_id) {
var dt = new Date();
createSimpleWindow("win_rfxmsfxx","修改收费信息","${ctx}/jsp/rfxm/rfxmSfxxEdit.action?flag=edit&ids="+row_id+"&dt="+dt.getTime(),900,600);
// type=0 编辑 type=1补录
createSimpleWindow("win_rfxmsfxx","修改收费信息","${ctx}/jsp/rfxm/rfxmSfxxEdit.action?flag=edit&ids="+row_id+"&dt="+dt.getTime() + "&type=" + type,900,600);
}
<%-- 查看收费信息 --%>
......@@ -135,16 +136,18 @@
columns:[[
{field:'op',title:'操作',width:130,align:'left',formatter:function(value,rec){
var btnTag = "";
if(rec.statusCnjfhj == 0){
btnTag += "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a>"+
"<c:if test='<%=permissions.containsKey("修改收费信息")%>'>"+
"<a class='btn_01_mini' onclick=edit('"+rec.id+"') >修改<b></b></a>"+
"</c:if>";
}else {
btnTag += "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a>";
}
if (rec.typeCnjfhj == 2 && rec.statusCnjfhj == 0) {
btnTag += "<a class='btn_01_mini' onclick=produceNotice(3,'"+rec.id+"') >生成通知书<b></b></a>"
if(rec.id.length > 0) {
if(rec.statusJBFH == 2){
btnTag += "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a>";
}else {
btnTag += "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a>"+
"<c:if test='<%=permissions.containsKey("修改收费信息")%>'>"+
"<a class='btn_01_mini' onclick=edit(0,'"+rec.id+"') >修改<b></b></a>"+
"</c:if>";
}
if (rec.tqjn == 1 && rec.statusJBFH == 2) {//延后缴纳并且已通过核验，显示补录
btnTag += "<a class='btn_01_mini' onclick=edit(1,'"+rec.id+"') >补录<b></b></a>"
}
}
return btnTag;
}},
......
src/com/jshx/jfzm/web/JfzmAction.java
View file @ ccb2ec37
......@@ -45,6 +45,7 @@ public class JfzmAction extends BaseAction {
String gcxmmc;
String jfhj;
String hczt;
String id;
Rfxm rfxm = new Rfxm();
Xmxxb xmxxb = new Xmxxb();
......@@ -126,7 +127,7 @@ public class JfzmAction extends BaseAction {
* 打印缴费证明时，查询所需要的数据
*/
public void queryDetail() {
rfxm = rfxmService.getById(rfxm.getId());
rfxm = rfxmService.getById(id);
xmxxb = xmxxbService.getById(rfxm.getXmxxbId());
paymentItemHis = paymentItemHisService.getById(rfxm.getPaymentHisId());
}
......@@ -202,4 +203,12 @@ public class JfzmAction extends BaseAction {
public void setHczt(String hczt) {
this.hczt = hczt;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
}
src/com/jshx/paymentItemHis/entity/PaymentItemHis.java
View file @ ccb2ec37
......@@ -248,6 +248,11 @@ public class PaymentItemHis extends BaseModel
* 经办人用户id
*/
private String operatorId;
/**
* 经办人
*/
private String jbr;
private User operator;
......@@ -940,4 +945,12 @@ public class PaymentItemHis extends BaseModel
public void setIsCwyz(String isCwyz) {
this.isCwyz = isCwyz;
}
public String getJbr() {
return jbr;
}
public void setJbr(String jbr) {
this.jbr = jbr;
}
}
src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java
View file @ ccb2ec37
......@@ -340,6 +340,7 @@ public class PaymentItemHisAction extends BaseAction
paymentItemHis.setDeptId(this.getLoginUserDepartmentId());
paymentItemHis.setDelFlag(0);
paymentItemHis.setYzsFlag(2);
paymentItemHis.setJbr(this.getLoginUser().getDisplayName());
paymentItemHisService.save(paymentItemHis);
Map<String, Object> paraMap = new HashMap<String, Object>();
paraMap.put("slbh", paymentItemHis.getSlbh().trim());
......
src/com/jshx/rfxm/web/RfxmAction.java
View file @ ccb2ec37
......@@ -17,6 +17,8 @@ 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;
import com.jshx.sdjd.service.SdjdService;
import com.jshx.xmhf.entity.Xmhf;
......@@ -221,6 +223,8 @@ public class RfxmAction extends BaseAction
@Autowired
private PaymentVoucherHisService paymentVoucherHisService;
@Autowired
private PaymentItemHisService paymentItemHisService;
@Autowired
private PaymentVoucherService paymentVoucherService;
@Autowired
private BillManagerService billManagerService;
......@@ -1197,6 +1201,22 @@ public class RfxmAction extends BaseAction
List sfxxs = rfxmSfxxService.findRfxmSfxx(tempMap);*/
pagination = rfxmSfxxService.findByPage(pagination, paraMap);
rfxm = rfxmService.getById(ids);
if(!TextUtils.isEmpty(rfxm.getPaymentHisId())) {
PaymentItemHis paymentItemHis = paymentItemHisService.getById(rfxm.getPaymentHisId());
RfxmSfxx sfxx = new RfxmSfxx();
sfxx.setSfxmmc(paymentItemHis.getXmmc());
sfxx.setSfxmlxdbh(paymentItemHis.getZslxdbh());
sfxx.setYjjemx(paymentItemHis.getZyjje());
sfxx.setShbm(paymentItemHis.getZsdw());
sfxx.setZslxdbh(paymentItemHis.getZslxdbh());
sfxx.setCreateTime(paymentItemHis.getUpdateTime());
sfxx.setStatusJBFH(2);
sfxx.setSfxxjbr(paymentItemHis.getJbr());
pagination.list.add(0,sfxx);
pagination.totalCount ++;
}
convObjectToJson(pagination, config);
}
/**
......@@ -1255,6 +1275,19 @@ public class RfxmAction extends BaseAction
pagination = rfxmJktzsService.findByPage(pagination, paraMap);
// if(!TextUtils.isEmpty(rfxm.getPaymentHisId())) {
// PaymentItemHis paymentItemHis = paymentItemHisService.getById(rfxm.getPaymentHisId());
// RfxmSfxx sfxx = new RfxmSfxx();
// sfxx.setSfxmmc(paymentItemHis.getXmmc());
// sfxx.setSfxmlxdbh(paymentItemHis.getZslxdbh());
// sfxx.setYjjemx(paymentItemHis.getZyjje());
// sfxx.setShbm(paymentItemHis.getZsdw());
// sfxx.setZslxdbh(paymentItemHis.getZslxdbh());
// sfxx.setCreateTime(paymentItemHis.getCreateTime());
// sfxx.setStatusJBFH(2);
// }
convObjectToJson(pagination, config);
}
......@@ -1386,9 +1419,12 @@ public class RfxmAction extends BaseAction
Map<String, Object> paramMap = new HashMap<>();
List<String> remarks = yzssfglService.getJktzsRemarks(paramMap);
String remark = StringUtils.isBlank(remarks.get(0))?"此轮不涉及":remarks.get(0);
//将已存在的复制到打印用的list中
rfxmSfxx4Print.addAll(rfxmSfxx);
//end 2019-6-25
if (this.getLoginUser() == null) {
this.getResponse().getWriter().println("{\"result\":false,\"message\":\""+"当前登录信息失效,请重新登录!"+"\"}");
......@@ -2182,7 +2218,7 @@ public class RfxmAction extends BaseAction
}
}else {
//id为空
message = "未查询到相关收费信息记录";
message = "未查询x到相关收费信息记录";
getResponse().getWriter().println("{\"result\":false,\"message\":"+message+"\"}");
}
}catch (Exception e) {
......
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