资产修改

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);
             //已关停

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;
 }

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;
 }

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;
 }

ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java

@@ -249,7 +249,6 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
                     //根据单位名称查询资产
                     QueryWrapper<AssetMiniPrograms> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("ssdw", part);
-                    queryWrapper.eq("isbf", 0);
                     queryWrapper.eq("del_flag", 0);
                     List<AssetMiniPrograms> list = assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getSsdw, part).eq(AssetMiniPrograms::getIsbf, 0).eq(AssetMiniPrograms::getDelFlag, 0).list();
                     List<AssetMiniProgramsCpPo> miniProgramsNewList = list.stream()
@@ -271,7 +270,6 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
                     //根据单位名称查询资产
                     QueryWrapper<AssetOfficialAccount> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("ssdw", part);
-                    queryWrapper.eq("isbf", 0);
                     queryWrapper.eq("del_flag", 0);
                     List<AssetOfficialAccount> list = assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getSsdw, part).eq(AssetOfficialAccount::getIsbf, 0).eq(AssetOfficialAccount::getDelFlag, 0).list();
                     List<AssetOfficialAccountCpPo> officialAccountProgramsNewList = list.stream()
@@ -293,7 +291,6 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
                     //根据单位名称查询资产
                     QueryWrapper<AssetEmail> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("ssdw", part);
-                    queryWrapper.eq("isbf", 0);
                     queryWrapper.eq("del_flag", 0);
                     List<AssetEmail> 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<AssetTaskMapper, AssetTask
                     //根据单位名称查询资产
                     QueryWrapper<AssetApp> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("ssdw", part);
-                    queryWrapper.eq("isbf", 0);
                     queryWrapper.eq("del_flag", 0);
                     List<AssetApp> list = assetAppService.lambdaQuery().eq(AssetApp::getSsdw, part).eq(AssetApp::getIsbf, 0).eq(AssetApp::getDelFlag, 0).list();
                     List<AssetAppCpPo> appCpNewList = list.stream()

ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml

@@ -200,7 +200,7 @@
     <select id="findByDwmcAssetCurrent" resultType="com.ruoyi.tc.entity.po.AssetCurrentCpPo">
         select * from asset_current
         <where>
-            del_flag = '0' and isbf = '0'
+            del_flag = '0'
             <if test="dwmc!=null and dwmc!='' ">
                 and dwmc like concat('%',#{dwmc},'%')
             </if>