From 90af9a8e5373903f581dd13dd3a38a5e7c6463d6 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Wed, 19 Jul 2023 18:04:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=92=8C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storehouseproject/StoreHouseProject.java | 18 ++ .../StoreHouseProjectDto.java | 16 ++ .../StoreHouseProjectQuery.java | 16 ++ .../StoreHouseProjectVo.java | 16 ++ .../shstorehouse/ShStorehouseRest.java | 14 ++ .../StoreHouseProjectRest.java | 35 ++++ .../shstorehouse/ShStorehouseMapper.java | 6 +- .../StoreHouseProjectMapper.java | 13 ++ .../shstorehouse/ShStorehouseService.java | 9 + .../StoreHouseProjectService.java | 51 +++++ .../resources/mappers/ShStorehouseMapper.xml | 4 +- .../mappers/StoreHouseProjectMapper.xml | 15 ++ .../com/yxt/supervise/crm/CrmApplication.java | 2 +- .../ProjectInformationRest.java | 12 +- .../crm/feign/wh/ShStorehouseFeign.java | 19 ++ .../yxt/supervise/system/flow/FlowTaskVo.java | 5 +- .../supervise/system/flow/FlowableRest.java | 181 +++++++++++------- 17 files changed, 352 insertions(+), 80 deletions(-) create mode 100644 warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProject.java create mode 100644 warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectDto.java create mode 100644 warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectQuery.java create mode 100644 warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectVo.java create mode 100644 warehousing-system/project/wh-manage/src/main/java/com/wh/controller/storehouseproject/StoreHouseProjectRest.java create mode 100644 warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/storehouseproject/StoreHouseProjectMapper.java create mode 100644 warehousing-system/project/wh-manage/src/main/java/com/wh/service/storehouseproject/StoreHouseProjectService.java create mode 100644 warehousing-system/project/wh-manage/src/main/resources/mappers/StoreHouseProjectMapper.xml create mode 100644 yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/wh/ShStorehouseFeign.java diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProject.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProject.java new file mode 100644 index 00000000..911b0dc4 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProject.java @@ -0,0 +1,18 @@ +package com.wh.pojo.storehouseproject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +@ApiModel(value = "仓库 项目关联表", description = "仓库项目关联表") +@TableName("storehouse_project") +public class StoreHouseProject extends BaseEntity { + private String shSid; + private String projectSid; +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectDto.java new file mode 100644 index 00000000..84164bd6 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectDto.java @@ -0,0 +1,16 @@ +package com.wh.pojo.storehouseproject; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class StoreHouseProjectDto implements Dto { + private String id; + private String sid; + private String shSid; + private String projectSid; +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectQuery.java new file mode 100644 index 00000000..f67bceba --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectQuery.java @@ -0,0 +1,16 @@ +package com.wh.pojo.storehouseproject; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class StoreHouseProjectQuery implements Query { + private String id; + private String sid; + private String shSid; + private String projectSid; +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectVo.java new file mode 100644 index 00000000..61a9b10b --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectVo.java @@ -0,0 +1,16 @@ +package com.wh.pojo.storehouseproject; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class StoreHouseProjectVo implements Vo { + private String id; + private String sid; + private String shSid; + private String projectSid; +} diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java index 7f7f2933..6aa98c94 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java @@ -80,6 +80,20 @@ public class ShStorehouseRest { PagerVo pv = shStorehouseService.listPageVo(pq); return rb.success().setData(pv); } + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/selectSh") + public ResultBean> selectSh(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + List pv = shStorehouseService.selectSh(pq); + return rb.success().setData(pv); + } + @ApiOperation("根据项目sid查询仓库") + @GetMapping("/getStorehouseBySid") + public ResultBean> getStorehouseBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + List pv = shStorehouseService.getStorehouseBySid(sid); + return rb.success().setData(pv); + } @ApiOperation("根据客户sid获取所有的仓库") @GetMapping("/listAllBycusterSid") public ResultBean> listAllBycusterSid(@RequestParam("custerSid") String custerSid){ diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/storehouseproject/StoreHouseProjectRest.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/storehouseproject/StoreHouseProjectRest.java new file mode 100644 index 00000000..0f582ef2 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/storehouseproject/StoreHouseProjectRest.java @@ -0,0 +1,35 @@ +package com.wh.controller.storehouseproject; + +import com.wh.pojo.shstorehouse.ShStorehouseDto; +import com.wh.pojo.storehouseproject.StoreHouseProjectDto; +import com.wh.service.storehouseproject.StoreHouseProjectService; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/7/19 15:31 + */ +@CrossOrigin +@Api(tags = "库房信息表") +@RestController("com.wh.biz.storehouseproject.StoreHouseProjectRest") +@RequestMapping("v1/storehouseproject") +public class StoreHouseProjectRest { + + @Autowired + StoreHouseProjectService storeHouseProjectService; + + + + // + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody StoreHouseProjectDto dto){ + ResultBean rb = ResultBean.fireFail(); + storeHouseProjectService.saveOrUpdateDto(dto); + return rb.success(); + } +} diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/shstorehouse/ShStorehouseMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/shstorehouse/ShStorehouseMapper.java index d77bfb47..cca583b9 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/shstorehouse/ShStorehouseMapper.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/shstorehouse/ShStorehouseMapper.java @@ -58,7 +58,11 @@ public interface ShStorehouseMapper extends BaseMapper { //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - + + List selectSh(); + @Select("select * from storehouse_project p left join sh_storehouse s on s.sid=p.shSid where p.projectSid=#{sid}") + List getStorehouseBySid(@Param("sid") String sid); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @Select("select * from sh_storehouse") diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/storehouseproject/StoreHouseProjectMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/storehouseproject/StoreHouseProjectMapper.java new file mode 100644 index 00000000..ba4a4ea6 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/storehouseproject/StoreHouseProjectMapper.java @@ -0,0 +1,13 @@ +package com.wh.mapper.storehouseproject; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.wh.pojo.storehouseproject.StoreHouseProject; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author wangpengfei + * @date 2023/7/19 15:43 + */ +@Mapper +public interface StoreHouseProjectMapper extends BaseMapper { +} diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java index a6d5f23d..443abdb8 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/shstorehouse/ShStorehouseService.java @@ -92,6 +92,15 @@ public class ShStorehouseService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + public List selectSh(PagerQuery pq) { + List pagging = baseMapper.selectSh(); + return pagging; + } + public List getStorehouseBySid(String sid) { + List pagging = baseMapper.getStorehouseBySid(sid); + return pagging; + } + public List listAllBycusterSid(String custerSid) { ShStorehouseQuery query = new ShStorehouseQuery(); query.setCusterSid(custerSid); diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/storehouseproject/StoreHouseProjectService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/storehouseproject/StoreHouseProjectService.java new file mode 100644 index 00000000..24379466 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/storehouseproject/StoreHouseProjectService.java @@ -0,0 +1,51 @@ +package com.wh.service.storehouseproject; + +import cn.hutool.core.bean.BeanUtil; +import com.wh.mapper.storehouseproject.StoreHouseProjectMapper; +import com.wh.pojo.shstorehouse.ShStorehouse; +import com.wh.pojo.shstorehouse.ShStorehouseDto; +import com.wh.pojo.shstorehouseattachment.ShStorehouseAttachmentDetailsVo; +import com.wh.pojo.shstorehouseattachment.ShStorehouseAttachmentDto; +import com.wh.pojo.shstorehouseattachment.ShStorehouseAttachmentVo; +import com.wh.pojo.storehouseproject.StoreHouseProject; +import com.wh.pojo.storehouseproject.StoreHouseProjectDto; +import com.yxt.common.base.service.MybatisBaseService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +/** + * @author wangpengfei + * @date 2023/7/19 15:44 + */ +@Service +public class StoreHouseProjectService extends MybatisBaseService { + @Transactional + public void saveOrUpdateDto(StoreHouseProjectDto dto){ + String dtoSid = dto.getSid(); + + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + + public void insertByDto(StoreHouseProjectDto dto){ + StoreHouseProject entity = new StoreHouseProject(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + public void updateByDto(StoreHouseProjectDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + StoreHouseProject entity = fetchBySid(dtoSid); + baseMapper.updateById(entity); + } + +} diff --git a/warehousing-system/project/wh-manage/src/main/resources/mappers/ShStorehouseMapper.xml b/warehousing-system/project/wh-manage/src/main/resources/mappers/ShStorehouseMapper.xml index e589f009..708f8fb0 100644 --- a/warehousing-system/project/wh-manage/src/main/resources/mappers/ShStorehouseMapper.xml +++ b/warehousing-system/project/wh-manage/src/main/resources/mappers/ShStorehouseMapper.xml @@ -6,7 +6,9 @@ - + diff --git a/warehousing-system/project/wh-manage/src/main/resources/mappers/StoreHouseProjectMapper.xml b/warehousing-system/project/wh-manage/src/main/resources/mappers/StoreHouseProjectMapper.xml new file mode 100644 index 00000000..2ad15ead --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/resources/mappers/StoreHouseProjectMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/CrmApplication.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/CrmApplication.java index d4117a3c..f60d2546 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/CrmApplication.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/CrmApplication.java @@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.supervise.crm" }) @EnableDiscoveryClient -@EnableFeignClients(basePackages = {"com.yxt.supervise.system"}) +@EnableFeignClients(basePackages = {"com.yxt.supervise.*"}) public class CrmApplication { public static void main(String[] args) { diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java index d3149213..c92ec489 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java @@ -7,6 +7,7 @@ import com.yxt.supervise.crm.api.projectinformation.ProjectInformationDto; import com.yxt.supervise.crm.api.projectinformation.ProjectInformationFeign; import com.yxt.supervise.crm.api.projectinformation.ProjectInformationQuery; import com.yxt.supervise.crm.api.projectinformation.ProjectInformationVo; +import com.yxt.supervise.crm.feign.wh.ShStorehouseFeign; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -22,7 +23,8 @@ import org.springframework.web.bind.annotation.*; public class ProjectInformationRest implements ProjectInformationFeign { @Autowired ProjectInformationService ProjectInformationService; - + @Autowired + ShStorehouseFeign shStorehouseFeign; @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @@ -51,7 +53,13 @@ public class ProjectInformationRest implements ProjectInformationFeign { ProjectInformationVo ProjectInformationVo=ProjectInformationService.getProjectBySid(sid); return rb.success().setData(ProjectInformationVo); } - + @ApiOperation("根据sid查询仓库信息") + @GetMapping("/getStorehouseBySid/{sid}") + public ResultBean ResultBean (@PathVariable String sid){ +// ResultBean rb = ResultBean.fireFail(); + ResultBean r=shStorehouseFeign.getStorehouseBySid(sid); + return r; + } @ApiOperation("删除") @DeleteMapping("/delete/{sid}") public ResultBean delete(@PathVariable String sid) { diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/wh/ShStorehouseFeign.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/wh/ShStorehouseFeign.java new file mode 100644 index 00000000..008ac904 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/wh/ShStorehouseFeign.java @@ -0,0 +1,19 @@ +package com.yxt.supervise.crm.feign.wh; + +import com.yxt.common.core.result.ResultBean; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * @author wangpengfei + * @date 2023/7/19 13:55 + */ +@FeignClient( + contextId = "supervise-wm-shstorehouse", + name = "supervise-wm", + path = "/v1/shstorehouse") +public interface ShStorehouseFeign { + @GetMapping("/getStorehouseBySid") + public ResultBean getStorehouseBySid(@RequestParam("sid") String sid); +} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskVo.java index f2618d33..3a110394 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskVo.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskVo.java @@ -47,5 +47,8 @@ public class FlowTaskVo { @ApiModelProperty("审批组") private List candidateGroups=new ArrayList<>(); - + private int todoNumber;//代办工作数 + private int pendingWork;//待阅工作数 + private List notice;//公告 + private String[] imageUrl;//轮播图地址 } diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java index 71c19c7f..239d84c7 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/flow/FlowableRest.java @@ -1,80 +1,80 @@ -///********************************************************* -// ********************************************************* -// ******************** ******************* -// ************* ************ -// ******* _oo0oo_ ******* -// *** o8888888o *** -// * 88" . "88 * -// * (| -_- |) * -// * 0\ = /0 * -// * ___/`---'\___ * -// * .' \\| |// '. * -// * / \\||| : |||// \ * -// * / _||||| -:- |||||- \ * -// * | | \\\ - /// | | * -// * | \_| ''\---/'' |_/ | * -// * \ .-\__ '-' ___/-. / * -// * ___'. .' /--.--\ `. .'___ * -// * ."" '< `.___\_<|>_/___.' >' "". * -// * | | : `- \`.;`\ _ /`;.`/ - ` : | | * -// * \ \ `_. \_ __\ /__ _/ .-` / / * -// * =====`-.____`.___ \_____/___.-`___.-'===== * -// * `=---=' * -// * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * -// *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* -// *********************************************************/ -//package com.yxt.supervise.system.flow; -// -//import cn.hutool.core.bean.BeanUtil; -//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -//import com.yxt.anrui.flowable.api.processcomment.ProcessCommentFeign; -//import com.yxt.anrui.flowable.api.processcomment.ProcessCommentVo; -//import com.yxt.common.base.utils.StringUtils; -//import com.yxt.common.core.query.PagerQuery; -//import com.yxt.common.core.result.ResultBean; -//import com.yxt.common.core.vo.PagerVo; -//import com.yxt.supervise.system.flow.app.FlowTaskDoQuery; -//import com.yxt.supervise.system.flow.app.FlowTaskDoVo; -//import com.yxt.supervise.system.flow.app.FlowTaskFinishVo; -//import com.yxt.supervise.system.sysstafforg.SysStaffOrgService; -//import com.yxt.supervise.system.sysstafforg.SysStaffOrgVo; -//import com.yxt.supervise.system.sysuser.SysUser; -//import com.yxt.supervise.system.sysuser.SysUserService; -//import io.swagger.annotations.Api; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RestController; -// -//import java.text.SimpleDateFormat; -//import java.util.ArrayList; -//import java.util.Date; -//import java.util.List; -//import java.util.Map; -// -///** -// * Project: anrui-parent
-// * File: FlowableRest.java
-// * Class: com.yxt.anrui.portal.biz.flow.FlowableRest
-// * Description: <描述类的功能>.
-// * Copyright: Copyright (c) 2011
-// * Company: https://gitee.com/liuzp315
-// * Makedate: 2021/10/23 上午11:13
-// * -// * @author popo -// * @version 1.0 -// * @since 1.0 -// */ -//@RestController -//@RequestMapping("v1/flow") -//@Api(tags = "业务系统中业务和工作流相关操作") +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.system.flow; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yxt.anrui.flowable.api.processcomment.ProcessCommentFeign; +import com.yxt.anrui.flowable.api.processcomment.ProcessCommentVo; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.system.flow.app.FlowTaskDoQuery; +import com.yxt.supervise.system.flow.app.FlowTaskDoVo; +import com.yxt.supervise.system.flow.app.FlowTaskFinishVo; +import com.yxt.supervise.system.sysstafforg.SysStaffOrgService; +import com.yxt.supervise.system.sysstafforg.SysStaffOrgVo; +import com.yxt.supervise.system.sysuser.SysUser; +import com.yxt.supervise.system.sysuser.SysUserService; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * Project: anrui-parent
+ * File: FlowableRest.java
+ * Class: com.yxt.anrui.portal.biz.flow.FlowableRest
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021/10/23 上午11:13
+ * + * @author popo + * @version 1.0 + * @since 1.0 + */ +@RestController +@RequestMapping("v1/flow") +@Api(tags = "业务系统中业务和工作流相关操作") //public class FlowableRest implements FlowableFeign { +public class FlowableRest{ // // @Autowired // private FlowableService flowableService; -// @Autowired -// private SysStaffOrgService sysStaffOrgService; -// @Autowired -// private SysUserService sysUserService; + @Autowired + private SysStaffOrgService sysStaffOrgService; + @Autowired + private SysUserService sysUserService; // @Autowired // private ProcessCommentFeign processCommentFeign; ///* @@ -289,4 +289,37 @@ // public ResultBean> finishApp(PagerQuery pagerQuery) { // return null;//flowableService.finishApp(pagerQuery); // } -//} + @GetMapping("/task/{userSid}") + public ResultBean> task(@PathVariable("userSid") String userSid) {//待办列表 + SysUser sysUser = sysUserService.fetchBySid(userSid); + String staffSid = sysUser.getStaffSid(); + List sysStaffOrgListByStaffSid = sysStaffOrgService.getSysStaffOrgListByStaffSid(staffSid); +// StringBuilder sb = new StringBuilder(); +// for (SysStaffOrgVo s : sysStaffOrgListByStaffSid) { +// sb.append(s.getOrgSidPath()); +// sb.append(","); +// } +// if (sb.length() > 0) { +// sb.delete(sb.length() - 1, sb.length()); +// } +// pQuery.getParams().setOrgSid(sb.toString()); +// Page page = new Page<>(); +// //BeanUtil.copyProperties(flowableService.todoAllTaskList(userSid, pQuery).getData(),page); +// ResultBean< Page> success = new ResultBean< Page>().success(); + ResultBean success = new ResultBean(); + FlowTaskVo flowTaskVo=new FlowTaskVo(); + flowTaskVo.setTodoNumber(5); + List list=new ArrayList<>(); + list.add("【一级风险】"); + list.add("【二级风险】"); + list.add("【三级风险】"); + list.add("【四级风险】"); + flowTaskVo.setNotice(list); + String [] urls={"http://192.168.1.193:7008/upload/1.jpg","http://192.168.1.193:7008/upload/2.jpg"}; + flowTaskVo.setImageUrl(urls); + flowTaskVo.setPendingWork(6); + success.setData(flowTaskVo); + return success; + } + +}