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

承包商入场审批

Browse Source
This commit is contained in:
guoshengxiong 2024-07-19 19:24:41 +08:00
parent 09bb7355cb
commit 3b2975bafe
41 changed files with 1058 additions and 550 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/modules/worker/controller/EnterpriseQualificationController.java
View File

@ -46,9 +46,10 @@ public class EnterpriseQualificationController {
@ApiImplicitParam(name = "enterpriseId", value = "所属劳务公司id", paramType = "body", required = true, dataType = "String")
@PostMapping(value = "/list")
public Result<List<EnterpriseQualification>> selectEnterpriseBadRecordList(@RequestBody Map<String, Object> map) {
Result<List<EnterpriseQualification>> result = new Result<List<EnterpriseQualification>>();
Result<List<EnterpriseQualification>> result = new Result<>();
QueryWrapper<EnterpriseQualification> queryWrapper = QueryGenerator.initPageQueryWrapper(EnterpriseQualification.class, map);
List<EnterpriseQualification> pageList = enterpriseQualificationService.list(queryWrapper);
queryWrapper.orderByDesc("t.create_time");
List<EnterpriseQualification> pageList = enterpriseQualificationService.selectEnterpriseBadRecordList(queryWrapper,map);
result.setSuccess(true);
result.setResult(pageList);
return result;

131
src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectEnterpriseSupplierInfoController.java Normal file
View File

@ -0,0 +1,131 @@
package com.zhgd.xmgl.modules.worker.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.modules.worker.entity.ProjectEnterpriseSupplierInfo;
import com.zhgd.xmgl.modules.worker.entity.vo.SaveProjectEnterpriseSupplierInfoListDto;
import com.zhgd.xmgl.modules.worker.service.IProjectEnterpriseSupplierInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.simpleframework.xml.core.Validate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.HashMap;
import java.util.List;
/**
* @Title: Controller
* @Description: 项目劳务公司的承包商项目信息
* @author： pds
* @date： 2024-07-16
* @version： V1.0
*/
@RestController
@RequestMapping("/xmgl/projectEnterpriseSupplierInfo")
@Slf4j
@Api(tags = "项目劳务公司的承包商项目信息相关Api")
public class ProjectEnterpriseSupplierInfoController {
@Autowired
private IProjectEnterpriseSupplierInfoService projectEnterpriseSupplierInfoService;
/**
* 分页列表查询
*
* @return
*/
@OperLog(operModul = "项目劳务公司的承包商项目信息管理", operType = "分页查询", operDesc = "分页列表查询项目劳务公司的承包商项目信息")
@ApiOperation(value = "分页列表查询项目劳务公司的承包商项目信息", notes = "分页列表查询项目劳务公司的承包商项目信息", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@GetMapping(value = "/page")
public Result<IPage<ProjectEnterpriseSupplierInfo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
return Result.success(projectEnterpriseSupplierInfoService.queryPageList(param));
}
/**
* 列表查询
*
* @return
*/
@OperLog(operModul = "项目劳务公司的承包商项目信息管理", operType = "列表查询", operDesc = "列表查询项目劳务公司的承包商项目信息")
@ApiOperation(value = "列表查询项目劳务公司的承包商项目信息", notes = "列表查询项目劳务公司的承包商项目信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<ProjectEnterpriseSupplierInfo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
return Result.success(projectEnterpriseSupplierInfoService.queryList(param));
}
/**
* 添加
*
* @param projectEnterpriseSupplierInfo
* @return
*/
@OperLog(operModul = "项目劳务公司的承包商项目信息管理", operType = "添加", operDesc = "添加项目劳务公司的承包商项目信息")
@ApiOperation(value = "添加项目劳务公司的承包商项目信息", notes = "添加项目劳务公司的承包商项目信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<ProjectEnterpriseSupplierInfo> add(@RequestBody @Validate ProjectEnterpriseSupplierInfo projectEnterpriseSupplierInfo) {
projectEnterpriseSupplierInfoService.add(projectEnterpriseSupplierInfo);
return Result.ok();
}
/**
* 编辑
*
* @param projectEnterpriseSupplierInfo
* @return
*/
@OperLog(operModul = "项目劳务公司的承包商项目信息管理", operType = "编辑", operDesc = "编辑项目劳务公司的承包商项目信息")
@ApiOperation(value = "编辑项目劳务公司的承包商项目信息", notes = "编辑项目劳务公司的承包商项目信息", httpMethod = "POST")
@PostMapping(value = "/edit")
public Result<ProjectEnterpriseSupplierInfo> edit(@RequestBody ProjectEnterpriseSupplierInfo projectEnterpriseSupplierInfo) {
projectEnterpriseSupplierInfoService.edit(projectEnterpriseSupplierInfo);
return Result.ok();
}
/**
* 通过id删除
*
* @return
*/
@OperLog(operModul = "项目劳务公司的承包商项目信息管理", operType = "删除", operDesc = "删除项目劳务公司的承包商项目信息")
@ApiOperation(value = "删除项目劳务公司的承包商项目信息", notes = "删除项目劳务公司的承包商项目信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "项目劳务公司的承包商项目信息ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<ProjectEnterpriseSupplierInfo> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
projectEnterpriseSupplierInfoService.delete(MapUtils.getString(map, "id"));
return Result.ok();
}
/**
* 通过id查询
*
* @param id
* @return
*/
@OperLog(operModul = "项目劳务公司的承包商项目信息管理", operType = "通过id查询", operDesc = "通过id查询项目劳务公司的承包商项目信息")
@ApiOperation(value = "通过id查询项目劳务公司的承包商项目信息", notes = "通过id查询项目劳务公司的承包商项目信息", httpMethod = "GET")
@ApiImplicitParam(name = "id", value = "项目劳务公司的承包商项目信息ID", paramType = "query", required = true, dataType = "Integer")
@GetMapping(value = "/queryById")
public Result<ProjectEnterpriseSupplierInfo> queryById(@RequestParam(name = "id", required = true) String id) {
return Result.success(projectEnterpriseSupplierInfoService.queryById(id));
}
@OperLog(operModul = "项目劳务公司的承包商项目信息管理", operType = "编辑", operDesc = "保存项目劳务公司的承包商项目信息列表")
@ApiOperation(value = "保存项目劳务公司的承包商项目信息列表", notes = "保存项目劳务公司的承包商项目信息列表", httpMethod = "POST")
@PostMapping(value = "/saveList")
public Result saveList(@RequestBody SaveProjectEnterpriseSupplierInfoListDto dto) {
projectEnterpriseSupplierInfoService.saveList(dto);
return Result.ok();
}
}

17
src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseQualification.java
View File

@ -48,9 +48,14 @@ public class EnterpriseQualification implements Serializable {
@Excel(name = "备注", width = 15)
@ApiModelProperty(value="备注")
private java.lang.String remarks;
/**
* 源文件名称
*/
@ApiModelProperty(value = "源文件名称")
private java.lang.String originFileName;
/**
* 创建时间
*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ -64,7 +69,15 @@ public class EnterpriseQualification implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private java.util.Date updateTime;
/**
* 资质类型（字典）
*/
@Excel(name = "资质类型（字典）", width = 15)
@ApiModelProperty(value = "资质类型（字典）")
private java.lang.Integer qualificationType;
@TableField(exist = false)
private Long userId;
@TableField(exist = false)
@ApiModelProperty(value = "资质类型（字典）名称")
private java.lang.String qualificationTypeName;
}

140
src/main/java/com/zhgd/xmgl/modules/worker/entity/ProjectEnterpriseSupplierInfo.java Normal file
View File

@ -0,0 +1,140 @@
package com.zhgd.xmgl.modules.worker.entity;
import java.io.Serializable;
import java.util.Date;
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 lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description: 项目劳务公司的承包商项目信息
* @author： pds
* @date： 2024-07-16
* @version： V1.0
*/
@Data
@TableName("project_enterprise_supplier_info")
@ApiModel(value="ProjectEnterpriseSupplierInfo实体类",description="ProjectEnterpriseSupplierInfo")
public class ProjectEnterpriseSupplierInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value="id")
private java.lang.Long id ;
/**项目sn*/
@Excel(name = "项目sn", width = 15)
@ApiModelProperty(value="项目sn")
private java.lang.String projectSn ;
/**企业Id*/
@Excel(name = "企业Id", width = 15)
@ApiModelProperty(value="企业Id")
private java.lang.Long enterpriseId ;
/**项目经理*/
@Excel(name = "项目经理", width = 15)
@ApiModelProperty(value="项目经理")
private java.lang.String projectManage ;
/**经度*/
@Excel(name = "经度", width = 15)
@ApiModelProperty(value="经度")
private java.lang.String longitude ;
/**纬度*/
@Excel(name = "纬度", width = 15)
@ApiModelProperty(value="纬度")
private java.lang.String latitude ;
/**项目编号*/
@Excel(name = "项目编号", width = 15)
@ApiModelProperty(value="项目编号")
private java.lang.String projectNumber ;
/**项目面积*/
@Excel(name = "项目面积", width = 15)
@ApiModelProperty(value="项目面积")
private java.lang.String projectAcreage ;
/**开工日期*/
@Excel(name = "开工日期", width = 15)
@ApiModelProperty(value="开工日期")
private java.lang.String startWorkDate ;
/**项目联系电话*/
@Excel(name = "项目联系电话", width = 15)
@ApiModelProperty(value="项目联系电话")
private java.lang.String projectTel ;
/**工程类别，1房建，2市政，3安装，4装饰，5公路，6冶炼，7矿山，8化工石油，9水利水电，10电力，11农林，12港口与航道，13航天航空，14通信，15其他*/
@Excel(name = "工程类别，1房建，2市政，3安装，4装饰，5公路，6冶炼，7矿山，8化工石油，9水利水电，10电力，11农林，12港口与航道，13航天航空，14通信，15其他", width = 15)
@ApiModelProperty(value="工程类别，1房建，2市政，3安装，4装饰，5公路，6冶炼，7矿山，8化工石油，9水利水电，10电力，11农林，12港口与航道，13航天航空，14通信，15其他")
private java.lang.Integer projectType ;
/**结构类型,1装配整体式框级结构，2装配整体式剪力墙结构，3装配整体式框级-现浇剪力墙结构，4装配整体式框级-现浇核心筒结构，5装配整体式部分框支剪力墙结构，6混合结构，7框架结构，8剪力墙结构，9框架-剪力墙结构，10简体结构，11钢结构，12型钢混凝土结构，13砖混结构，14砖木结构*/
@Excel(name = "结构类型,1装配整体式框级结构，2装配整体式剪力墙结构，3装配整体式框级-现浇剪力墙结构，4装配整体式框级-现浇核心筒结构，5装配整体式部分框支剪力墙结构，6混合结构，7框架结构，8剪力墙结构，9框架-剪力墙结构，10简体结构，11钢结构，12型钢混凝土结构，13砖混结构，14砖木结构", width = 15)
@ApiModelProperty(value="结构类型,1装配整体式框级结构，2装配整体式剪力墙结构，3装配整体式框级-现浇剪力墙结构，4装配整体式框级-现浇核心筒结构，5装配整体式部分框支剪力墙结构，6混合结构，7框架结构，8剪力墙结构，9框架-剪力墙结构，10简体结构，11钢结构，12型钢混凝土结构，13砖混结构，14砖木结构")
private java.lang.Integer structureType ;
/**工程状态，0未开工，1在建，2停工，3验收，4完工*/
@Excel(name = "工程状态，0未开工，1在建，2停工，3验收，4完工", width = 15)
@ApiModelProperty(value="工程状态，0未开工，1在建，2停工，3验收，4完工")
private java.lang.Integer bulidStatus ;
/**施工阶段，1施工证获取，2土方开挖，3桩基，4支护开始，5垫层完成，6正负零，7工程达到预售条件，8主体施工，9主体封顶，10装饰装修，11景观园林，12主体交付，13预售证获取，14规划验收，15竣工备案完成*/
@Excel(name = "施工阶段，1施工证获取，2土方开挖，3桩基，4支护开始，5垫层完成，6正负零，7工程达到预售条件，8主体施工，9主体封顶，10装饰装修，11景观园林，12主体交付，13预售证获取，14规划验收，15竣工备案完成", width = 15)
@ApiModelProperty(value="施工阶段，1施工证获取，2土方开挖，3桩基，4支护开始，5垫层完成，6正负零，7工程达到预售条件，8主体施工，9主体封顶，10装饰装修，11景观园林，12主体交付，13预售证获取，14规划验收，15竣工备案完成")
private java.lang.Integer constructionStage ;
/**现场布置图路径*/
@Excel(name = "现场布置图路径", width = 15)
@ApiModelProperty(value="现场布置图路径")
private java.lang.String layoutImage ;
/**施工地图*/
@Excel(name = "施工地图", width = 15)
@ApiModelProperty(value="施工地图")
private java.lang.String constructionMapUrl ;
/**承包项目名称*/
@Excel(name = "承包项目名称", width = 15)
@ApiModelProperty(value="承包项目名称")
private java.lang.String cbsName ;
/**项目施工区域*/
@Excel(name = "项目施工区域", width = 15)
@ApiModelProperty(value="项目施工区域")
private java.lang.String projectBuildArea ;
/**竣工日期*/
@Excel(name = "竣工日期", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value="竣工日期")
private java.util.Date completionDate ;
/**项目类型（字典）*/
@Excel(name = "项目类型（字典）", width = 15)
@ApiModelProperty(value="项目类型（字典）")
private java.lang.Integer cbsProjectType ;
/**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value="创建时间")
private java.util.Date createDate ;
/**更新时间*/
@Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value="更新时间")
private java.util.Date updateDate ;
/**1:审核记录;2:正式记录;*/
@ApiModelProperty(value="1:审核记录;2:正式记录;")
private java.lang.Integer type ;
/**星纵-供应商-入场申请Id*/
@ApiModelProperty(value="星纵-供应商-入场申请Id")
private java.lang.Long xzSupplierQualificationApplyId ;
@TableField(exist = false)
@ApiModelProperty(value = "项目类型（字典）名称")
private java.lang.String cbsProjectTypeName;
@TableField(exist = false)
@ApiModelProperty(value = "施工阶段名称")
private java.lang.String constructionStageName;
@TableField(exist = false)
@ApiModelProperty(value = "结构类型名称")
private java.lang.String structureTypeName;
@TableField(exist = false)
@ApiModelProperty(value = "工程类别名称")
private java.lang.String projectTypeName;
}

