增加喜相随模块

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
        },
-  } 
+  }
 }
 </script>
 
@@ -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;

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_*/

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<FlowTaskMapper, FlowTask
                 userName_str=userName.substring(0,userName.length()-1);
                 flowTask.setAssigneeName(userName_str);
             }
-
-            flowTask.setHasRevokeButton(userSid.equals(flowTask.getAssigneeSid()) ? true : false);
+            flowTask.setPreviousPersonSid(histTask.get("previousPersonSid")==null?"":histTask.get("previousPersonSid").toString());
+            flowTask.setHasRevokeButton(userSid.equals(histTask.get("previousPersonSid")==null?"":histTask.get("previousPersonSid").toString()) ? true : false);
             flowTask.setProcDefId(histTask.get("PROC_DEF_ID_") == null ? "" : histTask.get("PROC_DEF_ID_").toString());
             flowTask.setTaskDefKey(histTask.get("taskDefKey") == null ? "" : histTask.get("taskDefKey").toString());
             flowTask.setTaskName(histTask.get("NAME_") == null ? "" : histTask.get("NAME_").toString());
@@ -2120,6 +2120,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         }
         StringBuilder nextNodeUserSids = new StringBuilder();
         for (SysUserVo su : sysUserVos) {
+            if(su==null){
+                continue;
+            }
             nextNodeUserSids.append(su.getSid()).append(",");
         }
         //符合条件的用户的sid,拼接的字符串

yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-api/src/main/java/com/yxt/supervise/enterprisecentre/api/sealrecord/EnterpriseProjectVo.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.enterprisecentre.api.sealrecord;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/24 10:45
+ */
+@Data
+
+public class EnterpriseProjectVo implements Vo {
+    private String id;
+    private String ids;
+    private String projectSid;
+    private String enterpriseName;
+    private String enterpriseSid;
+
+}

yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-api/src/main/java/com/yxt/supervise/enterprisecentre/api/sealrecord/ProjectInformationVo.java

@@ -0,0 +1,54 @@
+package com.yxt.supervise.enterprisecentre.api.sealrecord;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/25 9:29
+ */
+@ApiModel(value = "项目信息 视图数据对象", description = "项目信息 视图数据对象")
+@Data
+public class ProjectInformationVo implements Vo {
+    private String id ;
+    private String sid;
+    //项目名称
+    private String  entryName;
+    //所属行业
+    private String industryName;
+    //项目类型
+    private String typeName;
+    //授信额度
+    private String creditLimit;
+    //贷款行
+    private String bankName;
+    //客户经理
+    private String bManagerName;
+    //签约日期
+    private String signingDate;
+    //结束日期
+    private String endDate;
+    //企业名称
+    private String enterpriseName;
+    //联系人
+    private String eContacts;
+    //监管负责人
+    private String regulatoryLeader;
+
+    private String generalManager;
+    private String fillInDate;
+    private String bankSid;
+    private String managerSid;
+    private String enterpriseSid;
+    private String industrySid;
+    private String typeSid;
+    private String remarks;
+    private String  engaDate;
+    private String url;
+    private String useLimit;
+    private String loanDate;
+    private String useDate;
+}

yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/feign/EnterpriseProjectFeign.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.EnterpriseProjectVo;
+import com.yxt.supervise.enterprisecentre.biz.feign.fallback.FlowTaskFeignFallBack;
+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-EnterpriseProject",
+        name = "supervise-crm",
+        path = "v1/EnterpriseProject")
+public interface EnterpriseProjectFeign {
+    @ApiOperation("根据sid查询数据")
+    @GetMapping("/getEnterpriseBySid/{sid}")
+    public ResultBean<EnterpriseProjectVo> getEnterpriseBySid(@PathVariable("sid") String sid);
+}

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<ProjectInformationVo> getWarehouse(@PathVariable("sid") String sid);
+}

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<SealRecordMapper, Seal
 	private SysUserFeign sysUserFeign;
 	@Autowired
 	private FlowTaskFeign flowTaskFeign;
+	@Resource
+	private ProjectInformationFeign projectInformationFeign;
+	@Resource
+	private EnterpriseProjectFeign enterpriseProjectFeign;
 	@Autowired
 	private SysFormLinkFeign sysFormLinkFeign;
 	private QueryWrapper<SealRecord> createQueryWrapper(SealRecordQuery query) {
@@ -129,6 +133,9 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
 		if(StringUtils.isNotBlank(query.getSeal_type())){
 			qw.like("seal_type",query.getSeal_type());
 		}
+		if(StringUtils.isNotBlank(query.getEnt_sid())){
+			qw.like("ent_sid",query.getEnt_sid());
+		}
 		qw.orderByDesc("id");
 		return qw;
 	}
@@ -145,6 +152,37 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
 	public ResultBean saveOrUpdateDto(SealRecordDto dto){
 		ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
+		String projectSid=dto.getProject_sid();
+		if(StringUtils.isBlank(projectSid)){
+			return rb.setMsg("项目sid不能为空！");
+		}
+		ResultBean<ProjectInformationVo> 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<EnterpriseProjectVo> 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<String> 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<SealRecordMapper, Seal
 		String businessSid= (String) resultBean.getData();
 		BusinessVariables bv = new BusinessVariables();
 		BeanUtil.copyProperties(dto, bv);
-		bv.setOrgSidPath("");
+		bv.setOrgSidPath(dto.getCreaterOrgPath()==null?"":dto.getCreaterOrgPath());
 		bv.setBusinessSid(businessSid);
 		bv.setUserSid(dto.getUser_sid());//"0331e5b5-9d60-11ed-87ce-525401028fe8");
 		//variables.put("businessSid", businessSid);