From 6a0fa6d652a82271830e59b7170284c5f05d5972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Fri, 27 Jun 2025 00:32:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yanzhu/api/domain/SysDictData.java | 2 +- .../SurProjectAttendanceDataMapper.java | 14 ++++++ .../SurProjectAttendanceUserMapper.java | 7 +++ .../com/yanzhu/security/utils/DictUtils.java | 2 +- .../system/mapper/SysDictDataMapper.java | 3 +- .../mapper/manage/AttendanceUbiDataMapper.xml | 30 +++++------ .../manage/SurProjectAttendanceDataMapper.xml | 26 +++++++++- .../manage/SurProjectAttendanceUserMapper.xml | 20 ++++++-- ...ProProjectInfoSubdeptsUsersController.java | 2 +- .../wechat/WXAttendanceController.java | 50 ++++++++++++++++--- .../ISurProjectAttendanceDataService.java | 14 ++++++ .../ISurProjectAttendanceUserService.java | 7 +++ .../impl/AttendanceUbiDataServiceImpl.java | 12 ++--- .../SurProjectAttendanceDataServiceImpl.java | 30 +++++++++++ .../SurProjectAttendanceUserServiceImpl.java | 9 ++++ .../dataway/service/InterfaceUiFilter.java | 3 +- .../controller/SysDictDataController.java | 22 +++----- .../system/service/ISysDictDataService.java | 3 +- .../system/service/ISysDictTypeService.java | 5 +- .../service/impl/SysDictDataServiceImpl.java | 8 +-- .../service/impl/SysDictTypeServiceImpl.java | 2 +- 21 files changed, 210 insertions(+), 61 deletions(-) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/api/domain/SysDictData.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/api/domain/SysDictData.java index a9f288c5..cbab85cb 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/api/domain/SysDictData.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/api/domain/SysDictData.java @@ -1,4 +1,4 @@ -package com.yanzhu.system.api.domain; +package com.yanzhu.api.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/SurProjectAttendanceDataMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/SurProjectAttendanceDataMapper.java index cd1537bc..d87e0554 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/SurProjectAttendanceDataMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/SurProjectAttendanceDataMapper.java @@ -154,4 +154,18 @@ public interface SurProjectAttendanceDataMapper * @return */ List getRealAttendance(@Param("prjId") Long prjId,@Param("year") int year); + + /** + * 根据项目统计今日考勤 + * @param where + * @return + */ + public List> statsAttendanceDaysByProId(SurProjectAttendanceData where); + + /** + * 统计人员出勤信息 + * @param where + * @return + */ + public List> statsAttendanceViewByProId(SurProjectAttendanceData where); } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/SurProjectAttendanceUserMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/SurProjectAttendanceUserMapper.java index 88fdb0aa..66556362 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/SurProjectAttendanceUserMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/SurProjectAttendanceUserMapper.java @@ -190,4 +190,11 @@ public interface SurProjectAttendanceUserMapper * @return */ List getAttendanceAlert(@Param("projectId")Long prjId, @Param("year")int year); + + /** + * 统计劳务人员信息 + * @param proId + * @return + */ + public List> statsSubDeptsUsersByProId(Long proId); } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/security/utils/DictUtils.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/security/utils/DictUtils.java index 79c6ab1c..a41e838b 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/security/utils/DictUtils.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/security/utils/DictUtils.java @@ -5,11 +5,11 @@ import java.util.List; import java.util.Objects; import com.alibaba.fastjson2.JSONArray; +import com.yanzhu.api.domain.SysDictData; import com.yanzhu.common.core.constant.CacheConstants; import com.yanzhu.common.core.utils.SpringUtils; import com.yanzhu.common.core.utils.StringUtils; import com.yanzhu.common.redis.service.RedisService; -import com.yanzhu.system.api.domain.SysDictData; /** * 字典工具类 diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDictDataMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDictDataMapper.java index 24f7bcb0..677fc479 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDictDataMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysDictDataMapper.java @@ -1,8 +1,9 @@ package com.yanzhu.system.mapper; import java.util.List; + +import com.yanzhu.api.domain.SysDictData; import org.apache.ibatis.annotations.Param; -import com.yanzhu.system.api.domain.SysDictData; /** * 字典表 数据层 diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml index 0068b7ab..61bcf44e 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/AttendanceUbiDataMapper.xml @@ -226,26 +226,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceDataMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceDataMapper.xml index 7c0472c1..5efccac3 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceDataMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceDataMapper.xml @@ -664,7 +664,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceUserMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceUserMapper.xml index d6872b07..89b2b77a 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceUserMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/SurProjectAttendanceUserMapper.xml @@ -829,8 +829,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java index 4dd9d3f7..fc306db5 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java @@ -1,6 +1,7 @@ package com.yanzhu.manage.controller; import com.alibaba.fastjson2.JSONObject; +import com.yanzhu.api.domain.SysDictData; import com.yanzhu.common.core.domain.R; import com.yanzhu.common.core.enums.UseStateEnums; import com.yanzhu.common.core.text.Convert; @@ -22,7 +23,6 @@ import com.yanzhu.common.core.enums.UserPostEnums; import com.yanzhu.manage.service.IProProjectInfoSubdeptsUsersService; import com.yanzhu.manage.service.IUniService; import com.yanzhu.security.utils.DictUtils; -import com.yanzhu.system.api.domain.SysDictData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java index 9b26696e..d309da45 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WXAttendanceController.java @@ -1,17 +1,20 @@ package com.yanzhu.manage.controller.wechat; +import com.yanzhu.common.core.utils.StringUtils; import com.yanzhu.common.core.web.controller.BaseController; import com.yanzhu.common.core.web.domain.AjaxResult; import com.yanzhu.common.redis.service.RedisService; +import com.yanzhu.manage.domain.AttendanceCfg; import com.yanzhu.manage.domain.AttendanceUbiData; -import com.yanzhu.manage.service.IAttendanceUbiDataService; -import com.yanzhu.manage.service.IProProjectInfoSubdeptsUsersService; +import com.yanzhu.manage.domain.SurProjectAttendanceData; +import com.yanzhu.manage.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -30,9 +33,18 @@ public class WXAttendanceController extends BaseController { @Autowired private RedisService redisService; + @Autowired + private IAttendanceCfgService attendanceCfgService; + @Autowired private IAttendanceUbiDataService attendanceUbiDataService; + @Autowired + private ISurProjectAttendanceUserService surProjectAttendanceUserService; + + @Autowired + private ISurProjectAttendanceDataService surProjectAttendanceDataService; + @Autowired private IProProjectInfoSubdeptsUsersService proProjectInfoSubdeptsUsersService; @@ -43,8 +55,16 @@ public class WXAttendanceController extends BaseController { */ @GetMapping("/v1/findSubDeptsUsers/{proId}") public AjaxResult findSubDeptsUsers(@PathVariable("proId") Long proId){ - List> list = proProjectInfoSubdeptsUsersService.statsSubDeptsUsersByProId(proId); - return AjaxResult.success(list); + AttendanceCfg attendanceCfgQuery = new AttendanceCfg(); + attendanceCfgQuery.setProjectId(proId); + List cfgList = attendanceCfgService.selectAttendanceCfgList(attendanceCfgQuery); + if(cfgList.size()>0 && (StringUtils.eqObj(cfgList.get(0).getVendorsCode(),"uni") || StringUtils.eqObj(cfgList.get(0).getVendorsCode(),"jgw"))){ + List> list = proProjectInfoSubdeptsUsersService.statsSubDeptsUsersByProId(proId); + return AjaxResult.success(list); + }else{ + List> list = surProjectAttendanceUserService.statsSubDeptsUsersByProId(cfgList.size()>0?cfgList.get(0).getId():0); + return AjaxResult.success(list); + } } /** @@ -54,8 +74,16 @@ public class WXAttendanceController extends BaseController { */ @GetMapping("/v1/findDaysAttendanceView/{proId}") public AjaxResult findDaysAttendanceView(@PathVariable("proId") Long proId){ - List> list = attendanceUbiDataService.statsAttendanceDaysByProId(proId); - return AjaxResult.success(list); + AttendanceCfg attendanceCfgQuery = new AttendanceCfg(); + attendanceCfgQuery.setProjectId(proId); + List cfgList = attendanceCfgService.selectAttendanceCfgList(attendanceCfgQuery); + if(cfgList.size()>0 && (StringUtils.eqObj(cfgList.get(0).getVendorsCode(),"uni") || StringUtils.eqObj(cfgList.get(0).getVendorsCode(),"jgw"))){ + List> list = attendanceUbiDataService.statsAttendanceDaysByProId(proId); + return AjaxResult.success(list); + }else{ + List> list = surProjectAttendanceDataService.statsAttendanceDaysByProId(proId); + return AjaxResult.success(list); + } } /** @@ -65,7 +93,15 @@ public class WXAttendanceController extends BaseController { */ @GetMapping("/v1/findSubDeptsAttendanceView/{proId}") public AjaxResult findSubDeptsAttendanceView(@PathVariable("proId") Long proId){ - List> list = attendanceUbiDataService.statsAttendanceViewByProId(proId); + List> list = new ArrayList<>(); + AttendanceCfg attendanceCfgQuery = new AttendanceCfg(); + attendanceCfgQuery.setProjectId(proId); + List cfgList = attendanceCfgService.selectAttendanceCfgList(attendanceCfgQuery); + if(cfgList.size()>0 && (StringUtils.eqObj(cfgList.get(0).getVendorsCode(),"uni") || StringUtils.eqObj(cfgList.get(0).getVendorsCode(),"jgw"))){ + list = attendanceUbiDataService.statsAttendanceViewByProId(proId); + }else{ + list = surProjectAttendanceDataService.statsAttendanceViewByProId(proId); + } Map data = new HashMap<>(); data.put("list",list); data.put("user",list.stream().mapToInt((u) -> Integer.valueOf(String.valueOf(u.get("total")))).sum()); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISurProjectAttendanceDataService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISurProjectAttendanceDataService.java index 90b4f1d4..178b183d 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISurProjectAttendanceDataService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISurProjectAttendanceDataService.java @@ -157,4 +157,18 @@ public interface ISurProjectAttendanceDataService * @return */ List getRealAttendance(Long prjId, int year); + + /** + * 统计今日出勤信息 + * @param proId + * @return + */ + public List> statsAttendanceDaysByProId(Long proId); + + /** + * 统计人员出勤信息 + * @param proId + * @return + */ + public List> statsAttendanceViewByProId(Long proId); } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISurProjectAttendanceUserService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISurProjectAttendanceUserService.java index 1f8039f1..dad9262a 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISurProjectAttendanceUserService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISurProjectAttendanceUserService.java @@ -183,4 +183,11 @@ public interface ISurProjectAttendanceUserService * @return */ List getAttendanceAlert(Long prjId, int year); + + /** + * 统计劳务人员信息 + * @param proId + * @return + */ + public List> statsSubDeptsUsersByProId(Long proId); } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java index 58c1db1c..764e64a1 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/AttendanceUbiDataServiceImpl.java @@ -1,28 +1,28 @@ package com.yanzhu.manage.service.impl; -import java.util.*; -import java.util.stream.Collectors; - import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; +import com.yanzhu.api.domain.SysDictData; import com.yanzhu.common.core.context.SecurityContextHolder; import com.yanzhu.common.core.enums.ShiFouEnums; +import com.yanzhu.common.core.enums.SubDeptsEnums; +import com.yanzhu.common.core.enums.UserPostEnums; import com.yanzhu.common.core.utils.DateUtils; import com.yanzhu.common.core.utils.StringUtils; import com.yanzhu.common.security.utils.SecurityUtils; import com.yanzhu.manage.domain.AttendanceUbiData; import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers; -import com.yanzhu.common.core.enums.SubDeptsEnums; -import com.yanzhu.common.core.enums.UserPostEnums; import com.yanzhu.manage.mapper.AttendanceUbiDataMapper; import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsUsersMapper; import com.yanzhu.manage.service.IAttendanceUbiDataService; -import com.yanzhu.system.api.domain.SysDictData; import com.yanzhu.system.mapper.SysDictDataMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.*; +import java.util.stream.Collectors; + /** * 考勤管理Service业务层处理 * diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SurProjectAttendanceDataServiceImpl.java index 4a51763b..f54d542a 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SurProjectAttendanceDataServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SurProjectAttendanceDataServiceImpl.java @@ -331,6 +331,36 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc return surProjectAttendanceDataMapper.getRealAttendance(prjId,year); } + /** + * 统计今日出勤信息 + * @param proId + * @return + */ + @Override + public List> statsAttendanceDaysByProId(Long proId){ + SurProjectAttendanceData query = new SurProjectAttendanceData(); + query.setProjectId(proId); + return surProjectAttendanceDataMapper.statsAttendanceDaysByProId(query); + } + + /** + * 统计人员出勤信息 + * @param proId + * @return + */ + public List> statsAttendanceViewByProId(Long proId){ + SurProjectAttendanceData query = new SurProjectAttendanceData(); + query.setProjectId(proId); + Map params = new HashMap<>(); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DAY_OF_MONTH, -1); + params.put("beginTime",DateUtil.format(calendar.getTime(),DateUtils.YYYY_MM_DD)); + calendar.add(Calendar.DAY_OF_MONTH, -6); + params.put("endTime",DateUtil.format(calendar.getTime(),DateUtils.YYYY_MM_DD)); + query.setParams(params); + return surProjectAttendanceDataMapper.statsAttendanceViewByProId(query); + } + public static void main(String[] args) { Date dateEnd=new DateTime(); Date dateStart=DateUtil.offsetDay(dateEnd,-7); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SurProjectAttendanceUserServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SurProjectAttendanceUserServiceImpl.java index 273560e3..af81dda9 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SurProjectAttendanceUserServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SurProjectAttendanceUserServiceImpl.java @@ -381,6 +381,15 @@ public class SurProjectAttendanceUserServiceImpl implements ISurProjectAttendanc return surProjectAttendanceUserMapper.getAttendanceAlert(prjId,year); } + /** + * 统计劳务人员信息 + * @param proId + * @return + */ + public List> statsSubDeptsUsersByProId(Long proId){ + return surProjectAttendanceUserMapper.statsSubDeptsUsersByProId(proId); + } + private Date findDate(List datas, SurProjectAttendanceUser u, String type) { for (SurProjectAttendanceUser user:datas) { if(user.getWorkerId().equals(u.getWorkerId()) && user.getName().equals(type)){ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/net/hasor/dataway/service/InterfaceUiFilter.java b/yanzhu-modules/yanzhu-manage/src/main/java/net/hasor/dataway/service/InterfaceUiFilter.java index f51c2176..6d2bbe67 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/net/hasor/dataway/service/InterfaceUiFilter.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/net/hasor/dataway/service/InterfaceUiFilter.java @@ -14,9 +14,8 @@ import java.util.concurrent.ConcurrentHashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.yanzhu.system.api.domain.SysDictData; +import com.yanzhu.api.domain.SysDictData; import net.hasor.dataway.config.DatawayUtils; -import net.hasor.utils.ResourcesUtils; import net.hasor.utils.StringUtils; import net.hasor.utils.io.FilenameUtils; import net.hasor.utils.io.IOUtils; diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysDictDataController.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysDictDataController.java index ffb52516..d660f0d6 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysDictDataController.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysDictDataController.java @@ -1,18 +1,6 @@ package com.yanzhu.system.controller; -import java.util.ArrayList; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.yanzhu.api.domain.SysDictData; import com.yanzhu.common.core.utils.StringUtils; import com.yanzhu.common.core.utils.poi.ExcelUtil; import com.yanzhu.common.core.web.controller.BaseController; @@ -22,9 +10,15 @@ import com.yanzhu.common.log.annotation.Log; import com.yanzhu.common.log.enums.BusinessType; import com.yanzhu.common.security.annotation.RequiresPermissions; import com.yanzhu.common.security.utils.SecurityUtils; -import com.yanzhu.system.api.domain.SysDictData; import com.yanzhu.system.service.ISysDictDataService; import com.yanzhu.system.service.ISysDictTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; /** * 数据字典信息 diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysDictDataService.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysDictDataService.java index 55896220..a8b04752 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysDictDataService.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysDictDataService.java @@ -1,7 +1,8 @@ package com.yanzhu.system.service; +import com.yanzhu.api.domain.SysDictData; + import java.util.List; -import com.yanzhu.system.api.domain.SysDictData; /** * 字典 业务层 diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysDictTypeService.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysDictTypeService.java index 2f662b67..055cb8fd 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysDictTypeService.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysDictTypeService.java @@ -1,9 +1,10 @@ package com.yanzhu.system.service; -import java.util.List; -import com.yanzhu.system.api.domain.SysDictData; +import com.yanzhu.api.domain.SysDictData; import com.yanzhu.system.api.domain.SysDictType; +import java.util.List; + /** * 字典 业务层 * diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictDataServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictDataServiceImpl.java index f2737e61..3b504a86 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictDataServiceImpl.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictDataServiceImpl.java @@ -1,13 +1,13 @@ package com.yanzhu.system.service.impl; -import java.util.List; - +import com.yanzhu.api.domain.SysDictData; import com.yanzhu.security.utils.DictUtils; import com.yanzhu.system.mapper.SysDictDataMapper; +import com.yanzhu.system.service.ISysDictDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.yanzhu.system.api.domain.SysDictData; -import com.yanzhu.system.service.ISysDictDataService; + +import java.util.List; /** * 字典 业务层处理 diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictTypeServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictTypeServiceImpl.java index 0f1b8d54..1f27c527 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictTypeServiceImpl.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDictTypeServiceImpl.java @@ -1,10 +1,10 @@ package com.yanzhu.system.service.impl; +import com.yanzhu.api.domain.SysDictData; import com.yanzhu.common.core.constant.UserConstants; import com.yanzhu.common.core.exception.ServiceException; import com.yanzhu.common.core.utils.StringUtils; import com.yanzhu.security.utils.DictUtils; -import com.yanzhu.system.api.domain.SysDictData; import com.yanzhu.system.api.domain.SysDictType; import com.yanzhu.system.mapper.SysDictDataMapper; import com.yanzhu.system.mapper.SysDictTypeMapper;