diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index 8d097481..56a5ad44 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -23,7 +23,6 @@ import com.jero.modules.compare.enums.ReleaseConditionEnum; import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; -import com.jero.modules.laws.standard.entity.LawsOverseasStandard; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.system.service.ISysUserService; @@ -117,8 +116,6 @@ public class SarFileCompareInfoController extends JeroController lawsDomesticStandards = new ArrayList<>(); - // 海外 - List lawsOverseasStandards = new ArrayList<>(); // 企业 List lawsEnterpriseStandards = new ArrayList<>(); // 获取编号对应的国内、海外、企业信息 @@ -130,28 +127,28 @@ public class SarFileCompareInfoController extends JeroController lawsDomesticStandards, List lawsOverseasStandards, List lawsEnterpriseStandards) { + private void setProperty(SarFileCompareInfo info, List lawsDomesticStandards, List lawsEnterpriseStandards) { // 编号1 String serialNumberLeft = info.getSerialNumberLeft(); // 编号2 String serialNumberRight = info.getSerialNumberRight(); if (StringUtils.isNotBlank(serialNumberLeft)){ - judgeLeftOrRight(info, lawsDomesticStandards, lawsOverseasStandards, lawsEnterpriseStandards, serialNumberLeft, "left"); + judgeLeftOrRight(info, lawsDomesticStandards, lawsEnterpriseStandards, serialNumberLeft, "left"); } if (StringUtils.isNotBlank(serialNumberRight)){ - judgeLeftOrRight(info, lawsDomesticStandards, lawsOverseasStandards, lawsEnterpriseStandards, serialNumberLeft, "right"); + judgeLeftOrRight(info, lawsDomesticStandards, lawsEnterpriseStandards, serialNumberLeft, "right"); } // 创建人 info.setCreateNameNo(sysUserService.getNameNoByUsername(info.getCreateBy())); } - private static void judgeLeftOrRight(SarFileCompareInfo info, List lawsDomesticStandards, List lawsOverseasStandards, List lawsEnterpriseStandards, String serialNumberLeft, String leftOrRight) { + private static void judgeLeftOrRight(SarFileCompareInfo info, List lawsDomesticStandards, List lawsEnterpriseStandards, String serialNumberLeft, String leftOrRight) { // 国内 Optional lawsDomesticStandardOptional = lawsDomesticStandards.stream().filter(v -> serialNumberLeft.equals(v.getStandardNumber())).findFirst(); if (lawsDomesticStandardOptional.isPresent()){ @@ -164,18 +161,7 @@ public class SarFileCompareInfoController extends JeroController lawsOverseasStandardOptional = lawsOverseasStandards.stream().filter(v -> serialNumberLeft.equals(v.getStandardNumber())).findFirst(); - if (lawsOverseasStandardOptional.isPresent()){ - if ("left".equals(leftOrRight)){ - info.setStandardSourceLeft(CommonConstant.STANDARD_SOURCE_2); - info.setStandardIdLeft(lawsOverseasStandardOptional.get().getId()); - }else { - info.setStandardSourceRight(CommonConstant.STANDARD_SOURCE_2); - info.setStandardIdRight(lawsOverseasStandardOptional.get().getId()); - } - return; - } + // 企业 Optional lawsEnterpriseStandardOptional = lawsEnterpriseStandards.stream().filter(v -> serialNumberLeft.equals(v.getStandardNumber())).findFirst(); if (lawsEnterpriseStandardOptional.isPresent()){ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 0cc2be81..137fcf01 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -676,8 +676,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { parameterMap.put(FieldCommon.STANDARD_NUMBER_TEMP, standardNumberTmp); } // 国标和外标 - if (module.equals(TableNameEnum.DOMESTIC_REGULATIONS.getValue()) - || module.equals(TableNameEnum.FOREIGN_REGULATIONS.getValue())) { + if (module.equals(TableNameEnum.DOMESTIC_REGULATIONS.getValue())) { // 拼接标准编号 if (null == parameterMap.get(FieldCommon.STANDARD_NUMBER)) { setStandardNumber(parameterMap); @@ -774,13 +773,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService { if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue()) && inspectContents != null) { this.esInspectContentSaveOrUpdate(inspectContents, id, standardNumber); } - // 企标授权部门处理 - if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(module) || - TableNameEnum.FOREIGN_REGULATIONS.getValue().equals(module)) { - if (parameterMap.get(FieldCommon.AUTH_DEPT) != null) { - esAuthUserService.resetAuthDept(id, parameterMap.get(FieldCommon.AUTH_DEPT).toString()); - } - } // 企标顺序号添加 if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(module)) { String sequenceNo = (String) parameterMap.get(FieldCommon.STANDARD_NUMBER_TEMP); @@ -943,22 +935,12 @@ public class LawsCommonServiceImpl implements ILawsCommonService { lawsNodeRelationService.removeByStandardId(id); lawsNodeRelationService.addRelation(standardSystem, standardNumber, id); - // 企标授权部门处理 - if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(module) || - TableNameEnum.FOREIGN_REGULATIONS.getValue().equals(module)) { - Object authDept = parameterMap.get(FieldCommon.AUTH_DEPT); - if (authDept != null) { - esAuthUserService.resetAuthDept(id, parameterMap.get(FieldCommon.AUTH_DEPT).toString()); - } - } - // 同步es数据库 lawsHomeSearchService.updateEsData(module, id, LawsHomeSearchCommon.LAWS_ES_UPDATE); // 给E采通同步标准变更的信息 try { boolean isAbolish = false; - if (module.equals(TableNameEnum.DOMESTIC_REGULATIONS.getValue()) - || module.equals(TableNameEnum.FOREIGN_REGULATIONS.getValue())) { + if (module.equals(TableNameEnum.DOMESTIC_REGULATIONS.getValue())) { if (standardState.equals(OutStandardStateEnum.ABOLISH.getStateValue())) { isAbolish = true; } @@ -1775,13 +1757,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService { throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR)); } } - if (tableName.equals(TableNameEnum.FOREIGN_REGULATIONS.getTableName())) { - // 检查Excel的文件名 - if (!excelName.equals("海外标准导入模板.xls")) { - FileUnZip.deleteDir(saveDirectory); - throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR)); - } - } // 数据内容格式校验 Map fileMap = new HashMap<>(); // 遍历saveDirectory下的所有文件 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java index bdc623ea..b2971899 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java @@ -118,8 +118,7 @@ public class ImportUtil { // 将国标和外标的三个标准号组成元素取出 if (!standardValidFlag) { - if ((TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(tag.getIsModel()) || - TableNameEnum.FOREIGN_REGULATIONS.getValue().equals(tag.getIsModel())) + if ((TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(tag.getIsModel())) && (FieldCommon.STANDARD_NUMBER_TEMP.equals(tag.getDbFieldName()) || FieldCommon.STANDARD_CLASS.equals(tag.getDbFieldName()) || @@ -221,8 +220,7 @@ public class ImportUtil { // 必填验证 if (YesOrNoEnum.YES.getValue().equals(tag.getFieldMustInput()) && needValidMustInput) { // 国内标准 标准状态为起草 征求意见 报批 状态的发布日期实施日期不是必填项 - if (!((TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(tag.getIsModel()) || - TableNameEnum.FOREIGN_REGULATIONS.getValue().equals(tag.getIsModel())) && + if (!((TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(tag.getIsModel())) && !isGbFbNeedValidDate && (FieldCommon.RELEASE_DATE.equals(tag.getDbFieldName()) || FieldCommon.IMPLEMENTATION_DATE.equals(tag.getDbFieldName())))) { @@ -327,8 +325,7 @@ public class ImportUtil { errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); } else { // 如果是国标 - if (TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(tag.getIsModel()) || - TableNameEnum.FOREIGN_REGULATIONS.getValue().equals(tag.getIsModel())) { + if (TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(tag.getIsModel())) { // 标准状态 if (FieldCommon.STANDARD_STATE.equals(tag.getDbFieldName())) { // 设置是否需要校验发布日期 实施日期 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java index 3ba7d3d4..2aa7968b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java @@ -37,7 +37,6 @@ import com.jero.modules.laws.standard.controller.LawsEnterpriseController; import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.entity.LawsNewsFeed; -import com.jero.modules.laws.standard.entity.LawsOverseasStandard; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.laws.standard.service.ILawsNewsFeedService; @@ -402,20 +401,6 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { return content; } - private void addLawsOverseasStandard(String searchContent, List listLawsOverseasStandard, List listLawsTag, LawsHomeNormalSearchVO p) { - if(!CollectionUtils.isEmpty(listLawsOverseasStandard)){ - Optional op = listLawsOverseasStandard.stream().filter(o-> Objects.equals(o.getId(),p.getId())).findFirst(); - if(op.isPresent()){ - LawsOverseasStandard obj = op.get(); - String content = getString(searchContent, obj.getStandardNumber(), obj.getStandardName()); - p.setTitle(content); - p.setReleaseDate(obj.getReleaseDate()); - // 生成正文 - JSONObject json = JSON.parseObject(JSON.toJSONStringWithDateFormat(obj,YYYY_MM_DD)); -// addContent(p, json,obj, LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD_TABLE_NAME,listLawsTag); - } - } - } private void addLawsDomesticStandard(String searchContent, List listLawsDomesticStandard, List listLawsTag, LawsHomeNormalSearchVO p) { if(!CollectionUtils.isEmpty(listLawsDomesticStandard)){ @@ -448,13 +433,7 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { return listLawsEnterpriseStandard; } - private List listLawsOverseasStandard(List lawsOverseasStandardIds) { - List listLawsOverseasStandard = new ArrayList<>(); - if(!CollectionUtils.isEmpty(lawsOverseasStandardIds)){ -// listLawsOverseasStandard = lawsOverseasStandardService.listByIds(lawsOverseasStandardIds); - } - return listLawsOverseasStandard; - } + private List listLawsDomesticStandard(List lawsDomesticStandardIds) { List listLawsDomesticStandard = new ArrayList<>(); @@ -1724,38 +1703,6 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { // } } - @NotNull - private List getOssFilesLawsOverseasStandard(LawsOverseasStandard lawsOverseasStandard) { - // 从过程稿件从上到下顺序检索；如果文档里有发布稿，只检索发布稿 - List list = getOssFiles(lawsOverseasStandard.getId()); - List listFile = new ArrayList<>(); - if(CollectionUtils.isEmpty(list)){ - return listFile; - } - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); -// query.eq(LawsTag::getTableName,LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD_TABLE_NAME); - query.isNotNull(LawsTag::getHomeSearchFileOrder); - query.orderByAsc(LawsTag::getHomeSearchFileOrder); - List listLawsTag = lawsTagService.list(query); - if(!CollectionUtils.isEmpty(listLawsTag)){ - List op = list.stream().filter(o-> Objects.equals(o.getStandardFileType(),listLawsTag.get(0).getDbFieldName())).collect(Collectors.toList()); - List opTr = list.stream().filter(o-> Objects.equals(o.getStandardFileType(),listLawsTag.get(1).getDbFieldName())).collect(Collectors.toList()); - // 有发布稿 - if(!CollectionUtils.isEmpty(op) || !CollectionUtils.isEmpty(opTr)){ - if(!CollectionUtils.isEmpty(op)){ - listFile.addAll(op); - } - if(!CollectionUtils.isEmpty(opTr)){ - listFile.addAll(opTr); - } - }else{ - for (int i = 2; i < listLawsTag.size(); i++) { - getOp(list, listFile, listLawsTag.get(i).getDbFieldName()); - } - } - } - return listFile; - } private void getOp(List list, List listFile, String modificationList) { List op = list.stream().filter(o -> Objects.equals(o.getStandardFileType(), modificationList)).collect(Collectors.toList()); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java index a120d437..76d3ff8f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java @@ -65,18 +65,6 @@ public class LawsTreeNodeController extends JeroController> queryFBTreeList(@RequestParam(required = false) @ApiParam("节点名称") String nodeName, - @RequestParam(required = false) @ApiParam("为空：显示我的收藏 1：不显示我的收藏") String option) { - String moduleCode = TableNameEnum.FOREIGN_REGULATIONS.getValue(); - List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option); - return Result.OK(list); - } - - @RequiresPermissions("enterpriseStandard:tree:add") @AutoLog(value = "企业标准-添加") @ApiOperation(value = "企业标准-添加", notes = "企业标准-添加") @@ -97,16 +85,6 @@ public class LawsTreeNodeController extends JeroController addFB(@RequestBody LawsTreeNode lawsTreeNode) { - lawsTreeNode.setModuleCode(TableNameEnum.FOREIGN_REGULATIONS.getValue()); - lawsTreeNodeService.saveTreeNodeData(lawsTreeNode); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - /** * 通用编辑方法 * @param lawsTreeNode 实体 @@ -146,14 +124,6 @@ public class LawsTreeNodeController extends JeroController editFB(@Validated @RequestBody LawsTreeNode lawsTreeNode, HttpServletRequest request) { - return this.commonEdit(lawsTreeNode, TableNameEnum.FOREIGN_REGULATIONS.getValue()); - } - /** * 通用删除方法 * @param map 参数Map @@ -197,11 +167,4 @@ public class LawsTreeNodeController extends JeroController deleteFB(@RequestBody IdMapBody map) { - return this.commonDelete(map, TableNameEnum.FOREIGN_REGULATIONS.getValue()); - } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsOverseasStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsOverseasStandard.java deleted file mode 100644 index 3ae64beb..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsOverseasStandard.java +++ /dev/null @@ -1,187 +0,0 @@ -package com.jero.modules.laws.standard.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; - - -/** - * @Description: 海外标准 - * @Author: jero-boot - * @Date: 2023-09-11 - * @Version: V1.0 - */ -@Data -@TableName("laws_overseas_standard") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_overseas_standard对象", description="海外标准") -public class LawsOverseasStandard implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键ID*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private java.lang.String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "创建时间") - private java.util.Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; - /**更新时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "更新时间") - private java.util.Date updateTime; - /**所属部门*/ - @Excel(name = "所属部门", width = 15) - @ApiModelProperty(value = "所属部门") - private java.lang.String orgCode; - /**0表示未删除,1表示删除*/ - @Excel(name = "0表示未删除,1表示删除", width = 15) - @ApiModelProperty(value = "0表示未删除,1表示删除") - @TableLogic - private java.lang.Integer delFlag; - /**国家/地区*/ - @Excel(name = "国家/地区", width = 15) - @ApiModelProperty(value = "国家/地区") - private java.lang.String countryOrRegion; - /**标准类别*/ - @Excel(name = "标准类别", width = 15) - @ApiModelProperty(value = "标准类别") - private java.lang.String standardClass; - /**年代号*/ - @Excel(name = "年代号", width = 15) - @ApiModelProperty(value = "年代号") - private java.lang.String yearNumber; - /**标准编号*/ - @Excel(name = "标准编号", width = 15) - @ApiModelProperty(value = "标准编号") - private java.lang.String standardNumber; - /**标准名称*/ - @Excel(name = "标准名称", width = 15) - @ApiModelProperty(value = "标准名称") - private java.lang.String standardName; - /**标准英文名称*/ - @Excel(name = "标准英文名称", width = 15) - @ApiModelProperty(value = "标准英文名称") - private java.lang.String standardEnglishName; - /**标准体系*/ - @Excel(name = "标准体系", width = 15) - @ApiModelProperty(value = "标准体系") - private java.lang.String standardSystem; - /**发布日期*/ - @Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "发布日期") - private java.util.Date releaseDate; - /**实施日期*/ - @Excel(name = "实施日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "实施日期") - private java.util.Date implementationDate; - /**在产车实施日期*/ - @Excel(name = "在产车实施日期", width = 15) - @ApiModelProperty(value = "在产车实施日期") - private java.lang.String onTheProductionDate; - /**新车型实施日期*/ - @Excel(name = "新车型实施日期", width = 15) - @ApiModelProperty(value = "新车型实施日期") - private java.lang.String newModelImplementationDate; - /**废止日期*/ - @Excel(name = "废止日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "废止日期") - private java.util.Date annulmentDate; - /**标准状态*/ - @Excel(name = "标准状态", width = 15) - @ApiModelProperty(value = "标准状态") - private java.lang.String standardState; - /**责任部门*/ - @Excel(name = "责任部门", width = 15) - @ApiModelProperty(value = "责任部门") - private java.lang.String responsibleDepartment; - /**责任部门负责人*/ - @Excel(name = "责任部门负责人", width = 15) - @ApiModelProperty(value = "责任部门负责人") - private java.lang.String responsibleDepartmentUser; - /**零部件名称*/ - @Excel(name = "零部件名称", width = 15) - @ApiModelProperty(value = "零部件名称") - private java.lang.String partName; - /**适用车型*/ - @Excel(name = "适用车型", width = 15) - @ApiModelProperty(value = "适用车型") - private java.lang.String applicableVehicle; - /**代替标准号*/ - @Excel(name = "代替标准号", width = 15) - @ApiModelProperty(value = "代替标准号") - private java.lang.String substituteStandardNumber; - /**被代替标准号*/ - @Excel(name = "被代替标准号", width = 15) - @ApiModelProperty(value = "被代替标准号") - private java.lang.String replacedByStandardNumber; - /**引用标准*/ - @Excel(name = "引用标准", width = 15) - @ApiModelProperty(value = "引用标准") - private java.lang.String referenceStandard; - /**被引用标准*/ - @Excel(name = "被引用标准", width = 15) - @ApiModelProperty(value = "被引用标准") - private java.lang.String referencedStandard; - /**关联文件*/ - @Excel(name = "关联文件", width = 15) - @ApiModelProperty(value = "关联文件") - private java.lang.String associatedFile; - /**发布搞（原文）*/ - @Excel(name = "发布搞（原文）", width = 15) - @ApiModelProperty(value = "发布搞（原文）") - private java.lang.String publishOfOriginal; - /**发布搞（译文）*/ - @Excel(name = "发布搞（译文）", width = 15) - @ApiModelProperty(value = "发布搞（译文）") - private java.lang.String publishOfTranslation; - /**修改单*/ - @Excel(name = "修改单", width = 15) - @ApiModelProperty(value = "修改单") - private java.lang.String modificationList; - /**报批稿*/ - @Excel(name = "报批稿", width = 15) - @ApiModelProperty(value = "报批稿") - private java.lang.String draftForReview; - /**送审稿*/ - @Excel(name = "送审稿", width = 15) - @ApiModelProperty(value = "送审稿") - private java.lang.String draftForApproval; - /**征求意见稿*/ - @Excel(name = "征求意见稿", width = 15) - @ApiModelProperty(value = "征求意见稿") - private java.lang.String draftForComment; - /**草案*/ - @Excel(name = "草案", width = 15) - @ApiModelProperty(value = "草案") - private java.lang.String draft; - /**标准号*/ - @ApiModelProperty(value = "标准号") - private java.lang.String standardNumberTemp; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsOverseasStandardMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsOverseasStandardMapper.java deleted file mode 100644 index 0efd0d74..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsOverseasStandardMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.jero.modules.laws.standard.mapper; - -import com.jero.modules.laws.standard.entity.LawsOverseasStandard; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; - -import java.util.List; - -/** - * @Description: 海外标准 - * @Author: jero-boot - * @Date: 2023-09-11 - * @Version: V1.0 - */ -public interface LawsOverseasStandardMapper extends BaseMapper { - - @Update("UPDATE laws_overseas_standard SET new_model_implementation_date = #{newModelImplementationDate}, on_the_production_date = #{onTheProductionDate} WHERE id = #{id}") - void updateIgnoreDelFlag(LawsOverseasStandard standard); - - @Select("SELECT * FROM laws_overseas_standard") - List listWithoutDelFlag(); - - @Select("UPDATE laws_overseas_standard SET annulment_date = null WHERE annulment_date = '0000-00-00'") - void cleanAnnulmentDate(); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsOverseasStandardMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsOverseasStandardMapper.xml deleted file mode 100644 index 6ae4e6fb..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsOverseasStandardMapper.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/tag/enums/TableNameEnum.java b/laws-modules/src/main/java/com/jero/modules/tag/enums/TableNameEnum.java index f878e466..6c3b6fcb 100644 --- a/laws-modules/src/main/java/com/jero/modules/tag/enums/TableNameEnum.java +++ b/laws-modules/src/main/java/com/jero/modules/tag/enums/TableNameEnum.java @@ -11,7 +11,6 @@ public enum TableNameEnum { * */ DOMESTIC_REGULATIONS("国内标准","laws_domestic_standard","1"), - FOREIGN_REGULATIONS("海外标准","laws_overseas_standard","2"), ENTERPRISE_STANDARDS("企业标准","laws_enterprise_standard","3"), DOCUMENT_SPLIT("条款拆分","laws_document_split","4"), HOME_SEARCH("高级搜索（全部）","home_search","5")