13
src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/SaveProjectEnterpriseSupplierInfoListDto.java Normal file
View File

@ -0,0 +1,13 @@
package com.zhgd.xmgl.modules.worker.entity.vo;
import com.zhgd.xmgl.modules.worker.entity.ProjectEnterpriseSupplierInfo;
import lombok.Data;
import java.util.List;
@Data
public class SaveProjectEnterpriseSupplierInfoListDto {
private String projectSn;
private String enterpriseId;
private List<ProjectEnterpriseSupplierInfo> projectEnterpriseSupplierInfoList;
}

14
src/main/java/com/zhgd/xmgl/modules/worker/mapper/EnterpriseQualificationMapper.java
View File

@ -1,8 +1,14 @@
package com.zhgd.xmgl.modules.worker.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import com.zhgd.xmgl.modules.worker.entity.EnterpriseQualification;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* @Description: 劳务公司-企业资质
@ -12,5 +18,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
@Mapper
public interface EnterpriseQualificationMapper extends BaseMapper<EnterpriseQualification> {
/**
* 列表查询劳务公司-企业资质信息
* @param queryWrapper
* @param map
* @return
*/
List<EnterpriseQualification> selectEnterpriseBadRecordList(@Param(Constants.WRAPPER)QueryWrapper<EnterpriseQualification> queryWrapper, @Param("param") Map<String, Object> map);
}

27
src/main/java/com/zhgd/xmgl/modules/worker/mapper/ProjectEnterpriseSupplierInfoMapper.java Normal file
View File

@ -0,0 +1,27 @@
package com.zhgd.xmgl.modules.worker.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import com.zhgd.xmgl.modules.worker.entity.ProjectEnterpriseSupplierInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.HashMap;
import java.util.List;
/**
* @Description: 项目劳务公司的承包商项目信息
* @author： pds
* @date： 2024-07-16
* @version： V1.0
*/
@Mapper
public interface ProjectEnterpriseSupplierInfoMapper extends BaseMapper<ProjectEnterpriseSupplierInfo> {
IPage<ProjectEnterpriseSupplierInfo> queryList(Page<ProjectEnterpriseSupplierInfo> page, @Param(Constants.WRAPPER) QueryWrapper<ProjectEnterpriseSupplierInfo> queryWrapper, @Param("param") HashMap<String, Object> param);
List<ProjectEnterpriseSupplierInfo> queryList(@Param(Constants.WRAPPER) QueryWrapper<ProjectEnterpriseSupplierInfo> queryWrapper,@Param("param") HashMap<String, Object> param);
}

8
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml
View File

@ -11,8 +11,8 @@
<sql id="getEnterpriseInfoList">
SELECT a.*,
b.project_sn,
c.company_type_name
enterprise_type_name,
c.company_type_name as enterprise_type_name,
c.company_type_name as company_type_name,
b.enterprise_type_id,
b.project_director_name,
b.sort_num,
@ -170,7 +170,7 @@
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
LEFT JOIN enterprise_type c ON b.xz_supplier_type_id = c.id
WHERE b.user_id = #{map.userId}
<if test="map.enterpriseName != null and map.enterpriseName != ''">
and a.enterprise_name like CONCAT(CONCAT('%', #{map.enterpriseName}), '%')
@ -209,7 +209,7 @@
enterpriseTypeId
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
LEFT JOIN enterprise_type c ON b.xz_supplier_type_id = c.id
WHERE b.user_id = #{userId}
</select>
<select id="getXzSupplierBySocialCode" resultType="com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo"

11
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseQualificationMapper.xml
View File

@ -2,4 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.worker.mapper.EnterpriseQualificationMapper">
</mapper>
<select id="selectEnterpriseBadRecordList" resultType="com.zhgd.xmgl.modules.worker.entity.EnterpriseQualification">
select t.*,t1.name as qualification_type_name
from enterprise_qualification t
left join (
<include refid="com.zhgd.xmgl.modules.xz.mapper.XzSupplierQualificationRecordMapper.qualificationTypeMap">
</include>
) t1 on t1.data = t.qualification_type
${ew.customSqlSegment}
</select>
</mapper>

5
src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierTypeMapper.xml → src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/ProjectEnterpriseApplyMapper.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.xz.mapper.XzSupplierTypeMapper">
</mapper>
<mapper namespace="com.zhgd.xmgl.modules.x.mapper.ProjectEnterpriseApplyMapper">
</mapper>

31
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/ProjectEnterpriseSupplierInfoMapper.xml Normal file
View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.worker.mapper.ProjectEnterpriseSupplierInfoMapper">
<select id="queryList" resultType="com.zhgd.xmgl.modules.worker.entity.ProjectEnterpriseSupplierInfo">
select t.*,
t1.name as cbs_project_type_name,
t2.name as construction_stage_name,
t3.name as structure_type_name,
t4.name as project_type_name
from
project_enterprise_supplier_info t
left join (
<include refid="com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper.dicMap">
</include>
) t1 on t1.data = t.cbs_project_type
left join (
<include refid="com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper.constructionStageDicMap">
</include>
) t2 on t2.data = t.construction_stage
left join (
<include refid="com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper.projectStructureTypeDicMap">
</include>
) t3 on t3.data = t.structure_type
left join (
<include refid="com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper.projectTypeDicMap">
</include>
) t4 on t4.data = t.project_type
${ew.customSqlSegment}
</select>
</mapper>

12
src/main/java/com/zhgd/xmgl/modules/worker/service/IEnterpriseQualificationService.java
View File

@ -1,9 +1,13 @@
package com.zhgd.xmgl.modules.worker.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
import com.zhgd.xmgl.modules.worker.entity.EnterpriseQualification;
import java.util.List;
import java.util.Map;
/**
* @Description: 劳务公司-企业资质
* @author： pds
@ -19,4 +23,12 @@ public interface IEnterpriseQualificationService extends IService<EnterpriseQual
* @return
*/
EnterpriseInfo getSupplierByUserId(Long userId);
/**
* 列表查询劳务公司-企业资质信息
* @param queryWrapper
* @param map
* @return
*/
List<EnterpriseQualification> selectEnterpriseBadRecordList(QueryWrapper<EnterpriseQualification> queryWrapper, Map<String, Object> map);
}

72
src/main/java/com/zhgd/xmgl/modules/worker/service/IProjectEnterpriseSupplierInfoService.java Normal file
View File

@ -0,0 +1,72 @@
package com.zhgd.xmgl.modules.worker.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.worker.entity.ProjectEnterpriseSupplierInfo;
import com.zhgd.xmgl.modules.worker.entity.vo.SaveProjectEnterpriseSupplierInfoListDto;
import java.util.HashMap;
import java.util.List;
/**
* @Description: 项目劳务公司的承包商项目信息
* @author： pds
* @date： 2024-07-16
* @version： V1.0
*/
public interface IProjectEnterpriseSupplierInfoService extends IService<ProjectEnterpriseSupplierInfo> {
/**
* 分页列表查询项目劳务公司的承包商项目信息
*
* @param param 参数map
* @return
*/
IPage<ProjectEnterpriseSupplierInfo> queryPageList(HashMap<String, Object> param);
/**
* 列表查询项目劳务公司的承包商项目信息
*
* @param param 参数map
* @return
*/
List<ProjectEnterpriseSupplierInfo> queryList(HashMap<String, Object> param);
/**
* 添加项目劳务公司的承包商项目信息
*
* @param projectEnterpriseSupplierInfo 项目劳务公司的承包商项目信息
* @return
*/
void add(ProjectEnterpriseSupplierInfo projectEnterpriseSupplierInfo);
/**
* 编辑项目劳务公司的承包商项目信息
*
* @param projectEnterpriseSupplierInfo 项目劳务公司的承包商项目信息
* @return
*/
void edit(ProjectEnterpriseSupplierInfo projectEnterpriseSupplierInfo);
/**
* 根据id删除项目劳务公司的承包商项目信息
*
* @param id 项目劳务公司的承包商项目信息的id
* @return
*/
void delete(String id);
/**
* 根据id查询项目劳务公司的承包商项目信息
*
* @param id 项目劳务公司的承包商项目信息的id
* @return
*/
ProjectEnterpriseSupplierInfo queryById(String id);
/**
* 保存项目劳务公司的承包商项目信息列表
*
* @param dto
*/
void saveList(SaveProjectEnterpriseSupplierInfoListDto dto);
}

9
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseQualificationServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.worker.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
@ -10,6 +11,9 @@ import com.zhgd.xmgl.modules.xz.mapper.XzUserToSupplierMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* @Description: 劳务公司-企业资质
* @author： pds
@ -32,4 +36,9 @@ public class EnterpriseQualificationServiceImpl extends ServiceImpl<EnterpriseQu
}
return xzUserToSupplier;
}
@Override
public List<EnterpriseQualification> selectEnterpriseBadRecordList(QueryWrapper<EnterpriseQualification> queryWrapper, Map<String, Object> map) {
return baseMapper.selectEnterpriseBadRecordList(queryWrapper, map);
}
}

109
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/ProjectEnterpriseSupplierInfoServiceImpl.java Normal file
View File

