diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreController.java index 6d9222f..9172a95 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreController.java @@ -93,7 +93,7 @@ public class GovEnterpriseScoreController { @PostMapping(value = "/rankList") public Result> rankList(@RequestBody EnterpriseScoreVo enterpriseScoreVo) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); - if(null != enterpriseScoreVo.getEnterpriseType()) { + if (null != enterpriseScoreVo.getEnterpriseType()) { queryWrapper.eq(EnterpriseScore::getEnterpriseType, enterpriseScoreVo.getEnterpriseType()); } if (null != enterpriseScoreVo.getListType()) { @@ -116,10 +116,40 @@ public class GovEnterpriseScoreController { if (StringUtils.isNotBlank(enterpriseScoreVo.getEngineeringName())) { queryWrapper.like(EnterpriseScore::getEngineeringName, enterpriseScoreVo.getEngineeringName()); } + queryWrapper.isNotNull(EnterpriseScore::getScore); List list = enterpriseScoreService.pageList(queryWrapper); return Result.success(list); } + /** + * 排行榜企业数量查询 + * + * @param enterpriseScoreVo + * @return + */ + @OperLog(operModul = "企业对应工程得分管理", operType = "查询", operDesc = "排行榜企业数量查询") + @ApiOperation(value = " 排行榜企业数量查询", notes = "排行榜企业数量查询", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "enterpriseType", value = "企业类型", paramType = "body", dataType = "Integer"), + @ApiImplicitParam(name = "listType", value = "榜单类型(1:红榜;2:黑榜;)", paramType = "body", dataType = "Integer") + }) + @PostMapping(value = "/rankEnterpriseStat") + public Result rankEnterpriseStat(@ApiIgnore @RequestBody EnterpriseScoreVo enterpriseScoreVo) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + if (null != enterpriseScoreVo.getEnterpriseType()) { + queryWrapper.eq(EnterpriseScore::getEnterpriseType, enterpriseScoreVo.getEnterpriseType()); + } + if (null != enterpriseScoreVo.getListType()) { + if (enterpriseScoreVo.getListType() == 1) { + queryWrapper.between(EnterpriseScore::getScore, 60, 100); + } else { + queryWrapper.between(EnterpriseScore::getScore, 0, 60); + } + } + queryWrapper.isNotNull(EnterpriseScore::getScore); + return Result.success(enterpriseScoreService.enterpriseNum(queryWrapper)); + } + /** * 添加 @@ -165,6 +195,7 @@ public class GovEnterpriseScoreController { /** * 通过id删除 + * * @return */ @OperLog(operModul = "企业对应工程得分管理", operType = "删除", operDesc = "删除企业对应工程得分信息") @@ -189,6 +220,7 @@ public class GovEnterpriseScoreController { /** * 批量删除 + * * @return */ @OperLog(operModul = "企业对应工程得分管理", operType = "批量删除", operDesc = "批量删除企业对应工程得分信息") @@ -209,6 +241,7 @@ public class GovEnterpriseScoreController { /** * 通过id查询 + * * @return */ @OperLog(operModul = "企业对应工程得分管理", operType = "查询", operDesc = "通过id查询企业对应工程得分信息") diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreDetailController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreDetailController.java index a4a94e8..ba9cd0f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreDetailController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreDetailController.java @@ -23,8 +23,10 @@ import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -78,6 +80,27 @@ public class GovEnterpriseScoreDetailController { return Result.success(list); } + /** + * 列表查询 + * + * @param enterpriseScoreDetail + * @return + */ + @OperLog(operModul = "企业对应工程得分明细管理", operType = "列表查询", operDesc = "列表查询企业对应工程得分明细信息(按分项)") + @ApiOperation(value = " 列表查询企业对应工程得分明细信息(按分项)", notes = "列表查询企业对应工程得分明细信息(按分项)", httpMethod = "POST") + @ApiImplicitParam(name = "scoreId", value = "企业评分ID", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/listByItem") + public Result> listByItem(@RequestBody EnterpriseScoreDetail enterpriseScoreDetail) { + List item = enterpriseScoreDetailService.getItem(enterpriseScoreDetail.getScoreId()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(enterpriseScoreDetail); + List list = enterpriseScoreDetailService.list(queryWrapper); + Map resultMap = new HashMap<>(); + for (String im : item) { + resultMap.put(im, list.stream().filter(l -> l.getSubItem().equals(im)).collect(Collectors.toList())); + } + return Result.success(resultMap); + } + /** * 添加 diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreStandardController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreStandardController.java index 652dba4..c7ee8b5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreStandardController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreStandardController.java @@ -23,10 +23,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** @@ -82,6 +80,27 @@ public class GovEnterpriseScoreStandardController { return Result.success(list); } + /** + * 列表查询 + * + * @param enterpriseScoreStandard + * @return + */ + @OperLog(operModul = "企业类型评分标准管理", operType = "列表查询", operDesc = "列表查询企业类型评分标准信息(按分项)") + @ApiOperation(value = " 列表查询企业类型评分标准信息(按分项)", notes = "列表查询企业类型评分标准信息(按分项)", httpMethod = "POST") + @ApiImplicitParam(name = "enterpriseType", value = "企业类型", paramType = "body", dataType = "Integer") + @PostMapping(value = "/listByItem") + public Result> listByItem(@RequestBody EnterpriseScoreStandard enterpriseScoreStandard) { + List item = enterpriseScoreStandardService.getItem(enterpriseScoreStandard.getEnterpriseType()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(enterpriseScoreStandard); + List list = enterpriseScoreStandardService.list(queryWrapper); + Map resultMap = new HashMap<>(); + for (String im : item) { + resultMap.put(im, list.stream().filter(l -> l.getSubItem().equals(im)).collect(Collectors.toList())); + } + return Result.success(resultMap); + } + /** * 添加 diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java index 9086d60..15fbb7f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java @@ -155,25 +155,18 @@ public class BaseMenuServiceImpl extends ServiceImpl i String userId = MapUtils.getString(map, "userId"); userId = Aes.decrypt(userId, "ssologin66!@#$%^"); SystemUser systemUser = new SystemUser(); - Integer type = 0; - String sn = ""; + Long moduleId = 0L; if (userId.equals("myy")) { systemUser = systemUserMapper.selectOne(Wrappers.lambdaQuery().eq(SystemUser::getAccount, "hzxmgl")); - type = 2; - sn = systemUser.getSn(); + moduleId = 1670639811581595650L; } if (userId.equals("test")) { systemUser = systemUserMapper.selectOne(Wrappers.lambdaQuery().eq(SystemUser::getAccount, "hzxm")); - type = 4; - if (systemUser != null) { - sn = governmentService.getGovByUser(systemUser.getAccountType(), systemUser.getSn()).getGovernmentSn(); - } + moduleId = 1670603312504918018L; } if (systemUser == null) { throw new CustomException("用户不存在"); } - Long moduleId = moduleTemplateMapper.selectList(Wrappers.lambdaQuery().eq(ModuleTemplate::getGovernmentSn, sn) - .eq(ModuleTemplate::getModuleType, type)).get(0).getModuleId(); List baseMenus = baseMenuMapper.selectList(Wrappers.lambdaQuery().in(BaseMenu::getModuleId, moduleId) .eq(BaseMenu::getStatus, 1).orderByAsc(BaseMenu::getPriority)); return TreeUtil.formatHz(baseMenus); diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreDetailMapper.java b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreDetailMapper.java index d64aafe..131d5fe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreDetailMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreDetailMapper.java @@ -22,4 +22,6 @@ public interface EnterpriseScoreDetailMapper extends BaseMapper pageList(Page page, @Param(Constants.WRAPPER) Wrapper wrapper); List pageList(@Param(Constants.WRAPPER) Wrapper wrapper); + + List getItem(Long scoreId); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreMapper.java b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreMapper.java index 8863133..0c976ce 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreMapper.java @@ -23,4 +23,6 @@ public interface EnterpriseScoreMapper extends BaseMapper { Page pageList(Page page, @Param(Constants.WRAPPER)Wrapper wrapper); List pageList(@Param(Constants.WRAPPER)Wrapper wrapper); + + Integer enterpriseNum(Wrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreStandardMapper.java b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreStandardMapper.java index fa62d58..d038f17 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreStandardMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/EnterpriseScoreStandardMapper.java @@ -7,6 +7,8 @@ import com.zhgd.xmgl.modules.safety.entity.EnterpriseScoreStandard; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @Description: 企业类型评分标准 * @author： pengj @@ -17,4 +19,6 @@ import org.apache.ibatis.annotations.Param; public interface EnterpriseScoreStandardMapper extends BaseMapper { Integer score(@Param(Constants.WRAPPER) Wrapper wrapper); + + List getItem(Integer enterpriseType); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreDetailMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreDetailMapper.xml index 217b293..5cfc5b8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreDetailMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreDetailMapper.xml @@ -6,4 +6,8 @@ SELECT * FROM enterprise_score_detail ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreMapper.xml index 1cdf7df..6165f3b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreMapper.xml @@ -23,4 +23,8 @@ LEFT JOIN engineering e ON s.engineering_sn = e.engineering_sn) a ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreStandardMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreStandardMapper.xml index b84fa39..ec43e2d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreStandardMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreStandardMapper.xml @@ -6,4 +6,8 @@ SELECT IFNULL(SUM(standard_score), 0) FROM enterprise_score_standard ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreDetailService.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreDetailService.java index 05bd933..43c350a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreDetailService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreDetailService.java @@ -23,4 +23,6 @@ public interface IEnterpriseScoreDetailService extends IService enterpriseScoreDetails); boolean updateInfo(List enterpriseScoreDetails); + + List getItem(Long scoreId); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreService.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreService.java index 4c3a013..d8f0f0a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreService.java @@ -22,4 +22,6 @@ public interface IEnterpriseScoreService extends IService { List pageList(Wrapper queryWrapper); boolean saveInfo(EnterpriseScore enterpriseScore); + + Integer enterpriseNum(Wrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreStandardService.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreStandardService.java index 87ff772..991296f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreStandardService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreStandardService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.safety.entity.EnterpriseScoreStandard; +import java.util.List; + /** * @Description: 企业类型评分标准 * @author： pengj @@ -13,4 +15,6 @@ import com.zhgd.xmgl.modules.safety.entity.EnterpriseScoreStandard; public interface IEnterpriseScoreStandardService extends IService { Integer score(Wrapper wrapper); + + List getItem(Integer enterpriseType); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreDetailServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreDetailServiceImpl.java index 10d0261..2f90be9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreDetailServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreDetailServiceImpl.java @@ -49,6 +49,9 @@ public class EnterpriseScoreDetailServiceImpl extends ServiceImpl enterpriseScoreDetails) { + for (EnterpriseScoreDetail enterpriseScoreDetail : enterpriseScoreDetails) { + enterpriseScoreDetail.setScore(enterpriseScoreDetail.getStandardScore() - enterpriseScoreDetail.getDeductPoints()); + } boolean flag = this.saveBatch(enterpriseScoreDetails); if (flag) { Integer totalScore = enterpriseScoreDetails.stream().map(e -> e.getScore()).reduce(Integer::sum).orElse(0); @@ -62,6 +65,9 @@ public class EnterpriseScoreDetailServiceImpl extends ServiceImpl enterpriseScoreDetails) { + for (EnterpriseScoreDetail enterpriseScoreDetail : enterpriseScoreDetails) { + enterpriseScoreDetail.setScore(enterpriseScoreDetail.getStandardScore() - enterpriseScoreDetail.getDeductPoints()); + } boolean flag = this.updateBatchById(enterpriseScoreDetails); if (flag) { Integer totalScore = enterpriseScoreDetails.stream().map(e -> e.getScore()).reduce(Integer::sum).orElse(0); @@ -72,4 +78,9 @@ public class EnterpriseScoreDetailServiceImpl extends ServiceImpl getItem(Long scoreId) { + return baseMapper.getItem(scoreId); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java index 3720939..dd73793 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java @@ -84,4 +84,9 @@ public class EnterpriseScoreServiceImpl extends ServiceImpl queryWrapper) { + return baseMapper.enterpriseNum(queryWrapper); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreStandardServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreStandardServiceImpl.java index 35b07c9..08f2a88 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreStandardServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreStandardServiceImpl.java @@ -7,6 +7,8 @@ import com.zhgd.xmgl.modules.safety.mapper.EnterpriseScoreStandardMapper; import com.zhgd.xmgl.modules.safety.service.IEnterpriseScoreStandardService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description: 企业类型评分标准 * @author： pengj @@ -19,4 +21,9 @@ public class EnterpriseScoreStandardServiceImpl extends ServiceImpl wrapper) { return baseMapper.score(wrapper); } + + @Override + public List getItem(Integer enterpriseType) { + return baseMapper.getItem(enterpriseType); + } }