Skip to content

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

修改问题

parent f3cc9054
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 75 deletions
WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp
View file @ 94795ad0
......@@ -579,11 +579,7 @@
result += "<a class='btn_01_mini' style='opacity: 0.5'>同步施工许可<b></b></a>\n";
}
}
if(rec.enableDy == 1) {
result += "<a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n";
} else {
result += "<a class='btn_01_mini' style='opacity: 0.5'>打印缴费凭证<b></b></a>\n";
}
result += "<a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n";
if(rec.showYb == 1) {
result += "<a class='btn_01_mini' onclick=one_book('" + rec.slbh + "')>一般缴款书<b></b></a>";
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp
View file @ 94795ad0
......@@ -400,7 +400,7 @@
<th width="15">提前缴纳配套费</th>
<td width="35%" >
<input type="radio" name="rfxmsfxx.tqjn" value="0" checked="checked" />否
<input type="radio" name="rfxmsfxx.tqjn" value="1" checked="checked" />是
<input type="radio" name="rfxmsfxx.tqjn" value="1"/>是
</td>
</c:if>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_View.jsp
View file @ 94795ad0
......@@ -372,7 +372,7 @@
</td>
</tr>
<tr>
<th width="15">缴款通知书编号</th>
<th width="15">联系单编号</th>
<td width="35%">
<input id="sfxmlxdbh" name="rfxmsfxx.sfxmlxdbh" value="${rfxmsfxx.sfxmlxdbh}" style="width:90%" readonly/>
</td>
......
src/com/jshx/jfzm/web/JfzmAction.java
View file @ 94795ad0
......@@ -156,7 +156,6 @@ public class JfzmAction extends BaseAction {
} catch (Exception e) {
}
r.setEnableDy(r.getIsRfyz() == 1 || r.getIsSl() == 1 ? 1 : 0);//人防用章后，才可以打印
if(r.getIsRfyz() != null && r.getIsRfyz() == 1) {//人防用章后可以同步
r.setEnableTb(1);
......@@ -310,4 +309,14 @@ public class JfzmAction extends BaseAction {
public void setWwjdclinfos(List<Wwjdclinfo> wwjdclinfos) {
this.wwjdclinfos = wwjdclinfos;
}
public File getFile() {
return file;
}
public void setFile(File file) {
this.file = file;
}
}
src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java
View file @ 94795ad0
......@@ -275,7 +275,7 @@ public class PaymentItemHisAction extends BaseAction
rfxm.setXmbh(model.getXmxxb().getXmbh());
rfxm.setMjyj(model.getXmxxb().getMjyj());
rfxm.setIsSl("002".equals(model.getXmxxb().getMjyj()) || "004".equals(model.getXmxxb().getMjyj()) ? 1 : 0);
rfxm.setIsSbj(model.getXmxxb().getZsfw() != null && !model.getXmxxb().getZsfw().contains("非市本级") ? 1 : 0);
rfxm.setIsSbj(model.getXmxxb().getJsdd() != null && model.getXmxxb().getJsdd().contains("南京市江宁区") ? 0 : 1);
rfxm.setIsRfyz(0);
rfxm.setIsTqdy(0);
rfxm.setIsSl(0);
......
src/com/jshx/rfxm/entity/Rfxm.java
View file @ 94795ad0
......@@ -289,7 +289,6 @@ public class Rfxm extends BaseModel
Integer showYb;//是否显示一般缴费按钮
Integer enableTb;//同步按钮是否可以点击（false置灰）
Integer enableDy;//打印按钮是否可以点击(false置灰)
Integer enableRfyz;//人防用章置灰
/**
......@@ -784,14 +783,6 @@ public class Rfxm extends BaseModel
this.enableTb = enableTb;
}
public Integer getEnableDy() {
return enableDy;
}
public void setEnableDy(Integer enableDy) {
this.enableDy = enableDy;
}
public String getJktzsbh() {
return jktzsbh;
}
......
src/com/jshx/rfxm/web/RfxmAction.java
View file @ 94795ad0
......@@ -377,12 +377,9 @@ public class RfxmAction extends BaseAction
double b = Double.parseDouble(s.getYjjemx());
if(b != 0) {
s.setZslxdbh(s.getSfxmlxdbh());
} else {
s.setSfxmlxdbh("");
s.setZslxdbh("");
}
s.setZslxdbh("");
} catch (Exception e) {
s.setSfxmlxdbh("");
s.setZslxdbh("");
}
}
......@@ -397,7 +394,7 @@ public class RfxmAction extends BaseAction
sfxx.setUpdateTime(paymentItemHis.getUpdateTime());
sfxx.setCnjfhj(rfxm.getPaymentLink() != null && rfxm.getPaymentLink() == 3 ? "30日内" : "施工许可前");
sfxx.setStatus(2);
sfxx.setSfxxjbr("系统");
sfxx.setSfxxjbr(paymentItemHis.getJbr());
sfxx.setPaymentHisId(paymentItemHis.getId());
pagination.list.add(0,sfxx);
pagination.totalCount ++;
......@@ -1284,59 +1281,67 @@ public class RfxmAction extends BaseAction
//再上一级目录+新建文件夹名
String path= SysPropertiesUtil.jdlj(this.getRequest())+File.separator+ "uploads" + File.separator + Constant.ZSLC_SFXX + File.separator;
String fileName = "";
if(file1!=null)
{
for(int i = 0 ; i < file1.size() ; i++ )
{
fileName = FileUtils.uploadFile(file1.get(i),file1FileName.get(i), path,UUID.randomUUID().toString());
String attachType = fileName.substring(fileName.lastIndexOf(".")+1);
if(i == 0) {
rfxmsfxx.setAttachname(file1FileName.get(i));
rfxmsfxx.setUrldz(fileName);
rfxmsfxx.setFilePath(path);
rfxmsfxx.setAttachType(attachType);
rfxmsfxx.setXmType("征收联系单");
//前台显示名称,目前方案为 缴费项目名称.扩展名 eg:配套费.xlsx
if (StringUtils.isNotBlank(rfxmsfxx.getAttachType())) {
rfxmsfxx.setShowName(rfxmsfxx.getXmType()+"."+rfxmsfxx.getAttachType());
} else {
rfxmsfxx.setShowName("");
}
} else if(i == 1) {
rfxmsfxx.setAttachnameFk(file1FileName.get(i));
rfxmsfxx.setUrldzFk(fileName);
rfxmsfxx.setFilePathFk(path);
rfxmsfxx.setAttachTypeFk(attachType);
rfxmsfxx.setXmTypeFk("税务反馈单");
if (StringUtils.isNotBlank(rfxmsfxx.getAttachTypeFk())) {
rfxmsfxx.setShowNameFk(rfxmsfxx.getXmTypeFk()+"."+rfxmsfxx.getAttachTypeFk());
} else {
rfxmsfxx.setShowNameFk("");
}
} else if(i == 2) {
rfxmsfxx.setAttachnameSq(file1FileName.get(i));
rfxmsfxx.setUrldzSq(fileName);
rfxmsfxx.setFilePathSq(path);
rfxmsfxx.setAttachTypeSq(attachType);
rfxmsfxx.setXmTypeSq("先行缴纳配套费申请");
if (StringUtils.isNotBlank(rfxmsfxx.getAttachTypeSq())) {
rfxmsfxx.setShowNameSq(rfxmsfxx.getXmTypeSq()+"."+rfxmsfxx.getAttachTypeSq());
} else {
rfxmsfxx.setShowNameSq("");
}
} else if(i == 3) {
rfxmsfxx.setAttachnameZm(file1FileName.get(i));
rfxmsfxx.setUrldzZm(fileName);
rfxmsfxx.setFilePathZm(path);
rfxmsfxx.setAttachTypeZm(attachType);
rfxmsfxx.setXmTypeZm("完税证明");
if (StringUtils.isNotBlank(rfxmsfxx.getAttachTypeZm())) {
rfxmsfxx.setShowNameZm(rfxmsfxx.getXmTypeZm()+"."+rfxmsfxx.getAttachTypeZm());
} else {
rfxmsfxx.setShowNameZm("");
}
}
if(file1 != null && file1.size() > 0) {
fileName = FileUtils.uploadFile(file1.get(0),file1FileName.get(0), path,UUID.randomUUID().toString());
String attachType = fileName.substring(fileName.lastIndexOf(".")+1);
rfxmsfxx.setAttachname(file1FileName.get(0));
rfxmsfxx.setUrldz(fileName);
rfxmsfxx.setFilePath(path);
rfxmsfxx.setAttachType(attachType);
rfxmsfxx.setXmType("征收联系单");
//前台显示名称,目前方案为 缴费项目名称.扩展名 eg:配套费.xlsx
if (StringUtils.isNotBlank(rfxmsfxx.getAttachType())) {
rfxmsfxx.setShowName(rfxmsfxx.getXmType()+"."+rfxmsfxx.getAttachType());
} else {
rfxmsfxx.setShowName("");
}
}
if(file2 != null && file2.size() > 0) {
fileName = FileUtils.uploadFile(file2.get(0),file2FileName.get(0), path,UUID.randomUUID().toString());
String attachType = fileName.substring(fileName.lastIndexOf(".")+1);
rfxmsfxx.setAttachnameFk(file2FileName.get(0));
rfxmsfxx.setUrldzFk(fileName);
rfxmsfxx.setFilePathFk(path);
rfxmsfxx.setAttachTypeFk(attachType);
rfxmsfxx.setXmTypeFk("税务反馈单");
//前台显示名称,目前方案为 缴费项目名称.扩展名 eg:配套费.xlsx
if (StringUtils.isNotBlank(rfxmsfxx.getAttachTypeFk())) {
rfxmsfxx.setShowNameFk(rfxmsfxx.getXmTypeFk()+"."+rfxmsfxx.getAttachTypeFk());
} else {
rfxmsfxx.setShowNameFk("");
}
}
if(file3 != null && file3.size() > 0) {
fileName = FileUtils.uploadFile(file3.get(0),file3FileName.get(0), path,UUID.randomUUID().toString());
String attachType = fileName.substring(fileName.lastIndexOf(".")+1);
rfxmsfxx.setAttachnameSq(file3FileName.get(0));
rfxmsfxx.setUrldzSq(fileName);
rfxmsfxx.setFilePathSq(path);
rfxmsfxx.setAttachTypeSq(attachType);
rfxmsfxx.setXmTypeSq("先行缴纳配套费申请");
//前台显示名称,目前方案为 缴费项目名称.扩展名 eg:配套费.xlsx
if (StringUtils.isNotBlank(rfxmsfxx.getAttachTypeSq())) {
rfxmsfxx.setShowNameSq(rfxmsfxx.getXmTypeSq()+"."+rfxmsfxx.getAttachTypeSq());
} else {
rfxmsfxx.setShowNameSq("");
}
}
if(file4 != null && file4.size() > 0) {
fileName = FileUtils.uploadFile(file4.get(0),file4FileName.get(0), path,UUID.randomUUID().toString());
String attachType = fileName.substring(fileName.lastIndexOf(".")+1);
rfxmsfxx.setAttachnameZm(file4FileName.get(0));
rfxmsfxx.setUrldzZm(fileName);
rfxmsfxx.setFilePathZm(path);
rfxmsfxx.setAttachTypeZm(attachType);
rfxmsfxx.setXmTypeZm("完税证明");
//前台显示名称,目前方案为 缴费项目名称.扩展名 eg:配套费.xlsx
if (StringUtils.isNotBlank(rfxmsfxx.getAttachTypeZm())) {
rfxmsfxx.setShowNameZm(rfxmsfxx.getXmTypeZm()+"."+rfxmsfxx.getAttachTypeZm());
} else {
rfxmsfxx.setShowNameZm("");
}
}
}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