From 85a2cd14d47a549dc6bb0240adfc0af07c8d354d Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 26 May 2022 17:59:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95log?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../4.数据库变更记录/解鋆宇sql变更记录.sql | 10 +- .../controller/SysDictItemController.java | 2 +- .../service/impl/SysDictItemServiceImpl.java | 2 +- .../controller/DummyLogEOController.java | 7 +- .../jero/modules/dummy/entity/DummyLogEO.java | 17 +- .../enums/DummyInventoryBaseFieldEnum.java | 72 +++-- .../dummy/mapper/xml/DummyLogEOMapper.xml | 2 + .../dummy/service/IDummyLogEOService.java | 4 + .../impl/DummyInventoryBaseEOServiceImpl.java | 2 +- .../impl/DummyInventoryInfoEOServiceImpl.java | 295 +++++++++++------- .../service/impl/DummyLogEOServiceImpl.java | 161 ++++++++-- .../entity/ProjectLawsInventoryLogEO.java | 2 + .../xml/ProjectLawsInventoryLogEOMapper.xml | 1 + 13 files changed, 391 insertions(+), 186 deletions(-) diff --git a/SynologyDrive/4.数据库变更记录/解鋆宇sql变更记录.sql b/SynologyDrive/4.数据库变更记录/解鋆宇sql变更记录.sql index c0e1eae00..37fc4209f 100644 --- a/SynologyDrive/4.数据库变更记录/解鋆宇sql变更记录.sql +++ b/SynologyDrive/4.数据库变更记录/解鋆宇sql变更记录.sql @@ -1,9 +1,15 @@ # 2022-5-24 #标签内容增加排序字段 ALTER TABLE `sys_dict` -ADD COLUMN `order_num` int(11) NOT NULL COMMENT '排序'; +ADD COLUMN `order_num` int(11) NULL COMMENT '排序'; # 2022-5-25 #标签内容-属性增加排序字段 ALTER TABLE `sys_category` - ADD COLUMN `sort_order` int(11) NOT NULL COMMENT '排序'; + ADD COLUMN `sort_order` int(11) NULL COMMENT '排序'; +#虚拟清单更新log +ALTER TABLE `dummy_log` + ADD COLUMN `is_en_log` int(50) NULL COMMENT 'log语言类别,cn中文,en英文'; +#法规清单更新log +ALTER TABLE `project_laws_inventory_log` + ADD COLUMN `is_en_log` int(50) NULL COMMENT 'log语言类别,cn中文,en英文'; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 4f2230b87..60cc01049 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -66,7 +66,7 @@ public class SysDictItemController { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap()); - queryWrapper.orderByAsc("sort_order").eq("del_flag",CommonConstant.DEL_FLAG_0); + queryWrapper.orderByDesc("sort_order").eq("del_flag",CommonConstant.DEL_FLAG_0); Page page = new Page(pageNo, pageSize); IPage pageList = sysDictItemService.page(page, queryWrapper); result.setSuccess(true); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java index 1a8878f04..85e6df8da 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java @@ -65,7 +65,7 @@ public class SysDictItemServiceImpl extends ServiceImpl 0) {//有重复展示顺序的,后面的号全+1 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyLogEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyLogEOController.java index 3f41da883..62a9bb944 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyLogEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyLogEOController.java @@ -49,15 +49,16 @@ public class DummyLogEOController extends JeroController queryPageList(DummyLogEO dummyLogEO, + public Result queryPageList(DummyLogEO dummyLogEO,String cut, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dummyLogEO, req.getParameterMap()); - queryWrapper.orderByDesc("create_time"); + queryWrapper.orderByDesc("create_time").eq("is_en_log",cut); Page page = new Page(pageNo, pageSize); IPage pageList = dummyLogEOService.page(page, queryWrapper); - return Result.OK(pageList); + IPage disposeLogList = dummyLogEOService.disposeLog(pageList,cut); + return Result.OK(disposeLogList); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyLogEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyLogEO.java index 002441400..1e7e99e9b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyLogEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyLogEO.java @@ -1,21 +1,18 @@ package com.jero.modules.dummy.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** @@ -71,4 +68,8 @@ public class DummyLogEO implements Serializable { @ApiModelProperty(value = "log内容") private java.lang.String logContent; + /**log语言类别,cn中文,en英文*/ + private java.lang.String isEnLog; + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseFieldEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseFieldEnum.java index efd154aaa..3648bda4a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseFieldEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseFieldEnum.java @@ -2,48 +2,50 @@ package com.jero.modules.dummy.enums; public enum DummyInventoryBaseFieldEnum { - TITLE("标题","title"), - SUBTITLE("子标题","subtitle"), - WVTA_ID("WVTA ID","wvta_id"), - SHI4_YONG4_FAN4_WEI2("适用范围","apply_scope"), - XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1("新车型实施日期","xin1_che1_xing2_shi2_shi1_ri4_qi1"), - IMPLEMENT_TIME("在产车实施日期","implement_time"), - ATTESTATION_TYPE("认证类型","attestation_type"), - TECHNOLOGY_TERRITORY("技术领域","technology_territory"), - DUTY_TERRITORY("责任领域","duty_territory"), - ATTESTATION_RANK("认证级别","attestation_rank"), - IMPLEMENT_TYPE("实施类别","implement_type"), - REGION("适用地区","region"), - APPLICABLE_SUPPLEMENT("适用增补件","applicable_supplement"), - REMARK("备注","remark"), + TITLE("标题", "title","Title"), + SUBTITLE("子标题", "subtitle","Sub-Title"), + WVTA_ID("WVTA ID", "wvta_id","WVTA ID"), + SHI4_YONG4_FAN4_WEI2("适用范围", "apply_scope","Scope of application"), + XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1("新车型实施日期", "xin1_che1_xing2_shi2_shi1_ri4_qi1","New Type Execute Date"), + IMPLEMENT_TIME("在产车实施日期", "implement_time","New Vehicle Execute Date"), + ATTESTATION_TYPE("认证类型", "attestation_type","Certification Type"), + TECHNOLOGY_TERRITORY("技术领域", "technology_territory","Technical Field"), + DUTY_TERRITORY("责任领域", "duty_territory","Responsible Field"), + ATTESTATION_RANK("认证级别", "attestation_rank","Certification Level"), + IMPLEMENT_TYPE("实施类别", "implement_type","Usage"), + REGION("适用地区", "region","Area"), + APPLICABLE_SUPPLEMENT("适用增补件", "applicable_supplement","Applicable Supplement"), + REMARK("备注", "remark","Comments"), - DELIVERABLE_TEMPLATE("交付物类型","deliverable_template"), - FA1_QI3_REN2("发起人","fa1_qi3_ren2"), - ZE2_REN2_REN2("责任人","ze2_ren4_ren2"), + DELIVERABLE_TEMPLATE("交付物类型", "deliverable_template","Type of deliverables"), + FA1_QI3_REN2("发起人", "fa1_qi3_ren2","Initiator"), + ZE2_REN2_REN2("责任人", "ze2_ren4_ren2","Assignee"), - DESIGN_DELIVERABLE_TYPE("设计符合性确认-交付物类型","deliverable_template"), - DESIGN_DELIVERABLE_TEMPLATE("设计符合性确认-交付物模板","design_deliverable_template"), - DESIGN_INITIATOR("设计符合性确认-发起人","fa1_qi3_ren2"), - DESIGN_DUTY("设计符合性确认-责任人","ze2_ren4_ren2"), + DESIGN_DELIVERABLE_TYPE("设计符合性确认-交付物类型", "deliverable_template","Type of deliverables"), + DESIGN_DELIVERABLE_TEMPLATE("设计符合性确认-交付物模板", "design_deliverable_template","Deliverable template"), + DESIGN_INITIATOR("设计符合性确认-发起人", "fa1_qi3_ren2","Initiator"), + DESIGN_DUTY("设计符合性确认-责任人", "ze2_ren4_ren2","Assignee"), - PREHOMO_DELIVERABLE_TYPE("prehomo确认-交付物类型","deliverable_template"), - PREHOMO_DELIVERABLE_TEMPLATE("prehomo确认-交付物模板","prehomo_deliverable_template"), - PREHOMO_INITIATOR("prehomo确认-发起人","fa1_qi3_ren2"), - PREHOMO_DUTY("prehomo确认-责任人","ze2_ren4_ren2"), + PREHOMO_DELIVERABLE_TYPE("prehomo确认-交付物类型", "deliverable_template","Type of deliverables"), + PREHOMO_DELIVERABLE_TEMPLATE("prehomo确认-交付物模板", "prehomo_deliverable_template","Deliverable template"), + PREHOMO_INITIATOR("prehomo确认-发起人", "fa1_qi3_ren2","Initiator"), + PREHOMO_DUTY("prehomo确认-责任人", "ze2_ren4_ren2","Assignee"), - VERIFY_DELIVERABLE_TYPE("验证符合性确认-交付物类型","deliverable_template"), - VERIFY_DELIVERABLE_TEMPLATE("验证符合性确认-交付物模板","verify_deliverable_template"), - VERIFY_INITIATOR("验证符合性确认-发起人","fa1_qi3_ren2"), - VERIFY_DUTY("验证符合性确认-责任人","ze2_ren4_ren2"), + VERIFY_DELIVERABLE_TYPE("验证符合性确认-交付物类型", "deliverable_template","Type of deliverables"), + VERIFY_DELIVERABLE_TEMPLATE("验证符合性确认-交付物模板", "verify_deliverable_template","Deliverable template"), + VERIFY_INITIATOR("验证符合性确认-发起人", "fa1_qi3_ren2","Initiator"), + VERIFY_DUTY("验证符合性确认-责任人", "ze2_ren4_ren2","Assignee"), ; String name; String value; + String enName; - private DummyInventoryBaseFieldEnum(String name, String value) { + DummyInventoryBaseFieldEnum(String name, String value, String enName) { this.name = name; this.value = value; + this.enName = enName; } public String getName() { @@ -61,4 +63,12 @@ public enum DummyInventoryBaseFieldEnum { public void setValue(String value) { this.value = value; } -} + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } +} \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyLogEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyLogEOMapper.xml index 3933e37cb..c4e7d9b28 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyLogEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyLogEOMapper.xml @@ -10,5 +10,7 @@ + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyLogEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyLogEOService.java index fe3e5a7e2..b95d9eb36 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyLogEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyLogEOService.java @@ -1,5 +1,6 @@ package com.jero.modules.dummy.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.dummy.entity.DummyLogEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -58,4 +59,7 @@ public interface IDummyLogEOService extends IService { * @return */ List queryList(); + + //翻译log数据 + IPage disposeLog(IPage pageList,String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 19c77f628..2f03fd3de 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -446,7 +446,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl records) { Set technologyTerritorySet = new HashSet<>(); for (DummyInventoryInfoEO dummyInventoryInfoEO : records) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 12c628f4f..4207afeb2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -101,7 +101,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -149,9 +149,11 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); String contentLog = username+"向清单中添加了标准“"+serialNumber+"”"; - dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId()); + String enContentLog = username+" added the standard “"+serialNumber+"” to the list."; + dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue()); + dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue()); } - } + } /** * 更新 @@ -160,14 +162,17 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl infoEOList = new ArrayList<>(); infoEOList.add(dummyInventoryInfoEO); //查询数据库里原来的数据 @@ -185,10 +190,11 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl> infoDiffList = new ArrayList<>(); infoDiffList.add(infoDiff); contentLog = dummyInventoryBaseEOService.setContentInfo(null,null,infoDiffList,null,null,contentLog); - - dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId()); - - } + enContentLog=contentLog.replace("由"," changed from ") + .replace("改为"," to "); + dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue()); + dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue()); + } /** * 通过id删除 @@ -197,10 +203,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl ids) { - //文件同步删除 + public void deleteByIds(List ids) { + //文件同步删除 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(DummyInventoryInfoEO::getId,ids); List dummyInventoryInfoEOList = this.list(wrapper); @@ -235,7 +241,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); String contentLog = username+"删除了清单中的“"+serialNumber+"”标准"; - dummyLogEOService.updateLog(contentLog, projectId); + String enContentLog = username+" deleted the “"+serialNumber+"” standard from the list"; + dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue()); + dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue()); } /** @@ -245,9 +253,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) { + public List queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap()); // queryWrapper.in("dummy_inventory_base_id",dummyInventoryInfoEO.getDummyInventoryBaseId()); queryWrapper.orderByDesc("create_time","serial_number"); @@ -263,8 +271,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dummyInventoryInfoEOList = this.list(queryWrapper); //技术领域处理 treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList); - return dummyInventoryInfoEOList; - } + return dummyInventoryInfoEOList; + } /** @@ -288,7 +296,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); String contentLog = username+"复制了“"+serialNumber+"”"; - dummyLogEOService.updateLog(contentLog, projectId); + String enContentLog = username+" copied “"+serialNumber+"”"; + dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue()); + dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue()); } } @@ -300,136 +310,193 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl idList = Arrays.asList(dummyInventoryInfoEO.getIds().split(",")); QueryWrapper queryWrapper = new QueryWrapper<>(); List infoList = list(queryWrapper.in("id", idList)); String projectId = infoList.get(0).getDummyInventoryBaseId(); - dummyInventoryBaseEOService.disposeData(infoList); - - //翻译传入的数据 - List inputList = new ArrayList<>(); - inputList.add(dummyInventoryInfoEO); - dummyInventoryBaseEOService.disposeData(inputList); - DummyInventoryInfoEO inputInfoEO = inputList.get(0); List dummyInventoryInfoEOList = new ArrayList<>(); for (String id : dummyInventoryInfoEO.getIds().split(",")) { - DummyInventoryInfoEO info = infoList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); - contentLogBuilder.append(info.getSerialNumber() + ":"); DummyInventoryInfoEO dummyInventoryInfoEOTemp = new DummyInventoryInfoEO(); dummyInventoryInfoEOTemp.setId(id); //实施类别 implementType - if(StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())) { + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())){ dummyInventoryInfoEOTemp.setImplementType(dummyInventoryInfoEO.getImplementType()); - if (StringUtils.isBlank(info.getImplementType())){ - info.setImplementType("空"); - } - if (!info.getImplementType().equals(inputInfoEO.getImplementType())) { - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName(), info.getImplementType(), inputInfoEO.getImplementType()); - } - } //认证类型 attestationType - if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())) { + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())){ dummyInventoryInfoEOTemp.setAttestationType(dummyInventoryInfoEO.getAttestationType()); - if (StringUtils.isBlank(info.getAttestationType())){ - info.setAttestationType("空"); - } - if (!info.getAttestationType().equals(inputInfoEO.getAttestationType())) { - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName(), info.getAttestationType(), inputInfoEO.getAttestationType()); - } } //认证级别 attestationRank - if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())) { + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())){ dummyInventoryInfoEOTemp.setAttestationRank(dummyInventoryInfoEO.getAttestationRank()); - if (StringUtils.isBlank(info.getAttestationRank())){ - info.setAttestationRank("空"); - } - if (!info.getAttestationRank().equals(inputInfoEO.getAttestationRank())){ - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName(), info.getAttestationRank(), inputInfoEO.getAttestationRank()); - } } //责任领域 dutyTerritory - if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())) { + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())){ dummyInventoryInfoEOTemp.setDutyTerritory(dummyInventoryInfoEO.getDutyTerritory()); - if (StringUtils.isBlank(info.getDutyTerritory())){ - info.setDutyTerritory("空"); - } - if (!info.getDutyTerritory().equals(inputInfoEO.getDutyTerritory())){ - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory()); - } } //适用范围 shi4Yong4Fan4Wei2 if(StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())){ dummyInventoryInfoEOTemp.setShi4Yong4Fan4Wei2(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2()); - if (StringUtils.isBlank(info.getShi4Yong4Fan4Wei2())){ - info.setShi4Yong4Fan4Wei2("空"); - } - if (!info.getShi4Yong4Fan4Wei2().equals(inputInfoEO.getShi4Yong4Fan4Wei2())) { - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName(),info.getShi4Yong4Fan4Wei2(),inputInfoEO.getShi4Yong4Fan4Wei2()); - } } //技术领域 technologyTerritory if(StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())){ dummyInventoryInfoEOTemp.setTechnologyTerritory(dummyInventoryInfoEO.getTechnologyTerritory()); - if (StringUtils.isBlank(info.getTechnologyTerritoryName())){ - info.setTechnologyTerritoryName("空"); - } - if (!info.getTechnologyTerritoryName().equals(inputInfoEO.getTechnologyTerritoryName())) { - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName(),info.getTechnologyTerritoryName(),inputInfoEO.getTechnologyTerritoryName()); - } } //适用地区 region if(StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())){ dummyInventoryInfoEOTemp.setRegion(dummyInventoryInfoEO.getRegion()); - if (StringUtils.isBlank(info.getRegion())){ - info.setRegion("空"); - } - if (!info.getRegion().equals(inputInfoEO.getRegion())) { - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.REGION.getName(),info.getRegion(),inputInfoEO.getRegion()); - } } //新车实施日期 if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){ dummyInventoryInfoEOTemp.setXin1Che1Xing2Shi2Shi1Ri4Qi1(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1()); - if (info.getXin1Che1Xing2Shi2Shi1Ri4Qi1() == null){ - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(),"空",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); - }else { - if (!info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String().equals(inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String())) { - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); - } - } } //在产车实施日期 if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getImplementTime())){ dummyInventoryInfoEOTemp.setImplementTime(dummyInventoryInfoEO.getImplementTime()); - if (info.getImplementTime() == null){ - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName(),"空",inputInfoEO.getImplementTimeString()); - }else { - if (!info.getImplementTimeString().equals(inputInfoEO.getImplementTimeString())) { - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString()); - } - } } dummyInventoryInfoEOList.add(dummyInventoryInfoEOTemp); } this.updateBatchById(dummyInventoryInfoEOList); - contentLog = contentLogBuilder.substring(0, contentLogBuilder.length() - 1); - contentLog += "”"; - dummyLogEOService.updateLog(contentLog, projectId); + //更新log + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String username = sysUser.getUsername(); + String contentLog = username+"批量设置了“"; + StringBuilder contentLogBuilder = new StringBuilder(contentLog); + String enContentLog = username+" batch set “"; + StringBuilder enContentLogBuilder = new StringBuilder(enContentLog); + + //根据id查询数据库中完整信息,翻译 +// List idList = Arrays.asList(dummyInventoryInfoEO.getIds().split(",")); +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// List infoList = list(queryWrapper.in("id", idList)); +// String projectId = infoList.get(0).getDummyInventoryBaseId(); + dummyInventoryBaseEOService.disposeData(infoList); + + //翻译传入的数据 + List inputList = new ArrayList<>(); + inputList.add(dummyInventoryInfoEO); + dummyInventoryBaseEOService.disposeData(inputList); + DummyInventoryInfoEO inputInfoEO = inputList.get(0); + + for (String id : idList) { + DummyInventoryInfoEO info = infoList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); + contentLogBuilder.append(info.getSerialNumber() + ":"); + enContentLogBuilder.append(info.getSerialNumber() + ":"); + DummyInventoryInfoEO dummyInventoryInfoEOTemp = new DummyInventoryInfoEO(); + dummyInventoryInfoEOTemp.setId(id); + //实施类别 implementType + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())) { + if (StringUtils.isBlank(info.getImplementType())){ + info.setImplementType("空"); + } + if (!info.getImplementType().equals(inputInfoEO.getImplementType())) { + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName(), info.getImplementType(), inputInfoEO.getImplementType()); + setUpdateEnContentLog(enContentLogBuilder,DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName(), info.getImplementType(), inputInfoEO.getImplementType()); + } + } + //认证类型 attestationType + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())) { + if (StringUtils.isBlank(info.getAttestationType())){ + info.setAttestationType("空"); + } + if (!info.getAttestationType().equals(inputInfoEO.getAttestationType())) { + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName(), info.getAttestationType(), inputInfoEO.getAttestationType()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getEnName(), info.getAttestationType(), inputInfoEO.getAttestationType()); + } + } + //认证级别 attestationRank + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())) { + if (StringUtils.isBlank(info.getAttestationRank())){ + info.setAttestationRank("空"); + } + if (!info.getAttestationRank().equals(inputInfoEO.getAttestationRank())){ + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName(), info.getAttestationRank(), inputInfoEO.getAttestationRank()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getEnName(), info.getAttestationRank(), inputInfoEO.getAttestationRank()); + } + } + //责任领域 dutyTerritory + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())) { + if (StringUtils.isBlank(info.getDutyTerritory())){ + info.setDutyTerritory("空"); + } + if (!info.getDutyTerritory().equals(inputInfoEO.getDutyTerritory())){ + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getEnName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory()); + } + } + //适用范围 shi4Yong4Fan4Wei2 + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())){ + if (StringUtils.isBlank(info.getShi4Yong4Fan4Wei2())){ + info.setShi4Yong4Fan4Wei2("空"); + } + if (!info.getShi4Yong4Fan4Wei2().equals(inputInfoEO.getShi4Yong4Fan4Wei2())) { + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName(),info.getShi4Yong4Fan4Wei2(),inputInfoEO.getShi4Yong4Fan4Wei2()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getEnName(),info.getShi4Yong4Fan4Wei2(),inputInfoEO.getShi4Yong4Fan4Wei2()); + } + } + //技术领域 technologyTerritory + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())){ + if (StringUtils.isBlank(info.getTechnologyTerritoryName())){ + info.setTechnologyTerritoryName("空"); + } + if (!info.getTechnologyTerritoryName().equals(inputInfoEO.getTechnologyTerritoryName())) { + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName(),info.getTechnologyTerritoryName(),inputInfoEO.getTechnologyTerritoryName()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getEnName(),info.getTechnologyTerritoryName(),inputInfoEO.getTechnologyTerritoryName()); + } + } + //适用地区 region + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())){ + if (StringUtils.isBlank(info.getRegion())){ + info.setRegion("空"); + } + if (!info.getRegion().equals(inputInfoEO.getRegion())) { + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.REGION.getName(),info.getRegion(),inputInfoEO.getRegion()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.REGION.getEnName(),info.getRegion(),inputInfoEO.getRegion()); + } + } + //新车实施日期 + if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){ + if (info.getXin1Che1Xing2Shi2Shi1Ri4Qi1() == null){ + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(),"空",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(),"null",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + }else { + if (!info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String().equals(inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String())) { + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + } + } + } + //在产车实施日期 + if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getImplementTime())){ + if (info.getImplementTime() == null){ + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName(),"空",inputInfoEO.getImplementTimeString()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getEnName(),"null",inputInfoEO.getImplementTimeString()); + }else { + if (!info.getImplementTimeString().equals(inputInfoEO.getImplementTimeString())) { + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getEnName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString()); + } + } + } + } + + contentLog = contentLogBuilder.substring(0, contentLogBuilder.length() - 1); + contentLog += "”"; + enContentLog = enContentLogBuilder.substring(0, enContentLogBuilder.length() - 1).replace("空","null"); + enContentLog += "”"; + dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue()); + dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue()); } } public StringBuilder setUpdateContentLog(StringBuilder contentLogBuilder,String fieldName,String oldValue,String newValue){ return contentLogBuilder.append("\'"+ fieldName + "\'由" + oldValue + "改为了" + newValue).append(","); } + public StringBuilder setUpdateEnContentLog(StringBuilder contentLogBuilder,String fieldName,String oldValue,String newValue){ + return contentLogBuilder.append("\'"+ fieldName + "\' changed from " + oldValue + " to " + newValue).append(","); + } /** * 模板下载 * @param dummyInventoryInfoEO @@ -542,8 +609,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl msgList, - String nameCn,String nameEn) { + Date field,List msgList, + String nameCn,String nameEn) { //判断格式是否正确 boolean flag = true; if(ObjectUtils.isNotEmpty(field)){ @@ -1340,8 +1409,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dictItemList, DummyInventoryInfoEO dummyInventoryInfoEO, - String errorMsg, String value,List msgList, - String nameCn,String nameEn,String dictCode) { + String errorMsg, String value,List msgList, + String nameCn,String nameEn,String dictCode) { if(StringUtils.isNotBlank(value)){ if(value.contains(",")){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ @@ -1367,8 +1436,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dictItemList, DummyInventoryInfoEO dummyInventoryInfoEO, - String errorMsg, String value,List msgList, - String nameCn,String nameEn,String dictCode) { + String errorMsg, String value,List msgList, + String nameCn,String nameEn,String dictCode) { List valueList = new ArrayList<>(); if (StringUtils.isNotBlank(value)) { List list = Arrays.asList(value.split(",")); @@ -1391,7 +1460,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl msgList, String serialNumber,String nameCn,String nameEn) { + List msgList, String serialNumber,String nameCn,String nameEn) { int errorCount = 0; if(StringUtils.isBlank(serialNumber)){ errorCount ++; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyLogEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyLogEOServiceImpl.java index c9862f943..f49a79514 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyLogEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyLogEOServiceImpl.java @@ -1,6 +1,8 @@ package com.jero.modules.dummy.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; import com.jero.modules.dummy.entity.DummyLogEO; import com.jero.modules.dummy.mapper.DummyLogEOMapper; @@ -24,13 +26,14 @@ public class DummyLogEOServiceImpl extends ServiceImpl ids) { - removeByIds(ids); - } + public void deleteByIds(List ids) { + removeByIds(ids); + } /** * 通过id查询 @@ -91,17 +94,123 @@ public class DummyLogEOServiceImpl extends ServiceImpl queryList() { - return list(); - } -} + public List queryList() { + return list(); + } + + //翻译log数据 + @Override + public IPage disposeLog(IPage pageList,String cut) { + for(DummyLogEO dummyLogEO : pageList.getRecords()){ + if(CutEnum.EN.getValue().equals(cut)){ + //添加 + //String contentLog = username+"向清单中添加了标准“"+serialNumber+"”"; + if(dummyLogEO.getLogContent().contains("向清单中添加了标准")){ + String replaceLog = dummyLogEO.getLogContent().replace("向清单中添加了标准"," added the standard ") + .replace("”","” to the list."); + dummyLogEO.setLogContent(replaceLog); + System.out.println(dummyLogEO); + } + //编辑 + //String contentLog = username+"编辑了清单中的“" + dummyInventoryInfoEO.getSerialNumber() + "”标准:"; + else if(dummyLogEO.getLogContent().contains("编辑了清单中的")){ + String replaceLog = dummyLogEO.getLogContent().replace("编辑了清单中的"," edited the ") + .replace("”标准","” standard in the list"); +// replaceLog = transData(replaceLog); + dummyLogEO.setLogContent(replaceLog); + System.out.println(dummyLogEO); + } + //删除 + //String contentLog = username+"删除了清单中的“"+serialNumber+"”标准"; + /*else if(dummyLogEO.getLogContent().contains("删除了清单中的")){ + String replaceLog = dummyLogEO.getLogContent().replace("删除了清单中的"," deleted the ") + .replace("”标准","” standard from the list"); + dummyLogEO.setLogContent(replaceLog); + System.out.println(dummyLogEO); + }*/ + //导入 + //String contentLog = username+"向清单中导入了“"+serialNumber+"”标准"; + /*else if(dummyLogEO.getLogContent().contains("向清单中导入了")){ + String replaceLog = dummyLogEO.getLogContent().replace("向清单中添加了标准"," imported ") + .replace("”","” standard into the list."); + dummyLogEO.setLogContent(replaceLog); + System.out.println(dummyLogEO); + }*/ + /*//复制 + //String contentLog = username+"复制了“"+serialNumber+"”"; + else if(dummyLogEO.getLogContent().contains("复制了")){ + String replaceLog = dummyLogEO.getLogContent().replace("复制了"," copied ") + .replace("”","” to the list."); + dummyLogEO.setLogContent(replaceLog); + System.out.println(dummyLogEO); + }*/ + /* //批量设置 + //XXX批量设置了“标准号1:'字段名'由XXX改为了XXX ,标准号2:"字段名'由XXX改为了xXX”。 + //XXX batch set "standard number 1:' field name' changed from XXX to XXX, standard number 2:' field name' changed from XXX to XXX". + else if(dummyLogEO.getLogContent().contains("批量设置了")){ + String replaceLog = dummyLogEO.getLogContent().replace("批量设置了"," batch set "); + //////// + dummyLogEO.setLogContent(replaceLog); + System.out.println(dummyLogEO); + }*/ + } + } + return pageList; + } +/* + + public String transData(String replaceLog){ + replaceLog = replaceLog.replace("空","null").replace("由"," changed from ") + .replace("改为"," to "); + //实施类别 implementType + if(replaceLog.contains("实施类别")) { + replaceLog = replaceLog.replace(DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName(),DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName()); + } + //认证类型 attestationType + if(replaceLog.contains("")) {//DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName() + + } + //认证级别 attestationRank + if(replaceLog.contains("")) {//DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName() + + } + //责任领域 dutyTerritory + if(replaceLog.contains("")) {//DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName() + + } + //适用范围 shi4Yong4Fan4Wei2 + if(replaceLog.contains("")){//DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName() + + } + //技术领域 technologyTerritory + if(replaceLog.contains("")){//DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName() + + } + //适用地区 region + if(replaceLog.contains("适用地区")){//DummyInventoryBaseFieldEnum.REGION.getName() + replaceLog = replaceLog.replace(DummyInventoryBaseFieldEnum.REGION.getName(),DummyInventoryBaseFieldEnum.REGION.getEnName()); + + } + //新车实施日期 + if(replaceLog.contains("")){//DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + + } + //在产车实施日期 + if(replaceLog.contains("")){//DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName() + + } + return replaceLog; + } +*/ + +} \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryLogEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryLogEO.java index 730d4e430..6b6886830 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryLogEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryLogEO.java @@ -68,4 +68,6 @@ public class ProjectLawsInventoryLogEO implements Serializable { @ApiModelProperty(value = "log内容") private String logContent; + /**log语言类别,cn中文,en英文*/ + private java.lang.String isEnLog; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryLogEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryLogEOMapper.xml index e31e085c7..7ab0a7e02 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryLogEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryLogEOMapper.xml @@ -10,5 +10,6 @@ + \ No newline at end of file