From 73e3b7994b1bf7deab511e7ce81cf9c4821880c1 Mon Sep 17 00:00:00 2001 From: caozhen <18736171426@139.com> Date: Mon, 18 Sep 2023 16:23:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsStandardCollectionController.java | 24 +++++++++++++++++++ .../LawsStandardCollectionServiceImpl.java | 5 ---- .../SarFileSplitInfoController.java | 18 +++++++------- 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java index b4af950c..f25a244b 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java @@ -8,6 +8,12 @@ import com.jero.common.api.vo.Result; 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.enterprise.entity.EnterpriseStandard; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardService; +import com.jero.modules.laws.standard.entity.LawsDomesticStandard; +import com.jero.modules.laws.standard.entity.LawsOverseasStandard; +import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; +import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; import com.jero.modules.personal.entity.LawsStandardCollection; import com.jero.modules.personal.service.ILawsStandardCollectionService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -38,6 +44,12 @@ import org.apache.poi.ss.formula.functions.T; public class LawsStandardCollectionController extends JeroController { @Autowired private ILawsStandardCollectionService lawsStandardCollectionService; + @Autowired + private ILawsDomesticStandardService lawsDomesticStandardService; //国内标准 + @Autowired + private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准 + @Autowired + private EnterpriseStandardService enterpriseStandardService; //企业标准 /** * 分页列表查询 @@ -62,6 +74,10 @@ public class LawsStandardCollectionController extends JeroController domesticAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) { + LawsDomesticStandard standard = lawsDomesticStandardService.queryById(lawsStandardCollection.getStandardId()); + lawsStandardCollection.setStandardClass(standard.getStandardClass()); + lawsStandardCollection.setStandardName(standard.getStandardName()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(LawsStandardCollection::getStandardId, lawsStandardCollection.getStandardId()); @@ -97,6 +113,10 @@ public class LawsStandardCollectionController extends JeroController overseasAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) { + LawsOverseasStandard standard = lawsOverseasStandardService.queryById(lawsStandardCollection.getStandardId()); + lawsStandardCollection.setStandardClass(standard.getStandardClass()); + lawsStandardCollection.setStandardName(standard.getStandardName()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(LawsStandardCollection::getStandardId, lawsStandardCollection.getStandardId()); @@ -132,6 +152,10 @@ public class LawsStandardCollectionController extends JeroController enterpriseAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) { + EnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardCollection.getStandardId()); + lawsStandardCollection.setStandardClass(standard.getCategoryCode()); + lawsStandardCollection.setStandardName(standard.getStandardName()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(LawsStandardCollection::getStandardId, lawsStandardCollection.getStandardId()); diff --git a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java index 00105967..e2b59654 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java @@ -98,11 +98,6 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl queryPageList(SarFileSplitInfoEOPage sarFileSplitInfoEOPage) { QueryWrapper queryWrapper = new QueryWrapper<>(); if(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getSerialNumber())){ @@ -103,7 +103,7 @@ public class SarFileSplitInfoController extends JeroController bindToDocumentLibrary(String id, String connectId, String fileName) { // 设置fileId boolean bindState = sarFileSplitInfoService.bindToDocumentLibrary(id, connectId, fileName); @@ -123,7 +123,7 @@ public class SarFileSplitInfoController extends JeroController add(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { sarFileSplitInfoService.add(sarFileSplitInfoEO); return Result.OK("添加成功！"); @@ -152,7 +152,7 @@ public class SarFileSplitInfoController extends JeroController delete(@RequestParam(name="id",required=true) String id) { sarFileSplitInfoService.deleteById(id); return Result.OK("删除成功!"); @@ -167,7 +167,7 @@ public class SarFileSplitInfoController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.sarFileSplitInfoService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -199,7 +199,7 @@ public class SarFileSplitInfoController extends JeroController>> splitFilePageInfo(@RequestBody Map parameter) { IPage> infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter); return Result.OK(infoPage); @@ -214,7 +214,7 @@ public class SarFileSplitInfoController extends JeroController>> splitResultPageInfo(@RequestBody Map parameter) { IPage> infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter); return Result.OK(infoPage); @@ -251,7 +251,7 @@ public class SarFileSplitInfoController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { List> list = sarFileSplitInfoService.getHeader(flag, cut); @@ -266,7 +266,7 @@ public class SarFileSplitInfoController extends JeroController>> queryCondition(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { List> list = languageSwitchService.queryCondition(flag, cut);