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/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());
}