Browse Source

修改

zhanglei
dimengzhe 1 year ago
parent
commit
87bb35c89a
  1. 1
      doc/databases/yxt-as.sql
  2. 16
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java

1
doc/databases/yxt-as.sql

@ -176,7 +176,6 @@ CREATE TABLE `as_busclaim_invoice_bill`
`createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid', `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
`useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid', `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
`useOrgName` varchar(64) DEFAULT NULL COMMENT '分公司', `useOrgName` varchar(64) DEFAULT NULL COMMENT '分公司',
`orgSidPath` text DEFAULT NULL COMMENT '组织全路径sid',
`closeDate` varchar(64) DEFAULT NULL COMMENT '办结日期', `closeDate` varchar(64) DEFAULT NULL COMMENT '办结日期',
`procInstId` varchar(64) DEFAULT NULL COMMENT '实例id', `procInstId` varchar(64) DEFAULT NULL COMMENT '实例id',
`procDefId` varchar(64) DEFAULT NULL COMMENT '流程定义id', `procDefId` varchar(64) DEFAULT NULL COMMENT '流程定义id',

16
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java

@ -24,6 +24,8 @@ import com.yxt.anrui.as.feign.flowable.flowtask.LatestTaskVo;
import com.yxt.anrui.as.feign.message.MessageFeign; import com.yxt.anrui.as.feign.message.MessageFeign;
import com.yxt.anrui.as.feign.message.MessageFlowVo; import com.yxt.anrui.as.feign.message.MessageFlowVo;
import com.yxt.anrui.as.feign.message.MessageFlowableQuery; import com.yxt.anrui.as.feign.message.MessageFlowableQuery;
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.PagerUtil;
@ -74,6 +76,9 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
@Autowired @Autowired
private FlowableFeign flowableFeign; private FlowableFeign flowableFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
public PagerVo<AsBusclaimInvoiceBillVo> listPage(PagerQuery<AsBusclaimInvoiceBillQuery> pagerQuery) { public PagerVo<AsBusclaimInvoiceBillVo> listPage(PagerQuery<AsBusclaimInvoiceBillQuery> pagerQuery) {
AsBusclaimInvoiceBillQuery query = pagerQuery.getParams(); AsBusclaimInvoiceBillQuery query = pagerQuery.getParams();
QueryWrapper<AsBusclaimInvoiceBill> qw = new QueryWrapper<>(); QueryWrapper<AsBusclaimInvoiceBill> qw = new QueryWrapper<>();
@ -123,7 +128,6 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
if (StringUtils.isBlank(sid)) { if (StringUtils.isBlank(sid)) {
AsBusclaimInvoiceBill asBusclaimInvoiceBill = new AsBusclaimInvoiceBill(); AsBusclaimInvoiceBill asBusclaimInvoiceBill = new AsBusclaimInvoiceBill();
BeanUtil.copyProperties(dto, asBusclaimInvoiceBill, "sid"); BeanUtil.copyProperties(dto, asBusclaimInvoiceBill, "sid");
// asBusclaimInvoiceBill.setOrgSidPath(dto.getOrgPath());
asBusclaimInvoiceBill.setCreateBySid(dto.getCreateBySid()); asBusclaimInvoiceBill.setCreateBySid(dto.getCreateBySid());
sid = asBusclaimInvoiceBill.getSid(); sid = asBusclaimInvoiceBill.getSid();
List<String> fileList = dto.getFileList(); List<String> fileList = dto.getFileList();
@ -220,7 +224,10 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
appMap.put("sid", businessSid); appMap.put("sid", businessSid);
variables.put("app", appMap); variables.put("app", appMap);
//用户的部门全路径sid //用户的部门全路径sid
// bv.setOrgSidPath(asBusclaimInvoiceBill.getOrgSidPath()); SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimInvoiceBill.getCreateDeptSid()).getData();
if (sysOrganization != null) {
bv.setOrgSidPath(sysOrganization.getOrgSidPath());
}
bv.setBusinessSid(businessSid); bv.setBusinessSid(businessSid);
bv.setUserSid(dto.getCreateBySid()); bv.setUserSid(dto.getCreateBySid());
bv.setFormVariables(variables); bv.setFormVariables(variables);
@ -309,7 +316,10 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
appMap.put("sid", businessSid); appMap.put("sid", businessSid);
variables.put("app", appMap); variables.put("app", appMap);
bv.setFormVariables(variables); bv.setFormVariables(variables);
// bv.setOrgSidPath(asBusclaimInvoiceBill.getOrgSidPath()); SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimInvoiceBill.getCreateDeptSid()).getData();
if (sysOrganization != null) {
bv.setOrgSidPath(sysOrganization.getOrgSidPath());
}
bv.setModelId(asBusclaimInvoiceBill.getProcDefId()); bv.setModelId(asBusclaimInvoiceBill.getProcDefId());
if (bv.getTaskId().equals(asBusclaimInvoiceBill.getTaskId())) { if (bv.getTaskId().equals(asBusclaimInvoiceBill.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);

Loading…
Cancel
Save