11/6

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java

@@ -54,10 +54,10 @@ public class ProjectInformationRest implements ProjectInformationFeign {
         return rb.success().setData(list);
     }
     @ApiOperation("查询全部（没有权限控制）")
-    @GetMapping("/listsAll")
+    @GetMapping("/listAllNew")
-    public ResultBean<List<ProjectInformationVo>> listsAll(@RequestHeader("token") String token) {
+    public ResultBean<List<ProjectInformationVo>> listAllNew(@RequestHeader("token") String token) {
         ResultBean rb = ResultBean.fireFail();
-        List<ProjectInformationVo> list =ProjectInformationService.listsAll(token);
+        List<ProjectInformationVo> list =ProjectInformationService.listAllNew(token);
         return rb.success().setData(list);
     }
     @ApiOperation("保存")

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java

@@ -113,7 +113,7 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         }
         return pagging;
     }
-    public List<ProjectInformationVo> listsAll(String token) {
+    public List<ProjectInformationVo> listAllNew(String token) {
 //        SysUserVo sysUserVo=sysUserFeign.loginDetailsNew(token).getData();
         List<ProjectInformationVo> pagging = baseMapper.listsAll();
         for(ProjectInformationVo projectInformationVo:pagging){

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/system/RegionRest.java

@@ -0,0 +1,27 @@
+package com.yxt.supervise.crm.biz.system;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.crm.feign.system.RegionFeign;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/6 16:28
+ */
+@RestController("com.yxt.supervise.crm.biz.system.RegionRest")
+@RequestMapping("v1/region")
+public class RegionRest {
+    @Autowired
+    RegionFeign regionFeign;
+    @ApiOperation("获取省")
+    @ResponseBody
+    @GetMapping("/getProvince")
+    public ResultBean getProvince(){
+        return regionFeign.getProvince();
+    }
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/system/SysMenuRest.java

@@ -0,0 +1,33 @@
+package com.yxt.supervise.crm.biz.system;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.crm.feign.sysmenu.SysMenuFeign;
+import com.yxt.supervise.crm.feign.sysmenu.SysMenuQuery;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/10/26 9:54
+ */
+@RestController("com.yxt.supervise.crm.biz.system.SysMenuRest")
+@RequestMapping("v1/sysmenu")
+public class SysMenuRest {
+    @Autowired
+    SysMenuFeign sysMenuFeign;
+
+
+    @ApiOperation("根据资源sid查询所有数据列表 ")
+    @PostMapping("/sourcemenutree")
+    public ResultBean<List<Map<String, Object>>> sourcemenutree(@RequestBody SysMenuQuery query){
+        return sysMenuFeign.sourcemenutree(query);
+    }
+
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/system/SysOrganizationRest.java

@@ -0,0 +1,48 @@
+package com.yxt.supervise.crm.biz.system;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.crm.feign.system.SysOrganizationFeign;
+import com.yxt.supervise.system.sysorganization.SysOrganizationVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/6 15:36
+ */
+@RestController("com.yxt.supervise.crm.biz.system.SysOrganizationRest")
+@RequestMapping("v1/sysorganization")
+public class SysOrganizationRest {
+    @Autowired
+    SysOrganizationFeign sysOrganizationFeign;
+    @ApiOperation("获取组织结构某一组织")
+    @GetMapping("/getUserListByOrg/{orgCode}")
+    public ResultBean<List<SysOrganizationVo>> getUserListByOrg(@PathVariable("orgCode")String orgCode){
+        return sysOrganizationFeign.getUserListByOrg(orgCode);
+    }
+
+    /**
+     * 获取组织结构下人员信息
+     * @return
+     */
+    @ApiOperation("获取组织结构下关联项目人员信息")
+    @GetMapping("/associationUserList/{projectSid}")
+    public ResultBean<List<SysOrganizationVo>> associationUserList(@PathVariable("projectSid") String projectSid){
+        return sysOrganizationFeign.associationUserList(projectSid);
+    };
+    /**
+     * 获取组织结构下人员信息
+     * @return
+     */
+    @ApiOperation("获取组织结构下人员信息")
+    @GetMapping("/userList/{projectSid}")
+    public ResultBean<List<SysOrganizationVo>> userList(@PathVariable("projectSid")String projectSid){
+        return sysOrganizationFeign.userList(projectSid);
+    };
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/system/SysUserRest.java

@@ -0,0 +1,27 @@
+package com.yxt.supervise.crm.biz.system;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.crm.feign.system.SysUserFeign;
+import com.yxt.supervise.system.sysuser.SysUserVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/6 15:37
+ */
+@RestController("com.yxt.supervise.crm.biz.system.SysUserRest")
+@RequestMapping("v1/sysuser")
+public class SysUserRest {
+    @Autowired
+    SysUserFeign sysUserFeign;
+    @PostMapping(value = "/loginDetailsNew")
+    @ApiOperation("根据token值获取登录后的用户信息")
+    public ResultBean<SysUserVo> loginDetailsNew(@RequestHeader("token") String token){
+        return sysUserFeign.loginDetailsNew(token);
+    }
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/sysmenu/SysMenuFeign.java

@@ -0,0 +1,26 @@
+package com.yxt.supervise.crm.feign.sysmenu;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/10/26 9:50
+ */
+@Api(tags = "菜单表")
+@FeignClient(
+        contextId = "supervise-system-SysMenu",
+        name = "supervise-system",
+        path = "v1/sysmenu")
+public interface SysMenuFeign {
+    @ApiOperation("根据资源sid查询所有数据列表 ")
+    @PostMapping("/sourcemenutree")
+    public ResultBean<List<Map<String, Object>>> sourcemenutree(@RequestBody SysMenuQuery query);
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/sysmenu/SysMenuQuery.java

@@ -0,0 +1,66 @@
+package com.yxt.supervise.crm.feign.sysmenu;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuQuery.java <br/>
+ * Class: SysMenuQuery <br/>
+ * Description: 菜单表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表 查询条件", description = "菜单表 查询条件")
+@Data
+public class SysMenuQuery implements Query {
+
+    
+	@ApiModelProperty("菜单名称")
+    private String name;
+
+	@ApiModelProperty("菜单路由路径(VUE)")
+    private String menuUrl;
+    
+	@ApiModelProperty("菜单对应的前端页面路径")
+    private String pageUrl;
+    
+	@ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+	@ApiModelProperty("用户sid")
+    private String userSid;
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+
+	@ApiModelProperty("是否显示,默认为1显示，0为不显示")
+    private String isShow;
+    
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+    
+	@ApiModelProperty("上级sid")
+    private String pSid;
+    
+	@ApiModelProperty("前端页面路径重定向")
+    private Integer pageUrlRedirect;
+    
+	@ApiModelProperty("前端页面名称（vue组件名）")
+    private String pageName;
+    
+	@ApiModelProperty("前端页面别名")
+    private String pageAliasName;
+    
+	@ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
+    private String menuType;
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/system/RegionFeign.java

@@ -0,0 +1,35 @@
+package com.yxt.supervise.crm.feign.system;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/30 14:19
+ * @Description
+ */
+@FeignClient(
+        contextId = "supervise-system-Region",
+        name = "supervise-system",
+        path = "v1/regions")
+public interface RegionFeign {
+
+    @ApiOperation("获取省")
+    @ResponseBody
+    @GetMapping("/getProvince")
+    public ResultBean getProvince();
+
+    @ApiOperation("根据省sid获取该省的所有市")
+    @ResponseBody
+    @GetMapping("/getCity")
+    public ResultBean getCity(@RequestParam("sid") String sid);
+
+    @ApiOperation("根据市sid获取该市的所有县区")
+    @ResponseBody
+    @GetMapping("/getCounty")
+    public ResultBean getCounty(@RequestParam("sid") String sid);
+}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/system/SysOrganizationFeign.java

@@ -26,4 +26,21 @@ public interface SysOrganizationFeign {
     @ResponseBody
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<SysOrganizationVo> fetchBySid(@PathVariable("sid") String sid);
+    @ApiOperation("获取组织结构某一组织")
+    @GetMapping("/getUserListByOrg/{orgCode}")
+    public ResultBean<List<SysOrganizationVo>> getUserListByOrg(@PathVariable("orgCode")String orgCode);
+    /**
+     * 获取组织结构下人员信息
+     * @return
+     */
+    @ApiOperation("获取组织结构下关联项目人员信息")
+    @GetMapping("/associationUserList/{projectSid}")
+    public ResultBean<List<SysOrganizationVo>> associationUserList(@PathVariable("projectSid") String projectSid);
+    /**
+     * 获取组织结构下人员信息
+     * @return
+     */
+    @ApiOperation("获取组织结构下人员信息")
+    @GetMapping("/userList/{projectSid}")
+    public ResultBean<List<SysOrganizationVo>> userList(@PathVariable("projectSid")String projectSid);
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/app/crm/ProjectAccountRest.java

@@ -0,0 +1,26 @@
+package com.yxt.supervise.report.app.crm;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.feign.crm.projectaccount.ProjectAccountFeign;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wangpengfei
+ * @date 2023/10/30 15:00
+ */
+@RestController("com.yxt.supervise.report.app.crm.ProjectAccountRest")
+@RequestMapping("app/projectaccount")
+public class ProjectAccountRest {
+    @Autowired
+    ProjectAccountFeign projectAccountFeign;
+    @ApiOperation("根据项目sid查询账户信息 app")
+    @GetMapping("/getAccountByProjectSidApp/{projectSid}")
+    public ResultBean getAccountByProjectSidApp (@PathVariable("projectSid") String projectSid){
+        return projectAccountFeign.getAccountByProjectSidApp(projectSid);
+    }
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/app/crm/ProjectInformationRest.java

@@ -0,0 +1,48 @@
+package com.yxt.supervise.report.app.crm;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.feign.crm.projectaccount.ProjectAccountFeign;
+import com.yxt.supervise.report.feign.crm.projectinformation.ProjectInformationFeign;
+import com.yxt.supervise.report.feign.wh.ShStorehouseFeign;
+import com.yxt.supervise.report.feign.wh.ShStorehouseVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wangpengfei
+ * @date 2023/10/30 14:38
+ */
+@RestController("com.yxt.supervise.report.app.crm.ProjectInformationRest")
+@RequestMapping("v1/app/project")
+public class ProjectInformationRest {
+    @Autowired
+    ProjectInformationFeign projectInformationFeign;
+    @Autowired
+    ShStorehouseFeign shStorehouseFeign;
+
+    @ApiOperation("根据用户sid查询项目名称App")
+    @GetMapping("/getProjectByUserSidApp/{userSid}")
+    public ResultBean getProjectByUserSidApp (@PathVariable("userSid")String userSid){
+        return projectInformationFeign.getProjectByUserSidApp(userSid);
+    }
+    @ApiOperation("根据sid查项目等相关信息")
+    @GetMapping("/getProjectBySidApp/{sid}")
+    public ResultBean getEnterpriseBySidApp(@PathVariable("sid") String sid){
+        return projectInformationFeign.getEnterpriseBySidApp(sid);
+    }
+    @ApiOperation("根据项目sid查询仓库")
+    @GetMapping("/selectStoreHouse/{sid}")
+    public ResultBean selectStoreBySid (@PathVariable("sid") String sid){
+        ResultBean rb =new ResultBean();
+        ShStorehouseVo r=shStorehouseFeign.selectStoreBySid(sid).getData();
+        if(null==r){
+            return rb.success().setData(new ShStorehouseVo());
+        }
+        return rb.success().setData(r);
+    }
+
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/app/enterprisecentre/BreakProcessQuery.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.report.app.enterprisecentre;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise-enterprisecentre(企业中心) <br/>
+ * File: SealRecordQuery.java <br/>
+ * Class: com.yxt.supervise.enterprisecentre.api.sealrecord.SealRecordQuery <br/>
+ * Description: 用章申请 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-09-03 10:29:22 <br/>
+ *
+ * @author 功夫熊猫
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "用章申请 BreakProcessQuery 查询条件", description = "用章申请 BreakProcessQuery 查询条件")
+public class BreakProcessQuery implements Query {
+    @ApiModelProperty(value = "节点状态")
+    private String nodeState;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("流程实例的id")
+    private String procInsId;
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
+    @ApiModelProperty(value = "环节定义的ID")
+    private String taskDefKey;
+    @ApiModelProperty(value = "usersid")
+    private String userSid;
+    @ApiModelProperty(value = "businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "instanceId")
+    private String instanceId;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/app/enterprisecentre/FlowTaskVo.java

@@ -0,0 +1,53 @@
+package com.yxt.supervise.report.app.enterprisecentre;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>流程任务<p>
+ *
+ * @author XuanXuan
+ * @date 2021-04-03
+ */
+@ApiModel("工作流任务相关--请求参数")
+@Data
+public class FlowTaskVo {
+
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("业务sid")
+    private String  businessSid;
+    @ApiModelProperty("用户Id")
+    private String userId;
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+
+    @ApiModelProperty("任务意见")
+    private String comment;
+
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+
+    @ApiModelProperty("节点")
+    private String targetKey;
+
+    @ApiModelProperty("流程变量信息")
+    private Map<String, Object> values=new HashMap<>();
+
+    @ApiModelProperty("审批人")
+    private String assignee;
+
+    @ApiModelProperty("候选人")
+    private List<String> candidateUsers;
+
+    @ApiModelProperty("审批组")
+    private List<String> candidateGroups;
+
+
+
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/app/enterprisecentre/SealRecordDetailsVo.java

@@ -0,0 +1,86 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.report.app.enterprisecentre;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: yxt-supervise-enterprisecentre(企业中心) <br/>
+ * File: SealRecordVo.java <br/>
+ * Class: com.yxt.supervise.enterprisecentre.api.sealrecord.SealRecordVo <br/>
+ * Description: 用章申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-09-03 10:29:22 <br/>
+ *
+ * @author 功夫熊猫
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "用章申请 视图数据详情", description = "用章申请 视图数据详情")
+public class SealRecordDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("项目sid")
+    private String project_sid; // 项目sid
+	@ApiModelProperty("项目名称")
+    private String project_name; // 项目名称
+	@ApiModelProperty("审批编号")
+    private String code; // 审批编号
+	@ApiModelProperty("申请日期")
+    private String applicant_date; // 申请日期
+	@ApiModelProperty("申请人sid")
+    private String applicant_sid; // 申请人sid
+	@ApiModelProperty("申请人name")
+    private String applicant_name; // 申请人name
+	@ApiModelProperty("用印章人姓名")
+    private String user_name; // 用印章人姓名
+	@ApiModelProperty("用印章人sid")
+    private String user_sid; // 用印章人sid
+	@ApiModelProperty("使用日期")
+    private String use_date; // 使用日期
+	@ApiModelProperty("用印章事由")
+    private String use_reason; // 用印章事由
+	@ApiModelProperty("用印文件名称")
+    private String use_file_name; // 用印文件名称
+	@ApiModelProperty("加盖何种公章。1:公章，2：法人章，3：财务章，4：发票章，5：营业执照，6：开户许可证")
+    private String[] seal_type; // 加盖何种公章。1:公章，2：法人章，3：财务章，4：发票章，5：营业执照，6：开户许可证
+	@ApiModelProperty("用印文件（附件）")
+    private List<String> file_paths; // 用印文件（附件）
+
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/app/enterprisecentre/SealRecordFeign.java

@@ -0,0 +1,90 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.report.app.enterprisecentre;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * Project: yxt-supervise-enterprisecentre(企业中心) <br/>
+ * File: SealRecordFeign.java <br/>
+ * Class: com.yxt.supervise.enterprisecentre.api.sealrecord.SealRecordFeign <br/>
+ * Description: 用章申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-09-03 10:29:22 <br/>
+ *
+ * @author 功夫熊猫
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "用章申请")
+@FeignClient(
+        contextId = "yxt-supervise-enterprisecentre-SealRecord",
+        name = "yxt-supervise-enterprisecentre",
+        path = "v1/sealrecord")
+public interface SealRecordFeign {
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<SealRecordDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    /**
+     *  办理用章申请
+     * @param dto
+     * @return
+     */
+    @ApiOperation("办理")
+    @PostMapping("/complete")
+    public ResultBean complete(@RequestBody SealRecordHandleDto dto);
+
+    /**
+     * 终止流程
+     * @param query
+     * @return
+     */
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    @ResponseBody
+    public ResultBean breakProcess(@Valid @RequestBody BreakProcessQuery query);
+
+    /**
+     * 撤回流程
+     * @param flowTaskVo
+     * @return
+     */
+    @ApiOperation("撤回")
+    @PostMapping("/revokeProcess")
+    public ResultBean revokeProcess( @RequestBody FlowTaskVo flowTaskVo);
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/app/enterprisecentre/SealRecordHandleDto.java

@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.report.app.enterprisecentre;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+/**
+ * Project: yxt-supervise-enterprisecentre(企业中心) <br/>
+ * File: SealRecordDto.java <br/>
+ * Class: com.yxt.supervise.enterprisecentre.api.sealrecord.SealRecordDto <br/>
+ * Description: 用章申请 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-09-03 10:29:22 <br/>
+ *
+ * @author 功夫熊猫
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "用章申请 办理 数据传输对象", description = "用章申请 办理 数据传输对象")
+public class SealRecordHandleDto implements Dto {
+
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    private String orgSidPath;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：instanceId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    @NotBlank(message = "参数错误：comment")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "分支字段及业务字段")
+    private Map<String, Object> formVariables;
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/app/system/FlowableRest.java

@@ -0,0 +1,43 @@
+package com.yxt.supervise.report.app.system;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.feign.system.flowable.FlowRecordVo;
+import com.yxt.supervise.report.feign.system.flowable.FlowTaskAllQuery;
+import com.yxt.supervise.report.feign.system.flowable.FlowTaskDto;
+import com.yxt.supervise.report.feign.system.flowable.FlowableFeign;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/6 9:52
+ */
+@RestController("com.yxt.supervise.report.app.system.FlowableRest")
+@RequestMapping("v1/app/flow")
+public class FlowableRest {
+    @Autowired
+    FlowableFeign flowableFeign;
+
+    @ApiOperation(value = "总待办列表")
+    @PostMapping("/todoAllTaskList/{userSid}")
+    public ResultBean<Page<FlowTaskDto>> todoAllTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid,
+                                                         @ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery<FlowTaskAllQuery> pQuery){
+        return flowableFeign.todoAllTaskList(userSid,pQuery);
+    }
+    @ApiOperation(value = "总已办列表")
+    @PostMapping("/doneAllTaskList/{userSid}")
+    public ResultBean<Page<FlowTaskDto>> doneAllTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid,
+                                                         @ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery<FlowTaskAllQuery> pQuery){
+        return flowableFeign.doneAllTaskList(userSid, pQuery);
+    }
+    @ApiOperation(value = "流程历史流转记录")
+    @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
+    public ResultBean<FlowRecordVo> flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId,
+                                               @ApiParam(value = "目前没用") @PathVariable(value = "deployId") String deployId){
+        return flowableFeign.flowRecord(procInsId, deployId);
+    }
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/app/system/SysUserRest.java

@@ -0,0 +1,56 @@
+package com.yxt.supervise.report.app.system;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.feign.system.sysuser.SysUserFeign;
+import com.yxt.supervise.system.sysuser.SysUserQuery;
+import com.yxt.supervise.system.sysuser.SysUserUpdate;
+import com.yxt.supervise.system.sysuser.SysUserVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/10/25 9:51
+ */
+@RestController("com.yxt.supervise.report.app.system.SysUserRest")
+@RequestMapping("v1/app/sysuser")
+public class SysUserRest {
+    @Autowired
+    SysUserFeign sysUserFeign;
+    @PostMapping(value = "/loginDetails", headers = "token")
+    @ApiOperation("根据token值获取登录后的用户信息")
+    public ResultBean<SysUserVo> loginDetails(HttpServletRequest httpServletRequest){
+        httpServletRequest.getHeader("token");
+        return sysUserFeign.loginDetailsNew(httpServletRequest.getHeader("token"));
+    }
+    @PostMapping("/uploadfile")
+    @ApiOperation("上传头像")
+    public ResultBean uploadImage(@RequestParam(value = "file") MultipartFile file){
+        System.out.println(1);
+        ResultBean resultBean=sysUserFeign.uploadImage(file);
+        return resultBean;
+    }
+    @PostMapping("/uploadImage")
+    @ApiOperation("保存头像")
+    public ResultBean uploadImage(@RequestBody Map<String, String> map){
+        return sysUserFeign.updateSysUserImage(map);
+    }
+    @PostMapping("/updatePassword")
+    @ApiOperation(value = "5、修改密码")
+    public ResultBean updatePassword(@RequestBody SysUserUpdate sysUserUpdate){
+        return sysUserFeign.updatePassword(sysUserUpdate);
+    }
+    @PostMapping("/login")
+    @ResponseBody
+    @ApiOperation(value = "3、登录")
+    @ApiOperationSupport(order = 30)
+    public ResultBean<SysUserVo> login(@RequestBody SysUserQuery sysUserQuery){
+        return sysUserFeign.login(sysUserQuery);
+    }
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/app/system/WxSysUserRest.java

@@ -0,0 +1,35 @@
+package com.yxt.supervise.report.app.system;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.feign.system.sysuser.SysUserLoginVo;
+import com.yxt.supervise.report.feign.system.sysuser.SysUserWxBindMobileDto;
+import com.yxt.supervise.report.feign.system.sysuser.WxSysUserFeign;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/6 9:56
+ */
+@RestController("com.yxt.supervise.report.app.system.WxSysUserRest")
+@RequestMapping("v1/app/wxuser")
+public class WxSysUserRest {
+    @Autowired
+    WxSysUserFeign wxSysUserFeign;
+    @PostMapping("/wxBindMobile")
+    @ApiOperation(value = "微信绑定手机")
+    public ResultBean wxBindMobile(@RequestBody SysUserWxBindMobileDto sysUserWxBindMobileDto){
+        return wxSysUserFeign.wxBindMobile(sysUserWxBindMobileDto);
+    }
+    @ApiOperation(value = "发送验证码")
+    @GetMapping("/sendVerificationCode/{mobile}/{type}")
+    public ResultBean sendVerificationCode(@PathVariable("mobile") String mobile, @PathVariable("type") String type){
+        return wxSysUserFeign.sendVerificationCode(mobile, type);
+    }
+    @ApiOperation(value = "微信静默登录")
+    @GetMapping("/wxSilentLogin")
+    public ResultBean wxSilentLogin(@RequestParam(value = "wxCode") String wxCode){
+        return wxSysUserFeign.wxSilentLogin(wxCode);
+    }
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/app/wh/ShStorehouseRest.java

@@ -0,0 +1,33 @@
+package com.yxt.supervise.report.app.wh;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.feign.wh.ShStorehouseFeign;
+import com.yxt.supervise.report.feign.wh.ShStorehouseQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/10/30 16:50
+ */
+@RestController("com.yxt.supervise.report.app.wh.ShStorehouseRest")
+@RequestMapping("v1/app/shstorehouse")
+public class ShStorehouseRest {
+    @Autowired
+    ShStorehouseFeign shStorehouseFeign;
+    @PostMapping("/storeHouseListPage")
+    public ResultBean task(@RequestBody PagerQuery<ShStorehouseQuery> pq) {
+        return shStorehouseFeign.listPage(pq);
+    }
+
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) {
+        return shStorehouseFeign.fetchDetailsBySid(sid);
+    }
+    @PostMapping("/listPage")
+    public ResultBean listPage(@RequestBody PagerQuery<ShStorehouseQuery> pq){
+        return shStorehouseFeign.listPage(pq);
+    }
+
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectaccount/ProjectAccountFeign.java

@@ -0,0 +1,25 @@
+package com.yxt.supervise.report.feign.crm.projectaccount;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.feign.crm.projectinformation.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;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/10/25 9:36
+ */
+@FeignClient(
+        contextId = "supervise-crm-projectaccount",
+        name = "supervise-crm",
+        path = "/projectAccount")
+public interface ProjectAccountFeign {
+    @ApiOperation("根据项目sid查询账户信息 app")
+    @GetMapping("/getAccountByProjectSidApp/{projectSid}")
+    public ResultBean getAccountByProjectSidApp (@PathVariable("projectSid") String projectSid);
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java

@@ -5,10 +5,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -26,4 +23,10 @@ public interface ProjectInformationFeign {
     @ApiOperation("查询全部")
     @GetMapping("/listAll")
     public ResultBean<List<ProjectInformationVo>> listAll(@RequestHeader("token") String token);
+    @ApiOperation("根据用户sid查询项目名称App")
+    @GetMapping("/getProjectByUserSidApp/{userSid}")
+    public ResultBean getProjectByUserSidApp (@PathVariable("userSid")String userSid);
+    @ApiOperation("根据sid查项目等相关信息")
+    @GetMapping("/getProjectBySidApp/{sid}")
+    public ResultBean getEnterpriseBySidApp(@PathVariable("sid") String sid);
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/flowable/FlowCommentDto.java

@@ -0,0 +1,35 @@
+package com.yxt.supervise.report.feign.system.flowable;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author XuanXuan
+ * @date 2021/3/28 15:50
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FlowCommentDto implements Serializable {
+
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1929734226858491967L;
+
+	/**
+     * 意见类别 1正常（同意）意见 2退回意见 3 驳回意见 4 委派意见 5 转办意见 6 终止流程 7 撤回流程
+     */
+    private String type;
+
+    /**
+     * 意见内容
+     */
+    private String comment;
+
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/flowable/FlowRecordVo.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.report.feign.system.flowable;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class FlowRecordVo {
+    private List<FlowTask> flowList = new ArrayList<>();
+
+    public List<FlowTask> getFlowList() {
+        return flowList;
+    }
+
+    public void setFlowList(List<FlowTask> flowList) {
+        this.flowList = flowList;
+    }
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/flowable/FlowTask.java

@@ -0,0 +1,102 @@
+package com.yxt.supervise.report.feign.system.flowable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>工作流任务<p>
+ *
+ * @author XuanXuan
+ * @date 2021-04-03
+ */
+@ApiModel("工作流任务相关-返回参数")
+@Data
+public class FlowTask extends BaseEntity implements Serializable {
+
+    @ApiModelProperty("任务编号")
+    private String taskId;
+
+    @ApiModelProperty("任务名称")
+    private String taskName;
+
+    @ApiModelProperty("任务Key")
+    private String taskDefKey;
+
+    @ApiModelProperty("任务执行人Id")
+    private Long assigneeId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("流程发起人部门名称")
+    private String startDeptName;
+
+    @ApiModelProperty("任务执行人名称")
+    private String assigneeName;
+
+    @ApiModelProperty("任务执行人头像")
+    private String assigneeHeadImage;
+
+    @ApiModelProperty("流程发起人Id")
+    private String startUserId;
+
+    @ApiModelProperty("流程发起人名称")
+    private String startUserName;
+
+    @ApiModelProperty("流程类型")
+    private String category;
+
+    @ApiModelProperty("流程变量信息")
+    private Object procVars;
+
+    @ApiModelProperty("局部变量信息")
+    private Object taskLocalVars;
+
+    @ApiModelProperty("流程部署编号")
+    private String deployId;
+
+    @ApiModelProperty("流程ID")
+    private String procDefId;
+
+    @ApiModelProperty("流程key")
+    private String procDefKey;
+
+    @ApiModelProperty("流程定义名称")
+    private String procDefName;
+
+    @ApiModelProperty("流程定义内置使用版本")
+    private int procDefVersion;
+
+    @ApiModelProperty("流程实例ID")
+    private String procInsId;
+
+    @ApiModelProperty("历史流程实例ID")
+    private String hisProcInsId;
+
+    @ApiModelProperty("任务耗时")
+    private String duration;
+
+    @ApiModelProperty("任务意见")
+    private FlowCommentDto comment = new FlowCommentDto();
+
+    @ApiModelProperty("候选执行人")
+    private String candidate;
+
+   /* @ApiModelProperty("任务创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
+    private Date createTime;*/
+
+    @ApiModelProperty("任务完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date finishTime;
+
+    @ApiModelProperty("环节的办理人信息")
+    private List<TaskUserInfo> taskUserInfos;
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/flowable/FlowTaskAllQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.supervise.report.feign.system.flowable;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author hanweijia
+ * @date 2021/8/20 13:53
+ * @description
+ */
+@Data
+public class FlowTaskAllQuery implements Query {
+    private static final long serialVersionUID = -7395299971899690002L;
+    private String proDefName;//流程定义名称
+    private String processDefinitionId;//流程定义id
+    private String startDate;//开始日期
+    private String endDate;//结束日期
+    private String orgSid;//部门sid
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/flowable/FlowTaskDto.java

@@ -0,0 +1,116 @@
+package com.yxt.supervise.report.feign.system.flowable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * <p>工作流任务<p>
+ *
+ * @author XuanXuan
+ * @date 2021-04-03
+ */
+@ApiModel("工作流任务相关-返回参数")
+@Data
+public class FlowTaskDto implements Serializable {
+
+    @ApiModelProperty("任务编号")
+    private String taskId;
+
+    @ApiModelProperty("任务名称")
+    private String taskName;
+
+    @ApiModelProperty("任务Key")
+    private String taskDefKey;
+
+    @ApiModelProperty("任务执行人Id")
+    private String assigneeSid;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("流程发起人部门名称")
+    private String startDeptName;
+
+    @ApiModelProperty("任务执行人名称")
+    private String assigneeName;
+
+    @ApiModelProperty("流程发起人Id")
+    private String startUserSid;
+
+    @ApiModelProperty("流程发起人名称")
+    private String startUserName;
+
+    @ApiModelProperty("流程类型")
+    private String category;
+
+    @ApiModelProperty("流程变量信息")
+    private Object procVars;
+
+    @ApiModelProperty("局部变量信息")
+    private Object taskLocalVars;
+
+    @ApiModelProperty("流程部署编号")
+    private String deployId;
+
+    @ApiModelProperty("流程ID")
+    private String procDefId;
+
+    @ApiModelProperty("流程key")
+    private String procDefKey;
+
+    @ApiModelProperty("流程定义名称")
+    private String procDefName;
+
+    @ApiModelProperty("流程定义内置使用版本")
+    private int procDefVersion;
+
+    @ApiModelProperty("流程实例ID")
+    private String procInsId;
+
+    @ApiModelProperty("历史流程实例ID")
+    private String hisProcInsId;
+
+    @ApiModelProperty("任务耗时")
+    private String duration;
+
+    @ApiModelProperty("任务意见")
+    private FlowCommentDto comment;
+
+    @ApiModelProperty("候选执行人")
+    private String candidate;
+    @ApiModelProperty("结束事件ID")
+    private String endActId;
+
+    @ApiModelProperty("流程创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date processCreateTime;
+    @ApiModelProperty("任务创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    @ApiModelProperty("任务结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    @ApiModelProperty("任务完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date finishTime;
+    @ApiModelProperty("业务表单参数集合")
+    private Map<String, Object> processVariables;
+
+    /*@ApiModelProperty("手机端参数集合")
+    private Map<String, Object> appVariables;
+
+    @ApiModelProperty("pc端参数集合")
+    private Map<String, Object> pcVariables;*/
+
+    @ApiModelProperty("是否显示撤回按钮(登录用户与待办人是否为同一个)")
+    private boolean hasRevokeButton = false;
+    @ApiModelProperty("办理的url")
+    private SysProUrlVo sysProUrlVo ;
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/flowable/FlowableFeign.java

@@ -0,0 +1,37 @@
+package com.yxt.supervise.report.feign.system.flowable;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author wangpengfei
+ * @date 2023/10/31 10:37
+ */
+@Api(tags = "业务系统中业务和工作流相关操作")
+@FeignClient(
+        contextId = "supervise-system-Flowable",
+        name = "supervise-system",
+        path = "v1/flow")
+public interface FlowableFeign {
+    @ApiOperation(value = "总待办列表")
+    @PostMapping("/todoAllTaskList/{userSid}")
+    public ResultBean<Page<FlowTaskDto>> todoAllTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid,
+                                                         @ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery<FlowTaskAllQuery> pQuery);
+    @ApiOperation(value = "总已办列表")
+    @PostMapping("/doneAllTaskList/{userSid}")
+    public ResultBean<Page<FlowTaskDto>> doneAllTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid,
+                                                         @ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery<FlowTaskAllQuery> pQuery);
+    @ApiOperation(value = "流程历史流转记录")
+    @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
+    public ResultBean<FlowRecordVo> flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId,
+                                               @ApiParam(value = "目前没用") @PathVariable(value = "deployId") String deployId);
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/flowable/SysProUrlVo.java

@@ -0,0 +1,54 @@
+package com.yxt.supervise.report.feign.system.flowable;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * 流程业务表单url对象 SysProUrl
+ *
+ * @author XuanXuan Xuan
+ * @date 2021-03-30
+ */
+@Data
+@ApiModel("流程业务表单url对象")
+public class SysProUrlVo implements Vo {
+
+    /**
+     * 表单主键
+     */
+    private String url;
+
+    /**
+     * 类型办理或者详情
+     */
+    private String type;
+
+    /**
+     * 终端：pc/mobile
+     */
+    private String terminal;
+    /**
+     * 表单id
+     */
+    private String formId;
+    /**
+     * 名称
+     */
+    private String title;
+
+    /**
+     * 流程定义id
+     */
+    private String proc_def_id;
+
+    /**
+     * 节点id
+     */
+    private String taskDefKey;
+
+    /**
+     * app插件名称（模块名称）
+     */
+    private String modulePluginName;
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/flowable/TaskUserInfo.java

@@ -0,0 +1,31 @@
+package com.yxt.supervise.report.feign.system.flowable;
+
+public class TaskUserInfo {
+    private String assigneeName;
+    private String assigneeHeadImage;
+    private String assigneeSid;
+
+    public String getAssigneeSid() {
+        return assigneeSid;
+    }
+
+    public void setAssigneeSid(String assigneeSid) {
+        this.assigneeSid = assigneeSid;
+    }
+
+    public String getAssigneeName() {
+        return assigneeName;
+    }
+
+    public void setAssigneeName(String assigneeName) {
+        this.assigneeName = assigneeName;
+    }
+
+    public String getAssigneeHeadImage() {
+        return assigneeHeadImage;
+    }
+
+    public void setAssigneeHeadImage(String assigneeHeadImage) {
+        this.assigneeHeadImage = assigneeHeadImage;
+    }
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysuser/SysUserFeign.java

@@ -1,15 +1,20 @@
 package com.yxt.supervise.report.feign.system.sysuser;
 
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.yxt.common.core.result.FileUploadResult;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.supervise.system.sysuser.SysUser;
+import com.yxt.supervise.system.sysuser.SysUserQuery;
-import com.yxt.supervise.system.sysuser.SysUserDto;
+import com.yxt.supervise.system.sysuser.SysUserUpdate;
 import com.yxt.supervise.system.sysuser.SysUserVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author wangpengfei
@@ -23,4 +28,16 @@ public interface SysUserFeign {
     @PostMapping(value = "/loginDetailsNew")
     @ApiOperation("根据token值获取登录后的用户信息")
     public ResultBean<SysUserVo> loginDetailsNew(@RequestHeader("token") String token);
+    @PostMapping(value = "/uploadfile",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResultBean<FileUploadResult> uploadImage(@RequestPart(value = "file") MultipartFile file);
+    @PostMapping("/uploadImage")
+    public ResultBean updateSysUserImage(@RequestBody Map<String, String> map);
+    @PostMapping("/updatePassword")
+    @ApiOperation(value = "5、修改密码")
+    public ResultBean updatePassword(@RequestBody SysUserUpdate sysUserUpdate);
+    @PostMapping("/login")
+    @ResponseBody
+    @ApiOperation(value = "3、登录")
+    @ApiOperationSupport(order = 30)
+    public ResultBean<SysUserVo> login(@RequestBody SysUserQuery sysUserQuery);
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysuser/SysUserLoginVo.java

@@ -0,0 +1,15 @@
+package com.yxt.supervise.report.feign.system.sysuser;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysUserLoginVo implements Vo {
+    @ApiModelProperty(value = "用户Sid")
+    private String sysUserSid;
+    @ApiModelProperty(value = "用户登录时随机生成身份验证字符串")
+    private String token;
+    @ApiModelProperty(value = "是否登陆")
+    private Boolean isLogin;
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysuser/SysUserUpdate.java

@@ -0,0 +1,15 @@
+package com.yxt.supervise.report.feign.system.sysuser;
+
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-08-18-17:19
+ */
+@Data
+public class SysUserUpdate {
+    private String original;
+    private String password;
+    private String confirmPassword;
+    private String userSid;
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysuser/SysUserWxBindMobileDto.java

@@ -0,0 +1,18 @@
+package com.yxt.supervise.report.feign.system.sysuser;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysUserWxBindMobileDto implements Dto {
+    @ApiModelProperty(value = "用户登陆授权Sid")
+    private String sysUserWxAuthSid;
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+    @ApiModelProperty(value = "验证码")
+    private String code;
+    //微信id
+    private String openid;
+    private String unionid;
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysuser/WxSysUserFeign.java

@@ -0,0 +1,26 @@
+package com.yxt.supervise.report.feign.system.sysuser;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/10/31 10:46
+ */
+@FeignClient(
+        contextId = "supervise-portal-WxUser",
+        name = "supervise-system",
+        path = "v1/wxuser")
+public interface WxSysUserFeign {
+    @PostMapping("/wxBindMobile")
+    @ApiOperation(value = "微信绑定手机")
+    public ResultBean wxBindMobile(@RequestBody SysUserWxBindMobileDto sysUserWxBindMobileDto);
+    @ApiOperation(value = "发送验证码")
+    @GetMapping("/sendVerificationCode/{mobile}/{type}")
+    public ResultBean sendVerificationCode(@PathVariable("mobile") String mobile, @PathVariable("type") String type);
+    @ApiOperation(value = "微信静默登录")
+    @GetMapping("/wxSilentLogin")
+    public ResultBean wxSilentLogin(@RequestParam(value = "wxCode") String wxCode);
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/wh/ShStorehouseFeign.java

@@ -0,0 +1,29 @@
+package com.yxt.supervise.report.feign.wh;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 13:55
+ */
+@FeignClient(
+        contextId = "supervise-wm-shstorehouse",
+        name = "supervise-wm",
+        path = "/v1/shstorehouse")
+public interface ShStorehouseFeign {
+
+    @GetMapping("/selectStoreBySid")
+    public ResultBean<ShStorehouseVo> selectStoreBySid(@RequestParam("shSid")String shSid);
+
+
+    @PostMapping("/listPage")
+    public ResultBean listPage(@RequestBody PagerQuery<ShStorehouseQuery> pq);
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/wh/ShStorehouseQuery.java

@@ -0,0 +1,99 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.report.feign.wh;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: ShStorehouseQuery.java <br/>
+ * Class: com.wh.api.shstorehouse.ShStorehouseQuery <br/>
+ * Description: 库房信息表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-06-14 23:18:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房信息表 查询条件", description = "库房信息表 查询条件")
+public class ShStorehouseQuery implements Query {
+
+	@ApiModelProperty("客户Sid（企业）")
+    private String custerSid; // 客户Sid（企业）
+	@ApiModelProperty("客户名称（企业）")
+    private String custerName; // 客户名称（企业）
+	@ApiModelProperty("仓库名称")
+    private String name; // 仓库名称
+	@ApiModelProperty("仓库简称")
+    private String simpleName; // 仓库简称
+	@ApiModelProperty("仓库编码")
+    private String code; // 仓库编码
+	@ApiModelProperty("所属省份编码")
+    private String provinceCode; // 所属省份编码
+	@ApiModelProperty("所属省份名称")
+    private String provinceName; // 所属省份名称
+	@ApiModelProperty("所属城市编码")
+    private String cityCode; // 所属城市编码
+	@ApiModelProperty("所属城市名称")
+    private String cityName; // 所属城市名称
+	@ApiModelProperty("所属区县编码")
+    private String countyCode; // 所属区县编码
+	@ApiModelProperty("所属区县名称")
+    private String countyName; // 所属区县名称
+	@ApiModelProperty("区域名称，不同级用逗号(,)分隔，如河北省,石家庄市,长安区")
+    private String regionName; // 区域名称，不同级用逗号(,)分隔，如河北省,石家庄市,长安区
+	@ApiModelProperty("详细地址")
+    private String address; // 详细地址
+	@ApiModelProperty("库房面积")
+    private String acreage; // 库房面积
+	@ApiModelProperty("库房面积")
+    private String storeyHeight; // 库房面积
+	@ApiModelProperty("月租金")
+    private String monthlyPrice; // 月租金
+	@ApiModelProperty("库房性质编码组，多个性质以逗号(,)分隔")
+    private String attributeCodes; // 库房性质编码组，多个性质以逗号(,)分隔
+	@ApiModelProperty("库房性质名称组，多个性质以逗号(,)分隔，如：电商仓库,物流仓储,厂房")
+    private String attributeNames; // 库房性质名称组，多个性质以逗号(,)分隔，如：电商仓库,物流仓储,厂房
+	@ApiModelProperty("房源")
+    private String housingResource; // 房源
+	@ApiModelProperty("联系人姓名")
+    private String linkerName; // 联系人姓名
+	@ApiModelProperty("联系人电话")
+    private String linkerPhone; // 联系人电话
+	@ApiModelProperty("图片访问url")
+    private String picUrl; // 图片访问url
+    @ApiModelProperty("精度")
+    private String lon;
+    @ApiModelProperty("维度")
+    private String lat;
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/wh/ShStorehouseVo.java

@@ -0,0 +1,319 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.report.feign.wh;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: ShStorehouseVo.java <br/>
+ * Class: com.wh.api.shstorehouse.ShStorehouseVo <br/>
+ * Description: 库房信息表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-06-14 23:18:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "库房信息表 视图数据对象", description = "库房信息表 视图数据对象")
+public class ShStorehouseVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("客户Sid（企业）")
+    private String custerSid; // 客户Sid（企业）
+	@ApiModelProperty("客户名称（企业）")
+    private String custerName; // 客户名称（企业）
+	@ApiModelProperty("仓库名称")
+    private String name; // 仓库名称
+	@ApiModelProperty("仓库简称")
+    private String simpleName; // 仓库简称
+	@ApiModelProperty("仓库编码")
+    private String code; // 仓库编码
+	@ApiModelProperty("所属省份编码")
+    private String provinceCode; // 所属省份编码
+	@ApiModelProperty("所属省份名称")
+    private String provinceName; // 所属省份名称
+	@ApiModelProperty("所属城市编码")
+    private String cityCode; // 所属城市编码
+	@ApiModelProperty("所属城市名称")
+    private String cityName; // 所属城市名称
+	@ApiModelProperty("所属区县编码")
+    private String countyCode; // 所属区县编码
+	@ApiModelProperty("所属区县名称")
+    private String countyName; // 所属区县名称
+	@ApiModelProperty("区域名称，不同级用逗号(,)分隔，如河北省,石家庄市,长安区")
+    private String regionName; // 区域名称，不同级用逗号(,)分隔，如河北省,石家庄市,长安区
+	@ApiModelProperty("详细地址")
+    private String address; // 详细地址
+	@ApiModelProperty("库房面积")
+    private String acreage; // 库房面积
+	@ApiModelProperty("库房面积")
+    private String storeyHeight; // 库房面积
+	@ApiModelProperty("月租金")
+    private String monthlyPrice; // 月租金
+	@ApiModelProperty("库房性质编码组，多个性质以逗号(,)分隔")
+    private String attributeCodes; // 库房性质编码组，多个性质以逗号(,)分隔
+	@ApiModelProperty("库房性质名称组，多个性质以逗号(,)分隔，如：电商仓库,物流仓储,厂房")
+    private String attributeNames; // 库房性质名称组，多个性质以逗号(,)分隔，如：电商仓库,物流仓储,厂房
+	@ApiModelProperty("房源")
+    private String housingResource; // 房源
+	@ApiModelProperty("联系人姓名")
+    private String linkerName; // 联系人姓名
+	@ApiModelProperty("联系人电话")
+    private String linkerPhone; // 联系人电话
+	@ApiModelProperty("图片访问url")
+    private String picUrl; // 图片访问url
+    @ApiModelProperty("精度")
+    private String lon;
+    @ApiModelProperty("维度")
+    private String lat;
+    private String shSid;//仓库sid
+    private String projectSid;//项目sid
+
+
+    public String getSid() {
+        return sid;
+    }
+
+    public void setSid(String sid) {
+        this.sid = sid;
+    }
+
+    public String getCusterSid() {
+        return custerSid;
+    }
+
+    public void setCusterSid(String custerSid) {
+        this.custerSid = custerSid;
+    }
+
+    public String getCusterName() {
+        return custerName;
+    }
+
+    public void setCusterName(String custerName) {
+        this.custerName = custerName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSimpleName() {
+        return simpleName;
+    }
+
+    public void setSimpleName(String simpleName) {
+        this.simpleName = simpleName;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getProvinceCode() {
+        return provinceCode;
+    }
+
+    public void setProvinceCode(String provinceCode) {
+        this.provinceCode = provinceCode;
+    }
+
+    public String getProvinceName() {
+        return provinceName;
+    }
+
+    public void setProvinceName(String provinceName) {
+        this.provinceName = provinceName;
+    }
+
+    public String getCityCode() {
+        return cityCode;
+    }
+
+    public void setCityCode(String cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getCountyCode() {
+        return countyCode;
+    }
+
+    public void setCountyCode(String countyCode) {
+        this.countyCode = countyCode;
+    }
+
+    public String getCountyName() {
+        return countyName;
+    }
+
+    public void setCountyName(String countyName) {
+        this.countyName = countyName;
+    }
+
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getAcreage() {
+        return acreage;
+    }
+
+    public void setAcreage(String acreage) {
+        this.acreage = acreage;
+    }
+
+    public String getStoreyHeight() {
+        return storeyHeight;
+    }
+
+    public void setStoreyHeight(String storeyHeight) {
+        this.storeyHeight = storeyHeight;
+    }
+
+    public String getMonthlyPrice() {
+        return monthlyPrice;
+    }
+
+    public void setMonthlyPrice(String monthlyPrice) {
+        this.monthlyPrice = monthlyPrice;
+    }
+
+    public String getAttributeCodes() {
+        return attributeCodes;
+    }
+
+    public void setAttributeCodes(String attributeCodes) {
+        this.attributeCodes = attributeCodes;
+    }
+
+    public String getAttributeNames() {
+        return attributeNames;
+    }
+
+    public void setAttributeNames(String attributeNames) {
+        this.attributeNames = attributeNames;
+    }
+
+    public String getHousingResource() {
+        return housingResource;
+    }
+
+    public void setHousingResource(String housingResource) {
+        this.housingResource = housingResource;
+    }
+
+    public String getLinkerName() {
+        return linkerName;
+    }
+
+    public void setLinkerName(String linkerName) {
+        this.linkerName = linkerName;
+    }
+
+    public String getLinkerPhone() {
+        return linkerPhone;
+    }
+
+    public void setLinkerPhone(String linkerPhone) {
+        this.linkerPhone = linkerPhone;
+    }
+
+    public String getPicUrl() {
+        return picUrl;
+    }
+
+    public void setPicUrl(String picUrl) {
+        this.picUrl = picUrl;
+    }
+
+    public String getLon() {
+        return lon;
+    }
+
+    public void setLon(String lon) {
+        this.lon = lon;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+    public String getShSid() {
+        return shSid;
+    }
+
+    public void setShSid(String shSid) {
+        this.shSid = shSid;
+    }
+
+    public String getProjectSid() {
+        return projectSid;
+    }
+
+    public void setProjectSid(String projectSid) {
+        this.projectSid = projectSid;
+    }
+}

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

@@ -95,4 +95,7 @@ public class SealRecordDto implements Dto {
     private String taskDefKey;
     @ApiModelProperty("taskId")
     private String taskId;
+    private String ent_name;
+    private String ent_sid;
+    private String createrOrgPath;
 }

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

@@ -87,5 +87,7 @@ public class SealRecordQuery implements Query {
     private String seal_type; // 加盖何种公章。1:公章，2：法人章，3：财务章，4：发票章，5：营业执照，6：开户许可证
 	@ApiModelProperty("用印文件（附件）")
     private String file_path; // 用印文件（附件）
+    private String ent_name;
+    private String ent_sid;
 
 }