Skip to content

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

修改全部问题

parent e5fd607b
Hide whitespace changes
Inline Side-by-side
Showing with 234 additions and 278 deletions
WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucherPrint_GuiHua.jsp
View file @ ba2fa175
......@@ -200,8 +200,7 @@
left: 220px;
top: 123px;
font-size: 24px;
color: red;
font-weight: bolder;
color: #a43635;
}
/*NO.PTF*/
......@@ -209,8 +208,7 @@
left: 920px;
top: 130px;
font-size: 24px;
color: red;
font-weight: bolder;
color: #a43635;
}
......@@ -223,10 +221,10 @@
/*内部使用*/
.f35, .f40 {
left: 800px;
left: 740px;
top: 408px;
color: red;
font-size: 20px;
font-size: 24px;
background-color: #F2F7FD;
z-index: 99;
text-align: center;
......@@ -372,9 +370,6 @@
<img class='screen-only' src="${ctx}/images/img/gz.jpg" style="position:absolute;width:100%;height:100%"/>
<div id='f1' draggable='true' class='f1'>${xmxxb.xxylb}</div>
<div id='f2' draggable='true' class='f2'>${xmxxb.slbh}</div>
<c:if test="${fn:length(xmxxb.jsdw) <= 20 }">
<div>${xmxxb.jsdw}</div>
</c:if>
<c:choose>
<c:when test="${fn:length(xmxxb.jsdw) <= 35 }"> <!--如果 -->
<div id='f3' draggable='true'
......@@ -437,7 +432,7 @@
<div id='32' draggable='true' class='f32'>${paymentItemHis.zslxdbh}</div>
<div id='33' draggable='true' class='f33'>${paymentItemHis.zslxdbh}</div>
<div id='34' draggable='true' class='f34'>${paymentItemHis.jbr}</br>${rfxm.jbr}</div>
<div id='34' draggable='true' class='f34'>${paymentItemHis.jbr}&nbsp;&nbsp;&nbsp;${rfxm.jbr}</div>
<c:if test="${paymentItemHis.isCwyz!='0'}">
<div id='37' draggable='true' class='f37'><img src="${ctx}/images/img/zhang1.png" alt=""></div>
</c:if>
......
WebRoot/WEB-INF/pages/account/paymentVoucher/Wwsqys_Edit4.jsp
View file @ ba2fa175
......@@ -84,7 +84,7 @@
<tr>
<td colspan="5" height="100px" style="text-align:center">
<a href="#" class="btn_01" type="submit" onclick="showUpload()" id="huancun">缓存<b></b></a>&nbsp;
<%-- <a href="#" class="btn_01" type="submit" onclick="syncpz('${xmxxb.xxylb}')" id="jfpz">同步凭证<b></b></a>&nbsp;--%>
<a href="#" class="btn_01" type="submit" onclick="syncpz('${xmxxb.xxylb}')" id="jfpz">同步凭证<b></b></a>&nbsp;
<a href="#" class="btn_01" onclick="parent.close_win('win_paymentItemHis');">关闭<b></b></a>
</td>
</tr>
......
WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp
View file @ ba2fa175
......@@ -710,13 +710,12 @@
if('true'==data.result1){
$.messager.alert('提示','同步成功！');
// search_cktzs();
search_rfxm();
}else{
$.messager.alert('错误','同步时出错！'+data.info);
}
},
error: function(data){
console.log(data);
$.messager.alert('错误','同步时出错！');
}
});
......
WebRoot/WEB-INF/pages/jfzm/jfzm_print.jsp
View file @ ba2fa175
......@@ -88,7 +88,7 @@
/* 电子监管号 */
.f13 {
left: 165px;
top: 707px
top: 707px;
}
/* 年 */
......@@ -191,16 +191,14 @@
left: 220px;
top: 123px;
font-size: 24px;
color: red;
font-weight: bolder;
color: #a43635;
}
/*NO.PTF*/
.f33 {
left: 920px;
top: 130px;
font-size: 24px;
color: red;
font-weight: bolder;
color: #a43635;
}
/*经办人*/
.f34 {
......@@ -210,10 +208,10 @@
}
/*内部使用*/
.f35,.f40 {
left: 800px;
left: 740px;
top: 408px;
color: red;
font-size: 20px;
font-size: 24px;
background-color: #F2F7FD;
z-index: 99;
text-align: center;
......@@ -537,11 +535,8 @@
<%-- isSl != 1 横联--%>
<div id='32' draggable='true' class='f32'>${paymentItemHis.zslxdbh}</div>
<div id='33' draggable='true' class='f33'>${paymentItemHis.zslxdbh}</div>
<div id='34' draggable='true' class='f34'>${paymentItemHis.jbr}</br>${rfxm.jbr}</div>
<c:if test="${rfxm.isRfyz=='1'}">
<div id='37' draggable='true' class='f37'><img src="${ctx}/images/img/zhang1.png" alt=""></div>
</c:if>
<div id='34' draggable='true' class='f34'>${paymentItemHis.jbr}&nbsp;&nbsp;&nbsp;${rfxm.jbr}</div>
<div id='37' draggable='true' class='f37'><img src="${ctx}/images/img/zhang1.png" alt=""></div>
<div id='36' draggable='true' class='f36'><img src="${ctx}/images/img/zhang3.png" alt=""></div>
<c:choose>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Detail.jsp
View file @ ba2fa175
......@@ -208,27 +208,25 @@
<td width="35%" ><s:property value="cnjfhj"/></td>
<th width="15%">反馈日期</th>
<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
<td width="35%" ><s:property value=""/></td>
<td width="35%" ><s:property value="fkTime"/></td>
</tr>
<tr>
<th width="15%">信息录入人</th>
<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
<td width="35%" ><s:property value=""/></td>
<td width="35%" ><s:property value="sfxxjbr"/></td>
<th width="15%">复核人</th>
<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
<td width="35%" ><s:property value=""/></td>
<td width="35%" ><s:property value="sfxxfhr"/></td>
</tr>
<tr>
<th width="15%">经办备注</th>
<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
<td width="35%" ><s:property value=""/></td>
</tr>
<tr>
<td width="35%" ><s:property value="beizhu"/></td>
<th width="15%">复核意见</th>
<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
<td width="35%" ><s:property value=""/></td>
<td width="35%" ><s:property value="sfxxfhyj"/></td>
</tr>
</table>
</div>
</s:iterator>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp
View file @ ba2fa175
......@@ -72,8 +72,7 @@
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "征收联系单未勾选";
return;
message += "征收联系单未勾选、";
}
}
......@@ -86,8 +85,7 @@
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "税务反馈单未勾选";
return;
message += "税务反馈单未勾选、";
}
}
......@@ -100,8 +98,7 @@
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "先行缴纳配套费的申请未勾选";
return;
message += "先行缴纳配套费的申请未勾选、";
}
}
......@@ -114,8 +111,7 @@
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "完税证明未勾选";
return;
message += "完税证明未勾选、";
}
}
......@@ -129,8 +125,7 @@
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "征收联系单未上传";
return;
message += "征收联系单未上传、";
}
obj[value] = name;
obj1[value] = no;
......@@ -144,8 +139,7 @@
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "税务反馈单未上传";
return;
message += "税务反馈单未上传、";
}
obj[value] = name;
obj1[value] = no;
......@@ -159,8 +153,7 @@
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "先行缴纳配套费的申请未上传";
return;
message += "先行缴纳配套费的申请未上传、";
}
obj[value] = name;
obj1[value] = no;
......@@ -174,8 +167,7 @@
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "完税证明未上传";
return;
message += "完税证明未上传、";
}
obj[value] = name;
obj1[value] = no;
......@@ -213,7 +205,7 @@
// return;
// }
if (!boolean1) {
$.messager.alert('提示', message);
$.messager.alert('提示', message.substring(0,message.length - 1));
return;
}
// 验证是否由当前的非税记录信息
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp
View file @ ba2fa175
......@@ -43,6 +43,7 @@
function reloadDate(){
$('#pagination').datagrid('clearSelections');
search_rfxmSfxx();
rfyzCheck()
}
<%-- 页面筛选查询 --%>
......@@ -88,42 +89,49 @@
}
<%-- 人防用章 --%>
function generateNotice(id){
$.messager.confirm("提示", "确认要人防用章？", function(result) {
if(result) {
$.ajax({
url : "${ctx}/jsp/rfxm/rfyz.action",
type: 'post',
dataType: 'json',
data:{
ids : id
},
async : false
});
$(".ye-use").css('display','inline-block')
$(".no_use").css('display','none')
$.messager.alert("提示","操作成功")
reloadDate()
}
});
}
function rfyzCheck() {
var queryParams = {
"ids": $("#ids").val()
};
$.ajax({
url: "${ctx}/jsp/rfxm/rfyzCheck.action",
type: 'post',
dataType: 'json',
async: false,
data: {ids : id},
data: queryParams,
error: function () {
$.messager.alert('错误', '提交出错！');
},
success: function (data) {
if (!data.result) {
$.messager.alert('提示',data.message);
} else {
$.messager.confirm("提示", "确认要人防用章？", function(result) {
if(result) {
$.ajax({
url : "${ctx}/jsp/rfxm/rfyz.action",
type: 'post',
dataType: 'json',
data:{
ids : id
},
async : false
});
$(".ye-use").css('display','inline-block')
$(".no_use").css('display','none')
$.messager.alert("提示","操作成功")
reloadDate()
}
});
if (data.result) {
$(".ye-use").css('display','inline-block')
$(".no_use").css('display','none')
}
}
});
}
}
function produceNotice(flag, row_id){
$.ajax({
......@@ -207,9 +215,10 @@
{field:'cnjfhj',title:'承诺缴费环节',width:160},
{field:'zslxdbh',title:'缴费凭证/反馈单编号',width:200,align:'center'},
{field:'sfxxjbr',title:'信息录入人',width:160},
{field:'updateTime',title:'录入时间',width:fixWidth(0.16)},
{field:'sfxxfhr',title:'复核人',width:160},
{field:'updateTime',title:'用章时间',width:fixWidth(0.16)},
{field:'status',title:'是否复核',width:160,formatter:function (value, rec) {
if (rec.status==0) {
if (rec.status == 0) {
return "待复核";
} else if(rec.status == 1) {
return "待补录";
......@@ -323,10 +332,12 @@
<c:if test="${rfxm.isRfyz != 1}">
<c:if test="${rfxm.isSbj==1}">
<a id="noticeBtn0" href="#" style="opacity: 0.5" class="btn_01 nohover">人防费用章（市本级）<b></b></a>
<a id="noticeBtn0" href="#" style="opacity: 0.5" class="btn_01 nohover no_use">人防费用章（市本级）<b></b></a>
<a id="noticeBtn0" href="#" class="btn_01 ye-use" onclick="generateNotice('${rfxm.id}');">人防费用章（市本级）<b></b></a>
</c:if>
<c:if test="${rfxm.isSbj!=1}">
<a id="noticeBtn0" href="#" style="opacity: 0.5" class="btn_01 nohover">人防费用章（非市本级）<b></b></a>
<a id="noticeBtn0" href="#" style="opacity: 0.5" class="btn_01 nohover no_use">人防费用章（非市本级）<b></b></a>
<a id="noticeBtn0" href="#" class="btn_01 ye-use" onclick="generateNotice('${rfxm.id}');">人防费用章（非市本级）<b></b></a>
</c:if>
</c:if>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Edit.jsp
View file @ ba2fa175
......@@ -42,122 +42,114 @@
$.messager.alert('提示', '请选择反馈日期!');
return
}
$("input[name=file1]").each(function(){
if($(this).val()!="") {
var name = $(this).parent().siblings().find("input").val();
flag1 = $(this).parent().siblings().find("input[type='checkbox']").is(':checked');
if(!flag1)
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "征收联系单未勾选";
return;
}
$("input[name=file1]").each(function(){
if($(this).val()!="") {
var name = $(this).parent().siblings().find("input").val();
flag1 = $(this).parent().siblings().find("input[type='checkbox']").is(':checked');
if(!flag1)
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message += "征收联系单未勾选、";
}
}
});
$("input[name=file2]").each(function(){
if($(this).val()!="") {
var name = $(this).parent().siblings().find("input").val();
flag1 = $(this).parent().siblings().find("input[type='checkbox']").is(':checked');
if(!flag1)
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "税务反馈单未勾选";
return;
}
}
});
$("input[name=file2]").each(function(){
if($(this).val()!="") {
var name = $(this).parent().siblings().find("input").val();
flag1 = $(this).parent().siblings().find("input[type='checkbox']").is(':checked');
if(!flag1)
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message += "税务反馈单未勾选、";
}
}
});
$("input[name=file3]").each(function(){
if($(this).val()!="") {
var name = $(this).parent().siblings().find("input").val();
flag1 = $(this).parent().siblings().find("input[type='checkbox']").is(':checked');
if(!flag1)
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "先行缴纳配套费的申请未勾选";
return;
}
}
});
$("input[name=file3]").each(function(){
if($(this).val()!="") {
var name = $(this).parent().siblings().find("input").val();
flag1 = $(this).parent().siblings().find("input[type='checkbox']").is(':checked');
if(!flag1)
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message += "先行缴纳配套费的申请未勾选、";
}
}
});
$("input[name=file4]").each(function(){
if($(this).val()!="") {
var name = $(this).parent().siblings().find("input").val();
flag1 = $(this).parent().siblings().find("input[type='checkbox']").is(':checked');
if(!flag1)
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "完税证明未勾选";
return;
}
}
});
$("input[name=file4]").each(function(){
if($(this).val()!="") {
var name = $(this).parent().siblings().find("input").val();
flag1 = $(this).parent().siblings().find("input[type='checkbox']").is(':checked');
if(!flag1)
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message += "完税证明未勾选、";
}
}
});
$("input[name=id1]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
var no = $(this).parent().parent().find("input[name=wdno]").val();
if(value=="")
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "征收联系单未上传";
return;
}
obj[value] = name;
obj1[value] = no;
});
$("input[name=id2]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
var no = $(this).parent().parent().find("input[name=wdno]").val();
if(value=="")
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "税务反馈单未上传";
return;
}
obj[value] = name;
obj1[value] = no;
});
$("input[name=id3]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
var no = $(this).parent().parent().find("input[name=wdno]").val();
if(value=="")
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "先行缴纳配套费的申请未上传";
return;
}
obj[value] = name;
obj1[value] = no;
});
$("input[name=id4]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
var no = $(this).parent().parent().find("input[name=wdno]").val();
if(value=="")
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "完税证明未上传";
return;
}
obj[value] = name;
obj1[value] = no;
});
}
});
$("input[name=id1]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
var no = $(this).parent().parent().find("input[name=wdno]").val();
if(value=="")
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message += "征收联系单未上传、";
}
obj[value] = name;
obj1[value] = no;
});
$("input[name=id2]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
var no = $(this).parent().parent().find("input[name=wdno]").val();
if(value=="")
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message += "税务反馈单未上传、";
}
obj[value] = name;
obj1[value] = no;
});
$("input[name=id3]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
var no = $(this).parent().parent().find("input[name=wdno]").val();
if(value=="")
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message += "先行缴纳配套费的申请未上传、";
}
obj[value] = name;
obj1[value] = no;
});
$("input[name=id4]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
var no = $(this).parent().parent().find("input[name=wdno]").val();
if(value=="")
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message += "完税证明未上传、";
}
obj[value] = name;
obj1[value] = no;
});
$("#allFileName").val(JSON.stringify(obj));
$("#originFileName").val(JSON.stringify(obj1));
......@@ -172,7 +164,7 @@
}
if (!boolean1) {
$.messager.alert('提示', message);
$.messager.alert('提示', message.substring(0,message.length - 1));
return;
}
var ids = $("#sfxxid").val();
......@@ -512,7 +504,7 @@
<tr>
<th width="15">备注</th>
<td width="85%">
<textarea id="beizhu" name="rfxmsfxx.beizhu" style="width: 95%" ></textarea>
<textarea id="beizhu" name="rfxmsfxx.beizhu" value="${rfxmsfxx.beizhu}" style="width: 95%" ></textarea>
</td>
</tr>
</table>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_View.jsp
View file @ ba2fa175
......@@ -327,17 +327,9 @@
<td width="35%">
<input id="cnjfhj" name="rfxmsfxx.cnjfhj" style="width:90%" value="${rfxmsfxx.cnjfhj}" readonly/>
</td>
<th width="15">反馈日期</th>
<td width="35%" >
<input style="width: 75%;" disabled name="zzhkppjList[${st.index}].kprq" id="kprq" style="width: 140px"
type="text" class="Wdate" value="${item1.kprq}"
onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" >
</td>
</tr>
<tr>
<th width="15">备注</th>
<th width="15">缴费凭证编号</th>
<td width="35%">
<input id="zslxdbh" name="rfxmsfxx.beizhu" disabled style="width:90%" value="${rfxmsfxx.zslxdbh}" readonly/>
<input id="zslxdbh" name="rfxmsfxx.zslxdbh" disabled style="width:90%" value="${rfxmsfxx.zslxdbh}" readonly/>
</td>
</tr>
</table>
......@@ -392,17 +384,11 @@
<td width="35%">
<input id="cnjfhj" name="rfxmsfxx.cnjfhj" style="width:90%" value="${rfxmsfxx.cnjfhj}" readonly/>
</td>
<th width="15">反馈日期</th>
<td width="35%" >
<input style="width: 75%;" disabled name="rfxmsfxx.fkTime" id="fkTime" style="width: 140px"
type="text" class="Wdate" value="${rfxmsfxx.fkTime}"
onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" >
</td>
</tr>
<tr>
<th width="15">备注</th>
<td width="35%">
<input id="zslxdbh" name="rfxmsfxx.beizhu" style="width:90%" value="${rfxmsfxx.zslxdbh}" readonly/>
<input id="zslxdbh" name="rfxmsfxx.beizhu" style="width:90%" value="${rfxmsfxx.beizhu}" readonly/>
</td>
</tr>
<tr>
......
module/com/jshx/module/admin/web/action/CommonAction.java
View file @ ba2fa175
......@@ -1859,7 +1859,7 @@ public class CommonAction extends BaseAction
// String url = "http://localhost:28080/util/getInfo.action";
// String url = "http://192.168.1.248:8080/zsbwwsb1/util/getInfo.action";
// String url = "http://localhost:8081/util/getInfo.action";
// String url = "http://localhost:8081/util/getInfo.action";NJSGXKPlat
if(map111 != null)
{
map.putAll(map111);
......
src/com/jshx/account/paymentVoucher/web/PaymentVoucherAction.java
View file @ ba2fa175
......@@ -1533,7 +1533,7 @@ public class PaymentVoucherAction extends BaseAction
return ;
}
PaymentItemHis paymentItemHis = paymentItemHisService.getByXmbId(xmxxb.getId());
PaymentItemHis paymentItemHis = paymentItemHisService.getByXmbId(xmxxb.getId());
Map<String,String> map = new HashMap();
......@@ -1617,8 +1617,8 @@ public class PaymentVoucherAction extends BaseAction
{
dwdm =StringUtil.isEmpty(xmxxb.getDwdm())? zsdwService.getDwdm(this.getLoginUserDepartmentId()):xmxxb.getDwdm();
}
String result3 = CommonAction.send2wwSGXK(xmxxb,null,dwdm,map);
// String result3 = "true";
// String result3 = CommonAction.send2wwSGXK(xmxxb,null,dwdm,map);//arvin1122
String result3 = "true";
// String result3 = com.jshx.module.admin.web.action.CommonAction.send2ww(map,null);
if(StringUtil.isEmpty(result3)||"false".equals(result3)) {
......@@ -1633,8 +1633,15 @@ public class PaymentVoucherAction extends BaseAction
/*if(paymentItemHis.getYzsFlag() == 2){
savePaymentVerification(xmxxb, paymentItemHis);
}*/
HashMap<String, Object> rfxmParam = new HashMap<>();
rfxmParam.put("paymentHisId",paymentItemHis.getId());
List<Rfxm> rfxmList = rfxmService.findRfxm(rfxmParam);
if(rfxmList != null && rfxmList.size() > 0) {//同步成功记录下，不允许再次同步了
Rfxm rfxm = rfxmList.get(0);
rfxm.setIsTb(1);
rfxmService.update(rfxm);
}
this.getResponse().getWriter().println("{\"result1\":\"true\",\"info\":\"查询成功\"}");
return ;
}
}
......
src/com/jshx/jfzm/web/JfzmAction.java
View file @ ba2fa175
......@@ -157,9 +157,9 @@ public class JfzmAction extends BaseAction {
}
if(r.getIsRfyz() != null && r.getIsRfyz() == 1) {//人防用章后可以同步
if(r.getIsRfyz() != null && r.getIsRfyz() == 1 && (r.getIsTb() == null || r.getIsTb() != 1)) {//人防用章后可以同步
r.setEnableTb(1);
} else if(sfxx != null && sfxx.getTqjn() != null && sfxx.getTqjn() == 1 && sfxx.getStatus() != 0) {//显示补录时可以同步
} else if(sfxx != null && sfxx.getTqjn() != null && sfxx.getTqjn() == 1 && sfxx.getStatus() != 0 && (r.getIsTb() == null || r.getIsTb() != 1)) {//显示补录时可以同步
r.setEnableTb(1);
} else {
r.setEnableTb(0);
......@@ -191,6 +191,7 @@ public class JfzmAction extends BaseAction {
xmxxb = xmxxbService.getBySlbh(xmxxb.getSlbh());
Map map = new HashMap();
map.put("xxylb",xmxxb.getXxylb());
map.put("fjqm","一般缴款书");
Pagination pagination1 = wwjdclinfoService.findByPage(new Pagination(1,0),map);
wwjdclinfos = pagination1.getListOfObject();
return EDIT;
......
src/com/jshx/rfxm/entity/Rfxm.java
View file @ ba2fa175
......@@ -312,6 +312,13 @@ public class Rfxm extends BaseModel
*/
private Date yzTime;
/**
* 施工许可是否同步过
* sfxxStatus= 10可以同步1次
* sfxxStatus= 1 可以同步1次
*/
private Integer isTb;
public Date getYzTime() {
return yzTime;
}
......@@ -819,4 +826,12 @@ public class Rfxm extends BaseModel
public void setSfxxStatus(Integer sfxxStatus) {
this.sfxxStatus = sfxxStatus;
}
public Integer getIsTb() {
return isTb;
}
public void setIsTb(Integer isTb) {
this.isTb = isTb;
}
}
src/com/jshx/rfxm/service/RfxmSfxxService.java
View file @ ba2fa175
......@@ -22,6 +22,7 @@ public interface RfxmSfxxService extends BaseService
public RfxmSfxx getById(String id);
public RfxmSfxx getByYbjksbh(String ybjksbh);
public RfxmSfxx getByXmdm(String xmdm);
public RfxmSfxx getByRfxmId(String rfxmid);
// public List<RfxmSfxx> getBy
......
src/com/jshx/rfxm/service/impl/RfxmSfxxServiceImpl.java
View file @ ba2fa175
......@@ -62,6 +62,14 @@ public class RfxmSfxxServiceImpl extends BaseServiceImpl implements RfxmSfxxServ
return rfxmSfxx;
}
@Override
public RfxmSfxx getByRfxmId(String rfxmid) {
Map<String,Object> paramMap = new HashMap<>();
paramMap.put("rfxmid",rfxmid);
RfxmSfxx rfxmSfxx = (RfxmSfxx)rfxmSfxxDao.findObjectByFieldsMap(RfxmSfxx.class,paramMap);
return rfxmSfxx;
}
/**
* 保存信息
* @param rfxmSfxx 信息
......
src/com/jshx/rfxm/web/RfxmAction.java
View file @ ba2fa175
......@@ -376,10 +376,11 @@ public class RfxmAction extends BaseAction
s.setUpdateTime(rfxm.getYzTime());
try {
double b = Double.parseDouble(s.getYjjemx());
if(b != 0) {
if(b != 0 && s.getStatus() != null && s.getStatus() > 0) {
s.setZslxdbh(s.getSfxmlxdbh());
} else {
s.setZslxdbh("");
}
s.setZslxdbh("");
} catch (Exception e) {
s.setZslxdbh("");
}
......@@ -520,7 +521,6 @@ public class RfxmAction extends BaseAction
rfxmSfxx = rfxmSfxxService.findRfxmSfxx(paraMap);
paymentItemHis = paymentItemHisService.getById(rfxm.getPaymentHisId());
paymentItemHis.setSlbh(rfxm.getJktzsbh());
paymentItemHis.setZsdw("南京市城市建设费用征收服务中心");
Map<String, Object> paramMap = new HashMap<>();
List<String> remarks = yzssfglService.getJktzsRemarks(paramMap);
......@@ -569,7 +569,7 @@ public class RfxmAction extends BaseAction
rfxmsfxx = new RfxmSfxx();
rfxmsfxx.setSfxmmc("城市基础设施配套费");
rfxmsfxx.setYjjemx(paymentItemHis.getZyjje());
rfxmsfxx.setShbm("南京市城市建设费用征收服务中心");
rfxmsfxx.setShbm(paymentItemHis.getZsdw());
rfxmsfxx.setZslxdbh(paymentItemHis.getZslxdbh());
rfxmsfxx.setSfxmlxdbh(rfxm.getJktzsbh());
rfxmsfxx.setCnjfhj(rfxm.getPaymentLink() ==1 ? "施工许可前" : "30日内");
......@@ -580,45 +580,6 @@ public class RfxmAction extends BaseAction
}
}
/**
* 复核项目信息
*/
public void rfxmReview() throws IOException {
String message = "";
boolean reviewFlag = false;
if (StringUtils.isNotBlank(flag) && null != rfxm) {
Rfxm rfxmById = rfxmService.getById(rfxm.getId());
if ("2".equalsIgnoreCase(flag)) {
rfxmById.setStatusJBFH(2);
rfxmById.setFhTime(new Date());
rfxmById.setDsdwfhr(this.getLoginUser().getDisplayName());
if (StringUtils.isNotBlank(rfxmsfxx.getSfxxfhyj())){
rfxmById.setFhyj(rfxmsfxx.getSfxxfhyj());
}
message = "复核通过";
reviewFlag = true;
}else if ("1".equalsIgnoreCase(flag)){
//退回
rfxmById.setStatusJBFH(1);
rfxmById.setFhTime(new Date());
rfxmById.setDsdwfhr(this.getLoginUser().getDisplayName());
if (StringUtils.isNotBlank(rfxmsfxx.getSfxxfhyj())) {
rfxmById.setFhyj(rfxmsfxx.getSfxxfhyj());
}
message = "退回成功";
reviewFlag = true;
}else {
message = "操作失败,请刷新页面再试";
}
try {
rfxmService.update(rfxmById);
}catch (Exception e) {
message = "操作失败,请稍后再试";
}
this.getResponse().getWriter().println("{\"result\":"+reviewTag+",\"message\":\"" + message + "!"+"\"}");
}
}
public void rfxmSfxxReviewCheck() throws IOException {
RfxmSfxx sfxx = rfxmSfxxService.getById(rfxmsfxx.getId());
......@@ -653,6 +614,9 @@ public class RfxmAction extends BaseAction
}
rfxm.setTqjn(sfxx.getTqjn());
rfxm.setSfxxStatus(sfxx.getStatus());
if(sfxx.getStatus() == 1 || sfxx.getStatus() == 10) {
rfxm.setIsTb(0);
}
sfxx.setFhTime(new Date());
sfxx.setSfxxfhr(this.getLoginUser().getDisplayName());
if (StringUtils.isNotBlank(rfxmsfxx.getSfxxfhyj())){
......@@ -1230,26 +1194,18 @@ public class RfxmAction extends BaseAction
}
public void rfyzCheck() throws IOException {
Rfxm rfxm = rfxmService.getById(ids);
Map<String, Object> paraMap = new HashMap<>();
paraMap.put("rfxmid", rfxm.getId());
rfxmSfxx = rfxmSfxxService.findRfxmSfxx(paraMap);
/**
* 判断是否可以人防用章
* @throws Exception
*/
public void rfyzCheck() throws Exception {
if(TextUtils.isEmpty(rfxm.getId())) {
rfxm.setId(ids);
}
view();
boolean result = true;
String message = "";
// if(rfxm.getIsRfyz() == 1) {
// result = false;//人防已经用章
// message = "人防已经用章";
// } else if("004".equals(rfxm.getMjyj())) {//非市本级的房改办项目
// result = false;//非市本级
// message = "项目来源为房改办，不需要人防用章";
// } else if(rfxmSfxx == null || rfxmSfxx.size() == 0) {
// result = false;//未添加人防费
// message = "请先添加人防费";
// } else if(rfxmSfxx.get(0).getStatus() != 2) {
// result = false;//收费信息未复核，不允许用章
// message = "人防费未复核";
// }
result = rfxm.getEnableRfyz() == 1;
this.getResponse().getWriter().println("{\"result\":" + result + ",\"message\":\""+message+"\"}");
}
......
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