From c9d58da3af96d0a41985e8b79b2a4f17ace614e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Mon, 14 Apr 2025 15:00:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ImportantMatterServiceImpl.java | 3 +++ .../impl/SafetyMeasuresServiceImpl.java | 9 +++++++++ .../imageUpload/CoordinatePhotoMapper.xml | 20 ++++--------------- .../imageUpload/ImportantMatterMapper.xml | 19 ++++-------------- .../imageUpload/SafetMeasuresMapper.xml | 19 +++--------------- 5 files changed, 23 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java index 9049d31..4f26c36 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java @@ -134,6 +134,9 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getUsername(): null; data.setUpdateUserId(CreateUserId); data.setUpdateUserName(CreateUserName); + if (data.getTime().isEmpty()){ + data.setTime(null); + } importantMatterMapper.updateImportantMatter(data); //附件先删除，后新增 sysFileResourceService.deleteFileResource(data.getId()); diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java index e8c8a23..b8d0219 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java @@ -137,6 +137,9 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getUsername(): null; data.setUpdateUserId(CreateUserId); data.setUpdateUserName(CreateUserName); + if (data.getCheckDate().isEmpty()){ + data.setCheckDate(null); + } //修改 safetyMeasuresMapper.updateSafetyMeasures(data); //附件先删除，后新增 @@ -153,6 +156,12 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { //修改综合查询 ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo(); BeanUtils.copyProperties(data,comprehensiveQueryVo); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + if (data.getCheckDate() != null && !data.getCheckDate().trim().isEmpty()) { + comprehensiveQueryVo.setRectDate(dateFormat.parse(data.getCheckDate())); + } + comprehensiveQueryVo.setVioPlace(data.getCheckPlace()); + comprehensiveQueryVo.setVioDesc(data.getCheckDesc()); synthesisQueryService.updateComprehensiveQuery(comprehensiveQueryVo); } catch (Exception e) { log.error(e.toString(), e); diff --git a/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml b/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml index fd7ad94..f5c0eb3 100644 --- a/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml +++ b/src/main/resources/mappers/imageUpload/CoordinatePhotoMapper.xml @@ -47,22 +47,10 @@ - update tb_coordinate_photo - - pro_id = #{proId}, - pro_name = #{proName}, - major_id = #{majorId}, - major_name = #{majorName}, - gx_id = #{gxId}, - gx_name = #{gxName}, - build_place = #{buildPlace}, - build_before_desc = #{buildBeforeDesc}, - build_under_desc = #{buildUnderDesc}, - build_after_desc = #{buildAfterDesc}, - update_user_id = #{updateUserId}, - update_user_name = #{updateUserName}, - update_time = NOW() - + update tb_coordinate_photo set pro_id = #{proId},pro_name = #{proName},gx_id = #{gxId},gx_name = #{gxName}, + build_place = #{buildPlace},build_before_desc = #{buildBeforeDesc},build_under_desc = #{buildUnderDesc}, + build_after_desc = #{buildAfterDesc},update_user_id = #{updateUserId},update_user_name = #{updateUserName}, + major_name = #{majorName},major_id = #{majorId},update_time = NOW() where id = #{id} diff --git a/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml b/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml index e446da6..121e25d 100644 --- a/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml +++ b/src/main/resources/mappers/imageUpload/ImportantMatterMapper.xml @@ -46,21 +46,10 @@ - update tb_main_matter_publicize_photo - - pro_id = #{proId}, - pro_name = #{proName}, - major_id = #{majorId}, - major_name = #{majorName}, - gx_id = #{gxId}, - gx_name = #{gxName}, - time = #{time}, - title = #{title}, - content = #{content}, - update_user_id = #{updateUserId}, - update_user_name = #{updateUserName}, - update_time = NOW() - + update tb_main_matter_publicize_photo set pro_id = #{proId},pro_name = #{proName},major_id = #{majorId}, + major_name = #{majorName},gx_id = #{gxId},gx_name = #{gxName},time = #{time}, + title = #{title},content = #{content}, + update_user_id = #{updateUserId},update_user_name = #{updateUserName},update_time = NOW() where id = #{id} diff --git a/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml b/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml index 070fcf6..85105a3 100644 --- a/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml +++ b/src/main/resources/mappers/imageUpload/SafetMeasuresMapper.xml @@ -47,22 +47,9 @@ - update tb_safety_measure - - pro_id = #{proId}, - pro_name = #{proName}, - major_id = #{majorId}, - major_name = #{majorName}, - gx_id = #{gxId}, - gx_name = #{gxName}, - check_user_name = #{checkUserName}, - check_date = #{checkDate}, - check_place = #{checkPlace}, - check_desc = #{checkDesc}, - update_user_id = #{updateUserId}, - update_user_name = #{updateUserName}, - update_time = NOW() - + update tb_safety_measure set pro_id = #{proId},pro_name = #{proName},major_id = #{majorId},major_name = #{majorName}, + gx_id = #{gxId},gx_name = #{gxName},check_user_name = #{checkUserName},check_date = #{checkDate},check_place = #{checkPlace}, + check_desc = #{checkDesc},update_user_id = #{updateUserId},update_user_name = #{updateUserName},update_time = NOW() where id = #{id}