联调工作流

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductServiceImpl.java

@@ -81,6 +81,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
     @Override
     public PageResult<Product> findPage(ProductReq req) {
         LambdaQueryWrapper<Product> wrapper = createWrapper(req);
+
         Page<Product> page = this.page(PageFactory.getDefaultPage(), wrapper);
         return PageResultFactory.createPageResult(page);
     }

jyzb-biz/src/main/java/com/junmp/jyzb/task/ClearLogAction.java

@@ -37,6 +37,7 @@ public class ClearLogAction implements JobAction {
     @Override
     public void action() {
         //获取两月前的日期
+//        ConfigExpander.getClearLogOffsetValue()
         Integer offset = 60;
         //Date maxTime = DateUtil.offsetMonth(new Date(), offset);
         Date maxTime = DateUtil.offsetDay(new Date(),offset);

jyzb-process/src/main/java/com/junmp/junmpProcess/common/CommonConstants.java

@@ -12,9 +12,8 @@ public interface CommonConstants {
     String FORM_VAR="formData";
     String PROCESS_STATUS="processStatus";
     String START_USER_INFO="startUser";
-    String BUSINESS_STATUS_1="1"; //正在处理
-    String BUSINESS_STATUS_2="2";//撤销
-    String BUSINESS_STATUS_3="3";//驳回
-    String BUSINESS_STATUS_4="4";//已结束
-
+    String BUSINESS_STATUS_1="正在处理"; //正在处理
+    String BUSINESS_STATUS_2="撤销";//撤销
+    String BUSINESS_STATUS_3="驳回";//驳回
+    String BUSINESS_STATUS_4="已结束";//已结束
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/BpmnController.java

@@ -20,10 +20,17 @@ import com.junmp.junmpProcess.entity.ProcessTemplates;
 import com.junmp.junmpProcess.exception.WorkFlowException;
 import com.junmp.junmpProcess.service.Repository.ProcessTemplateService;
 import com.junmp.junmpProcess.utils.BpmnConvert;
+import com.junmp.junmpProcess.utils.FormAndOrder;
 import com.junmp.junmpProcess.vo.*;
+import com.junmp.jyzb.api.bean.req.ProductSkuReq;
+import com.junmp.jyzb.api.bean.vo.TagInfoVo;
+import com.junmp.jyzb.entity.ProductSku;
 import com.junmp.jyzb.utils.HttpStatus;
 import com.junmp.jyzb.utils.ResponseResult;
 import com.junmp.jyzb.utils.ReturnMsg;
+import com.junmp.v2.common.bean.request.BaseRequest;
+import com.junmp.v2.common.bean.response.ApiRes;
+import com.junmp.v2.db.api.page.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
@@ -93,13 +100,13 @@ public class BpmnController  {
     }
     @ApiOperation("查看我发起的流程")
     @PostMapping("applyList")
-    public ResponseResult applyList(@RequestBody ApplyDTO ApplyDTO) {
+    public PageResult<HistoryProcessInstanceVO> applyList(@RequestBody ApplyDTO ApplyDTO) {
         return WorkProcessService.applyList(ApplyDTO);
     }
 
     @ApiOperation("查看我的待办")
     @PostMapping("toDoList")
-    public ResponseResult toDoList(@RequestBody TaskDTO taskDTO){
+    public PageResult<TaskVO> toDoList(@RequestBody TaskDTO taskDTO){
         return WorkProcessService.toDoList(taskDTO);
     }
     @ApiOperation("同意按钮")
@@ -107,6 +114,12 @@ public class BpmnController  {
     public ResponseResult agree(@RequestBody HandleDataDTO handleDataDTO){
         return WorkProcessService.agree(handleDataDTO);
     }
+    @ApiOperation("撤销按钮")
+    @PostMapping("revoke")
+    public ResponseResult revoke(@RequestBody HandleDataDTO handleDataDTO){
+        return WorkProcessService.revoke(handleDataDTO);
+    }
+
     @ApiOperation("拒绝按钮")
     @PostMapping("refuse")
     public ResponseResult refuse(@RequestBody HandleDataDTO handleDataDTO){
@@ -120,32 +133,19 @@ public class BpmnController  {
      */
     @ApiOperation("根据ID获取表单信息")
     @PostMapping(value = "getFormTemplateById")
-    public ResponseResult getFormTemplateById(String templateId) {
-        ProcessTemplates processTemplates = processTemplateService.getById(templateId);
+    public ResponseResult  getFormTemplateById(@RequestBody Map<String,Object> templateId) {
+        String temp= templateId.get("templateId").toString();
+        ProcessTemplates processTemplates = processTemplateService.getById(temp);
         processTemplates.setFormId(processTemplates.getTemplateId());
         return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,processTemplates);
     }
 
-    /**
-     * 查询表单模板数据
-     *
-     * @return 模板详情数据
-     */
     @ApiOperation("获取全部可用的表单和审核流")
     @GetMapping(value = "getFormList")
-    public ResponseResult getFormList( ) {
-        return WorkProcessService.getFormList();
+    public ApiRes<PageResult<TemplateGroupVo>> getFormList(BaseRequest br) {
+        return ApiRes.success(WorkProcessService.getFormList(br));
     }
 
-    /**
-     * 查询表单模板数据
-     *
-     * @param templateId 模板id
-     * @return 模板详情数据
-     */
-    @ApiOperation("通过模板id查看流程信息")
-    @GetMapping("getFormDetail")
-    public ResponseResult getFormDetail(@RequestParam("templateId") String templateId){
-        return WorkProcessService.getFormDetail(templateId);
-    }
+
+
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/json/UserInfo.java

@@ -10,6 +10,7 @@ import lombok.Data;
 @Data
 public class UserInfo {
     private String id;
+    private String userId;
     private String name;
     private String type;
     private String sex;

jyzb-process/src/main/java/com/junmp/junmpProcess/entity/ProcessTemplates.java

@@ -2,28 +2,23 @@ package com.junmp.junmpProcess.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
 import java.util.Date;
 
 /**
- * (ProcessTemplates)实体类
- *
- * @author makejava
- * @since 2020-09-21 22:50:29
+ * @author : willian fu
+ * @date : 2020/9/21
  */
-
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@TableName(value = "process_templates")
 @Builder
-public class ProcessTemplates implements Serializable {
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProcessTemplates {
+
     private static final long serialVersionUID = -95829441258242072L;
 
     @TableId
@@ -33,9 +28,9 @@ public class ProcessTemplates implements Serializable {
     private String templateId;
     @TableField(exist = false)
     private String formId;
-
     private String formName;
-
+    private String orgId;
+    @TableField(exist = false)
     private Integer groupId;
     /**
      * 摸板表单
@@ -53,22 +48,13 @@ public class ProcessTemplates implements Serializable {
      * 图标背景色
      */
     private String background;
-
-    private String notify;
-    /**
-     * 谁能提交
-     */
-    private String whoCommit;
-    /**
-     * 谁能编辑
-     */
-    private String whoEdit;
     /**
-     * 谁能导出数据
+     * 图标背景色
      */
-    private String whoExport;
-
     private String remark;
+
+    private String notify;
+
     /**
      * 是否已停用
      */

jyzb-process/src/main/java/com/junmp/junmpProcess/entity/TemplateGroupBo.java

-package com.junmp.junmpProcess.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-/**
- * @author : willian fu
- * @date : 2020/9/21
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class TemplateGroupBo {
-
-    private Integer id;
-
-    private Integer groupId;
-
-    private String groupName;
-
-    private String templateId;
-
-    private String formName;
-
-    private String icon;
-
-    private Boolean isStop;
-
-    private String remark;
-
-    private Date updated;
-
-    private String background;
-}

jyzb-process/src/main/java/com/junmp/junmpProcess/mapper/OrgUserMapper.java

 package com.junmp.junmpProcess.mapper;
 
 import com.junmp.junmpProcess.dto.UserListDTO;
-import com.junmp.junmpProcess.entity.TemplateGroupBo;
-import com.junmp.v2.sys.api.UserServiceApi;
-import com.junmp.v2.sys.api.bean.user.dto.RoleUserDto;
-import com.junmp.v2.sys.api.bean.user.vo.QueryUserInfoVo;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 

jyzb-process/src/main/java/com/junmp/junmpProcess/mapper/TemplateGroupMapper.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import com.junmp.junmpProcess.entity.TemplateGroup;
-import com.junmp.junmpProcess.entity.TemplateGroupBo;
+import com.junmp.junmpProcess.entity.ProcessTemplates;
 
 import java.util.List;
 
@@ -23,5 +23,5 @@ public interface TemplateGroupMapper extends BaseMapper<TemplateGroup> {
      */
     @Select("SELECT  pt.template_id, pt.remark, pt.is_stop, pt.updated, pt.form_name, \n" +
             "            pt.icon, pt.background FROM process_templates pt  ORDER BY updated desc")
-    List<TemplateGroupBo> getAllFormAndGroups();
+    List<ProcessTemplates> getAllFormAndGroups();
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/WorkProcessService.java

@@ -10,7 +10,10 @@ import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
 import com.junmp.junmpProcess.dto.TaskDTO;
 import com.junmp.junmpProcess.entity.ProcessTemplates;
 import com.junmp.junmpProcess.vo.*;
+import com.junmp.jyzb.entity.ProductSku;
 import com.junmp.jyzb.utils.ResponseResult;
+import com.junmp.v2.common.bean.request.BaseRequest;
+import com.junmp.v2.db.api.page.PageResult;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
@@ -46,7 +49,7 @@ public interface WorkProcessService {
      *
      * @return
      */
-    ResponseResult getFormList();
+    PageResult<TemplateGroupVo>  getFormList(BaseRequest br);
 
 
     /**
@@ -68,14 +71,14 @@ public interface WorkProcessService {
      *
      * @return
      */
-    ResponseResult applyList(ApplyDTO applyDTO);
+    PageResult<HistoryProcessInstanceVO> applyList(ApplyDTO applyDTO);
 
     /**
      * 查看我的待办
      *
      * @return
      */
-    ResponseResult toDoList(TaskDTO taskDTO);
+    PageResult<TaskVO> toDoList(TaskDTO taskDTO);
 
     /**
      * 查看我的已办
@@ -92,6 +95,12 @@ public interface WorkProcessService {
     ResponseResult agree(HandleDataDTO handleDataDTO);
 
     /**
+     * 同意
+     *
+     * @return
+     */
+    ResponseResult revoke(HandleDataDTO handleDataDTO);
+    /**
      * 委派
      *
      * @return
@@ -112,12 +121,7 @@ public interface WorkProcessService {
      */
     ResponseResult refuse(HandleDataDTO handleDataDTO);
 
-    /**
-     * 撤销按钮
-     *
-     * @return
-     */
-    Result revoke(HandleDataDTO handleDataDTO);
+
 
     /**
      * 转办按钮

jyzb-process/src/main/java/com/junmp/junmpProcess/utils/FormAndOrder.java

+package com.junmp.junmpProcess.utils;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.sql.Time;
+
+/**
+     * <pre>
+     *
+     * 描述：
+     * 版本：1.0.0
+     * 日期：2022/7/29 16:19
+     * 作者：ningzp@junmp.com.cn
+     * <br>修改记录
+     * <br>修改日期        修改人          修改内容
+     *
+     * </pre>
+     */
+    @Data
+    public class FormAndOrder {
+
+        private Long formId;
+
+        /**
+         * 号型代码
+         */
+        private String processDefinitionId;
+
+        /**
+         *
+         */
+        @TableField(value = "sku_code")
+        private String formName;
+
+        /**
+         *
+         */
+        private String isStop;
+
+        /**
+         *
+         */
+        private String remark;
+
+        /**
+         *
+         */
+        private Time updated;
+
+        /**
+         *
+         */
+        private String templateId;
+
+}

jyzb-process/src/main/java/com/junmp/junmpProcess/vo/TemplateGroupVo.java

@@ -17,23 +17,13 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 public class TemplateGroupVo {
-
-    private List<Template> items;
-
-    @Data
-    @Builder
-    @AllArgsConstructor
-    @NoArgsConstructor
-    public static class Template {
-
-        private String formId;
-        private String processDefinitionId;
-        private String formName;
-        private Boolean isStop;
-        private String remark;
-        private String updated;
-        private String templateId;
-    }
+    private String formId;
+    private String processDefinitionId;
+    private String formName;
+    private Boolean isStop;
+    private String remark;
+    private String updated;
+    private String templateId;
 
 
 }