From 6f3fac2b770f31ddb5f75e8181eaf6e2b669e9ab Mon Sep 17 00:00:00 2001 From: dx <1242347652@qq.com> Date: Fri, 21 Mar 2025 17:32:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1,=20=E6=95=B4?= =?UTF-8?q?=E6=94=B9,=20=E8=BF=87=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/enums/ErrorCodeConstants.java | 2 + .../QualityCollectionController.java | 18 +++ .../vo/QualityCollectionExcelVO.java | 49 +++++++ .../vo/QualityCollectionRespVO.java | 33 ++--- .../controller/admin/auth/AuthController.java | 13 +- .../auth/vo/AuthPermissionInfoRespVO.java | 3 + .../enterprise/EnterpriseController.java | 27 +++- .../enterprise/vo/EnterprisePageReqVO.java | 3 + .../admin/enterprise/vo/EnterpriseRespVO.java | 4 + .../admin/enterprise/vo/LabelValueLongVO.java | 9 ++ .../EnterpriseInspectionsController.java | 6 +- .../vo/EnterpriseInspectionsCorrectionVO.java | 2 + .../vo/EnterpriseInspectionsPageReqVO.java | 5 +- .../vo/EnterpriseInspectionsRespVO.java | 18 ++- .../vo/PassOnSaveVO.java | 3 + .../controller/admin/home/HomeController.java | 19 ++- .../admin/home/vo/EnterpriseNumVO.java | 2 + .../admin/home/vo/ExecCorrectionCountVO.java | 12 ++ .../admin/home/vo/HomeGroupMonthVO.java | 13 ++ .../admin/home/vo/HomeSelectVO.java | 3 + .../admin/policy/PolicyController.java | 29 +++- .../admin/policy/vo/PolicyRespVO.java | 12 +- .../vo/QualificationExpiredVO.java | 2 + .../taglibrary/TagLibraryController.java | 16 ++- .../admin/taglibrary/vo/TagLibraryRespVO.java | 4 + .../admin/taskinfo/TaskInfoController.java | 48 ++++++- .../admin/taskinfo/vo/TaskInfoPageReqVO.java | 6 + .../admin/taskinfo/vo/TaskInfoRespVO.java | 5 - .../controller/admin/user/UserController.java | 22 ++- .../admin/user/vo/user/DeptUserReqVO.java | 3 + .../admin/user/vo/user/UserDeptVO.java | 10 ++ .../QualityCollectionDO.java | 5 +- .../dataobject/enterprise/EnterpriseDO.java | 4 + .../EnterpriseInspectionsDO.java | 4 +- .../dal/dataobject/user/AdminUserDO.java | 6 + .../QualityCollectionMapper.java | 4 +- .../dal/mysql/notify/NotifyMessageMapper.java | 5 +- .../mysql/taglibrary/TagLibraryMapper.java | 1 + .../dal/mysql/taskinfo/TaskInfoMapper.java | 18 ++- .../dal/mysql/user/AdminUserMapper.java | 10 ++ .../job/InspectionsSendStartMessageJob.java | 8 +- ...alificationTimeOutSendStartMessageJob.java | 54 ++++--- .../system/job/TaskSendStartMessageJob.java | 2 +- .../QualityCollectionService.java | 1 + .../QualityCollectionServiceImpl.java | 15 ++ .../service/auth/AdminAuthServiceImpl.java | 16 ++- .../enterprise/EnterpriseServiceImpl.java | 3 + .../EnterpriseInspectionsService.java | 2 +- .../EnterpriseInspectionsServiceImpl.java | 60 ++++++-- .../system/service/home/HomeService.java | 8 +- .../system/service/home/HomeServiceImpl.java | 95 +++++++----- .../EnterpriseQualificationServiceImpl.java | 2 +- .../service/taglibrary/TagLibraryService.java | 2 + .../taglibrary/TagLibraryServiceImpl.java | 7 + .../service/taskinfo/TaskInfoService.java | 5 + .../service/taskinfo/TaskInfoServiceImpl.java | 94 +++++++----- .../system/service/user/AdminUserService.java | 9 +- .../service/user/AdminUserServiceImpl.java | 24 ++-- .../yudao/module/system/util/EntityUtils.java | 26 ++++ .../util/SingleValueToListDeserializer.java | 24 ++++ .../yudao/module/system/util/StringUtil.java | 2 + .../mapper/jobinfo/JobInfoMapper.xml | 12 -- .../mapper/notifyMessage/NotifyMessage.xml | 2 +- .../EnterpriseQualificationMapper.xml | 3 +- .../mapper/taskinfo/TaskInfoMapper.xml | 135 +++++++++++++++--- .../main/resources/mapper/users/AdminUser.xml | 45 ++++++ 66 files changed, 897 insertions(+), 217 deletions(-) create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/airqualitycollection/vo/QualityCollectionExcelVO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/LabelValueLongVO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/ExecCorrectionCountVO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/HomeGroupMonthVO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserDeptVO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/SingleValueToListDeserializer.java delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/jobinfo/JobInfoMapper.xml create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/users/AdminUser.xml diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java index 3b4def5..5b63f7e 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java @@ -194,6 +194,8 @@ public interface ErrorCodeConstants { ErrorCode ENTERPRISE_INSPECTIONS_STATUS_ERROR2 = new ErrorCode(1-003-002-001, "任务不能转给自己"); ErrorCode ENTERPRISE_INSPECTIONS_STATUS_ERROR3 = new ErrorCode(1-003-002-002, "请选择要转交的检查记录"); + ErrorCode ENTERPRISE_INSPECTIONS_STATUS_ERROR4 = new ErrorCode(1-003-002-002, "此状态下不能删除任务"); + ErrorCode SIGN_IN_LOG_ERROR = new ErrorCode(1-003-005-001, "打卡记录不存在"); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/airqualitycollection/QualityCollectionController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/airqualitycollection/QualityCollectionController.java index a49933b..5ade7f8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/airqualitycollection/QualityCollectionController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/airqualitycollection/QualityCollectionController.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.system.controller.admin.airqualitycollection; +import com.alibaba.excel.EasyExcel; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; @@ -24,6 +26,7 @@ import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; import cn.iocoder.yudao.module.system.controller.admin.airqualitycollection.vo.*; import cn.iocoder.yudao.module.system.dal.dataobject.airqualitycollection.QualityCollectionDO; import cn.iocoder.yudao.module.system.service.airqualitycollection.QualityCollectionService; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -33,6 +36,7 @@ import javax.validation.Valid; @RestController @RequestMapping("/system/quality-collection") @Validated +@Slf4j public class QualityCollectionController { @Resource @@ -92,4 +96,18 @@ public class QualityCollectionController { BeanUtils.toBean(list, QualityCollectionRespVO.class)); } + @PostMapping("/upload-excel") + @Operation(summary = "导入空气质量采集 Excel") +// @PreAuthorize("@ss.hasPermission('system:quality-collection:upload')") + public void uploadExcel(@RequestParam("file") MultipartFile file, @RequestParam("type") Long type) throws IOException { + // 2. 使用 EasyExcel 读取（替换 ExcelUtils） + List list = EasyExcel.read(file.getInputStream()) + .head(QualityCollectionExcelVO.class) + .sheet() + .doReadSync(); + + // 3. 打印读取结果 + qualityCollectionService.saveList(list, type); + } + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/airqualitycollection/vo/QualityCollectionExcelVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/airqualitycollection/vo/QualityCollectionExcelVO.java new file mode 100644 index 0000000..94ecd28 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/airqualitycollection/vo/QualityCollectionExcelVO.java @@ -0,0 +1,49 @@ +package cn.iocoder.yudao.module.system.controller.admin.airqualitycollection.vo; +import com.alibaba.excel.annotation.ExcelProperty; +import com.thoughtworks.xstream.converters.time.LocalDateTimeConverter; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 空气质量采集 Response VO") +@Data +@Accessors(chain = false) +public class QualityCollectionExcelVO { + @ExcelProperty(value = "城市", index = 0) + private String city; + + @ExcelProperty(value = "区县", index = 1) + private String qx; + + @ExcelProperty(value = "站点", index = 2) + private String siteName; + + @ExcelProperty(value = "时间", index = 3) + private LocalDateTime time; + + @ExcelProperty(value = "PM2.s(ugim3)", index = 4) + private String pm25; + + @ExcelProperty(value = "PM10(μg/m3)", index = 5) + private String pm10; + + @ExcelProperty(value = "SO2(μg/m3)", index = 6) + private String so2; + + @ExcelProperty(value = "NO2(μg/m3)", index = 7) + private String no2; + + @ExcelProperty(value = "NO2(μg/m3)", index = 8) + private String no; + + @ExcelProperty(value = "NOx(μg/m3)", index = 9) + private String nOx; + + @ExcelProperty(value = "CO(mg/m3)", index = 10) + private String co; + + @ExcelProperty(value = "O3(μg/m3)", index = 11) + private String o3; +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/airqualitycollection/vo/QualityCollectionRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/airqualitycollection/vo/QualityCollectionRespVO.java index c71e874..2b381b0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/airqualitycollection/vo/QualityCollectionRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/airqualitycollection/vo/QualityCollectionRespVO.java @@ -15,7 +15,6 @@ import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; public class QualityCollectionRespVO { @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "24697") - @ExcelProperty("主键") private Long id; @Schema(description = "站点名称", example = "赵六") @@ -35,44 +34,46 @@ public class QualityCollectionRespVO { @ExcelProperty("PM2.s(ugim3)") private Double pm25; - @Schema(description = "PMo(ug/m3") - @ExcelProperty("PMo(ug/m3") + @Schema(description = "PM10(μg/m3)") + @ExcelProperty("PM10(μg/m3)") private Double pm10; - @Schema(description = "sOz(ug/m3)") - @ExcelProperty("sOz(ug/m3)") + @Schema(description = "SO2(μg/m3)") + @ExcelProperty("SO2(μg/m3)") private Double so2; - @Schema(description = "NOz(ug/m3)") - @ExcelProperty("NOz(ug/m3)") + @Schema(description = "NO2(μg/m3)") + @ExcelProperty("NO2(μg/m3)") private Double no2; - @Schema(description = "NO(Hg/m3)") - @ExcelProperty("NO(Hg/m3)") + @Schema(description = "NO2(μg/m3)") + @ExcelProperty("NO2(μg/m3)") private Double no; - @Schema(description = "NOx(Hg/m3)") - @ExcelProperty("NOx(Hg/m3)") + @Schema(description = "NOx(μg/m3)") + @ExcelProperty("NOx(μg/m3)") private Double nOx; @Schema(description = "CO(mg/m3)") @ExcelProperty("CO(mg/m3)") private Double co; - @Schema(description = "0з(ug/m3)") - @ExcelProperty("0з(ug/m3)") + @Schema(description = "O3(μg/m3)") + @ExcelProperty("O3(μg/m3)") private Double o3; + @Schema(description = "时间") + @ExcelProperty("时间") + private LocalDateTime time; + @Schema(description = "备用1", example = "你猜") - @ExcelProperty("备用1") private String remark; @Schema(description = "备用2") - @ExcelProperty("备用2") private String remark2; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; -} \ No newline at end of file +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java index 0b356e0..0ddec39 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java @@ -17,11 +17,13 @@ import cn.iocoder.yudao.module.system.api.social.dto.SocialWxQrcodeReqDTO; import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; import cn.iocoder.yudao.module.system.controller.admin.auth.vo.*; import cn.iocoder.yudao.module.system.convert.auth.AuthConvert; +import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper; import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; import cn.iocoder.yudao.module.system.service.auth.AdminAuthService; import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService; @@ -81,12 +83,13 @@ public class AuthController { @Resource private SocialUserService socialUserService; - @Resource private StringRedisTemplate stringRedisTemplate; @Resource private OAuth2TokenService oAuth2TokenService; + @Resource + private DeptMapper deptMapper; @PostMapping("/login") @PermitAll @@ -152,6 +155,14 @@ public class AuthController { if (user == null) { return success(null); } + if (user.getDeptId() != null) { + final DeptDO deptDO = deptMapper.selectById(user.getDeptId()); + if (deptDO != null) { + user.setDeptName(deptDO.getName()); + } + } + + log.info("useruseruseruseruseruseruser:{}", user); // 1.2 获得角色列表 Set roleIds = permissionService.getUserRoleIdListByUserId(getLoginUserId()); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java index 76069ec..ef10516 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java @@ -62,6 +62,9 @@ public class AuthPermissionInfoRespVO { @Schema(description = "用户类型", example = "1") private Integer userType; + @Schema(description = "用户所属部门") + private String deptName; + } @Schema(description = "管理后台 - 登录用户的菜单信息 Response VO") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java index b2b0703..fa0c432 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java @@ -19,6 +19,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.enterprisetag.EnterpriseTagMappe import cn.iocoder.yudao.module.system.dal.mysql.fileInfo.FileInfoMapper; import cn.iocoder.yudao.module.system.dal.mysql.qualification.EnterpriseQualificationMapper; import cn.iocoder.yudao.module.system.dal.mysql.taglibrary.TagLibraryMapper; +import cn.iocoder.yudao.module.system.service.dept.DeptService; import cn.iocoder.yudao.module.system.service.enterprise.EnterpriseServiceImpl; import cn.iocoder.yudao.module.system.service.enterprisetag.EnterpriseTagService; import cn.iocoder.yudao.module.system.service.fileInfo.FileInfoService; @@ -84,6 +85,8 @@ public class EnterpriseController { private TagLibraryService tagLibraryService; @Resource private FileInfoService fileInfoService; + @Resource + private DeptService deptService; @PostMapping("/create") @Operation(summary = "创建企业") @@ -207,7 +210,13 @@ public class EnterpriseController { pageResult.getList().forEach(item->{ final AdminUserDO user = adminUserService.getUser(Long.valueOf(item.getUserId())); if (user != null) { - item.setInviterName(user.getNickname()); + item.setInviterName(user.getRealName()); + if (user.getDeptId() != null) { + final DeptDO dept = deptService.getDept(user.getDeptId()); + if (dept!= null) { + item.setInviterNameDept(dept.getName()); + } + } } final List tagLibraryDOS = tagLibraryService.listByEnterpriseId(item.getId()); @@ -224,6 +233,18 @@ public class EnterpriseController { } }); + + if (pageReqVO.getCreateDeptId() != null) { + //查出改部门下所有用户 + List deptIds = new ArrayList<>(); + deptIds.add(pageReqVO.getCreateDeptId()); + final List userList = adminUserService.getUserListByDeptIds(deptIds); + if (userList!= null && userList.size() > 0) { + List collect = userList.stream().map(item1 -> item1.getId()).collect(Collectors.toList()); + final List collect1 = pageResult.getList().stream().filter(item -> collect.contains(item.getCreator())).collect(Collectors.toList()); + } + } + return success(BeanUtils.toBean(pageResult, EnterpriseRespVO.class)); } @@ -261,6 +282,10 @@ public class EnterpriseController { final AdminUserDO user = adminUserService.getUser(Long.valueOf(item.getUserId())); if (user != null) { item.setInviterName(user.getRealName()); + final DeptDO dept = deptService.getDept(user.getDeptId()); + if (dept != null) { + item.setInviterNameDept(dept.getName()); + } } // 企业标签 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java index bb4d7ee..13eafec 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterprisePageReqVO.java @@ -101,5 +101,8 @@ public class EnterprisePageReqVO extends PageParam { @Schema(description = "排除企业id") private Long excludeEnterpriseId; + @Schema(description = "发布部门") + private Long createDeptId; + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java index e12209c..ea825fa 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java @@ -26,6 +26,10 @@ public class EnterpriseRespVO { @ExcelProperty("所属部门ID") private Long departmentId; + @Schema(description = "所属部门名称", example = "10990") + @ExcelProperty("所属部门名称") + private String inviterNameDept; + @Schema(description = "管辖人员ID", example = "30445") @ExcelProperty("管辖人员ID") private Long userId; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/LabelValueLongVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/LabelValueLongVO.java new file mode 100644 index 0000000..b74e10c --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/LabelValueLongVO.java @@ -0,0 +1,9 @@ +package cn.iocoder.yudao.module.system.controller.admin.enterprise.vo; + +import lombok.Data; + +@Data +public class LabelValueLongVO { + private Long value; + private String label; +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/EnterpriseInspectionsController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/EnterpriseInspectionsController.java index 5227328..83c6645 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/EnterpriseInspectionsController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/EnterpriseInspectionsController.java @@ -83,8 +83,7 @@ public class EnterpriseInspectionsController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('system:enterprise-inspections:query')") public CommonResult getEnterpriseInspections(@RequestParam("id") Long id) { - EnterpriseInspectionsDO enterpriseInspections = enterpriseInspectionsService.getEnterpriseInspections(id); - return success(BeanUtils.toBean(enterpriseInspections, EnterpriseInspectionsRespVO.class)); + return success(enterpriseInspectionsService.getEnterpriseInspections(id)); } @GetMapping("/getEnterpriseInspectionsByTaskId") @@ -92,8 +91,7 @@ public class EnterpriseInspectionsController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('system:enterprise-inspections:query')") public CommonResult getEnterpriseInspectionsByTaskId(@RequestParam("id") Long id) { - EnterpriseInspectionsDO enterpriseInspections = enterpriseInspectionsService.getEnterpriseInspections(id); - return success(BeanUtils.toBean(enterpriseInspections, EnterpriseInspectionsRespVO.class)); + return success(enterpriseInspectionsService.getEnterpriseInspections(id)); } @GetMapping("/page") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/EnterpriseInspectionsCorrectionVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/EnterpriseInspectionsCorrectionVO.java index 99f6057..9b3c92f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/EnterpriseInspectionsCorrectionVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/EnterpriseInspectionsCorrectionVO.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo import lombok.Data; +import java.time.LocalDateTime; + @Data public class EnterpriseInspectionsCorrectionVO { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/EnterpriseInspectionsPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/EnterpriseInspectionsPageReqVO.java index 9537036..885a3ef 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/EnterpriseInspectionsPageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/EnterpriseInspectionsPageReqVO.java @@ -54,12 +54,11 @@ public class EnterpriseInspectionsPageReqVO extends PageParam { //任务开始时间 @Schema(description = "任务开始时间", example = "27002") - private LocalDateTime TaskStartTime; + private LocalDateTime taskStartTime; //任务结束时间 @Schema(description = "任务结束时间", example = "27002") - private LocalDateTime TaskEndTime; - + private LocalDateTime taskEndTime; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/EnterpriseInspectionsRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/EnterpriseInspectionsRespVO.java index 9085bb1..f531b7e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/EnterpriseInspectionsRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/EnterpriseInspectionsRespVO.java @@ -28,6 +28,10 @@ public class EnterpriseInspectionsRespVO { @ExcelProperty("任务名称") private String taskName; + @Schema(description = "当前任务状态", example = "29150") + @ExcelProperty("当前任务状态") + private Integer status; + @Schema(description = "任务开始时间", example = "27002") private LocalDateTime TaskStartTime; @@ -53,20 +57,30 @@ public class EnterpriseInspectionsRespVO { @ExcelProperty("企业地址") private String enterpriseAddress; + @Schema(description = "发布部门", example = "综合部") + @ExcelProperty("发布部门") + private String createDeptName; + @Schema(description = "任务类型", example = "27002") @ExcelProperty("任务类型") private List tagList; + @Schema(description = "任务类型", example = "27002") + @ExcelProperty("任务类型") + private String taskType; + @Schema(description = "进度状态", example = "1") @ExcelProperty("进度状态") private String inspectionStatus; - - @Schema(description = "执法部门", example = "一大队") @ExcelProperty("执法部门") private String department; + @Schema(description = "执法部门id", example = "1") + @ExcelProperty("执法部门id") + private Long deptId; + @Schema(description = "执法人员", example = "张三") @ExcelProperty("执法人员") private String inspectName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/PassOnSaveVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/PassOnSaveVO.java index 32a944c..0ba0f96 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/PassOnSaveVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterpriseinspections/vo/PassOnSaveVO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo; +import cn.iocoder.yudao.module.system.util.SingleValueToListDeserializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.Data; import java.util.List; @@ -7,6 +9,7 @@ import java.util.List; @Data public class PassOnSaveVO { //转交的执法记录id 转交是否需要审核 + @JsonDeserialize(using = SingleValueToListDeserializer.class) private List inspectionsId; //转给的专管员id private Long userId; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/HomeController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/HomeController.java index 1b7c981..03feb8b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/HomeController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/HomeController.java @@ -3,9 +3,7 @@ package cn.iocoder.yudao.module.system.controller.admin.home; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission; import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.LabelValueVO; -import cn.iocoder.yudao.module.system.controller.admin.home.vo.EnterpriseNumVO; -import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeCountResVO; -import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeSelectVO; +import cn.iocoder.yudao.module.system.controller.admin.home.vo.*; import cn.iocoder.yudao.module.system.service.home.HomeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -53,4 +51,19 @@ public class HomeController { return success(homeService.appCount2(homeSelectVO)); } + @GetMapping("/taskNumDoing") + @Operation(summary = "近6个月执法走势") + @DataPermission(enable = false) // 关闭数据权限，避免只查看自己时，查询不到部门。 + public CommonResult> taskNumDoing(HomeSelectVO homeSelectVO) { + return success(homeService.taskNumDoing(homeSelectVO)); + } + + @GetMapping("/execCorrectionCount") + @Operation(summary = "执法整改统计") + @DataPermission(enable = false) // 关闭数据权限，避免只查看自己时，查询不到部门。 + public CommonResult> taskNum(HomeSelectVO homeSelectVO) { + + return success(homeService.execCorrectionCount(homeSelectVO)); + } + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/EnterpriseNumVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/EnterpriseNumVO.java index 12e4ec8..91e212b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/EnterpriseNumVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/EnterpriseNumVO.java @@ -5,5 +5,7 @@ import lombok.Data; @Data public class EnterpriseNumVO { private String name; + private String deptName; + private String realName; private Integer count; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/ExecCorrectionCountVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/ExecCorrectionCountVO.java new file mode 100644 index 0000000..f256e11 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/ExecCorrectionCountVO.java @@ -0,0 +1,12 @@ +package cn.iocoder.yudao.module.system.controller.admin.home.vo; + +import lombok.Data; + +@Data +public class ExecCorrectionCountVO { + + private String realName; + private Integer inspectionCount; + private Long correctionCount; + +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/HomeGroupMonthVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/HomeGroupMonthVO.java new file mode 100644 index 0000000..74b046b --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/HomeGroupMonthVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.system.controller.admin.home.vo; + +import lombok.Data; + +@Data +public class HomeGroupMonthVO { + + private String month; + + private Integer taskCount; + + private Integer inspectionCount; +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/HomeSelectVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/HomeSelectVO.java index c6e5f65..c353d0e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/HomeSelectVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/HomeSelectVO.java @@ -24,5 +24,8 @@ public class HomeSelectVO { //用户id private Long userId; + //长度 + private Integer size; + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/policy/PolicyController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/policy/PolicyController.java index f6d6bc5..749cc33 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/policy/PolicyController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/policy/PolicyController.java @@ -1,7 +1,11 @@ package cn.iocoder.yudao.module.system.controller.admin.policy; import cn.iocoder.yudao.module.system.controller.admin.maxkb.vo.MaxkbdocumentVo; +import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; +import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.iocoder.yudao.module.system.service.dept.DeptService; import cn.iocoder.yudao.module.system.service.maxkb.MaxkbApiService; +import cn.iocoder.yudao.module.system.service.user.AdminUserService; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -44,6 +48,10 @@ public class PolicyController { @Resource private MaxkbApiService maxkbApiService; + @Resource + private AdminUserService adminUserService; + @Resource + private DeptService deptService; @Value("${yudao.web.url}") private String webUrl; @@ -117,7 +125,24 @@ public class PolicyController { @Operation(summary = "获得政策法规分页") public CommonResult> getPolicyPage(@Valid PolicyPageReqVO pageReqVO) { PageResult pageResult = policyService.getPolicyPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, PolicyRespVO.class)); + final PageResult bean = BeanUtils.toBean(pageResult, PolicyRespVO.class); + if (bean.getList() != null) { + bean.getList().forEach(item->{ + final Long userId = Long.valueOf(item.getCreator()); + final AdminUserDO user = adminUserService.getUser(userId); + if(user != null) { + item.setCreateName(user.getRealName()); + if (user.getDeptId() != null) { + final Long deptId = user.getDeptId(); + final DeptDO deptName = deptService.getDept(deptId); + if (deptName != null) { + item.setCreateDeptName(deptName.getName()); + } + } + } + }); + } + return success(bean); } @@ -133,4 +158,4 @@ public class PolicyController { BeanUtils.toBean(list, PolicyRespVO.class)); } -} \ No newline at end of file +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/policy/vo/PolicyRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/policy/vo/PolicyRespVO.java index bfd3930..fe11d05 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/policy/vo/PolicyRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/policy/vo/PolicyRespVO.java @@ -27,6 +27,16 @@ public class PolicyRespVO { @ExcelProperty("名称") private String name; + @Schema(description = "发布人", example = "王五") + @ExcelProperty("发布人") + private String createName; + + @Schema(description = "发布人部门", example = "王五") + @ExcelProperty("发布人部门") + private String createDeptName; + + private String creator; + @Schema(description = "生效日期", requiredMode = Schema.RequiredMode.REQUIRED) @JsonSerialize(using = LocalDateSerializer.class) // 序列化（响应） @JsonDeserialize(using = LocalDateDeserializer.class) // 反序列化（请求） @@ -37,4 +47,4 @@ public class PolicyRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; -} \ No newline at end of file +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/qualification/vo/QualificationExpiredVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/qualification/vo/QualificationExpiredVO.java index d9175b8..c0eab41 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/qualification/vo/QualificationExpiredVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/qualification/vo/QualificationExpiredVO.java @@ -8,6 +8,8 @@ import java.time.LocalDateTime; public class QualificationExpiredVO { //公司名称 private String enterpriseName; + //资质类型 + private Integer qualificationName; //过期时间 private LocalDateTime expiryDate; //用户id diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/TagLibraryController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/TagLibraryController.java index dea7feb..74aaff6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/TagLibraryController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/TagLibraryController.java @@ -78,6 +78,21 @@ public class TagLibraryController { return success(BeanUtils.toBean(pageResult, TagLibraryRespVO.class)); } + @GetMapping("/pageInfo") + @Operation(summary = "获得标签分页") + public CommonResult> page(TagLibraryPageReqVO pageReqVO) { + PageResult pageResult = tagLibraryService.page(pageReqVO); + final PageResult bean = BeanUtils.toBean(pageResult, TagLibraryRespVO.class); + bean.getList().forEach(tagLibraryDO -> { + final TagLibraryDO tagLibrary = tagLibraryService.getTagLibrary(tagLibraryDO.getParentId()); + if (tagLibrary != null) { + tagLibraryDO.setParentName(tagLibrary.getTagName()); + } + + }); + return success(bean); + } + @GetMapping("/list") @Operation(summary = "获得标签分页") // @PreAuthorize("@ss.hasPermission('system:tag-library:query')") @@ -93,7 +108,6 @@ public class TagLibraryController { public CommonResult> childrenList(Long id) { List pageResult = tagLibraryService.childrenList(id); return success(BeanUtils.toBean(pageResult, TagLibraryRespVO.class)); - } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/vo/TagLibraryRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/vo/TagLibraryRespVO.java index 640bbbf..a281152 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/vo/TagLibraryRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taglibrary/vo/TagLibraryRespVO.java @@ -25,6 +25,10 @@ public class TagLibraryRespVO { @ExcelProperty("父标签的ID") private Integer parentId; + @Schema(description = "父标签标题", example = "30648") + @ExcelProperty("父标签标题") + private String parentName; + @Schema(description = "标签层级（一级、二级、三级）", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("标签层级（一级、二级、三级）") private Integer tagLevel; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/TaskInfoController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/TaskInfoController.java index 4d46063..33ab217 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/TaskInfoController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/TaskInfoController.java @@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.infra.api.job.JobApi; import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.EnterprisePageReqVO; +import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.LabelValueLongVO; import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.LabelValueVO; import cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo.EnterpriseInspectionsPageReqVO; import cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo.EnterpriseInspectionsSaveReqVO; @@ -161,6 +162,18 @@ public class TaskInfoController { }); + //执法人员 执法人员所在部门 + final Long userId = item.getUserId(); + final AdminUserDO user = adminUserService.getUser(userId); + if (user != null) { + item.setInviterName(user.getRealName()); + final Long deptId = user.getDeptId(); + final DeptDO dept = deptService.getDept(deptId); + if (dept != null) { + item.setInviterNameDept(dept.getName()); + } + } + item.setTagListName(labelValueVOList); } @@ -185,7 +198,6 @@ public class TaskInfoController { } - @GetMapping("/appGet") @Operation(summary = "获得任务表，用于存储所有的任务信息，任务可由不同用户创建并管理。") @Parameter(name = "id", description = "编号", required = true, example = "1024") @@ -217,11 +229,12 @@ public class TaskInfoController { @PreAuthorize("@ss.hasPermission('system:task-info:query')") public CommonResult> getTaskInfoPage(@Valid TaskInfoPageReqVO pageReqVO) { PageResult pageResult = taskInfoService.getTaskInfoPage(pageReqVO); - AdminUserDO user = adminUserService.getUser(SecurityFrameworkUtils.getLoginUserId()); - DeptDO dept= deptService.getDept(user.getDeptId()); EnterpriseInspectionsPageReqVO enterpriseInspectionsPageReqVO=new EnterpriseInspectionsPageReqVO(); - pageResult.getList().forEach(item->{ + final Long creator = Long.valueOf(item.getCreator()); + AdminUserDO user = adminUserService.getUser(creator); + DeptDO dept= deptService.getDept(user.getDeptId()); + if (dept != null) { item.setDeptName(dept.getName()); } @@ -239,6 +252,24 @@ public class TaskInfoController { item.setTaskTypeName(tagLibraryService.getTagLibrary(Integer.valueOf(item.getTaskType())).getTagName()); }); + + //按发布部门查询 + if (pageReqVO.getDeptId()!= null) { + List deptIds = new ArrayList<>(); + deptIds.add(pageReqVO.getDeptId()); + final List userListByDeptIds = adminUserService.getUserListByDeptIds(deptIds); + + if (!userListByDeptIds.isEmpty()) { + List longs = CollectionUtils.convertList(userListByDeptIds, AdminUserDO::getId); + final List collect = pageResult.getList().stream().filter(item -> longs.contains(Long.valueOf(item.getCreator()))).collect(Collectors.toList()); + pageResult.setList(collect); + Long count = collect.size() > 0 ? Long.valueOf(collect.size()) :0l; + pageResult.setTotal(count); + } + + } + + return success(BeanUtils.toBean(pageResult, TaskInfoRespVO.class)); } @@ -251,6 +282,13 @@ public class TaskInfoController { return success(BeanUtils.toBean(pageResult, TaskInfoRespVO.class)); } + @GetMapping("/appSelectCreateDept") + @Operation(summary = "发布部门查询") + @PreAuthorize("@ss.hasPermission('system:task-info:query')") + public CommonResult> appSelectCreateDept() { + return success(taskInfoService.appSelectCreateDept()); + } + @GetMapping("/appPageByEnterpriseId") @Operation(summary = "获得任务表，用于存储所有的任务信息，任务可由不同用户创建并管理。分页") // @PreAuthorize("@ss.hasPermission('system:task-info:query')") @@ -272,6 +310,8 @@ public class TaskInfoController { BeanUtils.toBean(list, TaskInfoRespVO.class)); } + + @GetMapping("/testInsertUserArea") @Operation(summary = "获得任务表，用于存储所有的任务信息，任务可由不同用户创建并管理。分页") // @PreAuthorize("@ss.hasPermission('system:task-info:query')") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoPageReqVO.java index a80110b..888d629 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoPageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoPageReqVO.java @@ -94,4 +94,10 @@ public class TaskInfoPageReqVO extends PageParam { @Schema(description = "企业id", example = "1") private Long enterpriseId; + @Schema(description = "创建部门", example = "1") + private Long createDeptId; + + @Schema(description = "企业所所属区域") + private Integer region; + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoRespVO.java index d180f8c..71c16b1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoRespVO.java @@ -146,9 +146,4 @@ public class TaskInfoRespVO { //任务类型名称 private String taskTypeName; - - - - - } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java index 68ec662..ab45215 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java @@ -159,8 +159,8 @@ public class UserController { @GetMapping({"/simple-zg-list"}) @Operation(summary = "获取用户精简信息列表", description = "只包含被开启的用户，主要用于前端的下拉选项") - public CommonResult> getSimpleUserZGList() { - return success(userService.getSimpleUserZGList()); + public CommonResult> getSimpleUserZGList(@RequestParam(value = "deptId", required = false) Long deptId) { + return success(userService.getSimpleUserZGList(deptId)); } @GetMapping({"/simple-user-by-userType"}) @@ -233,4 +233,22 @@ public class UserController { return success(true); } + @PutMapping("/enterprise_manager_list") + @Operation(summary = "专管员列表,邀请过企业的都是专管员") + public CommonResult> enterpriseManagerList() { + return success(userService.enterpriseManagerList()); + } + + @GetMapping("/deptByMenu") + @Operation(summary = "根据权限查询部门") + public CommonResult> deptByMenu() { + return success(userService.deptByMenu()); + } + + @GetMapping("/enterprise_manager_dept_list") + @Operation(summary = "专管员部门查询") + public CommonResult> enterpriseManagerDeptList() { + return success(userService.enterpriseManagerDeptList()); + } + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/DeptUserReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/DeptUserReqVO.java index 4ee73b3..3fb2527 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/DeptUserReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/DeptUserReqVO.java @@ -17,4 +17,7 @@ public class DeptUserReqVO { @Schema(description = "部门名称", example = "IT 部") private String deptName; + @Schema(description = "头像", example = "IT 部") + private String avatar; + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserDeptVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserDeptVO.java new file mode 100644 index 0000000..e852cb7 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserDeptVO.java @@ -0,0 +1,10 @@ +package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; + +import lombok.Data; + +@Data +public class UserDeptVO { + private Long userId; + private String realName; + private Long deptName; +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/airqualitycollection/QualityCollectionDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/airqualitycollection/QualityCollectionDO.java index f513d18..d7ff002 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/airqualitycollection/QualityCollectionDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/airqualitycollection/QualityCollectionDO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.system.dal.dataobject.airqualitycollection; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -64,7 +65,7 @@ public class QualityCollectionDO extends BaseDO { /** * NOx(Hg/m3) */ - private Double nOx; + private Double nox; /** * CO(mg/m3) */ @@ -82,4 +83,4 @@ public class QualityCollectionDO extends BaseDO { */ private String remark2; -} \ No newline at end of file +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/enterprise/EnterpriseDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/enterprise/EnterpriseDO.java index 7ef4030..b634d54 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/enterprise/EnterpriseDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/enterprise/EnterpriseDO.java @@ -104,6 +104,10 @@ public class EnterpriseDO extends BaseDO { @TableField(exist = false) private String inviterName; + //邀请人所在部门 + @TableField(exist = false) + private String inviterNameDept; + @TableField(exist = false) private List tagListName; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/enterpriseinspections/EnterpriseInspectionsDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/enterpriseinspections/EnterpriseInspectionsDO.java index 00ae238..2901f14 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/enterpriseinspections/EnterpriseInspectionsDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/enterpriseinspections/EnterpriseInspectionsDO.java @@ -88,11 +88,11 @@ public class EnterpriseInspectionsDO extends BaseDO { //任务开始时间 @TableField(exist = false) - private LocalDateTime TaskStartTime; + private LocalDateTime taskStartTime; //任务结束时间 @TableField(exist = false) - private LocalDateTime TaskEndTime; + private LocalDateTime taskEndTime; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java index 1580ecc..12f0983 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java @@ -60,6 +60,12 @@ public class AdminUserDO extends TenantBaseDO { * 部门 ID */ private Long deptId; + /* + 部门名称 + */ + @TableField(exist = false) + private String deptName; + /** * 岗位编号数组 */ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/airqualitycollection/QualityCollectionMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/airqualitycollection/QualityCollectionMapper.java index 145bb83..044473a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/airqualitycollection/QualityCollectionMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/airqualitycollection/QualityCollectionMapper.java @@ -27,7 +27,7 @@ public interface QualityCollectionMapper extends BaseMapperX { default PageResult selectPage(NotifyMessagePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(NotifyMessageDO::getUserId, reqVO.getUserId()) + .eqIfPresent(NotifyMessageDO::getUserId, getLoginUserId()) .eqIfPresent(NotifyMessageDO::getUserType, reqVO.getUserType()) .eqIfPresent(NotifyMessageDO::getTemplateId, reqVO.getTemplateId()) .likeIfPresent(NotifyMessageDO::getTemplateCode, reqVO.getTemplateCode()) .eqIfPresent(NotifyMessageDO::getTemplateType, reqVO.getTemplateType()) .eqIfPresent(NotifyMessageDO::getReadStatus, reqVO.getReadStatus()) .betweenIfPresent(NotifyMessageDO::getCreateTime, reqVO.getCreateTime()) + .orderByAsc(NotifyMessageDO::getReadStatus) .orderByDesc(NotifyMessageDO::getCreateTime)); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/taglibrary/TagLibraryMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/taglibrary/TagLibraryMapper.java index d62d2f3..639ba75 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/taglibrary/TagLibraryMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/taglibrary/TagLibraryMapper.java @@ -23,6 +23,7 @@ public interface TagLibraryMapper extends BaseMapperX { .eqIfPresent(TagLibraryDO::getParentId, reqVO.getParentId()) .eqIfPresent(TagLibraryDO::getTagLevel, reqVO.getTagLevel()) .eqIfPresent(TagLibraryDO::getTagType, reqVO.getTagType()) + .neIfPresent(TagLibraryDO::getParentId, 0) .betweenIfPresent(TagLibraryDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(TagLibraryDO::getSort)); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/taskinfo/TaskInfoMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/taskinfo/TaskInfoMapper.java index f24f4e3..a38587a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/taskinfo/TaskInfoMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/taskinfo/TaskInfoMapper.java @@ -5,11 +5,9 @@ import java.util.*; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.LabelValueLongVO; import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.LabelValueVO; -import cn.iocoder.yudao.module.system.controller.admin.home.vo.EnterpriseNumVO; -import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeExecFinishVO; -import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeGroupCountVO; -import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeSelectVO; +import cn.iocoder.yudao.module.system.controller.admin.home.vo.*; import cn.iocoder.yudao.module.system.dal.dataobject.taskinfo.TaskInfoDO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -27,7 +25,7 @@ public interface TaskInfoMapper extends BaseMapperX { default PageResult selectPage(TaskInfoPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(TaskInfoDO::getTitle, reqVO.getTitle()) + .likeIfPresent(TaskInfoDO::getTitle, reqVO.getTitle()) .eqIfPresent(TaskInfoDO::getTaskNumber, reqVO.getTaskNumber()) .eqIfPresent(TaskInfoDO::getDescription, reqVO.getDescription()) .eqIfPresent(TaskInfoDO::getExecCycle, reqVO.getExecCycle()) @@ -35,8 +33,7 @@ public interface TaskInfoMapper extends BaseMapperX { .eqIfPresent(TaskInfoDO::getPriority, reqVO.getPriority()) .eqIfPresent(TaskInfoDO::getStatus, reqVO.getStatus()) .betweenIfPresent(TaskInfoDO::getStartDate, reqVO.getStartDate()) - .betweenIfPresent(TaskInfoDO::getEndDate, reqVO.getEndDate()) - .betweenIfPresent(TaskInfoDO::getCreateTime, reqVO.getCreateTime()) + .betweenIfPresent(TaskInfoDO::getEndDate, reqVO.getStartDate()) .eqIfPresent(TaskInfoDO::getParentId, reqVO.getParentId()) .eqIfPresent(TaskInfoDO::getParentType, reqVO.getParentType()) .eqIfPresent(TaskInfoDO::getTaskStep, reqVO.getTaskStep()) @@ -68,6 +65,8 @@ public interface TaskInfoMapper extends BaseMapperX { //优化任务查询 IPage selectMyPage(Page page, @Param("params") TaskInfoPageReqVO reqVO); + List appSelectCreateDept(Map map); + //根据企业id查任务 IPage selectPageByEnterpriseId(Page page, @Param("reqVO") TaskInfoPageReqVO reqVO); @@ -83,4 +82,9 @@ public interface TaskInfoMapper extends BaseMapperX { //整改次数排序 List selectEnterpriseStatus(HomeSelectVO homeSelectVO); + //近6个月的执法走势 + List taskNumDoing(HomeSelectVO homeSelectVO); + + //近6个月的执法走势 + Long selectCorrectionCount(HomeSelectVO homeSelectVO); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java index c19c5b5..4c2d944 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java @@ -3,7 +3,9 @@ package cn.iocoder.yudao.module.system.dal.mysql.user; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserDeptVO; import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO; +import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; @@ -57,4 +59,12 @@ public interface AdminUserMapper extends BaseMapperX { @Delete("delete from system_oauth2_refresh_token where user_id = #{userId}") Long deleteOauth2RefreshAuth(Long userId); + + //查询所有邀请过企业的管理员 + List enterpriseManagerList(); + //查询发布过任务的部门 + List deptByMenu(); + //查询所有邀请过企业的部门 + List enterpriseManagerDeptList(); + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/InspectionsSendStartMessageJob.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/InspectionsSendStartMessageJob.java index f580c65..af739af 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/InspectionsSendStartMessageJob.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/InspectionsSendStartMessageJob.java @@ -55,8 +55,6 @@ public class InspectionsSendStartMessageJob implements JobHandler { for (final EnterpriseInspectionsCorrectionVO item : enterpriseInspectionsCorrectionVOS) { final InspectionsLogDO inspectionsLogNew = enterpriseInspectionsService.getInspectionsLogNew(item.getInspectionsId()); //站内信发送通知 - - if (inspectionsLogNew != null && inspectionsLogNew.getStatus() == 3) { //站内信发送通知 @@ -68,7 +66,7 @@ public class InspectionsSendStartMessageJob implements JobHandler { notifyMessage.setTemplateCode("correction_messages"); Map templateParams = new HashMap<>(); templateParams.put("title", enterpriseService.getEnterprise(item.getEnterpriseId()).getEnterprisesName()); - templateParams.put("correctionTime", inspectionsLogNew.getCorrectionTime()); + templateParams.put("endTime", DateUtil.format(inspectionsLogNew.getCorrectionTime(), DateUtils.FORMAT_YEAR_MONTH_DAY)); templateParams.put("url", "/sub/task/record?taskId="+item.getTaskId() +"&recordId=" + item.getEnterpriseId() +"&enterpriseId=" + item.getEnterpriseId()); notifyMessage.setTemplateParams(templateParams); @@ -83,8 +81,8 @@ public class InspectionsSendStartMessageJob implements JobHandler { reqDTO.setUserId(Long.valueOf(item.getCreator())); Map message = new HashMap<>(); message.put("thing5", enterprise.getEnterprisesName()); - message.put("time8", DateUtil.format(inspectionsLogNew.getCorrectionTime(), DateUtils.FORMAT_YEAR_MONTH_DAY)); - message.put("time9", item.getFeedback()); + message.put("thing8", item.getFeedback() ); + message.put("time9", DateUtil.format(inspectionsLogNew.getCorrectionTime(), DateUtils.FORMAT_YEAR_MONTH_DAY)); reqDTO.setMessages(message); socialClientApi.sendWxaSubscribeMessage(reqDTO); } catch (Exception e) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/QualificationTimeOutSendStartMessageJob.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/QualificationTimeOutSendStartMessageJob.java index 7e8f8e5..3e459d9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/QualificationTimeOutSendStartMessageJob.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/QualificationTimeOutSendStartMessageJob.java @@ -8,13 +8,16 @@ import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDT import cn.iocoder.yudao.module.system.api.social.SocialClientApi; import cn.iocoder.yudao.module.system.api.social.dto.SocialWxaSubscribeMessageSendReqDTO; import cn.iocoder.yudao.module.system.controller.admin.qualification.vo.QualificationExpiredVO; +import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; import cn.iocoder.yudao.module.system.dal.dataobject.enterprise.EnterpriseDO; import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO; import cn.iocoder.yudao.module.system.dal.dataobject.inspectionslog.InspectionsLogDO; import cn.iocoder.yudao.module.system.dal.mysql.enterpriseinspections.EnterpriseInspectionsMapper; import cn.iocoder.yudao.module.system.dal.mysql.qualification.EnterpriseQualificationMapper; +import cn.iocoder.yudao.module.system.service.dict.DictDataService; import cn.iocoder.yudao.module.system.service.enterprise.EnterpriseService; import cn.iocoder.yudao.module.system.service.inspectionslog.InspectionsLogService; +import cn.iocoder.yudao.module.system.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -33,43 +36,50 @@ public class QualificationTimeOutSendStartMessageJob implements JobHandler { EnterpriseQualificationMapper enterpriseQualificationMapper; @Resource NotifyMessageSendApi notifyMessageSendApi; + @Resource + DictDataService dictDataService; @Override public String execute(String param) throws Exception { //要发送的信息 - final Long id = Long.valueOf(param); final List qualificationExpiredVOS = enterpriseQualificationMapper.expiredList(); if (qualificationExpiredVOS != null && qualificationExpiredVOS.size() > 0) { qualificationExpiredVOS.forEach(item->{ try { - //发送消息 - SocialWxaSubscribeMessageSendReqDTO reqDTO = new SocialWxaSubscribeMessageSendReqDTO(); - reqDTO.setUserType(1); - reqDTO.setTemplateTitle("认证到期提醒"); - reqDTO.setPage("sub/enterprise/detail?id="+item.getEnterpriseId()); - reqDTO.setUserId(item.getUserId()); - Map message = new HashMap<>(); - message.put("phrase1", item.getEnterpriseName()); - message.put("data2", DateUtil.format(item.getExpiryDate(), DateUtils.FORMAT_YEAR_MONTH_DAY)); + final DictDataDO enterpriseQua = dictDataService.getDictData("enterprise_qua", item.getQualificationName().toString()); - reqDTO.setMessages(message); - socialClientApi.sendWxaSubscribeMessage(reqDTO); + //发送消息 + if (item.getEnterpriseName() != null && item.getExpiryDate() != null) { + SocialWxaSubscribeMessageSendReqDTO reqDTO = new SocialWxaSubscribeMessageSendReqDTO(); + reqDTO.setUserType(1); + reqDTO.setTemplateTitle("证书到期通知"); + reqDTO.setPage("sub/enterprise/detail?id="+item.getEnterpriseId()); + reqDTO.setUserId(item.getUserId()); + Map message = new HashMap<>(); + message.put("thing1", StringUtil.truncateString(enterpriseQua.getLabel(), 15)); + message.put("thing2", StringUtil.truncateString(item.getEnterpriseName(), 15)); + message.put("time4", DateUtil.format(item.getExpiryDate(), DateUtils.FORMAT_YEAR_MONTH_DAY)); + message.put("phrase3", "到期"); + reqDTO.setMessages(message); + socialClientApi.sendWxaSubscribeMessage(reqDTO); + } - //保存站内信 - NotifySendSingleToUserReqDTO notifyMessage = new NotifySendSingleToUserReqDTO(); - notifyMessage.setUserId(Long.valueOf(item.getUserId())); - notifyMessage.setTemplateCode("qualification_expiry_date"); - Map templateParams = new HashMap<>(); - templateParams.put("title", item.getEnterpriseName()); - templateParams.put("endTime", item.getExpiryDate()); - templateParams.put("url", "/sub/enterprise/detail?id="+ item.getEnterpriseId()); - notifyMessage.setTemplateParams(templateParams); - notifyMessageSendApi.sendSingleMessageToAdmin(notifyMessage); } catch (Exception e){ log.error("任务发送通知错误：",e.toString()); } + + //保存站内信 + NotifySendSingleToUserReqDTO notifyMessage = new NotifySendSingleToUserReqDTO(); + notifyMessage.setUserId(Long.valueOf(item.getUserId())); + notifyMessage.setTemplateCode("qualification_expiry_date"); + Map templateParams = new HashMap<>(); + templateParams.put("title", item.getEnterpriseName()); + templateParams.put("endTime", DateUtil.format(item.getExpiryDate(), DateUtils.FORMAT_YEAR_MONTH_DAY)); + templateParams.put("url", "/sub/enterprise/detail?id="+ item.getEnterpriseId()); + notifyMessage.setTemplateParams(templateParams); + notifyMessageSendApi.sendSingleMessageToAdmin(notifyMessage); }); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/TaskSendStartMessageJob.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/TaskSendStartMessageJob.java index 9c4c4a5..5019b2c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/TaskSendStartMessageJob.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/TaskSendStartMessageJob.java @@ -92,7 +92,7 @@ public class TaskSendStartMessageJob implements JobHandler { templateParams.put("url", "sub/task/detail?id="+ enterpriseInspectionsDO.getTaskId()); notifyMessage.setTemplateParams(templateParams); - notifyMessageSendApi.sendSingleMessageToMember(notifyMessage); + notifyMessageSendApi.sendSingleMessageToAdmin(notifyMessage); enterpriseInspectionsDO.setStatus(2); list.add(enterpriseInspectionsDO); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/airqualitycollection/QualityCollectionService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/airqualitycollection/QualityCollectionService.java index 7bb8a6c..da66a96 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/airqualitycollection/QualityCollectionService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/airqualitycollection/QualityCollectionService.java @@ -53,4 +53,5 @@ public interface QualityCollectionService { */ PageResult getQualityCollectionPage(QualityCollectionPageReqVO pageReqVO); + void saveList(List list, Long type); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/airqualitycollection/QualityCollectionServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/airqualitycollection/QualityCollectionServiceImpl.java index f29fa21..b57e7fc 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/airqualitycollection/QualityCollectionServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/airqualitycollection/QualityCollectionServiceImpl.java @@ -72,4 +72,19 @@ public class QualityCollectionServiceImpl implements QualityCollectionService { return qualityCollectionMapper.selectPage(pageReqVO); } + @Override + public void saveList(List list, Long type) { + List collectionDOS = new ArrayList<>(); + if (!list.isEmpty()) { + list.forEach(item->{ + QualityCollectionDO collectionDO = new QualityCollectionDO(); + collectionDO.setType(type); + BeanUtils.copyProperties(item, collectionDO); + + collectionDOS.add(collectionDO); + }); + qualityCollectionMapper.insertBatch(collectionDOS); + } + } + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java index 3dc2e97..b8c50ad 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java @@ -1,6 +1,9 @@ package cn.iocoder.yudao.module.system.service.auth; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.http.HttpUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils; @@ -322,6 +325,15 @@ public class AdminAuthServiceImpl implements AdminAuthService { AdminUserDO user = null; if (socialUserDO == null ) { + +// String userInfoUrl = "https://api.weixin.qq.com/sns/userinfo" + +// "?access_token=" + authUser.getToken() + +// "&openid=" + authUser.getUuid() + +// "&lang=zh_CN"; +// String userInfoResponse = HttpUtil.get(userInfoUrl); +// JSONObject userInfoJson = JSONUtil.parseObj(userInfoResponse); +// String nickname = userInfoJson.getStr("nickname"); + // 未找到社交用户，插入记录 SocialUserDO socialUser = new SocialUserDO(); socialUser.setType(reqVO.getType()); @@ -498,13 +510,13 @@ public class AdminAuthServiceImpl implements AdminAuthService { private List getRolesByIds(List roleIds) { return roleMapper.selectList(new LambdaQueryWrapper() .in(RoleDO::getId, roleIds) - .select(RoleDO::getName)); + .select(RoleDO::getName, RoleDO::getCode)); } private RoleNameAndSelectTypeVO buildRoleVO(AdminUserDO user, Long userId, List roles) { RoleNameAndSelectTypeVO vo = new RoleNameAndSelectTypeVO(); Set roleNames = roles.stream() - .map(RoleDO::getName) + .map(RoleDO::getCode) .collect(Collectors.toSet()); if (hasAdminPrivileges(roleNames)) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterprise/EnterpriseServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterprise/EnterpriseServiceImpl.java index 377f0de..aa6c78f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterprise/EnterpriseServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterprise/EnterpriseServiceImpl.java @@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; import org.apache.tomcat.jni.FileInfo; import org.checkerframework.checker.units.qual.A; import org.springframework.stereotype.Service; @@ -64,6 +65,7 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; */ @Service @Validated +@Slf4j public class EnterpriseServiceImpl implements EnterpriseService { @Resource @@ -323,6 +325,7 @@ public class EnterpriseServiceImpl implements EnterpriseService { public PageResult getEnterpriseByUserId(EnterprisePageReqVO pageReqVO) { RoleNameAndSelectTypeVO typeVO = authService.roleTypeByUserId(); + if ("self".equals(typeVO.getRoleName())) { pageReqVO.setUserId(typeVO.getValue()); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsService.java index 50b64ab..e3f95c0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsService.java @@ -46,7 +46,7 @@ public interface EnterpriseInspectionsService { * @param id 编号 * @return 企业检查记录表，用于记录与企业相关的环保检查信息。 */ - EnterpriseInspectionsDO getEnterpriseInspections(Long id); + EnterpriseInspectionsRespVO getEnterpriseInspections(Long id); List getListByUserIdAndTaskName(Long userId, String taskName); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsServiceImpl.java index 8647f71..1f5079b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterpriseinspections/EnterpriseInspectionsServiceImpl.java @@ -28,6 +28,7 @@ import cn.iocoder.yudao.module.system.service.dict.DictDataService; import cn.iocoder.yudao.module.system.service.inspectionslog.InspectionsLogService; import cn.iocoder.yudao.module.system.service.taglibrary.TagLibraryService; import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.iocoder.yudao.module.system.util.EntityUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -35,6 +36,7 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -152,39 +154,73 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe } @Override - public EnterpriseInspectionsDO getEnterpriseInspections(Long id) { + public EnterpriseInspectionsRespVO getEnterpriseInspections(Long id) { + + EnterpriseInspectionsRespVO enterpriseInspectionsRespVO = new EnterpriseInspectionsRespVO(); final EnterpriseInspectionsDO enterpriseInspectionsDO = enterpriseInspectionsMapper.selectById(id); if (enterpriseInspectionsDO == null) { throw exception(ENTERPRISE_INSPECTIONS_NOT_EXISTS); } + BeanUtils.copyProperties(enterpriseInspectionsDO, enterpriseInspectionsRespVO); + + //查询任务相关 final TaskInfoDO taskInfoDO = taskInfoMapper.selectById(enterpriseInspectionsDO.getTaskId()); if (taskInfoDO == null) { throw exception(TASK_INFO_NOT_EXISTS); } - enterpriseInspectionsDO.setTaskName(taskInfoDO.getTitle()); - enterpriseInspectionsDO.setTaskName(taskInfoDO.getTitle()); - enterpriseInspectionsDO.setTaskNumber(taskInfoDO.getTaskNumber()); + enterpriseInspectionsRespVO.setTaskName(taskInfoDO.getTitle()); + enterpriseInspectionsRespVO.setTaskId(taskInfoDO.getId()); + + //任务类型 + final TagLibraryDO tagLibrary = tagLibraryService.getTagLibrary(taskInfoDO.getTaskType()); + enterpriseInspectionsRespVO.setTaskType(tagLibrary.getTagName()); + + //任务当前状态 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("inspections_id", id); + wrapper.orderByDesc("create_time"); + final List list = inspectionsLogMapper.selectList(wrapper); + if (!list.isEmpty()) { + enterpriseInspectionsRespVO.setStatus(list.get(0).getStatus()); + } else { + enterpriseInspectionsRespVO.setStatus(0); + } + + //企业相关 final EnterpriseDO enterpriseDO = enterpriseMapper.selectById(enterpriseInspectionsDO.getEnterpriseId()); if (enterpriseDO == null) { throw exception(ENTERPRISE_NOT_EXISTS); } - //任务类型 - enterpriseInspectionsDO.setEnterpriseName(enterpriseDO.getEnterprisesName()); + enterpriseInspectionsRespVO.setEnterpriseName(enterpriseDO.getEnterprisesName()); + enterpriseInspectionsRespVO.setEnterpriseId(enterpriseDO.getId()); + + //查询的是执法人 final AdminUserDO user = adminUserService.getUser(enterpriseInspectionsDO.getUserId()); if (user == null) { throw exception(USER_NOT_EXISTS); } - enterpriseInspectionsDO.setInspectName(user.getRealName()); - + enterpriseInspectionsRespVO.setInspectName(user.getRealName()); final DeptDO dept = deptService.getDept(user.getDeptId()); + if (dept!= null) { + enterpriseInspectionsRespVO.setDepartment(dept.getName()); + enterpriseInspectionsRespVO.setDeptId(dept.getId()); + } - enterpriseInspectionsDO.setDepartment(dept.getName()); + //查询发布人部门 + final Long userId = Long.valueOf(taskInfoDO.getCreator()); + final AdminUserDO user1 = adminUserService.getUser(userId); + if (user1 != null) { + final DeptDO dept2 = deptService.getDept(user1.getDeptId()); + if (dept2!= null) { + enterpriseInspectionsRespVO.setCreateDeptName(dept2.getName()); + } + } - return enterpriseInspectionsDO; + return enterpriseInspectionsRespVO; } @Override @@ -197,6 +233,7 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe } } + //按照部门查询 if (pageReqVO.getDepartmentId() != null && pageReqVO.getUserId() == null) { final List adminUserDOS = adminUserMapper.selectList(new QueryWrapper().eq("dept_id", pageReqVO.getDepartmentId())); @@ -228,6 +265,7 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe } } + final PageResult enterpriseInspectionsDOPageResult = enterpriseInspectionsMapper.selectPage(pageReqVO); if ( enterpriseInspectionsDOPageResult.getList() != null && enterpriseInspectionsDOPageResult.getList().size() > 0 ) { enterpriseInspectionsDOPageResult.getList().forEach(item->{ @@ -264,8 +302,6 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe } - - item.setEnterpriseName(enterpriseDO.getEnterprisesName()); item.setEnterpriseAddress(enterpriseDO.getAddress()); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/home/HomeService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/home/HomeService.java index c6eccc1..cb4adac 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/home/HomeService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/home/HomeService.java @@ -1,9 +1,7 @@ package cn.iocoder.yudao.module.system.service.home; import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.LabelValueVO; -import cn.iocoder.yudao.module.system.controller.admin.home.vo.EnterpriseNumVO; -import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeCountResVO; -import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeSelectVO; +import cn.iocoder.yudao.module.system.controller.admin.home.vo.*; import java.util.List; @@ -13,4 +11,8 @@ public interface HomeService { List appCount2(HomeSelectVO homeSelectVO); List getUserArea(); + + List taskNumDoing(HomeSelectVO homeSelectVO); + + List execCorrectionCount(HomeSelectVO homeSelectVO); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/home/HomeServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/home/HomeServiceImpl.java index 4ed64c2..9353a55 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/home/HomeServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/home/HomeServiceImpl.java @@ -1,24 +1,15 @@ package cn.iocoder.yudao.module.system.service.home; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.system.controller.admin.auth.vo.RoleNameAndSelectTypeVO; import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.LabelValueVO; import cn.iocoder.yudao.module.system.controller.admin.home.vo.*; -import cn.iocoder.yudao.module.system.controller.admin.taskinfo.vo.TaskInfoPageReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; import cn.iocoder.yudao.module.system.dal.dataobject.enterprise.EnterpriseDO; -import cn.iocoder.yudao.module.system.dal.dataobject.taskinfo.TaskInfoDO; -import cn.iocoder.yudao.module.system.dal.dataobject.userarea.UserAreaDO; import cn.iocoder.yudao.module.system.dal.mysql.enterprise.EnterpriseMapper; -import cn.iocoder.yudao.module.system.dal.mysql.enterprisetag.EnterpriseTagMapper; import cn.iocoder.yudao.module.system.dal.mysql.taskinfo.TaskInfoMapper; -import cn.iocoder.yudao.module.system.dal.mysql.userarea.UserAreaMapper; import cn.iocoder.yudao.module.system.service.auth.AdminAuthService; import cn.iocoder.yudao.module.system.service.auth.AdminAuthServiceImpl; -import cn.iocoder.yudao.module.system.service.dept.DeptService; import cn.iocoder.yudao.module.system.service.dict.DictDataService; -import cn.iocoder.yudao.module.system.service.taskinfo.TaskInfoService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -41,13 +32,19 @@ public class HomeServiceImpl implements HomeService{ private TaskInfoMapper taskInfoMapper; @Resource private AdminAuthService authService; - @Resource - private UserAreaMapper userAreaMapper; + @Resource private DictDataService dictDataService; @Override public HomeCountResVO appCount1(HomeSelectVO homeSelectVO) { + + if (homeSelectVO.getSelectWeek() != null) { + // 1. 获取周的日期 + final LocalDateTime[] weekDate = this.getWeekDate(homeSelectVO.getSelectWeek()); + homeSelectVO.setTime(weekDate); + } + // 1. 初始化参数处理 processDeptSelection(homeSelectVO); @@ -220,29 +217,9 @@ public class HomeServiceImpl implements HomeService{ List labelValueVOS = new ArrayList<>(); RoleNameAndSelectTypeVO typeVO = authService.roleTypeByUserId(); - if ("director".equals(typeVO.getRoleName())) { - //局长返回整个字典 - final List enterprisesArea = dictDataService.getDictDataList(0, "enterprises_area"); - enterprisesArea.forEach(item-> { - LabelValueVO labelValueVO = new LabelValueVO(); - labelValueVO.setLabel(item.getLabel()); - labelValueVO.setValue(Integer.valueOf(item.getValue())); - labelValueVOS.add(labelValueVO); - }); - } else { -// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); -// wrapper.eq(UserAreaDO::getUserId, getLoginUserId()); -// final List userAreaDOS = userAreaMapper.selectList(wrapper); -// if (userAreaDOS != null && userAreaDOS.size() > 0) { -// userAreaDOS.forEach(item->{ -// LabelValueVO labelValueVO = new LabelValueVO(); -// final DictDataDO enterprisesArea = dictDataService.getDictData("enterprises_area", item.getArea().toString()); -// labelValueVO.setLabel(enterprisesArea.getLabel()); -// labelValueVO.setValue(Integer.valueOf(item.getArea())); -// labelValueVOS.add(labelValueVO); -// }); -// } + if ("self".equals(typeVO.getRoleName())) { + //专管员看自己 LambdaQueryWrapper enterpriseDOLambdaQueryWrapper = new LambdaQueryWrapper<>(); enterpriseDOLambdaQueryWrapper.eq(EnterpriseDO::getUserId, getLoginUserId()); final List enterpriseDOS = enterpriseMapper.selectList(enterpriseDOLambdaQueryWrapper); @@ -256,10 +233,60 @@ public class HomeServiceImpl implements HomeService{ labelValueVOS.add(labelValueVO); }); } + } else { + //其他人看所有 + final List enterprisesArea = dictDataService.getDictDataList(0, "enterprises_area"); + enterprisesArea.forEach(item-> { + LabelValueVO labelValueVO = new LabelValueVO(); + labelValueVO.setLabel(item.getLabel()); + labelValueVO.setValue(Integer.valueOf(item.getValue())); + labelValueVOS.add(labelValueVO); + }); } return labelValueVOS; } + @Override + public List taskNumDoing(HomeSelectVO homeSelectVO) { + return taskInfoMapper.taskNumDoing(homeSelectVO); + } + + @Override + public List execCorrectionCount(HomeSelectVO homeSelectVO) { + + if (homeSelectVO.getSelectWeek() != null) { + // 1. 获取周的日期 + final LocalDateTime[] weekDate = this.getWeekDate(homeSelectVO.getSelectWeek()); + homeSelectVO.setTime(weekDate); + } + + List execCorrectionCountVOList = new ArrayList<>(); + + final List homeGroupCountVOS = taskInfoMapper.selectHomeGroupCount(homeSelectVO); + if (!homeGroupCountVOS.isEmpty()) { + homeGroupCountVOS.forEach(item->{ + if (item.getFinishCount() == 0) return; + ExecCorrectionCountVO correctionCountVO = new ExecCorrectionCountVO(); + correctionCountVO.setRealName(item.getName()); + correctionCountVO.setInspectionCount(item.getFinishCount()); + homeSelectVO.setUserId(item.getUserId()); + final Long correctionCount = taskInfoMapper.selectCorrectionCount(homeSelectVO); + correctionCountVO.setCorrectionCount(correctionCount); + execCorrectionCountVOList.add(correctionCountVO); + }); + } + + if (execCorrectionCountVOList.isEmpty()) { + ExecCorrectionCountVO correctionCountVO = new ExecCorrectionCountVO(); + correctionCountVO.setRealName(""); + correctionCountVO.setInspectionCount(0); + correctionCountVO.setCorrectionCount(0L); + execCorrectionCountVOList.add(correctionCountVO); + } + + return execCorrectionCountVOList; + + } //查企业 public Integer getEnterpriseCount(HomeSelectVO homeSelectVO) { @@ -274,6 +301,4 @@ public class HomeServiceImpl implements HomeService{ return enterpriseCount.intValue(); } - - } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/qualification/EnterpriseQualificationServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/qualification/EnterpriseQualificationServiceImpl.java index ef2fd84..9e9b935 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/qualification/EnterpriseQualificationServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/qualification/EnterpriseQualificationServiceImpl.java @@ -103,7 +103,7 @@ public class EnterpriseQualificationServiceImpl implements EnterpriseQualificati @Override public PageResult getEnterpriseQualificationPage(EnterpriseQualificationPageReqVO pageReqVO) { - if (pageReqVO.getEnterpriseName() != null) { + if (pageReqVO.getEnterpriseName() != null) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.like(EnterpriseDO::getEnterprisesName, pageReqVO.getEnterpriseName()); List enterpriseDOList = enterpriseMapper.selectList(wrapper); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taglibrary/TagLibraryService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taglibrary/TagLibraryService.java index 29aa413..6123187 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taglibrary/TagLibraryService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taglibrary/TagLibraryService.java @@ -64,4 +64,6 @@ public interface TagLibraryService { List listByEnterpriseId(Long enterpriseId); List listSetParentId(List tagLibraryDOS); + + PageResult page(TagLibraryPageReqVO pageReqVO); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taglibrary/TagLibraryServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taglibrary/TagLibraryServiceImpl.java index fcbfa94..2450b62 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taglibrary/TagLibraryServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taglibrary/TagLibraryServiceImpl.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.system.service.taglibrary; +import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.module.system.dal.dataobject.enterprisetag.EnterpriseTagDO; import cn.iocoder.yudao.module.system.dal.dataobject.tasktag.TaskTagDO; @@ -158,6 +159,12 @@ public class TagLibraryServiceImpl implements TagLibraryService { } + @Override + public PageResult page(TagLibraryPageReqVO pageReqVO) { + + return tagLibraryMapper.selectPage(pageReqVO); + } + public TagLibraryDO findTopTag(Map integerTagLibraryDOMap,TagLibraryDO tagLibraryDOBot) { if(tagLibraryDOBot.getParentId() == 0) return tagLibraryDOBot; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoService.java index f204f22..39d4910 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoService.java @@ -1,6 +1,9 @@ package cn.iocoder.yudao.module.system.service.taskinfo; import java.util.*; + +import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.LabelValueLongVO; +import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.LabelValueVO; import cn.iocoder.yudao.module.system.controller.admin.taskinfo.vo.*; import cn.iocoder.yudao.module.system.dal.dataobject.taskinfo.TaskInfoDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -70,4 +73,6 @@ public interface TaskInfoService { void taskExec(TaskInfoSaveReqVO updateReqVO); void test(); + + List appSelectCreateDept(); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoServiceImpl.java index 2451f76..0ef65b9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/taskinfo/TaskInfoServiceImpl.java @@ -11,6 +11,8 @@ import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDT import cn.iocoder.yudao.module.system.api.social.SocialClientApi; import cn.iocoder.yudao.module.system.api.social.dto.SocialWxaSubscribeMessageSendReqDTO; import cn.iocoder.yudao.module.system.controller.admin.auth.vo.RoleNameAndSelectTypeVO; +import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.LabelValueLongVO; +import cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.LabelValueVO; import cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo.EnterpriseInspectionsPageReqVO; import cn.iocoder.yudao.module.system.controller.admin.tasktag.vo.TaskTagPageReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; @@ -30,6 +32,7 @@ import cn.iocoder.yudao.module.system.service.auth.AdminAuthService; import cn.iocoder.yudao.module.system.service.dept.DeptService; import cn.iocoder.yudao.module.system.service.taglibrary.TagLibraryService; import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.iocoder.yudao.module.system.util.EntityUtils; import cn.iocoder.yudao.module.system.util.StringUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -157,15 +160,27 @@ public class TaskInfoServiceImpl implements TaskInfoService { @Override public void deleteTaskInfo(Long id) { // 校验存在 - validateTaskInfoExists(id); + final TaskInfoDO taskInfoDO = validateTaskInfoExists(id); + + //先删除对应的执法记录 + if (taskInfoDO.getStatus() > 1) { + throw exception(ENTERPRISE_INSPECTIONS_STATUS_ERROR4); + } + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("task_id", taskInfoDO.getId()); + enterpriseInspectionsMapper.delete(wrapper); +// //删除任务标签 +// taskTagMapper.delete(new LambdaQueryWrapper().eq(TaskTagDO::getTaskId, taskInfoDO.getId())); // 删除 taskInfoMapper.deleteById(id); } - private void validateTaskInfoExists(Long id) { - if (taskInfoMapper.selectById(id) == null) { + private TaskInfoDO validateTaskInfoExists(Long id) { + final TaskInfoDO taskInfoDO = taskInfoMapper.selectById(id); + if (taskInfoDO == null) { throw exception(TASK_INFO_NOT_EXISTS); } + return taskInfoDO; } @Override @@ -175,6 +190,12 @@ public class TaskInfoServiceImpl implements TaskInfoService { @Override public PageResult getTaskInfoPage(TaskInfoPageReqVO pageReqVO) { + //时间范围查询 + if (pageReqVO.getSelectWeek() != null) { + final LocalDateTime[] weekDate = EntityUtils.getWeekDate(pageReqVO.getSelectWeek()); + pageReqVO.setStartDate(weekDate); + } + return taskInfoMapper.selectPage(pageReqVO); } @@ -187,6 +208,13 @@ public class TaskInfoServiceImpl implements TaskInfoService { //当天到任务 queryWrapperX.eqIfPresent(TaskInfoDO::getStartDate,DateUtil.format(new Date(), "yyyy-MM-dd")); + + Calendar calendar = Calendar.getInstance(); + // 获取小时（24 小时制） + int hour24 = calendar.get(Calendar.HOUR_OF_DAY); + + queryWrapperX.eqIfPresent(TaskInfoDO::getExecCycle, hour24); + List taskInfoDOS = taskInfoMapper.selectList(queryWrapperX); Map taskMap = CollectionUtils.convertMap(taskInfoDOS, TaskInfoDO::getId); @@ -208,51 +236,23 @@ public class TaskInfoServiceImpl implements TaskInfoService { return taskInfoRespVOS; } - - - - @Override public void sendTask(Long taskId) { final TaskInfoDO taskInfoDO = taskInfoMapper.selectById(taskId); if (taskInfoDO == null) { throw exception(TASK_INFO_NOT_EXISTS); } - - // - - //发送订阅消息给微信 - - } + @Override public PageResult getTaskInfoAppPage(TaskInfoPageReqVO pageReqVO) { //按时间查询 if (pageReqVO.getSelectWeek() != null) { - LocalDateTime now = LocalDateTime.now(); - - pageReqVO.setEndTime(now); - - LocalDateTime startTime = null; - - switch (pageReqVO.getSelectWeek()) { - case 4: - startTime = now.minusDays(3); // 三天前 - break; - case 3: - startTime = now.minusWeeks(1); // 一周前 - break; - case 2: - startTime = now.minusMonths(1); // 一月前 - break; - case 1: - startTime = now.minusYears(1); // 一年前 - break; - } - - pageReqVO.setStartTime(startTime); + final LocalDateTime[] weekDate = EntityUtils.getWeekDate(pageReqVO.getSelectWeek()); + pageReqVO.setStartTime(weekDate[0]); + pageReqVO.setEndTime(weekDate[1]); } RoleNameAndSelectTypeVO typeVO = authService.roleTypeByUserId(); @@ -265,7 +265,9 @@ public class TaskInfoServiceImpl implements TaskInfoService { } Page page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + log.info("taskInfoDOIPage:{}", pageReqVO); final IPage taskInfoDOIPage = taskInfoMapper.selectMyPage(page, pageReqVO); + final PageResult taskInfoDOPageResult = new PageResult<>(taskInfoDOIPage.getRecords(), taskInfoDOIPage.getTotal()); if (taskInfoDOPageResult.getList() != null && taskInfoDOPageResult.getList().size() > 0) { @@ -282,7 +284,10 @@ public class TaskInfoServiceImpl implements TaskInfoService { if (item.getCreator() != null) { final Long value = Long.valueOf(item.getCreator()); final DeptDO deptDO = deptService.getByUserId(value); - item.setDeptName(deptDO.getName()); + if (deptDO != null) { + item.setDeptName(deptDO.getName()); + } + } }); } @@ -404,4 +409,21 @@ public class TaskInfoServiceImpl implements TaskInfoService { }); } + @Override + public List appSelectCreateDept() { + Map map = new HashMap<>(); + RoleNameAndSelectTypeVO typeVO = authService.roleTypeByUserId(); + + if ("self".equals(typeVO.getRoleName())) { + map.put("userId", typeVO.getValue()); + } + + if ("queue".equals(typeVO.getRoleName())) { + map.put("deptId", typeVO.getDeptId()); + } + + + return taskInfoMapper.appSelectCreateDept(map); + } + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java index b7f1c37..53e5ac7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java @@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfi import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*; import cn.iocoder.yudao.module.system.controller.admin.userAuditlog.vo.UserAuditLogSaveReqVO; +import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import com.xingyuv.jushauth.model.AuthUser; @@ -227,9 +228,15 @@ public interface AdminUserService { void userAudit(UserAuditLogSaveReqVO auditLogSaveReqVO); - List getSimpleUserZGList(); + List getSimpleUserZGList(Long deptId); List getSimpleEnterpriseUserList(Integer type); void testDeleteUser(Long id); + + List enterpriseManagerList(); + + List deptByMenu(); + + List enterpriseManagerDeptList(); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java index 6197982..dae0f47 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java @@ -629,7 +629,7 @@ public class AdminUserServiceImpl implements AdminUserService { } @Override - public List getSimpleUserZGList() { + public List getSimpleUserZGList(Long deptId) { List list = new ArrayList<>(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -637,12 +637,14 @@ public class AdminUserServiceImpl implements AdminUserService { wrapper.eq(AdminUserDO::getStatus, CommonStatusEnum.ENABLE.getStatus()); wrapper.isNotNull(AdminUserDO::getDeptId); wrapper.ne(AdminUserDO::getId, 1); + wrapper.eq(deptId != null, AdminUserDO::getDeptId, deptId); final List adminUserDOS = userMapper.selectList(wrapper); adminUserDOS.forEach(item->{ DeptUserReqVO deptUserReqVO = new DeptUserReqVO(); deptUserReqVO.setId(item.getId()); deptUserReqVO.setRealName(item.getRealName()); + deptUserReqVO.setAvatar(item.getAvatar()); final DeptDO dept = deptService.getDept(item.getDeptId()); if (dept != null) { deptUserReqVO.setDeptName(dept.getName()); @@ -692,13 +694,19 @@ public class AdminUserServiceImpl implements AdminUserService { LogRecordContext.putVariable("user", user); } - public void bindSocialUser(Long userId, AuthUser authUser) { -// SocialUserDO socialUser = new SocialUserDO(); -// socialUser.setUserId(userId); -// socialUser.setType(SocialTypeEnum.WECHAT_MINI_APP.getType()); -// socialUser.setOpenId(authUser.getUuid()); -// socialUser.setUnionId(authUser.getToken().getUnionId()); -// socialUserMapper.insert(socialUser); + @Override + public List enterpriseManagerList() { + return adminUserMapper.enterpriseManagerList(); + } + + @Override + public List deptByMenu() { + return adminUserMapper.deptByMenu(); + } + + @Override + public List enterpriseManagerDeptList() { + return adminUserMapper.enterpriseManagerDeptList(); } /** diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/EntityUtils.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/EntityUtils.java index 9be3c1a..42d9f1d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/EntityUtils.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/EntityUtils.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.system.annotation.PrimaryKey; import com.baomidou.mybatisplus.annotation.TableName; import java.lang.reflect.Field; +import java.time.LocalDateTime; public class EntityUtils { @@ -53,5 +54,30 @@ public class EntityUtils { } return false; // 未找到 } + + public static LocalDateTime[] getWeekDate(Integer selectWeek) { + //按时间查询 + LocalDateTime now = LocalDateTime.now(); + LocalDateTime[] dateList = new LocalDateTime[2]; + + switch (selectWeek) { + case 4: + dateList[0] = now.minusDays(3); // 三天前 + break; + case 3: + dateList[0] = now.minusWeeks(1); // 一周前 + break; + case 2: + dateList[0] = now.minusMonths(1); // 一月前 + break; + case 1: + dateList[0] = now.minusYears(1); // 一年前 + break; + } + dateList[1] = now; + + return dateList; + + } } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/SingleValueToListDeserializer.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/SingleValueToListDeserializer.java new file mode 100644 index 0000000..45ee9ea --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/SingleValueToListDeserializer.java @@ -0,0 +1,24 @@ +package cn.iocoder.yudao.module.system.util; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.*; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; +import java.io.IOException; +import java.util.Collections; +import java.util.List; + +public class SingleValueToListDeserializer extends StdDeserializer> { + public SingleValueToListDeserializer() { + super(List.class); + } + + @Override + public List deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + // 如果是数组，直接解析 + if (p.isExpectedStartArrayToken()) { + return new ObjectMapper().readValue(p, List.class); + } + // 如果是单个值，转为单元素列表 + return Collections.singletonList(p.getLongValue()); + } +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/StringUtil.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/StringUtil.java index 0793c24..637d5e3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/StringUtil.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/StringUtil.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.system.util; +import java.time.LocalDateTime; + public class StringUtil { /* 字符串截取, 超过长度用... diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/jobinfo/JobInfoMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/jobinfo/JobInfoMapper.xml deleted file mode 100644 index 4385de6..0000000 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/jobinfo/JobInfoMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/notifyMessage/NotifyMessage.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/notifyMessage/NotifyMessage.xml index d2a1a5e..1575914 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/notifyMessage/NotifyMessage.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/notifyMessage/NotifyMessage.xml @@ -14,7 +14,7 @@ resultType="cn.iocoder.yudao.module.system.controller.admin.enterprise.vo.LabelValueVO"> select count(*) as value, template_id as label from system_notify_message - where deleted = 0 and user_id = #{userId} + where deleted = 0 AND read_status = 0 AND user_id = #{userId} group by template_id diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/qualification/EnterpriseQualificationMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/qualification/EnterpriseQualificationMapper.xml index 33dc350..a875928 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/qualification/EnterpriseQualificationMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/qualification/EnterpriseQualificationMapper.xml @@ -11,8 +11,9 @@ + + SELECT su.`real_name` as name, + su.`id` as userId, SUM(CASE WHEN il.status = 2 THEN 1 ELSE 0 END) as finishCount, COUNT(DISTINCT ei.id) as execCount, round( SUM(CASE WHEN il.status = 2 THEN 1 ELSE 0 END) /COUNT(DISTINCT ei.id) * 100,1) as completionRate @@ -70,6 +81,12 @@ system_users su on su.id = ei.user_id WHERE ei.deleted = 0 AND e.deleted = 0 and ei.status = 2 and e.region = #{region} + + AND ei.create_time between + + #{item} + + GROUP BY ei.user_id order by @@ -78,11 +95,11 @@ + + + diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/users/AdminUser.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/users/AdminUser.xml new file mode 100644 index 0000000..2f8421f --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/users/AdminUser.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + +