From 154e523879db9558c50009604b28211bc86bbd05 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 18 Apr 2022 11:29:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=A1=A8=20=E6=96=B0=E5=A2=9E=E3=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProjectLawsInventoryEO.java | 14 +++++ .../project/enums/OperatorResultEnum.java | 41 ++++++++++++++ .../project/enums/OperatorTypeEnum.java | 44 +++++++++++++++ .../ProjectLawsInventoryEOServiceImpl.java | 53 +++++++++++++------ 4 files changed, 137 insertions(+), 15 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorResultEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index 09ce07cb2..43b4bbad0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -92,6 +92,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**实施类别*/ @Excel(name = "实施类别", width = 15) @ApiModelProperty(value = "实施类别") + @Dict(dicCode ="implement_type") private String implementType; /**新车型实施日期*/ @@ -111,11 +112,13 @@ public class ProjectLawsInventoryEO implements Serializable { /**认证类型*/ @Excel(name = "认证类型", width = 15) @ApiModelProperty(value = "认证类型") + @Dict(dicCode ="attestation_type") private String attestationType; /**认证级别*/ @Excel(name = "认证级别", width = 15) @ApiModelProperty(value = "认证级别") + @Dict(dicCode ="attestation_rank") private String attestationRank; /**WVTA ID*/ @@ -126,6 +129,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**责任领域*/ @Excel(name = "责任领域", width = 15) @ApiModelProperty(value = "责任领域") + @Dict(dicCode ="duty_territory") private String dutyTerritory; /**法规工程师id*/ @@ -160,6 +164,7 @@ public class ProjectLawsInventoryEO implements Serializable { /**设计符合性确认-交付物类型*/ @Excel(name = "设计符合性确认-交付物类型", width = 15) @ApiModelProperty(value = "设计符合性确认-交付物类型") + @Dict(dicCode ="deliverable_template") private String designDeliverableType; /**设计符合性确认-交付物模板*/ @@ -170,11 +175,13 @@ public class ProjectLawsInventoryEO implements Serializable { /**设计符合性确认-发起人*/ @Excel(name = "设计符合性确认-发起人", width = 15) @ApiModelProperty(value = "设计符合性确认-发起人") + @Dict(dicCode ="fa1_qi3_ren2") private String designInitiator; /**设计符合性确认-责任人*/ @Excel(name = "设计符合性确认-责任人", width = 15) @ApiModelProperty(value = "设计符合性确认-责任人") + @Dict(dicCode ="ze2_ren4_ren2") private String designDuty; /**设计符合性确认-截止时间*/ @@ -197,11 +204,13 @@ public class ProjectLawsInventoryEO implements Serializable { /**prehomo确认-发起人*/ @Excel(name = "prehomo确认-发起人", width = 15) @ApiModelProperty(value = "prehomo确认-发起人") + @Dict(dicCode ="fa1_qi3_ren2") private String prehomoInitiator; /**prehomo确认-责任人*/ @Excel(name = "prehomo确认-责任人", width = 15) @ApiModelProperty(value = "prehomo确认-责任人") + @Dict(dicCode ="ze2_ren4_ren2") private String prehomoDuty; /**prehomo确认-截止时间*/ @@ -224,11 +233,13 @@ public class ProjectLawsInventoryEO implements Serializable { /**验证符合性确认-发起人*/ @Excel(name = "验证符合性确认-发起人", width = 15) @ApiModelProperty(value = "验证符合性确认-发起人") + @Dict(dicCode ="fa1_qi3_ren2") private String verifyInitiator; /**验证符合性确认-责任人*/ @Excel(name = "验证符合性确认-责任人", width = 15) @ApiModelProperty(value = "验证符合性确认-责任人") + @Dict(dicCode ="ze2_ren4_ren2") private String verifyDuty; /**验证符合性确认-截止时间*/ @@ -271,4 +282,7 @@ public class ProjectLawsInventoryEO implements Serializable { @ApiModelProperty(value = "认证工程师提交状态") private String homologationEngineerSubmitStatus; + @TableField(exist = false) + @ApiModelProperty(value = "文档库id") + private String ids;//文档库id 多个之间用英文逗号拼接 } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorResultEnum.java new file mode 100644 index 000000000..cdc97ab84 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorResultEnum.java @@ -0,0 +1,41 @@ +package com.jero.modules.project.enums; + +public enum OperatorResultEnum { + ACCEPTED("通过","0"), + REJECTED("拒绝","1"), + ; + + String name; + String value; + + private OperatorResultEnum(String name, String value) { + this.name = name; + this.value = value; + } + + 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 static String getTextByValue(String value) { + OperatorResultEnum[] values = values(); + for (OperatorResultEnum operatorResultEnum : values) { + if (operatorResultEnum.value.equals(value)) { + return operatorResultEnum.name; + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java new file mode 100644 index 000000000..d17ed6bc1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -0,0 +1,44 @@ +package com.jero.modules.project.enums; + +/** + * 操作类型枚举类 + */ +public enum OperatorTypeEnum { + INVENTORY_AFFIRM("清单确认，studio工程师发起","0"), + SUBMIT_OR_REJECTED("法规、认证工程师提交或拒绝","1"), + ; + + String name; + String value; + + private OperatorTypeEnum(String name, String value) { + this.name = name; + this.value = value; + } + + 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 static String getTextByValue(String value) { + OperatorTypeEnum[] values = values(); + for (OperatorTypeEnum operatorTypeEnum : values) { + if (operatorTypeEnum.value.equals(value)) { + return operatorTypeEnum.name; + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 0bbd6570b..1c7a80d8b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1,14 +1,15 @@ package com.jero.modules.project.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.vo.LoginUser; +import com.jero.modules.document.entity.BussDocumentLibraryEO; +import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLibraryBase; -import com.jero.modules.project.enums.ProjectRoleEnum; -import com.jero.modules.project.enums.InventoryAffirmStatusEnum; -import com.jero.modules.project.enums.TaskAffirmStatusEnum; +import com.jero.modules.project.enums.*; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.service.IProjectLawsInventoryEOService; @@ -17,6 +18,7 @@ import com.jero.modules.system.mapper.SysUserMapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,6 +42,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.in(BussDocumentLibraryEO::getId, Arrays.asList(ids.split(","))); + List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper); + + List list = new ArrayList<>(); + for (BussDocumentLibraryEO bussDocumentLibraryEO : bussDocumentLibraryEOList) { + ProjectLawsInventoryEO projectLawsInventoryTemp = new ProjectLawsInventoryEO(); + BeanUtils.copyProperties(bussDocumentLibraryEO,projectLawsInventoryTemp); + String id = UUID.randomUUID().toString().replace("-", ""); + projectLawsInventoryTemp.setId(id); + projectLawsInventoryTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId()); + projectLawsInventoryTemp.setCreateTime(new Date()); + projectLawsInventoryTemp.setUpdateTime(new Date()); + projectLawsInventoryTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue()); + projectLawsInventoryTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue()); + list.add(projectLawsInventoryTemp); + } + super.saveBatch(list); } /** @@ -129,8 +150,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl{ + queryWrapper.eq("regulation_owner_id",currentUser.getId()). + or().eq("homologation_engineer_id",currentUser.getId()); + }); } List result = super.baseMapper.selectList(projectLawsInventoryEOQueryWrapper); dataDispose(result,currentUser,isProjectRole); @@ -316,7 +339,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); if(StringUtils.isNotEmpty(ids)){ queryWrapper.lambda().in(ProjectLawsInventoryEO::getId, Arrays.asList(ids.split(","))); @@ -340,12 +363,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl