From 7f26ccc344bf006e3497037d3189f91d788f4902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Wed, 16 Aug 2023 22:38:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/project/surProjectSchedule.js | 10 +- .../src/views/project/surProject/index.vue | 4 +- .../surProjectInsurance/insuranceDrawer.vue | 34 +- .../surProjectSchedule/ProjectScheduleDlg.vue | 2 +- .../project/surProjectSchedule/index.vue | 12 +- .../surProjectSpecialDrawer.vue | 694 ++++++++++-------- .../SurProjectScheduleController.java | 24 +- .../yanzhu/jh/project/domain/SurProject.java | 4 +- .../jh/project/domain/SurProjectSchedule.java | 2 +- .../mapper/SurProjectScheduleMapper.java | 28 +- .../service/ISurProjectScheduleService.java | 30 +- .../impl/SurProjectInsuranceServiceImpl.java | 18 + .../impl/SurProjectScheduleServiceImpl.java | 30 +- .../project/SurProjectInsuranceMapper.xml | 1 - 14 files changed, 516 insertions(+), 377 deletions(-) diff --git a/ruoyi-ui/src/api/project/surProjectSchedule.js b/ruoyi-ui/src/api/project/surProjectSchedule.js index 89797adb..2340733e 100644 --- a/ruoyi-ui/src/api/project/surProjectSchedule.js +++ b/ruoyi-ui/src/api/project/surProjectSchedule.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询项目进度列表 +// 查询形象进度列表 export function listSurProjectSchedule(query) { return request({ url: '/project/surProjectSchedule/list', @@ -9,7 +9,7 @@ export function listSurProjectSchedule(query) { }) } -// 查询项目进度详细 +// 查询形象进度详细 export function getSurProjectSchedule(Id) { return request({ url: '/project/surProjectSchedule/' + Id, @@ -17,7 +17,7 @@ export function getSurProjectSchedule(Id) { }) } -// 新增项目进度 +// 新增形象进度 export function addSurProjectSchedule(data) { return request({ url: '/project/surProjectSchedule', @@ -26,7 +26,7 @@ export function addSurProjectSchedule(data) { }) } -// 修改项目进度 +// 修改形象进度 export function updateSurProjectSchedule(data) { return request({ url: '/project/surProjectSchedule', @@ -35,7 +35,7 @@ export function updateSurProjectSchedule(data) { }) } -// 删除项目进度 +// 删除形象进度 export function delSurProjectSchedule(Id) { return request({ url: '/project/surProjectSchedule/' + Id, diff --git a/ruoyi-ui/src/views/project/surProject/index.vue b/ruoyi-ui/src/views/project/surProject/index.vue index 9d303726..4ee88693 100644 --- a/ruoyi-ui/src/views/project/surProject/index.vue +++ b/ruoyi-ui/src/views/project/surProject/index.vue @@ -655,10 +655,10 @@ + > { this.surProjectInsuranceList = response.rows; @@ -319,6 +319,12 @@ export default { /** 修改按钮操作 */ handleUpdate(row) { this.reset(); + this.form.projectName = this.project.projectName; + this.nodes.forEach((item) => { + if (item.unitId == this.activeName) { + this.form.deptName = item.unitName; + } + }); const id = row.id || this.ids; getSurProjectInsurance(id).then((response) => { this.form = response.data; @@ -330,6 +336,16 @@ export default { submitForm() { this.$refs["form"].validate((valid) => { if (valid) { + if ( + this.form.insuranceFile != null && + this.form.insuranceFile != "" && + this.form.insuranceFile.length > 0 + ) { + this.form.insuranceFile = this.form.insuranceFile[0].url; + } else { + this.$modal.msgWarning("请上传保险合同"); + return false; + } if (this.form.id != null) { updateSurProjectInsurance(this.form).then((response) => { this.$modal.msgSuccess("修改成功"); @@ -338,9 +354,13 @@ export default { }); } else { addSurProjectInsurance(this.form).then((response) => { - this.$modal.msgSuccess("新增成功"); - this.open = false; - this.getList(); + if (response.code == 200) { + this.$modal.msgSuccess("新增成功"); + this.open = false; + this.getList(); + } else { + this.$message.error("当前项目单位已办理该保险，请勿重复办理！！"); + } }); } } @@ -370,6 +390,10 @@ export default { `surProjectInsurance_${new Date().getTime()}.xlsx` ); }, + /** 下载证书 */ + handledownload(row) { + window.open("/jhapi" + row.credentialFile); + }, }, }; diff --git a/ruoyi-ui/src/views/project/surProjectSchedule/ProjectScheduleDlg.vue b/ruoyi-ui/src/views/project/surProjectSchedule/ProjectScheduleDlg.vue index 935bdb11..99b795b2 100644 --- a/ruoyi-ui/src/views/project/surProjectSchedule/ProjectScheduleDlg.vue +++ b/ruoyi-ui/src/views/project/surProjectSchedule/ProjectScheduleDlg.vue @@ -1,6 +1,6 @@ - - diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectScheduleController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectScheduleController.java index 2cb491ca..eb65c7f1 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectScheduleController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectScheduleController.java @@ -26,7 +26,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** - * 项目进度Controller + * 形象进度Controller * * @author Jiangdu * @date 2023-07-29 @@ -42,7 +42,7 @@ public class SurProjectScheduleController extends BaseController private ISysDeptService sysDeptService; /** - * 查询项目进度列表 + * 查询形象进度列表 */ @PreAuthorize("@ss.hasPermi('project:surProjectSchedule:list')") @GetMapping("/list") @@ -63,10 +63,10 @@ public class SurProjectScheduleController extends BaseController } /** - * 导出项目进度列表 + * 导出形象进度列表 */ @PreAuthorize("@ss.hasPermi('project:surProjectSchedule:export')") - @Log(title = "项目进度", businessType = BusinessType.EXPORT) + @Log(title = "形象进度", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, SurProjectSchedule surProjectSchedule) { @@ -80,11 +80,11 @@ public class SurProjectScheduleController extends BaseController surProjectSchedule.setCreateBy(Convert.toStr(getLoginUser().getUser().getUserId())); List list = surProjectScheduleService.selectSurProjectScheduleList(surProjectSchedule); ExcelUtil util = new ExcelUtil(SurProjectSchedule.class); - util.exportExcel(response, list, "项目进度数据"); + util.exportExcel(response, list, "形象进度数据"); } /** - * 获取项目进度详细信息 + * 获取形象进度详细信息 */ @PreAuthorize("@ss.hasPermi('project:surProjectSchedule:query')") @GetMapping(value = "/{id}") @@ -94,10 +94,10 @@ public class SurProjectScheduleController extends BaseController } /** - * 新增项目进度 + * 新增形象进度 */ @PreAuthorize("@ss.hasPermi('project:surProjectSchedule:add')") - @Log(title = "项目进度", businessType = BusinessType.INSERT) + @Log(title = "形象进度", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody SurProjectSchedule surProjectSchedule) { @@ -105,10 +105,10 @@ public class SurProjectScheduleController extends BaseController } /** - * 修改项目进度 + * 修改形象进度 */ @PreAuthorize("@ss.hasPermi('project:surProjectSchedule:edit')") - @Log(title = "项目进度", businessType = BusinessType.UPDATE) + @Log(title = "形象进度", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody SurProjectSchedule surProjectSchedule) { @@ -116,10 +116,10 @@ public class SurProjectScheduleController extends BaseController } /** - * 删除项目进度 + * 删除形象进度 */ @PreAuthorize("@ss.hasPermi('project:surProjectSchedule:remove')") - @Log(title = "项目进度", businessType = BusinessType.DELETE) + @Log(title = "形象进度", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProject.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProject.java index 39ee1a04..9e8f120f 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProject.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProject.java @@ -133,8 +133,8 @@ public class SurProject extends BaseEntity @Excel(name = "挂账金额") private String onAccountAmount; - /** 项目进度情况 */ - @Excel(name = "项目进度情况") + /** 形象进度情况 */ + @Excel(name = "形象进度情况") private String projectSchedule; /** 项目概述 */ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java index e170f65a..6629ee9c 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java @@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 项目进度对象 sur_project_schedule + * 形象进度对象 sur_project_schedule * * @author Jiangdu * @date 2023-07-29 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectScheduleMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectScheduleMapper.java index 5c2ef774..dfe0cb20 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectScheduleMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectScheduleMapper.java @@ -4,7 +4,7 @@ import java.util.List; import com.yanzhu.jh.project.domain.SurProjectSchedule; /** - * 项目进度Mapper接口 + * 形象进度Mapper接口 * * @author Jiangdu * @date 2023-07-29 @@ -12,49 +12,49 @@ import com.yanzhu.jh.project.domain.SurProjectSchedule; public interface SurProjectScheduleMapper { /** - * 查询项目进度 + * 查询形象进度 * - * @param id 项目进度主键 - * @return 项目进度 + * @param id 形象进度主键 + * @return 形象进度 */ public SurProjectSchedule selectSurProjectScheduleById(Long id); /** - * 查询项目进度列表 + * 查询形象进度列表 * - * @param surProjectSchedule 项目进度 - * @return 项目进度集合 + * @param surProjectSchedule 形象进度 + * @return 形象进度集合 */ public List selectSurProjectScheduleList(SurProjectSchedule surProjectSchedule); public SurProjectSchedule getProjectConstructionProgress(Long projectId); /** - * 新增项目进度 + * 新增形象进度 * - * @param surProjectSchedule 项目进度 + * @param surProjectSchedule 形象进度 * @return 结果 */ public int insertSurProjectSchedule(SurProjectSchedule surProjectSchedule); /** - * 修改项目进度 + * 修改形象进度 * - * @param surProjectSchedule 项目进度 + * @param surProjectSchedule 形象进度 * @return 结果 */ public int updateSurProjectSchedule(SurProjectSchedule surProjectSchedule); /** - * 删除项目进度 + * 删除形象进度 * - * @param id 项目进度主键 + * @param id 形象进度主键 * @return 结果 */ public int deleteSurProjectScheduleById(Long id); /** - * 批量删除项目进度 + * 批量删除形象进度 * * @param ids 需要删除的数据主键集合 * @return 结果 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectScheduleService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectScheduleService.java index b23a7b31..6ba2b959 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectScheduleService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectScheduleService.java @@ -4,7 +4,7 @@ import java.util.List; import com.yanzhu.jh.project.domain.SurProjectSchedule; /** - * 项目进度Service接口 + * 形象进度Service接口 * * @author Jiangdu * @date 2023-07-29 @@ -12,50 +12,50 @@ import com.yanzhu.jh.project.domain.SurProjectSchedule; public interface ISurProjectScheduleService { /** - * 查询项目进度 + * 查询形象进度 * - * @param Id 项目进度主键 - * @return 项目进度 + * @param Id 形象进度主键 + * @return 形象进度 */ public SurProjectSchedule selectSurProjectScheduleById(Long id); /** - * 查询项目进度列表 + * 查询形象进度列表 * - * @param surProjectSchedule 项目进度 - * @return 项目进度集合 + * @param surProjectSchedule 形象进度 + * @return 形象进度集合 */ public List selectSurProjectScheduleList(SurProjectSchedule surProjectSchedule); public SurProjectSchedule getProjectConstructionProgress(Long projectId); /** - * 新增项目进度 + * 新增形象进度 * - * @param surProjectSchedule 项目进度 + * @param surProjectSchedule 形象进度 * @return 结果 */ public int insertSurProjectSchedule(SurProjectSchedule surProjectSchedule); /** - * 修改项目进度 + * 修改形象进度 * - * @param surProjectSchedule 项目进度 + * @param surProjectSchedule 形象进度 * @return 结果 */ public int updateSurProjectSchedule(SurProjectSchedule surProjectSchedule); /** - * 批量删除项目进度 + * 批量删除形象进度 * - * @param ids 需要删除的项目进度主键集合 + * @param ids 需要删除的形象进度主键集合 * @return 结果 */ public int deleteSurProjectScheduleByIds(Long[] ids); /** - * 删除项目进度信息 + * 删除形象进度信息 * - * @param id 项目进度主键 + * @param id 形象进度主键 * @return 结果 */ public int deleteSurProjectScheduleById(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 e739c676..c19661f0 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 @@ -1,6 +1,8 @@ package com.yanzhu.jh.project.service.impl; import java.util.List; + +import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -8,6 +10,8 @@ import com.yanzhu.jh.project.mapper.SurProjectInsuranceMapper; import com.yanzhu.jh.project.domain.SurProjectInsurance; import com.yanzhu.jh.project.service.ISurProjectInsuranceService; import com.ruoyi.common.utils.SecurityUtils; +import org.springframework.transaction.annotation.Transactional; + /** * 项目保险Service业务层处理 * @@ -63,10 +67,24 @@ public class SurProjectInsuranceServiceImpl implements ISurProjectInsuranceServi * @return 结果 */ @Override + @Transactional public int insertSurProjectInsurance(SurProjectInsurance surProjectInsurance) { surProjectInsurance.setCreateBy(SecurityUtils.getUsername()); surProjectInsurance.setCreateTime(DateUtils.getNowDate()); + surProjectInsurance.setInsuranceState(PublicStateEnum.YES.getCode()); + surProjectInsurance.setIsDel(PublicStateEnum.OK.getCode()); + int res = -1; + //效验保险是否已办理 + SurProjectInsurance _search = new SurProjectInsurance(); + _search.setIsDel(surProjectInsurance.getIsDel()); + _search.setInsuranceType(surProjectInsurance.getInsuranceType()); + _search.setProjectId(surProjectInsurance.getProjectId()); + _search.setDeptId(surProjectInsurance.getDeptId()); + List list = surProjectInsuranceMapper.selectSurProjectInsuranceList(_search); + if(list!=null && list.size()>0){ + return res; + } return surProjectInsuranceMapper.insertSurProjectInsurance(surProjectInsurance); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java index 5ef0277d..2f1d842a 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java @@ -9,7 +9,7 @@ import com.yanzhu.jh.project.domain.SurProjectSchedule; import com.yanzhu.jh.project.service.ISurProjectScheduleService; /** - * 项目进度Service业务层处理 + * 形象进度Service业务层处理 * * @author Jiangdu * @date 2023-07-29 @@ -21,10 +21,10 @@ public class SurProjectScheduleServiceImpl implements ISurProjectScheduleService private SurProjectScheduleMapper surProjectScheduleMapper; /** - * 查询项目进度 + * 查询形象进度 * - * @param id 项目进度主键 - * @return 项目进度 + * @param id 形象进度主键 + * @return 形象进度 */ @Override public SurProjectSchedule selectSurProjectScheduleById(Long id) @@ -33,10 +33,10 @@ public class SurProjectScheduleServiceImpl implements ISurProjectScheduleService } /** - * 查询项目进度列表 + * 查询形象进度列表 * - * @param surProjectSchedule 项目进度 - * @return 项目进度 + * @param surProjectSchedule 形象进度 + * @return 形象进度 */ @Override public List selectSurProjectScheduleList(SurProjectSchedule surProjectSchedule) @@ -50,9 +50,9 @@ public class SurProjectScheduleServiceImpl implements ISurProjectScheduleService } /** - * 新增项目进度 + * 新增形象进度 * - * @param surProjectSchedule 项目进度 + * @param surProjectSchedule 形象进度 * @return 结果 */ @Override @@ -63,9 +63,9 @@ public class SurProjectScheduleServiceImpl implements ISurProjectScheduleService } /** - * 修改项目进度 + * 修改形象进度 * - * @param surProjectSchedule 项目进度 + * @param surProjectSchedule 形象进度 * @return 结果 */ @Override @@ -76,9 +76,9 @@ public class SurProjectScheduleServiceImpl implements ISurProjectScheduleService } /** - * 批量删除项目进度 + * 批量删除形象进度 * - * @param ids 需要删除的项目进度主键 + * @param ids 需要删除的形象进度主键 * @return 结果 */ @Override @@ -88,9 +88,9 @@ public class SurProjectScheduleServiceImpl implements ISurProjectScheduleService } /** - * 删除项目进度信息 + * 删除形象进度信息 * - * @param id 项目进度主键 + * @param id 形象进度主键 * @return 结果 */ @Override diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml index d02109d6..e46161ee 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml @@ -71,7 +71,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sdd.dict_type = 'sur_project_insurance_type' and sp.id = #{projectId} - and dept_id = ORDER BY sp.projectSort,