diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index fe23ed6d2..c68350d46 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -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 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index b3e4b0bed..aed81c064 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -76,7 +76,7 @@ public class ParamsCollectManifestEOController extends JeroController 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 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> paramsInfoList(ParamsCollectManifestVO paramsCollectManifestVO, + public Result>> 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 list = paramsCollectManifestEOService.getParamsInfoPublishListForAdd(paramsCollectManifestVO); - return Result.OK(cut, list); + List> list = paramsCollectManifestEOService.getParamsInfoPublishListForAdd(paramsCollectManifestVO); + return Result.OK(list); } /** @@ -388,6 +388,21 @@ public class ParamsCollectManifestEOController extends JeroController getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO) { + List lockedConfigIdList = paramsCollectManifestEOService.getLockedConfigIdList(paramsCollectManifestVO); + return Result.OK(lockedConfigIdList); + } + /** * 冻结配置 * @@ -464,6 +479,21 @@ public class ParamsCollectManifestEOController extends JeroController bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO) { + paramsCollectManifestEOService.bringSdtInto(paramsCollectManifestVO); + return Result.OK("带入工程接口人成功！"); + } + diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml index 0952a335f..5709b8d47 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -48,6 +48,9 @@ AND duty_territory = #{paramsCollectManifestEO.dutyTerritory} + + AND state = #{paramsCollectManifestEO.state} + AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index 7da49f229..fce085305 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -85,16 +85,17 @@ public interface IParamsCollectManifestEOService extends IService> configDataList); + boolean save(List> configDataList, String paramsManifestId); /** * 查询清单所用模版参数项列表（过滤清单已添加的参数项） * @param paramsCollectManifestVO * @return */ - List getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO); + List> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO); List> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO); @@ -127,6 +128,9 @@ public interface IParamsCollectManifestEOService extends IService> getConfigLabelList(ParamsCollectManifestVO paramsCollectManifestVO); + // 冻结配置-回显已冻结的配置 + List getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO); + // 冻结配置 boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO); @@ -135,4 +139,7 @@ public interface IParamsCollectManifestEOService extends IService> configDataList) { + public boolean save(List> configDataList, String paramsManifestId) { List newConfigDataEOList = new ArrayList<>(); + List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列 + List paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList()); + List paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据 // 处理数据 for (Map map : configDataList) { @@ -768,7 +772,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> paramsConfigDataVOList = (List>) 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 getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO) { + public List> getParamsInfoPublishListForAdd(ParamsCollectManifestVO paramsCollectManifestVO) { + String cut = paramsCollectManifestVO.getCut(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsInfoPublishEO::getParamsTemplateId, paramsCollectManifestVO.getParamsTemplateId()) .eq(ParamsInfoPublishEO::getVersion, paramsCollectManifestVO.getParamsTemplatePublishVersion()) @@ -854,7 +861,27 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList()); paramsInfoPublishEOList = paramsInfoPublishEOList.stream().filter(e-> !nioNumberList.contains(e.getNioNumber())).collect(Collectors.toList()); - return paramsInfoPublishEOList; + // 查询 责任领域 数据字典 + List dictItems = sysDictItemService.selectItemsByDictCode("duty_territory"); + Map 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> listMapForAdd = new ArrayList<>(); + Map finalDictItemsMap = dictItemsMap; + paramsInfoPublishEOList.forEach(paramsInfoPublishEO -> { + Map 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 getLockedConfigIdList(ParamsCollectManifestVO paramsCollectManifestVO) { + String paramsManifestId = paramsCollectManifestVO.getParamsManifestId(); + + // 查询配置列 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsConfigEO::getParamsManifestId, paramsManifestId); + queryWrapper.eq(ParamsConfigEO::getIsLock, ConfigLockEnum.YES.getValue()); // 指定查询非冻结配置 + queryWrapper.orderByAsc(ParamsConfigEO::getDisplaySeq); + List paramsConfigEOList = paramsConfigEOService.list(queryWrapper); + + List 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 list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); + // 过滤出 状态为：待发起收集，且工程接口人处为空的参数项 + list = list.stream().filter(e-> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) && StringUtils.isBlank(e.getSdt())).collect(Collectors.toList()); + + List 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>> 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> 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 getConfigLableList(ParamsReportDetailVO paramsReportDetailVO) { List> configLabelList = paramsReportDetailEOService.getConfigLabelList(paramsReportDetailVO); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index 11e698743..1ba513ce4 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -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 { @Autowired private IParamsReportEOService paramsReportEOService; + + @Autowired + private IParamsReportExportHistoryEOService paramsReportExportHistoryEOService; /** * 分页列表查询 @@ -58,7 +63,7 @@ public class ParamsReportEOController extends JeroController 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); + } + + + diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java new file mode 100644 index 000000000..67a91a94f --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportExportHistoryEO.java @@ -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; +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java new file mode 100644 index 000000000..6a4782be3 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTypeEnum.java @@ -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 toMap(String cut){ + Map 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; + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java index ec54aeed7..53781f175 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java @@ -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 listInfo(@Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO); + IPage pageInfo(@Param("page") IPage page, @Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO); + List> listInfoForExport(@Param("idList") List idList, @Param("paramsReportDetailVO") ParamsReportDetailVO paramsReportDetailVO); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java new file mode 100644 index 000000000..0cf024066 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportExportHistoryEOMapper.java @@ -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 { + + IPage pageInfo(@Param("page") IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO); +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml index 060cf0d4e..b539d2703 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml @@ -91,6 +91,13 @@ order by nio_number asc, sync_time desc + + + select tmp_tb.* from( + select + 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 + + order by export_time desc + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java index 45931c5c2..b9150f5f5 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java @@ -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> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut); + IPage queryList(IPage page, ParamsReportDetailEO paramsReportDetailEO, String cut); /** * 列表表头中英文切换 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java new file mode 100644 index 000000000..c69874c9c --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java @@ -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 { + + /** + * 保存 + * + * @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 ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ParamsReportExportHistoryEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + IPage queryPage(IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO, String cut); +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 8ba990cfa..f31c090aa 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -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> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut) { + public IPage queryList(IPage page, ParamsReportDetailEO paramsReportDetailEO, String cut) { String paramsManifestId = paramsReportDetailEO.getParamsManifestId(); - List list = paramsReportDetailEOMapper.listInfo(paramsReportDetailEO); // 查询固定列 + IPage pageInfo = paramsReportDetailEOMapper.pageInfo(page, paramsReportDetailEO); // 查询固定列 + List list = pageInfo.getRecords(); // 查询固定列 List paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列 // 普通数据字典 @@ -193,7 +205,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl 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 ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ParamsReportExportHistoryEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public IPage queryPage(IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO, String cut) { + IPage pageInfo = paramsReportExportHistoryEOMapper.pageInfo(page, paramsReportExportHistoryEO); + List list = pageInfo.getRecords(); + + Map 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; + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java index cdca194aa..bac0f3502 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java @@ -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; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java index b8b399e51..8bb6ccc20 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java @@ -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"), diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java index e4e9b0339..6a9163656 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java @@ -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; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index 6786e76ff..df73c3ae6 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -203,6 +203,9 @@ public class OSSFileServiceImpl extends ServiceImpl 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 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, ",") + "类型的文件。请重新选择文件！"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java index 80885a019..54e97279b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java @@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class LawsOpinionAssessmentResultEOController extends JeroController { @Autowired private ILawsOpinionAssessmentResultEOService lawsOpinionAssessmentResultEOService; - + /** * 分页列表查询 * @@ -167,4 +167,11 @@ public class LawsOpinionAssessmentResultEOController extends JeroController insertBatch(@Validated @RequestBody List lawsOpinionAssessmentResultEOList) { + this.lawsOpinionAssessmentResultEOService.insertBatch(lawsOpinionAssessmentResultEOList); + return Result.OK("添加成功！"); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java index 922d15e25..0c1c4b174 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java @@ -53,10 +53,12 @@ public class LawsOpinionGatherEOController extends JeroController 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 queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionGatherEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = lawsOpinionGatherEOService.page(page, queryWrapper); + this.lawsOpinionGatherEOService.disposeData(pageList.getRecords(),cut); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java index 15ec36e61..cc9cd94a7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsProcessHistoryEOController.java @@ -68,8 +68,11 @@ public class LawsProcessHistoryEOController extends JeroController> queryList() { - List list = lawsProcessHistoryEOService.queryList(); + public Result> queryList(LawsProcessHistoryEO lawsProcessHistoryEO, + HttpServletRequest req, + @RequestParam(value = "cut",defaultValue = "cn") String cut) { + List list = lawsProcessHistoryEOService.queryList(lawsProcessHistoryEO,req,cut); + this.lawsProcessHistoryEOService.disposeData(list,cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java index aa759104e..f3bdee2c6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java @@ -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") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java index 6ac820d97..e7e09c63d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsProcessHistoryEO.java @@ -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") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/LawsOpinionGatherNodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/LawsOpinionGatherNodeEnum.java new file mode 100644 index 000000000..a4b2bc62f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/LawsOpinionGatherNodeEnum.java @@ -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; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/OperatorRoleCodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/OperatorRoleCodeEnum.java new file mode 100644 index 000000000..ae30be989 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/enums/OperatorRoleCodeEnum.java @@ -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; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java index 8be4646a9..97c166753 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java @@ -58,4 +58,10 @@ public interface ILawsOpinionAssessmentResultEOService extends IService queryList(); + + /** + * 批量新增 + * @param lawsOpinionAssessmentResultEOList + */ + void insertBatch(List lawsOpinionAssessmentResultEOList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java index e1a0cbe59..d3a492c06 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java @@ -67,4 +67,10 @@ public interface ILawsOpinionGatherEOService extends IService processCall(JSONObject jsonObject); + + /** + * 处理数据 + * @param lawsOpinionGatherEOList + */ + void disposeData(List lawsOpinionGatherEOList,String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java index 7d52e881e..50df84da2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsProcessHistoryEOService.java @@ -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 queryList(); + List queryList(LawsProcessHistoryEO lawsProcessHistoryEO, HttpServletRequest req,String cut); + + public void disposeData(List datas,String cut); /** * 流程调用 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java index ee57a53d0..8549a230f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java @@ -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 queryList() { return list(); } + + @Override + public void insertBatch(List lawsOpinionAssessmentResultEOList) { + if (CollectionUtils.isNotEmpty(lawsOpinionAssessmentResultEOList)) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO = lawsOpinionAssessmentResultEOList.get(0); + QueryWrapper 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); + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java index f1b8735fd..da95056f0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -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().success("调用成功！"); } + + @Override + public void disposeData(List lawsOpinionGatherEOList,String cut) { + if(CollectionUtils.isNotEmpty(lawsOpinionGatherEOList)){ + lawsOpinionGatherEOList.forEach(lawsOpinionGather -> { + if(StringUtils.isNotEmpty(lawsOpinionGather.getGatherResult())){ + lawsOpinionGather.setGatherResultShow(GatherResultEnum.getTextByValue(lawsOpinionGather.getGatherResult(),cut)); + } + }); + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java index 77599194d..7c9c84aa2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsProcessHistoryEOServiceImpl.java @@ -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 queryList() { - return list(); + public List queryList(LawsProcessHistoryEO lawsProcessHistoryEO, HttpServletRequest req,String cut) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsProcessHistoryEO, req.getParameterMap()); + List lawsProcessHistoryEOList = this.baseMapper.selectList(queryWrapper); + return lawsProcessHistoryEOList; } + @Override + public void disposeData(List 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"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java index e5f56b9ed..27ed1817a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/TaskCommonQuery.java @@ -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; diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 6f9f38f9a..bf75dc0c6 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -176,6 +176,8 @@ module.exports = { MenuType: 'Menu type', menu: 'Menu', ButtonsPermissions: 'Buttons / permissions', + ConventionalExport:'Conventional export', + CustomExport:'Custom export', assembly: 'Assembly', route: 'Route', AddSubmenu: 'Add submenu', @@ -385,6 +387,7 @@ module.exports = { StandardDetails: 'Standard Details', whole: 'Whole', DocumentLibrary: 'Document Library', + GeneralExportInformation:'General export information', DocumentComparisonLibrary: 'Document comparison Library', weekly: 'Weekly', SyncLibrary: 'Sync to doc. library', @@ -727,6 +730,7 @@ module.exports = { // 参数收集开始 MaintainConfigureInfo: 'Maintain configuration information', ParameteItemCollectionList: 'Parameter item collection list', + ParameterViewPage:'Parameter View page', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed', NoConfigurationNotStart: 'No configuration added, unable to start collection, please check', @@ -757,6 +761,7 @@ module.exports = { operatethisbutton: 'You do not have permission to operate this button', ParameterLibrary: 'Parameter Library', referenceparameter: 'Reference Parameter', + tempSave: 'Temp Save', Assignedby: 'Assignedby', CompulsoryWithdrawal: 'CompulsoryWithdrawal', SynchronousReportLibrary: 'Synchronous Report Library', @@ -791,6 +796,10 @@ module.exports = { releaseVersion: 'Release Version', parameterTemplate: 'Parameter Template', contentDescription: 'Content Description', + WhetherMergeParameters:'Whether to merge parameters', + merge:'merge', + nonjoinder:'nonjoinder', + MergeSeparator:'Merge separator', parameterTemplateExportName: 'Parameter List', parameterDataExport: 'Parameter Export Data', // 参数收集结束 @@ -941,14 +950,14 @@ module.exports = { reportNotUploaded: 'Report not uploaded', position: 'position', // 认证权限状态 - CollectionInitiated: 'Collection to be initiated', - handledInterface: 'To be handled by the project interface', - ReturnedPerson: 'Returned by project contact person', - completed: 'To be completed', - Filledreturn: 'Filled by return', - Submitted: 'Submitted', - ReturnedEngineer: 'Returned by Certification Engineer', - SynchronizedLibrary: 'Synchronized to the upper reporting Library', + CollectionInitiated: 'Wait Collect', + handledInterface: 'Wait Sdt', + ReturnedPerson: 'Sdt Back', + completed: 'Wait Fill', + Filledreturn: 'Dre Back', + Submitted: 'Submit', + ReturnedEngineer: 'Cert Back', + SynchronizedLibrary: 'Sync Report', Statusis: 'Statusis', toHavePermission: 'To Have Permission', and: 'and', @@ -1055,7 +1064,7 @@ module.exports = { Ftext: 'Text+Pull single+File', Nnothing: 'Null', Nchinese: 'Chinese', - NpositiveInteger: 'Positive integer', + NpositiveInteger: 'Integer', NPositivefloatingpointnumber: 'Positive float', NintegerOrDecimal: 'Integer decimal', NOneDecimalPlace: 'Decimal one', @@ -1073,4 +1082,9 @@ module.exports = { pleaseSelectinitiatedOrRejected:'Please select the data whose list confirmation status is not initiated or rejected', TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of cannot be empty', theResponsiblePersonAndDeadlineClank:'The responsible person and deadline of cannot be blank', + bringInTheProjectInterface:'Bring in the project interface', + theCurrentListSaved:'The current list data has been submitted and cannot be temporarily saved', + defaultTemplate:'Default template', + newRequestCommentListTemplate:'New request for comment list template', + NewReleasedStandardTemplate:'New released standard template', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 43e10d21e..296a334ab 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -178,6 +178,8 @@ module.exports = { MenuType: '菜单类型', menu: '菜单', ButtonsPermissions: '按钮/权限', + ConventionalExport:'常规导出', + CustomExport:'自定义导出', assembly: '组件', route: '路径', AddSubmenu: '添加子菜单', @@ -280,7 +282,7 @@ module.exports = { enterMenuTitle: '请输入菜单标题', enterAuthorizationPolicy: '请输入授权策略', AuthorizationIDExists: '授权标识已存在', - enterPositiveInteger: '请输入正整数', + enterPositiveInteger: '请输入整数', RuleName: '规则名称', enterRuleName: '请输入规则名称', RuleField: '规则字段', @@ -390,6 +392,7 @@ module.exports = { StandardDetails: '标准详情', whole: '全部', DocumentLibrary: '文档库', + GeneralExportInformation:'常规导出信息', DocumentComparisonLibrary: '文档对比库', weekly: '周报', SyncLibrary: '同步至文档库', @@ -693,7 +696,7 @@ module.exports = { confirmOverrule: '确认驳回？', The: '第', submitted: '条数据已提交不能重复提交', - incorrectsubmitted: '状态有误；只能提交状态为待确认的数据', + incorrectsubmitted: '条数据状态有误；只能提交状态为待确认的数据', basicInformationOfParameters: '项目基本信息', regulatoryCertificationTaskPlan: '法规/认证任务计划', bringInRelevantPersonnel: '带入相关人员', @@ -742,6 +745,7 @@ module.exports = { // 参数收集 MaintainConfigureInfo: '维护配置信息', ParameteItemCollectionList: '参数项收集清单', + ParameterViewPage:'参数项查看页', Areyousureparameteritems: '确认提交所选参数项嘛?', Theselectedconfiguration: '参数清单中参数项均为待发起收集或变更时，才能添加配置', NoConfigurationNotStart: '未添加任何配置，无法开始收集，请检查', @@ -772,6 +776,7 @@ module.exports = { operatethisbutton: '没有权限操作此按钮', ParameterLibrary: '参数库', referenceparameter: '引用参数', + tempSave: '暂存', Assignedby: '分配填写人', CompulsoryWithdrawal: '强制撤回', SynchronousReportLibrary: '同步上报库', @@ -806,6 +811,10 @@ module.exports = { releaseVersion: '发布版本', parameterTemplate: '参数模板', contentDescription: '内容说明', + WhetherMergeParameters:'是否合并参数', + merge:'合并', + nonjoinder:'不合并', + MergeSeparator:'合并分隔符', parameterTemplateExportName: '参数项列表', parameterDataExport: '参数项导出数据', // 参数收集结束 @@ -1064,7 +1073,7 @@ module.exports = { Ftext: '文本+下拉单选+附件', Nnothing: '无', Nchinese: '中文', - NpositiveInteger: '正整数', + NpositiveInteger: '整数', NPositivefloatingpointnumber: '正浮点数', NintegerOrDecimal: '整数或小数', NOneDecimalPlace: '一位小数', @@ -1077,4 +1086,9 @@ module.exports = { English:'英文', requiredParametersEmpty:'必填参数不能为空', theResponsiblePersonAndDeadlineClank:'的责任人、截止时间不能为空', + bringInTheProjectInterface:'带入工程接口人', + theCurrentListSaved:'当前列表数据已全部提交，无法进行暂存', + defaultTemplate:'默认模板', + newRequestCommentListTemplate:'新征求意见清单模板', + NewReleasedStandardTemplate:'新发布标准模板', } \ No newline at end of file diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 7d6973111..8a81c237e 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -49,6 +49,7 @@ show-size-changer :page-size.sync="pageSize" :total="total" + :current="pageNo" @change="pageOnChange" @showSizeChange="SizeChange" /> diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index e133eb8b3..efc3a9f0d 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -24,15 +24,18 @@ v-model="item.dataValue"/> -
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -176,16 +179,19 @@ v-model="item.dataValue"/>
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
{{ (item.dataValue === 'null' || item.dataValue === '' || @@ -496,7 +508,7 @@
-
+
{{ (item.dataValue === 'null' || item.dataValue === '' || @@ -540,16 +552,19 @@ v-model="item.dataValue"/>
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+ + \ No newline at end of file diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue new file mode 100644 index 000000000..9496747a7 --- /dev/null +++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue @@ -0,0 +1,358 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 6b6852905..723c4c40a 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -4,7 +4,7 @@
- {{ $t('ParameteItemCollectionList') }} + {{ $t('ParameterViewPage') }}
@@ -12,6 +12,17 @@
+ +
+
+ {{$t('certificationCategory')}} +
+ +
+
@@ -30,35 +41,32 @@ v-model="formInline.paramsName">
- -
-
- {{$t('certificationCategory')}} -
- -
- - -
-
- {{$t('areaOfResponsibility')}} -
- -
-
{{$t('completedBy')}}
- + +
+ + +
+
+ {{$t('engineeringInterfacePerson')}} +
+
@@ -71,6 +79,16 @@
+
+
+ + {{$t('ConventionalExport')}} +
+
+ + {{$t('CustomExport')}} +
+
+ + +