bonus
/
search_tools_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增需求

This commit is contained in:
马三炮 2025-06-23 14:51:49 +08:00
parent 7c0b619157
commit 8d6c4bd006
5 changed files with 99 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
search-tool/src/main/java/com/bonus/tool/dto/TbCompanyPerfVo.java
View File

@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@ -32,6 +33,11 @@ public class TbCompanyPerfVo {
@Excel(name = "电压等级", sort = 2)
private String voltage;
/**
* 电压等级
*/
private String dictValue;
/**
* 开始时间
*/
@ -126,4 +132,44 @@ public class TbCompanyPerfVo {
private List<String> perfIds;
private Long perfId;
/**
*合同金额(万元)
*/
private BigDecimal money;
/**
* 项目所在地
*/
private String projectLocation;
/**
*工程质量
*/
private String engineeringQuality;
/**
* 技术负责人
*/
private String technicalLead;
/**
* 监理工程师
*/
private String supervisingEngineer;
/**
* 业主单位地址
*/
private String ownerLocation;
/**
* 备注
*/
private String remark;
/**
* 项目概况
*/
private String projectSituation;
}

3
search-tool/src/main/java/com/bonus/tool/dto/TbFileSourceVo.java
View File

@ -36,11 +36,12 @@ public class TbFileSourceVo {
*文件类型 (自己按照每个表进行自己定义 建议统一用数字)
* tb_key_people 1:身份证正面，2:身份证反面，3:资格证，4:其他资质
* tb_other_people 1:身份证正面，2:身份证反面，3:资格证，4:其他资质
* tb_company_perf 1:合同
* tb_company_perf 1:中标通知书 2：合同关键页，3:竣工报告
* tb_company_perf_rel 1：业绩证明
* tb_sub 1:公司资质
* tb_sub_people 1:身份证正面，2:身份证反面，3:资格证，4:其他资质
* tb_sub_perf 1:合同
* tb_certification 3:资格证
*/
private String fileType;

5
search-tool/src/main/java/com/bonus/tool/dto/TbSubPerfVo.java
View File

@ -71,6 +71,11 @@ public class TbSubPerfVo {
*/
private String voltage;
/**
* 电压等级
*/
private String dictValue;
/**
* 创建时间
*/

46
search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml
View File

@ -17,6 +17,14 @@
<if test="ownerPhone != null and ownerPhone != ''">owner_phone,</if>
<if test="createTime != null ">create_time,</if>
<if test="createUser != null and createUser != ''">create_user,</if>
<if test="money != null and money != ''">money,</if>
<if test="projectLocation != null and projectLocation != ''">project_location,</if>
<if test="engineeringQuality != null and engineeringQuality != ''">engineering_quality,</if>
<if test="technicalLead != null and technicalLead != ''">technical_lead,</if>
<if test="supervisingEngineer != null and supervisingEngineer != ''">supervising_engineer,</if>
<if test="ownerLocation != null and ownerLocation != ''">owner_location,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="projectSituation != null and projectSituation != ''">project_situation,</if>
del_flag
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@ -32,6 +40,14 @@
<if test="ownerPhone != null and ownerPhone != ''">#{ownerPhone},</if>
<if test="createTime != null ">#{createTime},</if>
<if test="createUser != null and createUser != ''">#{createUser},</if>
<if test="money != null and money != ''">#{money},</if>
<if test="projectLocation != null and projectLocation != ''">#{projectLocation},</if>
<if test="engineeringQuality != null and engineeringQuality != ''">#{engineeringQuality},</if>
<if test="technicalLead != null and technicalLead != ''">#{technicalLead},</if>
<if test="supervisingEngineer != null and supervisingEngineer != ''">#{supervisingEngineer},</if>
<if test="ownerLocation != null and ownerLocation != ''">#{ownerLocation},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="projectSituation != null and projectSituation != ''">#{projectSituation},</if>
0
</trim>
</insert>
@ -48,6 +64,14 @@
<if test="contractRang != null">contract_rang = #{contractRang},</if>
<if test="ownerUnit != null">owner_unit = #{ownerUnit},</if>
<if test="ownerPhone != null">owner_phone = #{ownerPhone},</if>
<if test="money != null">money = #{money},</if>
<if test="projectLocation != null">project_location = #{projectLocation},</if>
<if test="engineeringQuality != null">engineering_quality = #{engineeringQuality},</if>
<if test="technicalLead != null">technical_lead = #{technicalLead},</if>
<if test="supervisingEngineer != null">supervising_engineer = #{supervisingEngineer},</if>
<if test="ownerLocation != null">owner_location = #{ownerLocation},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="projectSituation != null">project_situation = #{projectSituation},</if>
update_time = now()
</trim>
where id = #{id}
@ -57,17 +81,21 @@
</delete>
<select id="getTbCompanyPerfList" resultType="com.bonus.tool.dto.TbCompanyPerfVo">
select id as id ,pro_name as proName,voltage as voltage,start_time as startTime,end_time as endTime,
stop_time as stopTime,station_num as stationNum,line_scale as lineScale,contract_rang as contractRang,
owner_unit as ownerUnit,owner_phone as ownerPhone,create_time as createTime, create_user as createUser,
update_time as updateTime
from tb_company_perf where del_flag =0
<if test="proName != '' and proName != null">and pro_name like concat('%', #{proName}, '%')</if>
<if test="voltage != '' and voltage != null">and voltage = #{voltage}</if>
select tcp.id as id ,tcp.pro_name as proName,sdd.dict_label as voltage,tcp.start_time as startTime,tcp.end_time as endTime,
tcp.stop_time as stopTime,tcp.station_num as stationNum,tcp.line_scale as lineScale,tcp.contract_rang as contractRang,
tcp.owner_unit as ownerUnit,tcp.owner_phone as ownerPhone,tcp.create_time as createTime, tcp.create_user as createUser,
tcp.update_time as updateTime,tcp.voltage as dictValue,tcp.money as money,tcp.project_location as projectLocation,
tcp.engineering_quality as engineeringQuality,tcp.technical_lead as technicalLead,tcp.remark as remark,
tcp.supervising_engineer as supervisingEngineer,tcp.owner_location as ownerLocation,tcp.project_situation as projectSituation
from tb_company_perf tcp
LEFT JOIN sys_dict_data sdd on tcp.voltage = sdd.dict_value and sdd.dict_type= 'voltage_level'
where del_flag =0
<if test="proName != '' and proName != null">and tcp.pro_name like concat('%', #{proName}, '%')</if>
<if test="voltage != '' and voltage != null">and tcp.voltage = #{voltage}</if>
<if test="startTime != null and endTime != null">
and start_time BETWEEN STR_TO_DATE(#{startTime}, '%Y-%m-%d') AND STR_TO_DATE(#{endTime}, '%Y-%m-%d')
and tcp.start_time BETWEEN STR_TO_DATE(#{startTime}, '%Y-%m-%d') AND STR_TO_DATE(#{endTime}, '%Y-%m-%d')
</if>
ORDER By tcp.create_time desc
</select>
<select id="getTbCompanyPerfById" resultType="com.bonus.tool.dto.TbCompanyPerfVo">
select id,pro_name,voltage,start_time,end_time,stop_time,station_num,line_scale,contract_rang,

16
search-tool/src/main/resources/mapper/TbSubPerfMapper.xml
View File

@ -52,14 +52,16 @@
</delete>
<select id="getTbSubPerfList" resultType="com.bonus.tool.dto.TbSubPerfVo">
select id as id,sub_id as subId,pro_name as proName,cons_unit as consUnit,start_time as startTime,
end_time as endTime,ht_remark as htRemark,money as money,voltage as voltage
from tb_sub_perf where del_flag=0
<if test="proName != '' and proName != null">and pro_name like concat('%', #{proName}, '%')</if>
<if test="subId != '' and subId != null">and sub_id = #{subId}</if>
<if test="voltage != '' and voltage != null">and voltage = #{voltage}</if>
select tsp.id as id,tsp.sub_id as subId,tsp.pro_name as proName,tsp.cons_unit as consUnit,tsp.start_time as startTime,
tsp.end_time as endTime,tsp.ht_remark as htRemark,tsp.money as money,sdd.dict_label as voltage,tsp.voltage as dictValue
from tb_sub_perf tsp
LEFT JOIN sys_dict_data sdd on tsp.voltage = sdd.dict_value and sdd.dict_type= 'voltage_level'
where del_flag=0
<if test="proName != '' and proName != null">and tsp.pro_name like concat('%', #{proName}, '%')</if>
<if test="subId != '' and subId != null">and tsp.sub_id = #{subId}</if>
<if test="voltage != '' and voltage != null">and tsp.voltage = #{voltage}</if>
<if test="startTime != null and endTime != null">
and start_time BETWEEN STR_TO_DATE(#{startTime}, '%Y-%m-%d') AND STR_TO_DATE(#{endTime}, '%Y-%m-%d')
and tsp.start_time BETWEEN STR_TO_DATE(#{startTime}, '%Y-%m-%d') AND STR_TO_DATE(#{endTime}, '%Y-%m-%d')
</if>
</select>
<select id="getTbSubPerfById" resultType="com.bonus.tool.dto.TbSubPerfVo">