Merge branch 'master' of http://111.30.93.211:10101/r/supipe

叶松

2023-11-30 433cc383e19bcbe826567b09b9ef9247fa46c228

Merge branch 'master' of http://111.30.93.211:10101/r/supipe

 hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionHazardInformEntity.java

@@ -44,5 +44,6 @@
    RegionInspectionRecordEntity recordEntity;

    private String result;//巡检结果
    List<RegionInspectionRecordImgEntity> imgList;
    private List<RegionInspectionRecordImgEntity> imgList;
    private Integer status;//该区域的巡检状态
}

 hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionRecordEntity.java

@@ -51,5 +51,5 @@

    private String imgPaths;

    List<RegionInspectionRecordImgEntity> imgList;
    private List<RegionInspectionRecordImgEntity> imgList;
}

 hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/mapper/RegionInspectionRecordMapper.java

@@ -41,6 +41,7 @@
            @Param("regionHazardInformId")String regionHazardInformId);

    void insertIMG(RegionInspectionRecordImgEntity regionInspectionRecordImgEntity);
    void deleteIMG(String regionInspectionRecordId);

    List<RegionInspectionRecordImgEntity> selectImgByRecordId(String regionInspectionRecordId);


 hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionRecordServiceImpl.java

@@ -50,11 +50,11 @@
            regionInspectionEntity.setInspectionTime(new Date());
            regionInspectionEntity.setUpdateTime(new Date());
        }
        regionInspectionRecordMapper.deleteIMG(regionInspectionEntity.getId());
        synchronized (this){
            //修改打卡记录
            regionInspectionEntity.setCreateUser(userId);
            regionInspectionRecordMapper.insert(regionInspectionEntity);

            //添加记录相对应的图片
            if (!regionInspectionEntity.getImgList().isEmpty()){
                regionInspectionEntity.getImgList().forEach(obj->{
@@ -185,6 +185,7 @@
                        .recordEntity(recordEntity)
                        .imgList(imgEntityList)
                        .result(recordEntity.getResult())
                        .status(recordEntity.getStatus())
                        .build();
                regionList.add(regionEntity);
            }

 hd/pipe/secure/src/main/resources/mapping/RegionInspectionRecordMapper.xml

@@ -153,6 +153,9 @@
    <delete id="delete">
        delete from t_region_inspection_record where  id=#{id,jdbcType=VARCHAR}
    </delete>
    <delete id="deleteIMG">
        delete from t_region_inspection_record_img where  regionInspectionRecordId=#{regionInspectionRecordId,jdbcType=VARCHAR}
    </delete>

    <delete id="deleteByRegionInspectionId">
        delete from t_region_inspection_record where  regionInspectionId=#{regionInspectionId,jdbcType=VARCHAR}
@@ -282,7 +285,8 @@
                t.result result,
                GROUP_CONCAT(timg.imgPath) imgPaths,
                t.location,
                spu.real_name realName
                spu.real_name realName,
                t.status
        FROM t_region_inspection_record t
                     LEFT JOIN t_region_inspection_record_img timg on t.id = timg.regionInspectionRecordId
                     LEFT JOIN t_region_hazard_inform rhi on rhi.id = t.regionHazardInformId