临时提交

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/IProcessEsInspectPlanOpinionService.java

@@ -82,7 +82,7 @@ public interface IProcessEsInspectPlanOpinionService extends IService<ProcessEsI
 
 	/**
 	 * 标准化组-根据账号分组查最新
-	 * @param id
+	 * @param inspectPlanId
 	 * @return
 	 */
 	List<ProcessEsInspectPlanOpinion> findLastByGroup(String inspectPlanId);

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);
             // 计划稽查对象

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java

@@ -58,18 +58,18 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 
 	private final ProcessEsInspectPlanMapper processEsInspectPlanMapper;
 	private final ILawsEnterpriseStandardService lawsEnterpriseStandardService;
-	private final IProcessEsInspectPlanOpinionService iProcessEsInspectPlanOpinionService;
+	private final IProcessEsInspectPlanOpinionService processEsInspectPlanOpinionService;
 	private final ISysUserService sysUserService;
 	private final ISysDepartService sysDepartService;
 
 	public ProcessEsInspectPlanServiceImpl(ProcessEsInspectPlanMapper processEsInspectPlanMapper,
 										   ILawsEnterpriseStandardService lawsEnterpriseStandardService,
-										   IProcessEsInspectPlanOpinionService iProcessEsInspectPlanOpinionService,
+										   IProcessEsInspectPlanOpinionService processEsInspectPlanOpinionService,
 										   ISysUserService sysUserService,
 										   ISysDepartService sysDepartService) {
 		this.processEsInspectPlanMapper = processEsInspectPlanMapper;
 		this.lawsEnterpriseStandardService = lawsEnterpriseStandardService;
-		this.iProcessEsInspectPlanOpinionService = iProcessEsInspectPlanOpinionService;
+		this.processEsInspectPlanOpinionService = processEsInspectPlanOpinionService;
 		this.sysUserService = sysUserService;
 		this.sysDepartService = sysDepartService;
 	}
@@ -111,7 +111,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl<ProcessEsInspec
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		for (ProcessEsInspectPlan processEsInspectPlan : list) {
 			// 意见
-			List<ProcessEsInspectPlanOpinion> opinionList = iProcessEsInspectPlanOpinionService.findLastByGroup(processEsInspectPlan.getId());
+			List<ProcessEsInspectPlanOpinion> opinionList = processEsInspectPlanOpinionService.findLastByGroup(processEsInspectPlan.getId());
 			for (ProcessEsInspectPlanOpinion processEsInspectPlanOpinion : opinionList) {
 				if (loginUser.getUsername().equals(processEsInspectPlanOpinion.getCreateBy())){
 					processEsInspectPlan.setProcessEsInspectPlanOpinion(processEsInspectPlanOpinion);

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;
 }

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<EnterpriseStandardInspectRectifyPlan> enterpriseStandardInspectRectifyPlanList = Collections.emptyList();
 
+    /**
+     * 企标稽查计划id
+     */
+    @ApiModelProperty(value = "企标稽查计划id")
+    private String processEsInspectPlanId;
+
+    /**意见*/
+    @ApiModelProperty(value = "意见")
+    @TableField(exist = false)
+    private List<ProcessEsInspectPlanOpinion> processEsInspectPlanOpinionList;
+
     //=================================
     /**
      * ids 查询用

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,

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<Enterprise
     @Resource
     private EnterpriseStandardInspectDelayService enterpriseStandardInspectDelayService;
 
+    @Autowired
+    private IProcessEsInspectPlanOpinionService processEsInspectPlanOpinionService;
+
+    @Autowired
+    private IProcessEsInspectPlanService processEsInspectPlanService;
+
     @Override
     public IPage<EnterpriseStandardInspectVo> queryPageList(ESQueryCommonDTO esInspect, Integer pageNo, Integer pageSize) {
         IPage<EnterpriseStandardInspectVo> page = new Page<>(pageNo, pageSize);
@@ -351,6 +361,11 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
             enterpriseStandardInspectVo.setInspectUserDictText(sysUserService.dictByIdsOrUserNames(enterpriseStandardInspectVo.getInspectUser(), ""));
             enterpriseStandardInspectVo.setStandardizationDockingUserDictText(sysUserService.dictByIdsOrUserNames(enterpriseStandardInspectVo.getStandardizationDockingUser(), ""));
             enterpriseStandardInspectVo.setActualInspectUserDictText(sysUserService.dictByIdsOrUserNames(enterpriseStandardInspectVo.getActualInspectUser(), ""));
+            // 意见
+            List<ProcessEsInspectPlanOpinion> processEsInspectPlanOpinionList = processEsInspectPlanOpinionService.findLastByGroup(enterpriseStandardInspectVo.getProcessEsInspectPlanId());
+            if (CollectionUtils.isNotEmpty(processEsInspectPlanOpinionList)){
+                enterpriseStandardInspectVo.setProcessEsInspectPlanOpinionList(processEsInspectPlanOpinionList);
+            }
         }
     }