From ca4d366d745265847bd167659a70c5f694e95224 Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Sun, 27 Jul 2025 14:41:53 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=80=83=E5=8B=A4=E7=BB=84=E6=8F=92?= =?UTF-8?q?=E5=85=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/bo/AttendanceWeekSetBo.java | 2 +- .../domain/bo/TbVisitorManagementBo.java | 3 +++ .../domain/vo/TbVisitorManagementVo.java | 3 +++ .../impl/AttendanceGroupServiceImpl.java | 2 ++ ruoyi-modules/Sis/pom.xml | 18 +++++++++--------- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeekSetBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeekSetBo.java index 553ba155..f5dfa168 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeekSetBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeekSetBo.java @@ -34,7 +34,7 @@ public class AttendanceWeekSetBo extends BaseEntity { /** * 星期（1代表周一，7代表周日） */ - private Long dayOfWeek; + private Integer dayOfWeek; /** * 是否休息（0：不休息，1：休息） diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbVisitorManagementBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbVisitorManagementBo.java index c9b697a9..9e26f81b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbVisitorManagementBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbVisitorManagementBo.java @@ -52,6 +52,9 @@ public class TbVisitorManagementBo extends BaseEntity { @NotBlank(message = "拜访事由不能为空", groups = { AddGroup.class, EditGroup.class }) private String visitingReason; + @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer type; + /** * 被访人 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbVisitorManagementVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbVisitorManagementVo.java index 9f4fb19b..1edf997f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbVisitorManagementVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbVisitorManagementVo.java @@ -69,6 +69,9 @@ public class TbVisitorManagementVo implements Serializable { @ExcelProperty(value = "被访人") private String interviewedPerson; + @ExcelProperty(value = "访客类型") + private Integer type; + /** * 被访单位 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java index 3c8e3524..0c27bf93 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java @@ -163,6 +163,7 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService { BeanUtils.copyProperties(weekSet, attendanceWeekSet); attendanceWeekSet.setGroupId(add.getId()); attendanceWeekSet.setDayOfWeek(weekSet.getDayOfWeek()); +// attendanceWeekSet.setShiftId(weekSet.getShiftId()); weekSetMapper.insert(attendanceWeekSet); //查询出周期表的id Long weekSetId = attendanceWeekSet.getId(); @@ -209,6 +210,7 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService { } +// insertAttendaanceClockDate(bo); return flag; } diff --git a/ruoyi-modules/Sis/pom.xml b/ruoyi-modules/Sis/pom.xml index ba3949e3..8c7a9bdc 100644 --- a/ruoyi-modules/Sis/pom.xml +++ b/ruoyi-modules/Sis/pom.xml @@ -118,16 +118,16 @@ 2.4.0 - - com.hik - examples - + + + + - - com.hik - jna - 4.5.2_1 - + + + + + org.eclipse.paho From cd2703080d431f6211a487c29495762110e23b5b Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Sun, 27 Jul 2025 14:42:07 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=80=83=E5=8B=A4=E7=BB=84=E6=8F=92?= =?UTF-8?q?=E5=85=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/property/domain/TbVisitorManagement.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbVisitorManagement.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbVisitorManagement.java index af7bc773..ebfca824 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbVisitorManagement.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbVisitorManagement.java @@ -49,6 +49,11 @@ public class TbVisitorManagement extends TenantEntity { */ private String visitingReason; + /** + * 类型（0：拜访，1：邀约） + */ + private Integer type; + /** * 被访人 */ From f5159ab5f7ac531ef8f61a37381e9231f12503df Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Sun, 27 Jul 2025 14:43:13 +0800 Subject: [PATCH 3/9] 1 --- ruoyi-modules/Sis/pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ruoyi-modules/Sis/pom.xml b/ruoyi-modules/Sis/pom.xml index 8c7a9bdc..ba3949e3 100644 --- a/ruoyi-modules/Sis/pom.xml +++ b/ruoyi-modules/Sis/pom.xml @@ -118,16 +118,16 @@ 2.4.0 - - - - + + com.hik + examples + - - - - - + + com.hik + jna + 4.5.2_1 + org.eclipse.paho From 2150602335d78abe989e0b1b2a5265be2b6168ac Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Sun, 27 Jul 2025 15:01:43 +0800 Subject: [PATCH 4/9] 1 --- .../service/impl/AttendanceGroupServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java index 0c27bf93..26acfeb1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java @@ -256,6 +256,18 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService { AttendanceGroup update = MapstructUtils.convert(bo, AttendanceGroup.class); validEntityBeforeSave(update); + //根据参数判断当前是固定班制还是排班制 + if (Objects.equals(update.getAttendanceType(), FIXEDSCHEDULE)) { + //1.固定班制 + //取出考勤组id + Long groupId = update.getId(); + //根据考勤组id修改attendance_week_set表中的数据 + weekSetMapper.update(null, Wrappers.lambdaUpdate().eq(AttendanceWeekSet::getGroupId, groupId)); + //根据考勤组id查询出考勤周期id + } + + + return baseMapper.updateById(update) > 0; } From a043e18ba6700dd5b543e73c684f67e6a77c777f Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Sun, 27 Jul 2025 15:22:50 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../property/domain/AttendanceGroup.java | 2 +- .../property/domain/bo/AttendanceGroupBo.java | 2 +- .../domain/constant/StatusConstant.java | 4 ++++ .../impl/AttendanceGroupServiceImpl.java | 17 ++++++++++++++--- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceGroup.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceGroup.java index 6a93bf3f..f1962dd9 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceGroup.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceGroup.java @@ -36,7 +36,7 @@ public class AttendanceGroup extends TenantEntity { /** * 状态(1:启用,0:禁用) */ - private Long status; + private Integer status; /** * 考勤类型(0:固定班制,1:排班制) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceGroupBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceGroupBo.java index e4aab705..9b41932c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceGroupBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceGroupBo.java @@ -40,7 +40,7 @@ public class AttendanceGroupBo extends BaseEntity { /** * 状态(1:启用,0:禁用) */ - private Long status; + private Integer status; /** * 考勤类型(0:固定班制,1:排班制) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/constant/StatusConstant.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/constant/StatusConstant.java index 126467e4..efc6f43b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/constant/StatusConstant.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/constant/StatusConstant.java @@ -22,6 +22,10 @@ public class StatusConstant { public static final Integer SINGLEDATE = 0; public static final Integer DATERANGE = 1; + //启用禁用：0禁用 1启用 + public static final Integer DISABLE = 0; + public static final Integer ENABLE = 1; + public static final Integer NORMAL = 1; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java index 26acfeb1..2f93ad46 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java @@ -140,6 +140,7 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService { @Override public Boolean insertByBo(AttendanceGroupBo bo) { AttendanceGroup add = MapstructUtils.convert(bo, AttendanceGroup.class); + add.setStatus(StatusConstant.ENABLE); validEntityBeforeSave(add); @@ -261,9 +262,19 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService { //1.固定班制 //取出考勤组id Long groupId = update.getId(); - //根据考勤组id修改attendance_week_set表中的数据 - weekSetMapper.update(null, Wrappers.lambdaUpdate().eq(AttendanceWeekSet::getGroupId, groupId)); - //根据考勤组id查询出考勤周期id + //根据考勤组id查询出attendance_week_set表中的数据 + List weekSets = weekSetMapper.selectList(Wrappers.lambdaQuery().eq(AttendanceWeekSet::getGroupId, groupId)); + //根据weekSets修改考勤周期表中的数据 + weekSets.forEach( + weekSet -> { + AttendanceWeekSet attendanceWeekSet = new AttendanceWeekSet(); + BeanUtils.copyProperties(weekSet, attendanceWeekSet); + attendanceWeekSet.setGroupId(update.getId()); + attendanceWeekSet.setDayOfWeek(weekSet.getDayOfWeek()); + attendanceWeekSet.setShiftId(weekSet.getShiftId()); + weekSetMapper.updateById(attendanceWeekSet); + } + ); } From ff7bf241cb6d02230f3de93da2d19a2552d3966a Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Sun, 27 Jul 2025 15:28:22 +0800 Subject: [PATCH 6/9] 1 --- .../property/service/impl/AttendanceGroupServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java index 2f93ad46..da09c1a2 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java @@ -140,7 +140,9 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService { @Override public Boolean insertByBo(AttendanceGroupBo bo) { AttendanceGroup add = MapstructUtils.convert(bo, AttendanceGroup.class); - add.setStatus(StatusConstant.ENABLE); + if (bo.getStatus() == null) { + add.setStatus(StatusConstant.ENABLE); + } validEntityBeforeSave(add); From dd733fe5e2169982f2355efea043597959dd3321 Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Sun, 27 Jul 2025 16:01:55 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=A0=E8=BF=94?= =?UTF-8?q?=E5=9B=9Ebug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../property/service/impl/AttendanceGroupServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java index da09c1a2..1765c71e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java @@ -74,6 +74,7 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService { List shifts = attendanceShiftMapper.selectList(Wrappers.lambdaQuery().in(AttendanceShift::getId, shiftIds)); //1.6将查询后的数据封装到attendanceGroupVo中 vo.setAttendanceList(shifts); + vo.setWeekList(weekSets); } else if(Objects.equals(attendanceType, SHIFTSCHEDULE)) { //2.排班制 //2.1根据id参数查询考勤周期表 From eb7d29640bd8367839db9624c967e923398b676a Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Sun, 27 Jul 2025 17:07:58 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=97=A0=E6=89=93=E5=8D=A1=E6=97=A5=E6=9C=9Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/property/domain/AttendanceClockDate.java | 4 ---- .../dromara/property/domain/bo/AttendanceClockDateBo.java | 4 ---- .../dromara/property/domain/vo/AttendanceClockDateVo.java | 5 ----- .../org/dromara/property/domain/vo/AttendanceGroupVo.java | 7 +++---- .../service/impl/AttendanceClockDateServiceImpl.java | 2 +- .../property/service/impl/AttendanceGroupServiceImpl.java | 4 ++++ 6 files changed, 8 insertions(+), 18 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceClockDate.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceClockDate.java index ea070711..0e57cd75 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceClockDate.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceClockDate.java @@ -59,10 +59,6 @@ public class AttendanceClockDate extends TenantEntity { */ private String reason; - /** - * 创建人 - */ - private Long createdBy; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceClockDateBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceClockDateBo.java index 2a830fd5..6c0cbe06 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceClockDateBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceClockDateBo.java @@ -58,10 +58,6 @@ public class AttendanceClockDateBo extends BaseEntity { */ private String reason; - /** - * 创建人 - */ - private Long createdBy; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceClockDateVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceClockDateVo.java index 54b6eec9..8a004f32 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceClockDateVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceClockDateVo.java @@ -73,11 +73,6 @@ public class AttendanceClockDateVo implements Serializable { @ExcelProperty(value = "必须/无需打卡原因") private String reason; - /** - * 创建人 - */ - @ExcelProperty(value = "创建人") - private Long createdBy; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java index a56b12d7..44c1c8f0 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java @@ -1,15 +1,12 @@ package org.dromara.property.domain.vo; -import org.dromara.property.domain.AttendanceGroup; +import org.dromara.property.domain.*; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.property.domain.AttendanceShift; -import org.dromara.property.domain.AttendanceWeekSet; -import org.dromara.property.domain.AttendanceWeeksetShift; import java.io.Serial; import java.io.Serializable; @@ -62,5 +59,7 @@ public class AttendanceGroupVo implements Serializable { List attendanceList; + List clockDateList; + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceClockDateServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceClockDateServiceImpl.java index a0f9b40b..dcc7469f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceClockDateServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceClockDateServiceImpl.java @@ -80,7 +80,7 @@ public class AttendanceClockDateServiceImpl implements IAttendanceClockDateServi lqw.eq(bo.getStartDate() != null, AttendanceClockDate::getStartDate, bo.getStartDate()); lqw.eq(bo.getEndDate() != null, AttendanceClockDate::getEndDate, bo.getEndDate()); lqw.eq(StringUtils.isNotBlank(bo.getReason()), AttendanceClockDate::getReason, bo.getReason()); - lqw.eq(bo.getCreatedBy() != null, AttendanceClockDate::getCreatedBy, bo.getCreatedBy()); +// lqw.eq(bo.getCreateBy() != null, AttendanceClockDate::getCreateBy, bo.getCreateBy()); return lqw; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java index 1765c71e..4c6702f0 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java @@ -91,6 +91,10 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService { vo.setAttendanceList(shifts); } + //根据id查询attendance_clock_date表 + List clockDates = attendanceClockDateMapper.selectList(Wrappers.lambdaQuery().eq(AttendanceClockDate::getGroupId, id)); + vo.setClockDateList(clockDates); + return vo; } From 7bdd9ff0728c0a3353580962fe6ec9fcd72e025d Mon Sep 17 00:00:00 2001 From: yuyongle <1150359267@qq.com> Date: Sun, 27 Jul 2025 17:10:30 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CapitalApplicationController.java | 4 +- .../dromara/property/domain/CapitalInfo.java | 2 +- .../domain/bo/CapitalApplicationBo.java | 2 +- .../property/domain/bo/CapitalInfoBo.java | 2 +- .../domain/vo/CapitalApplicationVo.java | 6 ++- .../property/domain/vo/CapitalInfoVo.java | 2 +- .../impl/CapitalApplicationServiceImpl.java | 48 +++++++++++-------- 7 files changed, 38 insertions(+), 28 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CapitalApplicationController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CapitalApplicationController.java index aa7da895..30ea5c89 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CapitalApplicationController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CapitalApplicationController.java @@ -40,7 +40,7 @@ public class CapitalApplicationController extends BaseController { /** * 查询资产申请列表 */ - @SaCheckPermission("domain:application:list") + // @SaCheckPermission("domain:application:list") @GetMapping("/list") public TableDataInfo list(CapitalApplicationBo bo, PageQuery pageQuery) { return capitalApplicationService.queryPageList(bo, pageQuery); @@ -72,7 +72,7 @@ public class CapitalApplicationController extends BaseController { /** * 新增资产申请 */ - @SaCheckPermission("domain:application:add") + // @SaCheckPermission("domain:application:add") @Log(title = "资产申请", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CapitalInfo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CapitalInfo.java index 9494338c..e606735f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CapitalInfo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/CapitalInfo.java @@ -36,7 +36,7 @@ public class CapitalInfo extends TenantEntity { /** * 资产类型 */ - private String capitalType; + private Long capitalType; /** * 规格 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalApplicationBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalApplicationBo.java index f7105373..1964d3ed 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalApplicationBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalApplicationBo.java @@ -95,7 +95,7 @@ public class CapitalApplicationBo extends BaseEntity { * 申请时间 */ private Date applicationTime; - @NotEmpty(message = "资产不能为空", groups = { AddGroup.class, EditGroup.class }) + private List capitalInfoBolist; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalInfoBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalInfoBo.java index 13a502bc..d8960ecf 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalInfoBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CapitalInfoBo.java @@ -37,7 +37,7 @@ public class CapitalInfoBo extends BaseEntity { * 资产类型 */ @NotBlank(message = "资产类型不能为空", groups = { AddGroup.class, EditGroup.class }) - private String capitalType; + private Long capitalType; /** * 规格 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalApplicationVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalApplicationVo.java index 420776bd..f340fcde 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalApplicationVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalApplicationVo.java @@ -14,7 +14,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.util.Date; - +import java.util.List; /** @@ -131,5 +131,9 @@ public class CapitalApplicationVo implements Serializable { @ExcelProperty(value = "搜索值") private String searchValue; + /** + * 资产信息 + */ + private List capitalInfoVoList; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalInfoVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalInfoVo.java index a7ca24f4..53e2fa8f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalInfoVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CapitalInfoVo.java @@ -45,7 +45,7 @@ public class CapitalInfoVo implements Serializable { * 资产类型 */ @ExcelProperty(value = "资产类型") - private String capitalType; + private Long capitalType; /** * 规格 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CapitalApplicationServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CapitalApplicationServiceImpl.java index 60eecb0c..ed58c698 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CapitalApplicationServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CapitalApplicationServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.property.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -11,7 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.property.domain.*; -import org.dromara.property.domain.vo.CostItemsVo; +import org.dromara.property.domain.vo.CapitalInfoVo; import org.dromara.property.mapper.*; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.CapitalApplicationBo; @@ -19,10 +20,7 @@ import org.dromara.property.domain.vo.CapitalApplicationVo; import org.dromara.property.service.ICapitalApplicationService; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Collection; +import java.util.*; /** * 资产申请Service业务层处理 @@ -86,16 +84,20 @@ public class CapitalApplicationServiceImpl implements ICapitalApplicationService if (CollUtil.isNotEmpty(suppliersList)) { Suppliers suppliers = suppliersList.stream() .filter(vo -> vo.getId() != null && vo.getId().equals(capitalApplicationVo.getSupplier())).findFirst().orElse(null); - capitalApplicationVo.setSupplierName(suppliers.getSuppliersName()); + capitalApplicationVo.setSupplierName(ObjectUtil.isNotEmpty(suppliers)?suppliers.getSuppliersName():null); } if (CollUtil.isNotEmpty(residentPeopleList)) { ResidentPerson residentPerson = residentPeopleList.stream() .filter(vo -> vo.getId() != null && vo.getId().equals(capitalApplicationVo.getApplicat())).findFirst().orElse(null); - capitalApplicationVo.setApplicatName(residentPerson.getUserName()); + capitalApplicationVo.setApplicatName(ObjectUtil.isNotEmpty(residentPerson)?residentPerson.getUserName():null); ResidentPerson residentPersons = residentPeopleList.stream() .filter(vo -> vo.getId() != null && vo.getId().equals(capitalApplicationVo.getAudit())).findFirst().orElse(null); - capitalApplicationVo.setAuditName(residentPersons.getUserName()); + capitalApplicationVo.setAuditName(ObjectUtil.isNotEmpty(residentPersons)?residentPersons.getUserName():null); } + LambdaQueryWrapper capitalInfoWrapper = new LambdaQueryWrapper<>(); + capitalInfoWrapper.eq(CapitalInfo::getCapitalApplicationId,capitalApplicationVo.getId()); + List capitalInfoVoList = capitalMapper.selectVoList(capitalInfoWrapper); + capitalApplicationVo.setCapitalInfoVoList(capitalInfoVoList); } /** @@ -137,6 +139,7 @@ public class CapitalApplicationServiceImpl implements ICapitalApplicationService @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(CapitalApplicationBo bo) { CapitalApplication add = MapstructUtils.convert(bo, CapitalApplication.class); + validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); @@ -145,7 +148,7 @@ public class CapitalApplicationServiceImpl implements ICapitalApplicationService CapitalInfo capitalInfo = MapstructUtils.convert(s, CapitalInfo.class); capitalMapper.insert(capitalInfo); //validCapitalInfoBefore(add,capitalInfo); - validEntityBeforeSave(add); + }); } return flag; @@ -162,16 +165,19 @@ public class CapitalApplicationServiceImpl implements ICapitalApplicationService public Boolean updateByBo(CapitalApplicationBo bo) { CapitalApplication update = MapstructUtils.convert(bo, CapitalApplication.class); validEntityBeforeUpdate(update); - bo.getCapitalInfoBolist().stream().forEach(s -> { - CapitalInfo capitalInfo = MapstructUtils.convert(s, CapitalInfo.class); - capitalMapper.deleteById(capitalInfo); - capitalMapper.insert(capitalInfo); - //TODO 做一些数据校验,如唯一约束 - CapitalApplication capitalApplication = baseMapper.selectById(bo.getId()); - if (bo.getState().equals("1") && !bo.getState().equals(capitalApplication.getState())) { - validCapitalInfoBefore(update, capitalInfo); - } - }); + if(CollUtil.isNotEmpty(bo.getCapitalInfoBolist())){ + bo.getCapitalInfoBolist().stream().forEach(s -> { + CapitalInfo capitalInfo = MapstructUtils.convert(s, CapitalInfo.class); + capitalMapper.deleteById(capitalInfo); + capitalMapper.insert(capitalInfo); + //TODO 做一些数据校验,如唯一约束 + CapitalApplication capitalApplication = baseMapper.selectById(bo.getId()); + if (bo.getState().equals("1") && !bo.getState().equals(capitalApplication.getState())) { + validCapitalInfoBefore(update, capitalInfo); + } + }); + } + return baseMapper.updateById(update) > 0; } @@ -186,7 +192,7 @@ public class CapitalApplicationServiceImpl implements ICapitalApplicationService List assets = assetsMapper.selectList(assetQueryWrapper); if (assets.isEmpty()) { Asset asset = new Asset(); - asset.setModel(capitalInfo.getCapitalType()); + asset.setModel(capitalInfo.getCapitalType().toString()); asset.setName(capitalInfo.getCapitalName()); asset.setSpecs(capitalInfo.getSpec()); asset.setSpecs(capitalInfo.getSpec()); @@ -214,7 +220,7 @@ public class CapitalApplicationServiceImpl implements ICapitalApplicationService * 保存前的数据校验 */ private void validEntityBeforeSave(CapitalApplication entity) { - + entity.setState("0"); } /**