Commit b17913ca authored by suhuiguang's avatar suhuiguang

fix(大编辑):bug修复

1.流程中编辑管道增减管道,履历上无编辑日志 2.汇总表投用日期无值,应该是增加管道时未写入
parent 1bf97fbd
package com.yeejoin.amos.boot.module.jg.api.dto;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
import com.yeejoin.amos.boot.biz.common.annotation.Group;
import io.swagger.annotations.ApiModel;
......@@ -67,7 +66,7 @@ public class ProjectContraptionChangeDataDto extends BaseChangeDataDto {
private String productQualificationCertificate;
@FieldDisplayDefine(value = "使用地点代码_省",typeHandler = "regionCodeTypeHandler")
@FieldDisplayDefine(value = "使用地点代码_省", typeHandler = "regionCodeTypeHandler")
private String province;
@FieldDisplayDefine(value = "使用地点代码_市", typeHandler = "regionCodeTypeHandler")
......@@ -123,4 +122,7 @@ public class ProjectContraptionChangeDataDto extends BaseChangeDataDto {
@FieldDisplayDefine(value = "施工单位名称", isExist = false)
private String uscUnitName;
@FieldDisplayDefine(value = "投用日期", isExist = false)
private String useDate;
}
......@@ -12,9 +12,9 @@
<select id="queryPageListByChangeIds" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto">
SELECT *
FROM tzs_jg_resume_info
WHERE equ_id IN
<foreach collection="equIds" item="id" open="(" separator="," close=")">
#{id}
WHERE
<foreach collection="equIds" item="id" open="(" separator="or" close=")">
equ_id like concat('%',#{id}, '%')
</foreach>
order by rec_date desc
</select>
......
......@@ -166,6 +166,8 @@ public class PieLineDataChangeServiceImpl {
useInfo.setRecord(record);
useInfo.setSequenceNbr(null);
useInfo.setRecDate(new Date());
// 汇总表打印会使用
useInfo.setUseDate(projectContraptionChangeDataDto.getUseDate());
useInfo.setDataSource(projectContraptionChangeDataDto.getDataSource());
useInfo.setIsIntoManagement(Boolean.FALSE);
SingleProjectEquipChangeProcess.setNewUseAddressInfo(projectContraptionChangeDataDto, useInfo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment