suzhou-jichuang-lanhai
/
TcAssetVerificationJava
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
main
杜函宇 1 month ago
parent 92e082ba4c ca4b11be7c
commit 621eaeee83
11 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java
Unescape View File

@ -53,7 +53,7 @@ public interface AssetAppCpMapper extends BaseMapper<AssetAppCpPo> {
* @param taskId 任务id
* @param btgyy 不通过原因
*/
@Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
@Update("update asset_app_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy);

2
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java
Unescape View File

@ -45,7 +45,7 @@ public interface AssetEmailCpMapper extends BaseMapper<AssetEmailCpPo> {
* @param taskId 任务id
* @param btgyy 不通过原因
*/
@Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
@Update("update asset_email_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy);
}

2
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java
Unescape View File

@ -46,7 +46,7 @@ public interface AssetOfficialAccountCpMapper extends BaseMapper<AssetOfficialAc
* @param taskId 任务id
* @param btgyy 不通过原因
*/
@Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
@Update("update asset_official_account_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ")
void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy);
}

18
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java
Unescape View File

@ -250,7 +250,8 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
QueryWrapper<AssetMiniPrograms> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ssdw", part);
queryWrapper.eq("isbf", 0);
List<AssetMiniPrograms> list = assetMiniProgramsService.list(queryWrapper);
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()
.map(cpPo -> {
AssetMiniProgramsCpPo assetMiniProgramsCpPo = new AssetMiniProgramsCpPo();
@ -271,7 +272,8 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
QueryWrapper<AssetOfficialAccount> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ssdw", part);
queryWrapper.eq("isbf", 0);
List<AssetOfficialAccount> list = assetOfficialAccountService.list(queryWrapper);
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()
.map(cpPo -> {
AssetOfficialAccountCpPo assetOfficialAccountCpPo = new AssetOfficialAccountCpPo();
@ -292,7 +294,8 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
QueryWrapper<AssetEmail> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ssdw", part);
queryWrapper.eq("isbf", 0);
List<AssetEmail> list = assetEmailService.list(queryWrapper);
queryWrapper.eq("del_flag", 0);
List<AssetEmail> list = assetEmailService.lambdaQuery().eq(AssetEmail::getSsdw, part).eq(AssetEmail::getIsbf,0).eq(AssetEmail::getDelFlag,0).list();;
List<AssetEmailCpPo> emailCpNewList = list.stream()
.map(cpPo -> {
AssetEmailCpPo emailCpPo = new AssetEmailCpPo();
@ -313,7 +316,8 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
QueryWrapper<AssetApp> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ssdw", part);
queryWrapper.eq("isbf", 0);
List<AssetApp> list = assetAppService.list(queryWrapper);
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()
.map(cpPo -> {
AssetAppCpPo appCpPo = new AssetAppCpPo();
@ -554,7 +558,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
assetEmailService.deleteIdList(emailidList);
}
//将子表数据复制到主表中
List<AssetEmail> emailNewList = appList.stream()
List<AssetEmail> emailNewList = emailCpPoListList.stream()
.map(cpPo -> {
AssetEmail current = new AssetEmail();
BeanUtils.copyProperties(cpPo, current); // 复制属性
@ -572,7 +576,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
assetMiniProgramsService.deleteIdList(miniidList);
}
//将子表数据复制到主表中
List<AssetMiniPrograms> miniNewList = appList.stream()
List<AssetMiniPrograms> miniNewList = miniProgramsCpPoListList.stream()
.map(cpPo -> {
AssetMiniPrograms current = new AssetMiniPrograms();
BeanUtils.copyProperties(cpPo, current); // 复制属性
@ -591,7 +595,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
assetOfficialAccountService.deleteIdList(officialidList);
}
//将子表数据复制到主表中
List<AssetOfficialAccount> officialNewList = appList.stream()
List<AssetOfficialAccount> officialNewList = officialAccountCpPoListList.stream()
.map(cpPo -> {
AssetOfficialAccount current = new AssetOfficialAccount();
BeanUtils.copyProperties(cpPo, current); // 复制属性

2
ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml
Unescape View File

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

2
ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml
Unescape View File

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

2
ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml
Unescape View File

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

2
ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml
Unescape View File

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

2
ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml
Unescape View File

@ -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
where ssdw = #{part} and isbf=0 and del_flag=0
</select>
<select id="page" resultType="com.ruoyi.tc.entity.AssetOfficialAccount">
select * from asset_official_account

25
ruoyi-admin/src/main/resources/mapper/UnitMapper.xml
Unescape View File

@ -148,8 +148,29 @@
FROM asset_task b
where
b.task_status = 1 AND FIND_IN_SET(a.nick_name, b.dwmc)
AND FIND_IN_SET(#{req.type}, b.type)
) AND a.del_flag = '0'
<if test="req.type != null">
AND (
<foreach item="type" collection="req.type.split(',')" separator=" OR ">
FIND_IN_SET(#{type}, b.type)
</foreach>
)
</if>
) AND a.del_flag = 0
<if test="req.type!= null and req.type.indexOf('0') != -1">
and cr.del_flag=0
</if>
<if test="req.type!= null and req.type.indexOf('1') != -1">
and pr.del_flag=0
</if>
<if test="req.type!= null and req.type.indexOf('2') != -1">
and ac.del_flag=0
</if>
<if test="req.type!= null and req.type.indexOf('3') != -1">
and em.del_flag=0
</if>
<if test="req.type!= null and req.type.indexOf('4') != -1">
and ap.del_flag=0
</if>
<if test="req.nickName != null and req.nickName != '' ">
and a.nick_name like concat('%',#{req.nickName},'%')

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
Unescape View File

@ -115,7 +115,7 @@ public class SecurityConfig
// 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
// .antMatchers("/unit/assetTask/**","/tc/**","/unit/assetLc/**","/tc/unit/**").permitAll()
.antMatchers("/unit/assetTask/**","/tc/**","/unit/assetLc/**","/tc/unit/**").permitAll()
// 除上面外的所有请求全部需要鉴权认证
.antMatchers("/tc/without/**").permitAll()
.anyRequest().authenticated();

Write Preview
Loading…
Cancel
Save