Commit 0e3b29b3 authored by 徐州's avatar 徐州

修改两个问题

parent 3b964c2b
...@@ -13,6 +13,8 @@ import com.jshx.billlq.service.BilllqService; ...@@ -13,6 +13,8 @@ import com.jshx.billlq.service.BilllqService;
import com.jshx.common.utils.FileUtils; import com.jshx.common.utils.FileUtils;
import com.jshx.core.utils.StringUtil; import com.jshx.core.utils.StringUtil;
import com.jshx.core.utils.Struts2Util; import com.jshx.core.utils.Struts2Util;
import com.jshx.rfxm.entity.Rfxm;
import com.jshx.rfxm.service.RfxmService;
import com.jshx.spjlb.entity.Spjlb; import com.jshx.spjlb.entity.Spjlb;
import com.jshx.spjlb.service.SpjlbService; import com.jshx.spjlb.service.SpjlbService;
import com.jshx.wwjdclinfo.entity.Wwjdclinfo; import com.jshx.wwjdclinfo.entity.Wwjdclinfo;
...@@ -113,7 +115,9 @@ public class PaymentVoucherAction extends BaseAction ...@@ -113,7 +115,9 @@ public class PaymentVoucherAction extends BaseAction
private PaymentVoucherHis paymentVoucherHis = new PaymentVoucherHis(); private PaymentVoucherHis paymentVoucherHis = new PaymentVoucherHis();
private PaymentItemHis paymentItemHis = new PaymentItemHis(); private PaymentItemHis paymentItemHis = new PaymentItemHis();
private Rfxm rfxm;
private PaymentItemDelayHis paymentItemDelayHis = new PaymentItemDelayHis(); private PaymentItemDelayHis paymentItemDelayHis = new PaymentItemDelayHis();
private Mjyj mjyj = new Mjyj(); private Mjyj mjyj = new Mjyj();
...@@ -143,6 +147,9 @@ public class PaymentVoucherAction extends BaseAction ...@@ -143,6 +147,9 @@ public class PaymentVoucherAction extends BaseAction
@Autowired @Autowired
private PaymentItemHisService paymentItemHisService; private PaymentItemHisService paymentItemHisService;
@Autowired
private RfxmService rfxmService;
@Autowired @Autowired
private PaymentItemDelayService paymentItemDelayService; private PaymentItemDelayService paymentItemDelayService;
...@@ -552,6 +559,13 @@ public class PaymentVoucherAction extends BaseAction ...@@ -552,6 +559,13 @@ public class PaymentVoucherAction extends BaseAction
currentDate = outSdf.format(new Date()); currentDate = outSdf.format(new Date());
try{ try{
paymentItemHis = paymentItemHisService.getById(id); paymentItemHis = paymentItemHisService.getById(id);
Map<String,Object> param = new HashMap<>();
param.put("paymentHisId",paymentItemHis.getId());
List<Rfxm> rfxmList = rfxmService.findRfxm(param);
if(rfxmList != null && rfxmList.size() > 0) {
rfxm = rfxmList.get(0);
}
if(null!=paymentItemHis){ if(null!=paymentItemHis){
//获取项目信息 //获取项目信息
xmxxb = xmxxbService.getById(paymentItemHis.getXmbzj()); xmxxb = xmxxbService.getById(paymentItemHis.getXmbzj());
...@@ -2055,4 +2069,11 @@ public class PaymentVoucherAction extends BaseAction ...@@ -2055,4 +2069,11 @@ public class PaymentVoucherAction extends BaseAction
this.wwjdclinfos = wwjdclinfos; this.wwjdclinfos = wwjdclinfos;
} }
public Rfxm getRfxm() {
return rfxm;
}
public void setRfxm(Rfxm rfxm) {
this.rfxm = rfxm;
}
} }
...@@ -270,7 +270,7 @@ public class PaymentItemHisAction extends BaseAction ...@@ -270,7 +270,7 @@ public class PaymentItemHisAction extends BaseAction
rfxm.setXmbh(model.getXmxxb().getXmbh()); rfxm.setXmbh(model.getXmxxb().getXmbh());
rfxm.setMjyj(model.getXmxxb().getMjyj()); rfxm.setMjyj(model.getXmxxb().getMjyj());
rfxm.setIsSl("002".equals(model.getXmxxb().getMjyj()) || "004".equals(model.getXmxxb().getMjyj()) ? 1 : 0); rfxm.setIsSl("002".equals(model.getXmxxb().getMjyj()) || "004".equals(model.getXmxxb().getMjyj()) ? 1 : 0);
rfxm.setJbr(this.getLoginUser().getDisplayName());//经办人
rfxm.setIsSbj(!model.getXmxxb().getZsfw().contains("非市本级") ? 1 : 0); rfxm.setIsSbj(!model.getXmxxb().getZsfw().contains("非市本级") ? 1 : 0);
rfxm.setIsRfyz(0); rfxm.setIsRfyz(0);
rfxm.setIsTqdy(0); rfxm.setIsTqdy(0);
......
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
<isNotEmpty property="paymentLink"> <isNotEmpty property="paymentLink">
<![CDATA[and t.paymentLink = :paymentLink]]> <![CDATA[and t.paymentLink = :paymentLink]]>
</isNotEmpty> </isNotEmpty>
<isNotEmpty property="paymentHisId">
<![CDATA[and t.paymentHisId = :paymentHisId]]>
</isNotEmpty>
<isNotEmpty property="isRfyz"> <isNotEmpty property="isRfyz">
<![CDATA[and t.isRfyz = :isRfyz]]> <![CDATA[and t.isRfyz = :isRfyz]]>
</isNotEmpty> </isNotEmpty>
......
...@@ -278,6 +278,19 @@ public class Rfxm extends BaseModel ...@@ -278,6 +278,19 @@ public class Rfxm extends BaseModel
*/ */
private String paymentHisId; private String paymentHisId;
/**
* 经办人
*/
public String jbr;
public String getJbr() {
return jbr;
}
public void setJbr(String jbr) {
this.jbr = jbr;
}
public String getMjyj() { public String getMjyj() {
return mjyj; return mjyj;
} }
......
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