From 8db629a3f82ce1b9c1184c28bd0baa57a5962e22 Mon Sep 17 00:00:00 2001 From: zxy-lbj <15192043237@163.com> Date: Fri, 2 Jul 2021 02:27:45 +0000 Subject: [PATCH 01/47] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 1b77a4b0..1d9acd09 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -13,7 +13,10 @@ spring.application.name=gsar application.code=20200101 application.center=1 #============================================== - +#Eruept +eureka.client.allow-redirects=true +eureka.client.register-with-eureka=true +eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #============================================== # 邮箱配置 #============================================== From b5fae61dc233caeadb3583dbdc9636c231e4364d Mon Sep 17 00:00:00 2001 From: zxy-lbj <15192043237@163.com> Date: Fri, 2 Jul 2021 02:28:34 +0000 Subject: [PATCH 02/47] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 1d9acd09..05ce6353 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -16,7 +16,7 @@ application.center=1 #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ +eureka.client.service-url.defaultZone=http://101.36.227.25:8050//eureka/ #============================================== # 邮箱配置 #============================================== From 0ed5e3d5954315194537fab03f45661ecf407aaf Mon Sep 17 00:00:00 2001 From: zxy-lbj <15192043237@163.com> Date: Fri, 2 Jul 2021 02:36:14 +0000 Subject: [PATCH 03/47] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 05ce6353..1d9acd09 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -16,7 +16,7 @@ application.center=1 #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://101.36.227.25:8050//eureka/ +eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #============================================== # 邮箱配置 #============================================== From 7c74df6030b0c8d9dab2e650a01ed074ab509983 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 10 Aug 2021 16:00:57 +0800 Subject: [PATCH 04/47] =?UTF-8?q?=E9=9B=B6=E9=83=A8=E4=BB=B6=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandIdea/entity/DetAllStandDto.java | 2 +- .../Impl/SarPublicIdeaAllServiceImpl.java | 6 +- .../SarStandPartCodeApplyController.java | 56 +++++++++++++ .../dao/SarStandPartCodeApplyDao.java | 15 ++++ .../entity/SarStandPartCodeApply.java | 84 +++++++++++++++++++ .../entity/SarStandPartCodeApplyPage.java | 51 +++++++++++ .../ISarStandPartCodeApplyService.java | 16 ++++ .../SarStandPartCodeApplyServiceImpl.java | 35 ++++++++ .../SarStandProjectLibraryServiceImpl.java | 4 +- .../impl/SarStandUnqualifiedServiceImpl.java | 3 + 10 files changed, 266 insertions(+), 6 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java index e0da9d35..a1e195cf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java @@ -8,6 +8,6 @@ public class DetAllStandDto { Integer size; String cid; String userId; - String endTime; + String startTime; String Account; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java index 7f34cc6c..6d17d6f7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java @@ -40,11 +40,11 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl selectAll(DetAllStandDto detAllStandDto) { - if (detAllStandDto.getEndTime() != null) { + if (detAllStandDto.getStartTime() != null) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Date Time = null; try { - Time = sdf.parse(detAllStandDto.getEndTime()); + Time = sdf.parse(detAllStandDto.getStartTime()); } catch (ParseException e) { e.printStackTrace(); } @@ -110,7 +110,7 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl { +// +// //创建日志实例 +// private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class); +// +// @Autowired +// private ISarStandPartCodeApplyService sarStandPartCodeApplyService; +// +// @ApiOperation("零部件编号申请新增") +// @PostMapping("/add") +// public ResponseMessage add(@RequestBody List sarStandPartCodeApply){ +// sarStandPartCodeApply.forEach(sarStandPartCodeApply1 -> sarStandPartCodeApply1.setCreateTime(new Date())); +// if (sarStandPartCodeApplyService.saveBatch(sarStandPartCodeApply)){ +// return Result.success("新增成功"); +// } +// else { +// return Result.error("新增失败"); +// } +// } +// +// /** +// * 分页查询零部件 +// * @param sarStandPartCodeApplyPage: 筛选、分页信息 +// * @return IPage +// */ +// public ResponseMessage> getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage){ +// IPage sarStandPartCodeApplyIPage = sarStandPartCodeApplyService.getSarStandPartCodeApplyPage(sarStandPartCodeApplyPage); +// return Result.success(sarStandPartCodeApplyIPage); +// } +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java new file mode 100644 index 00000000..76921954 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java @@ -0,0 +1,15 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.dao; +// +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +//import com.baomidou.mybatisplus.core.mapper.BaseMapper; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import org.apache.ibatis.annotations.Mapper; +//import org.apache.ibatis.annotations.Param; +// +//@Mapper +//public interface SarStandPartCodeApplyDao extends BaseMapper { +// IPage getAllDatasByPage(Page page, @Param("sar")SarStandPartCodeApplyPage sarStandPartCodeApply); +// +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java new file mode 100644 index 00000000..46a2cf72 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java @@ -0,0 +1,84 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.entity; +// +//import com.adc.da.base.entity.BaseEntity; +//import com.alibaba.excel.annotation.ExcelIgnore; +//import com.alibaba.excel.annotation.ExcelProperty; +//import com.baomidou.mybatisplus.annotation.IdType; +//import com.baomidou.mybatisplus.annotation.TableField; +//import com.baomidou.mybatisplus.annotation.TableId; +//import com.fasterxml.jackson.annotation.JsonFormat; +//import io.swagger.annotations.ApiModel; +//import io.swagger.annotations.ApiModelProperty; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import lombok.experimental.Accessors; +//import org.springframework.format.annotation.DateTimeFormat; +// +//import java.util.Date; +// +//@Data +//@EqualsAndHashCode(callSuper = true) +//@Accessors(chain = true) +//@ApiModel(value = "SarStandPartCodeApply对象",description = "SarStandPartCodeApply基础表里的所有属性") +//public class SarStandPartCodeApply extends BaseEntity { +// +// //版本号 +// private static final long serialVersionUID = 1L; +// +// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 +// @ApiModelProperty(value = "主键")//接口标志 +// @TableId(type = IdType.UUID)//数据库表里的主键 +// private String id; +// +// @ExcelProperty("子组号")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "子组号")//接口标志 +// @TableField("SUBGROUP_NUMBER")//数据库表里的字段 +// private String subgroupNumber; +// +// @ExcelProperty("子组结构号")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "子组结构号")//接口标志 +// @TableField("SUBGROUP_STRUCTURE_NUMBER")//数据库表里的字段 +// private String subgroupStructureNumber; +// +// @ExcelProperty("子组结构名称")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "子组结构名称")//接口标志 +// @TableField("SUBGROUP_STRUCTURE_NAME")//数据库表里的字段 +// private String subgroupStructureName; +// +// @ExcelProperty("分组代号")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "分组代号")//接口标志 +// @TableField("GROUP_CODE")//数据库表里的字段 +// private String groupCode; +// +// @ExcelProperty("零部件分类名称")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "零部件分类名称")//接口标志 +// @TableField("PART_CATEGORY_NAME")//数据库表里的字段 +// private String partCategoryName; +// +// @ExcelProperty("零部件分类代号")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "零部件分类代号")//接口标志 +// @TableField("PART_CATEGORY_CODE")//数据库表里的字段 +// private String partCategoryCode; +// +// @ExcelProperty("备注")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "备注")//接口标志 +// @TableField("REMARKS")//数据库表里的字段 +// private String remarks; +// +// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 +// @ApiModelProperty(value = "创建部门")//接口标志 +// @TableField("CREATE_DEPT_ID")//数据库表里的字段 +// private String createDeptId; +// +// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 +// @ApiModelProperty(value = "创建人")//接口标志 +// @TableField("CREATE_BY_ID")//数据库表里的字段 +// private String createById; +// +// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 +// @ApiModelProperty(value = "创建时间")//接口标志 +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")//时间格式化 +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")//时间格式化 +// @TableField("CREATE_TIME")//数据库表里的字段 +// private Date createTime; +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java new file mode 100644 index 00000000..c1f53510 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java @@ -0,0 +1,51 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.entity; +// +//import io.swagger.annotations.ApiModel; +//import io.swagger.annotations.ApiModelProperty; +//import lombok.Data; +// +//import java.sql.Timestamp; +// +//@Data +//@ApiModel(value = "SarStandPartCodeApply分页",description = "SarStandPartCodeApply对象分页信息") +//public class SarStandPartCodeApplyPage { +// +// @ApiModelProperty(value = "主键") +// private String id; +// +// @ApiModelProperty(value = "子组号") +// private String subgroupNumber; +// +// @ApiModelProperty(value = "子组结构号") +// private String subgroupStructureNumber; +// +// @ApiModelProperty(value = "子组结构名称") +// private String subgroupStructureName; +// +// @ApiModelProperty(value = "分组代号") +// private String groupCode; +// +// @ApiModelProperty(value = "零部件分类名称") +// private String partCategoryName; +// +// @ApiModelProperty(value = "零部件分类代号") +// private String partCategoryCode; +// +// @ApiModelProperty(value = "备注") +// private String remarks; +// +// @ApiModelProperty(value = "创建部门") +// private String createDeptId; +// +// @ApiModelProperty(value = "创建人") +// private String createById; +// +// @ApiModelProperty(value = "创建时间") +// private Timestamp createTime; +// +// @ApiModelProperty("当前页") +// private Integer current; +// +// @ApiModelProperty("每页条数") +// private Integer size; +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java new file mode 100644 index 00000000..b16a1563 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java @@ -0,0 +1,16 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.service; +// +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.baomidou.mybatisplus.extension.service.IService; +// +//public interface ISarStandPartCodeApplyService extends IService { +// +// /** +// * 分页查询零部件 +// * @param sarStandPartCodeApplyPage: 筛选、分页信息 +// * @return: IPage +// */ +// IPage getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage); +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java new file mode 100644 index 00000000..d9c54026 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java @@ -0,0 +1,35 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.service.impl; +// +//import com.adc.da.slrs.sarStandPartCodeApply.dao.SarStandPartCodeApplyDao; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +//import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService; +//import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; +//import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +//import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Service; +// +//import javax.annotation.Resource; +//import java.util.List; +// +//@Service +//public class SarStandPartCodeApplyServiceImpl extends ServiceImpl implements ISarStandPartCodeApplyService { +// +// @Autowired +// private SarStandPartCodeApplyDao sarStandPartCodeApplyDao; +// +// @Resource +// private SarStandardsInfoDao sarStandardsInfoDao; +// +// public IPage getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage){ +// QueryWrapper sarStandPartCodeApplyQueryWrapper = new QueryWrapper<>(); +// if (sarStandPartCodeApplyQueryWrapper.) +// } +// +// +//} 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 510130bc..beee32f3 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 @@ -132,8 +132,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager(int current, int pageSize) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("distinct product_line","project_manager as projectManager","uName"); - wrapper.last("inner join ts_user t on sar_stand_project_library.project_manager=t.usid"); + wrapper.select("distinct product_line","sar_stand_project_library.project_manager as projectManager","ts_user.uName"); + wrapper.last("inner join sar_stand_project_library s on ts_user.USID = s.project_manager"); Page page = new Page<>(current, pageSize); IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); System.out.println("总条数"+userIPage.getTotal()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index 3bbc3938..599e5517 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -72,12 +72,15 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl Date: Tue, 10 Aug 2021 18:34:16 +0800 Subject: [PATCH 05/47] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandardComplianceProductAssess.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java index bdd5c4dc..4601161e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java @@ -109,6 +109,10 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date interpretationTime; + @ApiModelProperty(value = "条款名称") + @TableField("clause_name") + private String clauseName; + private String id; From 3f66b95e9430569ea8dcfdd8c7c303716a82132c Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 10 Aug 2021 19:19:29 +0800 Subject: [PATCH 06/47] =?UTF-8?q?=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/sarStandItems/entity/SarStandItems.java | 5 ++++- .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java index fb6929d3..0b1f8098 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java @@ -17,7 +17,7 @@ import lombok.experimental.Accessors; /** *

- * + * *

