diff --git a/supervise-enterprise-ui/src/views/paichanguanliFlow/paichanguanli/commission.vue b/supervise-enterprise-ui/src/views/paichanguanliFlow/paichanguanli/commission.vue index 0dc83a86..c30a9343 100644 --- a/supervise-enterprise-ui/src/views/paichanguanliFlow/paichanguanli/commission.vue +++ b/supervise-enterprise-ui/src/views/paichanguanliFlow/paichanguanli/commission.vue @@ -282,7 +282,7 @@ export default { this.$refs['form_obj'].clearValidate() }) this.viewTitle = '用章详情' - req.fetchDetailsBySid(sid).then((resp) => { + req.fetchDetailsBySid(sid).then((resp) => { var aa = '' this.purchaseForm = resp.data var checkList=resp.data.seal_type @@ -449,7 +449,7 @@ export default { this.dialogVisible = true this.dialogImageUrl = item }, - } + } } @@ -462,7 +462,7 @@ export default { color: #ffffff; background-color: #0294d7; } - + /deep/ .el-collapse-item__content { padding-bottom: 0; } @@ -472,11 +472,11 @@ export default { text-align: center; justify-content: center; } - + .trightb_item { padding-top: 5px; } - + .span { margin-left: 50px; font-size: 15px; diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml index e048fde1..56fa8822 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml @@ -138,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" arpd.KEY_ AS PROC_DEF_KEY_, arpd.NAME_ AS PROC_DEF_NAME_, arpd.VERSION_ AS PROC_DEF_VERSION_, + (select ASSIGNEE_ from ACT_HI_TASKINST aaht where aaht.proc_inst_id_=ahpi.id_ ORDER BY START_TIME_ DESC limit 1,1 ) previousPersonSid, arpd.DEPLOYMENT_ID_ AS DEPLOYMENT_ID_ /*sfl.taskDefKey AS taskDefKey,*/ /*sfl.nodeState NAME_*/ diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 96bffced..4de5cc17 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -745,8 +745,8 @@ public class FlowTaskService extends MybatisBaseService getEnterpriseBySid(@PathVariable("sid") String sid); +} diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/feign/ProjectInformationFeign.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/feign/ProjectInformationFeign.java new file mode 100644 index 00000000..33201195 --- /dev/null +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/feign/ProjectInformationFeign.java @@ -0,0 +1,19 @@ +package com.yxt.supervise.enterprisecentre.biz.feign; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.enterprisecentre.api.sealrecord.ProjectInformationVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +@FeignClient( + contextId = "supervise-crm-projectinformation", + name = "supervise-crm", + path = "v1/projectinformation" +) +public interface ProjectInformationFeign { + @ApiOperation("根据sid查询") + @GetMapping("/getProjectBySid/{sid}") + public ResultBean getWarehouse(@PathVariable("sid") String sid); +} diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java index 31b0ed24..7699667b 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java @@ -74,6 +74,10 @@ public class SealRecordService extends MybatisBaseService createQueryWrapper(SealRecordQuery query) { @@ -129,6 +133,9 @@ public class SealRecordService extends MybatisBaseService rbpinfo=projectInformationFeign.getWarehouse(projectSid); + boolean success = rbpinfo.getSuccess(); + if(!success){ + return rb.setMsg("项目信息查询不到!"); + } + ProjectInformationVo data = rbpinfo.getData(); + if(data==null){ + return rb.setMsg("项目信息查询不到!"); + } + String enterpriseSid = data.getEnterpriseSid(); + String enterpriseName =data.getEnterpriseName(); +// if(StringUtils.isBlank(enterpriseSid)){ +// return rb.setMsg("项目信息企业id为空!"); +// } +// ResultBean enterpriseBySid = +// enterpriseProjectFeign.getEnterpriseBySid(enterpriseSid); +// boolean success1 = enterpriseBySid.getSuccess(); +// if(!success1){ +// return rb.setMsg("项目信息企业不存在!"); +// } +// EnterpriseProjectVo data1 = enterpriseBySid.getData(); +// if(data1==null){ +// return rb.setMsg("项目信息企业不存在!"); +// } +// String enterpriseName = data1.getEnterpriseName(); + dto.setEnt_name(enterpriseName); + dto.setEnt_sid(enterpriseSid); List file_path = dto.getFile_paths(); if(file_path==null||file_path.size()==0){ return rb.setMsg("用印文件不能为空!"); @@ -224,7 +262,7 @@ public class SealRecordService extends MybatisBaseService