yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化工作

master
God 2 years ago
parent
aa52fc48bb
commit
26dc0d50d1
3 changed files with 18 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/flowable/FinFundsApplyCompleteDto.java
  2. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyRest.java
  3. 22
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/flowable/FinFundsApplyCompleteDto.java
View File

@ -21,6 +21,8 @@ public class FinFundsApplyCompleteDto implements Dto {
@ApiModelProperty(value = "用户sid")
private String userSid;
@ApiModelProperty(value = "下载类型")
private String pdfType;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误：taskDefKey")
private String taskDefKey;

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyRest.java
View File

@ -123,7 +123,7 @@ public class FinFundsCarriedForwardApplyRest implements FinFundsCarriedForwardAp
BeanUtil.copyProperties(query,bv);
bv.setModelId(ProcDefEnum.FINFUNDSAPPLY.getProDefId());
bv.setFormVariables(BeanUtil.beanToMap(query));
return finFundsCarriedForwardApplyService.complete(bv);
return finFundsCarriedForwardApplyService.complete(bv,query.getPdfType());
}
@Override
@ -190,7 +190,7 @@ public class FinFundsCarriedForwardApplyRest implements FinFundsCarriedForwardAp
BeanUtil.copyProperties(query,bv);
bv.setModelId(ProcDefEnum.FINFUNDSAPPLY.getProDefId());
bv.setFormVariables(BeanUtil.beanToMap(query));
return finFundsCarriedForwardApplyService.complete(bv);
return finFundsCarriedForwardApplyService.complete(bv,query.getPdfType());
}
@Override

22
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
View File

@ -607,10 +607,10 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
if (isOneSale) {
dto.setIsOneSale(true);
String sid = saveOrUpdateAll(dto).getData();
finFundsCarriedForwardApply = fetchBySid(sid);
//String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
//String pdfPath = createPdf(sid, dto.getPdfType()).getData();
//baseMapper.updatePathBySid(pdfPath, sid);
tsqtysd(sid);
jzComplete(sid);
return rb.success();
}
}
@ -1152,7 +1152,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean complete(BusinessVariables bv) {
public ResultBean complete(BusinessVariables bv,String pdfType) {
ResultBean rb = ResultBean.fireFail();
String businessSid = bv.getBusinessSid();
FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(businessSid);
@ -1191,12 +1191,13 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
//String pdfPath = createPdf(finFundsCarriedForwardApply.getSid(), finFundsCarriedForwardApply.getCreateByName()).getData();
//String pdfPath = createPdf(finFundsCarriedForwardApply.getSid(), pdfType).getData();
//baseMapper.updatePathBySid(pdfPath, businessSid);
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
for (AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
finSelectedReceivablesDetailedService.updateAuditStateBySid(3, appFinFundsCarriedForwardYXYSKXVo.getSid());
}
jzComplete(businessSid);
tsqtysd(businessSid);
} else {
//极光推送
@ -1329,7 +1330,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
return rb.success().setData(data);
}
public ResultBean<String> createPdf(String sid, String userName) {
public ResultBean<String> createPdf(String sid, String pdfType) {
ResultBean rb = ResultBean.fireFail();
FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(sid).getData();
List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = data.getFinFundsCarriedForwardVehDetailsVos();
@ -1346,7 +1347,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
String assigneeName = (String) taskUserInfos.get(0).get("assigneeName");
String finishTime = (String) flowableRecordVo.get("finishTime");
finishTime = finishTime.substring(0, 10);
if ("Activity_1nfy3ql".equals(taskDefKey)) {
if ("Activity_17mi28e".equals(taskDefKey)) {
dataMap.put("spName", assigneeName + finishTime);
}
}
@ -1373,6 +1374,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
tzList.add(tzDto);
}
dataMap.put("saleDate", DateUtil.formatDate(new Date()));
dataMap.put("billNo", data.getBillNo());
dataMap.put("tzList", tzList);
dataMap.put("makeName", data.getCreateByName() + data.getCreateByDate());
//获取模板
@ -1384,12 +1386,16 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
String typeName = dateStr + seconds + ".doc";
// 生成文件路径
String targetPath = sourcePath + dateStr;
WordUtils.creatWord(dataMap, "kxjz", sourcePath, targetPath, typeName);
if (pdfType.equals("针孔式打印机")) {
WordUtils.creatWord(dataMap, "jzsqzks", sourcePath, targetPath, typeName);
} else if (pdfType.equals("激光打印机")) {
WordUtils.creatWord(dataMap, "jzsqjg", sourcePath, targetPath, typeName);
}
//新生成的word路径
String wordPath = targetPath + "\\" + typeName;
//生成出门证文件名
String pdfName = "款项结转_" + dateStr + seconds + ".pdf";
WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
return rb.success().setData("template/" + dateStr + "/" + pdfName);
}

Write Preview
Loading…
Cancel
Save