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

ci: 生成标准文件表相关文件

Browse Source
This commit is contained in:
mzaxd
2023-09-20 11:38:07 +08:00
parent 34b7a5b95b
commit aa5f4c9c85
20 changed files with 257 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java
+4 -4
View File
@@ -20,7 +20,7 @@ import com.jero.modules.docTranslation.enums.ReleaseConditionEnum;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
import com.jero.modules.laws.standard.service.EnterpriseStandardService;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
import com.jero.modules.system.util.MyStringUtils;
@@ -60,7 +60,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
@Autowired
private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准
@Autowired
private EnterpriseStandardService enterpriseStandardService; //企业标准
private ILawsEnterpriseStandardService ILawsEnterpriseStandardService; //企业标准
/**
* 分页列表查询
@@ -117,7 +117,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
info.setStandardSourceLeft(CommonConstant.STANDARD_SOURCE_2);
info.setStandardIdLeft(standard1.getId());
}else {
LawsEnterpriseStandard standard2 = enterpriseStandardService.queryByStandardNumber(serialNumberLeft);
LawsEnterpriseStandard standard2 = ILawsEnterpriseStandardService.queryByStandardNumber(serialNumberLeft);
if (standard2 != null){
info.setStandardSourceLeft(CommonConstant.STANDARD_SOURCE_3);
info.setStandardIdLeft(standard2.getId());
@@ -136,7 +136,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
info.setStandardSourceRight(CommonConstant.STANDARD_SOURCE_2);
info.setStandardIdRight(standard1.getId());
}else {
LawsEnterpriseStandard standard2 = enterpriseStandardService.queryByStandardNumber(serialNumberRight);
LawsEnterpriseStandard standard2 = ILawsEnterpriseStandardService.queryByStandardNumber(serialNumberRight);
if (standard2 != null){
info.setStandardSourceRight(CommonConstant.STANDARD_SOURCE_3);
info.setStandardIdRight(standard2.getId());
laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java
+20
View File
@@ -23,10 +23,30 @@ public interface ILawsCommonService {
**/
IPage<Map<String,Object>> getCommonPage(Map<String, Object> parameterMap);
/**
* 获取导出的数据
* @param parameterMap
* @param headers
* @return
*/
IPage<Map<String, Object>> getExportData(Map<String, Object> parameterMap, List<LawsTag> headers);
/**
* 获取导出表头
* @param parameterMap
* @return
*/
List<LawsTag> getExportHeader(Map<String, Object> parameterMap);
/**
* 获取导出表头（带文件字段）
* @param parameterMap
* @return
*/
List<LawsTag> getExportHeaderWithFile(Map<String, Object> parameterMap);
/**
* @Author: liao
* @Date: 2023/8/24 9:09
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+20
View File
@@ -189,6 +189,23 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
return fieldList;
}
@Override
public List<LawsTag> getExportHeaderWithFile(Map<String, Object> parameterMap) {
// 获取操作模块
String module = (String) parameterMap.get(FieldCommon.MODULE);
// 获取要操作的表名
String tableName = TableNameEnum.getTableName(module);
// 获取全部字段
List<LawsTag> fieldList = lawsCommonMapper.getFieldList(tableName);
// 筛选表单显示的字段（传id查表单）
// 详情显示
fieldList = fieldList.stream()
.filter(lawsTag -> YesOrNoEnum.YES.getValue().equals(lawsTag.getIsShowForm().toString()))
.collect(Collectors.toList());
return fieldList;
}
/**
* @Author: liao
* @Date: 2023/9/11 14:49
@@ -864,6 +881,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
// 获取数据
IPage<Map<String, Object>> commonPage = this.getExportData(parameterMap, headers);
List<Map<String, Object>> records = commonPage.getRecords();
// 获取所有标准主键id
// 将文件名设置回数据列表
XSSFWorkbook workbook = new XSSFWorkbook();
XSSFSheet sheet = workbook.createSheet(sheetName);
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthDeptService.java
+2 -2
View File
@@ -2,7 +2,7 @@ package com.jero.modules.laws.enterprise.service;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.laws.standard.entity.StandardTempPermission;
import com.jero.modules.laws.standard.entity.LawsStandardTempPermission;
/**
* @author ThinkBook
@@ -11,5 +11,5 @@ import com.jero.modules.laws.standard.entity.StandardTempPermission;
*/
public interface EnterpriseStandardAuthDeptService extends IService<EnterpriseStandardAuthDept> {
void saveTempPermission(StandardTempPermission standardTempPermission);
void saveTempPermission(LawsStandardTempPermission lawsStandardTempPermission);
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthUserService.java
+2 -2
View File
@@ -2,7 +2,7 @@ package com.jero.modules.laws.enterprise.service;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.laws.standard.entity.StandardTempPermission;
import com.jero.modules.laws.standard.entity.LawsStandardTempPermission;
/**
* @author ThinkBook
@@ -11,5 +11,5 @@ import com.jero.modules.laws.standard.entity.StandardTempPermission;
*/
public interface EnterpriseStandardAuthUserService extends IService<EnterpriseStandardAuthUser> {
void saveTempPermission(StandardTempPermission standardTempPermission);
void saveTempPermission(LawsStandardTempPermission lawsStandardTempPermission);
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java
+6 -7
View File
@@ -3,10 +3,9 @@ package com.jero.modules.laws.enterprise.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService;
import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardAuthDeptMapper;
import com.jero.modules.laws.standard.entity.StandardTempPermission;
import com.jero.modules.laws.standard.entity.LawsStandardTempPermission;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -26,15 +25,15 @@ public class EnterpriseStandardAuthDeptServiceImpl extends ServiceImpl<Enterpris
implements EnterpriseStandardAuthDeptService{
@Override
public void saveTempPermission(StandardTempPermission standardTempPermission) {
public void saveTempPermission(LawsStandardTempPermission lawsStandardTempPermission) {
List<EnterpriseStandardAuthDept> esAuthDepts = new ArrayList<>();
for (String standardNo : standardTempPermission.getStandardNoList()) {
for (String deptId : standardTempPermission.getDeptIdList()) {
for (String standardNo : lawsStandardTempPermission.getStandardNoList()) {
for (String deptId : lawsStandardTempPermission.getDeptIdList()) {
EnterpriseStandardAuthDept enterpriseStandardAuthDept = new EnterpriseStandardAuthDept();
enterpriseStandardAuthDept.setAuthDept(deptId);
enterpriseStandardAuthDept.setStandardNo(standardNo);
if (standardTempPermission.getAuthDate() != null) {
enterpriseStandardAuthDept.setAuthExpireDate(standardTempPermission.getAuthDate());
if (lawsStandardTempPermission.getAuthDate() != null) {
enterpriseStandardAuthDept.setAuthExpireDate(lawsStandardTempPermission.getAuthDate());
}
esAuthDepts.add(enterpriseStandardAuthDept);
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java
+6 -6
View File
@@ -5,7 +5,7 @@ import com.jero.common.exception.JeroBootException;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService;
import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardAuthUserMapper;
import com.jero.modules.laws.standard.entity.StandardTempPermission;
import com.jero.modules.laws.standard.entity.LawsStandardTempPermission;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -24,15 +24,15 @@ import java.util.List;
public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<EnterpriseStandardAuthUserMapper, EnterpriseStandardAuthUser> implements EnterpriseStandardAuthUserService {
@Override
public void saveTempPermission(StandardTempPermission standardTempPermission) {
public void saveTempPermission(LawsStandardTempPermission lawsStandardTempPermission) {
List<EnterpriseStandardAuthUser> esAuthUsers = new ArrayList<>();
for (String standardNo : standardTempPermission.getStandardNoList()) {
for (String userId : standardTempPermission.getUserIdList()) {
for (String standardNo : lawsStandardTempPermission.getStandardNoList()) {
for (String userId : lawsStandardTempPermission.getUserIdList()) {
EnterpriseStandardAuthUser enterpriseStandardAuthUser = new EnterpriseStandardAuthUser();
enterpriseStandardAuthUser.setAuthUser(userId);
enterpriseStandardAuthUser.setStandardNo(standardNo);
if (standardTempPermission.getAuthDate() != null) {
enterpriseStandardAuthUser.setAuthExpireDate(standardTempPermission.getAuthDate());
if (lawsStandardTempPermission.getAuthDate() != null) {
enterpriseStandardAuthUser.setAuthExpireDate(lawsStandardTempPermission.getAuthDate());
}
esAuthUsers.add(enterpriseStandardAuthUser);
}
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java
+6 -17
View File
@@ -1,6 +1,5 @@
package com.jero.modules.laws.standard.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result;
@@ -11,9 +10,8 @@ import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.modules.laws.common.service.ILawsCommonService;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.entity.LawsUpdateRecord;
import com.jero.modules.laws.standard.entity.StandardTempPermission;
import com.jero.modules.laws.standard.entity.LawsStandardTempPermission;
import com.jero.modules.laws.standard.service.ILawsNodeRelationService;
import com.jero.modules.laws.standard.service.ILawsUpdateRecordService;
import com.jero.modules.personal.service.ILawsStandardCollectionService;
@@ -22,20 +20,11 @@ import com.jero.modules.tag.entity.LawsTag;
import com.jero.modules.tag.enums.TableNameEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.jeecgframework.poi.excel.ExcelExportUtil;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -173,14 +162,14 @@ public class LawsEnterpriseController {
@AutoLog(value = "企业法规标准-临时权限设置")
@ApiOperation(value="企业法规标准-临时权限设置", notes="企业法规标准-临时权限设置")
@PostMapping(value = "/tempPermission")
public Result<?> tempPermission(@RequestBody StandardTempPermission standardTempPermission) {
String userIds = standardTempPermission.getUserIds();
String deptIds = standardTempPermission.getDeptIds();
public Result<?> tempPermission(@RequestBody LawsStandardTempPermission lawsStandardTempPermission) {
String userIds = lawsStandardTempPermission.getUserIds();
String deptIds = lawsStandardTempPermission.getDeptIds();
if (Objects.nonNull(userIds) && !userIds.isEmpty()) {
esAuthUserService.saveTempPermission(standardTempPermission);
esAuthUserService.saveTempPermission(lawsStandardTempPermission);
}
if (Objects.nonNull(deptIds) && !deptIds.isEmpty()) {
esAuthDeptService.saveTempPermission(standardTempPermission);
esAuthDeptService.saveTempPermission(lawsStandardTempPermission);
}
return Result.OK();
}
laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsStandardFile.java
+89
View File
@@ -0,0 +1,89 @@
package com.jero.modules.laws.standard.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
*
* @TableName laws_standard_file
*/
@Data
@TableName("laws_update_record")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="laws_update_record对象", description="更新记录")
public class LawsStandardFile implements Serializable {
/**
* 主键ID
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键ID")
private String id;
/**
* 创建人
*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 更新人
*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**
* 所属部门
*/
@ApiModelProperty(value = "所属部门")
private String orgCode;
/**
* 标准编号
*/
@ApiModelProperty(value = "标准编号")
private String standardNo;
/**
* 文件id
*/
@ApiModelProperty(value = "文件id")
private String fileId;
/**
* 文件类型 发布稿/修改单/报批稿
*/
@ApiModelProperty(value = "文件类型 发布稿/修改单/报批稿")
private String fileType;
/**
* 所属模块编码
*/
@ApiModelProperty(value = "所属模块编码")
private String moduleCode;
@TableField(exist = false)
private static final long serialVersionUID = 1978687668756786786L;
}
laws-modules/src/main/java/com/jero/modules/laws/standard/entity/StandardTempPermission.java → laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsStandardTempPermission.java
+1 -2
View File
@@ -9,7 +9,6 @@ import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -23,7 +22,7 @@ import java.util.stream.Collectors;
@NoArgsConstructor
@AllArgsConstructor
@Accessors(chain = true)
public class StandardTempPermission {
public class LawsStandardTempPermission {
@NotBlank
@ApiModelProperty(value = "标准标号")
laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsStandardFileMapper.java
+18
View File
@@ -0,0 +1,18 @@
package com.jero.modules.laws.standard.mapper;
import com.jero.modules.laws.standard.entity.LawsStandardFile;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author ThinkBook
* @description 针对表【laws_standard_file】的数据库操作Mapper
* @createDate 2023-09-20 10:45:16
* @Entity com.jero.modules.laws.standard.entity.StandardFile
*/
public interface LawsStandardFileMapper extends BaseMapper<LawsStandardFile> {
}
laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsStandardFileMapper.xml
+26
View File
@@ -0,0 +1,26 @@
<?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.standard.mapper.LawsStandardFileMapper">
<resultMap id="BaseResultMap" type="com.jero.modules.laws.standard.entity.LawsStandardFile">
<id property="id" column="id" jdbcType="VARCHAR"/>
<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
<result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
<result property="fileId" column="file_id" jdbcType="VARCHAR"/>
<result property="fileType" column="file_type" jdbcType="VARCHAR"/>
<result property="moduleCode" column="module_code" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id,create_by,create_time,
update_by,update_time,org_code,
standard_no,file_id,file_type,
module_code
</sql>
</mapper>
laws-modules/src/main/java/com/jero/modules/laws/standard/service/EnterpriseStandardService.java → laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsEnterpriseStandardService.java
+1 -1
View File
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @description 针对表【laws_enterprise_standard(企业标准)】的数据库操作Service
* @createDate 2023-09-18 14:49:51
*/
public interface EnterpriseStandardService extends IService<LawsEnterpriseStandard> {
public interface ILawsEnterpriseStandardService extends IService<LawsEnterpriseStandard> {
/**
* 通过编号查查询
laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsStandardFileService.java
+13
View File
@@ -0,0 +1,13 @@
package com.jero.modules.laws.standard.service;
import com.jero.modules.laws.standard.entity.LawsStandardFile;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author ThinkBook
* @description 针对表【laws_standard_file】的数据库操作Service
* @createDate 2023-09-20 10:45:16
*/
public interface ILawsStandardFileService extends IService<LawsStandardFile> {
}
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/EnterpriseStandardServiceImpl.java → laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
+6 -3
View File
@@ -3,11 +3,13 @@ package com.jero.modules.laws.standard.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.service.EnterpriseStandardService;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import com.jero.modules.laws.standard.mapper.LawsEnterpriseStandardMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* @author ThinkBook
@@ -15,8 +17,9 @@ import org.springframework.stereotype.Service;
* @createDate 2023-09-18 14:49:51
*/
@Service
public class EnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpriseStandardMapper, LawsEnterpriseStandard>
implements EnterpriseStandardService{
@Transactional(rollbackFor = JeroBootException.class)
public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpriseStandardMapper, LawsEnterpriseStandard>
implements ILawsEnterpriseStandardService {
@Override
public LawsEnterpriseStandard queryByStandardNumber(String standardNumber) {
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsStandardFileServiceImpl.java
+25
View File
@@ -0,0 +1,25 @@
package com.jero.modules.laws.standard.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.laws.standard.entity.LawsStandardFile;
import com.jero.modules.laws.standard.service.ILawsStandardFileService;
import com.jero.modules.laws.standard.mapper.LawsStandardFileMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* @author ThinkBook
* @description 针对表【laws_standard_file】的数据库操作Service实现
* @createDate 2023-09-20 10:45:16
*/
@Service
@Transactional(rollbackFor = JeroBootException.class)
public class LawsStandardFileServiceImpl extends ServiceImpl<LawsStandardFileMapper, LawsStandardFile>
implements ILawsStandardFileService {
}
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java
+3 -3
View File
@@ -13,7 +13,7 @@ import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
import com.jero.modules.laws.standard.service.EnterpriseStandardService;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
import com.jero.modules.personal.entity.LawsStandardCollection;
@@ -51,7 +51,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
@Autowired
private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准
@Autowired
private EnterpriseStandardService enterpriseStandardService; //企业标准
private ILawsEnterpriseStandardService ILawsEnterpriseStandardService; //企业标准
/**
* 分页列表查询
@@ -155,7 +155,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
@PostMapping(value = "/enterprise/add")
public Result<T> enterpriseAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LawsEnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardCollection.getStandardId());
LawsEnterpriseStandard standard = ILawsEnterpriseStandardService.getById(lawsStandardCollection.getStandardId());
lawsStandardCollection.setStandardClass(standard.getCategoryCode());
lawsStandardCollection.setStandardName(standard.getStandardName());
lawsStandardCollection.setCollectorId(sysUser.getId());
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
+3 -3
View File
@@ -9,7 +9,7 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.service.EnterpriseStandardService;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
@@ -54,7 +54,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@Autowired
private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准
@Autowired
private EnterpriseStandardService enterpriseStandardService; //企业标准
private ILawsEnterpriseStandardService ILawsEnterpriseStandardService; //企业标准
/**
* 分页列表查询
@@ -180,7 +180,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
LawsStandardSharing sharing = new LawsStandardSharing();
sharing.setSource(CommonConstant.STANDARD_SOURCE_3);
sharing.setStandardId(lawsStandardSharing.getStandardId());
LawsEnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardSharing.getStandardId());
LawsEnterpriseStandard standard = ILawsEnterpriseStandardService.getById(lawsStandardSharing.getStandardId());
sharing.setStandardName(standard.getStandardName());
sharing.setStandardNumber(lawsStandardSharing.getStandardNumber());
sharing.setSharerId(sysUser.getId());
laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java
+3 -3
View File
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.service.EnterpriseStandardService;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
@@ -43,7 +43,7 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
@Autowired
private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准
@Autowired
private EnterpriseStandardService enterpriseStandardService; //企业标准
private ILawsEnterpriseStandardService ILawsEnterpriseStandardService; //企业标准
/**
@@ -85,7 +85,7 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
}
if (CommonConstant.STANDARD_SOURCE_3.equals(source)){
//查询企业标准数据，赋值给collection
LawsEnterpriseStandard standard = enterpriseStandardService.getById(standardId);
LawsEnterpriseStandard standard = ILawsEnterpriseStandardService.getById(standardId);
if (standard != null){
collection.setReleaseDate(standard.getReleaseDate());
}
laws-single-startup/src/test/java/com/jero/modules/standard/enterprise/LawsEnterpriseStandardTest.java
+3 -3
View File
@@ -7,7 +7,7 @@ import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardRmrEvaluateDetailService;
import com.jero.modules.laws.standard.service.EnterpriseStandardService;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
public class LawsEnterpriseStandardTest {
@Resource
private EnterpriseStandardService enterpriseStandardService;
private ILawsEnterpriseStandardService ILawsEnterpriseStandardService;
@Resource
private EnterpriseStandardRmrEvaluateDetailService enterpriseStandardRmrEvaluateDetailService;
@@ -87,7 +87,7 @@ public class LawsEnterpriseStandardTest {
@Test
public void insertRandomES() {
LawsEnterpriseStandard randomData = generateRandomEnterpriseStandard();
enterpriseStandardService.save(randomData);
ILawsEnterpriseStandardService.save(randomData);
System.out.println(randomData);
}