From 0915a8d2831f61fb2ea83cb881e4475cfe399798 Mon Sep 17 00:00:00 2001 From: haha Date: Thu, 4 Jul 2024 23:54:11 +0800 Subject: [PATCH 1/2] update code --- ruoyi-ui/src/api/project/projectCommittee.js | 2 + .../views/project/projectChecking/index.vue | 429 ++++-------------- .../views/project/projectCommittee/index.vue | 16 + .../SurProjectCheckingController.java | 8 + .../jh/project/domain/SurProjectChecking.java | 5 - .../domain/SurProjectWorkingCommittee.java | 13 + .../SurProjectWorkingCommitteeMapper.xml | 8 +- 7 files changed, 136 insertions(+), 345 deletions(-) diff --git a/ruoyi-ui/src/api/project/projectCommittee.js b/ruoyi-ui/src/api/project/projectCommittee.js index 6625e7af..68d7786a 100644 --- a/ruoyi-ui/src/api/project/projectCommittee.js +++ b/ruoyi-ui/src/api/project/projectCommittee.js @@ -35,6 +35,8 @@ export function updateProjectCommittee(data) { }) } + + // 删除工委会管理 export function delProjectCommittee(id) { return request({ diff --git a/ruoyi-ui/src/views/project/projectChecking/index.vue b/ruoyi-ui/src/views/project/projectChecking/index.vue index 213dc8de..67fc2de0 100644 --- a/ruoyi-ui/src/views/project/projectChecking/index.vue +++ b/ruoyi-ui/src/views/project/projectChecking/index.vue @@ -1,92 +1,39 @@ - + - + - + - - + + - - + + - - - + + + - - - + + + - + - + - {{ dict.label }} + {{ dict.label }} @@ -651,12 +404,12 @@ export default { this.getList(); }, methods: { - setDataTypeLvl1(row, val){ - row.dataTypeLvl2=null; - updateProjectChecking({id:row.id,dataTypeLvl1:val,dataTypeLvl2:null}); + setDataTypeLvl1(row, val) { + row.dataTypeLvl2 = null; + updateProjectChecking({ id: row.id, dataTypeLvl1: val, dataTypeLvl2: null }); }, - setDataTypeLvl2(row, val){ - updateProjectChecking({id:row.id,dataTypeLvl2:val}); + setDataTypeLvl2(row, val) { + updateProjectChecking({ id: row.id, dataTypeLvl2: val }); }, getImageUrl(url) { return process.env.VUE_APP_BASE_API + url + ".min.jpg"; @@ -814,7 +567,7 @@ export default { this.getList(); this.$modal.msgSuccess("删除成功"); }) - .catch(() => {}); + .catch(() => { }); }, /** 导出按钮操作 */ handleExport() { diff --git a/ruoyi-ui/src/views/project/projectCommittee/index.vue b/ruoyi-ui/src/views/project/projectCommittee/index.vue index 633048a5..0024eac8 100644 --- a/ruoyi-ui/src/views/project/projectCommittee/index.vue +++ b/ruoyi-ui/src/views/project/projectCommittee/index.vue @@ -46,6 +46,15 @@ + + + @@ -143,6 +152,13 @@ export default { this.loading = false; }); }, + doUpdateApplicationDate(row){ + updateProjectCommittee(row).then(d=>{ + if(d.code==200){ + this.$modal.msgSuccess("修改成功"); + } + }); + }, // 取消按钮 cancel() { this.open = false; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckingController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckingController.java index 9eebd730..1732c9a1 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckingController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckingController.java @@ -97,6 +97,14 @@ public class SurProjectCheckingController extends BaseController surProjectChecking.setNowUser(Convert.toStr(getUserId())); surProjectChecking.setNowUserName(getUsername()); List list = surProjectCheckingService.selectSurProjectCheckingList(surProjectChecking); + for(SurProjectChecking checking:list){ + if("2".equals(checking.getCheckResult())){ + checking.setCheckResult("不合格"); + } + if("1".equals(checking.getCheckResult())){ + checking.setCheckResult("合格"); + } + } ExcelUtil util = new ExcelUtil(SurProjectChecking.class); util.exportExcel(response, list, "举牌验收数据"); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java index 0c006275..9da21449 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java @@ -34,11 +34,9 @@ public class SurProjectChecking extends BaseEntity private Long deptId; /** 分包单位主键 */ - @Excel(name = "分包单位主键") private Long groupDeptId; /** 验收类型 */ - @Excel(name = "验收类型") private String checkType; @Excel(name = "验收大类") @@ -48,15 +46,12 @@ public class SurProjectChecking extends BaseEntity private String dataTypeLvl2Name; /** 验收主图 */ - @Excel(name = "验收主图") private String mainImage; /** 图片列表 */ - @Excel(name = "图片列表") private String imageUrls; /** 验收工序部位类型 */ - @Excel(name = "验收工序部位类型") private String workingPositionType; /** 验收工序部位 */ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectWorkingCommittee.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectWorkingCommittee.java index 57403599..f05fdaee 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectWorkingCommittee.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectWorkingCommittee.java @@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.Date; + /** * 工委会管理对象 sur_project_working_committee * @@ -53,6 +55,17 @@ public class SurProjectWorkingCommittee extends BaseEntity this.typeName = typeName; } + /** 申请日期 **/ + private Date applicationDate; + + public Date getApplicationDate() { + return applicationDate; + } + + public void setApplicationDate(Date applicationDate) { + this.applicationDate = applicationDate; + } + /** */ private Long id; diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkingCommitteeMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkingCommitteeMapper.xml index 18465ec6..5423ad73 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkingCommitteeMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkingCommitteeMapper.xml @@ -19,10 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, committeeId, projectId, workingType, costName, money, remark, create_by, create_time, update_by, update_time + select id, committeeId, projectId, workingType, costName, money, remark, create_by, create_time, update_by, update_time,applicationDate from sur_project_working_committee @@ -62,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, + applicationDate, #{committeeId}, @@ -74,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, + #{applicationDate}, @@ -90,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + applicationDate = #{applicationDate}, where id = #{id} @@ -135,7 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"