diff --git a/search-tool/src/main/java/com/bonus/tool/dto/TbCompanyPerfVo.java b/search-tool/src/main/java/com/bonus/tool/dto/TbCompanyPerfVo.java index 03cac70..26c8819 100644 --- a/search-tool/src/main/java/com/bonus/tool/dto/TbCompanyPerfVo.java +++ b/search-tool/src/main/java/com/bonus/tool/dto/TbCompanyPerfVo.java @@ -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 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; } diff --git a/search-tool/src/main/java/com/bonus/tool/dto/TbFileSourceVo.java b/search-tool/src/main/java/com/bonus/tool/dto/TbFileSourceVo.java index cc1fd64..a76a80f 100644 --- a/search-tool/src/main/java/com/bonus/tool/dto/TbFileSourceVo.java +++ b/search-tool/src/main/java/com/bonus/tool/dto/TbFileSourceVo.java @@ -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; diff --git a/search-tool/src/main/java/com/bonus/tool/dto/TbSubPerfVo.java b/search-tool/src/main/java/com/bonus/tool/dto/TbSubPerfVo.java index 6fc38e8..12a2bc0 100644 --- a/search-tool/src/main/java/com/bonus/tool/dto/TbSubPerfVo.java +++ b/search-tool/src/main/java/com/bonus/tool/dto/TbSubPerfVo.java @@ -71,6 +71,11 @@ public class TbSubPerfVo { */ private String voltage; + /** + * 电压等级 + */ + private String dictValue; + /** * 创建时间 */ diff --git a/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml b/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml index c6456f9..ce2be8c 100644 --- a/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml +++ b/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml @@ -17,6 +17,14 @@ owner_phone, create_time, create_user, + money, + project_location, + engineering_quality, + technical_lead, + supervising_engineer, + owner_location, + remark, + project_situation, del_flag @@ -32,6 +40,14 @@ #{ownerPhone}, #{createTime}, #{createUser}, + #{money}, + #{projectLocation}, + #{engineeringQuality}, + #{technicalLead}, + #{supervisingEngineer}, + #{ownerLocation}, + #{remark}, + #{projectSituation}, 0 @@ -48,6 +64,14 @@ contract_rang = #{contractRang}, owner_unit = #{ownerUnit}, owner_phone = #{ownerPhone}, + money = #{money}, + project_location = #{projectLocation}, + engineering_quality = #{engineeringQuality}, + technical_lead = #{technicalLead}, + supervising_engineer = #{supervisingEngineer}, + owner_location = #{ownerLocation}, + remark = #{remark}, + project_situation = #{projectSituation}, update_time = now() where id = #{id} @@ -57,17 +81,21 @@ - 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 - and pro_name like concat('%', #{proName}, '%') - and sub_id = #{subId} - and voltage = #{voltage} + 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 + and tsp.pro_name like concat('%', #{proName}, '%') + and tsp.sub_id = #{subId} + and tsp.voltage = #{voltage} - 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')