From d519f9e92f9e4e72f44a96e937f4cae54951efab Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Sat, 6 Jan 2024 19:00:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IProcessEsInspectPlanOpinionService.java | 2 +- .../impl/EsInspectPlanFlowServiceImpl.java | 1 + .../impl/ProcessEsInspectPlanServiceImpl.java | 8 ++++---- .../entity/EnterpriseStandardInspect.java | 6 ++++++ .../entity/vo/EnterpriseStandardInspectVo.java | 12 ++++++++++++ .../xml/EnterpriseStandardInspectMapper.xml | 1 + .../EnterpriseStandardInspectServiceImpl.java | 15 +++++++++++++++ 7 files changed, 40 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanOpinionService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanOpinionService.java index ccc1c467..0c5db056 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanOpinionService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanOpinionService.java @@ -82,7 +82,7 @@ public interface IProcessEsInspectPlanOpinionService extends IService findLastByGroup(String inspectPlanId); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java index 758e59f1..adc083d0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java @@ -430,6 +430,7 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService { EnterpriseStandardInspect enterpriseStandardInspect = new EnterpriseStandardInspect(); // 属性拷贝 BeanUtils.copyProperties(processEsInspectPlan, enterpriseStandardInspect); + enterpriseStandardInspect.setProcessEsInspectPlanId(processEsInspectPlan.getId()); // 稽查状态 enterpriseStandardInspect.setInspectStatus(EsInspectPlanCommon.INSPECT_STATUS_1); // 计划稽查对象 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java index 1b18f234..0ac95643 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java @@ -58,18 +58,18 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl opinionList = iProcessEsInspectPlanOpinionService.findLastByGroup(processEsInspectPlan.getId()); + List opinionList = processEsInspectPlanOpinionService.findLastByGroup(processEsInspectPlan.getId()); for (ProcessEsInspectPlanOpinion processEsInspectPlanOpinion : opinionList) { if (loginUser.getUsername().equals(processEsInspectPlanOpinion.getCreateBy())){ processEsInspectPlan.setProcessEsInspectPlanOpinion(processEsInspectPlanOpinion); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspect.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspect.java index afd235f5..fa259cd7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspect.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspect.java @@ -100,4 +100,10 @@ public class EnterpriseStandardInspect implements Serializable { /** 稽查状态 */ @ApiModelProperty(value = "稽查状态") private String inspectStatus; + + /** + * 企标稽查计划id + */ + @ApiModelProperty(value = "企标稽查计划id") + private String processEsInspectPlanId; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java index 6bdc8bfe..2c588459 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java @@ -3,6 +3,7 @@ package com.jero.modules.laws.enterprise.entity.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; +import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -155,6 +156,17 @@ public class EnterpriseStandardInspectVo { @ExcelCollection(name = "") private List enterpriseStandardInspectRectifyPlanList = Collections.emptyList(); + /** + * 企标稽查计划id + */ + @ApiModelProperty(value = "企标稽查计划id") + private String processEsInspectPlanId; + + /**意见*/ + @ApiModelProperty(value = "意见") + @TableField(exist = false) + private List processEsInspectPlanOpinionList; + //================================= /** * ids 查询用 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml index ce9fce52..0baa3d76 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml @@ -185,6 +185,7 @@ lesi.create_time, lesi.update_by, lesi.update_time, + lesi.process_es_inspect_plan_id, inspect_no, (IF(les.standard_number is not null, les.standard_name, inspect_name)) inspect_name, standardization_work_group, diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java index 99e7a9fd..b0f00b74 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java @@ -8,6 +8,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.common.util.BeanCopyUtils; import com.jero.common.util.oConvertUtils; +import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion; +import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanOpinionService; +import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanService; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectDelay; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectRectifyPlan; @@ -31,6 +34,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jetbrains.annotations.NotNull; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.servlet.ModelAndView; @@ -75,6 +79,12 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl queryPageList(ESQueryCommonDTO esInspect, Integer pageNo, Integer pageSize) { IPage page = new Page<>(pageNo, pageSize); @@ -351,6 +361,11 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl processEsInspectPlanOpinionList = processEsInspectPlanOpinionService.findLastByGroup(enterpriseStandardInspectVo.getProcessEsInspectPlanId()); + if (CollectionUtils.isNotEmpty(processEsInspectPlanOpinionList)){ + enterpriseStandardInspectVo.setProcessEsInspectPlanOpinionList(processEsInspectPlanOpinionList); + } } }