diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java index d1fdb1009..df9ae6b5c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java @@ -198,14 +198,39 @@ public class EnterpriseInfo implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "是否是项目部公司，1否，2是") - private java.lang.Integer departmentType; + private java.lang.Integer departmentType; - @TableField(exist = false) - @ApiModelProperty(value = "项目负责人列表") - private List personList; + @TableField(exist = false) + @ApiModelProperty(value = "项目负责人列表") + private List personList; + + @TableField(exist = false) + private String companyTypeName; + @TableField(exist = false) + private String projectEnterpriseId; + + /** + * xz_supplier_type表外键 + */ + @TableField(exist = false) + @ApiModelProperty(value = "企业类型Id") + private java.lang.Long xzSupplierTypeId; + + /** + * xz_supplier_type表外键 + */ + @TableField(exist = false) + @ApiModelProperty(value = "父级企业ID") + private java.lang.Long pid; + + @TableField(exist = false) + @ApiModelProperty(value = "企业类型名称") + private java.lang.String xzSupplierTypeName; + @TableField(exist = false) + private String xzUserToSupplierId; + + @TableField(exist = false) + @ApiModelProperty(value = "用户id") + private java.lang.Long userId; - @TableField(exist = false) - private String companyTypeName; - @TableField(exist = false) - private String projectEnterpriseId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/EnterpriseInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/EnterpriseInfoMapper.java index 26062af06..acc5de0cc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/EnterpriseInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/EnterpriseInfoMapper.java @@ -33,4 +33,14 @@ public interface EnterpriseInfoMapper extends BaseMapper { List> selectDepartmentEnterpriseList(Map map); List> selectChildrenDepartmentEnterpriseList(Map map); + + List getXzSupplierList(@Param("map") Map map); + + IPage getXzSupplierPage(@Param("map") Map map, @Param("page") Page qp); + + EnterpriseInfo getXzSupplierByUserId(Map map); + + EnterpriseInfo getXzSupplierBySocialCode(Map map); + + List getAllXzSupplierList(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml index fb82f1ce3..ad15c3c6d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml @@ -72,11 +72,67 @@ + + SELECT a.*,b.user_id,c.company_type_name + xz_supplier_type_name,b.xz_supplier_type_id,b.project_director_name,b.sort_num, + b.project_director_phone,b.pid,b.xz_supplier_id,b.department_type + from enterprise_info a INNER JOIN xz_user_to_supplier b ON a.id=b.xz_supplier_id + LEFT JOIN xz_supplier_type c ON b.xz_supplier_type_id=c.id + WHERE b.user_id=#{map.userId} + + and a.enterprise_name like CONCAT(CONCAT('%',#{map.enterpriseName}),'%') + + + and b.xz_supplier_type_id=#{map.xzSupplierTypeId} + + + and FIND_IN_SET(a.id,#{map.userXzSupplierId}) + + + and a.id in + + #{item} + + + order by b.sort_num + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierController.java index c2d4c88b6..26e4271e7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierController.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.xz.entity.XzSupplier; +import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo; import com.zhgd.xmgl.modules.xz.service.IXzSupplierService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -93,7 +93,7 @@ public class XzSupplierController { @OperLog(operModul = "供应商管理", operType = "添加星纵-供应商", operDesc = "添加星纵-供应商") @ApiOperation(value = "添加星纵-供应商信息", notes = "添加星纵-供应商信息", httpMethod = "POST") @PostMapping(value = "/add") - public Result add(@RequestBody XzSupplier xzSupplier) { + public Result add(@RequestBody EnterpriseInfo xzSupplier) { xzSupplierService.saveXzSupplier(xzSupplier); return Result.ok(); } @@ -107,7 +107,7 @@ public class XzSupplierController { @OperLog(operModul = "供应商管理", operType = "编辑星纵-供应商", operDesc = "编辑星纵-供应商") @ApiOperation(value = "编辑星纵-供应商信息", notes = "编辑星纵-供应商信息", httpMethod = "POST") @PostMapping(value = "/edit") - public Result edit(@RequestBody XzSupplier xzSupplier) { + public Result edit(@RequestBody EnterpriseInfo xzSupplier) { xzSupplierService.updateXzSupplier(xzSupplier); return Result.ok(); } @@ -115,7 +115,7 @@ public class XzSupplierController { @OperLog(operModul = "供应商管理", operType = "保存星纵-供应商", operDesc = "保存星纵-供应商") @ApiOperation(value = "保存星纵-供应商信息", notes = "保存星纵-供应商信息", httpMethod = "POST") @PostMapping(value = "/saveSupplier") - public Result saveSupplier(@RequestBody XzSupplier xzSupplier) { + public Result saveSupplier(@RequestBody EnterpriseInfo xzSupplier) { xzSupplierService.saveSupplier(xzSupplier); return Result.ok(); } @@ -128,7 +128,7 @@ public class XzSupplierController { @ApiImplicitParam(name = "projectSn", value = "项目sN", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { + public Result delete(@RequestBody Map map) { xzSupplierService.removeXzSupplier(map); return Result.ok(); } @@ -139,7 +139,7 @@ public class XzSupplierController { @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/getXzSupplierByUserId") - public Result getXzSupplierByUserId(@RequestBody Map map) { + public Result getXzSupplierByUserId(@RequestBody Map map) { return Result.success(xzSupplierService.getXzSupplierByUserId(map)); } @@ -149,7 +149,7 @@ public class XzSupplierController { @ApiImplicitParam(name = "socialCode", value = "社会统一信用代码", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/getXzSupplierBySocialCode") - public Result getXzSupplierBySocialCode(@RequestBody Map map) { + public Result getXzSupplierBySocialCode(@RequestBody Map map) { return Result.success(xzSupplierService.getXzSupplierBySocialCode(map)); } @@ -159,7 +159,7 @@ public class XzSupplierController { @ApiImplicitParam(name = "headquartersSn", value = "总公司sn", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/getAllXzSupplierList") - public Result> getAllXzSupplierList(@RequestBody Map map) { + public Result> getAllXzSupplierList(@RequestBody Map map) { return Result.success(xzSupplierService.getAllXzSupplierList(map)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzUserToSupplierController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzUserToSupplierController.java index 0f59a352e..4819c9647 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzUserToSupplierController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzUserToSupplierController.java @@ -5,7 +5,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.project.entity.XzUserToSupplier; -import com.zhgd.xmgl.modules.xz.entity.XzSupplier; +import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo; import com.zhgd.xmgl.modules.xz.service.IXzUserToSupplierService; import com.zhgd.xmgl.util.MessageUtil; import io.swagger.annotations.Api; @@ -51,8 +51,8 @@ public class XzUserToSupplierController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), }) @PostMapping(value = "/list") - public Result> queryPageList(@RequestBody Map map) { - IPage pageList = xzUserToSupplierService.selectXzUserToSupplierPage(map); + public Result> queryPageList(@RequestBody Map map) { + IPage pageList = xzUserToSupplierService.selectXzUserToSupplierPage(map); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplier.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplier.java deleted file mode 100644 index 0795a04fb..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplier.java +++ /dev/null @@ -1,225 +0,0 @@ -package com.zhgd.xmgl.modules.xz.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; - -import java.io.Serializable; - -/** - * @Description: 星纵-供应商 - * @author： pds - * @date： 2020-08-13 - * @version： V1.0 - */ -@Data -@TableName("xz_supplier") -@ApiModel(value = "XzSupplier实体类", description = "XzSupplier") -public class XzSupplier implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * 企业账号表 - */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "企业账号表") - private java.lang.Long id; - /** - * 企业名称 - */ - @Excel(name = "企业名称", width = 15) - @ApiModelProperty(value = "企业名称") - private java.lang.String enterpriseName; - - /** - * 描述 - */ - @Excel(name = "描述", width = 15) - @ApiModelProperty(value = "描述") - private java.lang.String description; - /** - * 企业地址 - */ - @Excel(name = "企业地址", width = 15) - @ApiModelProperty(value = "企业地址") - private java.lang.String enterpriseAddress; - /** - * 法定代表人 - */ - @Excel(name = "法定代表人", width = 15) - @ApiModelProperty(value = "法定代表人") - private java.lang.String enterpriseLegalPerson; - /** - * 法定人证件号 - */ - @Excel(name = "法定人证件号", width = 15) - @ApiModelProperty(value = "法定人证件号") - private java.lang.String legalPersonIdCard; - /** - * 企业安全生产许可证 - */ - @Excel(name = "企业安全生产许可证", width = 15) - @ApiModelProperty(value = "企业安全生产许可证") - private java.lang.String enterpriseSafeAllow; - /** - * 单位性质 1.国有企业 2三资企业 3集体企业 4私营企业 - */ - @Excel(name = "单位性质 1.国有企业 2三资企业 3集体企业 4私营企业", width = 15) - @ApiModelProperty(value = "单位性质 1.国有企业 2三资企业 3集体企业 4私营企业") - private java.lang.Integer enterpriseProperty; - /** - * 法人电话 - */ - @Excel(name = "法人电话", width = 15) - @ApiModelProperty(value = "法人电话") - private java.lang.String legalPersonTel; - /** - * 社会统一信用代码 - */ - @Excel(name = "社会统一信用代码", width = 15) - @ApiModelProperty(value = "社会统一信用代码") - private java.lang.String socialCode; - /** - * 营业执照注册号 - */ - @Excel(name = "营业执照注册号", width = 15) - @ApiModelProperty(value = "营业执照注册号") - private java.lang.String businessNumber; - /** - * 资质证书号 - */ - @Excel(name = "资质证书号", width = 15) - @ApiModelProperty(value = "资质证书号") - private java.lang.String qualificationNumber; - /** - * 企业邮箱 - */ - @Excel(name = "企业邮箱", width = 15) - @ApiModelProperty(value = "企业邮箱") - private java.lang.String enterpriseEmail; - /** - * 注册资金 - */ - @Excel(name = "注册资金", width = 15) - @ApiModelProperty(value = "注册资金") - private java.lang.String registeredCapital; - /** - * 开户行 - */ - @Excel(name = "开户行", width = 15) - @ApiModelProperty(value = "开户行") - private java.lang.String bankname; - /** - * 银行卡号 - */ - @Excel(name = "银行卡号", width = 15) - @ApiModelProperty(value = "银行卡号") - private java.lang.String bankcardnumber; - /** - * 银行代码 - */ - @Excel(name = "银行代码", width = 15) - @ApiModelProperty(value = "银行代码") - private java.lang.String bankcode; - /** - * 企业资质图片地址 - */ - @Excel(name = "企业资质图片地址", width = 15) - @ApiModelProperty(value = "企业资质图片地址") - private java.lang.String enterpriseQualificationUrl; - /** - * 营业执照截止日期 - */ - @Excel(name = "营业执照截止日期", width = 15) - @ApiModelProperty(value = "营业执照截止日期") - private java.lang.String businessLicenseEndDate; - - /** - * 注册人姓名 - */ - @Excel(name = "注册人姓名", width = 15) - @ApiModelProperty(value = "注册人姓名") - private java.lang.String registerPersonName; - /** - * 注册人电话 - */ - @Excel(name = "注册人电话 ", width = 15) - @ApiModelProperty(value = "注册人电话 ") - private java.lang.String registerPersonPhoneTel; - /** - * 企业sn - */ - @Excel(name = "企业sn", width = 15) - @ApiModelProperty(value = "企业sn") - private java.lang.String enterpriseSn; - /** - * logo - */ - @Excel(name = "logo", width = 15) - @ApiModelProperty(value = "logo") - private java.lang.String logo; - /** - * 企业注册日期 - */ - @Excel(name = "企业注册日期", width = 15) - @ApiModelProperty(value = "企业注册日期") - private java.lang.String registDate; - @Excel(name = "营业执照图片地址", width = 15) - @ApiModelProperty(value = "营业执照图片地址") - private java.lang.String businessLicenseUrl; - - /** - * xz_supplier_type表外键 - */ - @TableField(exist = false) - @ApiModelProperty(value = "企业类型Id") - private java.lang.Long xzSupplierTypeId; - - /** - * xz_supplier_type表外键 - */ - @TableField(exist = false) - @ApiModelProperty(value = "父级企业ID") - private java.lang.Long pid; - - @TableField(exist = false) - @ApiModelProperty(value = "排序") - private java.lang.Integer sortNum; - - @TableField(exist = false) - @ApiModelProperty(value = "企业类型名称") - private java.lang.String xzSupplierTypeName; - - @TableField(exist = false) - @ApiModelProperty(value = "类型，1项目，2企业") - private java.lang.Integer type; - - @TableField(exist = false) - @ApiModelProperty(value = "项目负责人") - private java.lang.String projectDirectorName; - - @TableField(exist = false) - @ApiModelProperty(value = "项目负责人电话") - private java.lang.String projectDirectorPhone; - - @TableField(exist = false) - @ApiModelProperty(value = "是否是项目部公司，1否，2是") - private java.lang.Integer departmentType; - - @TableField(exist = false) - private String companyTypeName; - @TableField(exist = false) - private String xzUserToSupplierId; - - @TableField(exist = false) - @ApiModelProperty(value = "用户id") - private java.lang.Long userId; - -} - - diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierMapper.java deleted file mode 100644 index 4ffcec18a..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.zhgd.xmgl.modules.xz.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.xz.entity.XzSupplier; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -/** - * @Description: 星纵-供应商 - * @author： pds - * @date： 2020-08-13 - * @version： V1.0 - */ -@Mapper -public interface XzSupplierMapper extends BaseMapper { - - List getXzSupplierList(@Param("map") Map map); - - IPage getXzSupplierPage(@Param("map") Map map, @Param("page") Page qp); - - XzSupplier getXzSupplierByUserId(Map map); - - XzSupplier getXzSupplierBySocialCode(Map map); - - List getAllXzSupplierList(Map map); - - List> selectDepartmentXzSupplierList(Map map); - - List> selectChildrenDepartmentXzSupplierList(Map map); -} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzUserToSupplierMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzUserToSupplierMapper.java index 631acc49a..dad9e4423 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzUserToSupplierMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzUserToSupplierMapper.java @@ -5,7 +5,7 @@ import java.util.Map; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.xz.entity.XzSupplier; +import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.zhgd.xmgl.modules.project.entity.XzUserToSupplier; @@ -22,7 +22,7 @@ import org.springframework.stereotype.Repository; @Repository public interface XzUserToSupplierMapper extends BaseMapper { - List selectXzUserToSupplierPage(Page page, @Param("param") Map map); + List selectXzUserToSupplierPage(Page page, @Param("param") Map map); List selectXzUserToSupplierList(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierMapper.xml deleted file mode 100644 index 3cbfe86c7..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierMapper.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - SELECT a.*,b.user_id,c.company_type_name - xz_supplier_type_name,b.xz_supplier_type_id,b.project_director_name,b.sort_num, - b.project_director_phone,b.pid,b.xz_supplier_id,b.department_type - from xz_supplier a INNER JOIN xz_user_to_supplier b ON a.id=b.xz_supplier_id - LEFT JOIN xz_supplier_type c ON b.xz_supplier_type_id=c.id - WHERE b.user_id=#{map.userId} - - and a.enterprise_name like CONCAT(CONCAT('%',#{map.enterpriseName}),'%') - - - and b.xz_supplier_type_id=#{map.xzSupplierTypeId} - - - and FIND_IN_SET(a.id,#{map.userXzSupplierId}) - - - and a.id in - - #{item} - - - order by b.sort_num - - - - - - - - - diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzUserToSupplierMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzUserToSupplierMapper.xml index 3a57567c5..326b91bbf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzUserToSupplierMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzUserToSupplierMapper.xml @@ -1,7 +1,7 @@ - SELECT a.*, b.id xz_user_to_supplier_id, @@ -12,7 +12,7 @@ b.parent_xz_supplier_id, b.sort_num, b.department_type - FROM xz_supplier a + FROM enterprise_info a LEFT JOIN xz_user_to_supplier b ON a.id = b.xz_supplier_id LEFT JOIN xz_supplier_type c ON b.xz_supplier_type_id = c.id WHERE b.project_sn = #{param.projectSn} @@ -37,7 +37,7 @@ c.company_type_name, b.project_director_name, b.project_director_phone - FROM xz_supplier a + FROM enterprise_info a LEFT JOIN xz_user_to_supplier b ON a.id = b.xz_supplier_id LEFT JOIN xz_supplier_type c ON b.xz_supplier_type_id = c.id WHERE b.project_sn = #{sn} @@ -55,7 +55,7 @@