QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善导入通知

Browse Source
This commit is contained in:
梁琦涛
2024-10-11 15:32:12 +08:00
parent 865a3b9cc0
commit e31591c4c6
14 changed files with 103 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/ni/entity/ProcessNewStandardImport.java
+2 -1
View File
@@ -126,8 +126,9 @@ public class ProcessNewStandardImport implements Serializable {
/**通知发布日期*/
@ApiModelProperty(value = "通知发布日期")
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@Excel(name = "通知发布日期", width = 15,format = "yyyy-MM-dd")
private String publishDate;
private Date publishDate;
/**
* 流程实例id
*/
laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml
+1 -1
View File
@@ -19,7 +19,7 @@
from process_standard_import p
left join laws_domestic_standard p1 on p.standard_id = p1.id and p1.del_flag = 0
left join process_all p2 on p2.process_instance_id = p.process_instance_id
left join sys_user s1 on s1.username = p1.create_by and s1.del_flag = 0
left join sys_user s1 on s1.username = p.create_by and s1.del_flag = 0
${ew.customSqlSegment}
</select>
</mapper>
laws-modules/src/main/java/com/jero/modules/laws/lead/vo/ProcessNewStandardImportExcel.java
-159
View File
@@ -1,159 +0,0 @@
package com.jero.modules.laws.lead.vo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
*
* @TableName process_standard_compliance_check
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="process_standard_import对象", description="新法规导入流程-主表")
public class ProcessNewStandardImportExcel implements Serializable {
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**
* 标准ID
*/
@ApiModelProperty(value = "标准ID")
private String standardId;
/**标准编号*/
@ApiModelProperty(value = "标准编号")
@TableField(exist = false)
@Excel(name = "标准编号", width = 15)
private String standardNumber;
/**标准名称*/
@ApiModelProperty(value = "标准名称")
@TableField(exist = false)
@Excel(name = "标准名称", width = 15)
private String standardName;
/**代替标准编号*/
@ApiModelProperty(value = "代替标准编号")
@TableField(exist = false)
@Excel(name = "代替标准编号", width = 15)
private String substituteStandardNumber;
/**适用市场*/
@ApiModelProperty(value = "标准类型")
@Dict(dicCode = "standard_type")
@Excel(name = "标准类型", width = 15,dicCode = "standard_type")
private String standardCategory;
/**主管部门*/
@ApiModelProperty(value = "主管部门")
@Excel(name = "主管部门", width = 15,dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private String competentDepartment;
/**主控部门*/
@ApiModelProperty(value = "主控部门")
@Excel(name = "主控部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private String mainControlDepartment;
/**主控部门专业模块*/
@ApiModelProperty(value = "主控部门专业模块")
@Excel(name = "主控部门专业模块", width = 15, dicCode = "professional_module")
@Dict(dicCode = "professional_module")
private String mainDeptProfMode;
/**所处阶段*/
@ApiModelProperty(value = "所处阶段")
@Excel(name = "所处阶段", width = 15,dicCode = "stage_we_are_in")
@Dict(dicCode = "stage_we_are_in")
private String eventPhase;
/**新认证车实施日期*/
@ApiModelProperty(value = "新认证车实施日期")
@TableField(exist = false)
@Excel(name = "新认证车实施日期", width = 15,format = "yyyy-MM-dd")
private String newAuthImplDate;
/**新生产车实施日期*/
@ApiModelProperty(value = "新生产车实施日期")
@TableField(exist = false)
@Excel(name = "新生产车实施日期", width = 15,format = "yyyy-MM-dd")
private String newProductImplDate;
/**注册日期*/
@ApiModelProperty(value = "注册日期")
@TableField(exist = false)
@Excel(name = "注册日期", width = 15,format = "yyyy-MM-dd")
private String registrationDate;
/**适用市场*/
@ApiModelProperty(value = "适用市场")
@Excel(name = "适用市场", width = 15,dicCode = "market_state")
@Dict(dicCode = "market_state")
private String applicableMarket;
/**法规要求简要描述*/
@ApiModelProperty(value = "法规要求简要描述")
@Excel(name = "法规要求简要描述", width = 15)
private String requireBriefDesc;
/**主送部门*/
@ApiModelProperty(value = "主送部门")
@Excel(name = "主送部门", width = 15,dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private String masterSendDepartment;
/**抄送部门*/
@ApiModelProperty(value = "抄送部门")
@Excel(name = "抄送部门", width = 15,dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private String copySendDepartment;
/**发送人员*/
@ApiModelProperty(value = "发送人员")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
@Excel(name = "法规要求简要描述", width = 15,dictTable = "sys_user", dicText = "realname", dicCode = "id")
private String copyUser;
/**通知发起人*/
@ApiModelProperty(value = "通知发起人")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Excel(name = "法规要求简要描述", width = 15,dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String createBy;
/**实施日期*/
@ApiModelProperty(value = "实施日期")
@TableField(exist = false)
private String implementationDate;
/**通知发布日期*/
@ApiModelProperty(value = "通知发布日期")
@TableField(exist = false)
@Excel(name = "通知发布日期", width = 15,format = "yyyy-MM-dd")
private String publishDate;
/**
* 流程实例id
*/
@ApiModelProperty(value = "流程实例id")
private String processInstanceId;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
/**
* 0表示未删除,1表示删除
*/
@ApiModelProperty(value = "0表示未删除,1表示删除")
@TableLogic
private Integer delFlag;
}
laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartPmmPartitionInfoController.java
-1
View File
@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@Api(tags = "业务支持-关键零部件名称")
laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartRelevanceController.java
-1
View File
@@ -15,7 +15,6 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartPmmPartitionInfo.java
-2
View File
@@ -3,14 +3,12 @@ package com.jero.modules.laws.part.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict;
import com.jero.modules.laws.marketStandard.entity.LawsMarketStandardDetail;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 关键零部件中间表
laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartProductionFactory.java
+8 -10
View File
@@ -1,19 +1,17 @@
package com.jero.modules.laws.part.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
/**
* 生产厂家表
* @TableName laws_part_production_factory
laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartType.java
+2 -2
View File
@@ -195,8 +195,8 @@ public class LawsPartType implements Serializable {
* 申请人
*/
@ApiModelProperty(value = "申请人")
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
@Excel(name = "申请人", width = 15, dictTable = "sys_user", dicCode = "username", dicText = "realname")
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "CONCAT(realname,'(',username,')')")
@Excel(name = "申请人", width = 15, dictTable = "sys_user", dicCode = "username", dicText = "CONCAT(realname,'(',username,')')")
private String createBy;
/**
* 申请部门
laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartPmmPartitionInfoService.java
-1
View File
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.laws.part.entity.LawsPartPmmPartitionInfo;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
public interface ILawsPartPmmPartitionInfoService extends IService<LawsPartPmmPartitionInfo> {
laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartTypeService.java
-4
View File
@@ -2,15 +2,11 @@ package com.jero.modules.laws.part.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.common.api.vo.Result;
import com.jero.modules.laws.part.entity.LawsPartRelevance;
import com.jero.modules.laws.part.entity.LawsPartType;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
public interface ILawsPartTypeService extends IService<LawsPartType> {
laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartInfoServiceImpl.java
-1
View File
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.laws.part.entity.LawsPartInfo;
import com.jero.modules.laws.part.entity.LawsPartType;
import com.jero.modules.laws.part.mapper.LawsPartInfoMapper;
import com.jero.modules.laws.part.service.ILawsPartInfoService;
import lombok.extern.slf4j.Slf4j;
laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartPmmPartitionInfoServiceImpl.java
-3
View File
@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.laws.part.entity.LawsPartPmmPartitionInfo;
import com.jero.modules.laws.part.entity.LawsPartRelevance;
import com.jero.modules.laws.part.mapper.LawsPartPmmPartitionInfoMapper;
import com.jero.modules.laws.part.service.ILawsPartPmmPartitionInfoService;
import lombok.extern.slf4j.Slf4j;
@@ -15,7 +13,6 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@Service
@Slf4j
laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java
+88 -82
View File
@@ -20,7 +20,6 @@ import com.jero.modules.laws.part.mapper.LawsPartRelevanceMapper;
import com.jero.modules.laws.part.service.ILawsPartPmmPartitionInfoService;
import com.jero.modules.laws.part.service.ILawsPartRelevanceService;
import com.jero.modules.laws.utils.ValidUtil;
import com.jero.modules.system.vo.SysDictPage;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -31,6 +30,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jetbrains.annotations.NotNull;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -60,8 +60,7 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl<LawsPartRelevanceM
QueryWrapper<LawsPartRelevance> queryWrapper =
QueryGenerator.initQueryWrapper(lawsPartRelevance, req.getParameterMap());
Page<LawsPartRelevance> page = new Page<>(pageNo, pageSize);
IPage<LawsPartRelevance> re = page(page, queryWrapper);
return re;
return page(page, queryWrapper);
}
@@ -197,85 +196,7 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl<LawsPartRelevanceM
Set<String> setAlready = new HashSet<>();
// 校验数据
for (int i = 0; i < listLawsPartRelevance.size(); i++) {
LawsPartRelevance lawsPartRelevance = listLawsPartRelevance.get(i);
StringBuilder s = new StringBuilder();
// 校验必填项
StringBuilder g = ValidUtil.validateReturnBuilderIsNotBlank(lawsPartRelevance);
if(!StringUtils.isEmpty(g.toString())){
s.append(g.toString());
}
if(!StringUtils.isBlank(lawsPartRelevance.getRegPartNameEn())
&& lawsPartRelevance.getRegPartNameEn().length() > 50){
s.append(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
"关键零部件名称（英文） Maximum length 50," : "关键零部件名称（英文）最大长度为50,");
}
if(!StringUtils.isBlank(lawsPartRelevance.getSystemCode())
&& lawsPartRelevance.getSystemCode().length() > 50){
s.append(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
"功能系统码 Maximum length 50," : "功能系统码最大长度为50,");
}
if(!StringUtils.isBlank(lawsPartRelevance.getRemark())
&& lawsPartRelevance.getRemark().length() > 50){
s.append(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
"备注 Maximum length 50," : "备注最大长度为50,");
}
if(!StringUtils.isBlank(lawsPartRelevance.getDecisionRequirement())
&& lawsPartRelevance.getDecisionRequirement().length() > 50){
s.append(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
"技术特性判定要求 Maximum length 500," : "技术特性判定要求最大长度为500,");
}
if(!StringUtils.isBlank(lawsPartRelevance.getRegPartNameCn())){
// 验证关键零部件名称是否正确
if(CollectionUtils.isEmpty(lawsPartPmmPartitionInfoList)){
s.append(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
"关键零部件名称 does not exist," : "关键零部件名称不存在,");
}else{
long l = lawsPartPmmPartitionInfoList.stream().filter(o->
Objects.equals(lawsPartRelevance.getRegPartNameCn(),o.getRegPartNameCn())).count();
if(l == 0){
s.append(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
"关键零部件名称 does not exist," : "关键零部件名称不存在,");
}
}
}
List<String> formType = Arrays.asList(lawsPartRelevance.getFormType().split(","));
if(formType.contains(PartConstants.FORM_TYPE1)){
if(StringUtils.isBlank(lawsPartRelevance.getSystemCode())){
s.append(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
"功能系统码 cannot be empty," : "功能系统码不能为空,");
}
if(StringUtils.isBlank(lawsPartRelevance.getDecisionRequirement())){
s.append(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
"技术特性判定要求 cannot be empty," : "技术特性判定要求不能为空,");
}
}
// 校验是否存在
String code = lawsPartRelevance.getRegPartNameCn() + "_" + lawsPartRelevance.getSystemCode();
if(!CollectionUtils.isEmpty(listOld)){
long l = listOld.stream().filter(o->
Objects.equals(o.getRegPartNameCn() + "_" + lawsPartRelevance.getSystemCode(), code))
.count();
if(l > 0){
s.append((Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
"关键零部件名称与功能系统码 already exists," : "关键零部件名称与功能系统码已存在,"));
}
}
// 校验重复
if(!CollectionUtils.isEmpty(setAlready) && !StringUtils.isBlank(code)){
long l = setAlready.stream().filter(o->Objects.equals(o,code)).count();
if(l > 0){
s.append((Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
"关键零部件名称与功能系统码 duplicate," : "关键零部件名称与功能系统码重复,"));
}
}
setAlready.add(code);
if(!StringUtils.isBlank(s.toString())){
m.append(MessageUtils.getMessage(ResultCommon.ROW_N_IMPORT,i + 4)).append(",")
.append(s.toString(), 0, s.toString().length() - 1).append("<br>");
}
}
checkData(listLawsPartRelevance, m, listOld, lawsPartPmmPartitionInfoList, setAlready);
if(!StringUtils.isBlank(m.toString())){
return Result.error(m.toString());
}
@@ -293,6 +214,91 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl<LawsPartRelevanceM
}
}
private void checkData(List<LawsPartRelevance> listLawsPartRelevance, StringBuilder m, List<LawsPartRelevance> listOld, List<LawsPartPmmPartitionInfo> lawsPartPmmPartitionInfoList, Set<String> setAlready) {
for (int i = 0; i < listLawsPartRelevance.size(); i++) {
LawsPartRelevance lawsPartRelevance = listLawsPartRelevance.get(i);
StringBuilder s = new StringBuilder();
// 校验必填项
StringBuilder g = ValidUtil.validateReturnBuilderIsNotBlank(lawsPartRelevance);
if(!StringUtils.isEmpty(g.toString())){
s.append(g.toString());
}
checkFields(s, lawsPartRelevance.getRegPartNameEn(), "关键零部件名称（英文） Maximum length 50,", "关键零部件名称（英文）最大长度为50,");
checkFields(s, lawsPartRelevance.getSystemCode(), "功能系统码 Maximum length 50,", "功能系统码最大长度为50,");
checkFields(s, lawsPartRelevance.getRemark(), "备注 Maximum length 50,", "备注最大长度为50,");
checkFields(s, lawsPartRelevance.getDecisionRequirement(), "技术特性判定要求 Maximum length 500,", "技术特性判定要求最大长度为500,");
checkRegPartNameCn(lawsPartPmmPartitionInfoList, lawsPartRelevance, s);
checkSystemCode(lawsPartRelevance, s);
// 校验是否存在
String code = lawsPartRelevance.getRegPartNameCn() + "_" + lawsPartRelevance.getSystemCode();
checkCode(listOld, setAlready, lawsPartRelevance, s, code);
setAlready.add(code);
if(!StringUtils.isBlank(s.toString())){
m.append(MessageUtils.getMessage(ResultCommon.ROW_N_IMPORT,i + 4)).append(",")
.append(s.toString(), 0, s.toString().length() - 1).append("<br>");
}
}
}
private void checkCode(List<LawsPartRelevance> listOld, Set<String> setAlready, LawsPartRelevance lawsPartRelevance, StringBuilder s, String code) {
if(!CollectionUtils.isEmpty(listOld)){
long l = listOld.stream().filter(o->
Objects.equals(o.getRegPartNameCn() + "_" + lawsPartRelevance.getSystemCode(), code))
.count();
if(l > 0){
s.append((getStr("关键零部件名称与功能系统码 already exists,", "关键零部件名称与功能系统码已存在,")));
}
}
// 校验重复
if(!CollectionUtils.isEmpty(setAlready) && !StringUtils.isBlank(code)){
long l = setAlready.stream().filter(o->Objects.equals(o,code)).count();
if(l > 0){
s.append((getStr("关键零部件名称与功能系统码 duplicate,", "关键零部件名称与功能系统码重复,")));
}
}
}
private void checkSystemCode(LawsPartRelevance lawsPartRelevance, StringBuilder s) {
List<String> formType = Arrays.asList(lawsPartRelevance.getFormType().split(","));
if(formType.contains(PartConstants.FORM_TYPE1)){
if(StringUtils.isBlank(lawsPartRelevance.getSystemCode())){
s.append(getStr("功能系统码 cannot be empty,", "功能系统码不能为空,"));
}
if(StringUtils.isBlank(lawsPartRelevance.getDecisionRequirement())){
s.append(getStr("技术特性判定要求 cannot be empty,", "技术特性判定要求不能为空,"));
}
}
}
private void checkRegPartNameCn(List<LawsPartPmmPartitionInfo> lawsPartPmmPartitionInfoList, LawsPartRelevance lawsPartRelevance, StringBuilder s) {
if(!StringUtils.isBlank(lawsPartRelevance.getRegPartNameCn())){
// 验证关键零部件名称是否正确
if(CollectionUtils.isEmpty(lawsPartPmmPartitionInfoList)){
s.append(getStr("关键零部件名称 does not exist,", "关键零部件名称不存在,"));
}else{
long l = lawsPartPmmPartitionInfoList.stream().filter(o->
Objects.equals(lawsPartRelevance.getRegPartNameCn(),o.getRegPartNameCn())).count();
if(l == 0){
s.append(getStr("关键零部件名称 does not exist,", "关键零部件名称不存在,"));
}
}
}
}
private void checkFields(StringBuilder s, String regPartNameEn, String s2, String s3) {
if (!StringUtils.isBlank(regPartNameEn)
&& regPartNameEn.length() > 50) {
s.append(getStr(s2, s3));
}
}
@NotNull
private String getStr(String s, String s2) {
return Objects.equals(LocaleContextHolder.getLocale(), Locale.ENGLISH) ?
s : s2;
}
@Override
public ModelAndView downloadTemplate(HttpServletResponse response) {
// Step.3 AutoPoi 导出Excel
laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartTypeServiceImpl.java
+2 -5
View File
@@ -1,6 +1,5 @@
package com.jero.modules.laws.part.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -61,8 +60,7 @@ public class LawsPartTypeServiceImpl extends ServiceImpl<LawsPartTypeMapper, Law
queryWrapper.isNotNull("l1.success_time");
queryWrapper.orderByDesc("l1.create_time");
Page<LawsPartType> page = new Page<>(pageNo, pageSize);
IPage<LawsPartType> re = lawsPartTypeMapper.pageList(page, queryWrapper);
return re;
return lawsPartTypeMapper.pageList(page, queryWrapper);
}
@@ -215,8 +213,7 @@ public class LawsPartTypeServiceImpl extends ServiceImpl<LawsPartTypeMapper, Law
queryLawsPartType.select(LawsPartType::getPartRelevanceType);
queryLawsPartType.eq(LawsPartType::getPartNum,partNum);
queryLawsPartType.isNotNull(LawsPartType::getSuccessTime);
List<LawsPartType> list = list(queryLawsPartType);
return list;
return list(queryLawsPartType);
}
}