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-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
+2
View File
@@ -143,6 +143,8 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/project/projectLawsInventoryEO/processCall", "anon"); // 项目库-法规清单 工作流处理数据接口排除
filterChainDefinitionMap.put("/project/projectTaskInventoryEO/processCall", "anon"); // 项目库-任务清单 工作流处理数据接口排除
filterChainDefinitionMap.put("/wkflow/processHistoryEO/processCall", "anon"); // 流程历史 工作流处理数据接口排除
filterChainDefinitionMap.put("/lawsOpinionGather/lawsOpinionGatherEO/processCall", "anon"); // 法规收集表 工作流处理数据接口排除
filterChainDefinitionMap.put("/lawsOpinionGather/lawsProcessHistoryEO/processCall", "anon"); // 法规收集历史 工作流处理数据接口排除
filterChainDefinitionMap.put("/sys/user/querySysUserListByIdList", "anon"); // 工作流根据用户idList获取用户信息接口
// 添加自己的过滤器并且取名为jwt
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+40 -10
View File
@@ -76,7 +76,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
// @RequiresPermissions("params:collectManifest:list")
public Result<?> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="500") Integer pageSize,
@RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
@RequestParam(name = "cut") String cut) {
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
@@ -113,21 +113,21 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
}
/**
* 保存
* 暂存
*
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数项收集清单-保存")
@ApiOperation(value="参数项收集清单-保存", notes="参数项收集清单-保存")
@AutoLog(value = "参数项收集清单-暂存")
@ApiOperation(value="参数项收集清单-暂存", notes="参数项收集清单-暂存")
@PostMapping(value = "/save")
// @RequiresPermissions("params:collectManifest:save")
public Result<?> save(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.save(paramsCollectManifestVO.getConfigDataList());
boolean isSuccess = paramsCollectManifestEOService.save(paramsCollectManifestVO.getConfigDataList(), paramsCollectManifestVO.getParamsManifestId());
if (isSuccess) {
return Result.OK("保存成功！");
return Result.OK("暂存成功！");
} else {
return Result.error("保存失败！");
return Result.error("暂存失败！");
}
}
@@ -140,7 +140,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@ApiOperation(value="参数项收集清单-添加查询", notes="参数项收集清单-添加查询")
@GetMapping(value = "/paramsInfoList")
// @RequiresPermissions("params:collectManifest:add")
public Result<List<ParamsInfoPublishEO>> paramsInfoList(ParamsCollectManifestVO paramsCollectManifestVO,
public Result<List<Map<String, Object>>> paramsInfoList(ParamsCollectManifestVO paramsCollectManifestVO,
@RequestParam(name = "cut") String cut) {
if (StringUtils.isNotEmpty(paramsCollectManifestVO.getNioNumber())) {
paramsCollectManifestVO.setNioNumber(paramsCollectManifestVO.getNioNumber().replace("%","\\%"));
@@ -149,8 +149,8 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
paramsCollectManifestVO.setParamsName(paramsCollectManifestVO.getParamsName().replace("%","\\%"));
}
List<ParamsInfoPublishEO> list = paramsCollectManifestEOService.getParamsInfoPublishListForAdd(paramsCollectManifestVO);
return Result.OK(cut, list);
List<Map<String, Object>> list = paramsCollectManifestEOService.getParamsInfoPublishListForAdd(paramsCollectManifestVO);
return Result.OK(list);
}
/**
@@ -388,6 +388,21 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
return Result.OK(configLableList);
}
/**
* 冻结配置-回显已冻结的配置
*
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数项收集清单-回显已冻结的配置")
@ApiOperation(value="参数项收集清单-回显已冻结的配置", notes="参数项收集清单-回显已冻结的配置")
@GetMapping(value = "/getLockedConfigIdList")
// @RequiresPermissions("params:collectManifest:lock")
public Result<?> getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO) {
List<String> lockedConfigIdList = paramsCollectManifestEOService.getLockedConfigIdList(paramsCollectManifestVO);
return Result.OK(lockedConfigIdList);
}
/**
* 冻结配置
*
@@ -464,6 +479,21 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
}
}
/**
* 带入工程接口人
*
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数项收集清单-带入工程接口人")
@ApiOperation(value="参数项收集清单-带入工程接口人", notes="参数项收集清单-带入工程接口人")
@GetMapping(value = "/bringSdtInto")
// @RequiresPermissions("params:collectManifest:bring")
public Result<?> bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO) {
paramsCollectManifestEOService.bringSdtInto(paramsCollectManifestVO);
return Result.OK("带入工程接口人成功！");
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+3
View File
@@ -48,6 +48,9 @@
<if test="paramsCollectManifestEO.dutyTerritory !=null and paramsCollectManifestEO.dutyTerritory !=''">
AND duty_territory = #{paramsCollectManifestEO.dutyTerritory}
</if>
<if test="paramsCollectManifestEO.state !=null and paramsCollectManifestEO.state !=''">
AND state = #{paramsCollectManifestEO.state}
</if>
<if test="paramsCollectManifestEO.paramsManifestId !=null and paramsCollectManifestEO.paramsManifestId !=''">
AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId}
</if>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+9 -2
View File
@@ -85,16 +85,17 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
/**
* 保存
* @param configDataList
* @param paramsManifestId
* @return
*/
boolean save(List<Map<String, Object>> configDataList);
boolean save(List<Map<String, Object>> configDataList, String paramsManifestId);
/**
* 查询清单所用模版参数项列表（过滤清单已添加的参数项）
* @param paramsCollectManifestVO
* @return
*/
List<ParamsInfoPublishEO> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO);
List<Map<String, Object>> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO);
List<Map<String,String>> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO);
@@ -127,6 +128,9 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
// 配置-下拉选项
List<Map<String, String>> getConfigLabelList(ParamsCollectManifestVO paramsCollectManifestVO);
// 冻结配置-回显已冻结的配置
List<String> getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO);
// 冻结配置
boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO);
@@ -135,4 +139,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
// 同步上报库
boolean syncReport(ParamsCollectManifestVO paramsCollectManifestVO);
// 带入工程接口人
boolean bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+101 -6
View File
@@ -63,6 +63,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -747,8 +748,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
@Override
public boolean save(List<Map<String, Object>> configDataList) {
public boolean save(List<Map<String, Object>> configDataList, String paramsManifestId) {
List<ParamsConfigDataEO> newConfigDataEOList = new ArrayList<>();
List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列
List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
List<ParamsConfigDataEO> paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据
// 处理数据
for (Map<String, Object> map : configDataList) {
@@ -768,7 +772,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
List<Map<String, Object>> paramsConfigDataVOList = (List<Map<String, Object>>) paramsConfigDataMap.get("list");
// 判断是新增还是修改
ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId);
// ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId);
ParamsConfigDataEO oldConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId,paramsConfigDataEOList);
if (ObjectUtil.isNotEmpty(oldConfigDataEO)) {
paramsConfigDataEO.setId(oldConfigDataEO.getId());
@@ -836,7 +841,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
* @return
*/
@Override
public List<ParamsInfoPublishEO> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO) {
public List<Map<String, Object>> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO) {
String cut = paramsCollectManifestVO.getCut();
LambdaQueryWrapper<ParamsInfoPublishEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsInfoPublishEO::getParamsTemplateId, paramsCollectManifestVO.getParamsTemplateId())
.eq(ParamsInfoPublishEO::getVersion, paramsCollectManifestVO.getParamsTemplatePublishVersion())
@@ -854,7 +861,27 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
List<String> nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList());
paramsInfoPublishEOList = paramsInfoPublishEOList.stream().filter(e-> !nioNumberList.contains(e.getNioNumber())).collect(Collectors.toList());
return paramsInfoPublishEOList;
// 查询 责任领域 数据字典
List<SysDictItem> dictItems = sysDictItemService.selectItemsByDictCode("duty_territory");
Map<String, String> dictItemsMap = new HashMap<>();
if (CutEnum.EN.getValue().equals(cut)) {
dictItemsMap = dictItems.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName));
} else {
dictItemsMap = dictItems.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText));
}
// 处理数据 返回map ---> 解决数据量大,系统拦截器转换数据字典慢的问题
List<Map<String, Object>> listMapForAdd = new ArrayList<>();
Map<String, String> finalDictItemsMap = dictItemsMap;
paramsInfoPublishEOList.forEach(paramsInfoPublishEO -> {
Map<String, Object> paramsInfoPublishMap = objectToMap(paramsInfoPublishEO);
// 处理责任领域数据字典
paramsInfoPublishMap.put("dutyTerritory_dictText", finalDictItemsMap.get(paramsInfoPublishEO.getDutyTerritory()));
listMapForAdd.add(paramsInfoPublishMap);
});
return listMapForAdd;
}
@Override
@@ -1323,6 +1350,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
return configLabelList;
}
@Override
public List<String> getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO) {
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
// 查询配置列
LambdaQueryWrapper<ParamsConfigEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsConfigEO::getParamsManifestId, paramsManifestId);
queryWrapper.eq(ParamsConfigEO::getIsLock, ConfigLockEnum.YES.getValue()); // 指定查询非冻结配置
queryWrapper.orderByAsc(ParamsConfigEO::getDisplaySeq);
List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.list(queryWrapper);
List<String> lockedConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
return lockedConfigIdList;
}
@Override
public boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) {
if (StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {
@@ -1559,6 +1602,44 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
return isSuccess;
}
@Override
public boolean bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO) {
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
String projectId = paramsCollectManifestVO.getProjectId();
// 查询所有收集参数项
ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
paramsCollectManifestEO.setParamsManifestId(paramsManifestId);
List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
// 过滤出 状态为：待发起收集，且工程接口人处为空的参数项
list = list.stream().filter(e-> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) && StringUtils.isBlank(e.getSdt())).collect(Collectors.toList());
List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>();
if (CollectionUtil.isNotEmpty(list)) {
list.forEach(collectManifestEO -> {
// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(projectId, collectManifestEO.getDutyTerritory());
if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
if (org.apache.commons.lang.StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
SysUser sysUser = sysUserService.getById(sdtId);
if (ObjectUtil.isNotEmpty(sysUser)) {
ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
updateCollectManifestEO.setId(collectManifestEO.getId());
updateCollectManifestEO.setSdt(sysUser.getUsername());
updateCollectManifestEOList.add(updateCollectManifestEO);
}
}
}
});
}
return updateBatchById(updateCollectManifestEOList);
}
/**
* 获取一个类和其父类的所有属性
*
@@ -1602,8 +1683,22 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
field.setAccessible(true);
// 获取在对象f中属性fields[i]对应的对象中的变量
Object o = field.get(obj);
if (o != null)
map.put(varName, o);
if (o != null) {
if (Date.class.equals(field.getType())) {
Date date = (Date) o;
String pattern = "";
if ("deadline".equals(varName)) {
pattern = "yyyy-MM-dd";
} else {
pattern = "yyyy-MM-dd HH:mm:ss";
}
SimpleDateFormat formatter=new SimpleDateFormat(pattern);
String time=formatter.format(date);
map.put(varName, time);
} else {
map.put(varName, o);
}
}
// 恢复访问控制权限
field.setAccessible(accessFlag);
} catch (IllegalArgumentException ex) {
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
+17 -2
View File
@@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -497,8 +498,22 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
field.setAccessible(true);
// 获取在对象f中属性fields[i]对应的对象中的变量
Object o = field.get(obj);
if (o != null)
map.put(varName, o);
if (o != null) {
if (Date.class.equals(field.getType())) {
Date date = (Date) o;
String pattern = "";
if ("deadline".equals(varName)) {
pattern = "yyyy-MM-dd";
} else {
pattern = "yyyy-MM-dd HH:mm:ss";
}
SimpleDateFormat formatter=new SimpleDateFormat(pattern);
String time=formatter.format(date);
map.put(varName, time);
} else {
map.put(varName, o);
}
}
// 恢复访问控制权限
field.setAccessible(accessFlag);
} catch (IllegalArgumentException ex) {
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
+9 -4
View File
@@ -1,6 +1,8 @@
package com.jero.modules.cert.report.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
@@ -62,8 +64,10 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
@ApiOperation(value="上报库参数项-列表查询", notes="上报库参数项-列表查询")
@GetMapping(value = "/list")
// @RequiresPermissions("report:detail:list")
public Result<List<Map<String, Object>>> queryList(ParamsReportDetailEO paramsReportDetailEO,
@RequestParam(name = "cut") String cut) {
public Result<?> queryList(ParamsReportDetailEO paramsReportDetailEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
@RequestParam(name = "cut") String cut) {
if (StringUtils.isNotEmpty(paramsReportDetailEO.getNioNumber())) {
paramsReportDetailEO.setNioNumber(paramsReportDetailEO.getNioNumber().replace("%","\\%"));
}
@@ -77,7 +81,8 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
paramsReportDetailEO.setDre(paramsReportDetailEO.getDre().replace("%","\\%"));
}
List<Map<String, Object>> list = paramsReportDetailEOService.queryList(paramsReportDetailEO, cut);
IPage page = new Page(pageNo, pageSize);
IPage list = paramsReportDetailEOService.queryList(page, paramsReportDetailEO, cut);
return Result.OK(list);
}
@@ -98,7 +103,7 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
*/
@AutoLog(value = "上报库参数项-配置下拉选项(常规导出)")
@ApiOperation(value="上报库参数项-配置下拉选项(常规导出)", notes="上报库参数项-配置下拉选项(常规导出)")
@PostMapping(value = "/getConfigLabelList")
@GetMapping(value = "/getConfigLabelList")
// @RequiresPermissions("report:detail:export:normal")
public Result<?> getConfigLableList(ParamsReportDetailVO paramsReportDetailVO) {
List<Map<String, String>> configLabelList = paramsReportDetailEOService.getConfigLabelList(paramsReportDetailVO);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
+37 -1
View File
@@ -6,7 +6,9 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.cert.report.entity.ParamsReportEO;
import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
import com.jero.modules.cert.report.service.IParamsReportEOService;
import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService;
import com.jero.modules.system.util.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -35,6 +37,9 @@ import java.util.List;
public class ParamsReportEOController extends JeroController<ParamsReportEO, IParamsReportEOService> {
@Autowired
private IParamsReportEOService paramsReportEOService;
@Autowired
private IParamsReportExportHistoryEOService paramsReportExportHistoryEOService;
/**
* 分页列表查询
@@ -58,7 +63,7 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
}
if (StringUtils.isNotEmpty(paramsReportEO.getTitle())) {
paramsReportEO.setProjectName(paramsReportEO.getTitle().replace("%", "\\%"));
paramsReportEO.setTitle(paramsReportEO.getTitle().replace("%", "\\%"));
}
IPage page = new Page(pageNo, pageSize);
@@ -66,6 +71,37 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @param paramsReportExportHistoryEO
* @param pageNo
* @param pageSize
* @return
*/
@AutoLog(value = "上报库-导出历史分页查询")
@ApiOperation(value="上报库-导出历史分页查询", notes="上报库-导出历史分页查询")
@GetMapping(value = "/exportHistoryPage")
// @RequiresPermissions("params:report:history")
public Result<?> exportHistoryPage(ParamsReportExportHistoryEO paramsReportExportHistoryEO,
@RequestParam(name="cut") String cut,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
if (StringUtils.isNotEmpty(paramsReportExportHistoryEO.getProjectName())) {
paramsReportExportHistoryEO.setProjectName(paramsReportExportHistoryEO.getProjectName().replace("%", "\\%"));
}
if (StringUtils.isNotEmpty(paramsReportExportHistoryEO.getTitle())) {
paramsReportExportHistoryEO.setTitle(paramsReportExportHistoryEO.getTitle().replace("%", "\\%"));
}
IPage page = new Page(pageNo, pageSize);
IPage pageList = paramsReportExportHistoryEOService.queryPage(page, paramsReportExportHistoryEO, cut);
return Result.OK(pageList);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java
+98
View File
@@ -0,0 +1,98 @@
package com.jero.modules.cert.report.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
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 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-04
* @Version: V1.0
*/
@Data
@TableName("params_report_export_history")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="params_report_export_history对象", description="上报库导出历史")
public class ParamsReportExportHistoryEO implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private 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 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 String sysOrgCode;
/**上报库id*/
@Excel(name = "上报库id", width = 15)
@ApiModelProperty(value = "上报库id")
private String paramsManifestId;
/**导出类型*/
@Excel(name = "导出类型", width = 15)
@ApiModelProperty(value = "导出类型")
private String exportType;
/**导出时间*/
@Excel(name = "导出时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
@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 exportTime;
/**导出文件id*/
@Excel(name = "导出文件id", width = 15)
@ApiModelProperty(value = "导出文件id")
private String exportFileId;
@TableField(exist = false)
@ApiModelProperty(value = "导出文件名称")
private String exportFileName;
@TableField(exist = false)
@ApiModelProperty(value = "项目名称")
private String projectName;
@TableField(exist = false)
@ApiModelProperty(value = "清单标题")
private String title;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java
+59
View File
@@ -0,0 +1,59 @@
package com.jero.modules.cert.report.enums;
import com.jero.common.constant.enums.CutEnum;
import java.util.HashMap;
import java.util.Map;
public enum ExportTypeEnum {
NORMAL("常规导出","1","Normal export"),
CUSTOM("自定义导出","2","Custom export");
String name;
String value;
String enName;
ExportTypeEnum(String name, String value, String enName) {
this.name = name;
this.value = value;
this.enName = enName;
}
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 String getEnName() {
return enName;
}
public void setEnName(String enName) {
this.enName = enName;
}
public static Map<String,String> toMap(String cut){
Map<String,String> map = new HashMap<>();
if (CutEnum.CN.getValue().equals(cut)) {
for (ExportTypeEnum exportTypeEnum : ExportTypeEnum.values()) {
map.put(exportTypeEnum.getValue(), exportTypeEnum.getName());
}
} else if (CutEnum.EN.getValue().equals(cut)) {
for (ExportTypeEnum exportTypeEnum : ExportTypeEnum.values()) {
map.put(exportTypeEnum.getValue(), exportTypeEnum.getEnName());
}
}
return map;
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
+3
View File
@@ -1,6 +1,7 @@
package com.jero.modules.cert.report.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
@@ -19,6 +20,8 @@ public interface ParamsReportDetailEOMapper extends BaseMapper<ParamsReportDetai
List<ParamsReportDetailEO> listInfo(@Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO);
IPage pageInfo(@Param("page") IPage page, @Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO);
List<Map<String, Object>> listInfoForExport(@Param("idList") List<String> idList,
@Param("paramsReportDetailVO") ParamsReportDetailVO paramsReportDetailVO);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java
+19
View File
@@ -0,0 +1,19 @@
package com.jero.modules.cert.report.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 上报库导出历史
* @Author: jero-boot
* @Date: 2022-07-04
* @Version: V1.0
*/
public interface ParamsReportExportHistoryEOMapper extends BaseMapper<ParamsReportExportHistoryEO> {
IPage pageInfo(@Param("page") IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+7
View File
@@ -91,6 +91,13 @@
order by nio_number asc, sync_time desc
</select>
<select id="pageInfo" resultMap="ParamsReportDetailEOResultMap">
select *
from params_report_detail
<include refid="BaseQuerySql"/>
order by nio_number asc, sync_time desc
</select>
<select id="listInfoForExport" resultType="java.util.LinkedHashMap">
select
prd.id as id,
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
+1 -1
View File
@@ -32,7 +32,7 @@
<where>
<if test="paramsReportEO != null">
<if test="paramsReportEO.title !=null and paramsReportEO.title !=''">
AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.paramsManifestTitle}),'%')
AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.title}),'%')
</if>
<if test="paramsReportEO.projectName !=null and paramsReportEO.projectName !=''">
AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportEO.projectName}),'%')
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
+60
View File
@@ -0,0 +1,60 @@
<?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.cert.report.mapper.ParamsReportExportHistoryEOMapper">
<resultMap id="ParamsReportExportHistoryEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO">
<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="params_manifest_id" property="paramsManifestId" />
<result column="export_type" property="exportType" />
<result column="export_time" property="exportTime" />
<result column="export_file_id" property="exportFileId" />
</resultMap>
<sql id="BaseColumnList">
preh.id as id,
preh.export_type as export_type,
preh.export_time as export_time,
preh.export_file_id as export_file_id,
preh.params_manifest_id as params_manifest_id,
pr.create_by as create_by,
pr.create_time as create_time,
pr.update_by as update_by,
pr.update_time as update_time,
pm.title as title,
concat(pni.project_name,'-',pyni.year_name) as project_name
</sql>
<sql id="BaseQuerySql">
<where>
<if test="paramsReportExportHistoryEO != null">
<if test="paramsReportExportHistoryEO.projectName !=null and paramsReportExportHistoryEO.projectName !=''">
AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportExportHistoryEO.projectName}),'%')
</if>
<if test="paramsReportExportHistoryEO.title !=null and paramsReportExportHistoryEO.title !=''">
AND title LIKE CONCAT(CONCAT('%',#{paramsReportExportHistoryEO.title}),'%')
</if>
<if test="paramsReportExportHistoryEO.paramsManifestId !=null and paramsReportExportHistoryEO.paramsManifestId !=''">
AND params_manifest_id = #{paramsReportExportHistoryEO.paramsManifestId}
</if>
</if>
</where>
</sql>
<select id="pageInfo" resultMap="ParamsReportExportHistoryEOResultMap">
select tmp_tb.* from(
select <include refid="BaseColumnList"/>
from params_report_export_history preh
left join params_report as pr on pr.id = preh.params_manifest_id
left join params_manifest as pm on pm.id = pr.old_params_manifest_id
left join project_library_base as plb on plb.id = pm.project_id
left join project_name_info as pni on plb.project_name_id = pni.id
left join project_year_name_info as pyni on plb.year_name_id = pyni.id
) tmp_tb
<include refid="BaseQuerySql"/>
order by export_time desc
</select>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
+3 -1
View File
@@ -1,5 +1,6 @@
package com.jero.modules.cert.report.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
@@ -19,11 +20,12 @@ public interface IParamsReportDetailEOService extends IService<ParamsReportDetai
/**
* 列表查询
* @param page
* @param paramsReportDetailEO
* @param cut
* @return
*/
List<Map<String, Object>> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut);
IPage queryList(IPage page, ParamsReportDetailEO paramsReportDetailEO, String cut);
/**
* 列表表头中英文切换
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java
+64
View File
@@ -0,0 +1,64 @@
package com.jero.modules.cert.report.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* @Description: 上报库导出历史
* @Author: jero-boot
* @Date: 2022-07-04
* @Version: V1.0
*/
public interface IParamsReportExportHistoryEOService extends IService<ParamsReportExportHistoryEO> {
/**
* 保存
*
* @param paramsReportExportHistoryEO
* @return
*/
void add(ParamsReportExportHistoryEO paramsReportExportHistoryEO);
/**
* 更新
*
* @param paramsReportExportHistoryEO
* @return
*/
void editById(ParamsReportExportHistoryEO paramsReportExportHistoryEO);
/**
* 通过id删除
*
* @param id
* @return
*/
void deleteById(String id);
/**
* 批量删除
*
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
/**
* 通过id查询
*
* @param id
* @return
*/
ParamsReportExportHistoryEO queryById(String id);
/**
* 列表查询
*
* @return
*/
List<ParamsReportExportHistoryEO> queryList();
IPage queryPage(IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO, String cut);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+48 -6
View File
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ZipUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.jero.common.constant.enums.CutEnum;
@@ -20,10 +21,13 @@ import com.jero.modules.cert.collect.vo.ParamsConfigDataVO;
import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
import com.jero.modules.cert.report.enums.ExportTypeEnum;
import com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper;
import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService;
import com.jero.modules.cert.report.service.IParamsReportConfigEOService;
import com.jero.modules.cert.report.service.IParamsReportDetailEOService;
import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService;
import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
import com.jero.modules.cert.template.enums.ControlTypeEnum;
import com.jero.modules.document.enums.FieldTypeEnum;
@@ -42,6 +46,7 @@ import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.service.ISysDictItemService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.entity.ContentType;
import org.apache.poi.common.usermodel.HyperlinkType;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.hssf.util.HSSFColor;
@@ -53,7 +58,9 @@ import org.apache.poi.xssf.usermodel.*;
import org.aspectj.util.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -62,6 +69,7 @@ import java.lang.reflect.Field;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -92,6 +100,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
@Autowired
private IOSSFileService ossFileService;
@Autowired
private IParamsReportExportHistoryEOService paramsReportExportHistoryEOService;
@Value(value = "${jero.path.upload}")
private String uploadpath;
@@ -101,10 +112,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
* @return
*/
@Override
public List<Map<String, Object>> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut) {
public IPage queryList(IPage page, ParamsReportDetailEO paramsReportDetailEO, String cut) {
String paramsManifestId = paramsReportDetailEO.getParamsManifestId();
List<ParamsReportDetailEO> list = paramsReportDetailEOMapper.listInfo(paramsReportDetailEO); // 查询固定列
IPage pageInfo = paramsReportDetailEOMapper.pageInfo(page, paramsReportDetailEO); // 查询固定列
List<ParamsReportDetailEO> list = pageInfo.getRecords(); // 查询固定列
List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列
// 普通数据字典
@@ -193,7 +205,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
listMap.add(manifestMap);
});
return listMap;
pageInfo.setRecords(listMap);
return pageInfo;
}
/**
@@ -483,7 +496,10 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
OutputStream excelOS = null;
XSSFWorkbook workbook = new XSSFWorkbook();
String fileOriName = "上报库参数项常规导出信息";
if (org.apache.commons.lang.StringUtils.isNotEmpty(paramsReportDetailVO.getExportName())) {
if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) {
fileOriName = "Params report normal data";
}
if (StringUtils.isNotEmpty(paramsReportDetailVO.getExportName())) {
fileOriName = paramsReportDetailVO.getExportName();
}
//创建临时文件夹
@@ -581,6 +597,18 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
while ((len = fis.read()) != -1) {
os.write(len);
}
// 添加导出历史
String uploadFileName = fileOriName + ".zip";
MultipartFile mFile = new MockMultipartFile(uploadFileName, uploadFileName, ContentType.APPLICATION_OCTET_STREAM.toString(), fis); // 用于上传
OSSFile ossFile = ossFileService.uploadLocalOfCos(mFile, "/report", "", CutEnum.CN.getValue()); // 上传导出的压缩包
ParamsReportExportHistoryEO paramsReportExportHistoryEO = new ParamsReportExportHistoryEO();
paramsReportExportHistoryEO.setExportType(ExportTypeEnum.NORMAL.getValue());
paramsReportExportHistoryEO.setExportFileId(ossFile.getId());
paramsReportExportHistoryEO.setParamsManifestId(paramsReportDetailVO.getParamsManifestId());
paramsReportExportHistoryEO.setExportTime(new Date());
paramsReportExportHistoryEOService.add(paramsReportExportHistoryEO);
os.flush();
os.close(); // 后开先关
fis.close(); // 先开后关
@@ -878,8 +906,22 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
field.setAccessible(true);
// 获取在对象f中属性fields[i]对应的对象中的变量
Object o = field.get(obj);
if (o != null)
map.put(varName, o);
if (o != null) {
if (Date.class.equals(field.getType())) {
Date date = (Date) o;
String pattern = "";
if ("deadline".equals(varName)) {
pattern = "yyyy-MM-dd";
} else {
pattern = "yyyy-MM-dd HH:mm:ss";
}
SimpleDateFormat formatter=new SimpleDateFormat(pattern);
String time=formatter.format(date);
map.put(varName, time);
} else {
map.put(varName, o);
}
}
// 恢复访问控制权限
field.setAccessible(accessFlag);
} catch (IllegalArgumentException ex) {
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java
+122
View File
@@ -0,0 +1,122 @@
package com.jero.modules.cert.report.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
import com.jero.modules.cert.report.enums.ExportTypeEnum;
import com.jero.modules.cert.report.mapper.ParamsReportExportHistoryEOMapper;
import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Date;
import java.util.Map;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 上报库导出历史
* @Author: jero-boot
* @Date: 2022-07-04
* @Version: V1.0
*/
@Service
public class ParamsReportExportHistoryEOServiceImpl extends ServiceImpl<ParamsReportExportHistoryEOMapper, ParamsReportExportHistoryEO> implements IParamsReportExportHistoryEOService {
@Autowired
private ParamsReportExportHistoryEOMapper paramsReportExportHistoryEOMapper;
@Autowired
private IOSSFileService ossFileService;
/**
* 保存
*
* @param paramsReportExportHistoryEO
* @return
*/
@Override
public void add(ParamsReportExportHistoryEO paramsReportExportHistoryEO) {
Date now = new Date();
paramsReportExportHistoryEO.setCreateTime(now);
paramsReportExportHistoryEO.setUpdateTime(now);
save(paramsReportExportHistoryEO);
}
/**
* 更新
*
* @param paramsReportExportHistoryEO
* @return
*/
@Override
public void editById(ParamsReportExportHistoryEO paramsReportExportHistoryEO) {
Date now = new Date();
paramsReportExportHistoryEO.setUpdateTime(now);
saveOrUpdate(paramsReportExportHistoryEO);
}
/**
* 通过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 ParamsReportExportHistoryEO queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
public List<ParamsReportExportHistoryEO> queryList() {
return list();
}
@Override
public IPage queryPage(IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO, String cut) {
IPage pageInfo = paramsReportExportHistoryEOMapper.pageInfo(page, paramsReportExportHistoryEO);
List<ParamsReportExportHistoryEO> list = pageInfo.getRecords();
Map<String, String> exportTypeMap = ExportTypeEnum.toMap(cut);
list.forEach(exportHistoryEO -> {
// 处理文件名
OSSFile ossFile = ossFileService.getById(exportHistoryEO.getExportFileId());
if (ObjectUtil.isNotEmpty(ossFile)) {
exportHistoryEO.setExportFileName(ossFile.getFileName());
}
// 处理导出类型
exportHistoryEO.setExportType(exportTypeMap.get(exportHistoryEO.getExportType()));
});
return pageInfo;
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java
+1 -1
View File
@@ -111,7 +111,7 @@ public class ParamsInfoEO implements Serializable {
private String controlType;
/**控件校验*/
@Excel(name = "控件校验", width = 15, replace = {"无_1","中文_2","正整数_3","正浮点数_4","整数或小数_5","一位小数_6","两位小数_7","三位小数_8","四位小数_9"})
@Excel(name = "控件校验", width = 15, replace = {"无_1","中文_2","整数_3","正浮点数_4","整数或小数_5","一位小数_6","两位小数_7","三位小数_8","四位小数_9"})
@ApiModelProperty(value = "控件校验")
private String controlVerify;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java
+1 -1
View File
@@ -13,7 +13,7 @@ import java.util.Map;
public enum ControlVerifyEnum {
NULL("无","Null","1"),
CHINESE("中文","Chinese","2"),
POSITIVE_INTEGER("正整数","Positive integer","3"),
POSITIVE_INTEGER("整数","Integer","3"),
POSITIVE_FLOAT("正浮点数","Positive float","4"),
INTEGER_DECIMAL("整数或小数","Integer decimal","5"),
DECIMAL_ONE("一位小数","Decimal one","6"),
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java
+1 -1
View File
@@ -94,7 +94,7 @@ public class ParamsInfoEnExport {
private String controlType;
/**控件校验*/
@Excel(name = "Control Verify", width = 15, replace = {"Null_1","Chinese_2","Positive integer_3","Positive float_4","Integer decimal_5","Decimal one_6","Decimal two_7","Decimal three_8","Decimal four_9"})
@Excel(name = "Control Verify", width = 15, replace = {"Null_1","Chinese_2","Integer_3","Positive float_4","Integer decimal_5","Decimal one_6","Decimal two_7","Decimal three_8","Decimal four_9"})
@ApiModelProperty(value = "控件校验")
private String controlVerify;
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java
+14 -1
View File
@@ -203,6 +203,9 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
OSSFile oSSFile = new OSSFile();
String ctxPath = uploadCospath;
if (org.apache.commons.lang.StringUtils.isNotBlank(bizPath)) {
ctxPath += bizPath;
}
String fileName = null;
String fileType = null;
@@ -227,7 +230,17 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
throw new JeroBootException("Only upload pdf,word,excel type of file Please select the file again！");
}
}
} else {
} else if ("2".equals(state)) {
String fileTypeStrTwo = ".doc,.DOC,.docx,.DOCX,.xls, .XLS,.xlsx,.XLSX";
//固定文件
if (!fileTypeStrTwo.contains(fileType)) {
if (cut.equals(CutEnum.CN.getValue())) {
throw new JeroBootException("只能够上传word,excel类型的文件。请重新选择文件！");
} else {
throw new JeroBootException("Only upload word,excel type of file Please select the file again！");
}
}
} else {
if (CommonUtils.limitFileSuffix(orgName, fileSuffixLimits)) {
if (cut.equals(CutEnum.CN.getValue())) {
throw new JeroBootException("不能上传" + StringUtils.join(fileSuffixLimits, ",") + "类型的文件。请重新选择文件！");
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;