@ -0,0 +1,109 @@
package com.zhgd.xmgl.modules.worker.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.modules.worker.entity.ProjectEnterpriseSupplierInfo;
import com.zhgd.xmgl.modules.worker.entity.vo.SaveProjectEnterpriseSupplierInfoListDto;
import com.zhgd.xmgl.modules.worker.mapper.ProjectEnterpriseSupplierInfoMapper;
import com.zhgd.xmgl.modules.worker.service.IProjectEnterpriseSupplierInfoService;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
/**
* @Description: 项目劳务公司的承包商项目信息
* @author： pds
* @date： 2024-07-16
* @version： V1.0
*/
@Service
public class ProjectEnterpriseSupplierInfoServiceImpl extends ServiceImpl<ProjectEnterpriseSupplierInfoMapper, ProjectEnterpriseSupplierInfo> implements IProjectEnterpriseSupplierInfoService {
@Autowired
private ProjectEnterpriseSupplierInfoMapper projectEnterpriseSupplierInfoMapper;
@Override
public IPage<ProjectEnterpriseSupplierInfo> queryPageList(HashMap<String, Object> param) {
QueryWrapper<ProjectEnterpriseSupplierInfo> queryWrapper = this.getQueryWrapper(param);
Page<ProjectEnterpriseSupplierInfo> page = PageUtil.getPage(param);
IPage<ProjectEnterpriseSupplierInfo> pageList = baseMapper.queryList(page, queryWrapper,param);
pageList.setRecords(this.dealList(pageList.getRecords()));
return pageList;
}
@Override
public List<ProjectEnterpriseSupplierInfo> queryList(HashMap<String, Object> param) {
QueryWrapper<ProjectEnterpriseSupplierInfo> queryWrapper = getQueryWrapper(param);
return dealList(baseMapper.queryList(queryWrapper,param));
}
private QueryWrapper<ProjectEnterpriseSupplierInfo> getQueryWrapper(HashMap<String, Object> param) {
String alias = "t.";
QueryWrapper<ProjectEnterpriseSupplierInfo> queryWrapper = QueryGenerator.initPageQueryWrapper(ProjectEnterpriseSupplierInfo.class, param, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(ProjectEnterpriseSupplierInfo::getId));
return queryWrapper;
}
private List<ProjectEnterpriseSupplierInfo> dealList(List<ProjectEnterpriseSupplierInfo> list) {
return list;
}
@Override
public void add(ProjectEnterpriseSupplierInfo projectEnterpriseSupplierInfo) {
projectEnterpriseSupplierInfo.setId(null);
baseMapper.insert(projectEnterpriseSupplierInfo);
}
@Override
public void edit(ProjectEnterpriseSupplierInfo projectEnterpriseSupplierInfo) {
ProjectEnterpriseSupplierInfo oldProjectEnterpriseSupplierInfo = baseMapper.selectById(projectEnterpriseSupplierInfo.getId());
if (oldProjectEnterpriseSupplierInfo == null) {
throw new OpenAlertException("未找到对应实体");
}
baseMapper.updateById(projectEnterpriseSupplierInfo);
}
@Override
public void delete(String id) {
ProjectEnterpriseSupplierInfo projectEnterpriseSupplierInfo = baseMapper.selectById(id);
if (projectEnterpriseSupplierInfo == null) {
throw new OpenAlertException("未找到对应实体");
}
baseMapper.deleteById(id);
}
@Override
public ProjectEnterpriseSupplierInfo queryById(String id) {
ProjectEnterpriseSupplierInfo entity = getById(id);
if (entity == null) {
throw new OpenAlertException("未找到对应实体");
}
return entity;
}
@Override
public void saveList(SaveProjectEnterpriseSupplierInfoListDto dto) {
String projectSn = dto.getProjectSn();
String enterpriseId = dto.getEnterpriseId();
List<ProjectEnterpriseSupplierInfo> projectEnterpriseSupplierInfoList = dto.getProjectEnterpriseSupplierInfoList();
projectEnterpriseSupplierInfoMapper.delete(new LambdaQueryWrapper<ProjectEnterpriseSupplierInfo>()
.eq(ProjectEnterpriseSupplierInfo::getProjectSn, projectSn)
.eq(ProjectEnterpriseSupplierInfo::getEnterpriseId, enterpriseId)
);
for (ProjectEnterpriseSupplierInfo info : projectEnterpriseSupplierInfoList) {
info.setId(null);
info.setProjectSn(projectSn);
info.setEnterpriseId(Long.valueOf(enterpriseId));
}
this.saveBatch(projectEnterpriseSupplierInfoList);
}
}

