|
@@ -306,12 +306,36 @@ public class TFeeServiceImpl implements ITFeeService {
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
public List<TFee> selectTFeeList(TFee tFee) {
|
|
public List<TFee> selectTFeeList(TFee tFee) {
|
|
- return tFeeMapper.selectTFeeList(tFee);
|
|
|
|
|
|
+ List<TFee> list = tFeeMapper.selectTFeeList(tFee);
|
|
|
|
+ for (TFee tf : list) {
|
|
|
|
+ List<TFeeDo> fd = tFeeDoMapper.selectTFeeDoByfPid(tf.getfId());
|
|
|
|
+ StringBuilder strb = new StringBuilder();
|
|
|
|
+ for (TFeeDo tFeeDo : fd) {
|
|
|
|
+ if (StringUtils.isNotNull(tFeeDo.getfSrcBillno())) {
|
|
|
|
+ strb.append(tFeeDo.getfSrcBillno()).append(",");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ tf.setfSrcBillno(StringUtils.objToStr(StringUtils.removeTheLastComma(strb)));
|
|
|
|
+ }
|
|
|
|
+ return list;
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<Map<String, Object>> selectTFeeList1(TFee tFee) {
|
|
public List<Map<String, Object>> selectTFeeList1(TFee tFee) {
|
|
- return tFeeMapper.selectTFeeList1(tFee);
|
|
|
|
|
|
+ List<Map<String,Object>> list = tFeeMapper.selectTFeeList1(tFee);
|
|
|
|
+ for (Map<String,Object> map : list) {
|
|
|
|
+ List<TFeeDo> tfd = tFeeDoMapper.selectTFeeDoByfPid(Long.valueOf(map.get("fId").toString()));
|
|
|
|
+ if (tfd.size()!=0) {
|
|
|
|
+ StringBuilder stringBuilder = new StringBuilder();
|
|
|
|
+ for (TFeeDo tFeeDo : tfd) {
|
|
|
|
+ if (StringUtils.isNotNull(tFeeDo.getfSrcBillno())) {
|
|
|
|
+ stringBuilder.append(tFeeDo.getfSrcBillno()).append(",");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ map.put("fSrcBillno",StringUtils.removeTheLastComma(stringBuilder));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return list;
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -411,6 +435,7 @@ public class TFeeServiceImpl implements ITFeeService {
|
|
tFeeDo.setfPid(fPid);
|
|
tFeeDo.setfPid(fPid);
|
|
tFeeDo.setCreateBy(loginUser.getUser().getUserName());
|
|
tFeeDo.setCreateBy(loginUser.getUser().getUserName());
|
|
tFeeDo.setCreateTime(new Date());
|
|
tFeeDo.setCreateTime(new Date());
|
|
|
|
+ tFeeDo.setfSrcBillno(tFeeDo.getfBillno());
|
|
tFeeDo.setfStatus("2");
|
|
tFeeDo.setfStatus("2");
|
|
tFeeDoMapper.insertTFeeDo(tFeeDo);
|
|
tFeeDoMapper.insertTFeeDo(tFeeDo);
|
|
} else {
|
|
} else {
|
|
@@ -790,6 +815,7 @@ public class TFeeServiceImpl implements ITFeeService {
|
|
// 删除从表
|
|
// 删除从表
|
|
tFeeDoMapper.deleteByFPid(tFee.getfId());
|
|
tFeeDoMapper.deleteByFPid(tFee.getfId());
|
|
messageMap.put("tFee", tFee);
|
|
messageMap.put("tFee", tFee);
|
|
|
|
+ // 声明业务编号 list
|
|
List<String> fSrcBillnos = new ArrayList<>();
|
|
List<String> fSrcBillnos = new ArrayList<>();
|
|
// 财务从表
|
|
// 财务从表
|
|
if (StringUtils.isNotNull(tfeeDo) && !"[]".equals(tfeeDo)) {
|
|
if (StringUtils.isNotNull(tfeeDo) && !"[]".equals(tfeeDo)) {
|
|
@@ -805,13 +831,15 @@ public class TFeeServiceImpl implements ITFeeService {
|
|
tFeeDo.setCreateBy(loginUser.getUser().getUserName());
|
|
tFeeDo.setCreateBy(loginUser.getUser().getUserName());
|
|
tFeeDo.setCreateTime(new Date());
|
|
tFeeDo.setCreateTime(new Date());
|
|
tFeeDo.setfStatus(billstatus);
|
|
tFeeDo.setfStatus(billstatus);
|
|
- // 业务编号传递
|
|
|
|
- fSrcBillnos.add(tFeeDo.getfSrcBillno());
|
|
|
|
tFeeDoMapper.insertTFeeDo(tFeeDo);
|
|
tFeeDoMapper.insertTFeeDo(tFeeDo);
|
|
|
|
+ if (StringUtils.isNotNull(tFeeDo.getfSrcBillno())) { // 判断是否有来源单据编号(业务编号)
|
|
|
|
+ // 装载业务编号传递
|
|
|
|
+ fSrcBillnos.add(tFeeDo.getfSrcBillno());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 点击对账、收费、付费提交审核时去掉费用
|
|
// 点击对账、收费、付费提交审核时去掉费用
|
|
- if (actId >= 210 && actId <= 230) {
|
|
|
|
|
|
+ if (actId >= 210L && actId <= 230L) {
|
|
AjaxResult ajaxResult = this.billsfeesFollow(tFee.getfId());
|
|
AjaxResult ajaxResult = this.billsfeesFollow(tFee.getfId());
|
|
String code = ajaxResult.get("code").toString();
|
|
String code = ajaxResult.get("code").toString();
|
|
if ("500".equals(code)) {
|
|
if ("500".equals(code)) {
|
|
@@ -850,7 +878,7 @@ public class TFeeServiceImpl implements ITFeeService {
|
|
auditItems.setTimes(1L);// 第几次提交审批
|
|
auditItems.setTimes(1L);// 第几次提交审批
|
|
auditItems.setAuditMsg("提交");
|
|
auditItems.setAuditMsg("提交");
|
|
auditItems.setAuditStatus("O");// 提交状态
|
|
auditItems.setAuditStatus("O");// 提交状态
|
|
- auditItems.setfSrcBillnos(fSrcBillnos);// 装载业务编号数据
|
|
|
|
|
|
+ auditItems.setfSrcBillnos(fSrcBillnos);// 装载业务编号数据(来源单据编号)
|
|
AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);// 生成审批流
|
|
AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);// 生成审批流
|
|
Long code = Long.valueOf(String.valueOf(approvalFlow.get("code"))).longValue();
|
|
Long code = Long.valueOf(String.valueOf(approvalFlow.get("code"))).longValue();
|
|
if (code.equals(500L)) {
|
|
if (code.equals(500L)) {
|