From 88424ed67743530db24eed145ffda7da1083f620 Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Fri, 22 Nov 2024 15:51:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tc/entity/po/AssetBusinessFormCpPo.java | 5 +++- .../entity/request/AssetTaskPageRequest.java | 7 ++++++ .../tc/service/impl/AssetTaskServiceImpl.java | 23 +++++++++++-------- .../main/resources/mapper/AssetTaskDao.xml | 6 +++-- .../src/main/resources/mapper/UnitMapper.xml | 7 ++++-- 5 files changed, 33 insertions(+), 15 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBusinessFormCpPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBusinessFormCpPo.java index a3d80b5..e46af6f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBusinessFormCpPo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBusinessFormCpPo.java @@ -27,7 +27,10 @@ public class AssetBusinessFormCpPo extends BaseClass implements Serializable { @TableId(type = IdType.AUTO,value = "business_id") private Long businessId; - + /** + * 主键id + */ + private Long id; /** * 资源id */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetTaskPageRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetTaskPageRequest.java index ea0dc47..cba8fcd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetTaskPageRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetTaskPageRequest.java @@ -58,4 +58,11 @@ public class AssetTaskPageRequest { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endTime; + + + /** + * 单位名称 + */ + @ApiModelProperty("单位名称") + private String dwmc; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java index 5dd04cf..80f2255 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java @@ -67,7 +67,8 @@ public class AssetTaskServiceImpl extends ServiceImpl bussList = assetBusinessFormCpService.findByassetId(assetCurrentResponse.getId()); if (bussList != null) { for (AssetBusinessFormCpPo assetBusinessFormCpResponse : bussList) { - assetCurrentResponse.getXjgywxt().setBusinessId(assetBusinessFormCpResponse.getBusinessId()); - assetCurrentResponse.getXjgywxt().setAssetId(assetCurrentResponse.getId()); - assetCurrentResponse.getXjgywxt().setTaskId(id); - assetBusinessFormCpResponseList.add(assetCurrentResponse.getXjgywxt()); + if (assetCurrentResponse.getXjgywxt() != null) { + assetCurrentResponse.getXjgywxt().setAssetId(assetBusinessFormCpResponse.getId()); + assetCurrentResponse.getXjgywxt().setTaskId(id); + assetBusinessFormCpResponseList.add(assetCurrentResponse.getXjgywxt()); + } } assetBusinessFormCpService.saveBatch(assetBusinessFormCpResponseList); } @@ -134,7 +137,7 @@ public class AssetTaskServiceImpl extends ServiceImpl SupplyChainNewList = SupplyChainList.stream() .map(cpPo -> { AssetSupplyChain supplyChain = new AssetSupplyChain(); + supplyChain.setId(null); BeanUtils.copyProperties(cpPo, supplyChain); // 复制属性 return supplyChain; // 返回新对象 }) @@ -345,7 +349,6 @@ public class AssetTaskServiceImpl extends ServiceImpl and task_name = #{req.taskName} + + and dwmc = #{req.dwmc} + and task_finish_time >= #{req.begainTime} @@ -185,7 +188,6 @@ and task_status = #{req.taskStatus} - and id = #{req.id} @@ -259,7 +261,7 @@ SELECT a.status, CASE - WHEN DATE(a.update_time) > STR_TO_DATE(IFNULL(b.task_deadline, '1970-01-01'), '%Y-%m-%d') THEN '6' + WHEN a.update_time > b.task_deadline THEN '6' ELSE '7' END AS deadstatus FROM diff --git a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml index f3c666d..72d12bd 100644 --- a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml @@ -115,9 +115,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update unit_info set del_flag = '2' where id = #{id} From 3a5a8e86e585798fdbeb212f8b27bfd09350ed2e Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Fri, 22 Nov 2024 21:49:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/tc/controller/AssetTaskController.java | 8 ++++++++ .../tc/entity/request/AssetCurrentShRequest.java | 6 +++++- .../tc/entity/request/AssetdwHcRequest.java | 7 +++++++ .../ruoyi/tc/mapper/AssetBasicNetWorkMapper.java | 7 +++++++ .../ruoyi/tc/mapper/AssetBusinessFormMapper.java | 7 +++++++ .../com/ruoyi/tc/mapper/AssetCurrentMapper.java | 8 ++++++++ .../ruoyi/tc/mapper/AssetSupplyChainMapper.java | 8 ++++++++ .../ruoyi/tc/mapper/UnitOtherConcatMapper.java | 7 +++++++ .../tc/service/AssetBasicNetworkService.java | 9 +++++++++ .../tc/service/AssetBusinessFormService.java | 7 +++++++ .../ruoyi/tc/service/AssetCurrentService.java | 12 +++++++++--- .../tc/service/AssetSupplyChainService.java | 8 ++++++++ .../ruoyi/tc/service/UnitOtherConcatService.java | 7 +++++++ .../impl/AssetBasicNetworkServiceImpl.java | 5 +++++ .../impl/AssetBusinessFormServiceImpl.java | 5 +++++ .../tc/service/impl/AssetCurrentServiceImpl.java | 5 +++++ .../impl/AssetSupplyChainServiceImpl.java | 5 +++++ .../tc/service/impl/AssetTaskServiceImpl.java | 16 +++++++++------- .../service/impl/UnitOtherConcatServiceImpl.java | 5 +++++ .../resources/mapper/AssetBasicNetworkMapper.xml | 7 +++++++ .../resources/mapper/AssetBusinessFormMapper.xml | 7 +++++++ .../main/resources/mapper/AssetCurrentMapper.xml | 7 +++++++ .../resources/mapper/AssetSupplyChainMapper.xml | 7 +++++++ .../src/main/resources/mapper/AssetTaskDao.xml | 8 ++++++++ .../main/resources/mapper/UnitOtherConcat.xml | 7 +++++++ 25 files changed, 174 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java index 53e576c..d95c4c1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.tc.entity.AssetCurrent; import com.ruoyi.tc.entity.AssetLc; import com.ruoyi.tc.entity.AssetTask; @@ -74,6 +75,9 @@ public class AssetTaskController extends BaseController { @Resource private AssetLcService assetLcService; + + @Resource + private AssetCurrentService assetCurrentService; /** * 分页查询 * @@ -184,6 +188,7 @@ public class AssetTaskController extends BaseController { assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); assetBasicNetworkCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); + AssetCurrent ac = new AssetCurrent(); if (StringUtils.isBlank(assetCurrent.getBfyy())) { //待审批 assetCurrent.setStatus(0); @@ -191,6 +196,7 @@ public class AssetTaskController extends BaseController { //已报废 assetCurrent.setStatus(5); assetCurrent.setXtzt("5"); + } StringBuilder a = new StringBuilder(); if (!assetCurrent.getGlymList().isEmpty()) { @@ -209,6 +215,8 @@ public class AssetTaskController extends BaseController { } assetCurrent.setGlIp(b.toString()); // assetCurrent.setCurrentId(null); + BeanUtils.copyProperties(assetCurrent,ac); + assetCurrentService.updateById(ac); assetCurrentCpService.save(assetCurrent); //新增新监管业务形态 if (assetCurrent.getXjgywxt() != null) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java index b036b5f..23304dc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java @@ -18,7 +18,11 @@ public class AssetCurrentShRequest { @ApiModelProperty("任务id") private Integer taskId; - + /** + * 系统名称 + */ + @ApiModelProperty("系统名称") + private String xtmc; /** * 资产id diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetdwHcRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetdwHcRequest.java index ae266d4..8737b2f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetdwHcRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetdwHcRequest.java @@ -20,4 +20,11 @@ public class AssetdwHcRequest { private String dwmc; + /** + * 任务id + */ + @ApiModelProperty("任务id") + private Integer taskId; + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkMapper.java index c1735ff..ac76f1a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkMapper.java @@ -22,5 +22,12 @@ public interface AssetBasicNetWorkMapper extends BaseMapper { */ void deleteByAssetIds(Long id); + + /** + * 删除 + * @param idList + */ + void deleteIdList(List idList); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormMapper.java index cb55133..9af09b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormMapper.java @@ -16,5 +16,12 @@ public interface AssetBusinessFormMapper extends BaseMapper { * 逻辑删除 */ void deleteByAssetIds(Long id); + + + /** + * 删除 + * @param idList + */ + void deleteIdList(List idList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentMapper.java index e6b3946..a3c57a6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentMapper.java @@ -33,5 +33,13 @@ public interface AssetCurrentMapper extends BaseMapper { * 逻辑删除 */ void deleteByUnitIds(Long id); + + + + /** + * 删除 + * @param idList + */ + void deleteIdList(List idList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainMapper.java index 3fc7a0f..86eea26 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainMapper.java @@ -28,5 +28,13 @@ public interface AssetSupplyChainMapper extends BaseMapper { * 根据现有资产id查找最新一条的系统运营单位 */ AssetSupplyChain getYydw(Long id); + + + + /** + * 删除 + * @param idList + */ + void deleteIdList(List idList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatMapper.java index eff1c21..e9cc1e3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatMapper.java @@ -20,4 +20,11 @@ public interface UnitOtherConcatMapper extends BaseMapper * 根据assetId逻辑删除 */ void deleteByAssetIds(Long id); + + + /** + * 删除 + * @param idList + */ + void deleteIdList(List idList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkService.java index 628d994..4aca3dd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkService.java @@ -23,4 +23,13 @@ public interface AssetBasicNetworkService extends IService { * 逻辑删除 */ void deleteByAssetIds(Long id); + + + + + /** + * 删除 + * @param netWorkidList + */ + void deleteIdList(List netWorkidList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormService.java index 0f15800..ecebb79 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormService.java @@ -17,5 +17,12 @@ public interface AssetBusinessFormService extends IService { * 逻辑删除 */ void deleteByAssetIds(Long id); + + + /** + * 删除 + * @param bussinessidList + */ + void deleteIdList(List bussinessidList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentService.java index 936a1a8..ef7d486 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentService.java @@ -21,10 +21,10 @@ public interface AssetCurrentService extends IService { * 分页查询所有数据 * * @param page 分页对象 - * @param as 查询实体 + * @param as 查询实体 * @return 所有数据 */ - Page page(Page page, AssetCurrentPageRequest as ); + Page page(Page page, AssetCurrentPageRequest as); /** * 查询所有数据 @@ -32,7 +32,7 @@ public interface AssetCurrentService extends IService { * @param as 查询实体 * @return 所有数据 */ - List page(AssetCurrentPageRequest as ); + List page(AssetCurrentPageRequest as); /** * 通过主键查询单条数据 @@ -46,5 +46,11 @@ public interface AssetCurrentService extends IService { * 逻辑删除 */ void deleteByUnitIds(Long id); + + /** + * 删除 + * @param idList + */ + void deleteIdList(List idList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainService.java index 14cf3b8..2ad13ff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainService.java @@ -27,4 +27,12 @@ public interface AssetSupplyChainService extends IService { * 根据现有资产id查找最新一条的系统运营单位 */ AssetSupplyChain getYydw(Long id); + + + + /** + * 删除 + * @param SupplyChainidList + */ + void deleteIdList(List SupplyChainidList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatService.java index df14955..c6319bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatService.java @@ -22,4 +22,11 @@ public interface UnitOtherConcatService extends IService { * 根据unitId逻辑删除 */ void deleteByUnitIds(Long id); + + + /** + * 删除 + * @param UnitOtherConcatidList + */ + void deleteIdList(List UnitOtherConcatidList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkServiceImpl.java index 2c01a16..350f74d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkServiceImpl.java @@ -32,4 +32,9 @@ public class AssetBasicNetworkServiceImpl extends ServiceImpl netWorkidList) { + baseMapper.deleteIdList(netWorkidList); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormServiceImpl.java index 2c70fb8..9433eb2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormServiceImpl.java @@ -24,5 +24,10 @@ public class AssetBusinessFormServiceImpl extends ServiceImpl idList) { + baseMapper.deleteIdList(idList); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java index fc200cd..d03aa56 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java @@ -95,5 +95,10 @@ public class AssetCurrentServiceImpl extends ServiceImpl idList) { + baseMapper.deleteIdList(idList); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainServiceImpl.java index b596ddd..779f53d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainServiceImpl.java @@ -41,4 +41,9 @@ public class AssetSupplyChainServiceImpl extends ServiceImpl SupplyChainidList) { + baseMapper.deleteIdList(SupplyChainidList); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java index 63a42dd..dbfd86f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java @@ -235,11 +235,11 @@ public class AssetTaskServiceImpl extends ServiceImpl currentNewList = currentList.stream() .map(cpPo -> { @@ -310,7 +312,7 @@ public class AssetTaskServiceImpl extends ServiceImpl bussinessNewList = bussinessList.stream() .map(cpPo -> { @@ -326,7 +328,7 @@ public class AssetTaskServiceImpl extends ServiceImpl netWorkNewList = netWorkList.stream() .map(cpPo -> { @@ -342,7 +344,7 @@ public class AssetTaskServiceImpl extends ServiceImpl SupplyChainNewList = SupplyChainList.stream() .map(cpPo -> { AssetSupplyChain supplyChain = new AssetSupplyChain(); @@ -358,7 +360,7 @@ public class AssetTaskServiceImpl extends ServiceImpl UnitOtherConcatNewList = UnitOtherConcatList.stream() .map(cpPo -> { UnitOtherConcat unitOtherConcat = new UnitOtherConcat(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatServiceImpl.java index 75bbe1d..779eb7f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatServiceImpl.java @@ -30,4 +30,9 @@ public class UnitOtherConcatServiceImpl extends ServiceImpl UnitOtherConcatidList) { + baseMapper.deleteIdList(UnitOtherConcatidList); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/AssetBasicNetworkMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetBasicNetworkMapper.xml index 456d959..005d903 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetBasicNetworkMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetBasicNetworkMapper.xml @@ -4,6 +4,13 @@ update asset_basic_network set del_flag = '2' where asset_id = #{id} + + DELETE FROM asset_basic_network + WHERE asset_id IN + + #{id} + + diff --git a/ruoyi-admin/src/main/resources/mapper/AssetSupplyChainMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetSupplyChainMapper.xml index 7714b58..7d1f2f7 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetSupplyChainMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetSupplyChainMapper.xml @@ -4,6 +4,13 @@ update asset_supply_chain set del_flag = '2' where asset_id = #{id} + + DELETE FROM asset_supply_chain + WHERE id IN + + #{id} + +