ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 法规清单接口增加分解单来源

Browse Source
This commit is contained in:
lijiarao
2023-12-12 16:17:51 +08:00
parent 999aa78eb0
commit 8b0e934161
5 changed files with 97 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessLink.java
+3 -1
View File
@@ -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;
laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java
+5 -32
View File
@@ -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<LawsAssess, ILawsAssess
}
lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
IPage<LawsAssess> pageList = lawsAssessService.queryPage(lawsAssess, pageNo, pageSize, req);
this.assignment(pageList.getRecords());
lawsAssessService.assignment(pageList.getRecords());
return Result.OK(pageList);
}
private void assignment(List<LawsAssess> 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<LawsAssess, ILawsAssess
if (dos.isEmpty()) {
throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
}
this.assignment(dos);
lawsAssessService.assignment(dos);
String title = "法规清单";
return super.exportListXls(dos, LawsAssess.class, title);
}
laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java
+6
View File
@@ -2,6 +2,8 @@ package com.jero.modules.projectLibrary.entity;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -101,6 +103,10 @@ public class LawsAssess implements Serializable {
@ApiModelProperty(value = "评估结果")
private String evaluationResults;
@TableField(exist = false)
@ApiModelProperty(value = "分解单来源")
private List<Map<String, String>> decompositionOrderSource;
@TableField(exist = false)
@Excel(name = "责任部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id", exportConvert = true)
@ApiModelProperty(value = "责任部门")
laws-modules/src/main/java/com/jero/modules/projectLibrary/service/ILawsAssessService.java
+2
View File
@@ -75,4 +75,6 @@ public interface ILawsAssessService extends IService<LawsAssess> {
* 查询该项目下所有删除的标准
*/
List<LawsAssess> getAllByProjectIdDeleted(String projectId);
void assignment(List<LawsAssess> records);
}
laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java
+81 -5
View File
@@ -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<LawsAssessMapper, LawsAssess> 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<LawsAssessMapper, LawsAss
wrapper.eq(LawsAssess::getDelFlag, CommonConstant.DEL_FLAG_1.toString());
return list(wrapper);
}
@Override
public void assignment(List<LawsAssess> 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<SarFileSplitInfoEO> queryWrapper = new LambdaQueryWrapper<>();
// 标准id
queryWrapper.eq(SarFileSplitInfoEO::getStandardId, standardId);
// 拆分表发布标识
queryWrapper.isNotNull(SarFileSplitInfoEO::getPublishBeforeId);
// 文件字段标识
queryWrapper.isNotNull(SarFileSplitInfoEO::getFileType);
List<SarFileSplitInfoEO> sarFileSplitInfoEOList = sarFileSplitInfoService.list(queryWrapper);
Map<String, String> flagMap = new HashMap<>();
List<DictModel> dictModels = sysBaseAPI.queryDictItemsByCode("decomposition_order_source");
List<Map<String, String>>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<String, String> map = new HashMap<>();
map.put("text",text);
map.put("value",value);
map.put("sarFileSplitInfoId",flagMap.get(value));
mapList.add(map);
}
assess.setDecompositionOrderSource(mapList);
}
}
}