diff --git a/bonus-modules/bonus-smart-site/src/main/java/com/bonus/smartsite/basic/domain/BmProject.java b/bonus-modules/bonus-smart-site/src/main/java/com/bonus/smartsite/basic/domain/BmProject.java index 24ec48a..0fcbc9d 100644 --- a/bonus-modules/bonus-smart-site/src/main/java/com/bonus/smartsite/basic/domain/BmProject.java +++ b/bonus-modules/bonus-smart-site/src/main/java/com/bonus/smartsite/basic/domain/BmProject.java @@ -60,6 +60,16 @@ public class BmProject extends BaseEntity { @Excel(name = "项目状态", readConverterExp = "0=筹建,1=在建,2=部分投运,3=投运,4=停工") private String projectStatus; + /** 项目规模 */ + @Excel(name = "项目规模") + @ApiModelProperty(value = "项目规模") + private String projectScale; + + /** 项目负责人 */ + @Excel(name = "项目负责人") + @ApiModelProperty(value = "项目负责人") + private String projectManager; + /** 地址 */ @Excel(name = "地址") @ApiModelProperty(value = "地址") diff --git a/bonus-modules/bonus-smart-site/src/main/java/com/bonus/smartsite/basic/service/impl/BmProjectLotServiceImpl.java b/bonus-modules/bonus-smart-site/src/main/java/com/bonus/smartsite/basic/service/impl/BmProjectLotServiceImpl.java index 2a24ba3..f67db1b 100644 --- a/bonus-modules/bonus-smart-site/src/main/java/com/bonus/smartsite/basic/service/impl/BmProjectLotServiceImpl.java +++ b/bonus-modules/bonus-smart-site/src/main/java/com/bonus/smartsite/basic/service/impl/BmProjectLotServiceImpl.java @@ -3,6 +3,7 @@ package com.bonus.smartsite.basic.service.impl; import java.util.List; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.smartsite.basic.mapper.BmProjectLotMapper; @@ -39,6 +40,7 @@ public class BmProjectLotServiceImpl implements IBmProjectLotService { */ @Override public List selectBmProjectLotList(BmProjectLot bmProjectLot) { + bmProjectLot.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); return bmProjectLotMapper.selectBmProjectLotList(bmProjectLot); } @@ -51,6 +53,7 @@ public class BmProjectLotServiceImpl implements IBmProjectLotService { @Override public int insertBmProjectLot(BmProjectLot bmProjectLot) { bmProjectLot.setCreateTime(DateUtils.getNowDate()); + bmProjectLot.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); try { return bmProjectLotMapper.insertBmProjectLot(bmProjectLot); } catch (Exception e) { diff --git a/bonus-modules/bonus-smart-site/src/main/java/com/bonus/smartsite/basic/service/impl/BmProjectServiceImpl.java b/bonus-modules/bonus-smart-site/src/main/java/com/bonus/smartsite/basic/service/impl/BmProjectServiceImpl.java index af801c9..3cf8117 100644 --- a/bonus-modules/bonus-smart-site/src/main/java/com/bonus/smartsite/basic/service/impl/BmProjectServiceImpl.java +++ b/bonus-modules/bonus-smart-site/src/main/java/com/bonus/smartsite/basic/service/impl/BmProjectServiceImpl.java @@ -1,8 +1,10 @@ package com.bonus.smartsite.basic.service.impl; +import java.security.SecureRandom; import java.util.List; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.smartsite.basic.mapper.BmProjectMapper; @@ -39,6 +41,7 @@ public class BmProjectServiceImpl implements IBmProjectService { */ @Override public List selectBmProjectList(BmProject bmProject) { + bmProject.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); return bmProjectMapper.selectBmProjectList(bmProject); } @@ -51,6 +54,7 @@ public class BmProjectServiceImpl implements IBmProjectService { @Override public int insertBmProject(BmProject bmProject) { bmProject.setCreateTime(DateUtils.getNowDate()); + bmProject.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); try { return bmProjectMapper.insertBmProject(bmProject); } catch (Exception e) { diff --git a/bonus-modules/bonus-smart-site/src/main/resources/mapper/smartsite/basic/BmProjectMapper.xml b/bonus-modules/bonus-smart-site/src/main/resources/mapper/smartsite/basic/BmProjectMapper.xml index 1f1b861..28f173e 100644 --- a/bonus-modules/bonus-smart-site/src/main/resources/mapper/smartsite/basic/BmProjectMapper.xml +++ b/bonus-modules/bonus-smart-site/src/main/resources/mapper/smartsite/basic/BmProjectMapper.xml @@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -22,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select project_id, project_name, plan_start_time, plan_end_time, project_amount, company_id, owner_unit, project_status, address, del_flag, create_by, create_time, update_by, update_time, remark from bm_project + select project_id, project_name, plan_start_time, plan_end_time, project_amount, company_id, owner_unit, project_status, project_scale, project_manager, address, del_flag, create_by, create_time, update_by, update_time, remark from bm_project @@ -54,6 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" company_id, owner_unit, project_status, + project_scale, + project_manager, address, del_flag, create_by, @@ -70,6 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{companyId}, #{ownerUnit}, #{projectStatus}, + #{projectScale}, + #{projectManager}, #{address}, #{delFlag}, #{createBy}, @@ -90,6 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" company_id = #{companyId}, owner_unit = #{ownerUnit}, project_status = #{projectStatus}, + project_scale = #{projectScale}, + project_manager = #{projectManager}, address = #{address}, del_flag = #{delFlag}, create_by = #{createBy},