admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

主管

Browse Source
This commit is contained in:
GUO 2024-04-30 20:32:53 +08:00
parent 9c00f94cd1
commit c00e29f3dc
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
View File

@ -166,6 +166,7 @@ public class SystemUserController {
@ApiImplicitParam(name = "workerId", required = false, value = "劳务人员id", paramType = "body"), @ApiImplicitParam(name = "workerId", required = false, value = "劳务人员id", paramType = "body"),
@ApiImplicitParam(name = "enterpriseId", required = false, value = "企业id（多个，分割）", paramType = "body"), @ApiImplicitParam(name = "enterpriseId", required = false, value = "企业id（多个，分割）", paramType = "body"),
@ApiImplicitParam(name = "enterpriseTypeId", required = false, value = "企业类型id", paramType = "body"), @ApiImplicitParam(name = "enterpriseTypeId", required = false, value = "企业类型id", paramType = "body"),
@ApiImplicitParam(name = "xzProjectOrgId", required = false, value = "星纵-项目组织机构id", paramType = "body"),
}) })
@PostMapping(value = "/getProjectChilderSystemUserList") @PostMapping(value = "/getProjectChilderSystemUserList")
public Result<List<SystemUser>> getProjectChilderSystemUserList(@RequestBody Map<String, Object> map) { public Result<List<SystemUser>> getProjectChilderSystemUserList(@RequestBody Map<String, Object> map) {

4
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
View File

@ -18,6 +18,7 @@
LEFT JOIN xz_project_org po on po.id=a.xz_project_org_id LEFT JOIN xz_project_org po on po.id=a.xz_project_org_id
LEFT JOIN enterprise_info ei on ei.id=d.enterprise_id LEFT JOIN enterprise_info ei on ei.id=d.enterprise_id
LEFT JOIN project_enterprise pe on pe.enterprise_id=ei.id and pe.project_sn=a.sn LEFT JOIN project_enterprise pe on pe.enterprise_id=ei.id and pe.project_sn=a.sn
left join xz_project_org po on po.id=a.xz_project_org_id
WHERE a.sn = #{projectSn} WHERE a.sn = #{projectSn}
and a.account_type = 6 and a.account_type = 6
<if test="workerName != null and workerName != ''"> <if test="workerName != null and workerName != ''">
@ -35,6 +36,9 @@
<if test="enterpriseTypeId != null and enterpriseTypeId != ''"> <if test="enterpriseTypeId != null and enterpriseTypeId != ''">
and pe.enterprise_type_id = #{enterpriseTypeId} and pe.enterprise_type_id = #{enterpriseTypeId}
</if> </if>
<if test="xzProjectOrgId != null and xzProjectOrgId != ''">
and po.id = #{xzProjectOrgId}
</if>
</select> </select>
<select id="findByUsername" resultType="com.zhgd.xmgl.modules.basicdata.entity.SystemUser" parameterType="string"> <select id="findByUsername" resultType="com.zhgd.xmgl.modules.basicdata.entity.SystemUser" parameterType="string">
select * select *

8
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzProjectOrg.java
View File

@ -57,11 +57,11 @@ public class XzProjectOrg implements Serializable {
@ApiModelProperty(value = "显示顺序") @ApiModelProperty(value = "显示顺序")
private java.lang.Integer orderNum; private java.lang.Integer orderNum;
/** /**
* 负责人 * 主管id
*/ */
@Excel(name = "负责人", width = 15) @Excel(name = "主管id", width = 15)
@ApiModelProperty(value = "负责人") @ApiModelProperty(value = "主管id")
private java.lang.String leader; private java.lang.Long leader;
/** /**
* 联系电话 * 联系电话
*/ */