* * @author super_liu @@ -180,6 +180,9 @@ public class SarStandItems extends BaseEntity { @TableField("compliance_state") private String complianceState; + @ApiModelProperty(value = "符合性要求-符合性状态") + @TableId("COMPLIANCE_REQUIR") + private String complianceRequire; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index f66c5ee1..ac7fc966 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -404,7 +404,7 @@ - select from From 8c92abab314c92f7dc9ab2344120587ea8320e9c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 9 Aug 2021 17:52:01 +0800 Subject: [PATCH 07/47] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarLawsAttrDetailedListDao.java | 1 - .../SarLawsAttrDetailedListMapper.xml | 30 ++----------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index 2ff5fc7c..47444721 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -31,7 +31,6 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsByIdE(@Param("param1") List LawsIds); //根据标准id查出数据 List selectLawsByIdC(@Param("start")Integer start,@Param("end")Integer end,@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType); - List selectLawsByIdCount(@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType,@Param("fileType")String fileType); //查询时间 List selectTimes(String standId); List selectLawsId2(String standId); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 70378358..994ffcb3 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -110,34 +110,6 @@ group by a.ID limit #{start},#{end} - - - + + + @@ -374,10 +374,10 @@ - select from @@ -740,10 +740,10 @@ a.STAND_ID FROM sar_stand_items a - LEFT JOIN sar_standards_info b - on a.STAND_ID=b.ID + LEFT JOIN sar_standards_info b + on a.STAND_ID=b.ID WHERE b.VALID_FLAG = 0 - and a.FILE_TYPE ='FBGBJBD' + and a.FILE_TYPE ='FBGBJBD' GROUP BY a.STAND_ID limit #{page},#{size} From 0326e66b5405380967e3abcf4c04429a2b7f9b2f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 12 Aug 2021 09:13:06 +0800 Subject: [PATCH 10/47] =?UTF-8?q?=E5=90=AF=E5=8A=A8bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 03b737c2..2f4b9196 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -405,7 +405,7 @@ - select from From f43ac650e009a89057934b1e24a1809e036c511e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 12 Aug 2021 09:29:24 +0800 Subject: [PATCH 11/47] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=BA=BF=E4=B8=8D=E6=98=BE=E7=A4=BAbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandProjectLibraryServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 3fb2b859..6097ac73 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 @@ -106,8 +106,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager(int current, int pageSize) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("distinct product_line","sar_stand_project_library.project_manager as projectManager","ts_user.uName"); - wrapper.last("inner join sar_stand_project_library s on ts_user.USID = s.project_manager"); + wrapper.select("distinct product_line","sar_stand_project_library.project_manager as projectManager","s.uName"); + wrapper.last("inner join ts_user s on s.USID = sar_stand_project_library.project_manager"); Page page = new Page<>(current, pageSize); IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); System.out.println("总条数"+userIPage.getTotal()); From 86ca14988548f42d7b6fb0d52504cdbf2f246caa Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 12 Aug 2021 09:40:16 +0800 Subject: [PATCH 12/47] GIT --- .../SarStandPartCodeApplyController.java | 56 +++++++++++++ .../dao/SarStandPartCodeApplyDao.java | 15 ++++ .../entity/SarStandPartCodeApply.java | 84 +++++++++++++++++++ .../entity/SarStandPartCodeApplyPage.java | 51 +++++++++++ .../ISarStandPartCodeApplyService.java | 16 ++++ .../SarStandPartCodeApplyServiceImpl.java | 35 ++++++++ 6 files changed, 257 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java new file mode 100644 index 00000000..bc26ef9c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java @@ -0,0 +1,56 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.controller; +// +//import com.adc.da.base.web.BaseController; +//import com.adc.da.http.ResponseMessage; +//import com.adc.da.http.Result; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +//import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService; +//import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.web.bind.annotation.PostMapping; +//import org.springframework.web.bind.annotation.RequestBody; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RestController; +// +//import java.util.Date; +//import java.util.List; +// +//@RestController +//@Api(tags = "零部件编号申请") +//@RequestMapping("/api/sarStandPartCodeApply")//前端和后端对的接口 +//public class SarStandPartCodeApplyController extends BaseController { +// +// //创建日志实例 +// private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class); +// +// @Autowired +// private ISarStandPartCodeApplyService sarStandPartCodeApplyService; +// +// @ApiOperation("零部件编号申请新增") +// @PostMapping("/add") +// public ResponseMessage add(@RequestBody List sarStandPartCodeApply){ +// sarStandPartCodeApply.forEach(sarStandPartCodeApply1 -> sarStandPartCodeApply1.setCreateTime(new Date())); +// if (sarStandPartCodeApplyService.saveBatch(sarStandPartCodeApply)){ +// return Result.success("新增成功"); +// } +// else { +// return Result.error("新增失败"); +// } +// } +// +// /** +// * 分页查询零部件 +// * @param sarStandPartCodeApplyPage: 筛选、分页信息 +// * @return IPage +// */ +// public ResponseMessage> getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage){ +// IPage sarStandPartCodeApplyIPage = sarStandPartCodeApplyService.getSarStandPartCodeApplyPage(sarStandPartCodeApplyPage); +// return Result.success(sarStandPartCodeApplyIPage); +// } +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java new file mode 100644 index 00000000..76921954 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java @@ -0,0 +1,15 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.dao; +// +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +//import com.baomidou.mybatisplus.core.mapper.BaseMapper; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import org.apache.ibatis.annotations.Mapper; +//import org.apache.ibatis.annotations.Param; +// +//@Mapper +//public interface SarStandPartCodeApplyDao extends BaseMapper { +// IPage getAllDatasByPage(Page page, @Param("sar")SarStandPartCodeApplyPage sarStandPartCodeApply); +// +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java new file mode 100644 index 00000000..46a2cf72 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java @@ -0,0 +1,84 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.entity; +// +//import com.adc.da.base.entity.BaseEntity; +//import com.alibaba.excel.annotation.ExcelIgnore; +//import com.alibaba.excel.annotation.ExcelProperty; +//import com.baomidou.mybatisplus.annotation.IdType; +//import com.baomidou.mybatisplus.annotation.TableField; +//import com.baomidou.mybatisplus.annotation.TableId; +//import com.fasterxml.jackson.annotation.JsonFormat; +//import io.swagger.annotations.ApiModel; +//import io.swagger.annotations.ApiModelProperty; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import lombok.experimental.Accessors; +//import org.springframework.format.annotation.DateTimeFormat; +// +//import java.util.Date; +// +//@Data +//@EqualsAndHashCode(callSuper = true) +//@Accessors(chain = true) +//@ApiModel(value = "SarStandPartCodeApply对象",description = "SarStandPartCodeApply基础表里的所有属性") +//public class SarStandPartCodeApply extends BaseEntity { +// +// //版本号 +// private static final long serialVersionUID = 1L; +// +// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 +// @ApiModelProperty(value = "主键")//接口标志 +// @TableId(type = IdType.UUID)//数据库表里的主键 +// private String id; +// +// @ExcelProperty("子组号")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "子组号")//接口标志 +// @TableField("SUBGROUP_NUMBER")//数据库表里的字段 +// private String subgroupNumber; +// +// @ExcelProperty("子组结构号")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "子组结构号")//接口标志 +// @TableField("SUBGROUP_STRUCTURE_NUMBER")//数据库表里的字段 +// private String subgroupStructureNumber; +// +// @ExcelProperty("子组结构名称")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "子组结构名称")//接口标志 +// @TableField("SUBGROUP_STRUCTURE_NAME")//数据库表里的字段 +// private String subgroupStructureName; +// +// @ExcelProperty("分组代号")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "分组代号")//接口标志 +// @TableField("GROUP_CODE")//数据库表里的字段 +// private String groupCode; +// +// @ExcelProperty("零部件分类名称")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "零部件分类名称")//接口标志 +// @TableField("PART_CATEGORY_NAME")//数据库表里的字段 +// private String partCategoryName; +// +// @ExcelProperty("零部件分类代号")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "零部件分类代号")//接口标志 +// @TableField("PART_CATEGORY_CODE")//数据库表里的字段 +// private String partCategoryCode; +// +// @ExcelProperty("备注")//Excel里的表头显示的是什么 +// @ApiModelProperty(value = "备注")//接口标志 +// @TableField("REMARKS")//数据库表里的字段 +// private String remarks; +// +// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 +// @ApiModelProperty(value = "创建部门")//接口标志 +// @TableField("CREATE_DEPT_ID")//数据库表里的字段 +// private String createDeptId; +// +// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 +// @ApiModelProperty(value = "创建人")//接口标志 +// @TableField("CREATE_BY_ID")//数据库表里的字段 +// private String createById; +// +// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 +// @ApiModelProperty(value = "创建时间")//接口标志 +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")//时间格式化 +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")//时间格式化 +// @TableField("CREATE_TIME")//数据库表里的字段 +// private Date createTime; +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java new file mode 100644 index 00000000..c1f53510 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java @@ -0,0 +1,51 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.entity; +// +//import io.swagger.annotations.ApiModel; +//import io.swagger.annotations.ApiModelProperty; +//import lombok.Data; +// +//import java.sql.Timestamp; +// +//@Data +//@ApiModel(value = "SarStandPartCodeApply分页",description = "SarStandPartCodeApply对象分页信息") +//public class SarStandPartCodeApplyPage { +// +// @ApiModelProperty(value = "主键") +// private String id; +// +// @ApiModelProperty(value = "子组号") +// private String subgroupNumber; +// +// @ApiModelProperty(value = "子组结构号") +// private String subgroupStructureNumber; +// +// @ApiModelProperty(value = "子组结构名称") +// private String subgroupStructureName; +// +// @ApiModelProperty(value = "分组代号") +// private String groupCode; +// +// @ApiModelProperty(value = "零部件分类名称") +// private String partCategoryName; +// +// @ApiModelProperty(value = "零部件分类代号") +// private String partCategoryCode; +// +// @ApiModelProperty(value = "备注") +// private String remarks; +// +// @ApiModelProperty(value = "创建部门") +// private String createDeptId; +// +// @ApiModelProperty(value = "创建人") +// private String createById; +// +// @ApiModelProperty(value = "创建时间") +// private Timestamp createTime; +// +// @ApiModelProperty("当前页") +// private Integer current; +// +// @ApiModelProperty("每页条数") +// private Integer size; +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java new file mode 100644 index 00000000..b16a1563 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java @@ -0,0 +1,16 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.service; +// +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.baomidou.mybatisplus.extension.service.IService; +// +//public interface ISarStandPartCodeApplyService extends IService { +// +// /** +// * 分页查询零部件 +// * @param sarStandPartCodeApplyPage: 筛选、分页信息 +// * @return: IPage +// */ +// IPage getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage); +//} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java new file mode 100644 index 00000000..d9c54026 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java @@ -0,0 +1,35 @@ +//package com.adc.da.slrs.sarStandPartCodeApply.service.impl; +// +//import com.adc.da.slrs.sarStandPartCodeApply.dao.SarStandPartCodeApplyDao; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +//import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService; +//import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; +//import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +//import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Service; +// +//import javax.annotation.Resource; +//import java.util.List; +// +//@Service +//public class SarStandPartCodeApplyServiceImpl extends ServiceImpl implements ISarStandPartCodeApplyService { +// +// @Autowired +// private SarStandPartCodeApplyDao sarStandPartCodeApplyDao; +// +// @Resource +// private SarStandardsInfoDao sarStandardsInfoDao; +// +// public IPage getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage){ +// QueryWrapper sarStandPartCodeApplyQueryWrapper = new QueryWrapper<>(); +// if (sarStandPartCodeApplyQueryWrapper.) +// } +// +// +//} From 0ae192be2f122474d84f7551e003565fbad04c20 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 12 Aug 2021 10:40:17 +0800 Subject: [PATCH 13/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListController.java | 4 +-- .../entity/LawsDto.java | 2 +- .../entity/SarLawsAttrDetailedList.java | 4 +-- .../SarLawsAttrDetailedListServiceImpl.java | 6 ++-- .../sarLawsDetailedList/entity/TimeDto.java | 2 +- .../impl/SarLawsDetailedListServiceImpl.java | 28 +++++++++---------- .../SarLawsAttrDetailedListMapper.xml | 18 ++++++------ 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java index 47156302..724cf5f8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java @@ -222,8 +222,8 @@ public class SarLawsAttrDetailedListController extends BaseController> sycpx = (List>)map.get("SYCPXCLASS"); for (LawsDto list1:data){ - if (list1.getPutTime()!=null){ - list1.setPutTime(list1.getPutTime().substring(0,10)); + if (list1.getSSRQ()!=null){ + list1.setSSRQ(list1.getSSRQ().substring(0,10)); } if (list1.getZCCSSRQGJ()!=null){ list1.setZCCSSRQGJ(list1.getZCCSSRQGJ().substring(0,10)); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 730446d8..4fc014e7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -63,7 +63,7 @@ public class LawsDto { @ExcelProperty(value = "标准实施日期", index = 8) @ApiModelProperty(value = "标准实施日期") @DateTimeFormat("yyyy年MM月dd日") - private String putTime; + private String SSRQ; @ColumnWidth(16) @ExcelProperty(value = "新车型实施日期", index = 9) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java index 45dc5441..b037f45f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java @@ -44,8 +44,8 @@ public class SarLawsAttrDetailedList extends BaseEntity { private String number; @ApiModelProperty(value = "标准实施日期") - @TableField(value = "putTime") - private String putTime; + @TableField(value = "ssrq") + private String ssrq; @ApiModelProperty(value = "新车型实施日期") @TableField(value = "xcxssrq") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 92c664b7..863a8f63 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -55,8 +55,8 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); - if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getPutTime())){ - lawsDto.setPutTime(sarLawsAttrDetailedLists.get(0).getPutTime()); + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){ + lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); } if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); @@ -199,7 +199,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); if ( detailedUpDto.getInforlist().contains(",")) { String[] id = detailedUpDto.getInforlist().split(","); - String[] putTime = detailedUpDto.getInforlist1().split(","); + String[] ssrq = detailedUpDto.getInforlist1().split(","); String[] zcc = detailedUpDto.getInforlist2().split(","); String[] xcx = detailedUpDto.getInforlist3().split(","); for (int a = 0; a < id.length; a++) { TimeDto dto = new TimeDto(); dto.setStandId(id[a]); - if (putTime.length<=a) { - dto.setPutTime(null); + if (ssrq.length<=a) { + dto.setSsrq(null); } else { - dto.setPutTime(putTime[a]); + dto.setSsrq(ssrq[a]); } - if (putTime.length<=a) { + if (ssrq.length<=a) { dto.setXcxssrqgj(null); } else { dto.setXcxssrqgj(xcx[a]); } - if (putTime.length<=a) { + if (ssrq.length<=a) { dto.setZccssrqgj(null); } else { dto.setZccssrqgj(zcc[a]); @@ -275,7 +275,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl SELECT b.country_area AS country, - a.putTime AS putTime, + a.ssrq AS ssrq, a.xcxssrq AS xcxssrq, a.zccssrq AS zccssrq FROM @@ -150,12 +150,12 @@ WHERE b.sort_key = 1 AND a.stand_id = #{standId} - AND (a.putTime is not NULL + AND (a.ssrq is not NULL AND a.xcxssrq is not NULL AND a.zccssrq is not NULL) - INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ,putTime,xcxssrq,zccssrq) VALUES + INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ,ssrq,xcxssrq,zccssrq) VALUES - (#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR},#{list.putTime,jdbcType=VARCHAR},#{list.xcxssrq,jdbcType=VARCHAR},#{list.zccssrq,jdbcType=VARCHAR}) + (#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR},#{list.ssrq,jdbcType=VARCHAR},#{list.xcxssrq,jdbcType=VARCHAR},#{list.zccssrq,jdbcType=VARCHAR}) From 57bfe507efa41770f3522febd6d93fb387fd7734 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 12 Aug 2021 14:27:20 +0800 Subject: [PATCH 14/47] =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java index 6805be5d..5588e7e2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java @@ -29,7 +29,7 @@ public class StandExcelDto { @ApiModelProperty(value = "能源类型") private String NYLX; @ApiModelProperty(value = "标准实施日期") - private String putTime; + private String SSRQ; @ApiModelProperty(value = "新车型实施日期") private String newCarTime; @ApiModelProperty(value = "在产车实施日期") From 3c27f20db3bb0626440fae85b585f17cf5e5a196 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 12 Aug 2021 14:53:54 +0800 Subject: [PATCH 15/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardSplit/controller/SarFileSplitInfoEOController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java index b964f1b1..329e1fe9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java @@ -210,6 +210,7 @@ public class SarFileSplitInfoEOController extends BaseController Date: Thu, 12 Aug 2021 16:22:36 +0800 Subject: [PATCH 16/47] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=80=BB=E6=95=B0=20?= =?UTF-8?q?=E9=94=99=E8=AF=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryMapper.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 9425ee37..df518e69 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -35,7 +35,12 @@ LEFT JOIN ts_user tu ON project_manager = tu.USID WHERE ( - id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) + + id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) + + + id IN ( SELECT project_id FROM sar_stand_project_relation ) + AND project_number LIKE concat(concat('%',#{qu.projectNumber}),'%') From 249f6bd1eb37732d0d7d94a09104ec8cc0888c77 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 12 Aug 2021 17:57:33 +0800 Subject: [PATCH 17/47] =?UTF-8?q?=E9=9B=B6=E9=83=A8=E4=BB=B6=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E7=94=B3=E8=AF=B7=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandPartCodeApplyController.java | 165 +++++++++++------ .../dao/SarStandPartCodeApplyDao.java | 30 ++-- .../entity/SarStandPartCodeApply.java | 168 +++++++++--------- .../entity/SarStandPartCodeApplyPage.java | 102 +++++------ .../entity/StandPartCodeExcelVO.java | 16 ++ .../ISarStandPartCodeApplyService.java | 49 +++-- .../SarStandPartCodeApplyServiceImpl.java | 126 +++++++++---- 7 files changed, 399 insertions(+), 257 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/StandPartCodeExcelVO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java index bc26ef9c..32fb0284 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/controller/SarStandPartCodeApplyController.java @@ -1,56 +1,109 @@ -//package com.adc.da.slrs.sarStandPartCodeApply.controller; -// -//import com.adc.da.base.web.BaseController; -//import com.adc.da.http.ResponseMessage; -//import com.adc.da.http.Result; -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; -//import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService; -//import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController; -//import com.baomidou.mybatisplus.core.metadata.IPage; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiOperation; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.web.bind.annotation.PostMapping; -//import org.springframework.web.bind.annotation.RequestBody; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RestController; -// -//import java.util.Date; -//import java.util.List; -// -//@RestController -//@Api(tags = "零部件编号申请") -//@RequestMapping("/api/sarStandPartCodeApply")//前端和后端对的接口 -//public class SarStandPartCodeApplyController extends BaseController { -// -// //创建日志实例 -// private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class); -// -// @Autowired -// private ISarStandPartCodeApplyService sarStandPartCodeApplyService; -// -// @ApiOperation("零部件编号申请新增") -// @PostMapping("/add") -// public ResponseMessage add(@RequestBody List sarStandPartCodeApply){ -// sarStandPartCodeApply.forEach(sarStandPartCodeApply1 -> sarStandPartCodeApply1.setCreateTime(new Date())); -// if (sarStandPartCodeApplyService.saveBatch(sarStandPartCodeApply)){ -// return Result.success("新增成功"); -// } -// else { -// return Result.error("新增失败"); -// } -// } -// -// /** -// * 分页查询零部件 -// * @param sarStandPartCodeApplyPage: 筛选、分页信息 -// * @return IPage -// */ -// public ResponseMessage> getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage){ -// IPage sarStandPartCodeApplyIPage = sarStandPartCodeApplyService.getSarStandPartCodeApplyPage(sarStandPartCodeApplyPage); -// return Result.success(sarStandPartCodeApplyIPage); -// } -//} +package com.adc.da.slrs.sarStandPartCodeApply.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +import com.adc.da.slrs.sarStandPartCodeApply.entity.StandPartCodeExcelVO; +import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService; +import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController; +import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +@RestController +@Api(tags = "零部件编号申请", value = "SarStandPartCodeApplyController", description = "零部件编号申请控制类") +@RequestMapping("/api/sarStandPartCodeApply")//前端和后端对的接口 +public class SarStandPartCodeApplyController extends BaseController { + + //创建日志实例 + private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class); + + @Autowired + private ISarStandPartCodeApplyService sarStandPartCodeApplyService; + + @ApiOperation("零部件编号申请新增") + @PostMapping("/add") + public ResponseMessage add(@RequestBody List sarStandPartCodeApply) { + sarStandPartCodeApply.forEach(sarStandPartCodeApply1 -> sarStandPartCodeApply1.setCreateTime(new Date())); + if (sarStandPartCodeApplyService.saveBatch(sarStandPartCodeApply)) { + return Result.success("新增成功"); + } else { + return Result.error("新增失败"); + } + } + + /** + * 分页查询零部件 + * + * @param sarStandPartCodeApplyPage: 筛选、分页信息 + * @return IPage + */ + @ApiOperation("分页查询零部件") + @GetMapping + public ResponseMessage> getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage) { + IPage sarStandPartCodeApplyIPage = sarStandPartCodeApplyService.getSarStandPartCodeApplyPage(sarStandPartCodeApplyPage); + return Result.success(sarStandPartCodeApplyIPage); + } + + /** + * 批量删除零部件 + * + * @param idList + * @return + */ + @ApiOperation(value = "批量删除零部件") + @PostMapping("/deleteListAll") + public ResponseMessage deleteListAll(String[] idList) { + if (idList == null || idList.length == 0) { + return Result.success("200", "要删除的数据为空"); + } else { + List list = new ArrayList<>(Arrays.asList(idList)); + String src = sarStandPartCodeApplyService.del(list); + return Result.success("200", src); + } + } + + @ApiOperation("导出Excel表") + @GetMapping(value = "exportPartInfoExcel") + public void exportPartInfoExcel(StandPartCodeExcelVO standPartCodeExcelVO, HttpServletResponse response) throws Exception { + // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman + try { + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 + if (standPartCodeExcelVO.getExportName() == null) { + standPartCodeExcelVO.setExportName("零部件申请信息"); + } + String fileName = URLEncoder.encode(standPartCodeExcelVO.getExportName(), "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + List data = sarStandPartCodeApplyService.getPartInfoExcelData(standPartCodeExcelVO); + //这里需要设置不关闭流 + EasyExcel.write(response.getOutputStream(), SarStandPartCodeApply.class).autoCloseStream(Boolean.FALSE) + .sheet("sheet1").doWrite(data); + } catch (Exception e) { + System.out.println(e); + //重置response + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + response.getWriter().println(JSON.toJSONString(Result.error())); + } + } + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java index 76921954..a51ef362 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/dao/SarStandPartCodeApplyDao.java @@ -1,15 +1,15 @@ -//package com.adc.da.slrs.sarStandPartCodeApply.dao; -// -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -//import com.baomidou.mybatisplus.core.metadata.IPage; -//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -//import org.apache.ibatis.annotations.Mapper; -//import org.apache.ibatis.annotations.Param; -// -//@Mapper -//public interface SarStandPartCodeApplyDao extends BaseMapper { -// IPage getAllDatasByPage(Page page, @Param("sar")SarStandPartCodeApplyPage sarStandPartCodeApply); -// -//} +package com.adc.da.slrs.sarStandPartCodeApply.dao; + +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface SarStandPartCodeApplyDao extends BaseMapper { + IPage getAllDatasByPage(Page page, @Param("sar")SarStandPartCodeApplyPage sarStandPartCodeApply); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java index 46a2cf72..a8b93259 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApply.java @@ -1,84 +1,84 @@ -//package com.adc.da.slrs.sarStandPartCodeApply.entity; -// -//import com.adc.da.base.entity.BaseEntity; -//import com.alibaba.excel.annotation.ExcelIgnore; -//import com.alibaba.excel.annotation.ExcelProperty; -//import com.baomidou.mybatisplus.annotation.IdType; -//import com.baomidou.mybatisplus.annotation.TableField; -//import com.baomidou.mybatisplus.annotation.TableId; -//import com.fasterxml.jackson.annotation.JsonFormat; -//import io.swagger.annotations.ApiModel; -//import io.swagger.annotations.ApiModelProperty; -//import lombok.Data; -//import lombok.EqualsAndHashCode; -//import lombok.experimental.Accessors; -//import org.springframework.format.annotation.DateTimeFormat; -// -//import java.util.Date; -// -//@Data -//@EqualsAndHashCode(callSuper = true) -//@Accessors(chain = true) -//@ApiModel(value = "SarStandPartCodeApply对象",description = "SarStandPartCodeApply基础表里的所有属性") -//public class SarStandPartCodeApply extends BaseEntity { -// -// //版本号 -// private static final long serialVersionUID = 1L; -// -// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 -// @ApiModelProperty(value = "主键")//接口标志 -// @TableId(type = IdType.UUID)//数据库表里的主键 -// private String id; -// -// @ExcelProperty("子组号")//Excel里的表头显示的是什么 -// @ApiModelProperty(value = "子组号")//接口标志 -// @TableField("SUBGROUP_NUMBER")//数据库表里的字段 -// private String subgroupNumber; -// -// @ExcelProperty("子组结构号")//Excel里的表头显示的是什么 -// @ApiModelProperty(value = "子组结构号")//接口标志 -// @TableField("SUBGROUP_STRUCTURE_NUMBER")//数据库表里的字段 -// private String subgroupStructureNumber; -// -// @ExcelProperty("子组结构名称")//Excel里的表头显示的是什么 -// @ApiModelProperty(value = "子组结构名称")//接口标志 -// @TableField("SUBGROUP_STRUCTURE_NAME")//数据库表里的字段 -// private String subgroupStructureName; -// -// @ExcelProperty("分组代号")//Excel里的表头显示的是什么 -// @ApiModelProperty(value = "分组代号")//接口标志 -// @TableField("GROUP_CODE")//数据库表里的字段 -// private String groupCode; -// -// @ExcelProperty("零部件分类名称")//Excel里的表头显示的是什么 -// @ApiModelProperty(value = "零部件分类名称")//接口标志 -// @TableField("PART_CATEGORY_NAME")//数据库表里的字段 -// private String partCategoryName; -// -// @ExcelProperty("零部件分类代号")//Excel里的表头显示的是什么 -// @ApiModelProperty(value = "零部件分类代号")//接口标志 -// @TableField("PART_CATEGORY_CODE")//数据库表里的字段 -// private String partCategoryCode; -// -// @ExcelProperty("备注")//Excel里的表头显示的是什么 -// @ApiModelProperty(value = "备注")//接口标志 -// @TableField("REMARKS")//数据库表里的字段 -// private String remarks; -// -// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 -// @ApiModelProperty(value = "创建部门")//接口标志 -// @TableField("CREATE_DEPT_ID")//数据库表里的字段 -// private String createDeptId; -// -// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 -// @ApiModelProperty(value = "创建人")//接口标志 -// @TableField("CREATE_BY_ID")//数据库表里的字段 -// private String createById; -// -// @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 -// @ApiModelProperty(value = "创建时间")//接口标志 -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")//时间格式化 -// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")//时间格式化 -// @TableField("CREATE_TIME")//数据库表里的字段 -// private Date createTime; -//} +package com.adc.da.slrs.sarStandPartCodeApply.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value = "SarStandPartCodeApply对象",description = "SarStandPartCodeApply基础表里的所有属性") +public class SarStandPartCodeApply extends BaseEntity { + + //版本号 + private static final long serialVersionUID = 1L; + + @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 + @ApiModelProperty(value = "主键")//接口标志 + @TableId(type = IdType.UUID)//数据库表里的主键 + private String id; + + @ExcelProperty("子组号")//Excel里的表头显示的是什么 + @ApiModelProperty(value = "子组号")//接口标志 + @TableField("SUBGROUP_NUMBER")//数据库表里的字段 + private String subgroupNumber; + + @ExcelProperty("子组结构号")//Excel里的表头显示的是什么 + @ApiModelProperty(value = "子组结构号")//接口标志 + @TableField("SUBGROUP_STRUCTURE_NUMBER")//数据库表里的字段 + private String subgroupStructureNumber; + + @ExcelProperty("子组结构名称")//Excel里的表头显示的是什么 + @ApiModelProperty(value = "子组结构名称")//接口标志 + @TableField("SUBGROUP_STRUCTURE_NAME")//数据库表里的字段 + private String subgroupStructureName; + + @ExcelProperty("分组代号")//Excel里的表头显示的是什么 + @ApiModelProperty(value = "分组代号")//接口标志 + @TableField("GROUP_CODE")//数据库表里的字段 + private String groupCode; + + @ExcelProperty("零部件分类名称")//Excel里的表头显示的是什么 + @ApiModelProperty(value = "零部件分类名称")//接口标志 + @TableField("PART_CATEGORY_NAME")//数据库表里的字段 + private String partCategoryName; + + @ExcelProperty("零部件分类代号")//Excel里的表头显示的是什么 + @ApiModelProperty(value = "零部件分类代号")//接口标志 + @TableField("PART_CATEGORY_CODE")//数据库表里的字段 + private String partCategoryCode; + + @ExcelProperty("备注")//Excel里的表头显示的是什么 + @ApiModelProperty(value = "备注")//接口标志 + @TableField("REMARKS")//数据库表里的字段 + private String remarks; + + @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 + @ApiModelProperty(value = "创建部门")//接口标志 + @TableField("CREATE_DEPT_ID")//数据库表里的字段 + private String createDeptId; + + @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 + @ApiModelProperty(value = "创建人")//接口标志 + @TableField("CREATE_BY_ID")//数据库表里的字段 + private String createById; + + @ExcelIgnore//这个字段在导出Excel的时候不显示在Excel表头里 + @ApiModelProperty(value = "创建时间")//接口标志 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")//时间格式化 + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")//时间格式化 + @TableField("CREATE_TIME")//数据库表里的字段 + private Date createTime; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java index c1f53510..2c5d819f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/SarStandPartCodeApplyPage.java @@ -1,51 +1,51 @@ -//package com.adc.da.slrs.sarStandPartCodeApply.entity; -// -//import io.swagger.annotations.ApiModel; -//import io.swagger.annotations.ApiModelProperty; -//import lombok.Data; -// -//import java.sql.Timestamp; -// -//@Data -//@ApiModel(value = "SarStandPartCodeApply分页",description = "SarStandPartCodeApply对象分页信息") -//public class SarStandPartCodeApplyPage { -// -// @ApiModelProperty(value = "主键") -// private String id; -// -// @ApiModelProperty(value = "子组号") -// private String subgroupNumber; -// -// @ApiModelProperty(value = "子组结构号") -// private String subgroupStructureNumber; -// -// @ApiModelProperty(value = "子组结构名称") -// private String subgroupStructureName; -// -// @ApiModelProperty(value = "分组代号") -// private String groupCode; -// -// @ApiModelProperty(value = "零部件分类名称") -// private String partCategoryName; -// -// @ApiModelProperty(value = "零部件分类代号") -// private String partCategoryCode; -// -// @ApiModelProperty(value = "备注") -// private String remarks; -// -// @ApiModelProperty(value = "创建部门") -// private String createDeptId; -// -// @ApiModelProperty(value = "创建人") -// private String createById; -// -// @ApiModelProperty(value = "创建时间") -// private Timestamp createTime; -// -// @ApiModelProperty("当前页") -// private Integer current; -// -// @ApiModelProperty("每页条数") -// private Integer size; -//} +package com.adc.da.slrs.sarStandPartCodeApply.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.sql.Timestamp; + +@Data +@ApiModel(value = "SarStandPartCodeApply分页",description = "SarStandPartCodeApply对象分页信息") +public class SarStandPartCodeApplyPage { + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "子组号") + private String subgroupNumber; + + @ApiModelProperty(value = "子组结构号") + private String subgroupStructureNumber; + + @ApiModelProperty(value = "子组结构名称") + private String subgroupStructureName; + + @ApiModelProperty(value = "分组代号") + private String groupCode; + + @ApiModelProperty(value = "零部件分类名称") + private String partCategoryName; + + @ApiModelProperty(value = "零部件分类代号") + private String partCategoryCode; + + @ApiModelProperty(value = "备注") + private String remarks; + + @ApiModelProperty(value = "创建部门") + private String createDeptId; + + @ApiModelProperty(value = "创建人") + private String createById; + + @ApiModelProperty(value = "创建时间") + private Timestamp createTime; + + @ApiModelProperty("当前页") + private Integer current; + + @ApiModelProperty("每页条数") + private Integer size; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/StandPartCodeExcelVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/StandPartCodeExcelVO.java new file mode 100644 index 00000000..03bb1163 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/entity/StandPartCodeExcelVO.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarStandPartCodeApply.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +@ApiModel(description = "零部件申请ExcelVO类") +public class StandPartCodeExcelVO { + @ApiModelProperty("文件名") + String exportName; + @ApiModelProperty("导出的零部件ID列表") + List ids; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java index b16a1563..d2a1b4dc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/ISarStandPartCodeApplyService.java @@ -1,16 +1,33 @@ -//package com.adc.da.slrs.sarStandPartCodeApply.service; -// -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; -//import com.baomidou.mybatisplus.core.metadata.IPage; -//import com.baomidou.mybatisplus.extension.service.IService; -// -//public interface ISarStandPartCodeApplyService extends IService { -// -// /** -// * 分页查询零部件 -// * @param sarStandPartCodeApplyPage: 筛选、分页信息 -// * @return: IPage -// */ -// IPage getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage); -//} +package com.adc.da.slrs.sarStandPartCodeApply.service; + +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +import com.adc.da.slrs.sarStandPartCodeApply.entity.StandPartCodeExcelVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface ISarStandPartCodeApplyService extends IService { + + /** + * 分页查询零部件 + * @param sarStandPartCodeApplyPage: 筛选、分页信息 + * @return: IPage + */ + IPage getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage); + + /** + * 批量删除零件申请信息 + * @param idList + * @return + */ + String del(List idList); + + /** + * 获取导出Excel的数据 + * @param standPartCodeExcelVO: ids + * @return List + */ + List getPartInfoExcelData(StandPartCodeExcelVO standPartCodeExcelVO); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java index d9c54026..e25edf6a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandPartCodeApply/service/impl/SarStandPartCodeApplyServiceImpl.java @@ -1,35 +1,91 @@ -//package com.adc.da.slrs.sarStandPartCodeApply.service.impl; -// -//import com.adc.da.slrs.sarStandPartCodeApply.dao.SarStandPartCodeApplyDao; -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; -//import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; -//import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService; -//import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; -//import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; -//import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.baomidou.mybatisplus.core.metadata.IPage; -//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Service; -// -//import javax.annotation.Resource; -//import java.util.List; -// -//@Service -//public class SarStandPartCodeApplyServiceImpl extends ServiceImpl implements ISarStandPartCodeApplyService { -// -// @Autowired -// private SarStandPartCodeApplyDao sarStandPartCodeApplyDao; -// -// @Resource -// private SarStandardsInfoDao sarStandardsInfoDao; -// -// public IPage getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage){ -// QueryWrapper sarStandPartCodeApplyQueryWrapper = new QueryWrapper<>(); -// if (sarStandPartCodeApplyQueryWrapper.) -// } -// -// -//} +package com.adc.da.slrs.sarStandPartCodeApply.service.impl; + +import com.adc.da.slrs.sarStandPartCodeApply.dao.SarStandPartCodeApplyDao; +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApply; +import com.adc.da.slrs.sarStandPartCodeApply.entity.SarStandPartCodeApplyPage; +import com.adc.da.slrs.sarStandPartCodeApply.entity.StandPartCodeExcelVO; +import com.adc.da.slrs.sarStandPartCodeApply.service.ISarStandPartCodeApplyService; +import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; +import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class SarStandPartCodeApplyServiceImpl extends ServiceImpl implements ISarStandPartCodeApplyService { + + @Autowired + private SarStandPartCodeApplyDao sarStandPartCodeApplyDao; + + @Resource + private SarStandardsInfoDao sarStandardsInfoDao; + + /** + * 分页查询零部件信息 + * @param sarStandPartCodeApplyPage: 筛选、分页信息 + * @return :IPage + */ + @Override + public IPage getSarStandPartCodeApplyPage(SarStandPartCodeApplyPage sarStandPartCodeApplyPage){ + QueryWrapper sarStandPartCodeApplyQueryWrapper = new QueryWrapper<>(); + //根据子组号查询 + if (sarStandPartCodeApplyPage.getSubgroupNumber() != null){ + sarStandPartCodeApplyQueryWrapper.like("SUBGROUP_NUMBER",sarStandPartCodeApplyPage.getSubgroupNumber()); + } + //根据分组代号查询 + if (sarStandPartCodeApplyPage.getGroupCode() != null){ + sarStandPartCodeApplyQueryWrapper.like("GROUP_CODE",sarStandPartCodeApplyPage.getGroupCode()); + } + //根据零件分类代号查询 + if (sarStandPartCodeApplyPage.getPartCategoryCode() != null){ + sarStandPartCodeApplyQueryWrapper.like("PART_CATEGORY_CODE",sarStandPartCodeApplyPage.getPartCategoryCode()); + } + Page standPartCodeApplyPage=new Page<>(); + //判断前端是否提供页码和每页条数 + if (sarStandPartCodeApplyPage.getCurrent()!=null && sarStandPartCodeApplyPage.getSize()!=null){ + standPartCodeApplyPage = new Page<>(sarStandPartCodeApplyPage.getCurrent(),sarStandPartCodeApplyPage.getSize()); + } + return sarStandPartCodeApplyDao.selectPage(standPartCodeApplyPage,sarStandPartCodeApplyQueryWrapper); + } + + /** + * 批量删除零部件信息 + * @param idList: 批量删除的id数组 + * @return + */ + @Override + public String del(List idList){ + QueryWrapper wrapper = new QueryWrapper<>(); + for (String id: idList) { + wrapper.eq("ID",id); + sarStandPartCodeApplyDao.delete(wrapper); + } + sarStandPartCodeApplyDao.deleteBatchIds(idList); + return "删除成功"; + } + + /** + * 获取导出excel的数据 + * @param standPartCodeExcelVO: ids + * @return List + */ + @Override + public List getPartInfoExcelData(StandPartCodeExcelVO standPartCodeExcelVO){ + QueryWrapper sarStandPartCodeApplyQueryWrapper = new QueryWrapper<>(); + if (standPartCodeExcelVO.getIds()!=null && standPartCodeExcelVO.getIds().size()>0){ + sarStandPartCodeApplyQueryWrapper.in("id",standPartCodeExcelVO.getIds()); + } + List stand = sarStandPartCodeApplyDao.selectList(sarStandPartCodeApplyQueryWrapper); + List a = stand; + return a; + } + + +} From 5254f397b80daf74fd93ee3fa06c9273ac6ef7db Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 12 Aug 2021 18:00:46 +0800 Subject: [PATCH 18/47] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 10 ++ .../dao/SarStandProjectLibraryDao.java | 2 + .../SarStandProjectLibraryService.java | 1 + .../SarStandProjectLibraryServiceImpl.java | 54 ++++++-- .../SarStandProjectLibraryMapper.xml | 119 +++++++++++++++++- 5 files changed, 175 insertions(+), 11 deletions(-) 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 f8a09d75..dfe3556c 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 @@ -49,6 +49,16 @@ public class SarStandProjectLibraryController extends BaseController MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProject(Page,PageSize,sarDto); + Map map = new HashMap(); + map.put("Maintenance",MaintenanceList); + return Result.success("200",map); + } /** * * @param id diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index f3e013d9..088c5516 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -22,4 +22,6 @@ public interface SarStandProjectLibraryDao extends BaseMapper list); List selectPages(@Param("page")Integer page, @Param("size")Integer size,@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag); Integer selectCount(@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag); + List selectPagesWorkFlow(@Param("page")Integer page, @Param("size")Integer size,@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag); + Integer selectCountWorkFlow(@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag); } 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 f8179596..56140cad 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 @@ -8,6 +8,7 @@ import java.util.List; public interface SarStandProjectLibraryService { IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); + IPage queryMaintenanceProjectWorkFlow(int current, int pageSize, SarStandProjectLibraryDto sarDto); IPage queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); List queryById(String id); IPage queryProjectManager(int current, int pageSize); 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 6097ac73..db421951 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 @@ -68,6 +68,35 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryMaintenanceProjectWorkFlow(int current, int pageSize, + SarStandProjectLibraryDto sarDto) { + SarStandProjectLibrary sar = new SarStandProjectLibrary(); + sar.setProjectPlatfor(sarDto.getProjectPlatfor()); + sar.setProjectNumber(sarDto.getProjectNumber()); + sar.setProjectName(sarDto.getProjectName()); + sar.setProjectClassification(sarDto.getProjectClassification()); + sar.setProjectStatus(sarDto.getProjectStatus()); + sar.setProjectGroup(sarDto.getProjectGroup()); + sar.setCurrentNode(sarDto.getCurrentNode()); + sar.setProjectLevel(sarDto.getProjectLevel()); + sar.setProjectManager(sarDto.getProjectManager()); + sar.setProductLine(sarDto.getProductLine()); + SimpleDateFormat formater = new SimpleDateFormat(); + formater.applyPattern("yyyy-MM-dd"); + try { + if (sarDto.getProjectStartDate()!=null){ + sar.setProjectStartDate(formater.parse(sarDto.getProjectStartDate())); + } + if (sarDto.getProjectEndDate()!=null){ + sar.setProjectEndDate(formater.parse(sarDto.getProjectEndDate())); + } + } catch (ParseException e) { + e.printStackTrace(); + } + int flag=3; + return getSarStandProjectLibraryIPage(current, pageSize, sar,flag); + } + @Override public IPage queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { SarStandProjectLibrary sar = new SarStandProjectLibrary(); @@ -260,12 +289,23 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl getSarStandProjectLibraryIPage(int current, int pageSize,SarStandProjectLibrary wrapper,int flag) { Page page = new Page<>(current, pageSize); IPage userIPage = new Page<>(); - List sarStandProjectLibraries=sarStandProjectLibraryDao.selectPages(current,pageSize,wrapper,flag); - Integer count = sarStandProjectLibraryDao.selectCount(wrapper,flag); - userIPage.setCurrent(current); - userIPage.setSize(pageSize); - userIPage.setRecords(sarStandProjectLibraries); - userIPage.setTotal(count); - return userIPage; + if (!"3".equals(flag)) { + List sarStandProjectLibraries = sarStandProjectLibraryDao.selectPages(current, pageSize, wrapper, flag); + Integer count = sarStandProjectLibraryDao.selectCount(wrapper, flag); + userIPage.setCurrent(current); + userIPage.setSize(pageSize); + userIPage.setRecords(sarStandProjectLibraries); + userIPage.setTotal(count); + return userIPage; + }else { + flag=2; + List sarStandProjectLibraries = sarStandProjectLibraryDao.selectPagesWorkFlow(current, pageSize, wrapper, flag); + Integer count = sarStandProjectLibraryDao.selectCountWorkFlow(wrapper, flag); + userIPage.setCurrent(current); + userIPage.setSize(pageSize); + userIPage.setRecords(sarStandProjectLibraries); + userIPage.setTotal(count); + return userIPage; + } } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index df518e69..939fb13e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -27,7 +27,7 @@ - SELECT count(sar_stand_project_library.id ) as total FROM @@ -82,7 +82,7 @@ ) - SELECT sar_stand_project_library.*, tu.UNAME as uName @@ -92,10 +92,10 @@ WHERE ( - id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) + id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) - id IN ( SELECT project_id FROM sar_stand_project_relation ) + id IN ( SELECT project_id FROM sar_stand_project_relation ) @@ -138,4 +138,115 @@ ) limit ${(page-1)*size},${page*size} + + From 26ffa2d7afd555382a4f510d3d35a153580ce710 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 12 Aug 2021 18:02:28 +0800 Subject: [PATCH 19/47] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandardComplianceProductAssess.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java index 4601161e..0fff5ae4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java @@ -91,6 +91,10 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @ApiModelProperty(value = "在产产品合规信息") private String productionCompliance; + @ApiModelProperty(value = "在产产品不合规信息") + @TableField("production_non_compliance") + private String productionNonCompliance; + @ApiModelProperty(value = "在产产品不合规应对措施") private String productionCountermeasures; From 9f0ed138743b90ad2b64f06878fa2cab2c74459d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 12 Aug 2021 18:08:29 +0800 Subject: [PATCH 20/47] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandProjectLibraryController.java | 2 +- .../service/impl/SarStandProjectLibraryServiceImpl.java | 2 +- .../sarStandProjectLibrary/SarStandProjectLibraryMapper.xml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) 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 dfe3556c..434f18b6 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 @@ -54,7 +54,7 @@ public class SarStandProjectLibraryController extends BaseController MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProject(Page,PageSize,sarDto); + IPage MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProjectWorkFlow(Page,PageSize,sarDto); Map map = new HashMap(); map.put("Maintenance",MaintenanceList); return Result.success("200",map); 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 db421951..1f6587de 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 @@ -289,7 +289,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl getSarStandProjectLibraryIPage(int current, int pageSize,SarStandProjectLibrary wrapper,int flag) { Page page = new Page<>(current, pageSize); IPage userIPage = new Page<>(); - if (!"3".equals(flag)) { + if (3!=flag) { List sarStandProjectLibraries = sarStandProjectLibraryDao.selectPages(current, pageSize, wrapper, flag); Integer count = sarStandProjectLibraryDao.selectCount(wrapper, flag); userIPage.setCurrent(current); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 939fb13e..204983ac 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -247,6 +247,5 @@ ) - limit ${(page-1)*size},${page*size} From 39c08ecb817213a71683ecd47bcb2c4284ac94f2 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 13 Aug 2021 09:15:01 +0800 Subject: [PATCH 21/47] =?UTF-8?q?=E5=8F=91=E7=89=88=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-dev.properties | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 50d13982..ccba8463 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -2,26 +2,24 @@ #============================================= # 数据库配置 #============================================= -# dev config -#============================================= -# 数据库配置 -#============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -#spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false -spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +#spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root + + #============================================== # 应用设置 -spring.application.name=FotonLAWSSystem-zyh +spring.application.name=FotonLAWSSystem application.code=20200101 application.center=1 #============================================== #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ +eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ #============================================== # 邮箱配置1 @@ -46,16 +44,10 @@ spring.mail.port=587 #spring.rabbitmq.username=uat_pcms #spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true - -#spring.rabbitmq.host=192.168.10.248 -#spring.rabbitmq.port=5672 -#spring.rabbitmq.username=ca -#spring.rabbitmq.password=cs986432 -spring.rabbitmq.host=localhost +spring.rabbitmq.host=62.234.118.181 spring.rabbitmq.port=5672 -spring.rabbitmq.virtual-host=/ -spring.rabbitmq.username=guest -spring.rabbitmq.password=guest +spring.rabbitmq.username=admin +spring.rabbitmq.password=admin # ============================================== # 文档存储路径指向 # ============================================== From 699b1ef9c4bf97c55ff0cc83f4aa2a51cc72f2e4 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 13 Aug 2021 16:44:09 +0800 Subject: [PATCH 22/47] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarLawsAttrDetailedListDao.java | 2 +- .../entity/SarFindDto.java | 3 +++ .../impl/SarLawsAttrDetailedListServiceImpl.java | 2 +- .../SarLawsDetailedListController.java | 4 ++-- .../entity/AddDetailedDto.java | 3 ++- .../entity/SarLawsDetailedList.java | 3 +++ .../service/ISarLawsDetailedListService.java | 2 +- .../impl/SarLawsDetailedListServiceImpl.java | 6 ++++-- .../SarStandProjectLibraryController.java | 3 +-- .../SarLawsAttrDetailedListMapper.xml | 16 +++++++++++++++- 10 files changed, 33 insertions(+), 11 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index 2ff5fc7c..4307db71 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -22,7 +22,7 @@ import java.util.List; public interface SarLawsAttrDetailedListDao extends BaseMapper { //根据清单id，查出标准的id并排序 - List selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size); + List selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size,@Param("sar") SarFindDto sarFindDto); //根据标准id查出数据 List selectLawsById(@Param("param1") List LawsIds, @Param("sarFindDto") SarFindDto sarFindDto); //根据标准id查出数据用于清单查询 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java index 06dc3d5d..db12a5b6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java @@ -23,5 +23,8 @@ public class SarFindDto { // private String ZCCSSRQGJ; private String zrbm; private String sycpx; + private String standSort; + private String standType; + private String standNumber; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 863a8f63..5c056cfe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -45,7 +45,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper); //查询标准id - List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize()); + List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize(),sarFindDto); if (CollectionUtils.isEmpty(lawsIds)){ return null; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index ce42e9cb..c0ad920e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -94,10 +94,10 @@ public class SarLawsDetailedListController extends BaseController publicList1 = sarLawsDetailedListService.AllSelectD(page, pageSize, sortKey, - countryArea, projectName, detailedList, detailedListName); + countryArea, projectName, detailedList, detailedListName,carType); List list= publicList1.getRecords();//从封装中取出数据 List list1;//继承类集合实现 list1 = BeanConverUtil.converList(list,FindFileNameDto.class);//将原来类的数据赋给继承类 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java index 6e7af186..47f55aad 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java @@ -40,5 +40,6 @@ public class AddDetailedDto { private String inforlist2; @ApiModelProperty(value = "新车型实施时间") private String inforlist3; - + @ApiModelProperty(value = "车辆类别") + private String carType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java index b95650b5..beec8129 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java @@ -81,5 +81,8 @@ public class SarLawsDetailedList extends BaseEntity { @TableField("file_id") private String fileIds; + @ApiModelProperty(value = "附件id") + @TableField("car_type") + private String carType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java index 323c009e..a772e7c8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java @@ -23,7 +23,7 @@ public interface ISarLawsDetailedListService extends IService AllSelectD(Integer pages, Integer size, String sortKey, String countryArea,String projectName, - String detailedList, String detailedListName); + String detailedList, String detailedListName,String carType); // IPage selectAllP(Integer pages,Integer size,String sortKey); String updateList(DetailedUpDto detailedUpDto); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index e43646f9..3d47af49 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -73,6 +73,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); switch (addDetailedDto.getSortKey()) { @@ -144,14 +145,15 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl AllSelectD(Integer page, Integer pageSize, String sortKey, String countryArea, String projectName, - String detailedList, String detailedListName) { + String detailedList, String detailedListName,String carType) { QueryWrapper wrapper = new QueryWrapper<>(); if ("1".equals(sortKey)) { wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea). like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); } else if ("2".equals(sortKey)) { wrapper.like(StringUtils.isNotEmpty(projectName), "project_name", projectName). - like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); + like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName). + like(StringUtils.isNotEmpty(carType), "car_type", carType); } else if ("3".equals(sortKey)) { wrapper.like(StringUtils.isNotEmpty(detailedList), "detailed_list", detailedList). 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 434f18b6..eff74842 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 @@ -52,8 +52,7 @@ public class SarStandProjectLibraryController extends BaseController MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProjectWorkFlow(Page,PageSize,sarDto); Map map = new HashMap(); map.put("Maintenance",MaintenanceList); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 92b59836..f75adaa6 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -65,10 +65,24 @@ + From 17a82cf235e19f61d5d731b578ed43b49788aa34 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Mon, 16 Aug 2021 10:18:15 +0800 Subject: [PATCH 24/47] =?UTF-8?q?add:=E6=81=A2=E5=A4=8Des=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application.properties | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 9bea6fa9..d39b475a 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -1,3 +1,6 @@ +############################################## +# 项目启动模式 +############################################## spring.profiles.active=dev ############################################## @@ -36,7 +39,7 @@ eureka.client.fetch-registry=true #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ +eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 @@ -134,13 +137,13 @@ file.path=D:/uploadfile/bus # 文件下载地址参数 file.downloadUrl=http://39.98.140.126:10001/uploadPath #上传文件白名单-以,分隔 -upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg +upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt # ============================================================================= # elasticsearch 配置 # ============================================================================= elasticsearch.clustername=elasticsearch -elasticsearch.ip=192.168.10.47 +elasticsearch.ip=172.17.0.1 elasticsearch.port=9300 elasticsearch.poolSize=5 elas.flag=true From bb283d79c73d5f72177444f6da52a40915056aa6 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Mon, 16 Aug 2021 11:08:30 +0800 Subject: [PATCH 25/47] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java | 3 +++ .../service/impl/SarLawsAttrDetailedListServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 4fc014e7..120a444d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -115,4 +115,7 @@ public class LawsDto { @ApiModelProperty(value = "文本状态") private String textStatus; + + @ApiModelProperty(value = "适用车型") + private String applyArctic; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 5c056cfe..9028d493 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -51,6 +51,9 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto); for (LawsDto lawsDto:list){ + if (StringUtils.isNoneEmpty(lawsDto.getApplyArctic())){ + lawsDto.setApplyArctic(lawsDto.getApplyArctic()); + } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("stand_id",lawsDto.getId()) .eq("detailed_list_id",sarFindDto.getId()); From 99d570618448062ce0269841b13335152fcc4351 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 16 Aug 2021 14:57:34 +0800 Subject: [PATCH 26/47] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java | 3 +++ .../java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java | 3 +++ .../com/adc/da/slrs/sarStandItems/entity/SarStandItems.java | 4 ++++ .../mybatis/mapper/SarStandItems/SarStandItemsMapper.xml | 1 + 4 files changed, 11 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java index 5ed30c32..1ab1f864 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java @@ -33,4 +33,7 @@ public class FindSarItemsPageReqDTO { @ApiModelProperty(value = "文件类型") private String fileType; + + @ApiModelProperty(value = "解读内容") + private String readContent; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java index 3d573ee0..769d39c0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java @@ -66,4 +66,7 @@ public class SarItemVO extends BaseEntity { @ApiModelProperty(value = "解读内容--核心技术要点") private String interpretationContent; + + @ApiModelProperty(value = "解读内容") + private String readContent; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java index 0b1f8098..441a01ac 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java @@ -184,5 +184,9 @@ public class SarStandItems extends BaseEntity { @TableId("COMPLIANCE_REQUIR") private String complianceRequire; + @ApiModelProperty(value = "解读内容") + @TableField("read_content") + private String readContent; + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 45984bb7..248f06d6 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -68,6 +68,7 @@ + From 241d14bac408c533b072a069842bdc8674529836 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Mon, 16 Aug 2021 15:01:03 +0800 Subject: [PATCH 27/47] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=E5=90=8E=E5=8F=B0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2bug~~~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ndardComplianceAssessResultController.java | 19 ++++++++++++++++--- .../SarStandardComplianceProductAssess.java | 4 ++++ .../SarStandardComplianceProductAssessEO.java | 4 ++++ .../entity/SarStandardsInfoEO.java | 3 +++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 36f7e23c..b2f044cb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -59,13 +59,16 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandApplicationType() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME",eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } + if (eo.getType() != null && !eo.getType().trim().equals("")) { + queryWrapper.like("type",eo.getType().trim()); + } IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -75,13 +78,16 @@ public class SarStandardComplianceAssessResultController { if(eo.getPosition()==1){ QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME",eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } + if (eo.getType() != null && !eo.getType().trim().equals("")) { + queryWrapper.like("type",eo.getType().trim()); + } IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -90,13 +96,16 @@ public class SarStandardComplianceAssessResultController { }else{ QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME",eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } + if (eo.getType() != null && !eo.getType().trim().equals("")) { + queryWrapper.like("type",eo.getType().trim()); + } IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -158,9 +167,13 @@ public class SarStandardComplianceAssessResultController { public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.select("*"); + + if (eo.getType() !=null) queryWrapper.like("type",eo.getType()); if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); +// queryWrapper.last("WHERE type = " + eo.getType()); IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java index 0fff5ae4..c6496762 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java @@ -117,6 +117,10 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @TableField("clause_name") private String clauseName; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; + private String id; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java index 53b782b2..c91afc56 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java @@ -18,6 +18,10 @@ public class SarStandardComplianceProductAssessEO{ @TableField("STAND_ID") private String standId; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; + @ApiModelProperty(value = "'项目名称'") private String productName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java index 9981e6ee..4fb0c327 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java @@ -25,6 +25,9 @@ public class SarStandardsInfoEO { @ApiModelProperty(value = "国内1，国外2") private Integer position=1; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; @ApiModelProperty("页数") private Integer current=1; From fbefe71f1c632afc05d43a8b38583b5d32e9e497 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 16 Aug 2021 15:43:26 +0800 Subject: [PATCH 28/47] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandardComplianceAssessResultController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index b2f044cb..d231e229 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -169,7 +169,7 @@ public class SarStandardComplianceAssessResultController { QueryWrapper queryWrapper = new QueryWrapper<>(); // queryWrapper.select("*"); - if (eo.getType() !=null) queryWrapper.like("type",eo.getType()); + if (eo.getType() !=null) queryWrapper.eq("type",eo.getType()); if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); From 690d86a4b8c2958fc529ee176d23c77f1a0fd51c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 17 Aug 2021 09:37:46 +0800 Subject: [PATCH 29/47] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BB=A3=E7=A0=81=E7=B2=BE=E7=AE=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardComplianceAssessResultController.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index d231e229..924cafd0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -167,18 +167,11 @@ public class SarStandardComplianceAssessResultController { public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.select("*"); - if (eo.getType() !=null) queryWrapper.eq("type",eo.getType()); if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); -// queryWrapper.last("WHERE type = " + eo.getType()); - IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); - -// while(page.getRecords().remove(null)); - return Result.success(page); } From 0529b40897e804ed754c5ac02c165a0bb4d5fe1d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 17 Aug 2021 09:50:23 +0800 Subject: [PATCH 30/47] =?UTF-8?q?=E8=AF=95=E5=9B=BE=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandProjectLibraryController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 eff74842..968efad0 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 @@ -51,7 +51,7 @@ public class SarStandProjectLibraryController extends BaseController MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProjectWorkFlow(Page,PageSize,sarDto); Map map = new HashMap(); From 1791877be5618c69a1ddfb3eaacba2929be1b1d1 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 17 Aug 2021 15:04:17 +0800 Subject: [PATCH 31/47] feat: There is no way the --- adc-da-main/src/main/resources/application-dev.properties | 6 +++--- .../da/search/service/impl/StandLawsSearchServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index ccba8463..3244c6d5 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -44,10 +44,10 @@ spring.mail.port=587 #spring.rabbitmq.username=uat_pcms #spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true -spring.rabbitmq.host=62.234.118.181 +spring.rabbitmq.host=127.0.0.1 spring.rabbitmq.port=5672 -spring.rabbitmq.username=admin -spring.rabbitmq.password=admin +spring.rabbitmq.username=guest +spring.rabbitmq.password=guest # ============================================== # 文档存储路径指向 # ============================================== diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index d4dcb175..1980b183 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -97,7 +97,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { result = elasticsearchService.updateDataByIdForMap(fullTextSearchEO,"fulltextserch","fulltextserch",id); } } else { - result = elasticsearchService.updateDataByIdForMap(fullTextSearchEO,"fulltextserch","fulltextserch",id); + result = elasticsearchService.addDataForMap(fullTextSearchEO,"fulltextserch","fulltextserch",id); } } return result; From 7b28ebb23cd914baf63ccd0a00eb82661cad4b73 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Tue, 17 Aug 2021 16:15:51 +0800 Subject: [PATCH 32/47] =?UTF-8?q?add:ocr=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application-dev.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index ccba8463..1356e669 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -57,13 +57,13 @@ file.path=/usr/laws/file/ #OCR请求识别URL地址 OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion # OCR回调接口地址 配置客户本地的IP及端口号 -OCR.callBackUrl = http://39.98.140.126:10001/api/ocr/OCRRestful/OcrHandleResult +OCR.callBackUrl = http://62.234.136.153:8033/api/ocr/OCRRestful/OcrHandleResult OCR.userId =dayuzhou1234 OCR.authCode =123456 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M # OCR文件存储路径 -OCR.ocrPath=D:/APPSOFT/LAWSOCRDEMO/OCRFILE/ +OCR.ocrPath=/opt/foton-slrs/front/dist/file/ # OCR文件请求下载或在线预览时URL -OCR.ocrDownPath=http://106.2.13.189:8089/downfile/ +OCR.ocrDownPath=http://62.234.136.153:8038/file/ OCR.times=20 OCR.convertType=BOTH \ No newline at end of file From 535c4f47c47cb3cd44277e90ca34277810484fb3 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 17 Aug 2021 16:18:38 +0800 Subject: [PATCH 33/47] =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=81=EF=BC=81?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarLawsDetailedListServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 3d47af49..f5698ab9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -66,7 +66,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl Date: Tue, 17 Aug 2021 17:36:44 +0800 Subject: [PATCH 34/47] feat: There is no way the --- .../da/search/service/impl/StandLawsSearchServiceImpl.java | 4 +--- .../service/impl/SarStandardsInfoServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index 1980b183..b801bb84 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -226,9 +226,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { StringBuilder itemBuilder = new StringBuilder(); mapItems.forEach((s, s2) -> { - itemBuilder.append(s+" ").append("(模拟数据)-本标准规定了机动车的整车及主要总成、安全防护装置等有关运行安全的基本技术要求，以及消防车、救护车、" + - "工程救险车和警车及残疾人专用汽车的附加要求。本标准适用于在我国道路上行驶的所有机动车，但不适用于有轨电车及并非为在道路上行驶和使用而设计和制造、" + - "主要用于封闭道路和场所作业施工的轮式专用机械车。 注：有轨电车是指以电机驱动，架线供电，有轨道承载的道路车辆。").append("
"); + itemBuilder.append(s+" ").append(s2).append("
"); }); StringBuilder textItemContent = replaceAll(itemBuilder, "null", "--"); fullTextSearchEO.put("textItems",textItemContent.toString()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index ee3d2b63..cb0b7ed8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -602,7 +602,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); if(!sarItemVOS.isEmpty()){ Map collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null) - .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName)); + .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getTermsConditions)); sarStandardsInfoEO.setMapItems(collectMap); } createStandMQService.sendStandMQ(sarStandardsInfoEO,"add"); @@ -1182,7 +1182,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); if(!sarItemVOS.isEmpty()){ Map collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null) - .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName)); + .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getTermsConditions)); sarStandardsInfoEO.setMapItems(collectMap); } createStandMQService.sendStandMQ(sarStandardsInfoEO,"update"); From 7303f11043bedd1a328a0f6b867d382f1e062f01 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 17 Aug 2021 17:51:38 +0800 Subject: [PATCH 35/47] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...SarStandardComplianceAssessResultController.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 924cafd0..67bcf14b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -85,9 +85,9 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } - if (eo.getType() != null && !eo.getType().trim().equals("")) { - queryWrapper.like("type",eo.getType().trim()); - } +// if (eo.getType() != null && !eo.getType().trim().equals("")) { +// queryWrapper.like("type",eo.getType().trim()); +// } IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -103,10 +103,9 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } - if (eo.getType() != null && !eo.getType().trim().equals("")) { - queryWrapper.like("type",eo.getType().trim()); - } - +// if (eo.getType() != null && !eo.getType().trim().equals("")) { +// queryWrapper.like("type",eo.getType().trim()); +// } IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); return Result.success(page); From 35877cd9413f5b911a228b8510844a7d455e1083 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 17 Aug 2021 20:11:35 +0800 Subject: [PATCH 36/47] =?UTF-8?q?=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=9B=BD=E5=AE=B6/=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=B8=AD=E7=9A=84=20=E6=AF=8F=E4=B8=AA?= =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E6=88=96=E8=80=85=E5=9C=B0=E5=8C=BA=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E5=BB=BA=E7=AB=8B=E4=B8=80=E6=AC=A1=E6=B8=85=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E5=81=9A=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsDetailedListServiceImpl.java | 484 ++++++++++++++---- 1 file changed, 377 insertions(+), 107 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 3d47af49..eb6eeb92 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -60,100 +60,370 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); - switch (addDetailedDto.getSortKey()) { - case "1": - sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea()); + //判断页面的国家地区是否和数据库里的字段长度相等 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("DISTINCT country_area"); + List sarLawsDetailedLists = sarLawsDetailedListDao.selectList(wrapper); + //多选是否可以添加的标识，true表示可以添加，false表示不许添加 + boolean multiAddFlag = true; + //单选是否可以添加的标识，true表示可以添加，false表示不许添加 + boolean singleAddFlag = true; +// System.out.println("数据库的值"+sarLawsDetailedLists); +// System.out.println("数据库里有多少条数据"+sarLawsDetailedLists.size()); +// System.out.println("数据库里第一条"+sarLawsDetailedLists.get(1)); + //如果页面字段国家为空，则为其他清单新增 + if (addDetailedDto.getCountryArea() == null) { + //下面放添加的具体方法 + try { + SarLawsDetailedList sarLawsDetailedList = SarLawsDetailedList.builder() + .id(UUIDUtils.randomUUID20()) + .sortKey(addDetailedDto.getSortKey()) + .detailedListName(addDetailedDto.getDetailedListName()) + .detailedListState("0") + .detailedListVision("v0") + .applicationScope(addDetailedDto.getApplicationScope()) + .updateTime(new Date()) + .updatePeople(addDetailedDto.getUpdatePeople()) + .remark(addDetailedDto.getRemark()) + .updatePeople(getUserName()) + .fileIds(addDetailedDto.getFileIds()) + .build(); + List timeDto = new ArrayList<>(); + switch (addDetailedDto.getSortKey()) { + case "1": + sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea()); - break; - case "2": - sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName()); + break; + case "2": + sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName()); - break; - case "3": - sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList()); + break; + case "3": + sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList()); - break; - default: - break; - } - if ("admin".equals(getUserName()))sarLawsDetailedList.setUpdatePeople("管理员"); - else {sarLawsDetailedList.setUpdatePeople(getUserName());} - sarLawsDetailedListDao.insert(sarLawsDetailedList); - if (addDetailedDto.getInforlist()!=null){ - if (addDetailedDto.getInforlist().contains(",")){ - String[] id = addDetailedDto.getInforlist().split(","); - String[] ssrq = addDetailedDto.getInforlist1().split(","); - String[] zcc = addDetailedDto.getInforlist2().split(","); - String[] xcx = addDetailedDto.getInforlist3().split(","); - for (int a =0;a< id.length;a++){ + break; + default: + break; + } + if ("admin".equals(getUserName())) sarLawsDetailedList.setUpdatePeople("管理员"); + else { + sarLawsDetailedList.setUpdatePeople(getUserName()); + } + sarLawsDetailedListDao.insert(sarLawsDetailedList); + if (addDetailedDto.getInforlist() != null) { + if (addDetailedDto.getInforlist().contains(",")) { + String[] id = addDetailedDto.getInforlist().split(","); + String[] putTime = addDetailedDto.getInforlist1().split(","); + String[] zcc = addDetailedDto.getInforlist2().split(","); + String[] xcx = addDetailedDto.getInforlist3().split(","); + for (int a = 0; a < id.length; a++) { + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if ("-".equals(putTime[a]) || null == putTime[a]) { + dto.setPutTime(null); + } else { + dto.setPutTime(putTime[a]); + } + if ("-".equals(putTime[a]) || null == xcx[a]) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if ("-".equals(putTime[a]) || null == zcc[a]) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } + } else { TimeDto dto = new TimeDto(); - dto.setStandId(id[a]); - if ("-".equals(ssrq[a]) || null==ssrq[a] ){ - dto.setSsrq(null); - }else { - dto.setSsrq(ssrq[a]); - } - if ("-".equals(ssrq[a]) || null == xcx[a]){ - dto.setXcxssrqgj(null); - }else { - dto.setXcxssrqgj(xcx[a]); - } - if ("-".equals(ssrq[a]) || null == zcc[a]){ - dto.setZccssrqgj(null); - }else { - dto.setZccssrqgj(zcc[a]); - } + dto.setStandId(addDetailedDto.getInforlist()); + dto.setPutTime(addDetailedDto.getInforlist1()); + dto.setXcxssrqgj(addDetailedDto.getInforlist2()); + dto.setZccssrqgj(addDetailedDto.getInforlist3()); timeDto.add(dto); } - }else { - TimeDto dto = new TimeDto(); - dto.setStandId(addDetailedDto.getInforlist()); - dto.setSsrq(addDetailedDto.getInforlist1()); - dto.setXcxssrqgj(addDetailedDto.getInforlist2()); - dto.setZccssrqgj(addDetailedDto.getInforlist3()); - timeDto.add(dto); + } else { + timeDto = null; } - }else { - timeDto=null; - } - service.insertDetailedList(sarLawsDetailedList.getId(),timeDto); + service.insertDetailedList(sarLawsDetailedList.getId(), timeDto); - } catch (Exception e) { - e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } + //0表示添加成功，1表示添加失败 + return "0"; + //添加方法结束 + } + + //如果页面字段国家不为空，则是国家地区清单新增 + if (addDetailedDto.getCountryArea() != null) { + //如果数据库里有数据，则判断，如果没有，则直接新增成功 + if (sarLawsDetailedLists.size() > 0) { + for (int i = 0; i < sarLawsDetailedLists.size(); i++) { +// System.out.println("数据库里的第"+(i+1)+"条数据为"+sarLawsDetailedLists.get(i).getCountryArea()); +// System.out.println("数据库里的第"+(i+1)+"条数据的长度为"+sarLawsDetailedLists.get(i).getCountryArea().length()); +// System.out.println("页面字段"+addDetailedDto.getCountryArea()); +// System.out.println("页面字段长度"+addDetailedDto.getCountryArea().length()); + System.out.println(sarLawsDetailedLists.get(i)); + if (null == sarLawsDetailedLists.get(i)) { + System.out.println("数据库里第" + (i + 1) + "条的国家地区字段长度为空，不重复，目前可以添加"); + } else if (addDetailedDto.getCountryArea().length() != sarLawsDetailedLists.get(i).getCountryArea().length()) { + System.out.println("数据库里第" + (i + 1) + "条的国家地区字段长度和页面的国家地区字段长度不一样，不重复，目前可以添加"); + } else { + System.out.println("数据库里第" + (i + 1) + "条的国家地区字段长度和页面的国家地区字段长度一样，可能重复"); + //判断页面的国家地区是单选还是多选（判断能不能拆） + if (addDetailedDto.getCountryArea().contains(",")) { + System.out.println("页面是多选"); + //如果数据库里的国家地区字段存在",",说明是多选，如果不存在说明是单选 + if (sarLawsDetailedLists.get(i).getCountryArea().contains(",")) { + System.out.println("数据库是多选，如果页面字段拆分之后都包含于数据库字段拆分之后，则说明重复，目前不许添加"); + System.out.println("页面字段为" + addDetailedDto.getCountryArea()); +// System.out.println("页面字段以“，”为分隔符拆分后为"+ Arrays.toString(addDetailedDto.getCountryArea().split(","))); + String[] frontCountryArea = addDetailedDto.getCountryArea().split(","); +// System.out.println("页面字段以“，”为分隔符拆分后为"+ frontCountryArea[0]+"然后"+frontCountryArea[1]+"然后"+frontCountryArea[2]); + String[] databaseCountryArea = sarLawsDetailedLists.get(i).getCountryArea().split(","); +// System.out.println("数据库字段以“，”为分隔符拆分后为"+ databaseCountryArea[0]+"然后"+databaseCountryArea[1]+"然后"+databaseCountryArea[2]); + + + //如果页面字段拆分之后都包含于数据库字段拆分之后，则说明重复，不许添加 + for (int j = 0; j < frontCountryArea.length; j++) { + //如果数据库包含了页面字段的所有值，说明这俩完全相同，重复，不许添加 + List databaseCountryAreaList = Arrays.asList(databaseCountryArea); + if (databaseCountryAreaList.contains(frontCountryArea[j])) { + System.out.println("数据库" + databaseCountryAreaList); + System.out.println("页面" + frontCountryArea[j]); + System.out.println("数据库里的字段包含页面里的字段，可能重复，目前不许添加"); + multiAddFlag = false; + } else { + System.out.println("数据库" + databaseCountryAreaList); + System.out.println("页面" + frontCountryArea[j]); + System.out.println("数据库里的字段和页面字段虽然长度相同，但是里面有不一样的元素，可以添加"); + multiAddFlag = true; + } +// System.out.println("页面字段以“，”为分隔符拆分后分别为"+ frontCountryArea[j]); +// System.out.println("数据库字段以“，”为分隔符拆分后分别为"+ databaseCountryArea[j]); + } + if (multiAddFlag == true) { + System.out.println("长度相同，只要有一个不重复，就可以添加"); + } else { + System.out.println("长度相同，整个循环下来都重复，说明两个字段重复，不许添加"); + break; + } + } + } else { + System.out.println("页面是单选"); + + //如果数据库里的国家地区字段存在",",说明是多选，如果不存在说明是单选 + if (sarLawsDetailedLists.get(i).getCountryArea().contains(",")) { + System.out.println("数据库是多选，肯定不重复，目前可以添加"); + } else { + System.out.println("数据库是单选，如果数据库里的字段和页面的字段相等，重复，不许添加"); + //如果数据库里的字段和页面的字段相等，重复，不许添加 + if (Objects.equals(sarLawsDetailedLists.get(i).getCountryArea(), addDetailedDto.getCountryArea())) { + System.out.println("数据库里的字段和页面的字段相等，重复，不许添加"); + singleAddFlag = false; + break; + } else { + System.out.println("数据库里的字段和页面的字段不相等，不重复，允许添加"); + } + } + } + } + } + } else { + //数据库为空，直接添加 + //下面放添加的具体方法 + try { + SarLawsDetailedList sarLawsDetailedList = SarLawsDetailedList.builder() + .id(UUIDUtils.randomUUID20()) + .sortKey(addDetailedDto.getSortKey()) + .detailedListName(addDetailedDto.getDetailedListName()) + .detailedListState("0") + .detailedListVision("v0") + .applicationScope(addDetailedDto.getApplicationScope()) + .updateTime(new Date()) + .updatePeople(addDetailedDto.getUpdatePeople()) + .remark(addDetailedDto.getRemark()) + .updatePeople(getUserName()) + .fileIds(addDetailedDto.getFileIds()) + .build(); + List timeDto = new ArrayList<>(); + switch (addDetailedDto.getSortKey()) { + case "1": + sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea()); + + break; + case "2": + sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName()); + + + break; + case "3": + sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList()); + + break; + default: + break; + } + if ("admin".equals(getUserName())) sarLawsDetailedList.setUpdatePeople("管理员"); + else { + sarLawsDetailedList.setUpdatePeople(getUserName()); + } + sarLawsDetailedListDao.insert(sarLawsDetailedList); + if (addDetailedDto.getInforlist() != null) { + if (addDetailedDto.getInforlist().contains(",")) { + String[] id = addDetailedDto.getInforlist().split(","); + String[] putTime = addDetailedDto.getInforlist1().split(","); + String[] zcc = addDetailedDto.getInforlist2().split(","); + String[] xcx = addDetailedDto.getInforlist3().split(","); + for (int a = 0; a < id.length; a++) { + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if ("-".equals(putTime[a]) || null == putTime[a]) { + dto.setPutTime(null); + } else { + dto.setPutTime(putTime[a]); + } + if ("-".equals(putTime[a]) || null == xcx[a]) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if ("-".equals(putTime[a]) || null == zcc[a]) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } + } else { + TimeDto dto = new TimeDto(); + dto.setStandId(addDetailedDto.getInforlist()); + dto.setPutTime(addDetailedDto.getInforlist1()); + dto.setXcxssrqgj(addDetailedDto.getInforlist2()); + dto.setZccssrqgj(addDetailedDto.getInforlist3()); + timeDto.add(dto); + } + } else { + timeDto = null; + } + service.insertDetailedList(sarLawsDetailedList.getId(), timeDto); + + } catch (Exception e) { + e.printStackTrace(); + } + //0表示添加成功，1表示添加失败 + return "0"; + //添加方法结束 + } + } + + //如果循环完整个数据库，都没有重复使当前数据无法添加，则添加 + if (multiAddFlag == true && singleAddFlag == true) { + //下面放添加的具体方法 + try { + SarLawsDetailedList sarLawsDetailedList = SarLawsDetailedList.builder() + .id(UUIDUtils.randomUUID20()) + .sortKey(addDetailedDto.getSortKey()) + .detailedListName(addDetailedDto.getDetailedListName()) + .detailedListState("0") + .detailedListVision("v0") + .applicationScope(addDetailedDto.getApplicationScope()) + .updateTime(new Date()) + .updatePeople(addDetailedDto.getUpdatePeople()) + .remark(addDetailedDto.getRemark()) + .updatePeople(getUserName()) + .fileIds(addDetailedDto.getFileIds()) + .build(); + List timeDto = new ArrayList<>(); + switch (addDetailedDto.getSortKey()) { + case "1": + sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea()); + + break; + case "2": + sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName()); + + + break; + case "3": + sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList()); + + break; + default: + break; + } + if ("admin".equals(getUserName())) sarLawsDetailedList.setUpdatePeople("管理员"); + else { + sarLawsDetailedList.setUpdatePeople(getUserName()); + } + sarLawsDetailedListDao.insert(sarLawsDetailedList); + if (addDetailedDto.getInforlist() != null) { + if (addDetailedDto.getInforlist().contains(",")) { + String[] id = addDetailedDto.getInforlist().split(","); + String[] putTime = addDetailedDto.getInforlist1().split(","); + String[] zcc = addDetailedDto.getInforlist2().split(","); + String[] xcx = addDetailedDto.getInforlist3().split(","); + for (int a = 0; a < id.length; a++) { + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if ("-".equals(putTime[a]) || null == putTime[a]) { + dto.setPutTime(null); + } else { + dto.setPutTime(putTime[a]); + } + if ("-".equals(putTime[a]) || null == xcx[a]) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if ("-".equals(putTime[a]) || null == zcc[a]) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } + } else { + TimeDto dto = new TimeDto(); + dto.setStandId(addDetailedDto.getInforlist()); + dto.setPutTime(addDetailedDto.getInforlist1()); + dto.setXcxssrqgj(addDetailedDto.getInforlist2()); + dto.setZccssrqgj(addDetailedDto.getInforlist3()); + timeDto.add(dto); + } + } else { + timeDto = null; + } + service.insertDetailedList(sarLawsDetailedList.getId(), timeDto); + + } catch (Exception e) { + e.printStackTrace(); + } + //0表示添加成功，1表示添加失败 + return "0"; + //添加方法结束 + } else { + //0表示添加成功，1表示添加失败 + return "1"; } - return "添加成功"; } @Override public IPage AllSelectD(Integer page, Integer pageSize, String sortKey, String countryArea, String projectName, - String detailedList, String detailedListName,String carType) { + String detailedList, String detailedListName) { QueryWrapper wrapper = new QueryWrapper<>(); if ("1".equals(sortKey)) { wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea). like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); } else if ("2".equals(sortKey)) { wrapper.like(StringUtils.isNotEmpty(projectName), "project_name", projectName). - like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName). - like(StringUtils.isNotEmpty(carType), "car_type", carType); + like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); } else if ("3".equals(sortKey)) { wrapper.like(StringUtils.isNotEmpty(detailedList), "detailed_list", detailedList). @@ -181,9 +451,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl map1:arr) { - if (map1.get("value").equals(list1.getCountryArea())){ + } else { + for (Map map1 : arr) { + if (map1.get("value").equals(list1.getCountryArea())) { list1.setCountryArea(map1.get("label")); break; } @@ -202,46 +472,46 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); - if ( detailedUpDto.getInforlist().contains(",")) { + if (detailedUpDto.getInforlist().contains(",")) { String[] id = detailedUpDto.getInforlist().split(","); - String[] ssrq = detailedUpDto.getInforlist1().split(","); + String[] putTime = detailedUpDto.getInforlist1().split(","); String[] zcc = detailedUpDto.getInforlist2().split(","); String[] xcx = detailedUpDto.getInforlist3().split(","); - for (int a = 0; a < id.length; a++) { - TimeDto dto = new TimeDto(); - dto.setStandId(id[a]); - if (ssrq.length<=a) { - dto.setSsrq(null); - } else { - dto.setSsrq(ssrq[a]); - } - if (ssrq.length<=a) { - dto.setXcxssrqgj(null); - } else { - dto.setXcxssrqgj(xcx[a]); - } - if (ssrq.length<=a) { - dto.setZccssrqgj(null); - } else { - dto.setZccssrqgj(zcc[a]); - } - timeDto.add(dto); + for (int a = 0; a < id.length; a++) { + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if (putTime.length <= a) { + dto.setPutTime(null); + } else { + dto.setPutTime(putTime[a]); } + if (putTime.length <= a) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if (putTime.length <= a) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } } else { TimeDto dto = new TimeDto(); dto.setStandId(detailedUpDto.getInforlist()); - dto.setSsrq(detailedUpDto.getInforlist1()); + dto.setPutTime(detailedUpDto.getInforlist1()); dto.setXcxssrqgj(detailedUpDto.getInforlist2()); dto.setZccssrqgj(detailedUpDto.getInforlist3()); timeDto.add(dto); From 79a6ac3b4cf8b111db546d081f15a1818431e724 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 18 Aug 2021 09:22:11 +0800 Subject: [PATCH 37/47] commit --- .../SarLawsAttrDetailedListController.java | 4 ++-- .../dao/SarLawsAttrDetailedListDao.java | 2 +- .../entity/LawsDto.java | 5 +--- .../entity/SarFindDto.java | 3 --- .../entity/SarLawsAttrDetailedList.java | 4 ++-- .../entity/StandExcelDto.java | 2 +- .../SarLawsAttrDetailedListServiceImpl.java | 11 ++++----- .../SarLawsDetailedListController.java | 4 ++-- .../entity/AddDetailedDto.java | 3 +-- .../entity/SarLawsDetailedList.java | 3 --- .../sarLawsDetailedList/entity/TimeDto.java | 2 +- .../service/ISarLawsDetailedListService.java | 2 +- ...ndardComplianceAssessResultController.java | 24 +++++++------------ .../SarStandardComplianceProductAssess.java | 8 ------- .../SarStandardComplianceProductAssessEO.java | 4 ---- .../entity/SarStandardsInfoEO.java | 3 --- 16 files changed, 25 insertions(+), 59 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java index 724cf5f8..47156302 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java @@ -222,8 +222,8 @@ public class SarLawsAttrDetailedListController extends BaseController> sycpx = (List>)map.get("SYCPXCLASS"); for (LawsDto list1:data){ - if (list1.getSSRQ()!=null){ - list1.setSSRQ(list1.getSSRQ().substring(0,10)); + if (list1.getPutTime()!=null){ + list1.setPutTime(list1.getPutTime().substring(0,10)); } if (list1.getZCCSSRQGJ()!=null){ list1.setZCCSSRQGJ(list1.getZCCSSRQGJ().substring(0,10)); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index 4307db71..2ff5fc7c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -22,7 +22,7 @@ import java.util.List; public interface SarLawsAttrDetailedListDao extends BaseMapper { //根据清单id，查出标准的id并排序 - List selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size,@Param("sar") SarFindDto sarFindDto); + List selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size); //根据标准id查出数据 List selectLawsById(@Param("param1") List LawsIds, @Param("sarFindDto") SarFindDto sarFindDto); //根据标准id查出数据用于清单查询 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 120a444d..730446d8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -63,7 +63,7 @@ public class LawsDto { @ExcelProperty(value = "标准实施日期", index = 8) @ApiModelProperty(value = "标准实施日期") @DateTimeFormat("yyyy年MM月dd日") - private String SSRQ; + private String putTime; @ColumnWidth(16) @ExcelProperty(value = "新车型实施日期", index = 9) @@ -115,7 +115,4 @@ public class LawsDto { @ApiModelProperty(value = "文本状态") private String textStatus; - - @ApiModelProperty(value = "适用车型") - private String applyArctic; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java index db12a5b6..06dc3d5d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java @@ -23,8 +23,5 @@ public class SarFindDto { // private String ZCCSSRQGJ; private String zrbm; private String sycpx; - private String standSort; - private String standType; - private String standNumber; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java index b037f45f..45dc5441 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java @@ -44,8 +44,8 @@ public class SarLawsAttrDetailedList extends BaseEntity { private String number; @ApiModelProperty(value = "标准实施日期") - @TableField(value = "ssrq") - private String ssrq; + @TableField(value = "putTime") + private String putTime; @ApiModelProperty(value = "新车型实施日期") @TableField(value = "xcxssrq") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java index 5588e7e2..6805be5d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java @@ -29,7 +29,7 @@ public class StandExcelDto { @ApiModelProperty(value = "能源类型") private String NYLX; @ApiModelProperty(value = "标准实施日期") - private String SSRQ; + private String putTime; @ApiModelProperty(value = "新车型实施日期") private String newCarTime; @ApiModelProperty(value = "在产车实施日期") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 9028d493..92c664b7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -45,21 +45,18 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper); //查询标准id - List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize(),sarFindDto); + List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize()); if (CollectionUtils.isEmpty(lawsIds)){ return null; } List list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto); for (LawsDto lawsDto:list){ - if (StringUtils.isNoneEmpty(lawsDto.getApplyArctic())){ - lawsDto.setApplyArctic(lawsDto.getApplyArctic()); - } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("stand_id",lawsDto.getId()) .eq("detailed_list_id",sarFindDto.getId()); List sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); - if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){ - lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getPutTime())){ + lawsDto.setPutTime(sarLawsAttrDetailedLists.get(0).getPutTime()); } if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); @@ -202,7 +199,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl publicList1 = sarLawsDetailedListService.AllSelectD(page, pageSize, sortKey, - countryArea, projectName, detailedList, detailedListName,carType); + countryArea, projectName, detailedList, detailedListName); List list= publicList1.getRecords();//从封装中取出数据 List list1;//继承类集合实现 list1 = BeanConverUtil.converList(list,FindFileNameDto.class);//将原来类的数据赋给继承类 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java index 47f55aad..6e7af186 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java @@ -40,6 +40,5 @@ public class AddDetailedDto { private String inforlist2; @ApiModelProperty(value = "新车型实施时间") private String inforlist3; - @ApiModelProperty(value = "车辆类别") - private String carType; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java index beec8129..b95650b5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java @@ -81,8 +81,5 @@ public class SarLawsDetailedList extends BaseEntity { @TableField("file_id") private String fileIds; - @ApiModelProperty(value = "附件id") - @TableField("car_type") - private String carType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java index 510ebe8c..e2dee83d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java @@ -15,7 +15,7 @@ public class TimeDto { private String standId; @ApiModelProperty(value = "实施日期") - private String ssrq; + private String putTime; @ApiModelProperty(value = "在产车实施日期") private String zccssrqgj; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java index a772e7c8..323c009e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java @@ -23,7 +23,7 @@ public interface ISarLawsDetailedListService extends IService AllSelectD(Integer pages, Integer size, String sortKey, String countryArea,String projectName, - String detailedList, String detailedListName,String carType); + String detailedList, String detailedListName); // IPage selectAllP(Integer pages,Integer size,String sortKey); String updateList(DetailedUpDto detailedUpDto); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 924cafd0..5d46d005 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -59,16 +59,13 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandApplicationType() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME",eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } - if (eo.getType() != null && !eo.getType().trim().equals("")) { - queryWrapper.like("type",eo.getType().trim()); - } IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -78,16 +75,13 @@ public class SarStandardComplianceAssessResultController { if(eo.getPosition()==1){ QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME",eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } - if (eo.getType() != null && !eo.getType().trim().equals("")) { - queryWrapper.like("type",eo.getType().trim()); - } IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -96,16 +90,13 @@ public class SarStandardComplianceAssessResultController { }else{ QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME",eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); } - if (eo.getType() != null && !eo.getType().trim().equals("")) { - queryWrapper.like("type",eo.getType().trim()); - } IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); while(page.getRecords().remove(null)); @@ -167,11 +158,14 @@ public class SarStandardComplianceAssessResultController { public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); - if (eo.getType() !=null) queryWrapper.eq("type",eo.getType()); if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); - if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); - if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); +// if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); +// if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); + IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); + +// while(page.getRecords().remove(null)); + return Result.success(page); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java index c6496762..4601161e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java @@ -91,10 +91,6 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @ApiModelProperty(value = "在产产品合规信息") private String productionCompliance; - @ApiModelProperty(value = "在产产品不合规信息") - @TableField("production_non_compliance") - private String productionNonCompliance; - @ApiModelProperty(value = "在产产品不合规应对措施") private String productionCountermeasures; @@ -117,10 +113,6 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @TableField("clause_name") private String clauseName; - @ApiModelProperty(value = "流程UUID") - @TableField("type") - private String type; - private String id; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java index c91afc56..53b782b2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java @@ -18,10 +18,6 @@ public class SarStandardComplianceProductAssessEO{ @TableField("STAND_ID") private String standId; - @ApiModelProperty(value = "流程UUID") - @TableField("type") - private String type; - @ApiModelProperty(value = "'项目名称'") private String productName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java index 4fb0c327..9981e6ee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java @@ -25,9 +25,6 @@ public class SarStandardsInfoEO { @ApiModelProperty(value = "国内1，国外2") private Integer position=1; - @ApiModelProperty(value = "流程UUID") - @TableField("type") - private String type; @ApiModelProperty("页数") private Integer current=1; From a45045f61cf09d6d1e89aa6acc08a90f0bbb668a Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Wed, 18 Aug 2021 09:35:41 +0800 Subject: [PATCH 38/47] =?UTF-8?q?add:=E9=87=8D=E7=BD=AEmq=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application-dev.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 0ba65555..1356e669 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -44,10 +44,10 @@ spring.mail.port=587 #spring.rabbitmq.username=uat_pcms #spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true -spring.rabbitmq.host=127.0.0.1 +spring.rabbitmq.host=62.234.118.181 spring.rabbitmq.port=5672 -spring.rabbitmq.username=guest -spring.rabbitmq.password=guest +spring.rabbitmq.username=admin +spring.rabbitmq.password=admin # ============================================== # 文档存储路径指向 # ============================================== From 8b465f93bff79632c187e349806a80a5abdbe7c3 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 18 Aug 2021 10:16:32 +0800 Subject: [PATCH 39/47] feat: There is no way the --- .../adc/da/search/service/impl/SearchCenterServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index ca267b3c..0ee34bf2 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -110,7 +110,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("textStatusName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("isRelateAccessName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("content.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.matchPhraseQuery("content", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*")); break; case "laws": @@ -199,6 +199,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { if(boolQueryShould!=null){ boolQueryBuilder.must(QueryBuilders.matchQuery("validFlag", 0)); if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){ + if (StringUtils.isNotBlank(searchInfoEO.getStandType())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("standType.keyword", "*"+searchInfoEO.getStandType()+"*")); + } boolQueryBuilder.must(boolQueryShould); }else { boolQueryBuilder.must(boolQueryShould); From 3906456daa37e7c2a45ee0b861ac86576e14140f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 18 Aug 2021 13:00:46 +0800 Subject: [PATCH 40/47] feat: There is no way the auth menu --- .../controller/TsResourceController.java | 7 +++ .../service/ITsResourceService.java | 2 + .../service/impl/TsResourceServiceImpl.java | 48 +++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java index 7ab32bdc..c8bd1e35 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java @@ -53,6 +53,13 @@ public class TsResourceController extends BaseController { return Result.success(tsResources); } + @ApiOperation("查询有权限资源") + @GetMapping("/getList") + public ResponseMessage> getList(TsResource tsResource){ + List tsResources=tsResourceService.getList(tsResource); + return Result.success(tsResources); + } + // @ApiOperation("查询所有资源") // @GetMapping("/getDefault") // public ResponseMessage> getDefault(){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java index 2335e30e..1f20ec11 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java @@ -34,6 +34,8 @@ public interface ITsResourceService extends IService { List getAll(TsResource tsResource); + List getList(TsResource tsResource); + List getDefaultByName(); ResponseMessage addResource(TsResource tsResource); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index 5da4ba92..17df5063 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -7,6 +7,7 @@ import com.adc.da.login.util.UserUtils; import com.adc.da.slrs.sarResource.dao.TsResourceDao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; +import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.util.UUIDUtils; import com.adc.da.utils.treetool.Tree; import com.adc.da.utils.treetool.TreeNode; @@ -34,6 +35,9 @@ public class TsResourceServiceImpl extends ServiceImpl selectMenuByRole(TsResource sarMenu) { List list = dao.selectMenuByRole(sarMenu); if (list == null) { @@ -155,6 +159,34 @@ public class TsResourceServiceImpl extends ServiceImpl getList(TsResource tsResource) { + List TsResources = new ArrayList<>(); + + List getMenuIdList = tsUserService.getResourceId(new TsResource()); + + if(!getMenuIdList.isEmpty()){ + QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); + if(tsResource.getSorDivide()!=null){ + tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide()); + } + tsResourceQueryWrapper.isNull("PARENT_ID"); + tsResourceQueryWrapper.in("ID",getMenuIdList); + tsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); + TsResources=dao.selectList(tsResourceQueryWrapper); + + for(TsResource TsResource:TsResources){ + TsResource.setChildren(recursionGetListChildren((TsResource),(getMenuIdList))); + } + } + + return TsResources; + } + @Override public List getDefaultByName() { List menusNames=new ArrayList<>(); @@ -248,6 +280,22 @@ public class TsResourceServiceImpl extends ServiceImpl(); } + /** + * 递归调用获取子节点 + * @param parent：父节点 + * @return List + */ + private List recursionGetListChildren(TsResource parent,List getMenuIdList){ + QueryWrapper TsResourceQueryWrapper=new QueryWrapper<>(); + TsResourceQueryWrapper.eq("PARENT_ID",parent.getId()); + TsResourceQueryWrapper.in("ID",getMenuIdList); + List children=dao.selectList(TsResourceQueryWrapper); + for(TsResource TsResource:children){ + TsResource.setChildren(recursionGetListChildren((TsResource),(getMenuIdList))); + } + return children; + } + /** * 递归调用获取子节点 * @param parent：父节点 From 9e0aad737ce7d97f6e94337038377228987053f3 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 18 Aug 2021 13:46:45 +0800 Subject: [PATCH 41/47] =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsDetailedListServiceImpl.java | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index eb6eeb92..63c916fd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -62,7 +62,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.select("DISTINCT country_area"); + wrapper.select("DISTINCT country_area,car_type"); List sarLawsDetailedLists = sarLawsDetailedListDao.selectList(wrapper); //多选是否可以添加的标识，true表示可以添加，false表示不许添加 boolean multiAddFlag = true; @@ -71,8 +71,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl AllSelectD(Integer page, Integer pageSize, String sortKey, - String countryArea, String projectName, + String countryArea, String carType, String detailedList, String detailedListName) { QueryWrapper wrapper = new QueryWrapper<>(); if ("1".equals(sortKey)) { wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea). like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); } else if ("2".equals(sortKey)) { - wrapper.like(StringUtils.isNotEmpty(projectName), "project_name", projectName). + wrapper.like(StringUtils.isNotEmpty(carType), "car_type", carType). like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); } else if ("3".equals(sortKey)) { @@ -475,9 +479,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl Date: Wed, 18 Aug 2021 14:44:27 +0800 Subject: [PATCH 42/47] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListController.java | 4 +- .../entity/LawsDto.java | 5 +- .../entity/SarLawsAttrDetailedList.java | 4 +- .../SarLawsAttrDetailedListServiceImpl.java | 9 ++- .../SarLawsDetailedListController.java | 4 +- .../entity/AddDetailedDto.java | 3 +- .../entity/SarLawsDetailedList.java | 3 + .../sarLawsDetailedList/entity/TimeDto.java | 2 +- .../service/ISarLawsDetailedListService.java | 2 +- ...ndardComplianceAssessResultController.java | 68 +++++++++---------- .../SarStandardComplianceProductAssessEO.java | 4 ++ .../entity/SarStandardsInfoEO.java | 3 + 12 files changed, 62 insertions(+), 49 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java index 47156302..724cf5f8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java @@ -222,8 +222,8 @@ public class SarLawsAttrDetailedListController extends BaseController> sycpx = (List>)map.get("SYCPXCLASS"); for (LawsDto list1:data){ - if (list1.getPutTime()!=null){ - list1.setPutTime(list1.getPutTime().substring(0,10)); + if (list1.getSSRQ()!=null){ + list1.setSSRQ(list1.getSSRQ().substring(0,10)); } if (list1.getZCCSSRQGJ()!=null){ list1.setZCCSSRQGJ(list1.getZCCSSRQGJ().substring(0,10)); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 730446d8..120a444d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -63,7 +63,7 @@ public class LawsDto { @ExcelProperty(value = "标准实施日期", index = 8) @ApiModelProperty(value = "标准实施日期") @DateTimeFormat("yyyy年MM月dd日") - private String putTime; + private String SSRQ; @ColumnWidth(16) @ExcelProperty(value = "新车型实施日期", index = 9) @@ -115,4 +115,7 @@ public class LawsDto { @ApiModelProperty(value = "文本状态") private String textStatus; + + @ApiModelProperty(value = "适用车型") + private String applyArctic; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java index 45dc5441..b037f45f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java @@ -44,8 +44,8 @@ public class SarLawsAttrDetailedList extends BaseEntity { private String number; @ApiModelProperty(value = "标准实施日期") - @TableField(value = "putTime") - private String putTime; + @TableField(value = "ssrq") + private String ssrq; @ApiModelProperty(value = "新车型实施日期") @TableField(value = "xcxssrq") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 92c664b7..a733b867 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -51,12 +51,15 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto); for (LawsDto lawsDto:list){ + if (StringUtils.isNoneEmpty(lawsDto.getApplyArctic())){ + lawsDto.setApplyArctic(lawsDto.getApplyArctic()); + } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("stand_id",lawsDto.getId()) .eq("detailed_list_id",sarFindDto.getId()); List sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); - if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getPutTime())){ - lawsDto.setPutTime(sarLawsAttrDetailedLists.get(0).getPutTime()); + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){ + lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); } if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); @@ -199,7 +202,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl publicList1 = sarLawsDetailedListService.AllSelectD(page, pageSize, sortKey, - countryArea, projectName, detailedList, detailedListName); + countryArea, projectName, detailedList, detailedListName,carType); List list= publicList1.getRecords();//从封装中取出数据 List list1;//继承类集合实现 list1 = BeanConverUtil.converList(list,FindFileNameDto.class);//将原来类的数据赋给继承类 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java index 6e7af186..47f55aad 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java @@ -40,5 +40,6 @@ public class AddDetailedDto { private String inforlist2; @ApiModelProperty(value = "新车型实施时间") private String inforlist3; - + @ApiModelProperty(value = "车辆类别") + private String carType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java index b95650b5..beec8129 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/SarLawsDetailedList.java @@ -81,5 +81,8 @@ public class SarLawsDetailedList extends BaseEntity { @TableField("file_id") private String fileIds; + @ApiModelProperty(value = "附件id") + @TableField("car_type") + private String carType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java index e2dee83d..510ebe8c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/TimeDto.java @@ -15,7 +15,7 @@ public class TimeDto { private String standId; @ApiModelProperty(value = "实施日期") - private String putTime; + private String ssrq; @ApiModelProperty(value = "在产车实施日期") private String zccssrqgj; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java index 323c009e..a772e7c8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java @@ -23,7 +23,7 @@ public interface ISarLawsDetailedListService extends IService AllSelectD(Integer pages, Integer size, String sortKey, String countryArea,String projectName, - String detailedList, String detailedListName); + String detailedList, String detailedListName,String carType); // IPage selectAllP(Integer pages,Integer size,String sortKey); String updateList(DetailedUpDto detailedUpDto); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 1e7c723f..4ab81ce3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -61,64 +61,64 @@ public class SarStandardComplianceAssessResultController { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { - queryWrapper.like("STAND_NAME",eo.getStandName().trim()); + queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { - queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); + queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); } if (eo.getType() != null && !eo.getType().trim().equals("")) { - queryWrapper.like("type",eo.getType().trim()); + queryWrapper.like("type", eo.getType().trim()); } IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); - }else { - if(eo.getPosition()==1){ + } else { + if (eo.getPosition() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { - queryWrapper.like("STAND_NAME",eo.getStandName().trim()); + queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { - queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); + queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); } // if (eo.getType() != null && !eo.getType().trim().equals("")) { // queryWrapper.like("type",eo.getType().trim()); // } IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); - }else{ + } else { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { - queryWrapper.like("STAND_NAME",eo.getStandName().trim()); + queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) { - queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim()); + queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim()); } // if (eo.getType() != null && !eo.getType().trim().equals("")) { // queryWrapper.like("type",eo.getType().trim()); // } IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); } } } - private static class InsertEntity{ + private static class InsertEntity { List entityList; T eo; } - @ApiOperation(value="（插入/更新）标准清单") + @ApiOperation(value = "（插入/更新）标准清单") @PostMapping("/standard") public ResponseMessage insertStandard(@RequestBody InsertEntity insertEntity) throws InvocationTargetException, IllegalAccessException { @@ -128,27 +128,27 @@ public class SarStandardComplianceAssessResultController { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarStandardComplianceProductAssess obj=new SarStandardComplianceProductAssess(); + SarStandardComplianceProductAssess obj = new SarStandardComplianceProductAssess(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } iSarStandardComplianceProductAssessService.saveOrUpdateBatch(entityList); - }else { - if(eo.getPosition()==1){ + } else { + if (eo.getPosition() == 1) { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + SarInterpretationNationalStandard obj = new SarInterpretationNationalStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); - }else{ + } else { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } @@ -166,14 +166,11 @@ public class SarStandardComplianceAssessResultController { public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); + if (eo.getType() != null) queryWrapper.eq("type", eo.getType()); if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName()); -// if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); -// if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - + if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId()); + if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); - -// while(page.getRecords().remove(null)); - return Result.success(page); } @@ -195,22 +192,22 @@ public class SarStandardComplianceAssessResultController { @ApiOperation(value = "条件查询技术审核符合性清单") @GetMapping("/interpretation") public ResponseMessage selectNationalStandard(InterpretationEO eo) throws Exception { - if (eo.getPosition()==1) { + if (eo.getPosition() == 1) { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - if(eo.getStandId()!=null)queryWrapper.eq("STAND_ID",eo.getStandId()); + if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); } else { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - if(eo.getStandId()!=null)queryWrapper.eq("STAND_ID",eo.getStandId()); + if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); + while (page.getRecords().remove(null)) ; return Result.success(page); } @@ -223,11 +220,11 @@ public class SarStandardComplianceAssessResultController { InterpretationEO eo = insertEntity.eo; - if (eo.getPosition()==1) { + if (eo.getPosition() == 1) { List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + SarInterpretationNationalStandard obj = new SarInterpretationNationalStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } @@ -235,10 +232,9 @@ public class SarStandardComplianceAssessResultController { } else { - List entityList = new ArrayList<>(); for (int i = 0; i < insertEntity.entityList.size(); i++) { - SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + SarInterpretationForeignStandard obj = new SarInterpretationForeignStandard(); BeanUtils.populate(obj, insertEntity.entityList.get(i)); entityList.add(obj); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java index 53b782b2..c91afc56 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssessEO.java @@ -18,6 +18,10 @@ public class SarStandardComplianceProductAssessEO{ @TableField("STAND_ID") private String standId; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; + @ApiModelProperty(value = "'项目名称'") private String productName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java index 9981e6ee..4fb0c327 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java @@ -25,6 +25,9 @@ public class SarStandardsInfoEO { @ApiModelProperty(value = "国内1，国外2") private Integer position=1; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; @ApiModelProperty("页数") private Integer current=1; From 508c2922002a07b7940cc35f7cda2acc87e1cd19 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 18 Aug 2021 15:15:06 +0800 Subject: [PATCH 43/47] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/FeignClient/workFlowFeignClient.java | 4 ++-- adc-da-main/src/main/resources/application-dev.properties | 2 +- adc-da-main/src/main/resources/application.properties | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 9774715e..ccd200f7 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -13,8 +13,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -//@FeignClient(value = "bat-wkflow") -@FeignClient(value = "shan6") +@FeignClient(value = "bat-wkflow") +//@FeignClient(value = "shan6") public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index d889af61..c9a24e7a 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -12,7 +12,7 @@ spring.datasource.password = root #============================================== # 应用设置 -spring.application.name=FotonLAWSSystem556 +spring.application.name=FotonLAWSSystem application.code=20200101 application.center=1 #============================================== diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index d39b475a..50c4225d 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -40,6 +40,7 @@ eureka.client.fetch-registry=true #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ +#eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 From 150e2c96d25979a8d0a6cc5546d2289a83594984 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 18 Aug 2021 16:30:58 +0800 Subject: [PATCH 44/47] feat: There is no way the User Menu auth --- .../slrs/sarResource/entity/TsResource.java | 3 +++ .../service/impl/TsResourceServiceImpl.java | 26 ++++++++++--------- .../entity/StandardsInfoExcelVO.java | 1 + .../impl/SarStandardsInfoServiceImpl.java | 9 ++++--- .../slrs/sarUser/service/ITsUserService.java | 2 ++ .../service/impl/TsUserServiceImpl.java | 12 +++++++++ 6 files changed, 38 insertions(+), 15 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java index 39e2f196..5fef685e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java @@ -97,4 +97,7 @@ public class TsResource extends BaseEntity { @TableField(exist=false) private List childMenuIds; + @TableField(exist=false) + private String userId; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index 17df5063..45327104 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -167,20 +167,22 @@ public class TsResourceServiceImpl extends ServiceImpl getList(TsResource tsResource) { List TsResources = new ArrayList<>(); - List getMenuIdList = tsUserService.getResourceId(new TsResource()); + if(tsResource.getUserId() != null){ + List getMenuIdList = tsUserService.getResourceUserId(tsResource.getUserId()); - if(!getMenuIdList.isEmpty()){ - QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); - if(tsResource.getSorDivide()!=null){ - tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide()); - } - tsResourceQueryWrapper.isNull("PARENT_ID"); - tsResourceQueryWrapper.in("ID",getMenuIdList); - tsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); - TsResources=dao.selectList(tsResourceQueryWrapper); + if(!getMenuIdList.isEmpty()){ + QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); + if(tsResource.getSorDivide()!=null){ + tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide()); + } + tsResourceQueryWrapper.isNull("PARENT_ID"); + tsResourceQueryWrapper.in("ID",getMenuIdList); + tsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); + TsResources=dao.selectList(tsResourceQueryWrapper); - for(TsResource TsResource:TsResources){ - TsResource.setChildren(recursionGetListChildren((TsResource),(getMenuIdList))); + for(TsResource TsResource:TsResources){ + TsResource.setChildren(recursionGetListChildren((TsResource),(getMenuIdList))); + } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/StandardsInfoExcelVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/StandardsInfoExcelVO.java index 9283ddc5..9fa14080 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/StandardsInfoExcelVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/StandardsInfoExcelVO.java @@ -13,5 +13,6 @@ public class StandardsInfoExcelVO { String standSort; String standNumber; String collectMenuId; + String userId; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index cb0b7ed8..1b2bddea 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -267,13 +267,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception { //查询当前登录人角色拥有权限的菜单 - if(page.getMenuId() != null ){ + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ QueryWrapper qw = new QueryWrapper<>(); qw.eq("ID",page.getMenuId()); qw.isNull("PARENT_ID"); List children = iTsResourceService.list(qw); if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ - List getMenuIdList = tsUserService.getResourceId(new TsResource()); + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); if (getMenuIdList != null && !getMenuIdList.isEmpty()) { page.setMenuRoleList(getMenuIdList); } else { @@ -1349,7 +1349,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getMenuIdList=tsUserService.getResourceId(new TsResource()); + List getMenuIdList = new ArrayList<>(); + if(standardsInfoExcelVO.getUserId() != null){ + getMenuIdList= tsUserService.getResourceUserId(standardsInfoExcelVO.getUserId()); + } // List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); if (getMenuIdList != null && !getMenuIdList.isEmpty()) { page.setMenuRoleList(getMenuIdList); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index 8100abb5..2be89ea5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -65,6 +65,8 @@ public interface ITsUserService extends IService { List getResourceId(TsResource tsResource); + List getResourceUserId(String userId); + /** * 导入人员数据 */ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index c3c4e8cb..12d7b452 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -195,6 +195,18 @@ public class TsUserServiceImpl extends ServiceImpl implements } + /** + * 查询当前登录的用户资源 + * @return List + */ + @Override + public List getResourceUserId(String userId) { + List positionIds=tsUserDao.selectPositionIds(userId); + List roleIds=tsPositionService.getRoleIdsByPositionIds(positionIds); + return tsRoleService.getResourceIdsByRoleIds(roleIds); + + } + /** * 导入人员数据 */ From cdb3a9ccd405d876451463e2e00a6013be4937f3 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 19 Aug 2021 09:25:29 +0800 Subject: [PATCH 45/47] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20!!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardComplianceAssessResultController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 4ab81ce3..230ea18a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -78,7 +78,7 @@ public class SarStandardComplianceAssessResultController { if (eo.getPosition() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } @@ -96,7 +96,7 @@ public class SarStandardComplianceAssessResultController { } else { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } From 0aba76276fd25e305b70282455d974cfa7e89270 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 19 Aug 2021 10:26:31 +0800 Subject: [PATCH 46/47] feat: There is no way the --- .../sarStandardsInfo/controller/SarStandardsInfoController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e333d7ac..06bf3717 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 @@ -49,7 +49,7 @@ import java.util.*; /** *

