fuliqi
2025-02-19 b5d319285186901e6b8f958d1a815c6aa592f0e4
新增行业主管部门
10个文件已修改
47 ■■■■■ 已修改文件
business/src/main/java/com/ycl/domain/entity/ProjectInfo.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/resources/mapper/ProjectInfoMapper.xml 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
start/src/main/java/com/ycl/web/controller/system/SysUserController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
system/src/main/java/com/ycl/system/mapper/SysUserMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
system/src/main/java/com/ycl/system/service/ISysUserService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
system/src/main/java/com/ycl/system/service/impl/SysUserServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
system/src/main/resources/mapper/system/SysUserMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.system.domain.base.AbsEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -155,4 +156,10 @@
    @TableField("remark")
    /** 审核信息 */
    private String remark;
    @TableField("industry_competent_department")
    private Long industryCompetentDepartment;
    @TableField("industry_competent_department_person")
    private Long industryCompetentDepartmentPerson;
    @TableField("department_person_phone")
    private String departmentPersonPhone;
}
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
@@ -134,6 +134,13 @@
    @ApiModelProperty("赋码")
    private String coding;
    @ApiModelProperty("行业主管部门")
    private Long industryCompetentDepartment;
    @ApiModelProperty("行业主管部门联系人")
    private Long industryCompetentDepartmentPerson;
    @ApiModelProperty("行业主管部门联系方式")
    private String departmentPersonPhone;
    private String remark;
    public static ProjectInfo getEntityByForm(@NonNull ProjectInfoForm form, ProjectInfo entity) {
        if(entity == null) {
business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
@@ -169,6 +169,14 @@
    @ApiModelProperty("文件")
    private List<File> fileList;
    @ApiModelProperty("行业主管部门")
    private Long industryCompetentDepartment;
    @ApiModelProperty("行业主管部门联系人")
    private Long industryCompetentDepartmentPerson;
    @ApiModelProperty("行业主管部门联系方式")
    private String departmentPersonPhone;
    private Integer usedStatus;
    private String remark;
    private Long processId;
business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -47,7 +47,10 @@
            TPI.update_by,
            TPI.create_by,
            TPI.remark,
            TPI.id
            TPI.id,
            TPI.industry_competent_department,
            TPI.industry_competent_department_person,
            TPI.department_person_phone
        FROM
            t_project_info TPI
        WHERE
start/src/main/java/com/ycl/web/controller/system/SysUserController.java
@@ -251,4 +251,9 @@
    public AjaxResult flowDeptTree(SysDept dept) {
        return success(deptService.flowDeptTree(dept));
    }
    @GetMapping("/getByDept/{deptId}")
    public AjaxResult getByDept(@PathVariable Long deptId) {
        return success(userService.getByDept(deptId));
    }
}
system/src/main/java/com/ycl/system/mapper/SysUserMapper.java
@@ -126,4 +126,7 @@
     * @return 结果
     */
    public SysUser checkEmailUnique(String email);
    List<SysUser> getByDept(Long deptId);
}
system/src/main/java/com/ycl/system/service/ISysUserService.java
@@ -213,4 +213,6 @@
     * @return 结果
     */
    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
    List<SysUser> getByDept(Long deptId);
}
system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
@@ -414,4 +414,6 @@
        }).collect(Collectors.toList());
        return list;
    }
}
system/src/main/java/com/ycl/system/service/impl/SysUserServiceImpl.java
@@ -551,4 +551,9 @@
        }
        return successMsg.toString();
    }
    @Override
    public List<SysUser> getByDept(Long deptId) {
        return userMapper.getByDept(deptId);
    }
}
system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -226,4 +226,7 @@
        </foreach>
     </delete>
    <select id="getByDept" resultMap="SysUserResult">
        select * from sys_user where dept_id = #{deptId}
    </select>
</mapper>