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