- * 前端控制器 + * 前端控制器 There is no way the *

* * @author super_liu From bc1a9e82418ec69bb5a14aa5d7f4b8c621112c29 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 19 Aug 2021 10:38:21 +0800 Subject: [PATCH 47/47] feat: There is no way the --- .../slrs/sarStandItems/entity/SarStandItems.java | 4 ---- .../service/impl/SarStandardsInfoServiceImpl.java | 15 +++++++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java index 4474b458..d9d268cb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java @@ -189,10 +189,6 @@ public class SarStandItems extends BaseEntity { @TableField("compliance_state") private String complianceState; - @ApiModelProperty(value = "符合性要求-符合性状态") - @TableId("COMPLIANCE_REQUIR") - private String complianceRequire; - @ApiModelProperty(value = "解读内容") @TableField("read_content") private String readContent; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index fb043141..0b3baafc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -267,13 +267,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception { //查询当前登录人角色拥有权限的菜单 - if(page.getMenuId() != null ){ + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ QueryWrapper qw = new QueryWrapper<>(); qw.eq("ID",page.getMenuId()); qw.isNull("PARENT_ID"); List children = iTsResourceService.list(qw); if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ - List getMenuIdList = tsUserService.getResourceId(new TsResource()); + List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); if (getMenuIdList != null && !getMenuIdList.isEmpty()) { page.setMenuRoleList(getMenuIdList); } else { @@ -609,7 +609,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); if(!sarItemVOS.isEmpty()){ Map collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null) - .collect(Collectors.toMap(SarStandItems::getItemsNum, SarStandItems::getItemsName)); + .collect(Collectors.toMap(SarStandItems::getItemsNum, SarStandItems::getTermsConditions)); sarStandardsInfoEO.setMapItems(collectMap); } createStandMQService.sendStandMQ(sarStandardsInfoEO,"add"); @@ -1195,7 +1195,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo); if(!sarItemVOS.isEmpty()){ Map collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null) - .collect(Collectors.toMap(SarStandItems::getItemsNum, SarStandItems::getItemsName)); + .collect(Collectors.toMap(SarStandItems::getItemsNum, SarStandItems::getTermsConditions)); sarStandardsInfoEO.setMapItems(collectMap); } createStandMQService.sendStandMQ(sarStandardsInfoEO,"update"); @@ -1362,8 +1362,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getMenuIdList=tsUserService.getResourceId(new TsResource()); -// List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); + List getMenuIdList = new ArrayList<>(); + if(standardsInfoExcelVO.getUserId() != null){ + getMenuIdList= tsUserService.getResourceUserId(standardsInfoExcelVO.getUserId()); + } + // List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); if (getMenuIdList != null && !getMenuIdList.isEmpty()) { page.setMenuRoleList(getMenuIdList); } else {