From e899750c440d985e79962971952e7102262a807f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 18 Jul 2022 13:59:40 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/20220718_表修改.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/sql/20220718_表修改.sql diff --git a/doc/sql/20220718_表修改.sql b/doc/sql/20220718_表修改.sql new file mode 100644 index 00000000..ab65d5f2 --- /dev/null +++ b/doc/sql/20220718_表修改.sql @@ -0,0 +1,3 @@ +//资料中心 附件表字段扩容 +ALTER TABLE `foton_slrs`.`file_material` +MODIFY COLUMN `attach_file_id` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `data_explain`; \ No newline at end of file From 2d3f27bf17eafa9920738b3e229494b302b908e5 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Mon, 18 Jul 2022 15:48:32 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=205?= =?UTF-8?q?6519=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92-=E7=BC=96=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E5=BC=95=E7=94=A8=E6=A0=87=E5=87=86=E6=98=BE=E7=A4=BA?= =?UTF-8?q?null=20=E5=88=A0=E9=99=A4=E5=90=8E=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E7=82=B9=E5=87=BB=E8=BF=98=E6=98=AF=E6=98=BE?= =?UTF-8?q?=E7=A4=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esRevisePlan/entity/EsRevisePlan.java | 11 ++++++ .../service/impl/EsRevisePlanServiceImpl.java | 2 +- .../esRevisePlan/EsRevisePlanMapper.xml | 36 +++++++++---------- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 2fc4e1fa..b5be3788 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -53,12 +53,15 @@ public class EsRevisePlan extends BasePage { @ApiModelProperty(value = "起草人姓名") + @TableField(exist = false) private String drafterName; @ApiModelProperty(value = "评审责任人姓名") + @TableField(exist = false) private String resPersonName; @ApiModelProperty(value = "工作组组长姓名") + @TableField(exist = false) private String wgLeaderName; @ApiModelProperty(value = "计划标准初稿完成时间") @@ -75,26 +78,33 @@ public class EsRevisePlan extends BasePage { private String unit; @ApiModelProperty(value = "起草责任单位名称") + @TableField(exist = false) private String unitName; @ApiModelProperty(value = "引入企业标准json(标准id)") private String rqbJson; @ApiModelProperty(value = "引入企业标准json(标准名称)") + @TableField(exist = false) private String rqbName; @ApiModelProperty(value = "引入企业标准json(标准编号)") + @TableField(exist = false) private String rqbCode; @ApiModelProperty(value = "体系结构树（id存储方式是逗号拼接）") private String tsJson; @ApiModelProperty(value = "体系结构树（名称逗号拼接展示）") + @TableField(exist = false) private String tsJsonName; @ApiModelProperty(value = "标准范围") private String area; @ApiModelProperty(value = "标准范围") + @TableField(exist = false) private String areaName; //企标类别 + @TableField(exist = false) private String standType; // 标准编号 + @TableField(exist = false) private String standNum; @@ -109,6 +119,7 @@ public class EsRevisePlan extends BasePage { @TableField("use_level") private String useLevel; + @TableField(exist = false) private String useLevelName; @ApiModelProperty(value = "简述技术指标依据") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 4ba8b212..6e8a7fe7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -75,7 +75,7 @@ public class EsRevisePlanServiceImpl extends ServiceImpl0){ return "企标名称不能重复,请更换新的企标名称。"; }else { - esRevisePlanDao.updateOne(esRevisePlan); + esRevisePlanDao.updateById(esRevisePlan); return "操作成功"; } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index c7c95620..c19e6985 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -304,25 +304,25 @@ update es_revise_plan - + id = #{id}, - + es_name = #{esName}, - + plan_status = #{planStatus}, - + revise_status = #{reviseStatus}, - + drafter = #{drafter}, - + res_person = #{resPerson}, - + wg_leader = #{wgLeader}, @@ -331,37 +331,37 @@ release_time = #{releaseTime}, - + unit = #{unit}, - + rqb_json=#{rqbJson}, - + ts_json=#{tsJson}, - + area=#{area}, - + es_mating_relations=#{esMatingRelations}, - + es_stand_relations=#{esStandRelations}, - + is_relate=#{isRelate}, - + use_level=#{useLevel}, - + technologic=#{technologic}, - + buss_sort=#{bussSort}, - + LXD=#{lxd}, From 211f589a55ad1cb4efb35a26a5d8dd45287e3d2a Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 18 Jul 2022 16:01:23 +0800 Subject: [PATCH 3/6] 56637 --- .../entity/SarStandUnqualified.java | 2 +- doc/sql/20220718_表修改.sql | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index d22c404d..89dcfe41 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -160,7 +160,7 @@ public class SarStandUnqualified extends BaseEntity { private Date planCloseTime; - @ExcelProperty("计划关闭时间") + @ExcelProperty("整改完成时间") @ApiModelProperty(value = "计划关闭时间excel导出") @TableField(exist = false) diff --git a/doc/sql/20220718_表修改.sql b/doc/sql/20220718_表修改.sql index ab65d5f2..3ea38927 100644 --- a/doc/sql/20220718_表修改.sql +++ b/doc/sql/20220718_表修改.sql @@ -1,3 +1,20 @@ //资料中心 附件表字段扩容 ALTER TABLE `foton_slrs`.`file_material` -MODIFY COLUMN `attach_file_id` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `data_explain`; \ No newline at end of file +MODIFY COLUMN `attach_file_id` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `data_explain`; + +//标准属性修改 +ALTER TABLE `foton_slrs`.`sar_stand_attr_info` +MODIFY COLUMN `BDTBZH` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `TXLB`; + +ALTER TABLE `foton_slrs`.`sar_stand_attr_info` +MODIFY COLUMN `CBBH` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `SYZD`, +MODIFY COLUMN `CBCD_` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `CBBH`, +MODIFY COLUMN `CYZBPM` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `CBCD_`, +MODIFY COLUMN `BFDTBZ` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `CYZBPM`, +MODIFY COLUMN `BBFDTBZ` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `BFDTBZ`, +MODIFY COLUMN `CSZD` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `BBFDTBZ`, +MODIFY COLUMN `XDB` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `CSZD`, +MODIFY COLUMN `TXLB` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `XDB`, +MODIFY COLUMN `DYBXHCAR` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `BDTBZH`, +MODIFY COLUMN `DYMCCAR` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `DYBXHCAR`, +MODIFY COLUMN `FBGYWBD` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `DYMCCAR`; \ No newline at end of file From ffcc3545f03163a7367ac9b6e2696e43d406e3b0 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 18 Jul 2022 16:39:53 +0800 Subject: [PATCH 4/6] 56646 56632 --- .../controller/SarStandUnqualifiedController.java | 4 ++++ .../mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java index 3c25d66a..64c9812c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java @@ -13,6 +13,7 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -98,6 +99,9 @@ public class SarStandUnqualifiedController extends BaseController> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage){ + if (StringUtils.isNotBlank(sarStandUnqualifiedPage.getProductName())) { + sarStandUnqualifiedPage.setProductName(sarStandUnqualifiedPage.getProductName().trim()); + } IPage sarStandUnqualifiedIPage=sarStandUnqualifiedService.getSarStandUnqualifiedPage(sarStandUnqualifiedPage); return Result.success(sarStandUnqualifiedIPage); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index a875ddd0..0e6501af 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -48,7 +48,7 @@ and sar_stand_unqualified.STAND_ID = #{sar.standId} - and sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.productName}),'%') + and sar_stand_unqualified.PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%') and ts_institution.name like concat('%',#{sar.responsibleUnit},'%') From afeac0ac1117c7bced8580c3b808878140d4b924 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 18 Jul 2022 16:59:53 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=20=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarInterpretationNationalStandard.java | 6 ++++++ .../SarInterpretationNationalStandardMapper.xml | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java index f5a3fb73..b90feef2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java @@ -125,5 +125,11 @@ public class SarInterpretationNationalStandard extends BaseEntity { private String coreTechnicalRequirementSSI; @TableField(exist = false) private String readContent; + @TableField(exist = false) + private String itemName; + @TableField(exist = false) + private String dutyEngineer; + @TableField(exist = false) + private String complianceRequire; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml index 2a67c835..1ecb92f1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml @@ -51,7 +51,10 @@ ssi.compliance_state as complianceStateSSI, ssi.compared_with_previous as compareWithPrevious, ssi.core_technical_requirement as coreTechnicalRequirementSSI, - ssi.read_content as readContent + ssi.read_content as readContent, + ssi.ITEMS_NAME as itemName, + ssi.DUTY_ENGINEER as dutyEngineer, + ssi.COMPLIANCE_REQUIR as complianceRequire FROM sar_interpretation_national_standard sins LEFT JOIN sar_stand_items ssi ON ssi.STAND_ID=sins.STAND_ID From 76686f95b8d3813535e5fce4951ab58cca6978e9 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 18 Jul 2022 17:44:23 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=20=E6=96=B0=E5=A2=9E=20=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 30 +++++++++++++++++ .../SarStandProjectLibraryService.java | 2 ++ .../SarStandProjectLibraryServiceImpl.java | 32 +++++++++++++++++++ 3 files changed, 64 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 77a5c481..1abb263f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -125,6 +125,36 @@ public class SarStandProjectLibraryController extends BaseController list1 = sarStandProjectLibraryService.queryProjectManagerXL(current,pageSize, standDTO); + // 创建一个新的list集合，用于存储去重后的元素 + List listTemp = new ArrayList(); + for (SarStandProjectLibrary sarStandProjectLibrary:list1.getRecords()){ + productLineDto p = new productLineDto(); + p.setProductLine(sarStandProjectLibrary.getProductLine()); + List list2 = sarStandProjectLibraryService.queryByProductLineXL(sarStandProjectLibrary.getProductLine()); + p.setSarStandProjectLibraries(list2); + listTemp.add(p); + } + IPage pageres=new Page<>(); + pageres.setRecords(listTemp); + pageres.setPages(list1.getPages()); + pageres.setTotal(list1.getTotal()); + pageres.setCurrent(list1.getCurrent()); + pageres.setSize(list1.getSize()); + return Result.success("200",pageres); + } + @GetMapping("/queryProjectUnderLine") @ApiOperation("查询产品线项目经理") public ResponseMessage queryProjectUnderLine(@RequestParam(defaultValue = "1", value = "current")int current, diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index 84f5436d..c9f697d1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -19,7 +19,9 @@ public interface SarStandProjectLibraryService { Map solostar(); List queryById(String id); IPage queryProjectManager(int current, int pageSize, standDTO standDTO); + IPage queryProjectManagerXL(int current, int pageSize, standDTO standDTO); List queryByProductLine(String productLine); + List queryByProductLineXL(String productLine); List queryStandId(String standId); IPage queryStandInfo(int current, int pageSize, String standId, String cars); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 856b3a7a..6b899a2a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -332,6 +332,29 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManagerXL(int current, int pageSize, standDTO standDTO) { + StringBuilder stringBuilder=new StringBuilder(); + stringBuilder.append("where 1=1 "); + if (null!=standDTO.getUname() && !"".equals(standDTO.getUname())){ + stringBuilder.append("and s.NAME like '%"+standDTO.getUname()+"%' "); + } + if (null!=standDTO.getProductLine() && !"".equals(standDTO.getProductLine())){ + stringBuilder.append("and sar_stand_project_library.product_line like '%"+standDTO.getProductLine()+"%' "); + } + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("distinct product_line"); + wrapper.last("inner join sar_stand_project_team s on s.project_code = sar_stand_project_library.project_number" + + " and sar_stand_project_library.product_line IS not NULL "+stringBuilder.toString()); + Page page = new Page<>(current, pageSize); + IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); + System.out.println("总条数"+userIPage.getTotal()); + System.out.println("总页数"+userIPage.getPages()); + return userIPage; + } + @Override public List queryByProductLine(String productLine) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -339,6 +362,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl list = sarStandProjectLibraryDao.selectList(wrapper); return list; } + + @Override + public List queryByProductLineXL(String productLine) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("distinct project_number,project_name"); + wrapper.eq("product_line",productLine); + List list = sarStandProjectLibraryDao.selectList(wrapper); + return list; + } @Override public List queryStandId(String standId) { QueryWrapper wrapper = new QueryWrapper<>();