Skip to content

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

完成需求开发

parent 4e70a466
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 18 deletions
WebRoot/WEB-INF/pages/fstzs/Fstzs_Add.jsp
View file @ 4259a627
......@@ -123,7 +123,7 @@
<tr>
<th width="15">应缴总面积(平方米)</th>
<td width="35%">
<input id="csmj" name="fstzsXm.xmxxb.csmj" style="width:90%" value="${fstzsXm.xmxxb.csmj}" disabled/>
<input id="yjmj" name="fstzsXm.xmxxb.yjmj" style="width:90%" value="${fstzsXm.xmxxb.yjmj}" disabled/>
</td>
<th width="15">收费标准(元)</th>
......@@ -400,7 +400,7 @@
var yjmjNums = numb / 150
var arr = String(yjmjNums).split('.');
if(arr.length > 1) {
if(arr[1].length > 2) {
if(arr[1].length > 10) {
$.messager.alert('提示', '请输入正确的应缴金额!');
$(this).parent().prev().text('');
return false;
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_View.jsp
View file @ 4259a627
......@@ -121,7 +121,7 @@
<tr>
<th width="15">应缴总面积(平方米)</th>
<td width="35%">
<input id="csmj" name="fstzsXm.xmxxb.csmj" style="width:90%" value="${fstzsXm.xmxxb.csmj}" disabled/>
<input id="yjmj" name="fstzsXm.xmxxb.yjmj" style="width:90%" value="${fstzsXm.xmxxb.yjmj}" disabled/>
</td>
<th width="15">收费标准(元)</th>
......
WebRoot/WEB-INF/pages/jfzm/Jfzm_Fujian.jsp
View file @ 4259a627
......@@ -54,8 +54,15 @@
<table width="100%" id="table">
<c:forEach var="c" items="${wwjdclinfos}">
<tr>
<th style='text-align: left'; width="35%">${c.fjqm}:</th>
<td width="57%"> <a href="javascript:opendoc('${c.id}')"><font style="color:blue">${c.scwjm}</font></a> </br></td>
<c:if test="${c.isUrl == 1}">
<th style='text-align: left'; width="35%">${c.fjqm}:</th>
<td width="57%"> <a href="http://192.168.1.193:8999/proxy?${c.scdz}" ><font style="color:blue">${c.scwjm}</font></a> </br></td>
</c:if>
<c:if test="${c.isUrl != 1}">
<th style='text-align: left'; width="35%">${c.fjqm}:</th>
<td width="57%"> <a href="javascript:opendoc('${c.id}')"><font style="color:blue">${c.scwjm}</font></a> </br></td>
</c:if>
</tr>
</c:forEach>
</table>
......
activiti/com/jshx/activiti/listener/AssigneeListener.java
View file @ 4259a627
......@@ -50,7 +50,13 @@ public class AssigneeListener extends AbstractListener implements TaskListener {
String taskCandidateGroup = identityLink.getGroupId();
if (StringUtils.isNoneBlank(taskCandidateGroup)) {
if (taskCandidateGroup.indexOf(CREATOR_DEPT) != -1) {
User user = userService.findUserById(creator);
User user;
if(creator.length() > 10) {
user = userService.findUserById(creator);
} else {
user = userService.findUserByLoginId(creator);
}
taskCandidateGroup = taskCandidateGroup.replace(CREATOR_DEPT, user.getDeptCode());
delegateTask.addCandidateGroup(taskCandidateGroup);
}
......
src/com/jshx/account/accountBank/web/AccountBankAction.java
View file @ 4259a627
......@@ -420,13 +420,13 @@ public class AccountBankAction extends BaseAction
{
if(orderId!=null && !orderId.trim().equals(""))
{
PaymentItemPending paymentItemPending = paymentItemPendingService.getById(orderId);
accountBankService.accountConfirmPending(orderId, ids, outcome, this.getLoginUser().getId(), identityService, runtimeService);
/**
* 办理时，直接生成非税通知书，不需要另外操作了
*/
if(!"1".equals(flag)) {
PaymentItemPending paymentItemPending = paymentItemPendingService.getById(orderId);
FstzsXm fstzsXm = fstzsXmService.getBySlbh(paymentItemPending.getSlbh());
if(fstzsXm != null) {
fstzsXm.setStatus(1);
......@@ -458,7 +458,7 @@ public class AccountBankAction extends BaseAction
}
}
}
this.getResponse().getWriter().println("{\"result\":true,\"msg\":\"" + ("1".equals(flag) ? "办理成功！" : "办理成功！，已生成非税通知书") + "\"}");
this.getResponse().getWriter().println("{\"result\":true,\"msg\":\"" + ("1".equals(flag) ? "办理成功！" : "办理成功! 同时该项目的非税通知书已变为已生成") + "\"}");
}catch (Exception e) {
logger.error(e.getMessage());
this.getResponse().getWriter().println("{\"result\":false}");
......
src/com/jshx/fstzs/conf/sql-map-fstzs.xml
View file @ 4259a627
......@@ -10,7 +10,6 @@
<isNotEmpty property="status">
<![CDATA[and t.status in (:status)]]>
</isNotEmpty>
<isNotEmpty property="slbh">
<![CDATA[and t.slbh like :slbh]]>
</isNotEmpty>
......@@ -39,6 +38,9 @@
<isNotEmpty property="jssj">
<![CDATA[and t.jhTime < :jssj]]>
</isNotEmpty>
<isNotEmpty property="fsxmId">
<![CDATA[and t.fsxmId like (:fsxmId)]]>
</isNotEmpty>
order by t.createTime desc
</select>
......
src/com/jshx/fstzs/entity/Fstzs.java
View file @ 4259a627
......@@ -177,6 +177,11 @@ public class Fstzs extends BaseModel {
*/
private String yjjeQfw;
/**
* 非税项目id
*/
private String fsxmId;
/**
* 对应项目信息
......@@ -430,4 +435,12 @@ public class Fstzs extends BaseModel {
public void setJkqdCode(String jkqdCode) {
this.jkqdCode = jkqdCode;
}
public String getFsxmId() {
return fsxmId;
}
public void setFsxmId(String fsxmId) {
this.fsxmId = fsxmId;
}
}
src/com/jshx/fstzs/web/FstzsAction.java
View file @ 4259a627
......@@ -38,6 +38,8 @@ import com.jshx.paymentItemHis.entity.PaymentItemHis;
import com.jshx.paymentItemHis.service.PaymentItemHisService;
import com.jshx.pjjx.entity.Pjjx;
import com.jshx.pjjx.service.PjjxService;
import com.jshx.wwjdclinfo.entity.Wwjdclinfo;
import com.jshx.wwjdclinfo.service.WwjdclinfoService;
import com.jshx.xmxxb.entity.Xmxxb;
import com.jshx.xmxxb.service.XmxxbService;
import com.neusoft.egov.utils.TextUtils;
......@@ -60,6 +62,9 @@ public class FstzsAction extends BaseAction {
@Autowired
XmxxbService xmxxbService;
@Autowired
WwjdclinfoService wwjdclinfoService;
/**
* 获取收款人信息
*/
......@@ -281,12 +286,15 @@ public class FstzsAction extends BaseAction {
fstzsXm.setYjjedx(NumberToCN.number2CNMontrayUnit(new BigDecimal(fstzsXm.getYjje())));
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",fstzsXm.getSlbh());
params.put("status",new ArrayList<Integer>(){{
add(0);
}});
fstzsList = fstzsService.findList(params);
if(fstzsList.size() == 0) {
Fstzs f = new Fstzs();
f.setJkr(fstzsXm.getJsdwmc());
f.setYjje(fstzsXm.getYjje());
f.setYjmj(fstzsXm.getXmxxb().getCsmj());
f.setYjmj(fstzsXm.getXmxxb().getYjmj());
fstzsList.add(f);
}
......@@ -323,7 +331,10 @@ public class FstzsAction extends BaseAction {
dbXm.setJkrlx(fstzsXm.getJkrlx());
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",dbXm.getSlbh());
params.put("fsxmId",dbXm.getSlbh());
params.put("status",new ArrayList<Integer>(){{
add(1);
}});
fstzsList = fstzsService.findList(params);
String beizhuAppend = dbXm.getSlbh() + "，共" + fstzsList.size() + "张电子发票";
if(TextUtils.isEmpty(dbXm.getBeizhu())) {
......@@ -382,6 +393,9 @@ public class FstzsAction extends BaseAction {
//编辑时，先删除之前添加的内容
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",fstzsXm.getSlbh());
params.put("status",new ArrayList<Integer>(){{
add(0);
}});
List<Fstzs> list = fstzsService.findList(params);
if(list != null && list.size() > 0) {
List<String> ids = list.stream().filter(i-> i.getStatus() == 0).map(f -> f.getId()).collect(Collectors.toList());
......@@ -396,6 +410,7 @@ public class FstzsAction extends BaseAction {
i.setGcxmmc(fstzsXm.getGcxmmc());
i.setJsdwmc(fstzsXm.getJsdwmc());
i.setSlbh(fstzsXm.getSlbh());
i.setFsxmId(fstzsXm.getId());
i.setLength(fstzsList.size());
i.setIsJk(0);
i.setKpState(0);
......@@ -418,7 +433,7 @@ public class FstzsAction extends BaseAction {
FstzsXm fstzsXm = fstzsXmService.getById(this.fstzsXm.getId());
if(this.getLoginUser().getDisplayName().equals(fstzsXm.getJbr())) {
result = false;
message = "不可以复核自己";
message = "复核人和修改人不能为同一人";
}
this.getResponse().getWriter().println("{\"result\":"+result+",\"message\":\"" + message + "!"+"\"}");
......@@ -451,6 +466,9 @@ public class FstzsAction extends BaseAction {
FstzsXm xm = fstzsXmService.getById(id);
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",xm.getSlbh());
params.put("status",new ArrayList<Integer>(){{
add(0);
}});
// 需要调用财政系统操作，财政返回成功之后，才可以修改入库
List<Fstzs> list = fstzsService.findList(params);
list.stream().forEach(f-> {
......@@ -495,6 +513,9 @@ public class FstzsAction extends BaseAction {
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",fstzs.getSlbh());
params.put("status",new ArrayList<Integer>(){{
add(1);//已激活
}});
List<Fstzs> list = fstzsService.findList(params);
FstzsXm xm = fstzsXmService.getBySlbh(fstzs.getSlbh());
List<Fstzs> jkList = list.stream().filter(i -> i.getIsJk() == 1).collect(Collectors.toList());
......@@ -538,10 +559,10 @@ public class FstzsAction extends BaseAction {
Fstzs fstzs = fstzsService.getById(id);
FstzsXm xm = fstzsXmService.getBySlbh(fstzs.getSlbh());
PaymentItemHis paymentItemHis = paymentItemHisService.getByXmbId(xm.getXmxxb().getId());
if(paymentItemHis == null) {
Xmxxb xmxxb = xmxxbService.getBySlbh(fstzs.getSlbh());
if(!"0".equals(xmxxb.getIssptg())){
result = false;
message = "请先确认财务到账再开票";
message = "该项目审批未通过，暂时无法开票！";
this.getResponse().getWriter().println("{\"result\":"+result+",\"message\":\"" + message + "!"+"\"}");
return;
}
......@@ -578,6 +599,16 @@ public class FstzsAction extends BaseAction {
fstzs.setPjdm(kaipiao.data.billBatchCode);
fstzs.setPjUrl(kaipiao.data.url);
fstzsService.update(fstzs);
//吧非税票据url，放进Wwjdclinfo
Xmxxb xmxxb = xmxxbService.getBySlbh(fstzs.getSlbh());
Wwjdclinfo wwjdclinfo = new Wwjdclinfo();
wwjdclinfo.setScdz(kaipiao.data.url);
wwjdclinfo.setDelFlag(0);
wwjdclinfo.setXxylb(xmxxb.getXxylb());
wwjdclinfo.setFjqm("非税发票");
wwjdclinfo.setScwjm("非税发票.pdf");
wwjdclinfo.setIsUrl(1);
wwjdclinfoService.save(wwjdclinfo);
} else {
result = false;
message = kaipiao.msg;
......@@ -600,6 +631,9 @@ public class FstzsAction extends BaseAction {
xm.setBeizhu("");
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",xm.getSlbh());
params.put("status",new ArrayList<Integer>(){{
add(0);//初始状态
}});
List<Fstzs> list = fstzsService.findList(params);
List<String> ids = list.stream().map(i -> i.getId()).collect(Collectors.toList());
fstzsService.delete(ids);
......@@ -660,8 +694,10 @@ public class FstzsAction extends BaseAction {
if(xm == null) return;
if(xm.getIsJx() != null && xm.getIsJx() == 1) return;
Map<String, Object> paraMap = new HashMap();
paraMap.put("slbh",new ArrayList<String>(){{
add(xm.getSlbh());
paraMap.put("slbh",xm.getSlbh());
paraMap.put("status",new ArrayList<Integer>(){{
add(1);//已激活
add(3);//已缴款
}});
//查询项目的所有缴款人
List<Fstzs> fsList = fstzsService.findList(paraMap);
......
src/com/jshx/jfzm/web/JfzmAction.java
View file @ 4259a627
......@@ -198,7 +198,7 @@ public class JfzmAction extends BaseAction {
xmxxb = xmxxbService.getBySlbh(xmxxb.getSlbh());
Map map = new HashMap();
map.put("xxylb",xmxxb.getXxylb());
map.put("fjqm","一般缴款书");
// map.put("fjqm","一般缴款书");
Pagination pagination1 = wwjdclinfoService.findByPage(new Pagination(1,0),map);
wwjdclinfos = pagination1.getListOfObject();
return EDIT;
......
src/com/jshx/paymentItemPending/service/impl/PaymentItemPendingServiceImpl.java
View file @ 4259a627
......@@ -211,6 +211,23 @@ public class PaymentItemPendingServiceImpl extends BaseServiceImpl implements Pa
paymentItemPendingDao.save(dj);
jktzsDao.save(jk);
xmxxbDao.update(xmb);
//保存项目到非税通知书表
FstzsXm xm = new FstzsXm();
xm.setXmxxb(xmb);
//获取收款人信息保存到项目中
HashMap<String, Object> param = new HashMap<>();
param.put("gllb","001");
xm.setKpsjgl(kpsjglDao.findFirst(param));
xm.setDelFlag(0);
xm.setStatus(0);
xm.setJsdwmc(dj.getDwmc());
xm.setGcxmmc(dj.getXmmc());
xm.setSlbh(dj.getSlbh());
xm.setYjje(dj.getZyjje());
fstzsXmDao.save(xm);
} catch (Exception e) {
e.printStackTrace();
......
src/com/jshx/wwjdclinfo/entity/Wwjdclinfo.java
View file @ 4259a627
......@@ -65,6 +65,11 @@ public class Wwjdclinfo extends BaseModel
*/
private String scdz;
/**
* scdz 保存的是不是url
*/
private Integer isUrl;
public Wwjdclinfo(){
}
......@@ -160,4 +165,12 @@ this.id = id;
public void setIsSync(String isSync) {
this.isSync = isSync;
}
public Integer getIsUrl() {
return isUrl;
}
public void setIsUrl(Integer isUrl) {
this.isUrl = isUrl;
}
}
src/com/jshx/wwjdclinfo/service/WwjdclinfoService.java
View file @ 4259a627
......@@ -24,6 +24,7 @@ public interface WwjdclinfoService extends BaseService
*/
public Wwjdclinfo getById(String id);
public Wwjdclinfo getByXxylb(String xxylb);
/**
* 保存信息
* @param model 信息
......
src/com/jshx/wwjdclinfo/service/impl/WwjdclinfoServiceImpl.java
View file @ 4259a627
......@@ -49,6 +49,17 @@ public class WwjdclinfoServiceImpl extends BaseServiceImpl implements Wwjdclinfo
return wwjdclinfoDao.getById(id);
}
public Wwjdclinfo getByXxylb(String xxylb)
{
Map<String, Object> paraMap = new HashMap<String, Object>();
paraMap.put("xxylb", xxylb);
List objects=wwjdclinfoDao.findWwjdclinfo(paraMap);
if(objects.size() > 0) {
return (Wwjdclinfo)objects.get(0);
}
return null;
}
/**
* 保存信息
* @param model 信息
......
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