From 1c95a50d1cef175a1251af664529fa139f6c3178 Mon Sep 17 00:00:00 2001 From: haha Date: Wed, 4 Sep 2024 00:20:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/manage/ProProjectInfoMapper.xml | 39 +++- .../impl/ProProjectInfoServiceImpl.java | 29 ++- .../src/components/BaiduMap/Map.vue | 2 +- .../src/views/manage/proProjectInfo/index.vue | 192 +++++++++++++----- yanzhu-ui-vue3/src/views/tool/gen/index.vue | 2 +- 5 files changed, 209 insertions(+), 55 deletions(-) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml index 0461076c..2d27b2b5 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml @@ -45,10 +45,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + - - select pi.id, pi.dept_id, sd.dept_name, pi.vis_dept_id, pi.dis_dept_id, pi.project_name, pi.project_code, pi.simple_name, pi.project_type, pi.project_level, pi.project_regional, pi.project_address, pi.project_nature, pi.licence_number, pi.project_person, pi.project_person_phone, pi.longitude, pi.latitude, pi.project_time_limit, pi.total_investment, pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time, pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status, pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark from pro_project_info pi + select pi.id, pi.dept_id, sd.dept_name, pi.vis_dept_id, pi.dis_dept_id, pi.project_name, pi.project_code, pi.simple_name, pi.project_type, pi.project_level, pi.project_regional, pi.project_address, pi.project_nature, pi.licence_number, pi.project_person, pi.project_person_phone, pi.longitude, pi.latitude, pi.project_time_limit, pi.total_investment, pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time, pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status, pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark + from pro_project_info pi left join sys_dept sd on sd.dept_id = pi.dept_id @@ -73,7 +95,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java index bbbd7b68..c86a8182 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java @@ -2,6 +2,10 @@ package com.yanzhu.manage.service.impl; import java.util.List; import com.yanzhu.common.core.utils.DateUtils; +import com.yanzhu.manage.domain.ProProjectInfoDepts; +import com.yanzhu.manage.domain.ProProjectInfoSetting; +import com.yanzhu.manage.mapper.ProProjectInfoDeptsMapper; +import com.yanzhu.manage.mapper.ProProjectInfoSettingMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.yanzhu.manage.mapper.ProProjectInfoMapper; @@ -19,7 +23,10 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService { @Autowired private ProProjectInfoMapper proProjectInfoMapper; - + @Autowired + private ProProjectInfoDeptsMapper deptsMapper; + @Autowired + private ProProjectInfoSettingMapper settingMapper; /** * 查询项目信息 * @@ -67,6 +74,26 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService public int updateProProjectInfo(ProProjectInfo proProjectInfo) { proProjectInfo.setUpdateTime(DateUtils.getNowDate()); + List depts= proProjectInfo.getProjectDeptsList(); + if(depts!=null){ + depts.forEach(dept->{ + dept.setProjectId(proProjectInfo.getId()); + if(dept.getId()!=null){ + deptsMapper.updateProProjectInfoDepts(dept); + }else{ + deptsMapper.insertProProjectInfoDepts(dept); + } + }); + } + ProProjectInfoSetting setting= proProjectInfo.getSetting(); + if(setting!=null){ + setting.setProjectId(proProjectInfo.getId()); + if(setting.getId()!=null){ + settingMapper.updateProProjectInfoSetting(setting); + }else{ + settingMapper.insertProProjectInfoSetting(setting); + } + } return proProjectInfoMapper.updateProProjectInfo(proProjectInfo); } diff --git a/yanzhu-ui-vue3/src/components/BaiduMap/Map.vue b/yanzhu-ui-vue3/src/components/BaiduMap/Map.vue index 516f564c..798a70f3 100644 --- a/yanzhu-ui-vue3/src/components/BaiduMap/Map.vue +++ b/yanzhu-ui-vue3/src/components/BaiduMap/Map.vue @@ -1,5 +1,5 @@