diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/dao/ProjectGeneralDao.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/dao/ProjectGeneralDao.java index c6ddcc3..a43336c 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/basic/dao/ProjectGeneralDao.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/dao/ProjectGeneralDao.java @@ -35,4 +35,6 @@ public interface ProjectGeneralDao { int getProCount(@Param("params") Map params); /** 专业工程查询页面 */ List getProList(@Param("params") Map params, @Param("offset") Integer offset, @Param("limit") Integer limit); + + ProjectGeneralBean getGeneralInfoByName(String name); } diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ProjectBean.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ProjectBean.java index fb5f6d2..cf1d5d7 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ProjectBean.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/entity/ProjectBean.java @@ -103,6 +103,7 @@ public class ProjectBean { /** * 总工程名称 */ + @Excel(name = "总包工程") private String proGeneralName; } diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/service/ProjectServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/service/ProjectServiceImpl.java index 008c57b..d339804 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/basic/service/ProjectServiceImpl.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/service/ProjectServiceImpl.java @@ -2,7 +2,9 @@ package com.bonus.bmw.basic.service; import com.bonus.bmw.basic.dao.CompanyDao; import com.bonus.bmw.basic.dao.ProjectDao; +import com.bonus.bmw.basic.dao.ProjectGeneralDao; import com.bonus.bmw.basic.entity.ProjectBean; +import com.bonus.bmw.basic.entity.ProjectGeneralBean; import com.bonus.common.core.utils.StringUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -21,6 +23,8 @@ public class ProjectServiceImpl implements ProjectService { private final CompanyDao companyDao; + private final ProjectGeneralDao projectGeneralDao; + @Override public String importData(List list) { if (list.size()>0){ @@ -49,6 +53,8 @@ public class ProjectServiceImpl implements ProjectService { return "第" + (i+1) + "行业主姓名为空,导入失败"; }else if (StringUtils.isEmpty(bean.getCompanyName())){ return "第" + (i+1) + "行公司名称为空,导入失败"; + }else if (StringUtils.isBlank(bean.getProGeneralName())){ + return "第" + (i+1) + "行总包工程为空,导入失败"; } switch (bean.getProStatus()){ @@ -89,6 +95,13 @@ public class ProjectServiceImpl implements ProjectService { return "第" + (i+1) + "行,对应的业主姓名不存在,导入失败"; } + ProjectGeneralBean projectGeneralBean = projectGeneralDao.getGeneralInfoByName(bean.getProGeneralName().trim()); + if (projectGeneralBean != null){ + list.get(i).setProGeneralId(projectGeneralBean.getProGeneralId()); + }else{ + return "第" + (i+1) + "行,对应的总包工程不存在,导入失败"; + } + } int result = projectDao.importData(list); return result > 0 ? "成功导入" + result + "条数据,保存成功" : "导入失败" ; diff --git a/modules/bmw/src/main/resources/mapper/basic/ProjectGeneralMapper.xml b/modules/bmw/src/main/resources/mapper/basic/ProjectGeneralMapper.xml index 69f9475..43451b5 100644 --- a/modules/bmw/src/main/resources/mapper/basic/ProjectGeneralMapper.xml +++ b/modules/bmw/src/main/resources/mapper/basic/ProjectGeneralMapper.xml @@ -107,4 +107,8 @@ AND bpg.id = #{params.proGeneralId} ) aa + + \ No newline at end of file diff --git a/modules/bmw/src/main/resources/mapper/basic/ProjectMapper.xml b/modules/bmw/src/main/resources/mapper/basic/ProjectMapper.xml index 0ad04c3..ca68d51 100644 --- a/modules/bmw/src/main/resources/mapper/basic/ProjectMapper.xml +++ b/modules/bmw/src/main/resources/mapper/basic/ProjectMapper.xml @@ -12,13 +12,13 @@ - INSERT INTO `bm_project`( `name`, `abbreviation`, `pro_type`, + INSERT INTO `bm_project`( `project_general_id`, `name`, `abbreviation`, `pro_type`, `company_id`, `owner_id`, `power_grid`, `project_address`, `lon`, `lat`, `pro_status`, `plan_start_time`, `plan_stop_time`, `create_time`, `update_time`, `is_active`) VALUES ( - #{item.name},#{item.abbreviation},#{item.proType},#{item.companyId},#{item.ownerId}, + #{item.proGeneralId}, #{item.name},#{item.abbreviation},#{item.proType},#{item.companyId},#{item.ownerId}, #{item.powerGrid},#{item.projectAddress},#{item.lon},#{item.lat}, #{item.proStatusCode},#{item.planStartTime},#{item.planStopTime},now(),now(),'1' ) diff --git a/modules/bmw/src/main/resources/static/downloads/工程信息导入模板.xlsx b/modules/bmw/src/main/resources/static/downloads/工程信息导入模板.xlsx index a02f3bb..3305eda 100644 Binary files a/modules/bmw/src/main/resources/static/downloads/工程信息导入模板.xlsx and b/modules/bmw/src/main/resources/static/downloads/工程信息导入模板.xlsx differ