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

update 标准法规

Browse Source
This commit is contained in:
liao
2023-09-18 17:26:11 +08:00
parent 08d150cada
commit a52b8e1389
11 changed files with 110 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java
+4 -2
View File
@@ -35,8 +35,8 @@ public class FieldCommon {
public static final List<String> TYPE_DICT = Arrays.asList(
LawsFieldTypeEnum.OPTION_SINGLE.getValue(), // 下拉单选
LawsFieldTypeEnum.OPTION_MANY.getValue(), // 下拉多选
LawsFieldTypeEnum.TREE_BOX.getValue(), // 树型单选
LawsFieldTypeEnum.TREE_BOX_SINGLE.getValue() // 树型多选
LawsFieldTypeEnum.TREE_BOX.getValue(), // 树型多选
LawsFieldTypeEnum.TREE_BOX_SINGLE.getValue() // 树型单选
);
public static final String MODULE = "module"; // 表名标识
@@ -56,6 +56,8 @@ public class FieldCommon {
public static final String YEAR_NUMBER = "year_number";
// 标准名称
public static final String STANDARD_NAME = "standard_name";
// 标准体系
public static final String STANDARD_SYSTEM = "standard_system";
// 标准类别
public static final String STANDARD_CLASS = "standard_class";
// 字典值统一后缀
laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java
+7
View File
@@ -83,4 +83,11 @@ public interface LawsCommonMapper {
IPage<ManyStandardSelectionBox> getManyStandardSelectionBox(Page<ManyStandardSelectionBox> page,
@Param("vo") ManyStandardSelectionBoxVO selectionBoxVO);
/**
* @Author: liao
* @Date: 2023/9/18 17:14
* @Description: 根据标准编号查询简单标准
**/
ManyStandardSelectionBox getSingleStandard(@Param("standardNumber") String standardNumber);
}
laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml
+17
View File
@@ -54,5 +54,22 @@
AND id not in (select unique_relation_flag from laws_node_relation where node_code = #{vo.nodeCode})
</if>
</select>
<select id="getSingleStandard" resultType="com.jero.modules.laws.common.vo.ManyStandardSelectionBox">
SELECT id, standard_number, standard_name, release_date, standard_state
FROM laws_domestic_standard
WHERE del_flag = 0 AND standard_number = #{standardNumber}
UNION ALL
SELECT id, standard_number, standard_name, release_date, standard_state
FROM laws_overseas_standard
WHERE del_flag = 0 AND standard_number = #{standardNumber}
UNION ALL
SELECT id, standard_number, standard_name, release_date, standard_state
FROM laws_enterprise_standard
WHERE del_flag = 0 AND standard_number = #{standardNumber}
</select>
</mapper>
laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java
+7
View File
@@ -91,4 +91,11 @@ public interface ILawsCommonService {
* @Description: 生成法规编号
**/
void setStandardNumber(Map<String, Object> parameterMap);
/**
* @Author: liao
* @Date: 2023/9/18 17:02
* @Description: 根据标准编号查询简单标准
**/
ManyStandardSelectionBox getSingleStandard(String standardNumber);
}
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+30 -3
View File
@@ -15,6 +15,7 @@ import com.jero.modules.laws.common.service.ILawsCommonService;
import com.jero.modules.laws.common.vo.ManyStandardSelectionBox;
import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO;
import com.jero.modules.laws.standard.entity.LawsNodeRelation;
import com.jero.modules.laws.standard.service.ILawsNodeRelationService;
import com.jero.modules.laws.standard.service.ILawsUpdateRecordService;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
@@ -36,6 +37,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
@@ -66,6 +68,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
private ILawsUpdateRecordService lawsUpdateRecordService;
@Autowired
private ISysDictItemService sysDictItemService;
@Autowired
private ILawsNodeRelationService lawsNodeRelationService;
/**
* @Author: liao
@@ -284,17 +288,26 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
* @Description: 通用新增数据
**/
@Override
@Transactional
public String commonAdd(Map<String, Object> parameterMap) {
// 法规编号不能为空
String standardNumber = (String) parameterMap.get(FieldCommon.STANDARD_NUMBER);
if (StringUtils.isBlank(standardNumber)) {
throw new JeroBootException(ResultCommon.EMPTY_STANDARD_NUMBER, "");
throw new JeroBootException(ResultCommon.EMPTY_STANDARD_NUMBER);
}
// 标准名称不能为空
String standardName = (String) parameterMap.get(FieldCommon.STANDARD_NAME);
if (StringUtils.isBlank(standardName)) {
throw new JeroBootException(ResultCommon.EMPTY_STANDARD_NAME, "");
throw new JeroBootException(ResultCommon.EMPTY_STANDARD_NAME);
}
// 标准体系不能为空
String standardSystem = (String) parameterMap.get(FieldCommon.STANDARD_SYSTEM);
if (StringUtils.isBlank(standardSystem)) {
throw new JeroBootException(ResultCommon.EMPTY_COMMON, FieldCommon.STANDARD_SYSTEM);
}
// 将更新数据库的标准体系字段设置为空
parameterMap.put(FieldCommon.STANDARD_SYSTEM, "");
// 获取操作模块
String module = (String) parameterMap.get(FieldCommon.MODULE);
@@ -325,6 +338,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
}
// 操作数据库进行新增数据
lawsCommonMapper.commonAdd(tableName, fieldsBuilder.toString(), valuesBuilder.toString());
// 增加入库记录
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss");
@@ -333,6 +347,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
standardNumber + "《" + standardName + "》";
lawsUpdateRecordService.addRecord(standardNumber, content);
// 对标准体系做处理
lawsNodeRelationService.addRelation(standardSystem, standardNumber);
return MessageUtils.getMessage(ResultCommon.OK);
}
@@ -538,7 +555,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
}
List<String> idList = Arrays.asList(ids.split(","));
// 操作数据库进行删除操作
int rowsDeleted = lawsCommonMapper.logicalDeleteByIdsAndModule(tableName, idList);
int rowsDeleted = lawsCommonMapper.deleteByIdsAndModule(tableName, idList);
if (rowsDeleted > 0) {
return MessageUtils.getMessage(ResultCommon.OK);
}
@@ -594,6 +611,16 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
parameterMap.put(FieldCommon.STANDARD_NUMBER, standardNumber);
}
/**
* @Author: liao
* @Date: 2023/9/18 17:03
* @Description: 根据标准编号查询简单标准
**/
@Override
public ManyStandardSelectionBox getSingleStandard(String standardNumber) {
return lawsCommonMapper.getSingleStandard(standardNumber);
}
/**
* @Author: liao
* @Date: 2023/8/24 9:53
laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsDomesticStandard.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class LawsDomesticStandard implements Serializable {
/**所属部门*/
@Excel(name = "所属部门", width = 15)
@ApiModelProperty(value = "所属部门")
private java.lang.String sysCode;
private java.lang.String orgCode;
/**0表示未删除,1表示删除*/
@Excel(name = "0表示未删除,1表示删除", width = 15)
@ApiModelProperty(value = "0表示未删除,1表示删除")
laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsOverseasStandard.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class LawsOverseasStandard implements Serializable {
/**所属部门*/
@Excel(name = "所属部门", width = 15)
@ApiModelProperty(value = "所属部门")
private java.lang.String sysCode;
private java.lang.String orgCode;
/**0表示未删除,1表示删除*/
@Excel(name = "0表示未删除,1表示删除", width = 15)
@ApiModelProperty(value = "0表示未删除,1表示删除")
laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsDomesticStandardMapper.xml
+2 -2
View File
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.laws.domestic.mapper.LawsDomesticStandardMapper">
<mapper namespace="com.jero.modules.laws.standard.mapper.LawsDomesticStandardMapper">
<resultMap id="LawsDomesticStandardResultMap" type="com.jero.modules.laws.standard.entity.LawsDomesticStandard">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_code" property="sysCode" />
<result column="org_code" property="orgCode" />
<result column="del_flag" property="delFlag" />
<result column="standard_property" property="standardProperty" />
<result column="standard_class" property="standardClass" />
laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsOverseasStandardMapper.xml
+2 -2
View File
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.laws.domestic.mapper.LawsOverseasStandardMapper">
<mapper namespace="com.jero.modules.laws.standard.mapper.LawsOverseasStandardMapper">
<resultMap id="LawsOverseasStandardResultMap" type="com.jero.modules.laws.standard.entity.LawsOverseasStandard">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_code" property="sysCode" />
<result column="org_code" property="orgCode" />
<result column="del_flag" property="delFlag" />
<result column="country_or_region" property="countryOrRegion" />
<result column="standard_class" property="standardClass" />
laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNodeRelationService.java
+7
View File
@@ -25,4 +25,11 @@ public interface ILawsNodeRelationService extends IService<LawsNodeRelation> {
**/
void removeStandard(String nodeCode, String ids);
/**
* @Author: liao
* @Date: 2023/9/13 10:52
* @Description: 新增标准时添加体系关联
**/
void addRelation(String nodeIds, String standardNumber);
}
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNodeRelationServiceImpl.java
+32 -2
View File
@@ -2,10 +2,15 @@ package com.jero.modules.laws.standard.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsNodeRelation;
import com.jero.modules.laws.standard.entity.LawsTreeNode;
import com.jero.modules.laws.standard.mapper.LawsNodeRelationMapper;
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
import com.jero.modules.laws.standard.service.ILawsNodeRelationService;
import com.jero.modules.laws.standard.service.ILawsTreeNodeService;
import com.spire.ms.System.Collections.ArrayList;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.jero.common.exception.JeroBootException;
@@ -25,6 +30,11 @@ import java.util.List;
@Transactional(rollbackFor = JeroBootException.class)
public class LawsNodeRelationServiceImpl extends ServiceImpl<LawsNodeRelationMapper, LawsNodeRelation> implements ILawsNodeRelationService {
@Autowired
private ILawsTreeNodeService lawsTreeNodeService;
@Autowired
private ILawsDomesticStandardService lawsDomesticStandardService;
/**
* @Author: liao
* @Date: 2023/9/13 14:26
@@ -33,16 +43,23 @@ public class LawsNodeRelationServiceImpl extends ServiceImpl<LawsNodeRelationMap
@Override
public void relatedStandard(String nodeCode, String ids) {
// 标准id集合
List<String> idList = Arrays.asList(ids.split(FieldCommon.SEPARATOR));
List<String> idList = Arrays.asList(ids.split(","));
// 添加之前先删除原来存储的
removeStandard(nodeCode, ids);
// 根据nodeCode查询nodeId
LambdaQueryWrapper<LawsTreeNode> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(LawsTreeNode::getNodeCode, nodeCode);
LawsTreeNode treeNode = lawsTreeNodeService.getOne(queryWrapper);
// 批量添加到数据库
List<LawsNodeRelation> relationList = new ArrayList();
idList.forEach(id -> {
LawsNodeRelation relation = new LawsNodeRelation();
relation.setNodeCode(nodeCode);
relation.setNodeId(treeNode.getId());
relation.setUniqueRelationFlag(id);
relationList.add(relation);
});
@@ -56,11 +73,24 @@ public class LawsNodeRelationServiceImpl extends ServiceImpl<LawsNodeRelationMap
**/
@Override
public void removeStandard(String nodeCode, String ids) {
List<String> idList = Arrays.asList(ids.split(FieldCommon.SEPARATOR));
List<String> idList = Arrays.asList(ids.split(","));
LambdaQueryWrapper<LawsNodeRelation> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(LawsNodeRelation::getNodeCode, nodeCode);
queryWrapper.in(LawsNodeRelation::getUniqueRelationFlag, idList);
remove(queryWrapper);
}
/**
* @Author: liao
* @Date: 2023/9/18 16:29
* @Description: 新增标准时添加体系关联
**/
@Override
public void addRelation(String nodeIds, String standardNumber) {
// 根据standardNumber查询标准id
LambdaQueryWrapper<LawsDomesticStandard> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(LawsDomesticStandard::getStandardNumber, standardNumber);
}
}