From a8fe40f59b5d4f0ecebdcf3793471b61445c91f7 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 23 Apr 2024 00:06:32 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SystemUserController.java | 2 + .../modules/basicdata/entity/BaseAction.java | 5 +- .../basicdata/mapper/xml/SystemUserMapper.xml | 6 + ...erousEngineeringControlItemController.java | 2 +- .../DangerousEngineeringRecordController.java | 34 ++-- .../DangerousEngineeringControlItem.java | 4 +- .../entity/DangerousEngineeringRecord.java | 29 ++-- ...angerousEngineeringTypeControlContent.java | 6 +- ...angerousEngineeringTypeDescribeMapper.java | 4 +- ...ousEngineeringChooseTypeDescribeMapper.xml | 3 +- .../xml/DangerousEngineeringRecordMapper.xml | 9 +- ...ousEngineeringTypeControlContentMapper.xml | 3 +- ...DangerousEngineeringTypeDescribeMapper.xml | 12 +- .../IDangerousEngineeringRecordService.java | 3 + ...DangerousEngineeringRecordServiceImpl.java | 150 +++++++++++------- .../worker/mapper/EnterpriseInfoMapper.java | 2 +- .../worker/mapper/xml/WorkerInfoMapper.xml | 18 ++- .../mapper/xml/WorkerSafeEducationMapper.xml | 4 + .../service/impl/WorkerInfoServiceImpl.java | 14 ++ .../controller/XzTaskProgressController.java | 20 +-- .../xz/mapper/xml/XzTaskProgressMapper.xml | 21 ++- ...SupplierQualificationApplyServiceImpl.java | 4 +- .../service/impl/XzSupplierServiceImpl.java | 3 +- .../impl/XzTaskProgressServiceImpl.java | 21 ++- .../zhgd/xmgl/security/WebSecurityConfig.java | 1 + 25 files changed, 250 insertions(+), 130 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java index 92a88b817..15d5a3b60 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java @@ -163,6 +163,8 @@ public class SystemUserController { @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", required = true, value = "项目SN", paramType = "body"), @ApiImplicitParam(name = "workerName", required = false, value = "姓名", paramType = "body"), + @ApiImplicitParam(name = "workerId", required = false, value = "劳务人员id", paramType = "body"), + @ApiImplicitParam(name = "enterpriseId", required = false, value = "企业id", paramType = "body"), }) @PostMapping(value = "/getProjectChilderSystemUserList") public Result> getProjectChilderSystemUserList(@RequestBody Map map) { diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseAction.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseAction.java index 206a272d8..5b24a0304 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseAction.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseAction.java @@ -24,8 +24,8 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(value="BaseAction实体类",description="BaseAction") public class BaseAction implements Serializable { private static final long serialVersionUID = 1L; - - /**资源ID*/ + + /**资源ID*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="资源ID") private java.lang.Long actionId ; @@ -43,7 +43,6 @@ public class BaseAction implements Serializable { private java.lang.String actionDesc ; /**资源父节点(所属菜单)*/ @Excel(name = "资源父节点(所属菜单)", width = 15) - @ApiModelProperty(value="资源父节点(所属菜单)") private java.lang.Long menuId ; /**优先级 越小越靠前*/ diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml index 5383ff41c..0943baac3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml @@ -20,6 +20,12 @@ and d.worker_name like CONCAT(CONCAT('%', #{workerName}), '%') + + and d.id = #{workerId} + + + and d.enterprise_id = #{enterpriseId} + - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringRecordMapper.xml index 64dcd6802..858c85763 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringRecordMapper.xml @@ -7,16 +7,19 @@ (case when a.build_end_time is not null and a.build_end_time!='' and a.build_end_time <DATE_FORMAT(now(),"%Y-%m-%d") then 3 when a.build_end_time is not null and a.build_end_time!='' and a.build_start_time is not null and a.build_start_time!='' and a.build_end_time >=DATE_FORMAT(now(),"%Y-%m-%d") and a.build_start_time <=DATE_FORMAT(now(),"%Y-%m-%d") then 2 - else 1 END) engineering_state + else 1 END) engineering_state from dangerous_engineering_record a LEFT JOIN (SELECT engineering_id,COUNT(1) hidden_danger_num from hidden_danger_inspection_record WHERE project_sn=#{param.projectSn} AND `status` in (2,3) AND engineering_id is not NULL GROUP BY engineering_id) tp ON a.id=tp.engineering_id WHERE a.project_sn=#{param.projectSn} - + and a.engineering_name like CONCAT(CONCAT('%',#{param.engineeringName}),'%') + + and a.person_liable_id = #{param.personLiableId} + order by a.create_time desc - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringTypeControlContentMapper.xml b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringTypeControlContentMapper.xml index bbf5228f3..0c99a8215 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringTypeControlContentMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringTypeControlContentMapper.xml @@ -38,6 +38,5 @@ SELECT b.* from dangerous_engineering_type_describe_control a INNER JOIN dangerous_engineering_type_control_content b ON a.control_id=b.id WHERE a.describe_id=#{describeId} - - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringTypeDescribeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringTypeDescribeMapper.xml index 507e2f329..0ddc90e46 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringTypeDescribeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringTypeDescribeMapper.xml @@ -9,10 +9,18 @@ ORDER BY a.type_id - SELECT a.id,a.describe_name,a.type_id,a.danger_type,b.type_name from dangerous_engineering_type_describe a INNER JOIN dangerous_engineering_type b ON a.type_id=b.id WHERE a.type_id=#{typeId} ORDER BY a.type_id - \ No newline at end of file + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringRecordService.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringRecordService.java index 30bbde2e6..851eaba3e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringRecordService.java @@ -21,4 +21,7 @@ public interface IDangerousEngineeringRecordService extends IService paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java index 02c7183f1..cf40dd0c0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java @@ -1,21 +1,23 @@ package com.zhgd.xmgl.modules.dangerous.service.impl; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl; import com.zhgd.xmgl.modules.dangerous.entity.*; -import com.zhgd.xmgl.modules.dangerous.mapper.DangerousEngineeringChooseTypeDescribeMapper; -import com.zhgd.xmgl.modules.dangerous.mapper.DangerousEngineeringProgressRecordMapper; -import com.zhgd.xmgl.modules.dangerous.mapper.DangerousEngineeringRecordMapper; -import com.zhgd.xmgl.modules.dangerous.mapper.DangerousEngineeringTypeControlContentMapper; +import com.zhgd.xmgl.modules.dangerous.mapper.*; import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringControlItemService; import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringRecordService; import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper; +import com.zhgd.xmgl.security.util.SecurityUtils; +import com.zhgd.xmgl.util.MessageUtil; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; import java.util.*; @@ -23,12 +25,14 @@ import java.util.*; /** * @Description: 现场危大工程 * @author： pds - * @date： 2021-06-28 + * @date： 2021-06-28 * @version： V1.0 */ @Service @Transactional(rollbackFor = Exception.class) public class DangerousEngineeringRecordServiceImpl extends ServiceImpl implements IDangerousEngineeringRecordService { + @Autowired + private DangerousEngineeringAcceptanceCheckMapper dangerousEngineeringAcceptanceCheckMapper; @Autowired private DangerousEngineeringRecordMapper dangerousEngineeringRecordMapper; @Autowired @@ -41,35 +45,33 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl queryDangerousEngineeringPageList(Map map) { int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString()); Page page = new Page<>(pageNo, pageSize); - List list=dangerousEngineeringRecordMapper.queryDangerousEngineeringPageList(page, map); - if(list.size()>0){ - for(EntityMap data:list){ - /*String responsibilityCompany= MapUtils.getString(data,"responsibilityCompany"); - StringBuilder stringBuilder=new StringBuilder(); - if(StringUtils.isNotEmpty(responsibilityCompany)){ - for (String enterpriseId:responsibilityCompany.split(",")){ - EnterpriseInfo info=enterpriseInfoMapper.selectById(enterpriseId); - if(info!=null) { - if (stringBuilder.length() > 0) { - stringBuilder.append(","); - } - stringBuilder.append(info.getEnterpriseName()); - } - } - } - data.put("responsibility_company_name",stringBuilder.toString());*/ - List chooseTypeDescribeList=dangerousEngineeringChooseTypeDescribeMapper.getChooseTypeDescribeList(MapUtils.getString(data,"id")); - data.put("choose_type_describe_list",chooseTypeDescribeList); - Map count=dangerousEngineeringControlItemService.selectEngineeringControlItemCount(MapUtils.getString(data,"id")); - data.put("control_item_count",count); - DangerousEngineeringProgressRecord progressRecord=dangerousEngineeringProgressRecordMapper.selectNewestEngineeringProgressRecord(MapUtils.getString(data,"id")); - data.put("progressRecord",progressRecord); + if (systemUserService.isSubProject()) { + map.put("personLiableId", SecurityUtils.getUser().getUserId()); + } + List list = dangerousEngineeringRecordMapper.queryDangerousEngineeringPageList(page, map); + if (list.size() > 0) { + for (EntityMap data : list) { + String id = MapUtils.getString(data, "id"); + List chooseTypeDescribeList = dangerousEngineeringChooseTypeDescribeMapper.getChooseTypeDescribeList(id); + data.put("choose_type_describe_list", chooseTypeDescribeList); + Map count = dangerousEngineeringControlItemService.selectEngineeringControlItemCount(id); + data.put("control_item_count", count); + DangerousEngineeringProgressRecord progressRecord = dangerousEngineeringProgressRecordMapper.selectNewestEngineeringProgressRecord(id); + data.put("progressRecord", progressRecord); + Boolean isSuperDanger = dangerousEngineeringTypeDescribeMapper.isSuperDangerByEngineeringId(id); + data.put("isSuperDanger", isSuperDanger); } } return page.setRecords(list); @@ -77,24 +79,10 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl map) { - EntityMap data=dangerousEngineeringRecordMapper.getDangerousEngineeringById(map); - if (data!=null){ - /*String responsibilityCompany= MapUtils.getString(data,"responsibilityCompany"); - StringBuilder stringBuilder=new StringBuilder(); - if(StringUtils.isNotEmpty(responsibilityCompany)){ - for (String enterpriseId:responsibilityCompany.split(",")){ - EnterpriseInfo info=enterpriseInfoMapper.selectById(enterpriseId); - if(info!=null) { - if (stringBuilder.length() > 0) { - stringBuilder.append(","); - } - stringBuilder.append(info.getEnterpriseName()); - } - } - } - data.put("responsibility_company_name",stringBuilder.toString());*/ - List chooseTypeDescribeList=dangerousEngineeringChooseTypeDescribeMapper.getChooseTypeDescribeList(MapUtils.getString(data,"id")); - data.put("choose_type_describe_list",chooseTypeDescribeList); + EntityMap data = dangerousEngineeringRecordMapper.getDangerousEngineeringById(map); + if (data != null) { + List chooseTypeDescribeList = dangerousEngineeringChooseTypeDescribeMapper.getChooseTypeDescribeList(MapUtils.getString(data, "id")); + data.put("choose_type_describe_list", chooseTypeDescribeList); } return data; } @@ -103,21 +91,31 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl0){ - for (DangerousEngineeringChooseTypeDescribe typeDescribe:dangerousEngineeringRecord.getTypeDescribeList()){ - typeDescribe.setEngineeringId(dangerousEngineeringRecord.getId()); + replaceTypeDescribeAndControllerContent(dangerousEngineeringRecord); + } + + private void replaceTypeDescribeAndControllerContent(DangerousEngineeringRecord dangerousEngineeringRecord) { + Long id = dangerousEngineeringRecord.getId(); + dangerousEngineeringChooseTypeDescribeMapper.delete(new LambdaQueryWrapper() + .eq(DangerousEngineeringChooseTypeDescribe::getEngineeringId, id) + ); + if (dangerousEngineeringRecord.getTypeDescribeList() != null && dangerousEngineeringRecord.getTypeDescribeList().size() > 0) { + for (DangerousEngineeringChooseTypeDescribe typeDescribe : dangerousEngineeringRecord.getTypeDescribeList()) { + typeDescribe.setEngineeringId(id); dangerousEngineeringChooseTypeDescribeMapper.insert(typeDescribe); } } + dangerousEngineeringControlItemMapper.delete(new LambdaQueryWrapper() + .eq(DangerousEngineeringControlItem::getEngineeringId, id)); //保存管控要点 - if(dangerousEngineeringRecord.getControlItemList()!=null&&dangerousEngineeringRecord.getControlItemList().size()>0){ - Map param=new HashMap<>(); - param.put("list",dangerousEngineeringRecord.getControlItemList()); - List list=dangerousEngineeringTypeControlContentMapper.selectUserCheckControlContentList(param); - List itemList=new ArrayList<>(); - for (DangerousEngineeringTypeControlContent content:list){ - DangerousEngineeringControlItem item=new DangerousEngineeringControlItem(); - item.setEngineeringId(dangerousEngineeringRecord.getId()); + if (dangerousEngineeringRecord.getControlItemList() != null && dangerousEngineeringRecord.getControlItemList().size() > 0) { + Map param = new HashMap<>(); + param.put("list", dangerousEngineeringRecord.getControlItemList()); + List list = dangerousEngineeringTypeControlContentMapper.selectUserCheckControlContentList(param); + List itemList = new ArrayList<>(); + for (DangerousEngineeringTypeControlContent content : list) { + DangerousEngineeringControlItem item = new DangerousEngineeringControlItem(); + item.setEngineeringId(id); item.setControlTypeName(content.getControlTypeName()); item.setControlContent(content.getControlContent()); item.setControlId(content.getId()); @@ -128,4 +126,38 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl paramMap) { + Long id = MapUtils.getLong(paramMap, "id"); + paramMap.put("engineeringId", id); + EntityMap data = dangerousEngineeringRecordMapper.getDangerousEngineeringById(paramMap); + Integer hiddenDangerNum = MapUtils.getInteger(data, "hiddenDangerNum"); + if (hiddenDangerNum > 0) { + throw new OpenAlertException("当前存在未销隐患"); + } + List list = dangerousEngineeringAcceptanceCheckMapper.selectAcceptanceCheckList(paramMap); + if (CollUtil.isNotEmpty(list)) { + EntityMap entityMap = list.get(list.size() - 1); + Integer acceptanceResult = MapUtils.getInteger(entityMap, "acceptanceResult"); + if (!Objects.equals(acceptanceResult, 1)) { + throw new OpenAlertException("当前验收未合格"); + } + } + DangerousEngineeringRecord record = new DangerousEngineeringRecord(); + record.setId(id); + record.setIsEnd(1); + baseMapper.updateById(record); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/EnterpriseInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/EnterpriseInfoMapper.java index c43fcb51d..6c1537098 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/EnterpriseInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/EnterpriseInfoMapper.java @@ -42,7 +42,7 @@ public interface EnterpriseInfoMapper extends BaseMapper { IPage getXzSupplierPage(@Param("map") Map map, @Param("page") Page qp); - EnterpriseInfo getXzSupplierByUserId(Map map); + EnterpriseInfo getXzSupplierByUserId(Long userId); EnterpriseInfo getXzSupplierBySocialCode(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml index b325e59ba..3badf0448 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml @@ -428,6 +428,10 @@ #{item} + + AND (w1.enterprise_id = #{supplierEnterpriseId} OR w1.enterprise_id IN ( SELECT t.enterprise_id FROM + project_enterprise t WHERE find_in_set(#{projectEnterpriseId}, ancestors) )) + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java index c0754bac2..789ad18d9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java @@ -172,9 +172,7 @@ public class XzSupplierQualificationApplyServiceImpl extends ServiceImpl eiMap = new HashMap<>(); - eiMap.put("userId", applyUserId); - EnterpriseInfo ei = enterpriseInfoMapper.getXzSupplierByUserId(eiMap); + EnterpriseInfo ei = enterpriseInfoMapper.getXzSupplierByUserId(applyUserId); if (ei == null) { throw new OpenAlertException("请先填写供应商信息"); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierServiceImpl.java index a3b020d78..647b15073 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierServiceImpl.java @@ -89,7 +89,8 @@ public class XzSupplierServiceImpl extends ServiceImpl map) { - return enterpriseInfoMapper.getXzSupplierByUserId(map); + Long userId = MapUtils.getLong(map, "userId"); + return enterpriseInfoMapper.getXzSupplierByUserId(userId); } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java index 19f6cc6ae..861dc59af 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java @@ -19,12 +19,15 @@ import com.zhgd.xmgl.enums.ParamEnum; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.basicdata.service.UploadFileService; +import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl; import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialRel; import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialRelPlan; import com.zhgd.xmgl.modules.taskprogress.mapper.TaskProgressMapper; import com.zhgd.xmgl.modules.taskprogress.mapper.TaskProgressMaterialRelMapper; import com.zhgd.xmgl.modules.taskprogress.mapper.TaskProgressMaterialRelPlanMapper; import com.zhgd.xmgl.modules.taskprogress.service.ITaskProgressService; +import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo; +import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper; import com.zhgd.xmgl.modules.xz.entity.XzTaskProgress; import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressAlarm; import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent; @@ -70,6 +73,12 @@ import java.util.stream.Collectors; @Transactional(rollbackFor = Exception.class) @Slf4j public class XzTaskProgressServiceImpl extends ServiceImpl implements IXzTaskProgressService { + @Autowired + private XzSupplierQualificationApplyServiceImpl xzSupplierQualificationApplyService; + @Autowired + private EnterpriseInfoMapper enterpriseInfoMapper; + @Autowired + private SystemUserServiceImpl systemUserService; @Value("${basePath}") private String basePath; @Autowired @@ -495,11 +504,19 @@ public class XzTaskProgressServiceImpl extends ServiceImpl