diff --git a/ruoyi-ui/src/views/project/surProject/index.vue b/ruoyi-ui/src/views/project/surProject/index.vue index 47a81507..e9834e80 100644 --- a/ruoyi-ui/src/views/project/surProject/index.vue +++ b/ruoyi-ui/src/views/project/surProject/index.vue @@ -552,11 +552,15 @@ - + +
+
({{ form.longitude }},{{ form.latitude }})
选择经纬度 -
- ({{ form.longitude }},{{ form.latitude }}) - {{ form.projectAddress }} +
+
+ + +
@@ -1191,6 +1195,11 @@ export default { .prj-suprj-edit-dialog { .el-dialog__body { padding-bottom: 0px; + .fi-longitude{ + .el-form-item__content{ + display: flex; + } + } } } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectInsuranceController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectInsuranceController.java index e4764a9b..511a6093 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectInsuranceController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectInsuranceController.java @@ -1,7 +1,10 @@ package com.yanzhu.jh.bigscreen.web.controller; +import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.StringUtils; import com.yanzhu.jh.project.domain.SurProjectInsurance; @@ -11,6 +14,9 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.concurrent.TimeUnit; + /** * 项目保险Conller */ @@ -20,7 +26,8 @@ public class ProjectInsuranceController extends BaseController { @Autowired private ISurProjectInsuranceService surProjectInsuranceService; - + @Autowired + private RedisCache redisCache; /** * 根据条件查询项目保险 * @param deptId @@ -39,4 +46,21 @@ public class ProjectInsuranceController extends BaseController { return getDataTable(surProjectInsuranceService.selectBgscreenInsuranceList(surProjectInsurance)); } + /** + * 按项目获取保险信息 + * @param id + * @return + */ + @GetMapping("/getProjectInsurance") + public AjaxResult getProjectInsurance(Long id){ + String key="bgscreen_insurance_getProjectInsurance_"+id; + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + List list=surProjectInsuranceService.selectProjectInsuranceListByProjectId(id); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return AjaxResult.success(list); + } + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectInsuranceMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectInsuranceMapper.java index dcf1f035..1f505160 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectInsuranceMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectInsuranceMapper.java @@ -84,4 +84,11 @@ public interface SurProjectInsuranceMapper * @return 结果 */ public int findInsuranceByParams(SurProjectInsurance surProjectInsurance); + + /** + * 按项目获取保险信息 + * @param projectId + * @return + */ + public List selectProjectInsuranceListByProjectId(Long projectId); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectInsuranceService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectInsuranceService.java index 0aa3b5f6..0ba3d949 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectInsuranceService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectInsuranceService.java @@ -76,4 +76,11 @@ public interface ISurProjectInsuranceService * @return 结果 */ public int deleteSurProjectInsuranceById(Long id); + + /** + * 按项目获取保险信息 + * @param id + * @return + */ + public List selectProjectInsuranceListByProjectId(Long id); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectInsuranceServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectInsuranceServiceImpl.java index a66a3b38..b542f739 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectInsuranceServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectInsuranceServiceImpl.java @@ -133,4 +133,14 @@ public class SurProjectInsuranceServiceImpl implements ISurProjectInsuranceServi { return surProjectInsuranceMapper.deleteSurProjectInsuranceById(id); } + + /** + * 按项目获取保险信息 + * @param projectId + * @return + */ + @Override + public List selectProjectInsuranceListByProjectId(Long projectId) { + return surProjectInsuranceMapper.selectProjectInsuranceListByProjectId(projectId); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml index 154738a7..ebaa48da 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml @@ -30,6 +30,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, project_id, dept_id, insurance_type, insurance_number, insurance_file, insurance_state, begin_date, end_date, company_name, is_del, create_by, create_time, update_by, update_time, remark from sur_project_insurance + +