WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_third_stage'

Browse Source 
# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
This commit is contained in:
lixuetao
2022-07-05 15:34:57 +08:00
parent c3c3baefe5 89424f793f
commit 7ddac7eb75
100 changed files with 2523 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java
+8 -1
View File
@@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog;
public class LawsOpinionAssessmentResultEOController extends JeroController<LawsOpinionAssessmentResultEO, ILawsOpinionAssessmentResultEOService> {
@Autowired
private ILawsOpinionAssessmentResultEOService lawsOpinionAssessmentResultEOService;
/**
* 分页列表查询
*
@@ -167,4 +167,11 @@ public class LawsOpinionAssessmentResultEOController extends JeroController<Laws
return super.importExcel(request, response, LawsOpinionAssessmentResultEO.class);
}
@AutoLog(value = "法规意见收集-评估结果表-添加")
@ApiOperation(value="法规意见收集-评估结果表-添加", notes="法规意见收集-评估结果表-添加")
@PostMapping(value = "/insertBatch")
public Result<?> insertBatch(@Validated @RequestBody List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList) {
this.lawsOpinionAssessmentResultEOService.insertBatch(lawsOpinionAssessmentResultEOList);
return Result.OK("添加成功！");
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java
+2
View File
@@ -53,10 +53,12 @@ public class LawsOpinionGatherEOController extends JeroController<LawsOpinionGat
public Result<?> queryPageList(LawsOpinionGatherEO lawsOpinionGatherEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name="cut", defaultValue="cn") String cut,
HttpServletRequest req) {
QueryWrapper<LawsOpinionGatherEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionGatherEO, req.getParameterMap());
Page<LawsOpinionGatherEO> page = new Page<LawsOpinionGatherEO>(pageNo, pageSize);
IPage<LawsOpinionGatherEO> pageList = lawsOpinionGatherEOService.page(page, queryWrapper);
this.lawsOpinionGatherEOService.disposeData(pageList.getRecords(),cut);
return Result.OK(pageList);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java
+5 -2
View File
@@ -68,8 +68,11 @@ public class LawsProcessHistoryEOController extends JeroController<LawsProcessHi
@AutoLog(value = "法规-流程历史表-列表查询")
@ApiOperation(value="法规-流程历史表-列表查询", notes="法规-流程历史表-列表查询")
@GetMapping(value = "/list")
public Result<List<LawsProcessHistoryEO>> queryList() {
List<LawsProcessHistoryEO> list = lawsProcessHistoryEOService.queryList();
public Result<List<LawsProcessHistoryEO>> queryList(LawsProcessHistoryEO lawsProcessHistoryEO,
HttpServletRequest req,
@RequestParam(value = "cut",defaultValue = "cn") String cut) {
List<LawsProcessHistoryEO> list = lawsProcessHistoryEOService.queryList(lawsProcessHistoryEO,req,cut);
this.lawsProcessHistoryEOService.disposeData(list,cut);
return Result.OK(list);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java
+3
View File
@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.Date;
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;
@@ -77,6 +78,8 @@ public class LawsOpinionGatherEO implements Serializable {
@Excel(name = "收集结果", width = 15)
@ApiModelProperty(value = "收集结果")
private String gatherResult;
@TableField(exist = false)
private String gatherResultShow;
/**发起日期*/
@Excel(name = "发起日期", width = 15, format = "yyyy-MM-dd")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java
+7
View File
@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.Date;
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;
@@ -67,6 +68,9 @@ public class LawsProcessHistoryEO implements Serializable {
@Excel(name = "操作节点", width = 15)
@ApiModelProperty(value = "操作节点")
private String taskDefinitionKey;
//操作节点展示字段
@TableField(exist = false)
private String taskDefinitionKeyName;
/**操作人id*/
@Excel(name = "操作人id", width = 15)
@@ -77,6 +81,9 @@ public class LawsProcessHistoryEO implements Serializable {
@Excel(name = "操作角色编码", width = 15)
@ApiModelProperty(value = "操作角色编码")
private String operatorRoleCode;
//操作角色展示字段
@TableField(exist = false)
private String operatorRoleName;
/**操作时间*/
@Excel(name = "操作时间", width = 15, format = "yyyy-MM-dd")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/LawsOpinionGatherNodeEnum.java
+62
View File
@@ -0,0 +1,62 @@
package com.jero.modules.lawsOpinionGather.enums;
import com.alibaba.druid.util.StringUtils;
import com.jero.common.constant.enums.CutEnum;
/**
* 法规意见收集 节点枚举类
*/
public enum LawsOpinionGatherNodeEnum {
ENGINEER_INITIATED("gcsfq","工程师发起","Engineer initiated"),
APPRAISERS_EVALUATION("pgrpg","评估人评估","Appraiser's evaluation"),
;
String key;
String cnName;
String enName;
private LawsOpinionGatherNodeEnum(String key, String cnName, String enName) {
this.key = key;
this.cnName = cnName;
this.enName = enName;
}
public String getKey() {
return key;
}
public void setKey(String key) {
this.key = key;
}
public String getCnName() {
return cnName;
}
public void setCnName(String cnName) {
this.cnName = cnName;
}
public String getEnName() {
return enName;
}
public void setEnName(String enName) {
this.enName = enName;
}
public static String getTextByValue(String key,String cut) {
LawsOpinionGatherNodeEnum[] values = values();
for (LawsOpinionGatherNodeEnum lawsOpinionGatherNodeEnum : values) {
if (lawsOpinionGatherNodeEnum.key.equals(key)) {
if(StringUtils.equals(cut, CutEnum.CN.getValue())){
return lawsOpinionGatherNodeEnum.cnName;
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
return lawsOpinionGatherNodeEnum.enName;
}
}
}
return null;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/OperatorRoleCodeEnum.java
+64
View File
@@ -0,0 +1,64 @@
package com.jero.modules.lawsOpinionGather.enums;
import com.jero.common.constant.enums.CutEnum;
import org.apache.commons.lang3.StringUtils;
/**
* 法规意见收集/法规技术评估流程使用
* 操作角色枚举类
*/
public enum OperatorRoleCodeEnum {
INITIATOR("发起人","Initiator","Initiator"),
EVALUATOR("评估人","Evaluator","Evaluator"),
;
String cnName;
String enName;
String value;
private OperatorRoleCodeEnum(String cnName, String value, String enName) {
this.cnName = cnName;
this.value = value;
this.enName = enName;
}
public String getCnName() {
return cnName;
}
public void setCnName(String cnName) {
this.cnName = cnName;
}
public String getEnName() {
return enName;
}
public void setEnName(String enName) {
this.enName = enName;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public static String getTextByValue(String value,String cut) {
OperatorRoleCodeEnum[] values = values();
for (OperatorRoleCodeEnum operatorRoleCodeEnum : values) {
if (operatorRoleCodeEnum.value.equals(value)) {
if(StringUtils.equals(cut, CutEnum.CN.getValue())){
return operatorRoleCodeEnum.cnName;
}else if(StringUtils.equals(cut, CutEnum.EN.getValue())){
return operatorRoleCodeEnum.enName;
}
}
}
return null;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java
+6
View File
@@ -58,4 +58,10 @@ public interface ILawsOpinionAssessmentResultEOService extends IService<LawsOpin
* @return
*/
List<LawsOpinionAssessmentResultEO> queryList();
/**
* 批量新增
* @param lawsOpinionAssessmentResultEOList
*/
void insertBatch(List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java
+6
View File
@@ -67,4 +67,10 @@ public interface ILawsOpinionGatherEOService extends IService<LawsOpinionGatherE
* @return
*/
Result<?> processCall(JSONObject jsonObject);
/**
* 处理数据
* @param lawsOpinionGatherEOList
*/
void disposeData(List<LawsOpinionGatherEO> lawsOpinionGatherEOList,String cut);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java
+5 -1
View File
@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
import com.jero.common.api.vo.Result;
import com.jero.modules.lawsOpinionGather.entity.LawsProcessHistoryEO;
import com.baomidou.mybatisplus.extension.service.IService;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
@@ -59,7 +61,9 @@ public interface ILawsProcessHistoryEOService extends IService<LawsProcessHistor
*
* @return
*/
List<LawsProcessHistoryEO> queryList();
List<LawsProcessHistoryEO> queryList(LawsProcessHistoryEO lawsProcessHistoryEO, HttpServletRequest req,String cut);
public void disposeData(List<LawsProcessHistoryEO> datas,String cut);
/**
* 流程调用
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
+20
View File
@@ -1,8 +1,12 @@
package com.jero.modules.lawsOpinionGather.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionAssessmentResultEOMapper;
import com.jero.modules.lawsOpinionGather.service.ILawsOpinionAssessmentResultEOService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Date;
@@ -86,4 +90,20 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
public List<LawsOpinionAssessmentResultEO> queryList() {
return list();
}
@Override
public void insertBatch(List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList) {
if (CollectionUtils.isNotEmpty(lawsOpinionAssessmentResultEOList)) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO = lawsOpinionAssessmentResultEOList.get(0);
QueryWrapper<LawsOpinionAssessmentResultEO> deleteWrapper = new QueryWrapper<>();
deleteWrapper.lambda().eq(LawsOpinionAssessmentResultEO::getActiProcInstId,lawsOpinionAssessmentResultEO.getActiProcInstId());
deleteWrapper.lambda().eq(LawsOpinionAssessmentResultEO::getLawsOpinionGatherId,lawsOpinionAssessmentResultEO.getLawsOpinionGatherId());
deleteWrapper.lambda().eq(LawsOpinionAssessmentResultEO::getCreateBy,sysUser.getUsername());
this.baseMapper.delete(deleteWrapper);
this.saveBatch(lawsOpinionAssessmentResultEOList);
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
+13
View File
@@ -4,10 +4,12 @@ import com.alibaba.fastjson.JSONObject;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO;
import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum;
import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionGatherEOMapper;
import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService;
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.List;
@@ -124,4 +126,15 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
}
return new Result<>().success("调用成功！");
}
@Override
public void disposeData(List<LawsOpinionGatherEO> lawsOpinionGatherEOList,String cut) {
if(CollectionUtils.isNotEmpty(lawsOpinionGatherEOList)){
lawsOpinionGatherEOList.forEach(lawsOpinionGather -> {
if(StringUtils.isNotEmpty(lawsOpinionGather.getGatherResult())){
lawsOpinionGather.setGatherResultShow(GatherResultEnum.getTextByValue(lawsOpinionGather.getGatherResult(),cut));
}
});
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java
+26 -2
View File
@@ -2,13 +2,18 @@ package com.jero.modules.lawsOpinionGather.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.lawsOpinionGather.entity.LawsProcessHistoryEO;
import com.jero.modules.lawsOpinionGather.enums.LawsOpinionGatherNodeEnum;
import com.jero.modules.lawsOpinionGather.enums.OperatorRoleCodeEnum;
import com.jero.modules.lawsOpinionGather.mapper.LawsProcessHistoryEOMapper;
import com.jero.modules.lawsOpinionGather.service.ILawsProcessHistoryEOService;
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;
@@ -17,6 +22,8 @@ import java.util.List;
import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import javax.servlet.http.HttpServletRequest;
/**
* @Description: 法规-流程历史表
* @Author: jero-boot
@@ -92,10 +99,27 @@ public class LawsProcessHistoryEOServiceImpl extends ServiceImpl<LawsProcessHist
* @return
*/
@Override
public List<LawsProcessHistoryEO> queryList() {
return list();
public List<LawsProcessHistoryEO> queryList(LawsProcessHistoryEO lawsProcessHistoryEO, HttpServletRequest req,String cut) {
QueryWrapper<LawsProcessHistoryEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsProcessHistoryEO, req.getParameterMap());
List<LawsProcessHistoryEO> lawsProcessHistoryEOList = this.baseMapper.selectList(queryWrapper);
return lawsProcessHistoryEOList;
}
@Override
public void disposeData(List<LawsProcessHistoryEO> datas, String cut){
if(CollectionUtils.isNotEmpty(datas)){
datas.forEach(data -> {
if(StringUtils.isNotEmpty(data.getOperatorRoleCode())){
data.setOperatorRoleName(OperatorRoleCodeEnum.getTextByValue(data.getOperatorRoleCode(),cut));
}
if(StringUtils.isNotEmpty(data.getTaskDefinitionKey())){
data.setTaskDefinitionKeyName(LawsOpinionGatherNodeEnum.getTextByValue(data.getTaskDefinitionKey(),cut));
}
});
}
}
@Override
public Result<?> processCall(JSONObject jsonObject) {
String requestSource = jsonObject.getString("requestSource");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java
+3 -1
View File
@@ -43,7 +43,9 @@ public class TaskCommonQuery {
private String prcNum;
@ApiModelProperty(value = "流程类型")
private String prcType = FlowTypeEnum.RWQRLC.getValue();
private String prcType;
private String prcTypes = FlowTypeEnum.RWQRLC.getValue() + "," + FlowTypeEnum.FGYJSJLC.getValue();
@ApiModelProperty(value = "高级搜索字符串")
private String advanceSearchVOStr;