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

Merge branch '20240913'

Browse Source 
# Conflicts:
#	laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
This commit is contained in:
fengchenchen
2024-09-14 13:02:16 +08:00
parent d9a099f92d d343300ae9
commit 2c9c4c7458
44 changed files with 706 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update/测试阶段.sql
+44 -5
View File
@@ -277,11 +277,6 @@ CREATE INDEX lds_idx_standard_id ON laws_document_split (standard_id);
-- 2024-09-03 修改标签管理条款在高级检索中搜索条件与导出全部数据
update laws_tag set is_show_search = 1 where table_name = 'laws_document_split';
-- 2024-09-04 修改外部标准实施日期为多选日期
# UPDATE laws_tag SET `db_length` = 200,`field_show_type` = '4' WHERE `id` = '1695991006579912706';
# ALTER TABLE `laws_domestic_standard`
# MODIFY COLUMN `implementation_date` varchar(200) NULL DEFAULT NULL COMMENT '实施日期';
-- 2024-09-04 条款添加标题译文
ALTER TABLE laws_document_split ADD title_translation longtext NULL DEFAULT NULL COMMENT '标题译文';
INSERT INTO `laws_tag`(`id`, `table_name`, `db_field_name`, `db_field_en_name`, `db_field_txt`, `order_num`, `db_field_name_old`, `db_is_key`, `db_is_null`, `db_type`, `db_length`, `db_point_length`, `db_default_val`, `dict_field`, `dict_table`, `dict_text`, `field_show_type`, `field_href`, `field_length`, `field_valid_type`, `field_must_input`, `field_extend_json`, `field_default_value`, `is_show_form_create`, `is_query`, `is_show_form`, `is_show_list`, `is_read_only`, `query_mode`, `main_table`, `main_field`, `update_by`, `update_time`, `create_time`, `create_by`, `converter`, `query_def_val`, `query_dict_text`, `query_dict_field`, `query_dict_table`, `query_show_type`, `query_config_flag`, `query_valid_type`, `query_must_input`, `sort_flag`, `show_area`, `is_show_laws_list`, `is_show_search`, `del_flag`, `is_model`, `dict_id`, `home_search_context_order`, `home_search_file_order`, `dict_field_search`, `dict_table_search`, `dict_text_search`, `usable_range`, `tree_first_href`, `import_sort`) VALUES ('1701142687771348923', 'laws_document_split', 'title_translation', 'Title Translation', '标题译文', 3, 'title_translation', 0, 1, 'String', 500, NULL, NULL, NULL, NULL, NULL, '9', NULL, NULL, NULL, '0', NULL, NULL, 1, 1, 1, 1, 1, NULL, NULL, NULL, 'admin', '2023-10-30 13:36:07', '2023-09-11 15:56:37', 'admin', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 0, '4', NULL, NULL, NULL, NULL, NULL, NULL, '1,3', NULL, 2);
@@ -336,3 +331,47 @@ update process_node set node_name = '部门接口人分发' where node_name = '
UPDATE `sys_permission` SET `name` = '市场法规清单发布流程' WHERE `id` = '897f89d790485b5c0190485b5c110000';
UPDATE `sys_permission` SET `name` = '市场法规清单发布流程' WHERE `id` = '897f89d790485b5c0190485ca6e10001';
UPDATE `sys_dict_item` SET `item_text` = '市场法规清单发布流程' WHERE `id` = '1808773975469953026';
-- 2024-09-11 修改外部标准实施日期为多选日期
UPDATE laws_tag SET `db_length` = 200,`field_show_type` = '4' WHERE `id` = '1695991006579912706';
ALTER TABLE `laws_domestic_standard`
MODIFY COLUMN `implementation_date` varchar(200) NULL DEFAULT NULL COMMENT '实施日期';
-- 2024-09-11 外来标准
ALTER TABLE `laws_domestic_standard`
MODIFY COLUMN `applicable_market` longtext NULL DEFAULT NULL COMMENT '适用市场';
-- 2024-09-12 修改主控部门字段长度
ALTER TABLE `laws_market_standard_detail`
MODIFY COLUMN `main_dept` longtext NULL DEFAULT NULL COMMENT '主控部门';
ALTER TABLE `laws_domestic_standard`
MODIFY COLUMN `main_dept` longtext NULL DEFAULT NULL COMMENT '主控部门';
UPDATE `laws_tag` SET `field_show_type` = '7' WHERE `id` = '1800826537491943426';
-- 2024-09-12 市场法规清单发布流程添加附件
ALTER TABLE `process_market_standard_release`
ADD COLUMN `file` varchar(2000) NULL DEFAULT NULL COMMENT '附件';
-- 2024-09-13 增加辅助说明材料字段
ALTER TABLE `process_standard_compliance_check_detail`
ADD COLUMN `unsatisfied_require_attach` varchar(500) NULL COMMENT '辅助说明材料' AFTER `assessor`;
-- 2024-09-13 增加辅助说明材料字段
ALTER TABLE `laws_evaluation_not_met_library`
ADD COLUMN `unsatisfied_require_attach` varchar(500) NULL COMMENT '辅助说明材料';
-- 2024-09-13 增加辅助说明材料字段
ALTER TABLE `laws_conformity_assessment_library_detail`
ADD COLUMN `unsatisfied_require_attach` varchar(500) NULL COMMENT '辅助说明材料';
-- 2024-09-13 增加评估发起人
ALTER TABLE `laws_conformity_assessment_library_detail`
ADD COLUMN `assessor_initiator` varchar(500) NULL COMMENT '评估发起人' AFTER `bind_id`;
-- 2024年9月13日15:38:30 拆分目录表字段长度和标签库改为一致
ALTER TABLE `sar_file_split_menu`
MODIFY COLUMN `item_name` varchar(500) NULL COMMENT '条款名称';
-- 2024-09-13 不符合项增加关闭人、关闭时间
ALTER TABLE `laws_evaluation_not_met_library`
ADD COLUMN `close_user` varchar(50) NULL COMMENT '关闭人' AFTER `all_approval_user`,
ADD COLUMN `close_time` datetime NULL COMMENT '关闭时间' AFTER `close_user`;
laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+1 -1
View File
@@ -221,7 +221,7 @@ public class SysDictItemController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
queryWrapper.select("del_flag","description","dict_id","en_name","id","is_read_only","is_tag_dict","item_text",
"item_value","item_text as name","parent_id as pId","parent_id","sort_order","status");
"item_value","item_text as name","parent_id as pId","parent_id","sort_order","status","en_base");
List<SysDictItem> listSysDictItem = sysDictItemService.list(queryWrapper);
List<SysDictItem> listAll = new ArrayList<>();
// 树形查询手动封装分页
laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+1
View File
@@ -786,6 +786,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
lambdaUpdateWrapper.set(SysUser::getUpdateTime,user.getUpdateTime());
lambdaUpdateWrapper.set(SysUser::getUpdateBy,user.getUpdateBy());
lambdaUpdateWrapper.set(SysUser::getBirthday,user.getBirthday());
lambdaUpdateWrapper.set(SysUser::getStatus,user.getStatus());
lambdaUpdateWrapper.set(SysUser::getEntryTime,user.getEntryTime());
lambdaUpdateWrapper.set(SysUser::getResignationTime,user.getResignationTime());
lambdaUpdateWrapper.set(SysUser::getFeishuId,user.getFeishuId());
laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java
+15 -3
View File
@@ -253,9 +253,21 @@ public class SyncIamService {
// 获取角色(多个逗号分隔)，针对大部分角用户默认写死一般用户
// （TODO 需要根据实际情况再沟通一遍角色怎么自动赋予），需要和角色接口那边沟通，确认具体情况
String selectedRoles = defaultRoleIds; // 一般用户的角色ID
// 存储到用户表中
this.sysUserService.saveUser(sysUser, selectedRoles, selectedDeparts);
iamUserCreateResponse.setUid(sysUser.getId());
LambdaQueryWrapper<SysUser> querySysUser = new LambdaQueryWrapper<>();
querySysUser.eq(SysUser::getUsername,sysUser.getUsername());
querySysUser.eq(SysUser::getStatus,"2");
SysUser oldSysUser = sysUserService.getOne(querySysUser,false);
if(!Objects.isNull(oldSysUser)){
// 编辑用户
sysUser.setId(oldSysUser.getId());
sysUser.setStatus(1);
this.sysUserService.editUser(sysUser, null, selectedDeparts);
iamUserCreateResponse.setUid(oldSysUser.getId());
}else{
// 存储到用户表中
this.sysUserService.saveUser(sysUser, selectedRoles, selectedDeparts);
iamUserCreateResponse.setUid(sysUser.getId());
}
return iamUserCreateResponse;
}
laws-modules/src/main/java/com/jero/modules/activiti/process/ms/entity/ProcessMarketStandardRelease.java
+5
View File
@@ -88,6 +88,11 @@ public class ProcessMarketStandardRelease implements Serializable {
@ApiModelProperty(value = "清单说明")
private String manifestDesc;
/**附件*/
@ApiModelProperty(value = "附件")
private String file;
/**
* 标准详情列表
*/
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java
+61 -15
View File
@@ -6,7 +6,9 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.DictPoint;
import com.jero.common.aspect.annotation.Translation;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.vo.DictModel;
import com.jero.common.util.MessageUtils;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
@@ -14,6 +16,7 @@ import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheck;
import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheckDetail;
import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.DictExcelVO;
import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.ModelExcelVO;
import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.ProcessSccVO;
import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.SplitExcelVO;
@@ -25,6 +28,8 @@ import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.poi.ss.usermodel.Workbook;
import org.jeecgframework.poi.excel.ExcelExportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
@@ -37,10 +42,11 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.*;
/**
* 流程-测试流程(process_demo)表控制层
@@ -60,6 +66,9 @@ public class ProcessStandardComplianceCheckController extends JeroController<Pro
@Resource
private ActFlowCommonService actFlowCommonService;
@Resource
private ISysBaseAPI sysBaseAPI;
@AutoLog(value = "法规符合性排查流程-发起流程")
@ApiOperation(value = "法规符合性排查流程-发起流程", notes = "法规符合性排查流程-发起流程")
@PostMapping(value = "/start")
@@ -141,19 +150,56 @@ public class ProcessStandardComplianceCheckController extends JeroController<Pro
@GetMapping("/modelTemplateDownload")
@ApiOperation(value = "法规符合性排查流程-车型导入模板下载", notes = "法规符合性排查流程-车型导入模板下载")
@AutoLog(value = "法规符合性排查流程-车型导入模板下载")
public ModelAndView modelTemplateDownload() {
public void modelTemplateDownload(HttpServletResponse response) {
// AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
String title = "车型批量导入模板";
//此处设置的filename无效 ,前端会重更新设置一下
mv.addObject(FILE_NAME);
mv.addObject(CLASS, ModelExcelVO.class);
ExportParams exportParams = new ExportParams(null, title);
// 导出xls
exportParams.setType(ExcelType.HSSF);
mv.addObject(PARAMS, exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, new ArrayList<T>());
return mv;
List<Map<String, Object>> list = new ArrayList<>();
Map<String, Object> map = new HashMap<>();
map.put("title",new ExportParams(null, title));
map.put(CLASS,ModelExcelVO.class);
map.put(NormalExcelConstants.DATA_LIST,new ArrayList<>());
list.add(map);
Map<String, Object> map1 = new HashMap<>();
map1.put("title",new ExportParams(null, "车型状态"));
map1.put(CLASS, DictExcelVO.class);
List<DictModel> dictItems = sysBaseAPI.getDictItems("model_status");
ArrayList<DictExcelVO> dictExcelVOS = new ArrayList<>();
for (DictModel dictItem : dictItems) {
DictExcelVO dictExcelVO = new DictExcelVO();
dictExcelVO.setModelState(dictItem.getText());
dictExcelVOS.add(dictExcelVO);
}
map1.put(NormalExcelConstants.DATA_LIST,dictExcelVOS);
list.add(map1);
ExcelType type = ExcelType.HSSF;
Workbook workbook = ExcelExportUtil.exportExcel(list, type);
// 设置HTTP响应头
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("UTF-8"); // 这行确保响应流使用UTF-8编码
// 处理文件名乱码问题
String encodedFileName = null;
try {
encodedFileName = URLEncoder.encode("车型批量导入模板", StandardCharsets.UTF_8.name()).replace("+", "%20");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + encodedFileName + ".xlsx");
// 获取响应输出流并写入Excel
try (OutputStream out = response.getOutputStream()) {
workbook.write(out);
out.flush();
} catch (IOException e) {
log.error("导出Excel失败", e);
} finally {
try {
workbook.close();
} catch (IOException e) {
log.error("导出Excel失败", e);
}
}
}
/**
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java
+1 -1
View File
@@ -118,7 +118,7 @@ public class ProcessStandardComplianceCheck implements Serializable {
* 适用市场
*/
@ApiModelProperty(value = "适用市场")
@Dict(dictTable = "laws_market_standard", dicText = "manifest_name", dicCode = "id")
@Dict(dicCode = "market_state")
private String applicableMarket;
/**
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
+20 -1
View File
@@ -222,6 +222,13 @@ public class ProcessStandardComplianceCheckDetail implements Serializable, Compa
@ApiModelProperty(value = "分发批次唯一Id")
private String batchId;
/**
* 辅助说明材料
*/
@ApiModelProperty(value = "辅助说明材料")
@Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name")
private String unsatisfiedRequireAttach;
@ApiModelProperty(value = "是否与上一版相同（字典：1：是，0：否）")
@Dict(dicCode = "yn")
@TableField(exist = false)
@@ -233,12 +240,24 @@ public class ProcessStandardComplianceCheckDetail implements Serializable, Compa
@ApiModelProperty(value = "佐证材料")
@ExcelCollection(name = "", orderNum = "16")
@TableField(exist = false)
private List<ExcelExportUtilPro.FileDetails> fileList = Collections.emptyList();
private List<ExcelExportUtilPro.MaterialFile> fileList = Collections.emptyList();
public List<String> obtainFileIds() {
return material != null ? Arrays.asList(material.split(",")) : Collections.emptyList();
}
/**
* 附件
*/
@ApiModelProperty(value = "辅助说明材料")
@ExcelCollection(name = "", orderNum = "17")
@TableField(exist = false)
private List<ExcelExportUtilPro.UnsatisfiedRequireAttachFile> fileListTwo = Collections.emptyList();
public List<String> obtainFileTwoIds() {
return unsatisfiedRequireAttach != null ? Arrays.asList(unsatisfiedRequireAttach.split(",")) : Collections.emptyList();
}
@TableField(exist = false)
private static final long serialVersionUID = 1L;
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/DictExcelVO.java
+17
View File
@@ -0,0 +1,17 @@
package com.jero.modules.activiti.process.standardComplianceCheck.entity.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.jero.common.aspect.annotation.Dict;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.util.Arrays;
import java.util.List;
@Data
public class DictExcelVO {
@Excel(name = "车型状态")
private String modelState;
}
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java
+8 -12
View File
@@ -119,14 +119,6 @@ public class WithoutDistributeExcelTemplate {
@Excel(name = "备注", width = 15, orderNum = "13")
private String remark;
/**
* 附件
*/
// @ApiModelProperty(value = "佐证材料")
// @ExcelCollection(name = "", orderNum = "14")
// @TableField(exist = false)
// private List<ExcelExportUtilPro.FileDetails> fileList = Collections.emptyList();
/**
* 佐证材料
*/
@@ -135,11 +127,15 @@ public class WithoutDistributeExcelTemplate {
@Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name")
private String material;
private String sort;
/**
* 佐证材料
*/
@ApiModelProperty(value = "辅助说明材料")
@Excel(name = "辅助说明材料", width = 15, orderNum = "14")
@Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name")
private String unsatisfiedRequireAttach;
// public List<String> obtainFileIds() {
// return material != null ? Arrays.asList(material.split(",")) : Collections.emptyList();
// }
private String sort;
}
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/listener/ProcessSCCEndListener.java
+6
View File
@@ -7,6 +7,7 @@ import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessS
import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheckDetail;
import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckDetailService;
import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckService;
import com.jero.modules.activiti.service.ProcessAllService;
import com.jero.modules.activiti.service.ProcessApprovalRecordService;
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary;
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail;
@@ -61,6 +62,9 @@ public class ProcessSCCEndListener implements ExecutionListener {
@Resource
private ProcessApprovalRecordService processApprovalRecordService;
@Resource
private ProcessAllService paService;
public static final String TO_BE_RECTIFIED = "1";
@Override
@@ -140,10 +144,12 @@ public class ProcessSCCEndListener implements ExecutionListener {
calService.updateById(lawsConformityAssessmentLibrary);
}
String processInitiator = paService.getByProcessInstanceId(processInstanceId).getCreateUserId();
List<LawsConformityAssessmentLibraryDetail> lawsConformityAssessmentLibraryDetails = BeanCopyUtils.copyBeanList(list, LawsConformityAssessmentLibraryDetail.class);
LawsConformityAssessmentLibrary finalLawsConformityAssessmentLibrary = lawsConformityAssessmentLibrary;
lawsConformityAssessmentLibraryDetails.forEach(detail -> {
detail.setBindId(finalLawsConformityAssessmentLibrary.getId());
detail.setAssessorInitiator(processInitiator);
});
calDetailService.saveBatch(lawsConformityAssessmentLibraryDetails);
// 找出不符合和待验证的存入不符合项库
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+30 -7
View File
@@ -546,6 +546,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
@Override
public void exportXls(String taskId, HttpServletResponse response) {
List<SysDictItemCore> listDict = commonAPI.getDictItemAll();
ProcessInfoVO<ProcessSccVO> handleData = this.getHandleData(taskId);
ProcessSccVO businessInfoDTO = handleData.getBusinessInfoDTO();
ProcessStandardComplianceCheck standardInfo = businessInfoDTO.getStandardInfo();
@@ -565,9 +566,13 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
}
try (FileOutputStream fos = new FileOutputStream(url + File.separator + fileName + ".xls")) {
// 获取数据
excelExportUtilPro.settleDocuments(url, "附件", detailInfoList,
excelExportUtilPro.settleDocuments(url, "佐证材料", detailInfoList,
ProcessStandardComplianceCheckDetail::obtainFileIds,
ProcessStandardComplianceCheckDetail::setFileList);
ProcessStandardComplianceCheckDetail::setFileList, ExcelExportUtilPro.MaterialFile.class);
// 获取数据
excelExportUtilPro.settleDocuments(url, "辅助说明材料", detailInfoList,
ProcessStandardComplianceCheckDetail::obtainFileTwoIds,
ProcessStandardComplianceCheckDetail::setFileListTwo, ExcelExportUtilPro.UnsatisfiedRequireAttachFile.class);
// 生成excel
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.HSSF);
@@ -584,9 +589,17 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
newRecordsExport.sort(new ProcessStandardComplianceCheckDetail());
Workbook workbook = ExcelExportUtil
.exportExcel(exportParams, ProcessStandardComplianceCheckDetail.class, detailInfoList);
// 生成超链接
excelExportUtilPro.generateHyperlink("附件", newRecordsExport, workbook,
ProcessStandardComplianceCheckDetail::getFileList, 15);
// 翻译评估结果和佐证材料字段
newRecordsExport.parallelStream().forEach(item -> {
String material = excelUtils.translateDictValue("id", "file_name", "oss_file", item.getMaterial(), listDict);
if (StrUtil.isNotBlank(material)) {
item.setMaterial("佐证材料/" + material);
}
String unsatisfiedRequireAttach = excelUtils.translateDictValue("id", "file_name", "oss_file", item.getUnsatisfiedRequireAttach(), listDict);
if (StrUtil.isNotBlank(unsatisfiedRequireAttach)) {
item.setUnsatisfiedRequireAttach("辅助说明材料/" + unsatisfiedRequireAttach);
}
});
// 导出excel
workbook.write(fos);
// 生成并导出zip
@@ -626,7 +639,11 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
// 获取数据
excelExportUtilPro.settleDocuments(url, "佐证材料", detailInfoList,
ProcessStandardComplianceCheckDetail::obtainFileIds,
ProcessStandardComplianceCheckDetail::setFileList);
ProcessStandardComplianceCheckDetail::setFileList, ExcelExportUtilPro.MaterialFile.class);
// 获取数据
excelExportUtilPro.settleDocuments(url, "辅助说明材料", detailInfoList,
ProcessStandardComplianceCheckDetail::obtainFileTwoIds,
ProcessStandardComplianceCheckDetail::setFileListTwo, ExcelExportUtilPro.UnsatisfiedRequireAttachFile.class);
// 去除文本的<p>
String regex = "<[^>]*>";
@@ -650,6 +667,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
if (StrUtil.isNotBlank(material)) {
item.setMaterial("佐证材料/" + material);
}
String unsatisfiedRequireAttach = excelUtils.translateDictValue("id", "file_name", "oss_file", item.getUnsatisfiedRequireAttach(), listDict);
if (StrUtil.isNotBlank(unsatisfiedRequireAttach)) {
item.setUnsatisfiedRequireAttach("辅助说明材料/" + unsatisfiedRequireAttach);
}
});
Workbook workbook = ExcelExportUtil
.exportExcel(exportParams, WithoutDistributeExcelTemplate.class, data);
@@ -910,6 +931,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
list.parallelStream().forEach(item -> {
item.setResult(excelUtils.translateDictValue("evaluation_result", item.getResult(), listDict));
item.setMaterial(excelUtils.uploadFile(item.getMaterial(), fileMap));
item.setUnsatisfiedRequireAttach(excelUtils.uploadFile(item.getUnsatisfiedRequireAttach(), fileMap));
});
}
@@ -936,7 +958,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
// 检查所有数据字典校验的字段
errMsg.append(excelUtils.validResult(result, listDict));
errMsg.append(excelUtils.validMaterial(material, fileMap));
errMsg.append(excelUtils.validMaterial(material, fileMap, "佐证材料"));
errMsg.append(excelUtils.validMaterial(material, fileMap, "辅助说明材料"));
// 如果数据有问题，则将提示信息添加到 errorMsgs 中
if (errMsg.length() > 0) {
errorMsgs.add(errMsgHeader.append(errMsg).toString());
laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpret.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class ProcessStandardInterpret extends BaseEntity {
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "实施日期")
@TableField(exist = false)
private java.util.Date implementationDate;
private java.lang.String implementationDate;
/**新生产车实施日*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/HomeNewestStandardInterpret.java
+1 -3
View File
@@ -35,9 +35,7 @@ public class HomeNewestStandardInterpret {
private String standardState;
// 实施日期
@ApiModelProperty(value = "实施日期")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date implementationDate;
private String implementationDate;
// 代替标准编号
@ApiModelProperty(value = "代替标准编号")
private String substituteStandardNumber;
laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
+2 -2
View File
@@ -596,12 +596,12 @@ public class ExcelUtils {
return "";
}
public String validMaterial(String value, Map<String, File> fileMap) {
public String validMaterial(String value, Map<String, File> fileMap, String title) {
if (StrUtil.isBlank(value)) {
return "";
}
if (!importUtil.fileValid(value, fileMap)) {
return "'佐证材料'无效。";
return "'" + title + "'无效。";
}
return "";
}
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsConformityAssessmentController.java
+2
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation;
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary;
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail;
import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibraryService;
@@ -42,6 +43,7 @@ public class LawsConformityAssessmentController {
@GetMapping(value = "/page")
@ApiOperationSupport(order = 1)
@RequiresPermissions("lawsConformityAssessment:search")
@Translation
public Result<IPage<LawsConformityAssessmentLibrary>> queryPageList(LawsConformityAssessmentLibrary lawsConformityAssessmentLibrary,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class LawsConformityAssessmentLibrary implements Serializable {
/**
* 评估日期
*/
@ApiModelProperty(value = "评估日期")
@ApiModelProperty(value = "评估完成日期")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date valuationTime;
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java
+14
View File
@@ -95,6 +95,13 @@ public class LawsConformityAssessmentLibraryDetail implements Serializable {
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
private String assessor;
/**
* 评估发起人
*/
@ApiModelProperty(value = "评估发起人")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
private String assessorInitiator;
/**
* 评估结果
*/
@@ -158,6 +165,13 @@ public class LawsConformityAssessmentLibraryDetail implements Serializable {
@Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name")
private String material;
/**
* 辅助说明材料
*/
@ApiModelProperty(value = "辅助说明材料")
@Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name")
private String unsatisfiedRequireAttach;
/**
* 关联主表Id
*/
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java
+36
View File
@@ -228,6 +228,18 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
return file != null ? Arrays.asList(file.split(",")) : Collections.emptyList();
}
/**
* 附件
*/
@ApiModelProperty(value = "辅助说明材料")
@ExcelCollection(name = "", orderNum = "14")
@TableField(exist = false)
private List<ExcelExportUtilPro.UnsatisfiedRequireAttachFile> fileListTwo = Collections.emptyList();
public List<String> obtainFileTwoIds() {
return unsatisfiedRequireAttach != null ? Arrays.asList(unsatisfiedRequireAttach.split(",")) : Collections.emptyList();
}
/**
* 标准ID
*/
@@ -254,6 +266,23 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
@ApiModelProperty(value = "这条数据的所有审批人员")
private String allApprovalUser;
/**
* 关闭人
*/
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
@Excel(name = "关闭人", width = 15, orderNum = "8", dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
@ApiModelProperty(value = "关闭人")
private String closeUser;
/**
* 关闭时间
*/
@ApiModelProperty(value = "关闭时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@Excel(name = "关闭时间", width = 15, orderNum = "12", format = "yyyy-MM-dd")
private Date closeTime;
/**
* 关闭用主键ids
*/
@@ -261,6 +290,13 @@ public class LawsEvaluationNotMetLibrary implements Serializable {
@ApiModelProperty(value = "关闭用主键ids")
private String selections;
/**
* 辅助说明材料
*/
@ApiModelProperty(value = "辅助说明材料")
@Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name")
private String unsatisfiedRequireAttach;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/vo/LawsConformityAssessmentLibraryExportVO.java
+15
View File
@@ -2,6 +2,8 @@ package com.jero.modules.assessmentLibrary.entity.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict;
import com.jero.modules.laws.utils.ExcelExportUtilPro.MaterialFile;
import com.jero.modules.laws.utils.ExcelExportUtilPro.UnsatisfiedRequireAttachFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -162,5 +164,18 @@ public class LawsConformityAssessmentLibraryExportVO implements Serializable {
@ExcelCollection(name = "")
private List<MaterialFile> materialFileList = Collections.emptyList();
/**
* 佐证材料
*/
@ApiModelProperty(value = "辅助说明材料")
private String unsatisfiedRequireAttach;
/**
* 佐证材料
*/
@ApiModelProperty(value = "辅助说明材料")
@ExcelCollection(name = "")
private List<UnsatisfiedRequireAttachFile> unsatisfiedRequireAttachList = Collections.emptyList();
}
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/vo/MaterialFile.java
-15
View File
@@ -1,15 +0,0 @@
package com.jero.modules.assessmentLibrary.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
@Data
public class MaterialFile {
@ApiModelProperty(value = "id")
private String id;
@Excel(name = "佐证材料", width = 15)
@ApiModelProperty(value = "佐证材料")
private String fileName;
}
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml
+3 -5
View File
@@ -23,14 +23,12 @@
cs.standard_id,
IF(cs.standard_id IS NOT NULL, d.standard_number, cs.standard_number) AS standard_number,
IF(cs.standard_id IS NOT NULL, d.standard_name, cs.standard_name) AS standard_name,
lms.country as applicableMarket,
cs.applicable_market,
cs.valuation_time,
cs.create_time,
cs.all_approval_user,
lms.country
cs.all_approval_user
from laws_conformity_assessment_library cs
left join laws_domestic_standard as d on d.id = cs.standard_id
left join laws_market_standard as lms on lms.id = cs.applicable_market) as t
left join laws_domestic_standard as d on d.id = cs.standard_id) as t
${ew.customSqlSegment}
</select>
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
+89 -2
View File
@@ -6,19 +6,23 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.CommonAPI;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.system.vo.SysDictItemCore;
import com.jero.common.util.FileUtils;
import com.jero.common.util.ZipUtil;
import com.jero.common.util.obs.ObsBootUtil;
import com.jero.modules.activiti.util.ExcelUtils;
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary;
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail;
import com.jero.modules.assessmentLibrary.entity.vo.LawsConformityAssessmentLibraryExportVO;
import com.jero.modules.assessmentLibrary.entity.vo.MaterialFile;
import com.jero.modules.assessmentLibrary.mapper.LawsConformityAssessmentLibraryMapper;
import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibraryService;
import com.jero.modules.laws.enterprise.util.BeanCopyUtils;
import com.jero.modules.laws.utils.ExcelExportUtilPro.MaterialFile;
import com.jero.modules.laws.utils.ExcelExportUtilPro.UnsatisfiedRequireAttachFile;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.sys.utils.UserUtils;
@@ -65,6 +69,12 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
@Resource
private LawsConformityAssessmentLibraryMapper lawsConformityAssessmentLibraryMapper;
@Resource
private ExcelUtils excelUtils;
@Resource
private CommonAPI commonAPI;
/**
* 法规管理员
*/
@@ -89,7 +99,8 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
if (StringUtils.isNotBlank(applicableMarkets)) {
String[] split = applicableMarkets.split(",");
for (String splitStr : split) {
queryWrapper.like("t.country", splitStr);
queryWrapper.likeRight("t.applicable_market", splitStr + "-").or()
.apply("FIND_IN_SET({0}, t.applicable_market) > 0", splitStr);
}
}
if (StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getSelections())) {
@@ -140,6 +151,7 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
@Override
public void export(HttpServletResponse response, LawsConformityAssessmentLibrary lawsConformityAssessmentLibrary, String fileName, String sheetName, HttpServletRequest req) {
List<SysDictItemCore> listDict = commonAPI.getDictItemAll();
String url = exportExcelTempPath.replace(EXPORT_EXCEL_TEMP, fileName);
File file = new File(url);
if (!file.exists()) {
@@ -180,6 +192,7 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
});
this.settleDocuments(url, "佐证材料", recordsExport);
this.settleDocumentsTwo(url, "辅助说明材料", recordsExport);
// 去除文本的<p>
String regex = "<[^>]*>";
@@ -196,8 +209,20 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
// 复制一份数据
List<LawsConformityAssessmentLibraryExportVO> newRecordsExport = new ArrayList<>(recordsExport);
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, LawsConformityAssessmentLibraryExportVO.class, recordsExport);
// 翻译评估结果和佐证材料字段
newRecordsExport.parallelStream().forEach(item -> {
String material = excelUtils.translateDictValue("id", "file_name", "oss_file", item.getMaterial(), listDict);
if (StrUtil.isNotBlank(material)) {
item.setMaterial("佐证材料/" + material);
}
String unsatisfiedRequireAttach = excelUtils.translateDictValue("id", "file_name", "oss_file", item.getUnsatisfiedRequireAttach(), listDict);
if (StrUtil.isNotBlank(unsatisfiedRequireAttach)) {
item.setUnsatisfiedRequireAttach("辅助说明材料/" + unsatisfiedRequireAttach);
}
});
// 生成超链接
generateHyperlink("佐证材料", newRecordsExport, workbook);
generateHyperlinkTwo("辅助说明材料", newRecordsExport, workbook);
// 导出excel
workbook.write(fos);
// 生成并导出zip
@@ -278,6 +303,33 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
}
}
private static void generateHyperlinkTwo(String folderName, List<LawsConformityAssessmentLibraryExportVO> vos, Workbook workbook) {
Sheet sheet = workbook.getSheetAt(0);
// 设置字体颜色、下划线
CellStyle cellStyle = workbook.createCellStyle();
Font font = workbook.createFont();
font.setColor(IndexedColors.BLUE.getIndex());
font.setUnderline(Font.U_SINGLE);
cellStyle.setFont(font);
cellStyle.setWrapText(true);
int i = 1;
for (LawsConformityAssessmentLibraryExportVO vo : vos) {
if (!Objects.isNull(vo.getUnsatisfiedRequireAttach()) && !vo.getUnsatisfiedRequireAttachList().isEmpty()) {
for (UnsatisfiedRequireAttachFile materialFile : vo.getUnsatisfiedRequireAttachList()) {
Row row = sheet.getRow(i);
Cell cell = row.getCell(19);
// 构建完整的超链接路径，包括文件夹名称
String hyperlinkPath = folderName + "/" + materialFile.getFileName();
cell.setCellFormula("HYPERLINK(\"" + hyperlinkPath + "\", \"" + materialFile.getFileName() + "\")");
cell.setCellStyle(cellStyle);
i += 1;
}
} else {
i += 1;
}
}
}
private void settleDocuments(String url, String folderName, List<LawsConformityAssessmentLibraryExportVO> excelVos) throws IOException {
// 构建完整的文件夹路径
String directoryPath = url + File.separator + folderName;
@@ -313,6 +365,41 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
}
}
private void settleDocumentsTwo(String url, String folderName, List<LawsConformityAssessmentLibraryExportVO> excelVos) throws IOException {
// 构建完整的文件夹路径
String directoryPath = url + File.separator + folderName;
// 检查文件夹是否存在，如果不存在则创建
File directory = new File(directoryPath);
if (!directory.exists()) {
directory.mkdirs(); // 使用mkdirs()而不是mkdir()，因为mkdirs()会创建所有必需的父目录
}
for (LawsConformityAssessmentLibraryExportVO vo : excelVos) {
// 查询文件
if (StringUtils.isNotBlank(vo.getUnsatisfiedRequireAttach())) {
List<String> fileIdList = Arrays.asList(vo.getUnsatisfiedRequireAttach().split(","));
List<OSSFile> ossFileList = ossFileService.listByIds(fileIdList);
if (!ossFileList.isEmpty()) {
// 赋值
List<UnsatisfiedRequireAttachFile> materialFileList = com.jero.common.util.BeanCopyUtils.copyBeanList(ossFileList, UnsatisfiedRequireAttachFile.class);
vo.setUnsatisfiedRequireAttachList(materialFileList);
// 写出文件
for (OSSFile ossFile : ossFileList) {
InputStream inputStream = ObsBootUtil.getOssFile(ossFile.getUrl());
// pdf加水印
if (StringUtils.endsWithIgnoreCase(ossFile.getFileName(), ".pdf")) {
inputStream = sysWaterMarkUtil.addWatermarkToPdf(inputStream);
}
// 构建文件保存路径，将文件保存在指定文件夹下
String filePath = url + File.separator + folderName + File.separator + ossFile.getFileName();
writeToLocal(filePath, inputStream);
}
}
}
}
}
/**
* 将InputStream写入本地文件
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
+26 -2
View File
@@ -6,16 +6,21 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.api.CommonAPI;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.SysDictItemCore;
import com.jero.common.util.FileUtils;
import com.jero.common.util.ZipUtil;
import com.jero.modules.activiti.util.ExcelUtils;
import com.jero.modules.assessmentLibrary.entity.AssessCommon;
import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary;
import com.jero.modules.assessmentLibrary.mapper.LawsEvaluationNotMetLibraryMapper;
import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibraryService;
import com.jero.modules.assessmentLibrary.service.ILawsEvaluationNotMetLibraryService;
import com.jero.modules.laws.utils.ExcelExportUtilPro;
import com.jero.modules.laws.utils.ExcelExportUtilPro.FileDetails;
import com.jero.modules.laws.utils.ExcelExportUtilPro.UnsatisfiedRequireAttachFile;
import com.jero.modules.sys.utils.UserUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -52,6 +57,10 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEval
private ExcelExportUtilPro excelExportUtilPro;
@Resource
private ILawsConformityAssessmentLibraryService calService;
@Resource
private CommonAPI commonAPI;
@Resource
private ExcelUtils excelUtils;
@Value("${jero.path.exportExcelTempPath}")
private String exportExcelTempPath;
@@ -101,6 +110,8 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEval
LawsEvaluationNotMetLibrary::getFile, lawsEvaluationNotMet.getFile());
wrapper.set(LawsEvaluationNotMetLibrary::getUpdateTime, new Date());
wrapper.set(LawsEvaluationNotMetLibrary::getUpdateBy, UserUtils.getCurrentUser().getUsername());
wrapper.set(LawsEvaluationNotMetLibrary::getCloseUser, UserUtils.getCurrentUser().getId());
wrapper.set(LawsEvaluationNotMetLibrary::getCloseTime, new Date());
wrapper.in(LawsEvaluationNotMetLibrary::getId, ids);
update(wrapper);
}
@@ -108,8 +119,8 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEval
@Override
public void export(HttpServletResponse response, LawsEvaluationNotMetLibrary lawsEvaluationNotMet, String fileName,
String sheetName, HttpServletRequest req) {
List<SysDictItemCore> listDict = commonAPI.getDictItemAll();
horizontalCheck(lawsEvaluationNotMet.getSelections());
String url = exportExcelTempPath.replace(EXPORT_EXCEL_TEMP, fileName);
File file = new File(url);
if (!file.exists()) {
@@ -121,7 +132,8 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEval
IPage<LawsEvaluationNotMetLibrary> lawsEvaluationNotMets = this.queryPage(lawsEvaluationNotMet, 1, Integer.MAX_VALUE, req);
List<LawsEvaluationNotMetLibrary> records = lawsEvaluationNotMets.getRecords();
excelExportUtilPro.settleDocuments(url, "附件", records, LawsEvaluationNotMetLibrary::obtainFileIds, LawsEvaluationNotMetLibrary::setFileList);
excelExportUtilPro.settleDocuments(url, "附件", records, LawsEvaluationNotMetLibrary::obtainFileIds, LawsEvaluationNotMetLibrary::setFileList, FileDetails.class);
excelExportUtilPro.settleDocuments(url, "辅助说明材料", records, LawsEvaluationNotMetLibrary::obtainFileTwoIds, LawsEvaluationNotMetLibrary::setFileListTwo, UnsatisfiedRequireAttachFile.class);
// 去除文本的<p>
String regex = "<[^>]*>";
@@ -138,8 +150,20 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEval
// 复制一份数据
List<LawsEvaluationNotMetLibrary> newRecordsExport = new ArrayList<>(records);
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, LawsEvaluationNotMetLibrary.class, records);
// 翻译评估结果和佐证材料字段
newRecordsExport.parallelStream().forEach(item -> {
String material = excelUtils.translateDictValue("id", "file_name", "oss_file", item.getFile(), listDict);
if (StrUtil.isNotBlank(material)) {
item.setFile("附件/" + material);
}
String unsatisfiedRequireAttach = excelUtils.translateDictValue("id", "file_name", "oss_file", item.getUnsatisfiedRequireAttach(), listDict);
if (StrUtil.isNotBlank(unsatisfiedRequireAttach)) {
item.setUnsatisfiedRequireAttach("辅助说明材料/" + unsatisfiedRequireAttach);
}
});
// 生成超链接
excelExportUtilPro.generateHyperlink("附件", newRecordsExport, workbook, LawsEvaluationNotMetLibrary::getFileList, 12);
excelExportUtilPro.generateHyperlink("辅助说明材料", newRecordsExport, workbook, LawsEvaluationNotMetLibrary::getFileList, 13);
// 导出excel
workbook.write(fos);
// 生成并导出zip
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+41 -3
View File
@@ -457,6 +457,36 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
* @Date: 2023/9/11 14:49
* @Description: 是否收藏标识判断
**/
private void collectionFlag(Map<String, Object> stringObjectMap) {
// 获取全部id集合
String id = String.valueOf(stringObjectMap.get("id"));
if (StrUtil.isBlank(id)) return;
// 获取登录用户
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 查询标准收藏表
LambdaQueryWrapper<LawsStandardCollection> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(LawsStandardCollection::getCollectorId, loginUser.getId());
queryWrapper.eq(LawsStandardCollection::getStandardId, id);
List<LawsStandardCollection> standardCollectionList = lawsStandardCollectionService.list(queryWrapper);
if (CollectionUtils.isEmpty(standardCollectionList)) {
stringObjectMap.put(FieldCommon.COLLECTION_FLAG, false);
return;
}
List<String> standardIdList = standardCollectionList.stream()
.map(LawsStandardCollection::getStandardId).collect(Collectors.toList());
if (standardIdList.contains(id)) {
stringObjectMap.put(FieldCommon.COLLECTION_FLAG, true);
} else {
stringObjectMap.put(FieldCommon.COLLECTION_FLAG, false);
}
}
/**
* @Author: liao
* @Date: 2023/9/11 14:49
* @Description: 标准详情是否收藏标识
**/
private void collectionFlag(List<Map<String, Object>> records) {
// 获取全部id集合
List<String> ids = records.stream().map(kv ->
@@ -1225,6 +1255,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
splitFlag(stringObjectMap);
// 添加固定字段
this.setFixedUserInfo(stringObjectMap, singleStandard);
// 标准收藏标识
collectionFlag(stringObjectMap);
// 对返回的字段做处理
return stringObjectMap;
}
@@ -1293,10 +1325,10 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
List<String> nodeCode = lawsTreeNodeList.stream()
.map(LawsTreeNode::getNodeCode).collect(Collectors.toList());
LambdaQueryWrapper<LawsNodeRelation> query = new LambdaQueryWrapper<>();
query.and(o->{
query.and(o -> {
for (int i = 0; i < nodeCode.size(); i++) {
o.likeRight(LawsNodeRelation::getNodeCode, nodeCode.get(i));
if(i != (nodeCode.size() - 1)){
if (i != (nodeCode.size() - 1)) {
o.or();
}
}
@@ -1689,10 +1721,16 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
headerList.remove(headerList.size() - 1);
headerList.add(inspectContentTag);
}
List<LawsDomesticStandard> list = lawsDomesticStandardService.list();
List<String> standardNoList = list.stream().map(LawsDomesticStandard::getStandardNumber)
.filter(e -> !e.contains("-") & !e.contains("—"))
.collect(Collectors.toList());
// 获取错误信息
errMsgList = importUtil.validExcelData(sheet, headerList, fileMap, insertDataList,
treeNodeMap, treeNodePathMap,
sysDeaprtMap, sysDepartPathMap);
sysDeaprtMap, sysDepartPathMap,
standardNoList);
}
return errMsgList;
}
laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+36 -2
View File
@@ -77,7 +77,8 @@ public class ImportUtil {
Map<String, List<LawsTreeNode>> treeNodeMap,
Map<String, String> treeNodePathMap,
Map<String, List<SysDepart>> sysDepartMap,
Map<String, String> sysDepartPathMap
Map<String, String> sysDepartPathMap,
List<String> fbStandardNoList
) {
List<String> errMsgList = new ArrayList<>();
Map<String, Integer> keyMap = new HashMap<>();
@@ -273,7 +274,6 @@ public class ImportUtil {
cellValue = this.convertDictValue(tag.getDictField(), cellValue);
}
}
// 组织机构
if (FieldShowTypeEnum.SINGLE_ORGANIZATION_DIALOG.getValue().equals(tag.getFieldShowType()) ||
FieldShowTypeEnum.MULTI_ORGANIZATION_DIALOG.getValue().equals(tag.getFieldShowType())) {
@@ -389,6 +389,12 @@ public class ImportUtil {
parameterMap.put(tag.getDbFieldName(), this.convertInspectContentFile(cellValue, fileMap));
}
}
// 企标稽查内容文件导入
if (FieldCommon.REFERENCE_STANDARD.equals(tag.getDbFieldName()) &&
TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(tag.getIsModel())) {
// 将转好的值加入Map
parameterMap.put(FieldCommon.REFERENCE_STANDARD, this.convertReferenceStandard(cellValue, fbStandardNoList));
}
}
if (errMsg.toString().contains("列") || errMsg.toString().contains("重复") || errMsg.toString().contains("已存在")) {
errMsgList.add(errMsg.toString());
@@ -399,6 +405,34 @@ public class ImportUtil {
return errMsgList;
}
private String convertReferenceStandard(String cellValue, List<String> fbStandardNoList) {
if (StrUtil.isBlank(cellValue)) {
return "";
}
List<String> standardNoList = new ArrayList<>(Arrays.asList(cellValue.split(",")));
Iterator<String> iterator = standardNoList.iterator();
List<String> addStandardNoList = new ArrayList<>();
while (iterator.hasNext()) {
String standardNo = iterator.next();
if (standardNo.contains("-") || standardNo.contains("—")) {
continue;
}
List<String> match = fbStandardNoList.stream().filter(s -> s.contains(standardNo)).collect(Collectors.toList());
if (!match.isEmpty()) {
iterator.remove();
addStandardNoList.addAll(match);
}
}
String result = String.join(",", standardNoList);
if (!addStandardNoList.isEmpty()) {
if (!result.isEmpty()) {
result += ",";
}
result += String.join(",", addStandardNoList);
}
return result;
}
// 体系校验
public boolean standardSystemValid(String cellValue, Map<String, List<LawsTreeNode>> treeNodeMap, Map<String, String> treeNodePathMap) {
String[] cellValues = cellValue.split(",");
laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBox.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class ManyStandardSelectionBox {
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "实施日期")
private java.util.Date implementationDate;
private java.lang.String implementationDate;
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "新认证车实施日期")
laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java
+8
View File
@@ -232,4 +232,12 @@ public interface DocumentSplitMapper extends BaseMapper<LawsDocumentSplit> {
List<ProcessStandardInterpretClause> selectClauseList(@Param("lawsDocumentSplit") LawsDocumentSplit lawsDocumentSplit);
List<ProcessStandardComplianceCheckDetail> selectClauseListScc(@Param("lawsDocumentSplit") LawsDocumentSplit lawsDocumentSplit);
/**
* 根据适用市场获取条款id
* @param countryList
* @return
*/
List<String> getSplitSelectIds(List<String> countryList);
}
laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
+10
View File
@@ -316,4 +316,14 @@
SET ${updateSet}
WHERE ${updateCondition}
</update>
<select id="getSplitSelectIds" resultType="java.lang.String">
select l2.id from laws_domestic_standard l1
left join sar_file_split_info l2 on l1.id = l2.standard_id and l2.del_flag = 0
where l1.del_flag = 0 and l2.id is not null
and
<foreach collection="countryList" separator="or" item= "item" open="(" close=")">
CONCAT(',',l1.applicable_market,',') like CONCAT('%,',#{item},',%')
</foreach>
</select>
</mapper>
laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+32 -14
View File
@@ -82,6 +82,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.web.util.HtmlUtils;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
@@ -194,6 +195,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
private static final String MENU_ID = "menu_id";
private static final String CREATE_TIME = "create_time";
private static final String SPLIT_STATUS = "split_status";
private static final String COUNTRY = "country";
private static final int NUMBER = 500;
@@ -481,25 +483,28 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
// 组织结构
List<LawsTag> lawsTags2 = fieldListSelect.stream()
.filter(j -> FieldCommon.GROUP.contains(j.getFieldShowType())).collect(Collectors.toList());
List<SysDict> sysDictList = sysDictService.list();
List<SysDictItem> sysDictItemList = sysDictItemService.list();
List<SysDepart> sysDepartListAll = sysDepartService.list();
records.parallelStream().forEach(map->{
for (LawsTag lawsTag : lawsTags) {
String dbFieldName = lawsTag.getDbFieldName();
if (map.containsKey(dbFieldName)){
// 字典查找
SysDict sysDict = sysDictService.getById(lawsTag.getDictId());
if (!Objects.isNull(sysDict)){
setDicText(map, dbFieldName, sysDict);
}
Optional<SysDict> op = sysDictList.stream().filter(o->Objects.equals(o.getId(),lawsTag.getDictId())).findFirst();
op.ifPresent(sysDict -> setDicText(map, dbFieldName, sysDict, sysDictItemList));
}
}
for (LawsTag lawsTag : lawsTags2) {
String dbFieldName = lawsTag.getDbFieldName();
if (map.containsKey(dbFieldName)){
List<SysDepart> sysDepartList =
sysDepartService.listByIds(Arrays.asList(map.get(dbFieldName).toString().split(",")));
List<String> itemTextList = sysDepartList.stream().map(SysDepart::getDepartName).collect(Collectors.toList());
map.put(dbFieldName + DocumentSplitCommon.DIC_TEXT, String.join(",", itemTextList));
if(!CollectionUtils.isEmpty(sysDepartListAll)){
List<SysDepart> sysDepartList = sysDepartListAll.stream().filter(o->
Arrays.asList(map.get(dbFieldName).toString().split(",")).contains(o.getId()))
.collect(Collectors.toList());
List<String> itemTextList = sysDepartList.stream().map(SysDepart::getDepartName).collect(Collectors.toList());
map.put(dbFieldName + DocumentSplitCommon.DIC_TEXT, String.join(",", itemTextList));
}
}
}
// 特殊翻译
@@ -529,12 +534,14 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
}
}
private void setDicText(Map<String, Object> map, String dbFieldName, SysDict sysDict) {
LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<SysDictItem>()
.eq(SysDictItem::getDictId, sysDict.getId())
.in(SysDictItem::getItemValue, Arrays.asList(map.get(dbFieldName).toString().split(",")));
private void setDicText(Map<String, Object> map, String dbFieldName, SysDict sysDict,List<SysDictItem> sysDictItemList) {
if(CollectionUtils.isEmpty(sysDictItemList)){
return;
}
// 字典值查询
List<SysDictItem> list = sysDictItemService.list(queryWrapper);
List<SysDictItem> list = sysDictItemList.stream().filter(o->Objects.equals(sysDict.getId(),o.getDictId()) &&
Arrays.asList(map.get(dbFieldName).toString().split(",")).contains(o.getItemValue()))
.collect(Collectors.toList());
if(!list.isEmpty()){
List<String> itemTextList = list.stream().map(SysDictItem::getItemText).collect(Collectors.toList());
map.put(dbFieldName + DocumentSplitCommon.DIC_TEXT, String.join(",", itemTextList));
@@ -1867,6 +1874,17 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
parameter.remove(MENU_ID);
}
}
// 适用市场
if (parameter.containsKey(COUNTRY) && !StringUtils.isBlank(parameter.get(COUNTRY).toString())){
// 查询市场下的标准
List<String> countryList = Arrays.asList(parameter.get(COUNTRY).toString().split(","));
List<String> ids = documentSplitMapper.getSplitSelectIds(countryList);
if(!CollectionUtils.isEmpty(ids)){
// in查询
selectCondition.append(" and s.info_id" + " in('").append(String.join("','",ids)).append("')");
}
parameter.remove(COUNTRY);
}
}
/**
laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml
-1
View File
@@ -58,7 +58,6 @@
sort_index DESC,
standard_type_order ASC,
standard_state_order ASC,
implementation_date DESC,
create_time DESC
</select>
<select id="getCount1" resultType="com.jero.modules.laws.home.vo.LawsHomeNormalSearchCountVO">
laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
+22 -22
View File
@@ -23,7 +23,6 @@ import com.jero.common.util.oConvertUtils;
import com.jero.modules.document.utils.ReadPdfUtil;
import com.jero.modules.document.utils.ReadWordUtil;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.mapper.LawsCommonMapper;
import com.jero.modules.laws.common.service.ILawsCommonService;
import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
import com.jero.modules.laws.home.common.LawsHomeSearchCommon;
@@ -34,8 +33,6 @@ import com.jero.modules.laws.home.mapper.LawsHomeSearchMapper;
import com.jero.modules.laws.home.service.ILawsHomeNormalSearchHistoryService;
import com.jero.modules.laws.home.service.ILawsHomeSearchService;
import com.jero.modules.laws.home.vo.*;
import com.jero.modules.laws.standard.controller.LawsDomesticController;
import com.jero.modules.laws.standard.controller.LawsEnterpriseController;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.entity.LawsNewsFeed;
@@ -49,7 +46,6 @@ import com.jero.modules.split.entity.SarFileSplitInfoEO;
import com.jero.modules.split.entity.SarFileSplitItemsValEO;
import com.jero.modules.split.mapper.SarFileSplitItemsValEOMapper;
import com.jero.modules.split.service.ISarFileSplitInfoService;
import com.jero.modules.system.service.ISysDictItemService;
import com.jero.modules.system.service.ISysDictService;
import com.jero.modules.tag.entity.LawsTag;
import com.jero.modules.tag.enums.TableNameEnum;
@@ -113,16 +109,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
@Resource
private ILawsTagService lawsTagService;
@Resource
private LawsDomesticController lawsDomesticController;
@Resource
private LawsEnterpriseController lawsEnterpriseController;
@Resource
private LawsCommonMapper lawsCommonMapper;
@Resource
private ISysDictService sysDictService;
@Resource
private ISysDictItemService sysDictItemService;
@Resource
private SarFileSplitItemsValEOMapper sarFileSplitItemsValEOMapper;
@Resource
private IDocumentSplitService documentSplitService;
@@ -767,12 +755,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
// mDesc44.put(order,"desc");
// m33.put("release_date",mDesc44);
// sort.add(m33);
Map<String,Object> m4 = new HashMap<>();
Map<String,Object> mDesc4 = new HashMap<>();
mDesc4.put(order,"desc");
m4.put(IMPLEMENTATION_DATE,mDesc4);
sort.add(m4);
// 实施日期改成多选，去掉了排序
// Map<String,Object> m4 = new HashMap<>();
// Map<String,Object> mDesc4 = new HashMap<>();
// mDesc4.put(order,"desc");
// m4.put(IMPLEMENTATION_DATE,mDesc4);
// sort.add(m4);
Map<String,Object> m5 = new HashMap<>();
Map<String,Object> mDesc5 = new HashMap<>();
@@ -1223,7 +1211,11 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
if(!Objects.isNull(lawsEnterpriseStandard)){
lawsHomeNormalSearchExportExcelVO.setStandardName(lawsEnterpriseStandard.getStandardName());
lawsHomeNormalSearchExportExcelVO.setStandardNumber(lawsEnterpriseStandard.getStandardNumber());
lawsHomeNormalSearchExportExcelVO.setImplementationDate(lawsEnterpriseStandard.getImplementationDate());
if(!Objects.isNull(lawsEnterpriseStandard.getImplementationDate())){
lawsHomeNormalSearchExportExcelVO.
setImplementationDate(new SimpleDateFormat("yyyy-MM-dd").
format(lawsEnterpriseStandard.getImplementationDate()));
}
}
}
lawsHomeNormalSearchExportExcelVOList.add(lawsHomeNormalSearchExportExcelVO);
@@ -1276,7 +1268,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
if(!Objects.isNull(lawsEnterpriseStandard)){
lawsHomeNormalSearchExportExcelVO.setStandardName(lawsEnterpriseStandard.getStandardName());
lawsHomeNormalSearchExportExcelVO.setStandardNumber(lawsEnterpriseStandard.getStandardNumber());
lawsHomeNormalSearchExportExcelVO.setImplementationDate(lawsEnterpriseStandard.getImplementationDate());
if(!Objects.isNull(lawsEnterpriseStandard.getImplementationDate())){
lawsHomeNormalSearchExportExcelVO.setImplementationDate(
new SimpleDateFormat("yyyy-MM-dd")
.format(lawsEnterpriseStandard.getImplementationDate()));
}
}
}
lawsHomeNormalSearchExportExcelVOList.add(lawsHomeNormalSearchExportExcelVO);
@@ -1844,7 +1841,10 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
case "7": obj.setStandardStateOrder("2");break;
default: obj.setStandardStateOrder("4");break;
}
obj.setImplementationDate(lawsEnterpriseStandard.getImplementationDate());
if(!Objects.isNull(lawsEnterpriseStandard.getImplementationDate())){
obj.setImplementationDate(new SimpleDateFormat("yyyy-MM-dd")
.format(lawsEnterpriseStandard.getImplementationDate()));
}
obj.setCreateTime(lawsEnterpriseStandard.getCreateTime());
obj.setReleaseDate(lawsEnterpriseStandard.getReleaseDate());
obj.setStandardState(lawsEnterpriseStandard.getStandardState());
@@ -2024,9 +2024,9 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
map.put(ENTERPRISE_STANDARD_STATE,"," + (StringUtils.isBlank(obj.getEnterpriseStandardState()) ? "" : obj.getEnterpriseStandardState()) + ",");
map.put("applicable_market","," + (StringUtils.isBlank(obj.getApplicableMarket()) ? "" : obj.getApplicableMarket()) + ",");
map.put("release_date",obj.getReleaseDate());
map.put(IMPLEMENTATION_DATE,StringUtils.isBlank(obj.getImplementationDate()) ? "" : obj.getImplementationDate());
// 没有时间 强行加入最早时间
try {
map.put(IMPLEMENTATION_DATE,Objects.isNull(obj.getImplementationDate()) ? new SimpleDateFormat(YYYY_MM_DD).parse("1900-01-01") : obj.getImplementationDate());
map.put("create_time_c",Objects.isNull(obj.getCreateTime()) ? new SimpleDateFormat(YYYY_MM_DD).parse("1900-01-01") : obj.getCreateTime());
}catch (Exception e){
log.error("文档库添加es失败",e);
laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchExportExcelVO.java
+2 -2
View File
@@ -41,6 +41,6 @@ public class LawsHomeNormalSearchExportExcelVO implements Serializable {
* 实施日期
*/
@ApiModelProperty(value = "实施日期")
@Excel(name = "实施日期", width = 20, format = "yyyy-MM-dd")
private Date implementationDate;
@Excel(name = "实施日期", width = 20)
private String implementationDate;
}
laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java
+1 -1
View File
@@ -107,7 +107,7 @@ public class LawsHomeNormalSearchVO implements Serializable {
@ApiModelProperty(value = "实施日期")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date implementationDate;
private String implementationDate;
/**
* 入库时间
*/
laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java
+2 -2
View File
@@ -68,7 +68,7 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa
// 获取当前日期往前90天以内创建的外部标准
LambdaQueryWrapper<LawsDomesticStandard> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.ne(LawsDomesticStandard::getStandardState, OutStandardStateEnum.ABOLISH.getStateValue());
queryWrapper.between(LawsDomesticStandard::getCreateTime, LocalDateTime.now().minusDays(90), LocalDateTime.now());
queryWrapper.ge(LawsDomesticStandard::getCreateTime, LocalDateTime.now().minusDays(90));
queryWrapper.orderByDesc(LawsDomesticStandard::getCreateTime);
IPage<LawsDomesticStandard> page = new Page<>(pageNo, pageSize);
return domesticStandardService.page(page, queryWrapper);
@@ -79,7 +79,7 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa
// 获取当前日期往前90天以内创建的企业标准
LambdaQueryWrapper<LawsEnterpriseStandard> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.ne(LawsEnterpriseStandard::getStandardState, StandardStateEnum.ABOLISH.getStateValue());
queryWrapper.between(LawsEnterpriseStandard::getCreateTime, LocalDateTime.now().minusDays(90), LocalDateTime.now());
queryWrapper.ge(LawsEnterpriseStandard::getCreateTime, LocalDateTime.now().minusDays(90));
queryWrapper.orderByDesc(LawsEnterpriseStandard::getCreateTime);
IPage<LawsEnterpriseStandard> page = new Page<>(pageNo, pageSize);
IPage<LawsEnterpriseStandard> dataPage = enterpriseStandardService.page(page, queryWrapper);
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml
+1 -1
View File
@@ -74,6 +74,6 @@
<foreach collection="str" separator="," open="(" close=")" item="item">
#{item}
</foreach>
order by s2.create_time asc
order by s2.item_value asc limit 1
</select>
</mapper>
laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsDomesticStandard.java
+1 -1
View File
@@ -98,7 +98,7 @@ public class LawsDomesticStandard implements Serializable {
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "实施日期")
private java.util.Date implementationDate;
private java.lang.String implementationDate;
/**在产车实施日期*/
@Excel(name = "新认证车实施日期", width = 15)
@ApiModelProperty(value = "新认证车实施日期")
laws-modules/src/main/java/com/jero/modules/laws/utils/ExcelExportUtilPro.java
+31 -6
View File
@@ -39,8 +39,30 @@ public class ExcelExportUtilPro {
@ApiModelProperty(value = "id")
private String id;
@Excel(name = "附件/佐证材料", width = 15)
@ApiModelProperty(value = "附件/佐证材料")
@Excel(name = "附件", width = 15)
@ApiModelProperty(value = "附件")
private String fileName;
}
@Setter
@Getter
public static class MaterialFile {
@ApiModelProperty(value = "id")
private String id;
@Excel(name = "佐证材料", width = 15)
@ApiModelProperty(value = "佐证材料")
private String fileName;
}
@Setter
@Getter
public static class UnsatisfiedRequireAttachFile {
@ApiModelProperty(value = "id")
private String id;
@Excel(name = "辅助说明材料", width = 15)
@ApiModelProperty(value = "辅助说明材料")
private String fileName;
}
@@ -78,9 +100,10 @@ public class ExcelExportUtilPro {
return cellStyle;
}
public <T> void settleDocuments(String url, String folderName, List<T> items,
Function<T, List<String>> fileIdProvider,
BiConsumer<T, List<FileDetails>> fileDetailsConsumer) throws IOException {
public <T, R> void settleDocuments(String url, String folderName, List<T> items,
Function<T, List<String>> fileIdProvider,
BiConsumer<T, List<R>> fileDetailsConsumer,
Class<R> fileDetailsClass) throws IOException {
// 构建完整的文件夹路径
String directoryPath = url + File.separator + folderName;
@@ -95,7 +118,8 @@ public class ExcelExportUtilPro {
if (fileIdList != null && !fileIdList.isEmpty()) {
List<OSSFile> ossFileList = ossFileService.listByIds(fileIdList);
if (!ossFileList.isEmpty()) {
List<FileDetails> fileDetailsList = BeanCopyUtils.copyBeanList(ossFileList, FileDetails.class);
// 将OSSFile列表复制为泛型R的列表
List<R> fileDetailsList = BeanCopyUtils.copyBeanList(ossFileList, fileDetailsClass);
fileDetailsConsumer.accept(item, fileDetailsList);
for (OSSFile ossFile : ossFileList) {
InputStream inputStream = ObsBootUtil.getOssFile(ossFile.getUrl());
@@ -110,6 +134,7 @@ public class ExcelExportUtilPro {
}
}
public void writeToLocal(String filePath, InputStream input) throws IOException {
int index;
byte[] bytes = new byte[1024];
laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java
+1 -2
View File
@@ -92,9 +92,8 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
@PostMapping(value = "/importSplitResult")
@RequiresPermissions("split:sarFileSplitInfo:splitResult")
public Result<?> importSplitResult(@ApiParam("标准拆分条id") String splitFileId,
@ApiParam("国际化") String cut,
SarFileSplitInfoEO splitInfoEO) throws IOException {
cut = CutUtils.getCurrentCut();
String cut = CutUtils.getCurrentCut();
return fileSplitItemsEOService.importSplitResult(splitFileId, cut,splitInfoEO);
}
laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
+7
View File
@@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -156,4 +157,10 @@ public class SarFileSplitInfoEO implements Serializable {
@ApiModelProperty(value = "标准类别")
@TableField(exist = false)
private String standardClass;
/**
* 识别父子关系
*/
@ApiModelProperty(value = "识别父子关系")
@TableField(exist = false)
private String childParentLink;
}
laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml
+5 -2
View File
@@ -375,8 +375,11 @@
select * from SAR_FILE_SPLIT_MENU
where parent_id = #{parentId}
AND valid_flag = '0'
and display_seq > #{displaySeq}
order by display_seq desc
<if test="displaySeq != null">
and display_seq > #{displaySeq}
</if>
order by display_seq
</select>
<select id="queryByGTDisplaySeq" resultMap="BaseResultMap">
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+58 -36
View File
@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.constant.CommonConstant;
import com.jero.common.constant.enums.IsMustEnum;
import com.jero.common.constant.enums.LanguageEnum;
import com.jero.common.constant.enums.ModuleEnum;
@@ -1987,11 +1988,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
HashMap<String, String> menuAndItemMap = new HashMap<>();
List<SarFileSplitMenuTreeNode> treeList = new ArrayList<>();
List<Map<String, Object>> itemsEOList = new ArrayList<>(addItemsEOList);
if (splitStandardClass.contains(sarFileSplitInfoEO.getStandardClass())){
treeList = buildTree2(itemsEOList, treeListDisplay, menuId);
}else {
treeList = buildTree(itemsEOList, treeListDisplay, menuId);
}
//if (splitStandardClass.contains(sarFileSplitInfoEO.getStandardClass())){
// treeList = buildTree2(itemsEOList, treeListDisplay, menuId);
//}else {
//识别父子关系
String childParentLink = sarFileSplitInfoEO.getChildParentLink();
treeList = buildTree(itemsEOList, treeListDisplay, menuId, childParentLink);
//}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId();
for (SarFileSplitMenuTreeNode treeNode : treeList) {
@@ -2210,7 +2214,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
// 校验名称
File file1 = excelfilelist.get(0);
String name = file1.getName().substring(0, file1.getName().lastIndexOf("."));
if(!"条款导入模板,clauseImport".contains(name)){
if(!name.contains("条款导入模板")){
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
@@ -2259,10 +2263,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
}
SplitTableInfo splitTableInfo = new SplitTableInfo();
splitTableInfo.setTableName(sheet.getSheetName());
String tableHtml = POIReadExcelToHtml.readExcelToHtml(workbook,i,false);
tableHtml = tableHtml.replaceAll("\'","\"");
tableHtml = tableHtml.replaceAll("style","border=\"1\" style");// 解决导入的表格没线
splitTableInfo.setTableHtml(tableHtml);
try {
String tableHtml = POIReadExcelToHtml.readExcelToHtml(workbook,i,false);
tableHtml = tableHtml.replaceAll("\'","\"");
tableHtml = tableHtml.replaceAll("style","border=\"1\" style");// 解决导入的表格没线
splitTableInfo.setTableHtml(tableHtml);
}catch (Exception e){
throw new JeroBootException(sheet.getSheetName() + "页签数据异常");
}
getSheetTableList.add(splitTableInfo);
}
int i = 0 ;
@@ -3173,7 +3181,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
}
countError++;
valueList = Collections.emptyList();
break;
continue;
}else {
valueList.add(first.get().getId());
}
@@ -3218,7 +3226,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} else {
errorMsg += fieldName + " " + treePath + "Exist in multiple;";
}
break;
continue;
}
valueList.add(pathOther.get(0).getItemValue());
}else{
@@ -3229,7 +3237,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} else {
errorMsg += fieldName + " " + treePath + "Not exist;";
}
break;
continue;
}
}
}else {
@@ -3246,7 +3254,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} else {
errorMsg += fieldName + " " + treePath + "Exist in multiple;";
}
break;
continue;
}
valueList.add(pathOther.get(0).getItemValue());
}else{
@@ -3257,7 +3265,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} else {
errorMsg += fieldName + " " + treePath + "Not exist;";
}
break;
continue;
}
}
}
@@ -3280,7 +3288,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} else {
errorMsg += fieldName + " " + treePath + "Exist in multiple;";
}
break;
continue;
}
valueList.add(path.get(0).getCode());
}else {
@@ -3291,7 +3299,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} else {
errorMsg += fieldName + " " + treePath + "Not exist;";
}
break;
continue;
}
}
}
@@ -3524,9 +3532,10 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
* @param addItemsEOList
* @param treeListDisplay
* @param menuId
* @param childParentLink
* @return
*/
private List<SarFileSplitMenuTreeNode> buildTree(List<Map<String, Object>> addItemsEOList, Long treeListDisplay, String menuId){
private List<SarFileSplitMenuTreeNode> buildTree(List<Map<String, Object>> addItemsEOList, Long treeListDisplay, String menuId, String childParentLink){
//排序
// addItemsEOList.sort(new DirectoryComparator());
@@ -3540,31 +3549,44 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
SarFileSplitMenuTreeNode treeNode = new SarFileSplitMenuTreeNode();
treeNode.setId(UUIDUtils.randomUUID20());
treeNode.setName(itemNum);
if(itemNum.matches(regex)) {
//父级是 总目录时，不做处理
if(itemNum.contains(".")) {
String parentName = itemNum.substring(0, itemNum.lastIndexOf("."));
treeNode.setParentName(parentName);
if(CommonConstant.STATUS_1.equals(childParentLink)){
if(itemNum.matches(regex)) {
//父级是 总目录时，不做处理
if(itemNum.contains(".")) {
String parentName = itemNum.substring(0, itemNum.lastIndexOf("."));
treeNode.setParentName(parentName);
List<SarFileSplitMenuTreeNode> p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(p)) {
//其他节点
treeNode.setParentId(p.get(0).getId());
List<SarFileSplitMenuTreeNode> p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(p)) {
//其他节点
treeNode.setParentId(p.get(0).getId());
}else{
//一级节点
treeNode.setParentId(menuId);
}
}else{
//一级节点
treeNode.setParentId(menuId);
}
}else{
}
else
if (StringUtils.isBlank(itemTitle)){
treeNode.setParentId(parentId);
}
else{
treeNode.setParentId(menuId);
parentId = treeNode.getId();
}
}else {
if (StringUtils.isBlank(itemTitle)){
treeNode.setParentId(parentId);
}
else{
treeNode.setParentId(menuId);
parentId = treeNode.getId();
}
}
else if (StringUtils.isBlank(itemTitle)){
treeNode.setParentId(parentId);
}
else{
treeNode.setParentId(menuId);
parentId = treeNode.getId();
}
++treeListDisplay;
treeNode.setOrderNum(treeListDisplay);
treeNode.setItemName(itemTitle);
laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
+47 -22
View File
@@ -377,30 +377,55 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
public void updateMenuLevel(String sourceIds, String parentId, Long displaySeq) {
// 要移动到的节点信息
SarFileSplitMenuEO parentMenu = baseMapper.findById(parentId);
// 获取要移动到的层级的最后一个 的排序值
List<SarFileSplitMenuEO> lastMenuList = getLastMenu(parentMenu.getId(),displaySeq);
Long menuDisplaySeq = parentMenu.getDisplaySeq();
List<String> sourceIdList = Arrays.asList(sourceIds.split(","));
int size = sourceIdList.size();
for (SarFileSplitMenuEO sarFileSplitMenuEO : lastMenuList) {
Long displaySeq1 = sarFileSplitMenuEO.getDisplaySeq();
sarFileSplitMenuEO.setDisplaySeq(displaySeq1+size);
baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
}
if(displaySeq == 0){
displaySeq = parentMenu.getDisplaySeq();
}
//this.updateBatchById(lastMenuList);
List<SarFileSplitMenuEO> updateList = new ArrayList<>();
for (int i = 0; i < sourceIdList.size(); i++) {
String sourceId = sourceIdList.get(i);
// 要移动的节点信息
SarFileSplitMenuEO sarFileSplitMenuEO = baseMapper.findById(sourceId);
sarFileSplitMenuEO.setParentId(parentId);
sarFileSplitMenuEO.setDisplaySeq(displaySeq+i+1);
updateList.add(sarFileSplitMenuEO);
baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
List<SarFileSplitMenuEO> lastMenuList;
//是否是放到最后
boolean equals = Objects.equals(menuDisplaySeq, displaySeq);
if (equals){
// 获取要移动到的层级的最后一个 的排序值
lastMenuList = getLastMenu(parentMenu.getId(),null);
int size = lastMenuList.size();
for (int i = 0; i < size; i++) {
SarFileSplitMenuEO sarFileSplitMenuEO = lastMenuList.get(i);
sarFileSplitMenuEO.setDisplaySeq(menuDisplaySeq+i+1);
baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
}
if(displaySeq == 0){
displaySeq = menuDisplaySeq;
}
for (int i = 0; i < sourceIdList.size(); i++) {
String sourceId = sourceIdList.get(i);
// 要移动的节点信息
SarFileSplitMenuEO sarFileSplitMenuEO = baseMapper.findById(sourceId);
sarFileSplitMenuEO.setParentId(parentId);
sarFileSplitMenuEO.setDisplaySeq(displaySeq+size+i+1);
baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
}
}else {
// 获取要移动到的层级的最后一个 的排序值
lastMenuList = getLastMenu(parentMenu.getId(),displaySeq);
int size = sourceIdList.size();
for (SarFileSplitMenuEO sarFileSplitMenuEO : lastMenuList) {
Long displaySeq1 = sarFileSplitMenuEO.getDisplaySeq();
sarFileSplitMenuEO.setDisplaySeq(displaySeq1+size);
baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
}
if(displaySeq == 0){
displaySeq = parentMenu.getDisplaySeq();
}
for (int i = 0; i < sourceIdList.size(); i++) {
String sourceId = sourceIdList.get(i);
// 要移动的节点信息
SarFileSplitMenuEO sarFileSplitMenuEO = baseMapper.findById(sourceId);
sarFileSplitMenuEO.setParentId(parentId);
sarFileSplitMenuEO.setDisplaySeq(displaySeq+i+1);
baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
}
}
//this.updateBatchById(updateList);
// 要移动的节点所有子集（包括本身）
//List<SarFileSplitMenuEO> sarFileSplitMenuEO1List = new ArrayList<>();
laws-single-startup/src/main/resources/application-dev.yml
+1 -1
View File
@@ -147,7 +147,7 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000;druid.stat.logSlowSql\=true
datasource:
master:
url: jdbc:p6spy:mysql://10.10.10.44:3306/laws_chery_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
url: jdbc:p6spy:mysql://10.10.10.44:3306/laws_chery_dev_init?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: root
password: hzwlsoft.com
driver-class-name: com.p6spy.engine.spy.P6SpyDriver