企业列表出来了
parent
f6f57905de
commit
8ac68b8c9a
|
|
@ -5,22 +5,8 @@
|
|||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="72651396-d9d2-4022-b080-e21d75d1bedb" name="更改" comment="企业列表出来了">
|
||||
<change afterPath="$PROJECT_DIR$/.idea/shelf/_2024_9_1_11_32____.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cloud-market-common/src/main/java/com/muyu/market/domain/SysDatawarehouse.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cloud-market-server/src/main/java/com/muyu/market/controller/SysDatawarehouseController.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cloud-market-server/src/main/java/com/muyu/market/mapper/SysDatawarehouseMapper.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cloud-market-server/src/main/java/com/muyu/market/service/ISysDatawarehouseService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cloud-market-server/src/main/java/com/muyu/market/service/impl/SysDatawarehouseServiceImpl.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cloud-market-server/src/main/resources/mapper/market/SysDatawarehouseMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/cloud-market-common/src/main/java/com/muyu/market/domain/SysFirm.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-market-common/src/main/java/com/muyu/market/domain/SysFirm.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/cloud-market-server/src/main/java/com/muyu/market/controller/SysFirminfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-market-server/src/main/java/com/muyu/market/controller/SysFirminfoController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/cloud-market-server/src/main/java/com/muyu/market/mapper/SysApitypeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-market-server/src/main/java/com/muyu/market/mapper/SysApitypeMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/cloud-market-server/src/main/java/com/muyu/market/service/ISysFirminfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-market-server/src/main/java/com/muyu/market/service/ISysFirminfoService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/cloud-market-server/src/main/java/com/muyu/market/service/impl/SysFirminfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-market-server/src/main/java/com/muyu/market/service/impl/SysFirminfoServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/cloud-market-server/src/main/resources/mapper/market/SysFirminfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-market-server/src/main/resources/mapper/market/SysFirminfoMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/logs/cloud-system/error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/cloud-system/error.log" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/logs/cloud-system/info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/cloud-system/info.log" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -75,19 +61,19 @@
|
|||
<component name="ProjectViewState">
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"WebServerToolWindowFactoryState": "false",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"settings.editor.selected.configurable": "MavenSettings",
|
||||
"spring.configuration.checksum": "647853898192e405c7aff8ecac5564ea",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"WebServerToolWindowFactoryState": "false",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"settings.editor.selected.configurable": "MavenSettings",
|
||||
"spring.configuration.checksum": "647853898192e405c7aff8ecac5564ea",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
}
|
||||
}]]></component>
|
||||
}</component>
|
||||
<component name="ReactorSettings">
|
||||
<option name="notificationShown" value="true" />
|
||||
</component>
|
||||
|
|
@ -167,7 +153,8 @@
|
|||
<workItem from="1725015154229" duration="1487000" />
|
||||
<workItem from="1725017183608" duration="6254000" />
|
||||
<workItem from="1725242763338" duration="3072000" />
|
||||
<workItem from="1725247138979" duration="444000" />
|
||||
<workItem from="1725247138979" duration="2255000" />
|
||||
<workItem from="1725258712426" duration="3588000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="初始化">
|
||||
<created>1724047244829</created>
|
||||
|
|
@ -344,7 +331,14 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1725161627925</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="26" />
|
||||
<task id="LOCAL-00026" summary="企业列表出来了">
|
||||
<created>1725247697205</created>
|
||||
<option name="number" value="00026" />
|
||||
<option name="presentableId" value="LOCAL-00026" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1725247697205</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="27" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
|
|
|
|||
|
|
@ -76,6 +76,10 @@ public class SysFirm {
|
|||
@Excel(name = "余额")
|
||||
private BigDecimal firmScore;
|
||||
|
||||
@TableField(exist = false)
|
||||
private SysUser sysUser;
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,114 @@
|
|||
package com.muyu.market.domain;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.muyu.common.core.annotation.Excel;
|
||||
import com.muyu.common.core.web.domain.BaseEntity;
|
||||
import lombok.*;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
|
||||
/**
|
||||
* 用户信息对象 sys_user
|
||||
*
|
||||
* @author 2112A
|
||||
* @date 2024-09-03
|
||||
*/
|
||||
|
||||
@Data
|
||||
@Setter
|
||||
@Getter
|
||||
@SuperBuilder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@TableName("sys_user")
|
||||
public class SysUser extends BaseEntity{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 用户ID */
|
||||
@TableId( type = IdType.AUTO)
|
||||
private Long userId;
|
||||
|
||||
/** 部门ID */
|
||||
@Excel(name = "部门ID")
|
||||
private Long deptId;
|
||||
|
||||
/** 用户账号 */
|
||||
@Excel(name = "用户账号")
|
||||
private String userName;
|
||||
|
||||
/** 用户昵称 */
|
||||
@Excel(name = "用户昵称")
|
||||
private String nickName;
|
||||
|
||||
/** 用户类型（00系统用户） */
|
||||
@Excel(name = "用户类型", readConverterExp = "0=0系统用户")
|
||||
private String userType;
|
||||
|
||||
/** 用户邮箱 */
|
||||
@Excel(name = "用户邮箱")
|
||||
private String email;
|
||||
|
||||
/** 手机号码 */
|
||||
@Excel(name = "手机号码")
|
||||
private String phonenumber;
|
||||
|
||||
/** 用户性别（0男 1女 2未知） */
|
||||
@Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
|
||||
private String sex;
|
||||
|
||||
/** 头像地址 */
|
||||
@Excel(name = "头像地址")
|
||||
private String avatar;
|
||||
|
||||
/** 密码 */
|
||||
@Excel(name = "密码")
|
||||
private String password;
|
||||
|
||||
/** 帐号状态（0正常 1停用） */
|
||||
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
|
||||
private String status;
|
||||
|
||||
/** 删除标志（0代表存在 2代表删除） */
|
||||
private String delFlag;
|
||||
|
||||
/** 最后登录IP */
|
||||
@Excel(name = "最后登录IP")
|
||||
private String loginIp;
|
||||
|
||||
/** 最后登录时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date loginDate;
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("userId", getUserId())
|
||||
.append("deptId", getDeptId())
|
||||
.append("userName", getUserName())
|
||||
.append("nickName", getNickName())
|
||||
.append("userType", getUserType())
|
||||
.append("email", getEmail())
|
||||
.append("phonenumber", getPhonenumber())
|
||||
.append("sex", getSex())
|
||||
.append("avatar", getAvatar())
|
||||
.append("password", getPassword())
|
||||
.append("status", getStatus())
|
||||
.append("delFlag", getDelFlag())
|
||||
.append("loginIp", getLoginIp())
|
||||
.append("loginDate", getLoginDate())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("remark", getRemark())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
|
|
@ -87,6 +87,15 @@
|
|||
<artifactId>cloud-common-xxl</artifactId>
|
||||
<version>3.6.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.yulichang</groupId>
|
||||
<artifactId>mybatis-plus-join</artifactId>
|
||||
<version>1.2.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<finalName>cloud-market</finalName>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,20 @@
|
|||
package com.muyu.market.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.github.yulichang.query.MPJQueryWrapper;
|
||||
import com.muyu.market.domain.SysFirm;
|
||||
import com.muyu.market.domain.SysUser;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
@Service
|
||||
public interface SysFirminfoMapper extends BaseMapper<SysFirm> {
|
||||
public interface SysFirminfoMapper extends MPJBaseMapper<SysFirm> {
|
||||
|
||||
List<SysFirm> selectSysApitypeList(SysFirm sysFirm);
|
||||
|
||||
SysFirm selectSysFirminfoListByUserId(Long adminsid);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ public class SysFirminfoServiceImpl
|
|||
{
|
||||
LambdaQueryWrapper<SysFirm> queryWrapper = new LambdaQueryWrapper<>();
|
||||
Assert.notNull(adminsid, "adminsid不可为空");
|
||||
queryWrapper.eq(SysFirm::getFirmId, adminsid);
|
||||
return this.getOne(queryWrapper);
|
||||
queryWrapper.eq(SysFirm::getAdminsid, adminsid);
|
||||
return sysFirminfoMapper.selectSysFirminfoListByUserId(adminsid);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -69,4 +69,6 @@ public class SysFirminfoServiceImpl
|
|||
return this.count(queryWrapper) > 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,4 +24,8 @@
|
|||
<include refid="selectSysFirminfoVo"/>
|
||||
|
||||
</select>
|
||||
<select id="selectSysFirminfoListByUserId" resultType="com.muyu.market.domain.SysFirm">
|
||||
select firm_id, adminsid,firm_tem, names, position, firm_region, firm_from, social_reputation, business_license, firm_time, firm_score , sys_user.nick_name, sys_user.avatar, sys_user.phonenumber from sys_firminfo left join sys_user on sys_user.user_id = sys_firminfo.adminsid
|
||||
where adminsid = #{adminsid}
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue