From 9ddaa2d7b888068342f5ad75c8b0c30fe96dbb19 Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 14 Oct 2024 13:52:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=92=8C=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/constant/MaterialConstants.java | 15 ++++ .../bonus/common/biz/enums/HttpCodeEnum.java | 6 ++ .../basic/controller/BmProjectController.java | 20 ++++- .../basic/controller/BmUnitController.java | 6 +- .../basic/mapper/BmProjectMapper.java | 7 ++ .../material/basic/mapper/BmUnitMapper.java | 7 ++ .../basic/service/IBmProjectService.java | 10 ++- .../basic/service/IBmUnitService.java | 10 ++- .../service/impl/BmProjectServiceImpl.java | 79 ++++++++++++++++--- .../basic/service/impl/BmUnitServiceImpl.java | 61 ++++++++++++-- .../mapper/material/basic/BmProjectMapper.xml | 21 ++--- .../mapper/material/basic/BmUnitMapper.xml | 21 ++--- 12 files changed, 212 insertions(+), 51 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java index 27b49a68..9db1b115 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java @@ -13,5 +13,20 @@ public class MaterialConstants */ public static final String UTF8 = "UTF-8"; + /** + * 身份证正则表达式 + */ + public static final String CREDENTIALS_CODE_PATTERN = "^[1-9]\\d{5}[1-9]\\d{3}((0[1-9])|(1[0-2]))(0[1-9]|([1|2][0-9])|3[0-1])((\\d{4})|\\d{3}X)$"; + + /** + * 经度正则表达式 + */ + public static final String LONGITUDE_PATTERN = "^(-?(180(\\.0+)?|1[0-7][0-9](\\.\\d{1,6})?|[1-9]?\\d(\\.\\d{1,6})?))$"; + + /** + * 纬度正则表达式 + */ + public static final String LATITUDE_PATTERN = "^(-?(90(\\.0+)?|[1-8]?\\d(\\.\\d{1,6})?))$"; + } diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/HttpCodeEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/HttpCodeEnum.java index df53128d..1001abf8 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/HttpCodeEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/HttpCodeEnum.java @@ -3,6 +3,8 @@ package com.bonus.common.biz.enums; public enum HttpCodeEnum { // 成功 SUCCESS(200, "操作成功"), + //失败 + FAIL(400, "操作失败,请联系管理员"), // 登录 NEED_LOGIN(401, "需要登录后操作"), NO_OPERATOR_AUTH(403, "无权限操作"), @@ -19,6 +21,10 @@ public enum HttpCodeEnum { EMAIL_NOT_NULL(511, "邮箱不能为空"), NICKNAME_EXIST(512, "昵称已存在"), LOGIN_ERROR(505, "用户名或密码错误"), + NAME_DUPLICATE(1000, "名称重复，请重新输入"), + INVALID_LONGITUDE_FORMAT(1001, "经度格式不正确"), + INVALID_LATITUDE_FORMAT(1002, "纬度格式不正确"), + INVALID_PHONE_FORMAT(1003, "手机号格式不正确"), REPEATE_ERROR(600, "不允许重复提交，请稍候再试"); int code; String msg; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmProjectController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmProjectController.java index 4ece383c..37db8080 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmProjectController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmProjectController.java @@ -1,9 +1,11 @@ package com.bonus.material.basic.controller; import java.util.List; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; +import com.bonus.system.api.RemoteDictDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +40,9 @@ public class BmProjectController extends BaseController @Autowired private IBmProjectService bmProjectService; + @Resource + private RemoteDictDataService remoteDictDataService; + /** * 查询标段工程管理列表 */ @@ -51,6 +56,15 @@ public class BmProjectController extends BaseController return getDataTable(list); } + /** + * 查询工程类型列表 + */ + @ApiOperation(value = "查询工程类型列表") + @GetMapping("/getProjectTypeList") + public AjaxResult getProjectTypeList() { + return remoteDictDataService.dictType("bm_project_type", null); + } + /** * 导出标段工程管理列表 */ @@ -87,7 +101,7 @@ public class BmProjectController extends BaseController @PostMapping public AjaxResult add(@RequestBody BmProject bmProject) { - return toAjax(bmProjectService.insertBmProject(bmProject)); + return bmProjectService.insertBmProject(bmProject); } /** @@ -100,7 +114,7 @@ public class BmProjectController extends BaseController @PutMapping public AjaxResult edit(@RequestBody BmProject bmProject) { - return toAjax(bmProjectService.updateBmProject(bmProject)); + return bmProjectService.updateBmProject(bmProject); } /** @@ -113,6 +127,6 @@ public class BmProjectController extends BaseController @DeleteMapping("/{proIds}") public AjaxResult remove(@PathVariable Long[] proIds) { - return toAjax(bmProjectService.deleteBmProjectByProIds(proIds)); + return bmProjectService.deleteBmProjectByProIds(proIds); } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java index bed25a46..bf64ef37 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java @@ -87,7 +87,7 @@ public class BmUnitController extends BaseController @PostMapping public AjaxResult add(@RequestBody BmUnit bmUnit) { - return toAjax(bmUnitService.insertBmUnit(bmUnit)); + return bmUnitService.insertBmUnit(bmUnit); } /** @@ -100,7 +100,7 @@ public class BmUnitController extends BaseController @PutMapping public AjaxResult edit(@RequestBody BmUnit bmUnit) { - return toAjax(bmUnitService.updateBmUnit(bmUnit)); + return bmUnitService.updateBmUnit(bmUnit); } /** @@ -113,6 +113,6 @@ public class BmUnitController extends BaseController @DeleteMapping("/{unitIds}") public AjaxResult remove(@PathVariable Long[] unitIds) { - return toAjax(bmUnitService.deleteBmUnitByUnitIds(unitIds)); + return bmUnitService.deleteBmUnitByUnitIds(unitIds); } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmProjectMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmProjectMapper.java index 203054ca..59f73250 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmProjectMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmProjectMapper.java @@ -58,4 +58,11 @@ public interface BmProjectMapper * @return 结果 */ public int deleteBmProjectByProIds(Long[] proIds); + + /** + * 根据工程名称查询工程信息 + * @param proName + * @return + */ + BmProject selectBmProjectByProName(String proName); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitMapper.java index 7f81e013..2144acfe 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitMapper.java @@ -58,4 +58,11 @@ public interface BmUnitMapper * @return 结果 */ public int deleteBmUnitByUnitIds(Long[] unitIds); + + /** + * 根据单位名查询单位信息 + * @param unitName + * @return + */ + BmUnit selectBmUnitByProName(String unitName); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmProjectService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmProjectService.java index 1a47f98a..01870b76 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmProjectService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmProjectService.java @@ -1,6 +1,8 @@ package com.bonus.material.basic.service; import java.util.List; + +import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.basic.domain.BmProject; /** @@ -33,7 +35,7 @@ public interface IBmProjectService * @param bmProject 标段工程管理 * @return 结果 */ - public int insertBmProject(BmProject bmProject); + public AjaxResult insertBmProject(BmProject bmProject); /** * 修改标段工程管理 @@ -41,7 +43,7 @@ public interface IBmProjectService * @param bmProject 标段工程管理 * @return 结果 */ - public int updateBmProject(BmProject bmProject); + public AjaxResult updateBmProject(BmProject bmProject); /** * 批量删除标段工程管理 @@ -49,7 +51,7 @@ public interface IBmProjectService * @param proIds 需要删除的标段工程管理主键集合 * @return 结果 */ - public int deleteBmProjectByProIds(Long[] proIds); + public AjaxResult deleteBmProjectByProIds(Long[] proIds); /** * 删除标段工程管理信息 @@ -57,5 +59,5 @@ public interface IBmProjectService * @param proId 标段工程管理主键 * @return 结果 */ - public int deleteBmProjectByProId(Long proId); + public AjaxResult deleteBmProjectByProId(Long proId); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmUnitService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmUnitService.java index 3e50f779..e2bf2270 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmUnitService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmUnitService.java @@ -1,6 +1,8 @@ package com.bonus.material.basic.service; import java.util.List; + +import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.basic.domain.BmUnit; /** @@ -33,7 +35,7 @@ public interface IBmUnitService * @param bmUnit 往来单位管理 * @return 结果 */ - public int insertBmUnit(BmUnit bmUnit); + public AjaxResult insertBmUnit(BmUnit bmUnit); /** * 修改往来单位管理 @@ -41,7 +43,7 @@ public interface IBmUnitService * @param bmUnit 往来单位管理 * @return 结果 */ - public int updateBmUnit(BmUnit bmUnit); + public AjaxResult updateBmUnit(BmUnit bmUnit); /** * 批量删除往来单位管理 @@ -49,7 +51,7 @@ public interface IBmUnitService * @param unitIds 需要删除的往来单位管理主键集合 * @return 结果 */ - public int deleteBmUnitByUnitIds(Long[] unitIds); + public AjaxResult deleteBmUnitByUnitIds(Long[] unitIds); /** * 删除往来单位管理信息 @@ -57,5 +59,5 @@ public interface IBmUnitService * @param unitId 往来单位管理主键 * @return 结果 */ - public int deleteBmUnitByUnitId(Long unitId); + public AjaxResult deleteBmUnitByUnitId(Long unitId); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectServiceImpl.java index cf749ba3..4359246a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectServiceImpl.java @@ -1,13 +1,22 @@ package com.bonus.material.basic.service.impl; import java.util.List; +import java.util.Objects; + +import com.bonus.common.biz.constant.MaterialConstants; +import com.bonus.common.biz.enums.HttpCodeEnum; +import com.bonus.common.biz.exception.BusinessException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.material.basic.mapper.BmProjectMapper; import com.bonus.material.basic.domain.BmProject; import com.bonus.material.basic.service.IBmProjectService; +import javax.annotation.Resource; + /** * 标段工程管理Service业务层处理 * @@ -17,7 +26,7 @@ import com.bonus.material.basic.service.IBmProjectService; @Service public class BmProjectServiceImpl implements IBmProjectService { - @Autowired + @Resource private BmProjectMapper bmProjectMapper; /** @@ -51,10 +60,31 @@ public class BmProjectServiceImpl implements IBmProjectService * @return 结果 */ @Override - public int insertBmProject(BmProject bmProject) + public AjaxResult insertBmProject(BmProject bmProject) { + //首先根据工程名称去表中查询，看是否重复 + BmProject project = bmProjectMapper.selectBmProjectByProName(bmProject.getProName()); + if (project != null) { + return AjaxResult.error(HttpCodeEnum.NAME_DUPLICATE.getCode(), HttpCodeEnum.NAME_DUPLICATE.getMsg()); + } + //校验输入的经纬度是否合规 + if (bmProject.getLon() != null) { + if (!bmProject.getLon().matches(MaterialConstants.LONGITUDE_PATTERN)){ + return AjaxResult.error(HttpCodeEnum.INVALID_LONGITUDE_FORMAT.getCode(), HttpCodeEnum.INVALID_LONGITUDE_FORMAT.getMsg()); + } + } + if (bmProject.getLat() != null) { + if (!bmProject.getLat().matches(MaterialConstants.LATITUDE_PATTERN)){ + return AjaxResult.error(HttpCodeEnum.INVALID_LATITUDE_FORMAT.getCode(), HttpCodeEnum.INVALID_LATITUDE_FORMAT.getMsg()); + } + } bmProject.setCreateTime(DateUtils.getNowDate()); - return bmProjectMapper.insertBmProject(bmProject); + bmProject.setCreateBy(SecurityUtils.getUserId().toString()); + int result = bmProjectMapper.insertBmProject(bmProject); + if (result > 0) { + return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result); + } + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } /** @@ -64,10 +94,33 @@ public class BmProjectServiceImpl implements IBmProjectService * @return 结果 */ @Override - public int updateBmProject(BmProject bmProject) + public AjaxResult updateBmProject(BmProject bmProject) { + //首先根据工程名称去表中查询，看是否重复 + BmProject project = bmProjectMapper.selectBmProjectByProName(bmProject.getProName()); + if (project != null) { + if (!Objects.equals(project.getProId(), bmProject.getProId())) { + return AjaxResult.error(HttpCodeEnum.NAME_DUPLICATE.getCode(), HttpCodeEnum.NAME_DUPLICATE.getMsg()); + } + } + //校验输入的经纬度是否合规 + if (bmProject.getLon() != null) { + if (!bmProject.getLon().matches(MaterialConstants.LONGITUDE_PATTERN)){ + return AjaxResult.error(HttpCodeEnum.INVALID_LONGITUDE_FORMAT.getCode(), HttpCodeEnum.INVALID_LONGITUDE_FORMAT.getMsg()); + } + } + if (bmProject.getLat() != null) { + if (!bmProject.getLat().matches(MaterialConstants.LATITUDE_PATTERN)){ + return AjaxResult.error(HttpCodeEnum.INVALID_LATITUDE_FORMAT.getCode(), HttpCodeEnum.INVALID_LATITUDE_FORMAT.getMsg()); + } + } bmProject.setUpdateTime(DateUtils.getNowDate()); - return bmProjectMapper.updateBmProject(bmProject); + bmProject.setUpdateBy(SecurityUtils.getUserId().toString()); + int result = bmProjectMapper.updateBmProject(bmProject); + if (result > 0) { + return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result); + } + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } /** @@ -77,9 +130,13 @@ public class BmProjectServiceImpl implements IBmProjectService * @return 结果 */ @Override - public int deleteBmProjectByProIds(Long[] proIds) + public AjaxResult deleteBmProjectByProIds(Long[] proIds) { - return bmProjectMapper.deleteBmProjectByProIds(proIds); + int result = bmProjectMapper.deleteBmProjectByProIds(proIds); + if (result > 0) { + return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result); + } + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } /** @@ -89,8 +146,12 @@ public class BmProjectServiceImpl implements IBmProjectService * @return 结果 */ @Override - public int deleteBmProjectByProId(Long proId) + public AjaxResult deleteBmProjectByProId(Long proId) { - return bmProjectMapper.deleteBmProjectByProId(proId); + int result = bmProjectMapper.deleteBmProjectByProId(proId); + if (result > 0) { + return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result); + } + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitServiceImpl.java index cbe9869a..063ed8a6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitServiceImpl.java @@ -1,7 +1,14 @@ package com.bonus.material.basic.service.impl; import java.util.List; +import java.util.Objects; + +import cn.hutool.core.util.PhoneUtil; +import com.bonus.common.biz.enums.HttpCodeEnum; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.utils.StringUtils; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.material.basic.mapper.BmUnitMapper; @@ -51,10 +58,24 @@ public class BmUnitServiceImpl implements IBmUnitService * @return 结果 */ @Override - public int insertBmUnit(BmUnit bmUnit) + public AjaxResult insertBmUnit(BmUnit bmUnit) { + //根据单位名称查询去重 + BmUnit unit = bmUnitMapper.selectBmUnitByProName(bmUnit.getUnitName()); + if (unit != null) { + return AjaxResult.error(HttpCodeEnum.NAME_DUPLICATE.getCode(), HttpCodeEnum.NAME_DUPLICATE.getMsg()); + } + //判断手机号是否合法 + if (StringUtils.isNotBlank(bmUnit.getTelphone()) && !PhoneUtil.isMobile(bmUnit.getTelphone())) { + return AjaxResult.error(HttpCodeEnum.INVALID_PHONE_FORMAT.getCode(), HttpCodeEnum.INVALID_PHONE_FORMAT.getMsg()); + } bmUnit.setCreateTime(DateUtils.getNowDate()); - return bmUnitMapper.insertBmUnit(bmUnit); + bmUnit.setCreateBy(SecurityUtils.getUserId().toString()); + int result = bmUnitMapper.insertBmUnit(bmUnit); + if (result > 0) { + return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result); + } + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } /** @@ -64,10 +85,26 @@ public class BmUnitServiceImpl implements IBmUnitService * @return 结果 */ @Override - public int updateBmUnit(BmUnit bmUnit) + public AjaxResult updateBmUnit(BmUnit bmUnit) { + //根据单位名称查询去重 + BmUnit unit = bmUnitMapper.selectBmUnitByProName(bmUnit.getUnitName()); + if (unit != null) { + if (!Objects.equals(unit.getUnitId(), bmUnit.getUnitId())) { + return AjaxResult.error(HttpCodeEnum.NAME_DUPLICATE.getCode(), HttpCodeEnum.NAME_DUPLICATE.getMsg()); + } + } + //判断手机号是否合法 + if (StringUtils.isNotBlank(bmUnit.getTelphone()) && !PhoneUtil.isMobile(bmUnit.getTelphone())) { + return AjaxResult.error(HttpCodeEnum.INVALID_PHONE_FORMAT.getCode(), HttpCodeEnum.INVALID_PHONE_FORMAT.getMsg()); + } bmUnit.setUpdateTime(DateUtils.getNowDate()); - return bmUnitMapper.updateBmUnit(bmUnit); + bmUnit.setUpdateBy(SecurityUtils.getUserId().toString()); + int result = bmUnitMapper.updateBmUnit(bmUnit); + if (result > 0) { + return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result); + } + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } /** @@ -77,9 +114,13 @@ public class BmUnitServiceImpl implements IBmUnitService * @return 结果 */ @Override - public int deleteBmUnitByUnitIds(Long[] unitIds) + public AjaxResult deleteBmUnitByUnitIds(Long[] unitIds) { - return bmUnitMapper.deleteBmUnitByUnitIds(unitIds); + int result = bmUnitMapper.deleteBmUnitByUnitIds(unitIds); + if (result > 0) { + return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result); + } + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } /** @@ -89,8 +130,12 @@ public class BmUnitServiceImpl implements IBmUnitService * @return 结果 */ @Override - public int deleteBmUnitByUnitId(Long unitId) + public AjaxResult deleteBmUnitByUnitId(Long unitId) { - return bmUnitMapper.deleteBmUnitByUnitId(unitId); + int result = bmUnitMapper.deleteBmUnitByUnitId(unitId); + if (result > 0) { + return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result); + } + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml index ecb05b6c..46e82911 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml @@ -31,7 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where pro_id = #{proId} + where del_flag = 0 and pro_id = #{proId} - + + insert into bm_project @@ -73,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, remark, - del_flag, + del_flag #{proId}, @@ -94,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, - #{delFlag}, + 0 @@ -113,22 +117,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" plan_end_date = #{planEndDate}, actual_start_date = #{actualStartDate}, actual_end_date = #{actualEndDate}, - create_by = #{createBy}, - create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, - del_flag = #{delFlag}, where pro_id = #{proId} - delete from bm_project where pro_id = #{proId} + update bm_project set del_flag = 2 where pro_id = #{proId} - delete from bm_project where pro_id in + update bm_project set del_flag = 2 where pro_id in #{proId} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml index a24c1171..936f445e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml @@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where unit_id = #{unitId} + where del_flag = 0 and unit_id = #{unitId} - + + insert into bm_unit @@ -49,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" link_man, telphone, dept_id, - del_flag, + del_flag, create_by, create_time, update_by, @@ -63,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{linkMan}, #{telphone}, #{deptId}, - #{delFlag}, + 0, #{createBy}, #{createTime}, #{updateBy}, @@ -81,9 +85,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" link_man = #{linkMan}, telphone = #{telphone}, dept_id = #{deptId}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, @@ -92,11 +93,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from bm_unit where unit_id = #{unitId} + update bm_unit set del_flag = 2 where unit_id = #{unitId} - delete from bm_unit where unit_id in + update bm_unit set del_flag = 2 where unit_id in #{unitId}