Merge branch 'dongdingding' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationJava into duhanyu

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

@@ -250,7 +250,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
                     QueryWrapper<AssetMiniPrograms> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("ssdw", part);
                     queryWrapper.eq("del_flag", 0);
-                    List<AssetMiniPrograms> list = assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getSsdw, part).eq(AssetMiniPrograms::getIsbf, 0).eq(AssetMiniPrograms::getDelFlag, 0).list();
+                    List<AssetMiniPrograms> list = assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getSsdw, part).eq(AssetMiniPrograms::getDelFlag, 0).list();
                     List<AssetMiniProgramsCpPo> miniProgramsNewList = list.stream()
                             .map(cpPo -> {
                                 AssetMiniProgramsCpPo assetMiniProgramsCpPo = new AssetMiniProgramsCpPo();
@@ -271,7 +271,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
                     QueryWrapper<AssetOfficialAccount> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("ssdw", part);
                     queryWrapper.eq("del_flag", 0);
-                    List<AssetOfficialAccount> list = assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getSsdw, part).eq(AssetOfficialAccount::getIsbf, 0).eq(AssetOfficialAccount::getDelFlag, 0).list();
+                    List<AssetOfficialAccount> list = assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getSsdw, part).eq(AssetOfficialAccount::getDelFlag, 0).list();
                     List<AssetOfficialAccountCpPo> officialAccountProgramsNewList = list.stream()
                             .map(cpPo -> {
                                 AssetOfficialAccountCpPo assetOfficialAccountCpPo = new AssetOfficialAccountCpPo();
@@ -292,7 +292,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
                     QueryWrapper<AssetEmail> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("ssdw", part);
                     queryWrapper.eq("del_flag", 0);
-                    List<AssetEmail> list = assetEmailService.lambdaQuery().eq(AssetEmail::getSsdw, part).eq(AssetEmail::getIsbf, 0).eq(AssetEmail::getDelFlag, 0).list();
+                    List<AssetEmail> list = assetEmailService.lambdaQuery().eq(AssetEmail::getSsdw, part).eq(AssetEmail::getDelFlag, 0).list();
                     ;
                     List<AssetEmailCpPo> emailCpNewList = list.stream()
                             .map(cpPo -> {
@@ -314,7 +314,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
                     QueryWrapper<AssetApp> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("ssdw", part);
                     queryWrapper.eq("del_flag", 0);
-                    List<AssetApp> list = assetAppService.lambdaQuery().eq(AssetApp::getSsdw, part).eq(AssetApp::getIsbf, 0).eq(AssetApp::getDelFlag, 0).list();
+                    List<AssetApp> list = assetAppService.lambdaQuery().eq(AssetApp::getSsdw, part).eq(AssetApp::getDelFlag, 0).list();
                     List<AssetAppCpPo> appCpNewList = list.stream()
                             .map(cpPo -> {
                                 AssetAppCpPo appCpPo = new AssetAppCpPo();

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

@@ -45,7 +45,7 @@
     <select id="findBydwmc" resultType="java.lang.Integer" parameterType="java.lang.String">
         select count(*)
         from asset_app
-        where ssdw = #{part} and isbf=0 and del_flag=0
+        where ssdw = #{part}  and del_flag=0
     </select>
 </mapper>
 

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

@@ -468,6 +468,6 @@
 
         select count(*)
         from asset_current
-        where dwmc = #{part} and isbf=0 and del_flag=0
+        where dwmc = #{part} and del_flag=0
     </select>
 </mapper>

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

@@ -45,7 +45,7 @@
     <select id="findBydwmc" resultType="java.lang.Integer" parameterType="java.lang.String">
         select count(*)
         from asset_email
-        where ssdw = #{part} and isbf=0 and del_flag=0
+        where ssdw = #{part}  del_flag=0
     </select>
 </mapper>
 

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

@@ -46,7 +46,7 @@
     <select id="findBydwmc" resultType="java.lang.Integer" parameterType="java.lang.String">
         select count(*)
         from asset_mini_programs
-        where ssdw = #{part} and isbf=0 and del_flag=0
+        where ssdw = #{part} and del_flag=0
     </select>
 </mapper>
 

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

@@ -16,7 +16,7 @@
     <select id="findBydwmc" resultType="java.lang.Integer" parameterType="java.lang.String">
         select count(*)
         from asset_official_account
-        where ssdw = #{part} and isbf=0 and del_flag=0
+        where ssdw = #{part}and del_flag=0
     </select>
     <select id="page" resultType="com.ruoyi.tc.entity.AssetOfficialAccount">
         select a.* from asset_official_account a