法规技术评估开发。
This commit is contained in:
@@ -238,3 +238,30 @@ CREATE TABLE `laws_technology_evaluation` (
|
||||
`prc_num` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程编号',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估表' ROW_FORMAT = DYNAMIC;
|
||||
|
||||
-- 法规技术评估-流程明细表
|
||||
CREATE TABLE `laws_technology_evaluation_flow_detail` (
|
||||
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
|
||||
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
|
||||
`update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
|
||||
`sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
|
||||
`laws_technology_evaluation_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规技术评估表id',
|
||||
`acti_proc_inst_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程实例id',
|
||||
`prc_num` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程编号',
|
||||
`prc_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流程名称',
|
||||
`evaluator_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评估人id',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估-流程明细表' ROW_FORMAT = Dynamic;
|
||||
|
||||
-- 工作流数据库增加数据。
|
||||
INSERT INTO `t_form` (
|
||||
`OBJECT_ID`,`CODE`,`CREATE_TIME`,`WIDGET_JSON`,`JSON`,`NAME`,`SHOW_KEY`,`IS_DELETED`,
|
||||
`MODEL_ID`,`JSON_EVAL`,`HTML`,`RUN_TYPE`,`CATEGORY_ID`,`HTML_READONLY`
|
||||
)
|
||||
VALUES
|
||||
(
|
||||
'fgjspglc','0006','2022-07-11 15:45:33',NULL,NULL,'法规技术评估流程',NULL,
|
||||
0,'15007',NULL,NULL,'json','4bdf0b396b4aa6ea10dd5e19956a1e22',NULL
|
||||
);
|
||||
|
||||
+4
@@ -145,6 +145,10 @@ public class ShiroConfig {
|
||||
filterChainDefinitionMap.put("/wkflow/processHistoryEO/processCall", "anon"); // 流程历史 工作流处理数据接口排除
|
||||
filterChainDefinitionMap.put("/lawsOpinionGather/lawsOpinionGatherEO/processCall", "anon"); // 法规收集表 工作流处理数据接口排除
|
||||
filterChainDefinitionMap.put("/lawsOpinionGather/lawsProcessHistoryEO/processCall", "anon"); // 法规收集历史 工作流处理数据接口排除
|
||||
// 法规技术评估表-流程明细 工作流处理数据接口排除
|
||||
filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationFlowDetailEO/processCall", "anon");
|
||||
// 法规技术评估表 工作流处理数据接口排除
|
||||
filterChainDefinitionMap.put("/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/processCall", "anon");
|
||||
filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口
|
||||
|
||||
// 添加自己的过滤器并且取名为jwt
|
||||
|
||||
+15
-1
@@ -4,6 +4,8 @@ import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
|
||||
@@ -35,7 +37,7 @@ import com.jero.common.aspect.annotation.AutoLog;
|
||||
public class LawsTechnologyEvaluationEOController extends JeroController<LawsTechnologyEvaluationEO, ILawsTechnologyEvaluationEOService> {
|
||||
@Autowired
|
||||
private ILawsTechnologyEvaluationEOService lawsTechnologyEvaluationEOService;
|
||||
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
@@ -167,4 +169,16 @@ public class LawsTechnologyEvaluationEOController extends JeroController<LawsTec
|
||||
return super.importExcel(request, response, LawsTechnologyEvaluationEO.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* 流程调用接口
|
||||
* @param jsonObject
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "法规意见收集表-流程调用")
|
||||
@ApiOperation(value="法规意见收集表-流程调用", notes="法规意见收集细表-流程调用")
|
||||
@PostMapping(value = "/processCall")
|
||||
public Result<?> processCall(@RequestBody JSONObject jsonObject){
|
||||
return this.lawsTechnologyEvaluationEOService.processCall(jsonObject);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+184
@@ -0,0 +1,184 @@
|
||||
package com.jero.modules.lawsTechnologyEvaluation.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 法规技术评估表-流程明细
|
||||
* @Author: jero-boot
|
||||
* @Date: 2022-07-11
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="法规技术评估表-流程明细")
|
||||
@RestController
|
||||
@RequestMapping("/lawsTechnologyEvaluation/lawsTechnologyEvaluationFlowDetailEO")
|
||||
@Slf4j
|
||||
public class LawsTechnologyEvaluationFlowDetailEOController extends JeroController<LawsTechnologyEvaluationFlowDetailEO, ILawsTechnologyEvaluationFlowDetailEOService> {
|
||||
@Autowired
|
||||
private ILawsTechnologyEvaluationFlowDetailEOService lawsTechnologyEvaluationFlowDetailEOService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param lawsTechnologyEvaluationFlowDetailEO
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "法规技术评估表-流程明细-分页列表查询")
|
||||
@ApiOperation(value="法规技术评估表-流程明细-分页列表查询", notes="法规技术评估表-流程明细-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<LawsTechnologyEvaluationFlowDetailEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationFlowDetailEO, req.getParameterMap());
|
||||
Page<LawsTechnologyEvaluationFlowDetailEO> page = new Page<LawsTechnologyEvaluationFlowDetailEO>(pageNo, pageSize);
|
||||
IPage<LawsTechnologyEvaluationFlowDetailEO> pageList = lawsTechnologyEvaluationFlowDetailEOService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "法规技术评估表-流程明细-列表查询")
|
||||
@ApiOperation(value="法规技术评估表-流程明细-列表查询", notes="法规技术评估表-流程明细-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<LawsTechnologyEvaluationFlowDetailEO>> queryList() {
|
||||
List<LawsTechnologyEvaluationFlowDetailEO> list = lawsTechnologyEvaluationFlowDetailEOService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param lawsTechnologyEvaluationFlowDetailEO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "法规技术评估表-流程明细-添加")
|
||||
@ApiOperation(value="法规技术评估表-流程明细-添加", notes="法规技术评估表-流程明细-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) {
|
||||
lawsTechnologyEvaluationFlowDetailEOService.add(lawsTechnologyEvaluationFlowDetailEO);
|
||||
return Result.OK("添加成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param lawsTechnologyEvaluationFlowDetailEO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "法规技术评估表-流程明细-编辑")
|
||||
@ApiOperation(value="法规技术评估表-流程明细-编辑", notes="法规技术评估表-流程明细-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) {
|
||||
lawsTechnologyEvaluationFlowDetailEOService.editById(lawsTechnologyEvaluationFlowDetailEO);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "法规技术评估表-流程明细-通过id删除")
|
||||
@ApiOperation(value="法规技术评估表-流程明细-通过id删除", notes="法规技术评估表-流程明细-通过id删除")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||
lawsTechnologyEvaluationFlowDetailEOService.deleteById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "法规技术评估表-流程明细-批量删除")
|
||||
@ApiOperation(value="法规技术评估表-流程明细-批量删除", notes="法规技术评估表-流程明细-批量删除")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||
this.lawsTechnologyEvaluationFlowDetailEOService.deleteByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "法规技术评估表-流程明细-通过id查询")
|
||||
@ApiOperation(value="法规技术评估表-流程明细-通过id查询", notes="法规技术评估表-流程明细-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO = lawsTechnologyEvaluationFlowDetailEOService.queryById(id);
|
||||
if(lawsTechnologyEvaluationFlowDetailEO==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(lawsTechnologyEvaluationFlowDetailEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param lawsTechnologyEvaluationFlowDetailEO
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) {
|
||||
return super.exportXls(request, lawsTechnologyEvaluationFlowDetailEO, LawsTechnologyEvaluationFlowDetailEO.class, "法规技术评估表-流程明细");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, LawsTechnologyEvaluationFlowDetailEO.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* 流程调用接口
|
||||
* @param jsonObject
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "法规意见收集-流程明细表-流程调用")
|
||||
@ApiOperation(value="法规意见收集-流程明细表-流程调用", notes="法规意见收集-流程明细表-流程调用")
|
||||
@PostMapping(value = "/processCall")
|
||||
public Result<?> processCall(@RequestBody JSONObject jsonObject){
|
||||
return this.lawsTechnologyEvaluationFlowDetailEOService.processCall(jsonObject);
|
||||
}
|
||||
|
||||
}
|
||||
+89
@@ -0,0 +1,89 @@
|
||||
package com.jero.modules.lawsTechnologyEvaluation.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 法规技术评估表-流程明细
|
||||
* @Author: jero-boot
|
||||
* @Date: 2022-07-11
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("laws_technology_evaluation_flow_detail")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="laws_technology_evaluation_flow_detail对象", description="法规技术评估表-流程明细")
|
||||
public class LawsTechnologyEvaluationFlowDetailEO implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**主键*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "主键")
|
||||
private java.lang.String id;
|
||||
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private java.lang.String createBy;
|
||||
|
||||
/**创建日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
private java.util.Date createTime;
|
||||
|
||||
/**更新人*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private java.lang.String updateBy;
|
||||
|
||||
/**更新日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private java.util.Date updateTime;
|
||||
|
||||
/**所属部门*/
|
||||
@ApiModelProperty(value = "所属部门")
|
||||
private java.lang.String sysOrgCode;
|
||||
|
||||
/**法规技术评估表id*/
|
||||
@Excel(name = "法规技术评估表id", width = 15)
|
||||
@ApiModelProperty(value = "法规技术评估表id")
|
||||
private java.lang.String lawsTechnologyEvaluationId;
|
||||
|
||||
/**流程实例id*/
|
||||
@Excel(name = "流程实例id", width = 15)
|
||||
@ApiModelProperty(value = "流程实例id")
|
||||
private java.lang.String actiProcInstId;
|
||||
|
||||
/**流程编号*/
|
||||
@Excel(name = "流程编号", width = 15)
|
||||
@ApiModelProperty(value = "流程编号")
|
||||
private java.lang.String prcNum;
|
||||
|
||||
/**流程名称*/
|
||||
@Excel(name = "流程名称", width = 15)
|
||||
@ApiModelProperty(value = "流程名称")
|
||||
private java.lang.String prcName;
|
||||
|
||||
/**评估人id*/
|
||||
@Excel(name = "评估人id", width = 15)
|
||||
@ApiModelProperty(value = "评估人id")
|
||||
private java.lang.String evaluatorId;
|
||||
|
||||
}
|
||||
+51
@@ -0,0 +1,51 @@
|
||||
package com.jero.modules.lawsTechnologyEvaluation.enums;
|
||||
|
||||
import com.alibaba.druid.util.StringUtils;
|
||||
import com.jero.common.constant.enums.CutEnum;
|
||||
|
||||
/**
|
||||
* 评估类型枚举类
|
||||
*/
|
||||
public enum EvaluationTypeEnum {
|
||||
FEED_BACK("反馈评估","Feedback evaluation"),
|
||||
ITEM("条款评估","Item evaluation"),
|
||||
;
|
||||
|
||||
String name;
|
||||
String value;
|
||||
|
||||
private EvaluationTypeEnum(String name, String value) {
|
||||
this.name = name;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public void setValue(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public static String getTextByValue(String value,String cut) {
|
||||
EvaluationTypeEnum[] values = values();
|
||||
for (EvaluationTypeEnum certificationProgressEnum : values) {
|
||||
if (certificationProgressEnum.value.equals(value)) {
|
||||
if(StringUtils.equals(cut, CutEnum.CN.getValue())){
|
||||
return certificationProgressEnum.name;
|
||||
}else {
|
||||
return certificationProgressEnum.value;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package com.jero.modules.lawsTechnologyEvaluation.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 法规技术评估表-流程明细
|
||||
* @Author: jero-boot
|
||||
* @Date: 2022-07-11
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface LawsTechnologyEvaluationFlowDetailEOMapper extends BaseMapper<LawsTechnologyEvaluationFlowDetailEO> {
|
||||
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationFlowDetailEOMapper">
|
||||
<resultMap id="LawsTechnologyEvaluationFlowDetailEOResultMap" type="com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO">
|
||||
<id column="id" property="id" />
|
||||
<result column="create_by" property="createBy" />
|
||||
<result column="create_time" property="createTime" />
|
||||
<result column="update_by" property="updateBy" />
|
||||
<result column="update_time" property="updateTime" />
|
||||
<result column="sys_org_code" property="sysOrgCode" />
|
||||
<result column="laws_technology_evaluation_id" property="lawsTechnologyEvaluationId" />
|
||||
<result column="acti_proc_inst_id" property="actiProcInstId" />
|
||||
<result column="prc_num" property="prcNum" />
|
||||
<result column="prc_name" property="prcName" />
|
||||
<result column="evaluator_id" property="evaluatorId" />
|
||||
</resultMap>
|
||||
</mapper>
|
||||
+9
@@ -1,5 +1,7 @@
|
||||
package com.jero.modules.lawsTechnologyEvaluation.service;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import java.util.List;
|
||||
@@ -58,4 +60,11 @@ public interface ILawsTechnologyEvaluationEOService extends IService<LawsTechnol
|
||||
* @return
|
||||
*/
|
||||
List<LawsTechnologyEvaluationEO> queryList();
|
||||
|
||||
/**
|
||||
* 流程调用
|
||||
* @param jsonObject
|
||||
* @return
|
||||
*/
|
||||
Result<?> processCall(JSONObject jsonObject);
|
||||
}
|
||||
|
||||
+70
@@ -0,0 +1,70 @@
|
||||
package com.jero.modules.lawsTechnologyEvaluation.service;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 法规技术评估表-流程明细
|
||||
* @Author: jero-boot
|
||||
* @Date: 2022-07-11
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface ILawsTechnologyEvaluationFlowDetailEOService extends IService<LawsTechnologyEvaluationFlowDetailEO> {
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
* @param lawsTechnologyEvaluationFlowDetailEO
|
||||
* @return
|
||||
*/
|
||||
void add(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO);
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param lawsTechnologyEvaluationFlowDetailEO
|
||||
* @return
|
||||
*/
|
||||
void editById(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO);
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
void deleteById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
void deleteByIds(List<String> ids);
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
LawsTechnologyEvaluationFlowDetailEO queryById(String id);
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
List<LawsTechnologyEvaluationFlowDetailEO> queryList();
|
||||
|
||||
/**
|
||||
* 流程调用
|
||||
* @param jsonObject
|
||||
* @return
|
||||
*/
|
||||
Result<?> processCall(JSONObject jsonObject);
|
||||
}
|
||||
+33
@@ -1,9 +1,20 @@
|
||||
package com.jero.modules.lawsTechnologyEvaluation.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
|
||||
import com.jero.modules.project.enums.OperatorTypeEnum;
|
||||
import com.jero.modules.project.enums.RequestSourceEnum;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
@@ -86,4 +97,26 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
|
||||
public List<LawsTechnologyEvaluationEO> queryList() {
|
||||
return list();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result<?> processCall(JSONObject jsonObject) {
|
||||
String requestSource = jsonObject.getString("requestSource");
|
||||
if(StringUtils.isEmpty(requestSource)){
|
||||
throw new JeroBootException("请求来源不能为空!");
|
||||
}
|
||||
if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){
|
||||
throw new JeroBootException("来源有误,没有权限调用该接口!");
|
||||
}
|
||||
|
||||
String operatorType = jsonObject.getString("operatorType");
|
||||
if(StringUtils.isEmpty(operatorType)){
|
||||
throw new JeroBootException("操作类型不能为空!");
|
||||
}
|
||||
if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())){
|
||||
LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("lawsTechnologyEvaluationEO")),LawsTechnologyEvaluationEO.class);
|
||||
this.save(lawsTechnologyEvaluationEO);
|
||||
}
|
||||
|
||||
return new Result<>().success("调用成功!");
|
||||
}
|
||||
}
|
||||
|
||||
+129
@@ -0,0 +1,129 @@
|
||||
package com.jero.modules.lawsTechnologyEvaluation.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationFlowDetailEOMapper;
|
||||
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService;
|
||||
import com.jero.modules.project.enums.OperatorTypeEnum;
|
||||
import com.jero.modules.project.enums.RequestSourceEnum;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
/**
|
||||
* @Description: 法规技术评估表-流程明细
|
||||
* @Author: jero-boot
|
||||
* @Date: 2022-07-11
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class LawsTechnologyEvaluationFlowDetailEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationFlowDetailEOMapper, LawsTechnologyEvaluationFlowDetailEO> implements ILawsTechnologyEvaluationFlowDetailEOService {
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*
|
||||
* @param lawsTechnologyEvaluationFlowDetailEO
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void add(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) {
|
||||
Date now = new Date();
|
||||
lawsTechnologyEvaluationFlowDetailEO.setCreateTime(now);
|
||||
lawsTechnologyEvaluationFlowDetailEO.setUpdateTime(now);
|
||||
save(lawsTechnologyEvaluationFlowDetailEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param lawsTechnologyEvaluationFlowDetailEO
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void editById(LawsTechnologyEvaluationFlowDetailEO lawsTechnologyEvaluationFlowDetailEO) {
|
||||
Date now = new Date();
|
||||
lawsTechnologyEvaluationFlowDetailEO.setUpdateTime(now);
|
||||
saveOrUpdate(lawsTechnologyEvaluationFlowDetailEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void deleteById(String id) {
|
||||
removeById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public void deleteByIds(List<String> ids) {
|
||||
removeByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public LawsTechnologyEvaluationFlowDetailEO queryById(String id) {
|
||||
return getById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<LawsTechnologyEvaluationFlowDetailEO> queryList() {
|
||||
return list();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result<?> processCall(JSONObject jsonObject) {
|
||||
String requestSource = jsonObject.getString("requestSource");
|
||||
if(StringUtils.isEmpty(requestSource)){
|
||||
throw new JeroBootException("请求来源不能为空!");
|
||||
}
|
||||
if(!StringUtils.equals(requestSource, RequestSourceEnum.WORK_FLOW.getValue())){
|
||||
throw new JeroBootException("来源有误,没有权限调用该接口!");
|
||||
}
|
||||
|
||||
String operatorType = jsonObject.getString("operatorType");
|
||||
if(StringUtils.isEmpty(operatorType)){
|
||||
throw new JeroBootException("操作类型不能为空!");
|
||||
}
|
||||
if(StringUtils.equals(operatorType, OperatorTypeEnum.ADD.getValue())){
|
||||
JSONArray lawsTechnologyEvaluationListArray = jsonObject.getJSONArray("lawsTechnologyEvaluationList");
|
||||
List<LawsTechnologyEvaluationFlowDetailEO> detailList = new ArrayList<>();
|
||||
LawsTechnologyEvaluationFlowDetailEO detailEO = null;
|
||||
for (Object lawsTechnologyEvaluation : lawsTechnologyEvaluationListArray) {
|
||||
detailEO = JSONObject.parseObject(JSONObject.toJSONString(lawsTechnologyEvaluation),LawsTechnologyEvaluationFlowDetailEO.class);
|
||||
detailList.add(detailEO);
|
||||
}
|
||||
if(CollectionUtils.isNotEmpty(detailList)){
|
||||
this.saveBatch(detailList);
|
||||
}
|
||||
}
|
||||
|
||||
return new Result<>().success("调用成功!");
|
||||
}
|
||||
}
|
||||
+11
@@ -71,6 +71,9 @@ public class workFlowController {
|
||||
}else if(StringUtils.equals(type,FlowTypeEnum.FGYJSJLC.getValue())){
|
||||
jsonObject.put("id", FlowTypeEnum.FGYJSJLC.getProcessDefinitionKey());
|
||||
return this.activiti_define_start(jsonObject);
|
||||
}else if(StringUtils.equals(type,FlowTypeEnum.FGJSPG.getValue())){
|
||||
jsonObject.put("processDefinitionKey", FlowTypeEnum.FGJSPG.getProcessDefinitionKey());
|
||||
return this.startLawsTechnologyEvaluationProcess(jsonObject);
|
||||
}else{
|
||||
return null;
|
||||
}
|
||||
@@ -192,4 +195,12 @@ public class workFlowController {
|
||||
conditionAssessmentEOService.addOrUpdate(conditionAssessmentEO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 启动流程-法规技术评估流程
|
||||
* @param jsonObject
|
||||
* @return
|
||||
*/
|
||||
public Result startLawsTechnologyEvaluationProcess(@RequestBody JSONObject jsonObject){
|
||||
return workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject);
|
||||
}
|
||||
}
|
||||
|
||||
+3
-1
@@ -45,7 +45,9 @@ public class TaskCommonQuery {
|
||||
@ApiModelProperty(value = "流程类型")
|
||||
private String prcType;
|
||||
|
||||
private String prcTypes = FlowTypeEnum.RWQRLC.getValue() + "," + FlowTypeEnum.FGYJSJLC.getValue();
|
||||
private String prcTypes = FlowTypeEnum.RWQRLC.getValue()
|
||||
+ "," + FlowTypeEnum.FGYJSJLC.getValue()
|
||||
+ "," + FlowTypeEnum.FGJSPG.getValue();
|
||||
|
||||
@ApiModelProperty(value = "高级搜索字符串")
|
||||
private String advanceSearchVOStr;
|
||||
|
||||
+1
@@ -10,6 +10,7 @@ public enum FlowTypeEnum {
|
||||
PREHOMOQRLC("3","prehomo确认流程","PREHOMOQRLC","prehomo确认流程","prehomoqrlc"),
|
||||
YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc"),
|
||||
FGYJSJLC("5","法规意见收集流程","FGYJSJLC","法规意见收集流程","fgyjsjlc"),
|
||||
FGJSPG("6","法规技术评估","FGJSPG","法规技术评估流程","fgjspglc"),
|
||||
;
|
||||
|
||||
private String value;
|
||||
|
||||
+8
@@ -137,4 +137,12 @@ public interface WorkFlowFeignClient {
|
||||
|
||||
@RequestMapping(value = "/bat-wkflow/task/completeTaskByPids",method = RequestMethod.GET)
|
||||
Result<String> completeTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds);
|
||||
|
||||
/**
|
||||
* 启动流程-法规技术评估流程
|
||||
* @param jsonObject
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/bat-wkflow/startLawsTechnologyEvaluationProcess",method = RequestMethod.POST,headers = {"content-type=application/json"})
|
||||
Result<String> startLawsTechnologyEvaluationProcess(String jsonObject);
|
||||
}
|
||||
|
||||
+10
@@ -157,4 +157,14 @@ public class WorkFlowFeignClientImpl{
|
||||
public List<Map<String, Object>> queryProcessHistoryByPrcId(@RequestParam("prcId") String prcId,@RequestParam("cut") String cut,@RequestParam("prcType") String prcType, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
|
||||
return workFlowFeignClient.queryProcessHistoryByPrcId(prcId,cut,prcType,sortWord,shunxu);
|
||||
}
|
||||
|
||||
/**
|
||||
* 启动流程-法规技术评估流程
|
||||
* @param jsonObject
|
||||
* @return
|
||||
*/
|
||||
public Result startLawsTechnologyEvaluationProcess(@RequestBody net.sf.json.JSONObject jsonObject){
|
||||
Result<String> stringWrapper = workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject.toString());
|
||||
return Result.OK(stringWrapper.getResult());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user