From 9868de7e0a6b8829fd709e33887855c2d33742af Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 22 Mar 2022 11:40:37 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=BA=93=E6=B3=A8=E6=8E=89=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsStandInfoServiceImpl.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index be058360..34fd22d0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -151,12 +151,12 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl children = iTsResourceService.list(qw); if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ - List getMenuIdList = tsUserService.getResourceUserId(userId); - if (!getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); - } +// List getMenuIdList = tsUserService.getResourceUserId(userId); +// if (!getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } List ids = iTsResourceService.getChildMenuList(page.getMenuId()); if (ids != null && !ids.isEmpty()) { page.setMenuAllChildrenIdList(ids); @@ -180,12 +180,12 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl children = iTsResourceService.list(qw); if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ - List getMenuIdList = tsUserService.getResourceUserId(userId); - if (!getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); - } +// List getMenuIdList = tsUserService.getResourceUserId(userId); +// if (!getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } List ids = iTsResourceService.getChildMenuList(userId); if (ids != null && !ids.isEmpty()) { page.setMenuAllChildrenIdList(ids); @@ -429,12 +429,12 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl children = iTsResourceService.list(qw); if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ - List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); - if (getMenuIdList != null && !getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); - } +// List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); +// if (getMenuIdList != null && !getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } List ids = iTsResourceService.getChildMenuList(page.getMenuId()); if (ids != null && !ids.isEmpty()) { page.setMenuAllChildrenIdList(ids); From 7e41d259443aa232dd91a156360f1248fc7c0c67 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 22 Mar 2022 16:57:59 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=20=E6=B7=BB=E5=8A=A0=20pdg?= =?UTF-8?q?=20=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index be7c405b..7a7db19f 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -138,7 +138,7 @@ stand.edit.file.path = /data/slrs/file/ file.downloadUrl=https://srms.foton.com.cn/file/ #上传文件白名单-以,分隔 -upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt +upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt,pdg # ============================================================================= # elasticsearch 配置 From 86b9eabd038e145fabb41bd0cd5401cebec0799d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 22 Mar 2022 17:30:29 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AB=8B=E9=A1=B9-=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=20=E4=BF=AE=E5=A4=8D=20=EF=BC=8C=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=B1=E6=95=88=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/processModel/entity/importExcelDTO.java | 3 ++- .../slrs/processModel/service/impl/IExportServiceImpl.java | 6 +++--- .../controller/SarStandardsInfoController.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java index 1eb26d04..4f8ae795 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java @@ -19,9 +19,10 @@ public class importExcelDTO { private String unitName; - @Excel(name = "起草责任单位" , orderNum = "3", width = 20.0) + private String unit; + @Excel(name = "起草责任单位" , orderNum = "3", width = 20.0) private String drafterName; @Excel(name = "起草人" , orderNum = "4", width = 20.0) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java index bc529903..675a4bf6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java @@ -73,9 +73,9 @@ public class IExportServiceImpl implements IExportService { stringBuilder.append("第" + i + "行第7列工作组组长填写不符合格式要求请检查；"); } } - if (null!=importExcelDTO.getUnit() && !"".equals(importExcelDTO.getUnit())){ - importExcelDTO.setUnitName(tsInstitutionMap.get(importExcelDTO.getUnit())); - if (null==tsInstitutionMap.get(importExcelDTO.getUnit())){ + if (null!=importExcelDTO.getUnitName() && !"".equals(importExcelDTO.getUnitName())){ + importExcelDTO.setUnit(tsInstitutionMap.get(importExcelDTO.getUnitName())); + if (null==tsInstitutionMap.get(importExcelDTO.getUnitName())){ stringBuilder.append("第"+i+"行第4列起草责任单位填写不符合格式要求请检查；"); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 1e6dc360..4282d025 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -233,7 +233,7 @@ public class SarStandardsInfoController extends BaseController // sarAdvanceSearchVO.setField("STAND_SYSTEM"); // } // }); - String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info"); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_stand_attr_info"); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { From cee8fb564fc7a8b1b7ce98fa28b5711c083ac824 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 23 Mar 2022 10:23:41 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/processModel/entity/importExcelDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java index 4f8ae795..aedda55a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/entity/importExcelDTO.java @@ -17,12 +17,12 @@ public class importExcelDTO { @Excel(name = "制修订类型",orderNum = "2", width = 20.0) private String reviseStatus; + @Excel(name = "起草责任单位" , orderNum = "3", width = 20.0) private String unitName; private String unit; - @Excel(name = "起草责任单位" , orderNum = "3", width = 20.0) private String drafterName; @Excel(name = "起草人" , orderNum = "4", width = 20.0) From 98a47392b6ffb44b8b0c5537362b328b3ca1bb76 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 23 Mar 2022 14:53:00 +0800 Subject: [PATCH 5/6] feat: There is no way the, bug #51962 --- .../impl/SarBussionessStandServiceImpl.java | 39 ++++++++++++------- .../service/impl/SarUpdLogServiceImpl.java | 2 +- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index f1f6644e..1215f68f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -61,6 +61,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.sql.Clob; +import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -550,18 +551,30 @@ public class SarBussionessStandServiceImpl extends ServiceImpl i // case "country": return "适用区域"; // case "isRelateAccess": return "重要度"; case "issueTime": return "发布日期"; - case "putTime": return "标准实施日期"; + case "putTime": return "企标实施日期"; // case "standYear": return "标准年份"; // case "standNature": return "标准性质"; case "standEnName": return "英文名称"; From aefc5c72a575980ff50190f7fadf4ca3c9904177 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 23 Mar 2022 15:31:56 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=85=AC=E5=BC=80?= =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarPublicIdeaController.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java index 0111de68..aaf0202c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java @@ -3,12 +3,16 @@ package com.adc.da.slrs.sarStandIdea.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; import com.adc.da.slrs.sarStandIdea.entity.SeByoDto; +import com.adc.da.slrs.sarStandIdea.service.ISarPublicIdeaAllService; import com.adc.da.slrs.sarStandIdea.service.ISarPublicIdeaService; import com.adc.da.slrs.sarStandIdea.service.Impl.SarPublicIdeaServiceImpl; import com.adc.da.sys.util.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdea; @@ -36,6 +40,9 @@ public class SarPublicIdeaController extends BaseController { @Autowired private ISarPublicIdeaService sarPublicIdeaService; + @Autowired + private ISarPublicIdeaAllService sarPublicIdeaAllService; + @ApiOperation(value = "分页查询") @GetMapping("/SelectAllPage") public ResponseMessage selectAllPage(@RequestParam(defaultValue="1")Integer page,@RequestParam(defaultValue="10")Integer size,String categorg, String cname, @@ -87,4 +94,18 @@ public class SarPublicIdeaController extends BaseController { } + @ApiOperation(value = "动态查询") + @GetMapping("/deletePublicIdea") + public ResponseMessage delete(@RequestParam("id") String id){ + QueryWrapper wrapper=new QueryWrapper<>(); + wrapper.eq("uniques",id); + SarPublicIdea sarPublicIdea=sarPublicIdeaService.getOne(wrapper); + sarPublicIdeaService.remove(wrapper); + QueryWrapper wrapper1=new QueryWrapper<>(); + wrapper1.eq("idea_id",sarPublicIdea.getId()); + sarPublicIdeaAllService.remove(wrapper1); + return Result.success(); + } + + }