From 154fb456588db57692c4f35e6d072d88dde262c5 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 18 Apr 2025 13:55:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/BmProjectController.java | 56 ++--- .../bonus/base/basic/domain/BmProject.java | 101 +++++++-- .../base/basic/mapper/BmProjectMapper.java | 54 ++--- .../base/basic/service/IBmProjectService.java | 20 +- .../service/impl/BmProjectServiceImpl.java | 107 ++++++--- .../service/impl/ProDepartServiceImpl.java | 2 +- .../mapper/base/basic/BmProjectMapper.xml | 211 ++++++++++-------- .../smartsite/basic/ProDepartMapper.xml | 4 +- 8 files changed, 345 insertions(+), 210 deletions(-) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/BmProjectController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/BmProjectController.java index 2195545..24b1020 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/BmProjectController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/BmProjectController.java @@ -39,7 +39,7 @@ public class BmProjectController extends BaseController { * 查询工程项目管理列表 */ @ApiOperation(value = "查询工程项目管理列表") - @RequiresPermissions("basic:project:list") +// @RequiresPermissions("basic:project:list") @GetMapping("/list") public TableDataInfo list(BmProject bmProject) { startPage(); @@ -65,54 +65,46 @@ public class BmProjectController extends BaseController { * 获取工程项目管理详细信息 */ @ApiOperation(value = "获取工程项目管理详细信息") - @RequiresPermissions("basic:project:query") - @GetMapping(value = "/{projectId}") - public AjaxResult getInfo(@PathVariable("projectId") Long projectId) { - return success(bmProjectService.selectBmProjectByProjectId(projectId)); +// @RequiresPermissions("basic:project:query") + @GetMapping(value = "getDetailById") + public AjaxResult getDetailById(BmProject bmProject) { + return bmProjectService.selectBmProjectByProjectId(bmProject); } /** * 新增工程项目管理 */ - @ApiOperation(value = "新增工程项目管理") - @PreventRepeatSubmit - @RequiresPermissions("basic:project:add") - @SysLog(title = "工程项目管理", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增工程项目管理") - @PostMapping + @ApiOperation(value = "新增项目管理") +// @PreventRepeatSubmit +// @RequiresPermissions("basic:project:add") + @SysLog(title = "项目管理", businessType = OperaType.INSERT, logType = 1,module = "项目管理->新增项目") + @PostMapping("addProject") public AjaxResult add(@RequestBody BmProject bmProject) { - try { - return toAjax(bmProjectService.insertBmProject(bmProject)); - } catch (Exception e) { - return error("系统错误, " + e.getMessage()); - } + return bmProjectService.insertBmProject(bmProject); } /** * 修改工程项目管理 */ - @ApiOperation(value = "修改工程项目管理") - @PreventRepeatSubmit - @RequiresPermissions("basic:project:edit") - @SysLog(title = "工程项目管理", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改工程项目管理") - @PostMapping("/edit") + @ApiOperation(value = "修改项目") +// @PreventRepeatSubmit +// @RequiresPermissions("basic:project:edit") + @SysLog(title = "项目管理", businessType = OperaType.UPDATE, logType = 1,module = "项目管理->修改项目") + @PostMapping("/editProject") public AjaxResult edit(@RequestBody BmProject bmProject) { - try { - return toAjax(bmProjectService.updateBmProject(bmProject)); - } catch (Exception e) { - return error("系统错误, " + e.getMessage()); - } + return bmProjectService.updateBmProject(bmProject); } /** * 删除工程项目管理 */ - @ApiOperation(value = "删除工程项目管理") - @PreventRepeatSubmit - @RequiresPermissions("basic:project:remove") - @SysLog(title = "工程项目管理", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除工程项目管理") - @PostMapping("/del/{projectIds}") - public AjaxResult remove(@PathVariable Long[] projectIds) { - return toAjax(bmProjectService.deleteBmProjectByProjectIds(projectIds)); + @ApiOperation(value = "删除项目") +// @PreventRepeatSubmit +// @RequiresPermissions("basic:project:remove") + @SysLog(title = "项目管理", businessType = OperaType.DELETE, logType = 1,module = "项目管理->删除项目") + @PostMapping("/delProject") + public AjaxResult remove(@RequestBody BmProject bmProject) { + return bmProjectService.deleteBmProjectByProjectIds(bmProject); } /** diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/BmProject.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/BmProject.java index b23c82a..334024b 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/BmProject.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/BmProject.java @@ -2,16 +2,25 @@ package com.bonus.base.basic.domain; import java.math.BigDecimal; import java.util.Date; + +import com.bonus.base.basic.domain.vo.ProDepartVo; +import com.bonus.base.basic.domain.vo.UnitVo; import com.fasterxml.jackson.annotation.JsonFormat; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; /** * 工程项目管理对象 bm_project - * + * * @author xsheng * @date 2025-01-09 */ @@ -22,61 +31,123 @@ import com.bonus.common.core.web.domain.BaseEntity; public class BmProject extends BaseEntity { private static final long serialVersionUID = 1L; - /** 主键,工程ID */ + /**关键字*/ + private String keyWord; + + /** + * 主键,工程ID + */ + @NotNull(message = "id不能为空", groups = {Edit.class, Del.class}) private Long projectId; - /** 工程项目名称 */ - @Excel(name = "工程项目名称") - @ApiModelProperty(value = "工程项目名称") + /** + * 项目名称 + */ + @Excel(name = "项目名称") + @ApiModelProperty(value = "项目名称") + @NotBlank(message = "项目名称不能为空", groups = {Add.class, Edit.class}) + @Length(max = 255, message = "项目名称字符长度不能超过255", groups = {Add.class, Edit.class}) private String projectName; - /** 计划开工日期 */ + /** + * 计划开工日期 + */ @ApiModelProperty(value = "计划开工日期") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "计划开工日期", width = 30, dateFormat = "yyyy-MM-dd") + @NotNull(message = "计划开工日期", groups = {Add.class, Edit.class}) private Date planStartTime; - /** 计划竣工日期 */ + /** + * 计划竣工日期 + */ @ApiModelProperty(value = "计划竣工日期") @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @Excel(name = "计划竣工日期", width = 30, dateFormat = "yyyy-MM-dd") + @NotNull(message = "计划竣工日期", groups = {Add.class, Edit.class}) private Date planEndTime; - /** 项目金额（万元） */ + /** + * 项目金额（万元） + */ @Excel(name = "项目金额", readConverterExp = "万=元") private BigDecimal projectAmount; - /** 所属公司ID */ + /** + * 所属公司ID + */ @Excel(name = " 所属公司ID") @ApiModelProperty(value = " 所属公司ID") + @NotNull(message = "所属公司ID不能为空", groups = {Add.class, Edit.class}) private Long companyId; - /** 业主单位 */ + /** + * 业主单位 + */ @Excel(name = "业主单位") @ApiModelProperty(value = "业主单位") + @NotBlank(message = "业主单位不能为空", groups = {Add.class, Edit.class}) + @Length(max = 255, message = "业主单位字符长度不能超过255", groups = {Add.class, Edit.class}) private String ownerUnit; - /** 项目状态（0筹建 1在建 2部分投运 3投运 4停工） */ + /** + * 项目状态（0筹建 1在建 2部分投运 3投运 4停工） + */ @Excel(name = "项目状态", readConverterExp = "0=筹建,1=在建,2=部分投运,3=投运,4=停工") + @NotBlank(message = "项目状态不能为空", groups = {Add.class, Edit.class}) private String projectStatus; - /** 项目规模 */ + /** + * 项目规模 + */ @Excel(name = "项目规模") @ApiModelProperty(value = "项目规模") + @Length(max = 255, message = "项目规模字符长度不能超过255", groups = {Add.class, Edit.class}) private String projectScale; - /** 项目负责人 */ + /** + * 项目负责人 + */ @Excel(name = "项目负责人") @ApiModelProperty(value = "项目负责人") + @Length(max = 100, message = "项目负责人字符长度不能超过100", groups = {Add.class, Edit.class}) private String projectManager; - /** 地址 */ + /** + * 地址 + */ @Excel(name = "地址") @ApiModelProperty(value = "地址") + @Length(max = 255, message = "地址字符长度不能超过100", groups = {Add.class, Edit.class}) private String address; - /** 删除标志（0代表存在 2代表删除） */ + /** + * 删除标志（0代表存在 2代表删除） + */ private String delFlag; + /** + * 标段数量 + */ + private int bidNum; + + /** + * 新增条件限制 + */ + public interface Add { + } + + /** + * 修改条件限制 + */ + public interface Edit { + } + + /** + * 删除条件限制 + */ + public interface Del { + } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/BmProjectMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/BmProjectMapper.java index 8e1d3e2..28da129 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/BmProjectMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/BmProjectMapper.java @@ -1,60 +1,52 @@ package com.bonus.base.basic.mapper; import java.util.List; + import com.bonus.base.basic.domain.BmProject; +import org.apache.ibatis.annotations.Param; /** * 工程项目管理Mapper接口 - * + * * @author xsheng * @date 2025-01-09 */ public interface BmProjectMapper { /** * 查询工程项目管理 - * - * @param projectId 工程项目管理主键 + * + * @param bmProject 工程项目管理主键 * @return 工程项目管理 */ - public BmProject selectBmProjectByProjectId(Long projectId); + public BmProject selectBmProjectByProjectId(BmProject bmProject); /** * 查询工程项目管理列表 - * + * * @param bmProject 工程项目管理 * @return 工程项目管理集合 */ public List selectBmProjectList(BmProject bmProject); /** - * 新增工程项目管理 - * - * @param bmProject 工程项目管理 - * @return 结果 + * 校验数据是否重复 + * + * @param vo + * @param projectName + * @param columnName + * @return int + * @author cwchen + * @date 2025/4/17 16:34 */ - public int insertBmProject(BmProject bmProject); + int queryValueIsExist(@Param("params") BmProject vo,@Param("value") String projectName,@Param("columnName") String columnName); /** - * 修改工程项目管理 - * - * @param bmProject 工程项目管理 - * @return 结果 + * 新增/修改/删除项目 + * @param vo + * @param type + * @return void + * @author cwchen + * @date 2025/4/17 16:35 */ - public int updateBmProject(BmProject bmProject); - - /** - * 删除工程项目管理 - * - * @param projectId 工程项目管理主键 - * @return 结果 - */ - public int deleteBmProjectByProjectId(Long projectId); - - /** - * 批量删除工程项目管理 - * - * @param projectIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBmProjectByProjectIds(Long[] projectIds); + void addOrUpdateProject(@Param("params") BmProject vo, @Param("type") int type); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IBmProjectService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IBmProjectService.java index 368eca2..4ea81f3 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IBmProjectService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/IBmProjectService.java @@ -2,6 +2,7 @@ package com.bonus.base.basic.service; import java.util.List; import com.bonus.base.basic.domain.BmProject; +import com.bonus.common.core.web.domain.AjaxResult; /** * 工程项目管理Service接口 @@ -13,10 +14,10 @@ public interface IBmProjectService { /** * 查询工程项目管理 * - * @param projectId 工程项目管理主键 + * @param bmProject 工程项目管理主键 * @return 工程项目管理 */ - public BmProject selectBmProjectByProjectId(Long projectId); + public AjaxResult selectBmProjectByProjectId(BmProject bmProject); /** * 查询工程项目管理列表 @@ -32,7 +33,7 @@ public interface IBmProjectService { * @param bmProject 工程项目管理 * @return 结果 */ - public int insertBmProject(BmProject bmProject); + public AjaxResult insertBmProject(BmProject bmProject); /** * 修改工程项目管理 @@ -40,21 +41,14 @@ public interface IBmProjectService { * @param bmProject 工程项目管理 * @return 结果 */ - public int updateBmProject(BmProject bmProject); + public AjaxResult updateBmProject(BmProject bmProject); /** * 批量删除工程项目管理 * - * @param projectIds 需要删除的工程项目管理主键集合 + * @param bmProject 需要删除的工程项目管理主键集合 * @return 结果 */ - public int deleteBmProjectByProjectIds(Long[] projectIds); + public AjaxResult deleteBmProjectByProjectIds(BmProject bmProject); - /** - * 删除工程项目管理信息 - * - * @param projectId 工程项目管理主键 - * @return 结果 - */ - public int deleteBmProjectByProjectId(Long projectId); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/BmProjectServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/BmProjectServiceImpl.java index 1504bd4..d1c1685 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/BmProjectServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/BmProjectServiceImpl.java @@ -1,14 +1,26 @@ package com.bonus.base.basic.service.impl; import java.util.List; +import java.util.Optional; + +import com.bonus.base.basic.domain.vo.ProDepartVo; +import com.bonus.base.basic.domain.vo.UnitVo; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; +import com.bonus.common.security.utils.ValidatorsUtils; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.base.basic.mapper.BmProjectMapper; import com.bonus.base.basic.domain.BmProject; import com.bonus.base.basic.service.IBmProjectService; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; + +import javax.annotation.Resource; /** * 工程项目管理Service业务层处理 @@ -17,10 +29,15 @@ import com.bonus.base.basic.service.IBmProjectService; * @date 2025-01-09 */ @Service +@Slf4j public class BmProjectServiceImpl implements IBmProjectService { + @Autowired private BmProjectMapper bmProjectMapper; + @Resource(name = "ValidatorsUtils") + private ValidatorsUtils validatorsUtils; + /** * 查询工程项目管理 * @@ -28,8 +45,14 @@ public class BmProjectServiceImpl implements IBmProjectService { * @return 工程项目管理 */ @Override - public BmProject selectBmProjectByProjectId(Long projectId) { - return bmProjectMapper.selectBmProjectByProjectId(projectId); + public AjaxResult selectBmProjectByProjectId(BmProject bmProject) { + try { + BmProject vo = Optional.ofNullable(bmProjectMapper.selectBmProjectByProjectId(bmProject)).orElseGet(BmProject::new); + return AjaxResult.success(vo); + } catch (Exception e) { + log.error(e.toString(),e); + return AjaxResult.error(); + } } /** @@ -40,62 +63,90 @@ public class BmProjectServiceImpl implements IBmProjectService { */ @Override public List selectBmProjectList(BmProject bmProject) { - bmProject.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); return bmProjectMapper.selectBmProjectList(bmProject); } /** * 新增工程项目管理 * - * @param bmProject 工程项目管理 + * @param vo 工程项目管理 * @return 结果 */ @Override - public int insertBmProject(BmProject bmProject) { - bmProject.setCreateTime(DateUtils.getNowDate()); - bmProject.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + @Transactional(rollbackFor = Exception.class) + public AjaxResult insertBmProject(BmProject vo) { try { - return bmProjectMapper.insertBmProject(bmProject); + // 校验必填数据 + String validResult = validatorsUtils.valid(vo, BmProject.Add.class); + if (StringUtils.isNotBlank(validResult)) { + return AjaxResult.error(validResult); + } + // 校验项目名称是否重复 + int flag = bmProjectMapper.queryValueIsExist(vo,vo.getProjectName(),"project_name"); + if (flag > 0) return AjaxResult.error("公司名称已存在"); + vo.setCreateTime(DateUtils.getNowDate()); + vo.setUpdateTime(DateUtils.getNowDate()); + vo.setCreateBy(SecurityUtils.getUsername()); + vo.setUpdateBy(SecurityUtils.getUsername()); + bmProjectMapper.addOrUpdateProject(vo,1); + return AjaxResult.success(); } catch (Exception e) { - throw new ServiceException("错误信息描述"); + log.error(e.toString(), e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); } } /** * 修改工程项目管理 * - * @param bmProject 工程项目管理 + * @param vo 工程项目管理 * @return 结果 */ @Override - public int updateBmProject(BmProject bmProject) { - bmProject.setUpdateTime(DateUtils.getNowDate()); + @Transactional(rollbackFor = Exception.class) + public AjaxResult updateBmProject(BmProject vo) { try { - return bmProjectMapper.updateBmProject(bmProject); + // 校验必填数据 + String validResult = validatorsUtils.valid(vo, BmProject.Edit.class); + if (StringUtils.isNotBlank(validResult)) { + return AjaxResult.error(validResult); + } + // 校验项目名称是否重复 + int flag = bmProjectMapper.queryValueIsExist(vo,vo.getProjectName(),"project_name"); + if (flag > 0) return AjaxResult.error("项目名称已存在"); + vo.setUpdateTime(DateUtils.getNowDate()); + vo.setUpdateBy(SecurityUtils.getUsername()); + bmProjectMapper.addOrUpdateProject(vo,2); + return AjaxResult.success(); } catch (Exception e) { - throw new ServiceException("错误信息描述"); + log.error(e.toString(), e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); } } /** * 批量删除工程项目管理 * - * @param projectIds 需要删除的工程项目管理主键 + * @param vo 需要删除的工程项目管理主键 * @return 结果 */ @Override - public int deleteBmProjectByProjectIds(Long[] projectIds) { - return bmProjectMapper.deleteBmProjectByProjectIds(projectIds); - } - - /** - * 删除工程项目管理信息 - * - * @param projectId 工程项目管理主键 - * @return 结果 - */ - @Override - public int deleteBmProjectByProjectId(Long projectId) { - return bmProjectMapper.deleteBmProjectByProjectId(projectId); + @Transactional(rollbackFor = Exception.class) + public AjaxResult deleteBmProjectByProjectIds(BmProject vo) { + try { + // 校验必填数据 + String validResult = validatorsUtils.valid(vo, BmProject.Del.class); + if (StringUtils.isNotBlank(validResult)) { + return AjaxResult.error(validResult); + } + bmProjectMapper.addOrUpdateProject(vo,3); + return AjaxResult.success(); + } catch (Exception e) { + log.error(e.toString(), e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/ProDepartServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/ProDepartServiceImpl.java index 4cf4bcc..fd4e05e 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/ProDepartServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/ProDepartServiceImpl.java @@ -42,7 +42,7 @@ public class ProDepartServiceImpl implements ProDepartService { } // 校验项目部名称是否重复 int flag = mapper.queryValueIsExist(vo,vo.getDepartName(),vo.getBranchCompanyId(),"depart_name"); - if (flag > 0) return AjaxResult.error("公司名称已存在"); + if (flag > 0) return AjaxResult.error("项目部名称已存在"); mapper.addOrUpdateDepart(vo,1); return AjaxResult.success(); } catch (Exception e) { diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/BmProjectMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/BmProjectMapper.xml index 70076d1..ee3e9eb 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/BmProjectMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/basic/BmProjectMapper.xml @@ -27,98 +27,133 @@ 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, project_scale, project_manager, address, del_flag, create_by, create_time, update_by, update_time, remark from bm_project - + SELECT bp.project_name AS projectName, + bp.address, + bp.plan_start_time AS planStartTime, + bp.plan_end_time AS planEndTime, + bp.owner_unit AS ownerUnit, + bp.project_id AS projectId, + sdd.dict_label AS projectStatus, + IFNULL(A.num,0) AS bidNum + FROM bm_project bp + LEFT JOIN sys_dict_data sdd ON bp.project_status = sdd.dict_value AND sdd.dict_type = 'pro_status' + LEFT JOIN ( + SELECT project_id,COUNT(*) AS num + FROM bm_project_lot + WHERE del_flag = '0' + GROUP BY project_id + ) A ON A.project_id = bp.project_id + + + AND bp.company_id = #{companyId} + + + AND ( + INSTR(bp.project_name,#{keyWord}) > 0 OR + INSTR(bp.owner_unit,#{keyWord}) > 0 OR + INSTR(bp.address,#{keyWord}) > 0 + ) + + + AND bp.project_status = #{projectStatus} + + AND bp.del_flag = '0' + ORDER BY bp.create_time DESC - + SELECT project_id AS projectId, + project_name AS projectName, + plan_start_time AS planStartTime, + plan_end_time AS planEndTime, + project_amount AS projectAmount, + company_id AS companyId, + owner_unit AS ownerUnit, + project_status AS projectStatus, + project_scale AS projectScale, + project_manager AS projectManager, + address, + remark + FROM bm_project + WHERE project_id = #{projectId} - - - insert into bm_project - - 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, - - - #{projectName}, - #{planStartTime}, - #{planEndTime}, - #{projectAmount}, - #{companyId}, - #{ownerUnit}, - #{projectStatus}, - #{projectScale}, - #{projectManager}, - #{address}, - #{delFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - + + + + + + + + insert into bm_project + + project_name, + plan_start_time, + plan_end_time, + project_amount, + company_id, + owner_unit, + project_status, + project_scale, + project_manager, + address, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{params.projectName}, + #{params.planStartTime}, + #{params.planEndTime}, + #{params.projectAmount}, + #{params.companyId}, + #{params.ownerUnit}, + #{params.projectStatus}, + #{params.projectScale}, + #{params.projectManager}, + #{params.address}, + #{params.createBy}, + #{params.createTime}, + #{params.updateBy}, + #{params.updateTime}, + #{params.remark}, + + + + UPDATE bm_project + + project_name = #{params.projectName}, + plan_start_time = #{params.planStartTime}, + plan_end_time = #{params.planEndTime}, + project_amount = #{params.projectAmount}, + company_id = #{params.companyId}, + owner_unit = #{params.ownerUnit}, + project_status = #{params.projectStatus}, + project_scale = #{params.projectScale}, + address = #{params.address}, + update_by = #{params.updateBy}, + update_time = #{params.updateTime}, + remark = #{params.remark}, + + WHERE project_id = #{params.projectId} + + + UPDATE bm_project SET del_flag = '1' WHERE project_id = #{params.projectId} + - - update bm_project - - project_name = #{projectName}, - plan_start_time = #{planStartTime}, - plan_end_time = #{planEndTime}, - project_amount = #{projectAmount}, - company_id = #{companyId}, - owner_unit = #{ownerUnit}, - project_status = #{projectStatus}, - project_scale = #{projectScale}, - project_manager = #{projectManager}, - address = #{address}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where project_id = #{projectId} - - - - delete from bm_project where project_id = #{projectId} - - - - delete from bm_project where project_id in - - #{projectId} - - \ No newline at end of file diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/ProDepartMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/ProDepartMapper.xml index bc88de2..17c93c0 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/ProDepartMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/ProDepartMapper.xml @@ -41,12 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + SELECT + tci.id, + tci.`name`, + tci.`code`, + tcd.is_online, + tcd.dev_location + FROM + tb_const_info tci + LEFT JOIN tb_collect_device tcd ON tci.id = tcd.const_id + WHERE + tci.type_code = #{typeCode} + + + + + +