From 8cd863cb33f0236abc7af2ccfed50a309c762334 Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Wed, 11 Dec 2024 14:24:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/tc/controller/AssetTaskController.java | 4 ++++ .../src/main/java/com/ruoyi/tc/entity/AssetApp.java | 8 ++++++++ .../main/java/com/ruoyi/tc/entity/po/AssetAppCpPo.java | 3 +++ .../main/java/com/ruoyi/tc/entity/po/AssetAppJyPo.java | 2 ++ .../com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java | 4 ---- ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml | 2 +- 6 files changed, 18 insertions(+), 5 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 e87fd78..127aae4 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 @@ -513,6 +513,7 @@ public class AssetTaskController extends BaseController { //已报废 assetMiniProgramsCpPo.setStatus(5); ac.setIsbf(2); + ac.setState("7"); ac.setId(assetMiniProgramsCpPo.getAssetId()); assetMiniProgramsService.updateById(ac); //已关停 @@ -547,6 +548,7 @@ public class AssetTaskController extends BaseController { //已报废 assetOfficialAccountCpPo.setStatus(5); ac.setIsbf(2); + ac.setGzhzt("7"); ac.setId(assetOfficialAccountCpPo.getAssetId()); assetOfficialAccountService.updateById(ac); //已关停 @@ -582,6 +584,7 @@ public class AssetTaskController extends BaseController { //已报废 assetAppCpPo.setStatus(5); ac.setIsbf(2); + ac.setAppState("7"); ac.setId(assetAppCpPo.getAssetId()); assetAppService.updateById(ac); //已关停 @@ -617,6 +620,7 @@ public class AssetTaskController extends BaseController { //已报废 assetEmailCpPo.setStatus(5); ac.setIsbf(2); + ac.setYjxtzc("2"); ac.setId(assetEmailCpPo.getAssetId()); assetEmailService.updateById(ac); //已关停 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetApp.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetApp.java index 6339693..3e4eaf9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetApp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetApp.java @@ -142,4 +142,12 @@ public class AssetApp extends BaseClass implements Serializable { @ApiModelProperty("组织机构名称（部门名称）") @TableField(exist = false) private String deptName; + + + /** + * 状态 + */ + @ApiModelProperty("状态") + @Excel(name = "状态", dictType = "gzh_state",comboReadDict = true) + private String appState; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppCpPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppCpPo.java index 8089e40..253dcd6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppCpPo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppCpPo.java @@ -153,4 +153,7 @@ public class AssetAppCpPo extends BaseClass implements Serializable { @ApiModelProperty("不通过次数") private Integer count; + + @ApiModelProperty("app状态") + private Integer appState; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppJyPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppJyPo.java index 7564427..6378e49 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppJyPo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppJyPo.java @@ -157,4 +157,6 @@ public class AssetAppJyPo extends BaseClass implements Serializable { private Integer count; + @ApiModelProperty("app状态") + private String appState; } 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 ac885d6..e8534ba 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 @@ -249,7 +249,6 @@ public class AssetTaskServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ssdw", part); - queryWrapper.eq("isbf", 0); queryWrapper.eq("del_flag", 0); List list = assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getSsdw, part).eq(AssetMiniPrograms::getIsbf, 0).eq(AssetMiniPrograms::getDelFlag, 0).list(); List miniProgramsNewList = list.stream() @@ -271,7 +270,6 @@ public class AssetTaskServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ssdw", part); - queryWrapper.eq("isbf", 0); queryWrapper.eq("del_flag", 0); List list = assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getSsdw, part).eq(AssetOfficialAccount::getIsbf, 0).eq(AssetOfficialAccount::getDelFlag, 0).list(); List officialAccountProgramsNewList = list.stream() @@ -293,7 +291,6 @@ public class AssetTaskServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ssdw", part); - queryWrapper.eq("isbf", 0); queryWrapper.eq("del_flag", 0); List list = assetEmailService.lambdaQuery().eq(AssetEmail::getSsdw, part).eq(AssetEmail::getIsbf, 0).eq(AssetEmail::getDelFlag, 0).list(); ; @@ -316,7 +313,6 @@ public class AssetTaskServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ssdw", part); - queryWrapper.eq("isbf", 0); queryWrapper.eq("del_flag", 0); List list = assetAppService.lambdaQuery().eq(AssetApp::getSsdw, part).eq(AssetApp::getIsbf, 0).eq(AssetApp::getDelFlag, 0).list(); List appCpNewList = list.stream() diff --git a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml index 926338d..434ac29 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml @@ -200,7 +200,7 @@