记得上下班打卡 | git大法好,push需谨慎

Commit 91154bde authored by sunyuntian's avatar sunyuntian

exit

parent dfe272cc
...@@ -13,14 +13,8 @@ import java.time.LocalDateTime; ...@@ -13,14 +13,8 @@ import java.time.LocalDateTime;
* @since 2022-03-14 * @since 2022-03-14
*/ */
@Data @Data
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class SmileOrganizationVo{ public class SmileOrganizationVo{
private static final long serialVersionUID = 1L;
private Long id; private Long id;
/** /**
......
...@@ -46,7 +46,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM ...@@ -46,7 +46,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
List<SmileOrganization> smileOrganizations = smileOrganizationMapper.selectOrganizationList(map); List<SmileOrganization> smileOrganizations = smileOrganizationMapper.selectOrganizationList(map);
List<SmileOrganizationVo> smileOrganizationVos = smileOrganizations.stream().map(smileOrganization -> { List<SmileOrganizationVo> smileOrganizationVos = smileOrganizations.stream().map(smileOrganization -> {
SmileOrganizationVo smileOrganizationVo = new SmileOrganizationVo(); SmileOrganizationVo smileOrganizationVo = new SmileOrganizationVo();
BeanUtils.copyBeanProp(smileOrganization, smileOrganizationVo); BeanUtils.copyProperties(smileOrganization, smileOrganizationVo);
log.info("organizationList orgId:{}", smileOrganization.getId()); log.info("organizationList orgId:{}", smileOrganization.getId());
//关联查询人数 //关联查询人数
smileOrganizationVo.setProper(smileUserMapper.strip(smileOrganization.getId())); smileOrganizationVo.setProper(smileUserMapper.strip(smileOrganization.getId()));
......
...@@ -71,11 +71,11 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile ...@@ -71,11 +71,11 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
queryWrapper.eq(SmileSchool::getName, smileSchool.getName()); queryWrapper.eq(SmileSchool::getName, smileSchool.getName());
if (smileSchoolMapper.selectOne(queryWrapper) == null) { if (smileSchoolMapper.selectOne(queryWrapper) == null) {
int id = smileSchoolMapper.insert(smileSchool); int id = smileSchoolMapper.insert(smileSchool);
if (id > 0) { if (id > 0 && redisSchoolTag) {
//查询二十个学校放入redis中 //查询二十个学校放入redis中
updateSchoolRedis(); updateSchoolRedis();
return true;
} }
return true;
} }
return false; return false;
} }
......
...@@ -75,7 +75,7 @@ public class SmileOrganization implements Serializable { ...@@ -75,7 +75,7 @@ public class SmileOrganization implements Serializable {
/** /**
* 总代理名称 * 总代理名称
*/ */
private Long agentName; private String agentName;
/** /**
* 0:未删除,1:已删除 * 0:未删除,1:已删除
......
...@@ -3,6 +3,7 @@ package com.liquidnet.service.smile.mapper; ...@@ -3,6 +3,7 @@ package com.liquidnet.service.smile.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.smile.entity.SmileSchool; import com.liquidnet.service.smile.entity.SmileSchool;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -20,4 +21,5 @@ public interface SmileSchoolMapper extends BaseMapper<SmileSchool> { ...@@ -20,4 +21,5 @@ public interface SmileSchoolMapper extends BaseMapper<SmileSchool> {
List<SmileSchool> selectListLimit(); List<SmileSchool> selectListLimit();
List<SmileSchool> selectSchoolList(Map<String, Object> map); List<SmileSchool> selectSchoolList(Map<String, Object> map);
} }
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<mapper namespace="com.liquidnet.service.smile.mapper.SmileOrganizationMapper"> <mapper namespace="com.liquidnet.service.smile.mapper.SmileOrganizationMapper">
<select id="selectOrganizationList" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileOrganization"> <select id="selectOrganizationList" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileOrganization">
select * from smilt_organization select * from smile_organization
<where> <where>
<if test="name!=''"> <if test="name!=''">
and `name` like concat('%',#{name},'%') and `name` like concat('%',#{name},'%')
......
...@@ -15,4 +15,5 @@ ...@@ -15,4 +15,5 @@
</if> </if>
</where> </where>
</select> </select>
</mapper> </mapper>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</resultMap> </resultMap>
<select id="strip" resultType="Integer"> <select id="strip" resultType="Integer">
select count from smile_user where org_id = #{orgId}; select count(*) from smile_user where org_id = #{orgId};
</select> </select>
<select id="selectUserNameById" resultType="String"> <select id="selectUserNameById" resultType="String">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment