From 8b0e9341617975053dd7dbfa5ffeef5e5a252017 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 12 Dec 2023 16:17:51 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=88=86=E8=A7=A3=E5=8D=95?= =?UTF-8?q?=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProcessProjectAssessLink.java | 4 +- .../controller/LawsAssessController.java | 37 ++------ .../projectLibrary/entity/LawsAssess.java | 6 ++ .../service/ILawsAssessService.java | 2 + .../service/impl/LawsAssessServiceImpl.java | 86 +++++++++++++++++-- 5 files changed, 97 insertions(+), 38 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessLink.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessLink.java index 8b579a90..54a203cf 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessLink.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessLink.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; @@ -83,7 +84,8 @@ public class ProcessProjectAssessLink { * 分解单来源 */ @ApiModelProperty(value = "分解单来源") - private Integer decompositionOrderSource; + @Dict(dicCode = "decomposition_order_source") + private String decompositionOrderSource; diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java index a4604827..f43c579c 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java @@ -5,6 +5,7 @@ import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; @@ -20,6 +21,7 @@ import com.jero.modules.projectLibrary.service.ILawsAssessService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.projectLibrary.vo.LawsAssessAddVo; +import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.system.vo.IdMapBody; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; @@ -70,39 +72,10 @@ public class LawsAssessController extends JeroController pageList = lawsAssessService.queryPage(lawsAssess, pageNo, pageSize, req); - this.assignment(pageList.getRecords()); + lawsAssessService.assignment(pageList.getRecords()); return Result.OK(pageList); } - private void assignment(List records) { - for (LawsAssess assess : records) { - String standardId = assess.getStandardId(); - String source = assess.getSource(); - if (CommonConstant.STANDARD_SOURCE_1.equals(source)){ - //查询国内标准数据，赋值给collection - LawsDomesticStandard standard = lawsDomesticStandardService.queryById(standardId); - assess.setStandardEnglishName(standard.getStandardEnglishName()); - assess.setStandardState(standard.getStandardState()); - assess.setApplicableVehicle(standard.getApplicableVehicle()); - assess.setOnTheProductionDate(standard.getOnTheProductionDate()); - assess.setNewModelImplementationDate(standard.getNewModelImplementationDate()); - //TODO "这里要用额外方法查询" - assess.setEvaluationResults("-"); - assess.setResponsibleDepartment(standard.getResponsibleDepartment()); - } - if (CommonConstant.STANDARD_SOURCE_2.equals(source)){ - //查询海外标准数据，赋值给collection - LawsOverseasStandard standard = lawsOverseasStandardService.queryById(standardId); - assess.setStandardEnglishName(standard.getStandardEnglishName()); - assess.setStandardState(standard.getStandardState()); - assess.setApplicableVehicle(standard.getApplicableVehicle()); - assess.setOnTheProductionDate(standard.getOnTheProductionDate()); - assess.setNewModelImplementationDate(standard.getNewModelImplementationDate()); - //TODO "这里要用额外方法查询" - assess.setEvaluationResults("-"); - assess.setResponsibleDepartment(standard.getResponsibleDepartment()); - } - } - } + /** * 调取 @@ -266,7 +239,7 @@ public class LawsAssessController extends JeroController> decompositionOrderSource; + @TableField(exist = false) @Excel(name = "责任部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id", exportConvert = true) @ApiModelProperty(value = "责任部门") diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsAssessService.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsAssessService.java index e6fba791..caf5c708 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsAssessService.java @@ -75,4 +75,6 @@ public interface ILawsAssessService extends IService { * 查询该项目下所有删除的标准 */ List getAllByProjectIdDeleted(String projectId); + + void assignment(List records); } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java index c2b4a4a3..58f07d91 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java @@ -3,19 +3,29 @@ package com.jero.modules.projectLibrary.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.constant.CommonConstant; +import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.system.vo.DictModel; +import com.jero.modules.laws.standard.entity.LawsDomesticStandard; +import com.jero.modules.laws.standard.entity.LawsOverseasStandard; +import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; +import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; import com.jero.modules.projectLibrary.entity.LawsAssess; import com.jero.modules.projectLibrary.mapper.LawsAssessMapper; import com.jero.modules.projectLibrary.service.ILawsAssessService; +import com.jero.modules.split.entity.SarFileSplitInfoEO; +import com.jero.modules.split.service.ISarFileSplitInfoService; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; -import java.util.ArrayList; -import java.util.List; -import java.util.Date; +import java.util.*; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.query.QueryGenerator; + +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -30,8 +40,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @Service @Transactional(rollbackFor = JeroBootException.class) public class LawsAssessServiceImpl extends ServiceImpl implements ILawsAssessService { - - + @Resource + private ISarFileSplitInfoService sarFileSplitInfoService; + //国内标准 + @Autowired + private ILawsDomesticStandardService lawsDomesticStandardService; + //海外标准 + @Autowired + private ILawsOverseasStandardService lawsOverseasStandardService; + @Resource + private ISysBaseAPI sysBaseAPI; /** * 分页查询 * @@ -133,4 +151,62 @@ public class LawsAssessServiceImpl extends ServiceImpl records) { + for (LawsAssess assess : records) { + String standardId = assess.getStandardId(); + String source = assess.getSource(); + if (CommonConstant.STANDARD_SOURCE_1.equals(source)){ + //查询国内标准数据，赋值给collection + LawsDomesticStandard standard = lawsDomesticStandardService.queryById(standardId); + assess.setStandardEnglishName(standard.getStandardEnglishName()); + assess.setStandardState(standard.getStandardState()); + assess.setApplicableVehicle(standard.getApplicableVehicle()); + assess.setOnTheProductionDate(standard.getOnTheProductionDate()); + assess.setNewModelImplementationDate(standard.getNewModelImplementationDate()); + //TODO "这里要用额外方法查询" + assess.setEvaluationResults("-"); + assess.setResponsibleDepartment(standard.getResponsibleDepartment()); + + } + if (CommonConstant.STANDARD_SOURCE_2.equals(source)){ + //查询海外标准数据，赋值给collection + LawsOverseasStandard standard = lawsOverseasStandardService.queryById(standardId); + assess.setStandardEnglishName(standard.getStandardEnglishName()); + assess.setStandardState(standard.getStandardState()); + assess.setApplicableVehicle(standard.getApplicableVehicle()); + assess.setOnTheProductionDate(standard.getOnTheProductionDate()); + assess.setNewModelImplementationDate(standard.getNewModelImplementationDate()); + //TODO "这里要用额外方法查询" + assess.setEvaluationResults("-"); + assess.setResponsibleDepartment(standard.getResponsibleDepartment()); + } + + // 查询标准拆分表 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + // 标准id + queryWrapper.eq(SarFileSplitInfoEO::getStandardId, standardId); + // 拆分表发布标识 + queryWrapper.isNotNull(SarFileSplitInfoEO::getPublishBeforeId); + // 文件字段标识 + queryWrapper.isNotNull(SarFileSplitInfoEO::getFileType); + List sarFileSplitInfoEOList = sarFileSplitInfoService.list(queryWrapper); + + Map flagMap = new HashMap<>(); + List dictModels = sysBaseAPI.queryDictItemsByCode("decomposition_order_source"); + List>mapList = new ArrayList<>(); + sarFileSplitInfoEOList.forEach(e -> flagMap.put(e.getFileType(), e.getId())); + for (DictModel dictModel : dictModels) { + String text = dictModel.getText(); + String value = dictModel.getValue(); + Map map = new HashMap<>(); + map.put("text",text); + map.put("value",value); + map.put("sarFileSplitInfoId",flagMap.get(value)); + mapList.add(map); + } + assess.setDecompositionOrderSource(mapList); + } + } }