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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
fl 2025-04-27 14:11:38 +08:00
parent 2a99d40160 ac26ff3f45
commit 75e333b0d8
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,11 @@ public class TbSubPerfVo {
@Excel(name = "分包合同金额(万元)", sort = 3)
private BigDecimal money;
/**
* 电压等级
*/
private String voltage;
/**
* 创建时间
*/

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

@ -14,6 +14,7 @@
<if test="money != null ">money,</if>
<if test="createTime != null ">create_time,</if>
<if test="createUser != null and createUser != ''">create_user,</if>
<if test="voltage != null and voltage != ''">voltage,</if>
del_flag
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@ -24,6 +25,7 @@
<if test="endTime != null ">#{endTime},</if>
<if test="htRemark != null and htRemark != ''">#{htRemark},</if>
<if test="money != null ">#{money},</if>
<if test="voltage != null ">#{voltage},</if>
0
</trim>
</insert>
@ -37,6 +39,7 @@
<if test="endTime != null">end_time = #{endTime},</if>
<if test="htRemark != null">ht_remark = #{htRemark},</if>
<if test="money != null">money = #{money},</if>
<if test="voltage != null">voltage = #{voltage},</if>
<if test="updateUser != null">update_user = #{updateUser},</if>
update_time = now()
</trim>
@ -48,7 +51,7 @@
<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
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 = #{proName}</if>
<if test="startTime != null"> and start_time >= STR_TO_DATE(#{startTime}, '%Y-%m-%d')</if>
@ -56,12 +59,12 @@
</select>
<select id="getTbSubPerfById" 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
end_time as endTime,ht_remark as htRemark,money as money,voltage as voltage
from tb_sub_perf where id=#{id}
</select>
<select id="getTbSubPerfByProName" 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
end_time as endTime,ht_remark as htRemark,money as money,voltage as voltage
from tb_sub_perf where pro_name=#{proName} and sub_id=#{subId} and del_flag=0
</select>
</mapper>