Skip to content

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

新增人防用章

parent c773dd84
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 338 deletions
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp
View file @ c0aeeb81
...@@ -56,44 +56,22 @@ ...@@ -56,44 +56,22 @@
<%-- 下载缴费信息附件 --%> <%-- 下载缴费信息附件 --%>
function opendoc(id) function opendoc(id)
{ {
console.log(id);
console.log($("#id").val());
window.location.href="${ctx}/jsp/rfxm/downloadFile.action?ids="+id; window.location.href="${ctx}/jsp/rfxm/downloadFile.action?ids="+id;
} }
<%-- 生成缴费通知书 --%> <%-- 人防用章 --%>
function generateNotice(flag){ function generateNotice(id){
$.messager.confirm("提示", "确认要人防用章？", function(result) {
$.ajax({ $.ajax({
url: "${ctx}/jsp/rfxm/produceNotice.action", url : "${ctx}/jsp/rfxm/rfyz.action",
type: 'post', type: 'post',
dataType: 'json', dataType: 'json',
async: false, data:{
data: {ids : $("#ids").val(), flag : flag}, ids : id
error: function () {
$.messager.alert('错误', '提交出错！');
}, },
success: function (data) { async : false
if (data.result) { });
$("#yzjg").html('验证成功!'); $.messager.alert("提示","操作成功")
$.messager.alert('提示',"生成缴款通知书成功"); reloadDate()
abc="1";
window.location.reload();
// var noticeBtn = "#noticeBtn";
// noticeBtn += flag;
// /*var noticeB = document.getElementById(noticeBtn);
// noticeB.href = "";
// noticeB.innerHTML("<i class=\"edit\" style=\"opacity: 0.5\">已生成施工前缴款通知书</i>");*/
// $(noticeBtn).attr('href','');
// $(noticeBtn).html("<i class=\"edit\" style=\"opacity: 0.5\">已生成施工前缴款通知书</i>");
/*var tab = $('#center').tabs('getSelected');
//获得当前选中的tab 的href
var url = $(tab.panel('options')).attr('href');
tab.panel('refresh', url);*/
} else {
abc="0";
$("#yzjg").html('信息表编号重复!该项目状态:'+data.message);
$.messager.alert('提示',data.message);
}
}
}); });
} }
...@@ -273,7 +251,7 @@ ...@@ -273,7 +251,7 @@
</c:if> </c:if>
<c:if test="${rfxm.isSbj==1}"> <c:if test="${rfxm.isSbj==1}">
<a id="noticeBtn0" href="#" class="btn_01" <a id="noticeBtn0" href="#" class="btn_01"
onclick="generateNotice(0);">人防费用章（市本级）<b></b></a> onclick="generateNotice('${rfxm.id}');">人防费用章（市本级）<b></b></a>
</c:if> </c:if>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_View.jsp
View file @ c0aeeb81
...@@ -25,9 +25,6 @@ ...@@ -25,9 +25,6 @@
<%-- 下载缴费信息附件 --%> <%-- 下载缴费信息附件 --%>
function opendoc(index,id) function opendoc(index,id)
{ {
console.log(id);
console.log("hello");
console.log($("#id").val());
window.location.href="${ctx}/jsp/rfxm/downloadFile.action?ids="+id + "&downloadIndex=" + index; window.location.href="${ctx}/jsp/rfxm/downloadFile.action?ids="+id + "&downloadIndex=" + index;
} }
var index4Sf = 1; var index4Sf = 1;
...@@ -400,9 +397,9 @@ ...@@ -400,9 +397,9 @@
<th width="15">附件:</th> <th width="15">附件:</th>
<td width="35%"> <td width="35%">
<a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc(0,'${rfxmsfxx.id}') >${rfxmsfxx.showName}<b></b></a>&nbsp; <a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc(0,'${rfxmsfxx.id}') >${rfxmsfxx.showName}<b></b></a>&nbsp;
<a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc(1,'"+rec.id+"') >${rfxmsfxx.showNameFk}<b></b></a>&nbsp; <a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc(1,'${rfxmsfxx.id}') >${rfxmsfxx.showNameFk}<b></b></a>&nbsp;
<a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc(2,'"+rec.id+"') >${rfxmsfxx.showNameSq}<b></b></a>&nbsp; <a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc(2,'${rfxmsfxx.id}') >${rfxmsfxx.showNameSq}<b></b></a>&nbsp;
<a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc(3,'"+rec.id+"') >${rfxmsfxx.showNameZm}<b></b></a>&nbsp; <a class='dow-fj' title='点击下载附件' style='cursor:pointer' onclick=opendoc(3,'${rfxmsfxx.id}') >${rfxmsfxx.showNameZm}<b></b></a>&nbsp;
</td> </td>
</tr> </tr>
</table> </table>
......
src/com/jshx/rfxm/conf/struts-rfxm.xml
View file @ c0aeeb81
...@@ -233,5 +233,9 @@ ...@@ -233,5 +233,9 @@
<result name="fail" >/invalid.jsp</result> <result name="fail" >/invalid.jsp</result>
</action> </action>
<!-- 人防用章 -->
<action name="rfyz" class="com.jshx.rfxm.web.RfxmAction" method="rfyz">
</action>
</package> </package>
</struts> </struts>
src/com/jshx/rfxm/web/RfxmAction.java
View file @ c0aeeb81
...@@ -3166,51 +3166,6 @@ public class RfxmAction extends BaseAction ...@@ -3166,51 +3166,6 @@ public class RfxmAction extends BaseAction
* @return * @return
*/ */
public String materialCollect(){ public String materialCollect(){
// if (null != rfxmJktzs && StringUtils.isNotBlank(rfxmJktzs.getId())) {
// //归档号
// String j="";
// String Magdh="";
// Map<String,Object> paramMap2 = new HashMap<>();
//// YzsMaterialCol1 yzsMaterialCol2 = new YzsMaterialCol1();
// paramMap2.put("gdh","YZS"+DateTime.now().getYear()+"%");
// List<YzsMaterialCol1> yzsMaterialColList2 = rfxmJktzsService.findYzsMaterialCol(paramMap2);
//
// Map<String,Object> paramMapX = new HashMap<>();
//// paramMap.put("gdh","YZS"+DateTime.now().getYear()+"%");
// paramMapX.put("jktzsglid",rfxmJktzs.getId());
// List<YzsMaterialCol1> yzsMaterialColList = rfxmJktzsService.findYzsMaterialCol(paramMapX);
// RfxmJktzs rfxmJktzs111 = rfxmJktzsService.getById(rfxmJktzs.getId());
//
// if(CollectionUtils.isEmpty(yzsMaterialColList2)){
// Magdh = "YZS" + DateTime.now().getYear() + "0001";
// }else if(CollectionUtils.isNotEmpty(yzsMaterialColList)){
// Magdh = rfxmJktzs111.getWfpzbh();
// } else{
// yzsMaterialColList2.sort((o1, o2) -> o2.getGdh().compareToIgnoreCase(o1.getGdh()));
// yzsMaterialCol2 = yzsMaterialColList2.get(0);
// String yzsGdh = yzsMaterialCol2.getGdh();
// String TempGdh = yzsGdh.substring(yzsGdh.length()-4);
// j = (Integer.parseInt(TempGdh) + 1) + "";
// while(j.length()<4){
// j = "0"+j;
// }
// Magdh = "YZS" + DateTime.now().getYear() + j;
// }
// getRequest().setAttribute("Magdh",Magdh);
//
// Map<String, Object> paraMap = new HashMap<>();
// Map<String, Object> paramMap = new HashMap<>();
// rfxmJktzs = rfxmJktzsService.getById(rfxmJktzs.getId());
// paraMap.put("jfdmwybh", rfxmJktzs.getJfdmwybh());
// List<RfxmSfxx> sfxxs = rfxmSfxxService.findRfxmSfxx(paraMap);
// if (StringUtils.isNotBlank(rfxmJktzs.getRfxmid())) {
// rfxm = rfxmService.getById(rfxmJktzs.getRfxmid());
// }
//
// //附件
// paramMap.put("jktzsglid",rfxmJktzs.getId());
// materialColsList = rfxmJktzsService.findYzsMaterialCol(paramMap);
// }
return EDIT; return EDIT;
} }
...@@ -3220,117 +3175,6 @@ public class RfxmAction extends BaseAction ...@@ -3220,117 +3175,6 @@ public class RfxmAction extends BaseAction
*/ */
public String materialCollectSave() throws Exception public String materialCollectSave() throws Exception
{ {
// FileInputStream in = null;
// Map<String, Object> paraMap = new HashMap<>();
// try
// {
// // 设置Blob字段
// setBlobField(in);
// } finally
// {
// if (null != in)
// {
// try
// {
// in.close();
// } catch (Exception ex)
// {
// }
// }
// }
// try
// {
// String path = SysPropertiesUtil.jdlj(this.getRequest()) + File.separator + "uploads" + File.separator + "YZS" + File.separator + gdh + File.separator;
//
// //归档号
// String j="";
// String Magdh="";
// Map<String,Object> paramMap2 = new HashMap<>();
// YzsMaterialCol1 yzsMaterialCol2 = new YzsMaterialCol1();
// paramMap2.put("gdh","YZS"+DateTime.now().getYear()+"%");
// List<YzsMaterialCol1> yzsMaterialColList2 = rfxmJktzsService.findYzsMaterialCol(paramMap2);
//
// Map<String,Object> paramMap = new HashMap<>();
//// paramMap.put("gdh","YZS"+DateTime.now().getYear()+"%");
// paramMap.put("jktzsglid",rfxmJktzs.getId());
// List<YzsMaterialCol1> yzsMaterialColList = rfxmJktzsService.findYzsMaterialCol(paramMap);
// RfxmJktzs rfxmJktzs111 = rfxmJktzsService.getById(rfxmJktzs.getId());
//
// if(CollectionUtils.isEmpty(yzsMaterialColList2)){
// Magdh = "YZS" + DateTime.now().getYear() + "0001";
// }else if(CollectionUtils.isNotEmpty(yzsMaterialColList)){
// Magdh = rfxmJktzs111.getWfpzbh();
// } else{
// yzsMaterialColList2.sort(new Comparator<YzsMaterialCol1>() {
// @Override
// public int compare(YzsMaterialCol1 o1, YzsMaterialCol1 o2) {
// return o2.getGdh().compareToIgnoreCase(o1.getGdh());
// }
// });
// yzsMaterialCol2 = yzsMaterialColList2.get(0);
// String yzsGdh = yzsMaterialCol2.getGdh();
// String TempGdh = yzsGdh.substring(yzsGdh.length()-4);
// j = (Integer.parseInt(TempGdh) + 1) + "";
// while(j.length()<4){
// j = "0"+j;
// }
// Magdh = "YZS" + DateTime.now().getYear() + j;
// }
//// getRequest().setAttribute("gdh",gdh);
//
//
// // 写到指定的路径中
// JSONObject jsonObject = JSONObject.fromObject(allFileName);
// JSONObject jsonObject1 = JSONObject.fromObject(originFileName);
// String fileName = "";
// if ((file1 != null))
// {
// for (int i = 0; i < file1.size(); i++)
// {
// String attachType = jsonObject.getString(file1FileName.get(i));
// fileName = FileUtils.uploadFile(file1.get(i), file1FileName.get(i), path);
//
// paraMap.put("attachType", attachType);
// paraMap.put("jktzsglid", rfxmJktzs.getId());
// List<YzsMaterialCol1> yzsMaterialColList1 = new ArrayList<>();
// yzsMaterialColList1 = rfxmJktzsService.findYzsMaterialCol(paraMap);
// if (yzsMaterialColList1.size() > 0)
// {
// YzsMaterialCol1 yzsMaterialCol = yzsMaterialColList1.get(0);
// yzsMaterialCol.setAttachname(file1FileName.get(i));
// yzsMaterialCol.setAttachType(attachType);
// yzsMaterialCol.setAttachpath(Magdh + File.separator + fileName);
// yzsMaterialCol.setWdno(jsonObject1.getString(file1FileName.get(i)));
// rfxmJktzsService.update(yzsMaterialCol);
//
// //保存完费凭证编号
// RfxmJktzs rfxmJktzs2 = rfxmJktzsService.getById(rfxmJktzs.getId());
// rfxmJktzs2.setWfpzbh(Magdh);
// rfxmJktzsService.update(rfxmJktzs2);
// }
// else
// {
// YzsMaterialCol1 yzsMaterialCol1 = new YzsMaterialCol1();
// yzsMaterialCol1.setDelFlag(0);
// yzsMaterialCol1.setAttachname(file1FileName.get(i));
// yzsMaterialCol1.setAttachpath(Magdh + File.separator + fileName);
// yzsMaterialCol1.setJktzsglid(rfxmJktzs.getId());
// yzsMaterialCol1.setAttachType(attachType);
// yzsMaterialCol1.setGdh(Magdh);
// yzsMaterialCol1.setWdno(jsonObject1.getString(file1FileName.get(i)));
// rfxmJktzsService.save(yzsMaterialCol1);
//
// //保存完费凭证编号
// RfxmJktzs rfxmJktzs1 = rfxmJktzsService.getById(rfxmJktzs.getId());
// rfxmJktzs1.setWfpzbh(Magdh);
// rfxmJktzsService.update(rfxmJktzs1);
// }
// }
// }
// } catch (Exception e)
// {
// throw new BasalException(BasalException.ERROR, e.getMessage(), e);
// }
return RELOAD; return RELOAD;
} }
...@@ -3349,149 +3193,6 @@ public class RfxmAction extends BaseAction ...@@ -3349,149 +3193,6 @@ public class RfxmAction extends BaseAction
private static final String password = SysPropertiesUtil.getProperty("gd.password"); private static final String password = SysPropertiesUtil.getProperty("gd.password");
private static final String ftpPath = SysPropertiesUtil.getProperty("gd.ftpPath"); private static final String ftpPath = SysPropertiesUtil.getProperty("gd.ftpPath");
// @Autowired
// private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
/**
* 完成归档
*/
public String finishMaterial() throws Exception {
// if(StringUtils.isNotEmpty(ids)){
// String[] idArray = ids.split(",");
/*List list=Arrays.asList(idArray);
Map<String, Object> paraMap = new HashMap<String, Object>();
paraMap.put("ids", list);
List<RfxmJktzs> RfxmJktzList=rfxmJktzsService.findRfxmJktzs(paraMap);
if(CollectionUtils.isNotEmpty(RfxmJktzList)){
for(RfxmJktzs rfxmJktz:RfxmJktzList){
rfxmJktz.setGdStatus("1");
rfxmJktzsService.update(rfxmJktzs);
}
}*/
// for(String idt:idArray) {
// rfxmJktzs = rfxmJktzsService.getById(idt.trim());
//
// Map<String, Object> parameterMap = new HashMap<>();
// ArrayList<String> ids = new ArrayList<>();
// ids.add(rfxmJktzs.getRfxmid());
// parameterMap.put("ids", ids);
// Rfxm rfxm = rfxmService.findRfxm(parameterMap).get(0);
//// 2020-9-18 start ---------------------------------------------
//// String ftpPath = "/upload/";
// RfxmJktzs rfxmJktzs = rfxmJktzsService.getById(idt.trim());
// Map<String, Object> paramMap1 =new HashMap<>();
// //附件
// paramMap1.put("jktzsglid",rfxmJktzs.getId());
// List<YzsMaterialCol1> attaches = rfxmJktzsService.findYzsMaterialCol(paramMap1);
//
// String s = JDBCUtils.buildArchiveSql(rfxm, rfxmJktzs, "1");
// List<String> add = new ArrayList<String>();
// add.add(s);
// int b = JDBCUtils.insertData(add);
// if (b==0) {
// return null;
// }
// for (YzsMaterialCol1 attach : attaches) {
// String attachpath = attach.getAttachpath();
//// attachpath.replaceAll("\\", "/");
// if (null != attach && StringUtils.isNotBlank(attachpath)) {
// String srcPath = SysPropertiesUtil.jdlj(this.getRequest())
// + File.separator+ "uploads" +File.separator + "YZS" + File.separator + attachpath;
// try {
// FileInputStream in = new FileInputStream(new File(srcPath));
// File file = new File(srcPath);
// String fileName = attachpath.substring(attachpath.lastIndexOf(attachpath.contains("/")?"/":"\\") + 1);
// String filePath = attachpath.substring(0, attachpath.lastIndexOf(attachpath.contains("/")?"/":"\\") + 1);
//// boolean success = FTPUtils.uploadFile(host, username, password, Integer.parseInt(port), "uploads" +File.separator + "YZS" + File.separator + filePath, fileName, in);
//// System.out.println(success);
//// if (success) {
// if (true) {
//
// List<String> sql = JDBCUtils.buildInVolumeSql(rfxm, rfxmJktzs, attach, "2");
// int i = JDBCUtils.insertData(sql);
// }
// }catch(Exception e) {
// e.printStackTrace();
// break;
// }
// }
// }
//
//// 2020-9-18 end -----------------------------------------------
// if (null != rfxmJktzs) {
// rfxmJktzs.setGdStatus("1");
// rfxmJktzsService.update(rfxmJktzs);
// }
// }
// this.getResponse().getWriter().println("{\"result\":true}");
// }
return null;
}
/**
* 下载收费信息附件
* @return
*/
public String downloadMaterialFile() throws IOException{
// if (StringUtil.isNotEmpty(attachId))
// {
// try
// {
// YzsMaterialCol1 yzsMaterialCol = rfxmJktzsService.getByYzsId(attachId);
// if (null != yzsMaterialCol)
// {
// // 服务器路径,创建文件夹
// // 得到当前路径
// String filename = yzsMaterialCol.getAttachname();
//// String str = ServletActionContext.getServletContext().getRealPath("");
//// int i = "zhengshouWebRoot".length() + 2;
//// String path = str.substring(1, i);
//// String url = path + SysPropertiesUtil.getProperty("filePath") + File.separator + filename;
// String cc = this.getRequest().getSession().getServletContext()
// .getRealPath(File.separator);
// File ff = new File(cc);
// String ab=ff.getParent();
// String path=new File(ab).getParent()+File.separator+ "uploads" + File.separator + "YZS" + File.separator + yzsMaterialCol.getGdh() + File.separator+ filename;
//// String path = sfxx.getFilePath() + sfxx.getUrldz();
//// String url = ServletActionContext.getServletContext().getRealPath("/" +SysPropertiesUtil.getProperty("filePath")) +File.separator + filename;
// String url = path.replaceAll("\\\\", "/").trim();
//// String url = path;
// File file = new File(url);
// System.out.println(url);
// System.out.println(file.exists());
// // if (file.exists()) {
// downFileName = java.net.URLEncoder.encode(yzsMaterialCol.getAttachname(), "UTF-8");
// // downFileStream =
// // ServletActionContext.getServletContext().getResourceAsStream("uploads/"
// // + filename);
// InputStream inputStream = null;
// byte[] contents = null;
// try {
// inputStream = new FileInputStream(file);
// contents = new byte[inputStream.available()];
// inputStream.read(contents);
// } catch (FileNotFoundException e) {
// this.getResponse().getWriter().println("{\"result\":false,\"message\":\""+"系统异常,请联系管理员!"+"\"}");
// e.printStackTrace();
// } catch (IOException e) {
// e.printStackTrace();
// }
// // downFileName = java.net.URLEncoder.encode(att
// // .getAttachname(), "UTF-8");
// downFileStream = getDownLoadFileStream(contents);
// // }
// }
// } catch (Exception ex){
// logger.error(ex.toString());
// this.getResponse().getWriter().println("{\"result\":false,\"message\":\""+"系统异常,请联系管理员!"+"\"}");
//// throw new BasalException(BasalException.ERROR, "系统异常,请联系管理员!");
// }
// }
return SUCCESS;
}
// 2020-1-3 start ------------------------------------------ // 2020-1-3 start ------------------------------------------
/** /**
* 跳转账表 * 跳转账表
...@@ -3509,6 +3210,12 @@ public class RfxmAction extends BaseAction ...@@ -3509,6 +3210,12 @@ public class RfxmAction extends BaseAction
} }
public void rfyz() throws Exception {
Rfxm rfxm = rfxmService.getById(ids);
rfxm.setIsRfyz(1);
rfxmService.save(rfxm);
}
private String deptCode; private String deptCode;
private String cpt; private String cpt;
......
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