diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java index 262b77d..be2670b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java @@ -2,6 +2,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse; import com.casic.missiles.dto.cockpit.CockpitDeptOutputListResponse; import com.casic.missiles.dto.cockpit.LabAssetsResponse; import com.casic.missiles.dto.cockpit.OrderInfoResponse; @@ -46,6 +47,11 @@ /** * 工作分析,使用业务管理-业务看板中部门综合分析,缺少同比、环比、本月检完样品总数 */ + @ApiOperation("工作分析") + @GetMapping("/work/list") + public ReturnDTO workList() { + return ReturnUtil.success(measureTaskService.workList()); + } /** * 产值分析,使用业务管理-业务看板中部门产值分析改造成按部门分组统计,缺少同比、环比、总产值 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java index 262b77d..be2670b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java @@ -2,6 +2,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse; import com.casic.missiles.dto.cockpit.CockpitDeptOutputListResponse; import com.casic.missiles.dto.cockpit.LabAssetsResponse; import com.casic.missiles.dto.cockpit.OrderInfoResponse; @@ -46,6 +47,11 @@ /** * 工作分析,使用业务管理-业务看板中部门综合分析,缺少同比、环比、本月检完样品总数 */ + @ApiOperation("工作分析") + @GetMapping("/work/list") + public ReturnDTO workList() { + return ReturnUtil.success(measureTaskService.workList()); + } /** * 产值分析,使用业务管理-业务看板中部门产值分析改造成按部门分组统计,缺少同比、环比、总产值 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 98079db..612894e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -1,7 +1,9 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.system.SignDetailResponse; +import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.model.system.SystemSign; import org.apache.ibatis.annotations.Param; @@ -22,4 +24,8 @@ SignDetailResponse selectSignDetailById(Long id); List selectUsableSignList(@Param("userId") Long userId); + + Page selectSignListPage(Page page, @Param("request") SignListRequest request); + + List selectSignList(@Param("request") SignListRequest request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java index 262b77d..be2670b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java @@ -2,6 +2,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse; import com.casic.missiles.dto.cockpit.CockpitDeptOutputListResponse; import com.casic.missiles.dto.cockpit.LabAssetsResponse; import com.casic.missiles.dto.cockpit.OrderInfoResponse; @@ -46,6 +47,11 @@ /** * 工作分析,使用业务管理-业务看板中部门综合分析,缺少同比、环比、本月检完样品总数 */ + @ApiOperation("工作分析") + @GetMapping("/work/list") + public ReturnDTO workList() { + return ReturnUtil.success(measureTaskService.workList()); + } /** * 产值分析,使用业务管理-业务看板中部门产值分析改造成按部门分组统计,缺少同比、环比、总产值 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 98079db..612894e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -1,7 +1,9 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.system.SignDetailResponse; +import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.model.system.SystemSign; import org.apache.ibatis.annotations.Param; @@ -22,4 +24,8 @@ SignDetailResponse selectSignDetailById(Long id); List selectUsableSignList(@Param("userId") Long userId); + + Page selectSignListPage(Page page, @Param("request") SignListRequest request); + + List selectSignList(@Param("request") SignListRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index ae078b7..dd65fb9 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -62,4 +62,64 @@ JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id WHERE ssur.user_id = #{userId} AND ss.is_del = 0 + + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java index 262b77d..be2670b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java @@ -2,6 +2,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse; import com.casic.missiles.dto.cockpit.CockpitDeptOutputListResponse; import com.casic.missiles.dto.cockpit.LabAssetsResponse; import com.casic.missiles.dto.cockpit.OrderInfoResponse; @@ -46,6 +47,11 @@ /** * 工作分析,使用业务管理-业务看板中部门综合分析,缺少同比、环比、本月检完样品总数 */ + @ApiOperation("工作分析") + @GetMapping("/work/list") + public ReturnDTO workList() { + return ReturnUtil.success(measureTaskService.workList()); + } /** * 产值分析,使用业务管理-业务看板中部门产值分析改造成按部门分组统计,缺少同比、环比、总产值 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 98079db..612894e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -1,7 +1,9 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.system.SignDetailResponse; +import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.model.system.SystemSign; import org.apache.ibatis.annotations.Param; @@ -22,4 +24,8 @@ SignDetailResponse selectSignDetailById(Long id); List selectUsableSignList(@Param("userId") Long userId); + + Page selectSignListPage(Page page, @Param("request") SignListRequest request); + + List selectSignList(@Param("request") SignListRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index ae078b7..dd65fb9 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -62,4 +62,64 @@ JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id WHERE ssur.user_id = #{userId} AND ss.is_del = 0 + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java index 244e431..ce4b96e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -129,4 +129,7 @@ @TableField(exist = false) private List userIdList; + @ApiModelProperty(hidden = true) + private String deptName; + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java index 262b77d..be2670b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java @@ -2,6 +2,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse; import com.casic.missiles.dto.cockpit.CockpitDeptOutputListResponse; import com.casic.missiles.dto.cockpit.LabAssetsResponse; import com.casic.missiles.dto.cockpit.OrderInfoResponse; @@ -46,6 +47,11 @@ /** * 工作分析,使用业务管理-业务看板中部门综合分析,缺少同比、环比、本月检完样品总数 */ + @ApiOperation("工作分析") + @GetMapping("/work/list") + public ReturnDTO workList() { + return ReturnUtil.success(measureTaskService.workList()); + } /** * 产值分析,使用业务管理-业务看板中部门产值分析改造成按部门分组统计,缺少同比、环比、总产值 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 98079db..612894e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -1,7 +1,9 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.system.SignDetailResponse; +import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.model.system.SystemSign; import org.apache.ibatis.annotations.Param; @@ -22,4 +24,8 @@ SignDetailResponse selectSignDetailById(Long id); List selectUsableSignList(@Param("userId") Long userId); + + Page selectSignListPage(Page page, @Param("request") SignListRequest request); + + List selectSignList(@Param("request") SignListRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index ae078b7..dd65fb9 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -62,4 +62,64 @@ JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id WHERE ssur.user_id = #{userId} AND ss.is_del = 0 + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java index 244e431..ce4b96e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -129,4 +129,7 @@ @TableField(exist = false) private List userIdList; + @ApiModelProperty(hidden = true) + private String deptName; + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/IMeasureTaskServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/IMeasureTaskServiceImpl.java index 756c9da..adc7281 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/IMeasureTaskServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/IMeasureTaskServiceImpl.java @@ -2,9 +2,7 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.dto.business.board.BoardBaseRequest; -import com.casic.missiles.dto.business.board.BoardDeptOutputListResponse; -import com.casic.missiles.dto.business.board.BoardDeptOutputResponse; +import com.casic.missiles.dto.business.board.*; import com.casic.missiles.dto.cockpit.CockpitDeptOutputListResponse; import com.casic.missiles.dto.cockpit.LabAssetsResponse; import com.casic.missiles.dto.cockpit.OrderInfoResponse; @@ -20,6 +18,7 @@ import com.casic.missiles.service.business.IBusinessBoardService; import com.casic.missiles.service.cockpit.IMeasureTaskService; import com.casic.missiles.service.finance.IFinanceBusinessSettlementInfoService; +import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,6 +27,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * @Description: @@ -98,7 +98,19 @@ if(CollectionUtils.isEmpty(list)){ return new ArrayList<>(); } - return null; + List outputDTOs = ConvertUtils.sourceToTarget(list, CockpitDeptOutputListResponse.class); + List resultList = outputDTOs.stream().collect(Collectors.toMap(CockpitDeptOutputListResponse::getDeptId, a -> a, (o1, o2) -> { + o1.setCertificates(o1.getCertificates() + o2.getCertificates()); + o1.setSamples(o1.getSamples() + o2.getSamples()); + o1.setOutPut(o1.getOutPut() + o2.getOutPut()); + return o1; + })).values().stream().collect(Collectors.toList()); + return resultList; + } + @Override + public List workList() { + BoardDeptComprehensiveRequest request = new BoardDeptComprehensiveRequest(); + return boardService.deptComprehensive(request); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java index 262b77d..be2670b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java @@ -2,6 +2,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse; import com.casic.missiles.dto.cockpit.CockpitDeptOutputListResponse; import com.casic.missiles.dto.cockpit.LabAssetsResponse; import com.casic.missiles.dto.cockpit.OrderInfoResponse; @@ -46,6 +47,11 @@ /** * 工作分析,使用业务管理-业务看板中部门综合分析,缺少同比、环比、本月检完样品总数 */ + @ApiOperation("工作分析") + @GetMapping("/work/list") + public ReturnDTO workList() { + return ReturnUtil.success(measureTaskService.workList()); + } /** * 产值分析,使用业务管理-业务看板中部门产值分析改造成按部门分组统计,缺少同比、环比、总产值 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 98079db..612894e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -1,7 +1,9 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.system.SignDetailResponse; +import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.model.system.SystemSign; import org.apache.ibatis.annotations.Param; @@ -22,4 +24,8 @@ SignDetailResponse selectSignDetailById(Long id); List selectUsableSignList(@Param("userId") Long userId); + + Page selectSignListPage(Page page, @Param("request") SignListRequest request); + + List selectSignList(@Param("request") SignListRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index ae078b7..dd65fb9 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -62,4 +62,64 @@ JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id WHERE ssur.user_id = #{userId} AND ss.is_del = 0 + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java index 244e431..ce4b96e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -129,4 +129,7 @@ @TableField(exist = false) private List userIdList; + @ApiModelProperty(hidden = true) + private String deptName; + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/IMeasureTaskServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/IMeasureTaskServiceImpl.java index 756c9da..adc7281 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/IMeasureTaskServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/IMeasureTaskServiceImpl.java @@ -2,9 +2,7 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.dto.business.board.BoardBaseRequest; -import com.casic.missiles.dto.business.board.BoardDeptOutputListResponse; -import com.casic.missiles.dto.business.board.BoardDeptOutputResponse; +import com.casic.missiles.dto.business.board.*; import com.casic.missiles.dto.cockpit.CockpitDeptOutputListResponse; import com.casic.missiles.dto.cockpit.LabAssetsResponse; import com.casic.missiles.dto.cockpit.OrderInfoResponse; @@ -20,6 +18,7 @@ import com.casic.missiles.service.business.IBusinessBoardService; import com.casic.missiles.service.cockpit.IMeasureTaskService; import com.casic.missiles.service.finance.IFinanceBusinessSettlementInfoService; +import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,6 +27,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * @Description: @@ -98,7 +98,19 @@ if(CollectionUtils.isEmpty(list)){ return new ArrayList<>(); } - return null; + List outputDTOs = ConvertUtils.sourceToTarget(list, CockpitDeptOutputListResponse.class); + List resultList = outputDTOs.stream().collect(Collectors.toMap(CockpitDeptOutputListResponse::getDeptId, a -> a, (o1, o2) -> { + o1.setCertificates(o1.getCertificates() + o2.getCertificates()); + o1.setSamples(o1.getSamples() + o2.getSamples()); + o1.setOutPut(o1.getOutPut() + o2.getOutPut()); + return o1; + })).values().stream().collect(Collectors.toList()); + return resultList; + } + @Override + public List workList() { + BoardDeptComprehensiveRequest request = new BoardDeptComprehensiveRequest(); + return boardService.deptComprehensive(request); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index 8260271..df6197e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.system; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.model.auth.AuthUser; @@ -24,7 +23,6 @@ import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -52,15 +50,17 @@ @Override public Page listPage(Page page, SignListRequest request) { - QueryWrapper wrapper = getWrapper(request); - Page signPage = signMapper.selectPage(page, wrapper); + Page signPage = signMapper.selectSignListPage(page, request); +// QueryWrapper wrapper = getWrapper(request); +// Page signPage = signMapper.selectPage(page, wrapper); return signPage; } @Override public List list(SignListRequest request) { - QueryWrapper wrapper = getWrapper(request); - return signMapper.selectList(wrapper); +// QueryWrapper wrapper = getWrapper(request); + List signList = signMapper.selectSignList(request); + return signList; } @Override @@ -150,19 +150,19 @@ return bsRelations; } - private QueryWrapper getWrapper(SignListRequest request) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("sign_type", request.getSignType()); - wrapper.like(StringUtils.isNotBlank(request.getSignNo()), "sign_no", request.getSignNo()); - wrapper.like(StringUtils.isNotBlank(request.getSignName()), "sign_name", request.getSignName()); - wrapper.like(StringUtils.isNotBlank(request.getSignDirector()), "sign_director", request.getSignDirector()); - wrapper.eq(!Objects.isNull(request.getSignUserId()), "sign_user_id", request.getSignUserId()); - wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); - wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); - wrapper.eq("is_del", 0); - wrapper.orderByDesc("create_time"); - return wrapper; - } +// private QueryWrapper getWrapper(SignListRequest request) { +// QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.eq("sign_type", request.getSignType()); +// wrapper.like(StringUtils.isNotBlank(request.getSignNo()), "sign_no", request.getSignNo()); +// wrapper.like(StringUtils.isNotBlank(request.getSignName()), "sign_name", request.getSignName()); +// wrapper.like(StringUtils.isNotBlank(request.getSignDirector()), "sign_director", request.getSignDirector()); +// wrapper.eq(!Objects.isNull(request.getSignUserId()), "sign_user_id", request.getSignUserId()); +// wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()), +// "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); +// wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()), +// "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); +// wrapper.eq("is_del", 0); +// wrapper.orderByDesc("create_time"); +// return wrapper; +// } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java index 262b77d..be2670b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/cockpit/MeasureTaskController.java @@ -2,6 +2,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse; import com.casic.missiles.dto.cockpit.CockpitDeptOutputListResponse; import com.casic.missiles.dto.cockpit.LabAssetsResponse; import com.casic.missiles.dto.cockpit.OrderInfoResponse; @@ -46,6 +47,11 @@ /** * 工作分析,使用业务管理-业务看板中部门综合分析,缺少同比、环比、本月检完样品总数 */ + @ApiOperation("工作分析") + @GetMapping("/work/list") + public ReturnDTO workList() { + return ReturnUtil.success(measureTaskService.workList()); + } /** * 产值分析,使用业务管理-业务看板中部门产值分析改造成按部门分组统计,缺少同比、环比、总产值 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java index 98079db..612894e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java @@ -1,7 +1,9 @@ package com.casic.missiles.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.system.SignDetailResponse; +import com.casic.missiles.dto.system.SignListRequest; import com.casic.missiles.model.system.SystemSign; import org.apache.ibatis.annotations.Param; @@ -22,4 +24,8 @@ SignDetailResponse selectSignDetailById(Long id); List selectUsableSignList(@Param("userId") Long userId); + + Page selectSignListPage(Page page, @Param("request") SignListRequest request); + + List selectSignList(@Param("request") SignListRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml index ae078b7..dd65fb9 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml @@ -62,4 +62,64 @@ JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id WHERE ssur.user_id = #{userId} AND ss.is_del = 0 + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java index 244e431..ce4b96e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java @@ -129,4 +129,7 @@ @TableField(exist = false) private List userIdList; + @ApiModelProperty(hidden = true) + private String deptName; + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/IMeasureTaskServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/IMeasureTaskServiceImpl.java index 756c9da..adc7281 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/IMeasureTaskServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/IMeasureTaskServiceImpl.java @@ -2,9 +2,7 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.casic.missiles.dto.business.board.BoardBaseRequest; -import com.casic.missiles.dto.business.board.BoardDeptOutputListResponse; -import com.casic.missiles.dto.business.board.BoardDeptOutputResponse; +import com.casic.missiles.dto.business.board.*; import com.casic.missiles.dto.cockpit.CockpitDeptOutputListResponse; import com.casic.missiles.dto.cockpit.LabAssetsResponse; import com.casic.missiles.dto.cockpit.OrderInfoResponse; @@ -20,6 +18,7 @@ import com.casic.missiles.service.business.IBusinessBoardService; import com.casic.missiles.service.cockpit.IMeasureTaskService; import com.casic.missiles.service.finance.IFinanceBusinessSettlementInfoService; +import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,6 +27,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * @Description: @@ -98,7 +98,19 @@ if(CollectionUtils.isEmpty(list)){ return new ArrayList<>(); } - return null; + List outputDTOs = ConvertUtils.sourceToTarget(list, CockpitDeptOutputListResponse.class); + List resultList = outputDTOs.stream().collect(Collectors.toMap(CockpitDeptOutputListResponse::getDeptId, a -> a, (o1, o2) -> { + o1.setCertificates(o1.getCertificates() + o2.getCertificates()); + o1.setSamples(o1.getSamples() + o2.getSamples()); + o1.setOutPut(o1.getOutPut() + o2.getOutPut()); + return o1; + })).values().stream().collect(Collectors.toList()); + return resultList; + } + @Override + public List workList() { + BoardDeptComprehensiveRequest request = new BoardDeptComprehensiveRequest(); + return boardService.deptComprehensive(request); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index 8260271..df6197e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.system; import cn.hutool.core.lang.Assert; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.model.auth.AuthUser; @@ -24,7 +23,6 @@ import com.casic.missiles.service.system.ISystemSignUserRelationService; import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -52,15 +50,17 @@ @Override public Page listPage(Page page, SignListRequest request) { - QueryWrapper wrapper = getWrapper(request); - Page signPage = signMapper.selectPage(page, wrapper); + Page signPage = signMapper.selectSignListPage(page, request); +// QueryWrapper wrapper = getWrapper(request); +// Page signPage = signMapper.selectPage(page, wrapper); return signPage; } @Override public List list(SignListRequest request) { - QueryWrapper wrapper = getWrapper(request); - return signMapper.selectList(wrapper); +// QueryWrapper wrapper = getWrapper(request); + List signList = signMapper.selectSignList(request); + return signList; } @Override @@ -150,19 +150,19 @@ return bsRelations; } - private QueryWrapper getWrapper(SignListRequest request) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("sign_type", request.getSignType()); - wrapper.like(StringUtils.isNotBlank(request.getSignNo()), "sign_no", request.getSignNo()); - wrapper.like(StringUtils.isNotBlank(request.getSignName()), "sign_name", request.getSignName()); - wrapper.like(StringUtils.isNotBlank(request.getSignDirector()), "sign_director", request.getSignDirector()); - wrapper.eq(!Objects.isNull(request.getSignUserId()), "sign_user_id", request.getSignUserId()); - wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); - wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); - wrapper.eq("is_del", 0); - wrapper.orderByDesc("create_time"); - return wrapper; - } +// private QueryWrapper getWrapper(SignListRequest request) { +// QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.eq("sign_type", request.getSignType()); +// wrapper.like(StringUtils.isNotBlank(request.getSignNo()), "sign_no", request.getSignNo()); +// wrapper.like(StringUtils.isNotBlank(request.getSignName()), "sign_name", request.getSignName()); +// wrapper.like(StringUtils.isNotBlank(request.getSignDirector()), "sign_director", request.getSignDirector()); +// wrapper.eq(!Objects.isNull(request.getSignUserId()), "sign_user_id", request.getSignUserId()); +// wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()), +// "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); +// wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()), +// "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); +// wrapper.eq("is_del", 0); +// wrapper.orderByDesc("create_time"); +// return wrapper; +// } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/cockpit/IMeasureTaskService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/cockpit/IMeasureTaskService.java index cfe07b5..ced032b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/cockpit/IMeasureTaskService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/cockpit/IMeasureTaskService.java @@ -1,5 +1,6 @@ package com.casic.missiles.service.cockpit; +import com.casic.missiles.dto.business.board.BoardDeptComprehensiveResponse; import com.casic.missiles.dto.cockpit.CockpitDeptOutputListResponse; import com.casic.missiles.dto.cockpit.LabAssetsResponse; import com.casic.missiles.dto.cockpit.OrderInfoResponse; @@ -17,4 +18,6 @@ List labAssets(); List deptOutputList(); + + List workList(); }