66
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierQualificationApplyController.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualificationApply;
import com.zhgd.xmgl.modules.xz.entity.vo.XzSupplierQualificationApplyDto;
import com.zhgd.xmgl.modules.xz.service.IXzSupplierQualificationApplyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@ -22,7 +23,7 @@ import java.util.List;
/**
* @Title: Controller
* @Description: 星纵-供应商-资质申请
* @Description: 星纵-承包商-入场申请
* @author： pds
* @date： 2024-03-29
* @version： V1.0
@ -30,7 +31,7 @@ import java.util.List;
@RestController
@RequestMapping("/xmgl/xzSupplierQualificationApply")
@Slf4j
@Api(tags = "星纵-供应商-资质申请相关Api")
@Api(tags = "星纵-承包商-入场申请相关Api")
public class XzSupplierQualificationApplyController {
@Autowired
private IXzSupplierQualificationApplyService xzSupplierQualificationApplyService;
@ -40,8 +41,8 @@ public class XzSupplierQualificationApplyController {
*
* @return
*/
@OperLog(operModul = "供应商-资质申请管理", operType = "查询", operDesc = "分页列表查询供应商-资质申请信息")
@ApiOperation(value = "分页列表查询星纵-供应商-资质申请信息", notes = "分页列表查询星纵-供应商-资质申请信息", httpMethod = "GET")
@OperLog(operModul = "承包商-入场申请管理", operType = "查询", operDesc = "分页列表查询承包商-入场申请信息")
@ApiOperation(value = "分页列表查询星纵-承包商-入场申请信息", notes = "分页列表查询星纵-承包商-入场申请信息", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
@ -56,8 +57,8 @@ public class XzSupplierQualificationApplyController {
*
* @return
*/
@OperLog(operModul = "供应商-资质申请管理", operType = "查询", operDesc = "列表查询供应商-资质申请信息")
@ApiOperation(value = "列表查询星纵-供应商-资质申请信息", notes = "列表查询星纵-供应商-资质申请信息", httpMethod = "GET")
@OperLog(operModul = "承包商-入场申请管理", operType = "查询", operDesc = "列表查询承包商-入场申请")
@ApiOperation(value = "列表查询星纵-承包商-入场申请信息", notes = "列表查询星纵-承包商-入场申请信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<XzSupplierQualificationApply>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
return Result.success(xzSupplierQualificationApplyService.queryList(paramMap));
@ -69,8 +70,8 @@ public class XzSupplierQualificationApplyController {
* @param xzSupplierQualificationApply
* @return
*/
@OperLog(operModul = "供应商-资质申请管理", operType = "添加", operDesc = "添加供应商-资质申请信息")
@ApiOperation(value = "添加星纵-供应商-资质申请信息", notes = "添加星纵-供应商-资质申请信息", httpMethod = "POST")
@OperLog(operModul = "承包商-入场申请管理", operType = "添加", operDesc = "添加承包商-入场申请")
@ApiOperation(value = "添加星纵-承包商-入场申请信息", notes = "添加星纵-承包商-入场申请信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<XzSupplierQualificationApply> add(@RequestBody @Validate XzSupplierQualificationApply xzSupplierQualificationApply) {
xzSupplierQualificationApplyService.add(xzSupplierQualificationApply);
@ -83,8 +84,8 @@ public class XzSupplierQualificationApplyController {
* @param xzSupplierQualificationApply
* @return
*/
@OperLog(operModul = "供应商-资质申请管理", operType = "编辑", operDesc = "编辑供应商-资质申请信息")
@ApiOperation(value = "编辑星纵-供应商-资质申请信息", notes = "编辑星纵-供应商-资质申请信息", httpMethod = "POST")
@OperLog(operModul = "承包商-入场申请管理", operType = "编辑", operDesc = "编辑承包商-入场申请")
@ApiOperation(value = "编辑星纵-承包商-入场申请信息", notes = "编辑星纵-承包商-入场申请信息", httpMethod = "POST")
@PostMapping(value = "/edit")
public Result<XzSupplierQualificationApply> edit(@RequestBody XzSupplierQualificationApply xzSupplierQualificationApply) {
xzSupplierQualificationApplyService.edit(xzSupplierQualificationApply);
@ -96,9 +97,9 @@ public class XzSupplierQualificationApplyController {
*
* @return
*/
@OperLog(operModul = "供应商-资质申请管理", operType = "删除", operDesc = "删除供应商-资质申请信息")
@ApiOperation(value = "删除星纵-供应商-资质申请信息", notes = "删除星纵-供应商-资质申请信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "星纵-供应商-资质申请ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@OperLog(operModul = "承包商-入场申请管理", operType = "删除", operDesc = "删除承包商-入场申请")
@ApiOperation(value = "删除星纵-承包商-入场申请信息", notes = "删除星纵-承包商-入场申请信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "星纵-承包商-入场申请ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<XzSupplierQualificationApply> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
xzSupplierQualificationApplyService.delete(MapUtils.getString(map, "id"));
@ -111,9 +112,9 @@ public class XzSupplierQualificationApplyController {
* @param id
* @return
*/
@OperLog(operModul = "供应商-资质申请管理", operType = "查询", operDesc = "通过id查询供应商-资质申请信息")
@ApiOperation(value = "通过id查询星纵-供应商-资质申请信息", notes = "通过id查询星纵-供应商-资质申请信息", httpMethod = "GET")
@ApiImplicitParam(name = "id", value = "星纵-供应商-资质申请ID", paramType = "query", required = true, dataType = "Integer")
@OperLog(operModul = "承包商-入场申请管理", operType = "查询", operDesc = "通过id查询承包商-入场申请")
@ApiOperation(value = "通过id查询星纵-承包商-入场申请信息", notes = "通过id查询星纵-承包商-入场申请信息", httpMethod = "GET")
@ApiImplicitParam(name = "id", value = "星纵-承包商-入场申请ID", paramType = "query", required = true, dataType = "Integer")
@GetMapping(value = "/queryById")
public Result<XzSupplierQualificationApply> queryById(@RequestParam(name = "id", required = true) String id) {
Result<XzSupplierQualificationApply> result = new Result<XzSupplierQualificationApply>();
@ -127,18 +128,29 @@ public class XzSupplierQualificationApplyController {
return result;
}
@OperLog(operModul = "供应商-资质申请管理", operType = "查询", operDesc = "申请")
@ApiOperation(value = "申请", notes = "申请", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "xzSupplierQualificationApplyId", value = "星纵-供应商-资质申请id", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "type", value = "1第一次申请2撤销申请3重新提交申请", paramType = "body", required = true, dataType = "Integer"),
})
@PostMapping(value = "/apply")
public Result apply(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
xzSupplierQualificationApplyService.apply(paramMap);
@OperLog(operModul = "承包商-入场申请管理", operType = "编辑", operDesc = "保存承包商-入场申请")
@ApiOperation(value = "保存星纵-承包商-入场申请信息", notes = "保存星纵-承包商-入场申请信息", httpMethod = "POST")
@PostMapping(value = "/saveInfo")
public Result saveInfo(@RequestBody XzSupplierQualificationApplyDto dto) {
xzSupplierQualificationApplyService.saveInfo(dto);
return Result.ok();
}
@OperLog(operModul = "承包商-入场申请管理", operType = "审批通过", operDesc = "审批通过")
@ApiOperation(value = "审批通过", notes = "审批通过", httpMethod = "POST")
@PostMapping(value = "/pass")
public Result<XzSupplierQualificationApply> pass(@RequestBody XzSupplierQualificationApply xzSupplierQualificationApply) {
xzSupplierQualificationApplyService.pass(xzSupplierQualificationApply);
return Result.ok();
}
@OperLog(operModul = "承包商-入场申请管理", operType = "审批驳回", operDesc = "审批驳回")
@ApiOperation(value = "审批驳回", notes = "审批驳回", httpMethod = "POST")
@PostMapping(value = "/refuse")
public Result<XzSupplierQualificationApply> refuse(@RequestBody XzSupplierQualificationApply xzSupplierQualificationApply) {
xzSupplierQualificationApplyService.refuse(xzSupplierQualificationApply);
return Result.ok();
}
}

20
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierQualificationRecordController.java
View File

@ -22,7 +22,7 @@ import java.util.List;
/**
* @Title: Controller
* @Description: 星纵-供应商-企业资质记录
* @Description: 星纵-承包商-企业资质记录
* @author： pds
* @date： 2024-03-29
* @version： V1.0
@ -30,7 +30,7 @@ import java.util.List;
@RestController
@RequestMapping("/xmgl/xzSupplierQualificationRecord")
@Slf4j
@Api(tags = "星纵-供应商-企业资质记录相关Api")
@Api(tags = "星纵-承包商-企业资质记录相关Api")
public class XzSupplierQualificationRecordController {
@Autowired
private IXzSupplierQualificationRecordService xzSupplierQualificationRecordService;
@ -41,7 +41,7 @@ public class XzSupplierQualificationRecordController {
* @return
*/
@OperLog(operModul = "供应商-企业资质记录管理", operType = "查询", operDesc = "分页列表查询供应商-企业资质记录信息")
@ApiOperation(value = "分页列表查询星纵-供应商-企业资质记录信息", notes = "分页列表查询星纵-供应商-企业资质记录信息", httpMethod = "GET")
@ApiOperation(value = "分页列表查询星纵-承包商-企业资质记录信息", notes = "分页列表查询星纵-承包商-企业资质记录信息", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
@ -57,7 +57,7 @@ public class XzSupplierQualificationRecordController {
* @return
*/
@OperLog(operModul = "供应商-企业资质记录管理", operType = "查询", operDesc = "列表查询供应商-企业资质记录信息")
@ApiOperation(value = "列表查询星纵-供应商-企业资质记录信息", notes = "列表查询星纵-供应商-企业资质记录信息", httpMethod = "GET")
@ApiOperation(value = "列表查询星纵-承包商-企业资质记录信息", notes = "列表查询星纵-承包商-企业资质记录信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<XzSupplierQualificationRecord>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
return Result.success(xzSupplierQualificationRecordService.queryList(paramMap));
@ -70,7 +70,7 @@ public class XzSupplierQualificationRecordController {
* @return
*/
@OperLog(operModul = "供应商-企业资质记录管理", operType = "添加", operDesc = "添加供应商-企业资质记录信息")
@ApiOperation(value = "添加星纵-供应商-企业资质记录信息", notes = "添加星纵-供应商-企业资质记录信息", httpMethod = "POST")
@ApiOperation(value = "添加星纵-承包商-企业资质记录信息", notes = "添加星纵-承包商-企业资质记录信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<XzSupplierQualificationRecord> add(@RequestBody @Validate XzSupplierQualificationRecord xzSupplierQualificationRecord) {
xzSupplierQualificationRecordService.add(xzSupplierQualificationRecord);
@ -84,7 +84,7 @@ public class XzSupplierQualificationRecordController {
* @return
*/
@OperLog(operModul = "供应商-企业资质记录管理", operType = "编辑", operDesc = "编辑供应商-企业资质记录信息")
@ApiOperation(value = "编辑星纵-供应商-企业资质记录信息", notes = "编辑星纵-供应商-企业资质记录信息", httpMethod = "POST")
@ApiOperation(value = "编辑星纵-承包商-企业资质记录信息", notes = "编辑星纵-承包商-企业资质记录信息", httpMethod = "POST")
@PostMapping(value = "/edit")
public Result<XzSupplierQualificationRecord> edit(@RequestBody XzSupplierQualificationRecord xzSupplierQualificationRecord) {
xzSupplierQualificationRecordService.edit(xzSupplierQualificationRecord);
@ -97,8 +97,8 @@ public class XzSupplierQualificationRecordController {
* @return
*/
@OperLog(operModul = "供应商-企业资质记录管理", operType = "删除", operDesc = "删除供应商-企业资质记录信息")
@ApiOperation(value = "删除星纵-供应商-企业资质记录信息", notes = "删除星纵-供应商-企业资质记录信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "星纵-供应商-企业资质记录ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@ApiOperation(value = "删除星纵-承包商-企业资质记录信息", notes = "删除星纵-承包商-企业资质记录信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "星纵-承包商-企业资质记录ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<XzSupplierQualificationRecord> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
xzSupplierQualificationRecordService.delete(MapUtils.getString(map, "id"));
@ -112,8 +112,8 @@ public class XzSupplierQualificationRecordController {
* @return
*/
@OperLog(operModul = "供应商-企业资质记录管理", operType = "查询", operDesc = "通过id查询供应商-企业资质记录信息")
@ApiOperation(value = "通过id查询星纵-供应商-企业资质记录信息", notes = "通过id查询星纵-供应商-企业资质记录信息", httpMethod = "GET")
@ApiImplicitParam(name = "id", value = "星纵-供应商-企业资质记录ID", paramType = "query", required = true, dataType = "Integer")
@ApiOperation(value = "通过id查询星纵-承包商-企业资质记录信息", notes = "通过id查询星纵-承包商-企业资质记录信息", httpMethod = "GET")
@ApiImplicitParam(name = "id", value = "星纵-承包商-企业资质记录ID", paramType = "query", required = true, dataType = "Integer")
@GetMapping(value = "/queryById")
public Result<XzSupplierQualificationRecord> queryById(@RequestParam(name = "id", required = true) String id) {
Result<XzSupplierQualificationRecord> result = new Result<XzSupplierQualificationRecord>();

24
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierRecordController.java
View File

@ -23,7 +23,7 @@ import java.util.Map;
/**
* @Title: Controller
* @Description: 星纵-供应商记录
* @Description: 星纵-承包商记录
* @author： pds
* @date： 2024-03-29
* @version： V1.0
@ -31,7 +31,7 @@ import java.util.Map;
@RestController
@RequestMapping("/xmgl/xzSupplierRecord")
@Slf4j
@Api(tags = "星纵-供应商记录相关Api")
@Api(tags = "星纵-承包商记录相关Api")
public class XzSupplierRecordController {
@Autowired
private IXzSupplierRecordService xzSupplierRecordService;
@ -42,7 +42,7 @@ public class XzSupplierRecordController {
* @return
*/
@OperLog(operModul = "供应商记录管理", operType = "查询", operDesc = "分页列表查询供应商记录信息")
@ApiOperation(value = "分页列表查询星纵-供应商记录信息", notes = "分页列表查询星纵-供应商记录信息", httpMethod = "GET")
@ApiOperation(value = "分页列表查询星纵-承包商记录信息", notes = "分页列表查询星纵-承包商记录信息", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
@ -58,7 +58,7 @@ public class XzSupplierRecordController {
* @return
*/
@OperLog(operModul = "供应商记录管理", operType = "查询", operDesc = "列表查询供应商记录信息")
@ApiOperation(value = "列表查询星纵-供应商记录信息", notes = "列表查询星纵-供应商记录信息", httpMethod = "GET")
@ApiOperation(value = "列表查询星纵-承包商记录信息", notes = "列表查询星纵-承包商记录信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<XzSupplierRecord>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
return Result.success(xzSupplierRecordService.queryList(paramMap));
@ -71,7 +71,7 @@ public class XzSupplierRecordController {
* @return
*/
@OperLog(operModul = "供应商记录管理", operType = "添加", operDesc = "添加供应商记录信息")
@ApiOperation(value = "添加星纵-供应商记录信息", notes = "添加星纵-供应商记录信息", httpMethod = "POST")
@ApiOperation(value = "添加星纵-承包商记录信息", notes = "添加星纵-承包商记录信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<XzSupplierRecord> add(@RequestBody @Validate XzSupplierRecord xzSupplierRecord) {
xzSupplierRecordService.add(xzSupplierRecord);
@ -85,7 +85,7 @@ public class XzSupplierRecordController {
* @return
*/
@OperLog(operModul = "供应商记录管理", operType = "编辑", operDesc = "编辑供应商记录信息")
@ApiOperation(value = "编辑星纵-供应商记录信息", notes = "编辑星纵-供应商记录信息", httpMethod = "POST")
@ApiOperation(value = "编辑星纵-承包商记录信息", notes = "编辑星纵-承包商记录信息", httpMethod = "POST")
@PostMapping(value = "/edit")
public Result<XzSupplierRecord> edit(@RequestBody XzSupplierRecord xzSupplierRecord) {
xzSupplierRecordService.edit(xzSupplierRecord);
@ -98,8 +98,8 @@ public class XzSupplierRecordController {
* @return
*/
@OperLog(operModul = "供应商记录管理", operType = "删除", operDesc = "删除供应商记录信息")
@ApiOperation(value = "删除星纵-供应商记录信息", notes = "删除星纵-供应商记录信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "星纵-供应商记录ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@ApiOperation(value = "删除星纵-承包商记录信息", notes = "删除星纵-承包商记录信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "星纵-承包商记录ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<XzSupplierRecord> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
xzSupplierRecordService.delete(MapUtils.getString(map, "id"));
@ -113,8 +113,8 @@ public class XzSupplierRecordController {
* @return
*/
@OperLog(operModul = "供应商记录管理", operType = "查询", operDesc = "通过id查询供应商记录信息")
@ApiOperation(value = "通过id查询星纵-供应商记录信息", notes = "通过id查询星纵-供应商记录信息", httpMethod = "GET")
@ApiImplicitParam(name = "id", value = "星纵-供应商记录ID", paramType = "query", required = true, dataType = "Integer")
@ApiOperation(value = "通过id查询星纵-承包商记录信息", notes = "通过id查询星纵-承包商记录信息", httpMethod = "GET")
@ApiImplicitParam(name = "id", value = "星纵-承包商记录ID", paramType = "query", required = true, dataType = "Integer")
@GetMapping(value = "/queryById")
public Result<XzSupplierRecord> queryById(@RequestParam(name = "id", required = true) String id) {
Result<XzSupplierRecord> result = new Result<XzSupplierRecord>();
@ -129,9 +129,9 @@ public class XzSupplierRecordController {
}
@OperLog(operModul = "供应商记录管理", operType = "查询", operDesc = "通过供应商-资质申请id查询供应商记录信息")
@ApiOperation(value = "通过星纵-供应商-资质申请id查询星纵-供应商记录信息", notes = "通过星纵-供应商-资质申请id查询星纵-供应商记录信息", httpMethod = "POST")
@ApiOperation(value = "通过星纵-承包商-入场申请id查询星纵-承包商记录信息", notes = "通过星纵-承包商-入场申请id查询星纵-承包商记录信息", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "xzSupplierQualificationApplyId", value = "星纵-供应商-资质申请id", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "xzSupplierQualificationApplyId", value = "星纵-承包商-入场申请id", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/getXzSupplierByXzSupplierQualificationApplyId")
public Result<XzSupplierRecord> getXzSupplierByXzSupplierQualificationApplyId(@RequestBody Map<String, Object> map) {

123
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierTypeController.java
View File

@ -1,123 +0,0 @@
package com.zhgd.xmgl.modules.xz.controller;
import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.modules.worker.entity.XzSupplierType;
import com.zhgd.xmgl.modules.xz.service.IXzSupplierTypeService;
import com.zhgd.xmgl.util.MessageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* @Title: Controller
* @Description: 星纵-供应商类型
* @author： pds
* @date： 2020-08-13
* @version： V1.0
*/
@RestController
@RequestMapping("/xmgl/xzSupplierType")
@Slf4j
@Api(tags = "星纵-供应商类型")
public class XzSupplierTypeController {
@Autowired
private IXzSupplierTypeService xzSupplierTypeService;
/**
* 列表查询
*
* @return
*/
@ApiOperation(value = "列表查询星纵-供应商类型信息", notes = "列表查询星纵-供应商类型信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<XzSupplierType>> getList() {
Result<List<XzSupplierType>> result = new Result<List<XzSupplierType>>();
List<XzSupplierType> pageList = xzSupplierTypeService.list();
result.setSuccess(true);
result.setResult(pageList);
return result;
}
/**
* 添加
*
* @param xzSupplierType
* @return
*/
@OperLog(operModul = "供应商管理", operType = "添加星纵-供应商类型信息", operDesc = "添加供应商类型信息")
@ApiOperation(value = "添加星纵-供应商类型信息", notes = "添加星纵-供应商类型信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<XzSupplierType> add(@RequestBody XzSupplierType xzSupplierType) {
Result<XzSupplierType> result = new Result<XzSupplierType>();
try {
xzSupplierTypeService.save(xzSupplierType);
result.successMsg(MessageUtil.get("addSucess"));
} catch (Exception e) {
log.error("error：", e);
log.info(e.getMessage());
result.error500(MessageUtil.get("failErr"));
}
return result;
}
/**
* 编辑
*
* @param xzSupplierType
* @return
*/
@OperLog(operModul = "供应商管理", operType = "编辑星纵-供应商类型信息", operDesc = "编辑供应商类型信息")
@ApiOperation(value = "编辑星纵-供应商类型信息", notes = "编辑星纵-供应商类型信息", httpMethod = "POST")
@PostMapping(value = "/edit")
public Result<XzSupplierType> edit(@RequestBody XzSupplierType xzSupplierType) {
Result<XzSupplierType> result = new Result<XzSupplierType>();
XzSupplierType xzSupplierTypeEntity = xzSupplierTypeService.getById(xzSupplierType.getId());
if (xzSupplierTypeEntity == null) {
result.error500(MessageUtil.get("notFindErr"));
} else {
boolean ok = xzSupplierTypeService.updateById(xzSupplierType);
if (ok) {
result.successMsg(MessageUtil.get("editSucess"));
}
}
return result;
}
/**
* 通过id删除
*
* @param
* @return
*/
@OperLog(operModul = "供应商管理", operType = "删除星纵-供应商类型信息", operDesc = "删除供应商类型信息")
@ApiOperation(value = "删除星纵-供应商类型信息", notes = "删除星纵-供应商类型信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "星纵-供应商类型ID", paramType = "body", required = true, dataType = "Integer")
@PostMapping(value = "/delete")
public Result<XzSupplierType> delete(@RequestBody Map<String, Object> map) {
Result<XzSupplierType> result = new Result<XzSupplierType>();
XzSupplierType xzSupplierType = xzSupplierTypeService.getById(MapUtils.getString(map, "id"));
if (xzSupplierType == null) {
result.error500(MessageUtil.get("notFindErr"));
} else {
boolean ok = xzSupplierTypeService.removeById(MapUtils.getString(map, "id"));
if (ok) {
result.successMsg(MessageUtil.get("deleteSucess"));
}
}
return result;
}
}

125
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualificationApply.java
View File

@ -1,21 +1,20 @@
package com.zhgd.xmgl.modules.xz.entity;
import java.io.Serializable;
import java.util.Date;
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 lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
* @Description: 星纵-供应商-资质申请
* @Description: 星纵-承包商-入场申请
* @author： pds
* @date： 2024-03-29
* @version： V1.0
@ -24,62 +23,56 @@ import io.swagger.annotations.ApiModelProperty;
@TableName("xz_supplier_qualification_apply")
@ApiModel(value = "XzSupplierQualificationApply实体类", description = "XzSupplierQualificationApply")
public class XzSupplierQualificationApply implements Serializable {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.Long id;
/**
* 资质申请时间
*/
@Excel(name = "资质申请时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "资质申请时间")
private java.util.Date applyTime;
@ApiModelProperty(value = "项目sn")
private java.lang.String projectSn;
/**
* 审批回复时间
*/
@Excel(name = "审批回复时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "审批回复时间")
private java.util.Date replyTime;
/**
* 审批状态：1待审批2已审批3已驳回4已撤销
*/
@Excel(name = "审批状态：1待审批2已审批3已驳回4已撤销", width = 15)
@ApiModelProperty(value = "审批状态：1待审批2已审批3已驳回4已撤销")
private java.lang.Integer applyStatus;
/**
* 审批人
*/
@Excel(name = "审批人", width = 15)
@ApiModelProperty(value = "审批人")
private java.lang.String applyUser;
/**
* 审批回复内容
*/
@Excel(name = "审批回复内容", width = 15)
@ApiModelProperty(value = "审批回复内容")
private java.lang.String applyContent;
/**
* 星纵-供应商记录id
*/
@Excel(name = "星纵-供应商记录id", width = 15)
@ApiModelProperty(value = "星纵-供应商记录id")
private java.lang.Long xzSupplierRecordId;
/**
* 创建时间 yyyy-MM-dd HH:mm:ss
*/
@Excel(name = "创建时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
/**
* id
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.Long id;
/**
* 资质申请时间
*/
@Excel(name = "资质申请时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "资质申请时间")
private java.util.Date applyTime;
@ApiModelProperty(value = "项目sn")
private java.lang.String projectSn;
/**
* 审批回复时间
*/
@Excel(name = "审批回复时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "审批回复时间")
private java.util.Date replyTime;
/**
* 审批状态：1待审批2已审批3已驳回4已撤销
*/
@Excel(name = "审批状态：1待审批2已审批3已驳回4已撤销", width = 15)
@ApiModelProperty(value = "审批状态：1待审批2已审批3已驳回4已撤销")
private java.lang.Integer applyStatus;
/**
* 审批人
*/
@Excel(name = "审批人", width = 15)
@ApiModelProperty(value = "审批人")
private java.lang.String applyUser;
/**
* 审批回复内容
*/
@Excel(name = "审批回复内容", width = 15)
@ApiModelProperty(value = "审批回复内容")
private java.lang.String applyContent;
/**
* 创建时间 yyyy-MM-dd HH:mm:ss
*/
@Excel(name = "创建时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间 yyyy-MM-dd HH:mm:ss")
private java.util.Date createTime;
/**
@ -92,11 +85,19 @@ public class XzSupplierQualificationApply implements Serializable {
private java.util.Date updateTime;
@ApiModelProperty(value = "申请用户id")
private java.lang.Long applyUserId;
@ApiModelProperty(value = "通知邮箱")
private java.lang.String noticeEmail;
@TableField(exist = false)
@ApiModelProperty(value = "审批组织（项目名称）")
private java.lang.String applyOrg;
@TableField(exist = false)
@ApiModelProperty(value = "用户id")
private java.lang.Long userId;
@TableField(exist = false)
@ApiModelProperty(value = "重新提交申请链接(点击链接补充资质)")
private java.lang.String resubmitApplicationUrl;
@TableField(exist = false)
@ApiModelProperty(value = "承包商名称")
private java.lang.String enterpriseName;
}

24
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualificationRecord.java
View File

@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.Date;
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 lombok.Data;
@ -14,7 +15,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description: 星纵-供应商-企业资质记录
* @Description: 星纵-承包商-企业资质记录
* @author： pds
* @date： 2024-03-29
* @version： V1.0
@ -32,10 +33,10 @@ public class XzSupplierQualificationRecord implements Serializable {
@ApiModelProperty(value = "id")
private java.lang.Long id;
/**
* 星纵-供应商-资质申请id
* 星纵-承包商-入场申请id
*/
@Excel(name = "星纵-供应商-资质申请id", width = 15)
@ApiModelProperty(value = "星纵-供应商-资质申请id")
@Excel(name = "星纵-承包商-入场申请id", width = 15)
@ApiModelProperty(value = "星纵-承包商-入场申请id")
private java.lang.Long xzSupplierQualificationApplyId;
/**
* 资质文件名称
@ -75,4 +76,19 @@ public class XzSupplierQualificationRecord implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private java.util.Date updateTime;
/**
* 文件名称
*/
@Excel(name = "文件名称", width = 15)
@ApiModelProperty(value = "文件名称")
private java.lang.String originFileName;
/**
* 资质类型（字典）
*/
@Excel(name = "资质类型（字典）", width = 15)
@ApiModelProperty(value = "资质类型（字典）")
private java.lang.Integer qualificationType;
@TableField(exist = false)
@ApiModelProperty(value = "资质类型（字典）名称")
private java.lang.String qualificationTypeName;
}

77
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierRecord.java
View File

@ -15,7 +15,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description: 星纵-供应商记录
* @Description: 星纵-承包商记录
* @author： pds
* @date： 2024-03-29
* @version： V1.0
@ -27,10 +27,10 @@ public class XzSupplierRecord implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 企业账号表
* id
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "企业账号表")
@ApiModelProperty(value = "id")
private java.lang.Long id;
/**
* 企业名称
@ -176,14 +176,53 @@ public class XzSupplierRecord implements Serializable {
@Excel(name = "营业执照图片地址", width = 15)
@ApiModelProperty(value = "营业执照图片地址")
private java.lang.String businessLicenseUrl;
/**
* 星纵-承包商-入场申请id
*/
@Excel(name = "星纵-承包商-入场申请id", width = 15)
@ApiModelProperty(value = "星纵-承包商-入场申请id")
private java.lang.Long xzSupplierQualificationApplyId;
/**
* xz_supplier_type表外键
* 企业类型
*/
@TableField(exist = false)
@ApiModelProperty(value = "企业类型Id")
private java.lang.Long xzSupplierTypeId;
@Excel(name = "企业类型", width = 15)
@ApiModelProperty(value = "企业类型")
private java.lang.Long enterpriseTypeId;
/**
* 父级企业ID
*/
@Excel(name = "父级企业ID", width = 15)
@ApiModelProperty(value = "父级企业ID")
private java.lang.Long parentEnterpriseId;
@Excel(name = "类型，1项目，2企业", width = 15)
@ApiModelProperty(value = "类型，1项目，2企业")
private java.lang.Integer type;
@Excel(name = "项目负责人", width = 15)
@ApiModelProperty(value = "项目负责人")
private java.lang.String projectDirectorName;
@Excel(name = "项目负责人电话", width = 15)
@ApiModelProperty(value = "项目负责人电话")
private java.lang.String projectDirectorPhone;
/**
* 排序
*/
@Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序")
private java.lang.Integer sortNum;
@ApiModelProperty(value = "是否是项目部公司，1否，2是")
private java.lang.Integer departmentType;
@ApiModelProperty(value = "祖级列表")
private java.lang.String ancestors;
@ApiModelProperty(value = "父级id")
private java.lang.Long parentProjectEnterpriseId;
/**
* xz_supplier_type表外键
*/
@ -191,30 +230,6 @@ public class XzSupplierRecord implements Serializable {
@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)

50
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierType.java
View File

@ -1,50 +0,0 @@
package com.zhgd.xmgl.modules.worker.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description: 星纵-供应商类型
* @author： pds
* @date： 2020-08-13
* @version： V1.0
*/
@Data
@TableName("xz_supplier_type")
@ApiModel(value = "XzSupplierType实体类", description = "XzSupplierType")
public class XzSupplierType 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 companyTypeName;
/**
* 描述
*/
@Excel(name = "描述", width = 15)
@ApiModelProperty(value = "描述")
private java.lang.String description;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private java.util.Date createTime;
}

17
src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/XzSupplierQualificationApplyDto.java Normal file
View File

@ -0,0 +1,17 @@
package com.zhgd.xmgl.modules.xz.entity.vo;
import com.zhgd.xmgl.modules.worker.entity.ProjectEnterpriseSupplierInfo;
import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualificationApply;
import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualificationRecord;
import com.zhgd.xmgl.modules.xz.entity.XzSupplierRecord;
import lombok.Data;
import java.util.List;
@Data
public class XzSupplierQualificationApplyDto {
private XzSupplierQualificationApply apply;
private XzSupplierRecord supplierRecord;
private List<XzSupplierQualificationRecord> qualificationRecords;
private List<ProjectEnterpriseSupplierInfo> enterpriseSupplierInfos;
}

15
src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierQualificationApplyMapper.java
View File

@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description: 星纵-供应商-资质申请
* @Description: 星纵-承包商-入场申请
* @author： pds
* @date： 2024-03-29
* @version： V1.0
@ -20,7 +20,7 @@ import java.util.List;
@Mapper
public interface XzSupplierQualificationApplyMapper extends BaseMapper<XzSupplierQualificationApply> {
/**
* 分页列表查询星纵-供应商-资质申请信息
* 分页列表查询星纵-承包商-入场申请信息
*
* @param page
* @param queryWrapper
@ -29,10 +29,19 @@ public interface XzSupplierQualificationApplyMapper extends BaseMapper<XzSupplie
IPage<XzSupplierQualificationApply> queryList(Page<XzSupplierQualificationApply> page, @Param(Constants.WRAPPER) QueryWrapper<XzSupplierQualificationApply> queryWrapper);
/**
* 列表查询星纵-供应商-资质申请信息
* 列表查询星纵-承包商-入场申请信息
*
* @param queryWrapper
* @return
*/
List<XzSupplierQualificationApply> queryList(@Param(Constants.WRAPPER) QueryWrapper<XzSupplierQualificationApply> queryWrapper);
/**
* 获取承包商-入场申请信息列表
*
* @param projectSn
* @param socialCode
* @return
*/
List<XzSupplierQualificationApply> getSupplierApprovalList(@Param("projectSn") String projectSn, @Param("socialCode") String socialCode);
}

32
src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierQualificationRecordMapper.java
View File

@ -1,17 +1,41 @@
package com.zhgd.xmgl.modules.xz.mapper;
import com.zhgd.annotation.DataScope;
import org.apache.ibatis.annotations.Mapper;
import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualificationRecord;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualificationRecord;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.HashMap;
import java.util.List;
/**
* @Description: 星纵-供应商-企业资质记录
* @Description: 星纵-承包商-企业资质记录
* @author： pds
* @date： 2024-03-29
* @version： V1.0
*/
@Mapper
public interface XzSupplierQualificationRecordMapper extends BaseMapper<XzSupplierQualificationRecord> {
/**
* 列表查询星纵-承包商-企业资质记录信息
*
* @param queryWrapper
* @param paramMap
* @return
*/
List<XzSupplierQualificationRecord> queryList(@Param(Constants.WRAPPER) QueryWrapper<XzSupplierQualificationRecord> queryWrapper, @Param("param") HashMap<String, Object> paramMap);
/**
* 分页列表查询星纵-承包商-企业资质记录信息
*
* @param page
* @param queryWrapper
* @param paramMap
* @return
*/
IPage<XzSupplierQualificationRecord> queryList(Page<XzSupplierQualificationRecord> page, @Param(Constants.WRAPPER) QueryWrapper<XzSupplierQualificationRecord> queryWrapper,@Param("param") HashMap<String, Object> paramMap);
}

8
src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierRecordMapper.java
View File

@ -13,7 +13,7 @@ import java.util.List;
import java.util.Map;
/**
* @Description: 星纵-供应商记录
* @Description: 星纵-承包商记录
* @author： pds
* @date： 2024-03-29
* @version： V1.0
@ -21,7 +21,7 @@ import java.util.Map;
@Mapper
public interface XzSupplierRecordMapper extends BaseMapper<XzSupplierRecord> {
/**
* 分页列表查询星纵-供应商记录信息
* 分页列表查询星纵-承包商记录信息
*
* @param page
* @param queryWrapper
@ -30,7 +30,7 @@ public interface XzSupplierRecordMapper extends BaseMapper<XzSupplierRecord> {
IPage<XzSupplierRecord> queryList(Page<XzSupplierRecord> page, @Param(Constants.WRAPPER) QueryWrapper<XzSupplierRecord> queryWrapper);
/**
* 列表查询星纵-供应商记录信息
* 列表查询星纵-承包商记录信息
*
* @param queryWrapper
* @return
@ -38,7 +38,7 @@ public interface XzSupplierRecordMapper extends BaseMapper<XzSupplierRecord> {
List<XzSupplierRecord> queryList(@Param(Constants.WRAPPER) QueryWrapper<XzSupplierRecord> queryWrapper);
/**
* 通过星纵-供应商-资质申请id查询星纵-供应商记录信息
* 通过星纵-承包商-入场申请id查询星纵-承包商记录信息
*
* @param map
* @return

16
src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierTypeMapper.java
View File

@ -1,16 +0,0 @@
package com.zhgd.xmgl.modules.xz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zhgd.xmgl.modules.worker.entity.XzSupplierType;
import org.apache.ibatis.annotations.Mapper;
/**
* @Description: 星纵-供应商类型
* @author： pds
* @date： 2020-08-13
* @version： V1.0
*/
@Mapper
public interface XzSupplierTypeMapper extends BaseMapper<XzSupplierType> {
}

11
src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierQualificationApplyMapper.xml
View File

@ -2,9 +2,18 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.xz.mapper.XzSupplierQualificationApplyMapper">
<select id="queryList" resultType="com.zhgd.xmgl.modules.xz.entity.XzSupplierQualificationApply">
select xsqa.*,p.project_name as applyOrg
select xsqa.*,p.project_name as applyOrg,xsr.enterprise_name
from xz_supplier_qualification_apply xsqa
left join project p on xsqa.project_sn = p.project_sn
left join xz_supplier_record xsr on xsqa.id = xsr.xz_supplier_qualification_apply_id
${ew.customSqlSegment}
</select>
<select id="getSupplierApprovalList" resultType="com.zhgd.xmgl.modules.xz.entity.XzSupplierQualificationApply">
select xsqa.*
from xz_supplier_qualification_apply xsqa
join xz_supplier_record xsr on xsqa.id = xsr.xz_supplier_qualification_apply_id
where xsqa.project_sn = #{projectSn}
and xsr.social_code = #{socialCode}
</select>
</mapper>

27
src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierQualificationRecordMapper.xml
View File

@ -1,4 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.xz.mapper.XzSupplierQualificationRecordMapper">
<sql id="qualificationTypeMap">
SELECT
*
FROM
dictionary_item
WHERE
dictionary_encoding =
IF
((
SELECT
COUNT(*)
FROM
dictionary_item di
WHERE
di.dictionary_encoding = CONCAT( 'enterprise_qualification_qualification_type_', #{param.projectSn} )) > 0,(
CONCAT( 'enterprise_qualification_qualification_type_', #{param.projectSn} )),'enterprise_qualification_qualification_type')
</sql>
<select id="queryList" resultType="com.zhgd.xmgl.modules.xz.entity.XzSupplierQualificationRecord">
select t.*,t1.name as qualification_type_name
from xz_supplier_qualification_record t
left join (
<include refid="com.zhgd.xmgl.modules.xz.mapper.XzSupplierQualificationRecordMapper.qualificationTypeMap">
</include>
) t1 on t1.data = t.qualification_type
${ew.customSqlSegment}
</select>
</mapper>

7
src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierRecordMapper.xml
View File

@ -10,11 +10,10 @@
<select id="getXzSupplierByXzSupplierQualificationApplyId"
resultType="com.zhgd.xmgl.modules.xz.entity.XzSupplierRecord">
SELECT
a.*,b.user_id,c.company_type_name,b.xz_supplier_type_id,b.project_director_name,b.project_director_phone
a.*,c.company_type_name,c.id as xz_supplier_type_id,a.project_director_name,a.project_director_phone
from xz_supplier_record a
join xz_supplier_qualification_apply xsqa on a.id = xsqa.xz_supplier_record_id
INNER JOIN xz_user_to_supplier b ON xsqa.apply_user_id=b.user_id
LEFT JOIN xz_supplier_type c ON b.xz_supplier_type_id=c.id
join xz_supplier_qualification_apply xsqa on xsqa.id=a.xz_supplier_qualification_apply_id
LEFT JOIN enterprise_type c ON a.enterprise_type_id=c.id
WHERE xsqa.id=#{xzSupplierQualificationApplyId}
</select>
</mapper>

4
src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzUserToSupplierMapper.xml
View File

@ -14,7 +14,7 @@
b.department_type
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
LEFT JOIN enterprise_type c ON b.xz_supplier_type_id = c.id
WHERE b.project_sn = #{param.projectSn}
<if test="param.xzSupplierTypeId != null and param.xzSupplierTypeId != ''">
and b.xz_supplier_type_id = #{param.xzSupplierTypeId}
@ -39,7 +39,7 @@
b.project_director_phone
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
LEFT JOIN enterprise_type c ON b.xz_supplier_type_id = c.id
WHERE b.project_sn = #{sn}
<if test="xzSupplierName != null and xzSupplierName != ''">
and a.xz_supplier_name like CONCAT(CONCAT('%', #{xzSupplierName}), '%')

32
src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierQualificationApplyService.java
View File

@ -3,19 +3,20 @@ package com.zhgd.xmgl.modules.xz.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualificationApply;
import com.zhgd.xmgl.modules.xz.entity.vo.XzSupplierQualificationApplyDto;
import java.util.HashMap;
import java.util.List;
/**
* @Description: 星纵-供应商-资质申请
* @Description: 星纵-承包商-入场申请
* @author： pds
* @date： 2024-03-29
* @version： V1.0
*/
public interface IXzSupplierQualificationApplyService extends IService<XzSupplierQualificationApply> {
/**
* 分页列表查询星纵-供应商-资质申请信息
* 分页列表查询星纵-承包商-入场申请信息
*
* @param paramMap
* @return
@ -23,7 +24,7 @@ public interface IXzSupplierQualificationApplyService extends IService<XzSupplie
IPage<XzSupplierQualificationApply> queryPageList(HashMap<String, Object> paramMap);
/**
* 列表查询星纵-供应商-资质申请信息
* 列表查询星纵-承包商-入场申请信息
*
* @param paramMap
* @return
@ -31,31 +32,44 @@ public interface IXzSupplierQualificationApplyService extends IService<XzSupplie
List<XzSupplierQualificationApply> queryList(HashMap<String, Object> paramMap);
/**
* 添加星纵-供应商-资质申请信息
* 添加星纵-承包商-入场申请信息
*
* @param xzSupplierQualificationApply
*/
void add(XzSupplierQualificationApply xzSupplierQualificationApply);
/**
* 编辑星纵-供应商-资质申请信息
* 编辑星纵-承包商-入场申请信息
*
* @param xzSupplierQualificationApply
*/
void edit(XzSupplierQualificationApply xzSupplierQualificationApply);
/**
* 根据id删除星纵-供应商-资质申请信息
* 根据id删除星纵-承包商-入场申请信息
*
* @param id
*/
void delete(String id);
/**
* 申请
* 保存星纵-承包商-入场申请信息
*
* @param paramMap
* @param dto
*/
void apply(HashMap<String, Object> paramMap);
void saveInfo(XzSupplierQualificationApplyDto dto);
/**
* 审批通过
*
* @param xzSupplierQualificationApply
*/
void pass(XzSupplierQualificationApply xzSupplierQualificationApply);
/**
* 审批驳回
*
* @param xzSupplierQualificationApply
*/
void refuse(XzSupplierQualificationApply xzSupplierQualificationApply);
}

12
src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierQualificationRecordService.java
View File

@ -8,14 +8,14 @@ import java.util.HashMap;
import java.util.List;
/**
* @Description: 星纵-供应商-企业资质记录
* @Description: 星纵-承包商-企业资质记录
* @author： pds
* @date： 2024-03-29
* @version： V1.0
*/
public interface IXzSupplierQualificationRecordService extends IService<XzSupplierQualificationRecord> {
/**
* 分页列表查询星纵-供应商-企业资质记录信息
* 分页列表查询星纵-承包商-企业资质记录信息
*
* @param paramMap
* @return
@ -23,7 +23,7 @@ public interface IXzSupplierQualificationRecordService extends IService<XzSuppli
IPage<XzSupplierQualificationRecord> queryPageList(HashMap<String, Object> paramMap);
/**
* 列表查询星纵-供应商-企业资质记录信息
* 列表查询星纵-承包商-企业资质记录信息
*
* @param paramMap
* @return
@ -31,21 +31,21 @@ public interface IXzSupplierQualificationRecordService extends IService<XzSuppli
List<XzSupplierQualificationRecord> queryList(HashMap<String, Object> paramMap);
/**
* 添加星纵-供应商-企业资质记录信息
* 添加星纵-承包商-企业资质记录信息
*
* @param xzSupplierQualificationRecord
*/
void add(XzSupplierQualificationRecord xzSupplierQualificationRecord);
/**
* 编辑星纵-供应商-企业资质记录信息
* 编辑星纵-承包商-企业资质记录信息
*
* @param xzSupplierQualificationRecord
*/
void edit(XzSupplierQualificationRecord xzSupplierQualificationRecord);
/**
* 根据id删除星纵-供应商-企业资质记录信息
* 根据id删除星纵-承包商-企业资质记录信息
*
* @param id
*/

14
src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierRecordService.java
View File

@ -9,14 +9,14 @@ import java.util.List;
import java.util.Map;
/**
* @Description: 星纵-供应商记录
* @Description: 星纵-承包商记录
* @author： pds
* @date： 2024-03-29
* @version： V1.0
*/
public interface IXzSupplierRecordService extends IService<XzSupplierRecord> {
/**
* 分页列表查询星纵-供应商记录信息
* 分页列表查询星纵-承包商记录信息
*
* @param paramMap
* @return
@ -24,7 +24,7 @@ public interface IXzSupplierRecordService extends IService<XzSupplierRecord> {
IPage<XzSupplierRecord> queryPageList(HashMap<String, Object> paramMap);
/**
* 列表查询星纵-供应商记录信息
* 列表查询星纵-承包商记录信息
*
* @param paramMap
* @return
@ -32,28 +32,28 @@ public interface IXzSupplierRecordService extends IService<XzSupplierRecord> {
List<XzSupplierRecord> queryList(HashMap<String, Object> paramMap);
/**
* 添加星纵-供应商记录信息
* 添加星纵-承包商记录信息
*
* @param xzSupplierRecord
*/
void add(XzSupplierRecord xzSupplierRecord);
/**
* 编辑星纵-供应商记录信息
* 编辑星纵-承包商记录信息
*
* @param xzSupplierRecord
*/
void edit(XzSupplierRecord xzSupplierRecord);
/**
* 根据id删除星纵-供应商记录信息
* 根据id删除星纵-承包商记录信息
*
* @param id
*/
void delete(String id);
/**
* 通过星纵-供应商-资质申请id查询星纵-供应商记录信息
* 通过星纵-承包商-入场申请id查询星纵-承包商记录信息
*
* @param map
* @return

13
src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierTypeService.java
View File

@ -1,13 +0,0 @@
package com.zhgd.xmgl.modules.xz.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.worker.entity.XzSupplierType;
/**
* @Description: 星纵-供应商类型
* @author： pds
* @date： 2020-08-13
* @version： V1.0
*/
public interface IXzSupplierTypeService extends IService<XzSupplierType> {
}

253
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java
View File

@ -1,48 +1,52 @@
package com.zhgd.xmgl.modules.xz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.constant.Cts;
import com.zhgd.xmgl.modules.basicdata.entity.Company;
import com.zhgd.xmgl.modules.basicdata.entity.XzSystemUserToCompanyProject;
import com.zhgd.redis.lock.redisson.DistributedLock;
import com.zhgd.xmgl.modules.basicdata.mapper.CompanyMapper;
import com.zhgd.xmgl.modules.basicdata.mapper.XzSystemUserToCompanyProjectMapper;
import com.zhgd.xmgl.modules.basicdata.service.impl.CompanyServiceImpl;
import com.zhgd.xmgl.modules.project.entity.ProjectEnterprise;
import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper;
import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
import com.zhgd.xmgl.modules.worker.entity.EnterpriseQualification;
import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
import com.zhgd.xmgl.modules.worker.mapper.EnterpriseQualificationMapper;
import com.zhgd.xmgl.modules.worker.service.impl.EnterpriseInfoServiceImpl;
import com.zhgd.xmgl.modules.worker.service.impl.EnterpriseQualificationServiceImpl;
import com.zhgd.xmgl.modules.worker.entity.ProjectEnterpriseSupplierInfo;
import com.zhgd.xmgl.modules.worker.service.impl.ProjectEnterpriseSupplierInfoServiceImpl;
import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualificationApply;
import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualificationRecord;
import com.zhgd.xmgl.modules.xz.entity.XzSupplierRecord;
import com.zhgd.xmgl.modules.xz.enums.XzSupplierQualificationApplyApplyStatusEnum;
import com.zhgd.xmgl.modules.xz.entity.vo.XzSupplierQualificationApplyDto;
import com.zhgd.xmgl.modules.xz.mapper.XzSupplierQualificationApplyMapper;
import com.zhgd.xmgl.modules.xz.mapper.XzSupplierQualificationRecordMapper;
import com.zhgd.xmgl.modules.xz.mapper.XzSupplierRecordMapper;
import com.zhgd.xmgl.modules.xz.service.IXzSupplierQualificationApplyService;
import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.EmailUtils;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
/**
* @Description: 星纵-供应商-资质申请
* @Description: 星纵-承包商-入场申请
* @author： pds
* @date： 2024-03-29
* @version： V1.0
@ -50,6 +54,9 @@ import java.util.*;
@Service
@Transactional(rollbackFor = Exception.class)
public class XzSupplierQualificationApplyServiceImpl extends ServiceImpl<XzSupplierQualificationApplyMapper, XzSupplierQualificationApply> implements IXzSupplierQualificationApplyService {
@Lazy
@Autowired
XzSupplierRecordServiceImpl xzSupplierRecordService;
@Autowired
private XzSystemUserToCompanyProjectMapper xzSystemUserToCompanyProjectMapper;
@Autowired
@ -70,6 +77,20 @@ public class XzSupplierQualificationApplyServiceImpl extends ServiceImpl<XzSuppl
private CompanyMapper companyMapper;
@Autowired
private EnterpriseInfoMapper enterpriseInfoMapper;
@Lazy
@Autowired
private XzSupplierQualificationRecordServiceImpl xzSupplierQualificationRecordService;
@Lazy
@Autowired
private ProjectEnterpriseSupplierInfoServiceImpl projectEnterpriseSupplierInfoService;
@Autowired
private EmailUtils emailUtils;
@Lazy
@Autowired
private EnterpriseInfoServiceImpl enterpriseInfoService;
@Lazy
@Autowired
private EnterpriseQualificationServiceImpl enterpriseQualificationService;
@Override
public IPage<XzSupplierQualificationApply> queryPageList(HashMap<String, Object> paramMap) {
@ -89,7 +110,7 @@ public class XzSupplierQualificationApplyServiceImpl extends ServiceImpl<XzSuppl
private QueryWrapper<XzSupplierQualificationApply> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = "xsqa.";
QueryWrapper<XzSupplierQualificationApply> queryWrapper = QueryGenerator.initPageQueryWrapper(XzSupplierQualificationApply.class, paramMap, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzSupplierQualificationApply::getId));
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzSupplierQualificationApply::getCreateTime));
return queryWrapper;
}
@ -109,65 +130,6 @@ public class XzSupplierQualificationApplyServiceImpl extends ServiceImpl<XzSuppl
if (apply == null) {
throw new OpenAlertException("未找到对应实体");
}
if (!Objects.equals(apply.getApplyStatus(), XzSupplierQualificationApplyApplyStatusEnum.PASS.getValue()) && Objects.equals(xzSupplierQualificationApply.getApplyStatus(), XzSupplierQualificationApplyApplyStatusEnum.PASS.getValue())) {
//已审批，关联组织权限
HashMap<String, Object> paramMap = new HashMap<>(16);
Long applyUserId = apply.getApplyUserId();
paramMap.put("userId", applyUserId);
String projectSn = apply.getProjectSn();
EntityMap companyMap = companyMapper.getCompanyInfosByProjectSn(projectSn);
if (companyMap == null) {
throw new OpenAlertException("查询公司为空");
}
HashMap<String, Object> p = new HashMap<>(16);
p.put("companyType", 4);
p.put("sn", projectSn);
Company headquarterCompany = companyMapper.getHeadquarterCompany(p);
if (headquarterCompany == null) {
throw new OpenAlertException("总公司为空");
}
EnterpriseInfo ei = getSupplierInfoByUserId(applyUserId);
//添加之前已经分配的权限
Set<String> projectSnList = new HashSet<>();
projectSnList.add(projectSn);
String headquartersSn = headquarterCompany.getHeadquartersSn();
List<XzSystemUserToCompanyProject> toCompanyProjects = xzSystemUserToCompanyProjectMapper.selectList(new LambdaQueryWrapper<XzSystemUserToCompanyProject>()
.eq(XzSystemUserToCompanyProject::getUserId, applyUserId)
.eq(XzSystemUserToCompanyProject::getHeadquartersSn, headquartersSn)
);
Set<String> companySnList = new HashSet<>();
companySnList.add(companyMap.get("companySn4"));
companySnList.add(companyMap.get("companySn3"));
companySnList.add(companyMap.get("companySn2"));
for (XzSystemUserToCompanyProject toCompanyProject : toCompanyProjects) {
if (toCompanyProject.getType() == 1) {
companySnList.add(toCompanyProject.getSn());
} else if (toCompanyProject.getType() == 2) {
projectSnList.add(toCompanyProject.getSn());
}
}
paramMap.put("companySns", StrUtil.join(Cts.COMMA, companySnList));
paramMap.put("headquartersSn", headquartersSn);
paramMap.put("projectSns", StrUtil.join(Cts.COMMA, projectSnList));
companyService.updateTenantOrg(paramMap);
//插入企业关联
Integer count = projectEnterpriseMapper.selectCount(new LambdaQueryWrapper<ProjectEnterprise>()
.eq(ProjectEnterprise::getProjectSn, projectSn)
.eq(ProjectEnterprise::getEnterpriseId, ei.getId())
);
if (count == 0) {
ProjectEnterprise projectEnterprise = new ProjectEnterprise();
projectEnterprise.setProjectSn(projectSn);
projectEnterprise.setEnterpriseId(ei.getId());
projectEnterprise.setEnterpriseTypeId(ei.getEnterpriseTypeId());
projectEnterprise.setType(1);
projectEnterprise.setParentEnterpriseId(0L);
projectEnterprise.setProjectDirectorName(ei.getProjectDirectorName());
projectEnterprise.setProjectDirectorPhone(ei.getProjectDirectorPhone());
projectEnterpriseMapper.insert(projectEnterprise);
}
}
baseMapper.updateById(xzSupplierQualificationApply);
}
@ -190,68 +152,111 @@ public class XzSupplierQualificationApplyServiceImpl extends ServiceImpl<XzSuppl
}
@Override
public void apply(HashMap<String, Object> paramMap) {
//1第一次申请2撤销申请3重新提交申请
Integer type = MapUtils.getInteger(paramMap, "type");
String projectSn = MapUtils.getString(paramMap, "projectSn");
String userId = MapUtils.getString(paramMap, "userId");
String xzSupplierQualificationApplyId = MapUtils.getString(paramMap, "xzSupplierQualificationApplyId");
int revocation = 2;
int undo = 3;
int first = 1;
if (Objects.equals(type, first)) {
//1第一次申请
applyNew(projectSn, userId);
} else if (Objects.equals(type, revocation)) {
if (StrUtil.isBlank(xzSupplierQualificationApplyId)) {
throw new OpenAlertException("xzSupplierQualificationApplyId不能为空");
public void saveInfo(XzSupplierQualificationApplyDto dto) {
XzSupplierQualificationApply apply = dto.getApply();
apply.setId(null);
XzSupplierRecord supplierRecord = dto.getSupplierRecord();
supplierRecord.setId(null);
List<XzSupplierQualificationRecord> qualificationRecords = dto.getQualificationRecords();
List<ProjectEnterpriseSupplierInfo> enterpriseSupplierInfos = dto.getEnterpriseSupplierInfos();
List<XzSupplierQualificationApply> supplierApprovalList = baseMapper.getSupplierApprovalList(apply.getProjectSn(), supplierRecord.getSocialCode());
long c1 = supplierApprovalList.stream().filter(apply1 -> Objects.equals(apply1.getApplyStatus(), 1)).count();
if (c1 > 0) {
throw new OpenAlertException("该承包商（信用代码：" + supplierRecord.getSocialCode() + "）待审核中");
}
long c2 = supplierApprovalList.stream().filter(apply1 -> Objects.equals(apply1.getApplyStatus(), 2)).count();
if (c2 > 0) {
throw new OpenAlertException("该承包商（信用代码：" + supplierRecord.getSocialCode() + "）已审核通过");
}
baseMapper.insert(apply);
Long applyId = apply.getId();
supplierRecord.setXzSupplierQualificationApplyId(applyId);
xzSupplierRecordService.save(supplierRecord);
if (CollUtil.isNotEmpty(qualificationRecords)) {
for (XzSupplierQualificationRecord record : qualificationRecords) {
record.setId(null);
record.setXzSupplierQualificationApplyId(applyId);
}
//2撤销申请
baseMapper.update(null, new LambdaUpdateWrapper<XzSupplierQualificationApply>().eq(XzSupplierQualificationApply::getId, xzSupplierQualificationApplyId)
.set(XzSupplierQualificationApply::getApplyStatus, 4));
} else if (Objects.equals(type, undo)) {
XzSupplierQualificationApply apply = baseMapper.selectById(xzSupplierQualificationApplyId);
if (apply == null) {
throw new OpenAlertException("未找到对应实体");
xzSupplierQualificationRecordService.saveBatch(qualificationRecords);
}
if (CollUtil.isNotEmpty(enterpriseSupplierInfos)) {
for (ProjectEnterpriseSupplierInfo info : enterpriseSupplierInfos) {
info.setId(null);
info.setType(1);
info.setProjectSn(apply.getProjectSn());
info.setXzSupplierQualificationApplyId(applyId);
}
//3重新提交申请
applyNew(apply.getProjectSn(), String.valueOf(apply.getApplyUserId()));
projectEnterpriseSupplierInfoService.saveBatch(enterpriseSupplierInfos);
}
}
private void applyNew(String projectSn, String userId) {
if (StrUtil.isBlank(projectSn)) {
throw new OpenAlertException("项目sn不能为空");
@Override
@DistributedLock(keyPrefix = "xz_supplier_qualification_apply:", key = "#xzSupplierQualificationApply.id", tryLok = true, lockTime = 0)
public void pass(XzSupplierQualificationApply xzSupplierQualificationApply) {
Long id = xzSupplierQualificationApply.getId();
XzSupplierQualificationApply apply = baseMapper.selectById(id);
if (apply == null) {
throw new OpenAlertException("未找到对应实体");
}
if (userId == null) {
throw new OpenAlertException("用户id不能为空");
apply.setApplyContent(xzSupplierQualificationApply.getApplyContent());
apply.setApplyStatus(2);
apply.setApplyUser(xzSupplierQualificationApply.getApplyUser());
apply.setReplyTime(xzSupplierQualificationApply.getReplyTime());
baseMapper.updateById(apply);
XzSupplierRecord supplierRecord = xzSupplierRecordService.getOne(Wrappers.<XzSupplierRecord>lambdaQuery().eq(XzSupplierRecord::getXzSupplierQualificationApplyId, id));
String realName = SecurityUtils.getUser().getRealName();
emailUtils.sendSimpleMail(apply.getNoticeEmail(), supplierRecord.getEnterpriseName() + "入场审批通过",
StrUtil.format("审批结果：合格\r\n审批人：{}\r\n审批回复：{}\r\n", realName, apply.getApplyContent()));
//添加到正式的数据中
EnterpriseInfo enterpriseInfo = BeanUtil.copyProperties(supplierRecord, EnterpriseInfo.class);
enterpriseInfo.setProjectSn(apply.getProjectSn());
enterpriseInfoService.saveEnterpriseInfo(enterpriseInfo);
EnterpriseInfo newEnterpriseInfo = enterpriseInfoService.getOne(Wrappers.<EnterpriseInfo>lambdaQuery().eq(EnterpriseInfo::getSocialCode, supplierRecord.getSocialCode()));
List<ProjectEnterpriseSupplierInfo> projectEnterpriseSupplierInfos = projectEnterpriseSupplierInfoService.list(Wrappers.<ProjectEnterpriseSupplierInfo>lambdaQuery().eq(ProjectEnterpriseSupplierInfo::getXzSupplierQualificationApplyId, id));
if (CollUtil.isNotEmpty(projectEnterpriseSupplierInfos)) {
List<ProjectEnterpriseSupplierInfo> copyToList = BeanUtil.copyToList(projectEnterpriseSupplierInfos, ProjectEnterpriseSupplierInfo.class);
for (ProjectEnterpriseSupplierInfo info : copyToList) {
info.setId(null);
info.setXzSupplierQualificationApplyId(null);
info.setType(2);
info.setEnterpriseId(newEnterpriseInfo.getId());
}
projectEnterpriseSupplierInfoService.saveBatch(copyToList);
}
XzSupplierQualificationApply xzSupplierQualificationApply = new XzSupplierQualificationApply();
//添加记录
HashMap<String, Object> map = new HashMap<>(16);
map.put("userId", userId);
EnterpriseInfo xzSupplier = xzSupplierService.getXzSupplierByUserId(map);
if (xzSupplier == null) {
throw new OpenAlertException("请先填报基本信息");
List<XzSupplierQualificationRecord> enterpriseQualifications = xzSupplierQualificationRecordService.list(Wrappers.<XzSupplierQualificationRecord>lambdaQuery().eq(XzSupplierQualificationRecord::getXzSupplierQualificationApplyId, id));
if (CollUtil.isNotEmpty(enterpriseQualifications)) {
List<EnterpriseQualification> copyToList = BeanUtil.copyToList(enterpriseQualifications, EnterpriseQualification.class);
for (EnterpriseQualification qualification : copyToList) {
qualification.setId(null);
qualification.setEnterpriseId(newEnterpriseInfo.getId());
}
enterpriseQualificationService.saveBatch(copyToList);
}
xzSupplier.setId(null);
XzSupplierRecord supplierRecord = new XzSupplierRecord();
BeanUtil.copyProperties(xzSupplier, supplierRecord);
xzSupplierRecordMapper.insert(supplierRecord);
xzSupplierQualificationApply.setXzSupplierRecordId(supplierRecord.getId());
xzSupplierQualificationApply.setProjectSn(projectSn);
xzSupplierQualificationApply.setApplyUserId(Long.valueOf(userId));
baseMapper.insert(xzSupplierQualificationApply);
EnterpriseInfo ei = getSupplierInfoByUserId(Long.valueOf(userId));
List<EnterpriseQualification> xzSupplierQualifications = enterpriseQualificationMapper.selectList(new LambdaQueryWrapper<EnterpriseQualification>()
.eq(EnterpriseQualification::getEnterpriseId, ei.getId()));
for (EnterpriseQualification xzSupplierQualification : xzSupplierQualifications) {
XzSupplierQualificationRecord qualificationRecord = new XzSupplierQualificationRecord();
qualificationRecord.setXzSupplierQualificationApplyId(xzSupplierQualificationApply.getId());
BeanUtil.copyProperties(xzSupplierQualification, qualificationRecord);
qualificationRecord.setId(null);
xzSupplierQualificationRecordMapper.insert(qualificationRecord);
}
@Override
@DistributedLock(keyPrefix = "xz_supplier_qualification_apply:", key = "#xzSupplierQualificationApply.id", tryLok = true, lockTime = 0)
public void refuse(XzSupplierQualificationApply xzSupplierQualificationApply) {
Long id = xzSupplierQualificationApply.getId();
XzSupplierQualificationApply apply = baseMapper.selectById(id);
if (apply == null) {
throw new OpenAlertException("未找到对应实体");
}
String url = xzSupplierQualificationApply.getResubmitApplicationUrl();
if (StrUtil.isBlank(url)) {
throw new OpenAlertException("重新提交申请链接不能为空");
}
apply.setApplyContent(xzSupplierQualificationApply.getApplyContent());
apply.setApplyStatus(3);
apply.setApplyUser(xzSupplierQualificationApply.getApplyUser());
apply.setReplyTime(xzSupplierQualificationApply.getReplyTime());
baseMapper.updateById(apply);
XzSupplierRecord supplierRecord = xzSupplierRecordService.getOne(Wrappers.<XzSupplierRecord>lambdaQuery().eq(XzSupplierRecord::getXzSupplierQualificationApplyId, id));
String realName = SecurityUtils.getUser().getRealName();
emailUtils.sendSimpleMail(apply.getNoticeEmail(), supplierRecord.getEnterpriseName() + "入场审批不通过",
StrUtil.format("审批结果：不合格\r\n审批人：{}\r\n审批回复：{}\r\n重新提交申请链接(点击链接补充资质)：{}", realName, apply.getApplyContent(), url));
}
}

8
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationRecordServiceImpl.java
View File

@ -20,7 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description: 星纵-供应商-企业资质记录
* @Description: 星纵-承包商-企业资质记录
* @author： pds
* @date： 2024-03-29
* @version： V1.0
@ -35,7 +35,7 @@ public class XzSupplierQualificationRecordServiceImpl extends ServiceImpl<XzSupp
public IPage<XzSupplierQualificationRecord> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzSupplierQualificationRecord> queryWrapper = getQueryWrapper(paramMap);
Page<XzSupplierQualificationRecord> page = PageUtil.getPage(paramMap);
IPage<XzSupplierQualificationRecord> pageList = this.page(page, queryWrapper);
IPage<XzSupplierQualificationRecord> pageList = baseMapper.queryList(page, queryWrapper,paramMap);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;
}
@ -43,13 +43,13 @@ public class XzSupplierQualificationRecordServiceImpl extends ServiceImpl<XzSupp
@Override
public List<XzSupplierQualificationRecord> queryList(HashMap<String, Object> paramMap) {
QueryWrapper<XzSupplierQualificationRecord> queryWrapper = getQueryWrapper(paramMap);
return dealList(this.list(queryWrapper));
return dealList(baseMapper.queryList(queryWrapper,paramMap));
}
private QueryWrapper<XzSupplierQualificationRecord> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = "";
QueryWrapper<XzSupplierQualificationRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(XzSupplierQualificationRecord.class, paramMap, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzSupplierQualificationRecord::getId));
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzSupplierQualificationRecord::getCreateTime));
return queryWrapper;
}

2
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierRecordServiceImpl.java
View File

@ -21,7 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description: 星纵-供应商记录
* @Description: 星纵-承包商记录
* @author： pds
* @date： 2024-03-29
* @version： V1.0

21
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierTypeServiceImpl.java
View File

@ -1,21 +0,0 @@
package com.zhgd.xmgl.modules.xz.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.xmgl.modules.worker.entity.XzSupplierType;
import com.zhgd.xmgl.modules.xz.mapper.XzSupplierTypeMapper;
import com.zhgd.xmgl.modules.xz.service.IXzSupplierTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @Description: 星纵-供应商类型
* @author： pds
* @date： 2020-08-13
* @version： V1.0
*/
@Service
public class XzSupplierTypeServiceImpl extends ServiceImpl<XzSupplierTypeMapper, XzSupplierType> implements IXzSupplierTypeService {
@Autowired
private XzSupplierTypeMapper xzSupplierTypeMapper;
}

3
src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
View File

@ -80,6 +80,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
http.authorizeRequests()
//请求路径允许访问
.antMatchers("/xmgl/enterpriseType/list").permitAll()
.antMatchers("/xmgl/dictionaryItem/list").permitAll()
.antMatchers("/xmgl/xzSupplierQualificationApply/**").permitAll()
.antMatchers("/xmgl/rainRecord/add").permitAll()
.antMatchers("/xmgl/rainAlarm/add").permitAll()
.antMatchers("/xmgl/vrSecurityWorkerLoginInfo/add").permitAll()