From 72d2d47c31e96b6d797b15bc8bdfc3da3950b5ae Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Tue, 6 Sep 2022 15:03:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=EF=BC=8C=E8=BF=94=E6=98=BE=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandAttrDetailsController.java | 25 +++- .../entity/SarStandAttrDetailsDto.java | 115 ++++++++++++++++++ 2 files changed, 136 insertions(+), 4 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/SarStandAttrDetailsDto.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java index ae190b73..5a759a15 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java @@ -5,6 +5,7 @@ import com.adc.da.common.SarTypeEnum; import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetailsDto; import com.adc.da.slrs.sarStandAttrDetails.page.SarStandAttrDetailsEOPage; import com.adc.da.slrs.sarStandAttrDetails.service.ISarStandAttrDetailsService; import com.adc.da.sys.common.SelectionResult; @@ -15,16 +16,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -172,6 +171,24 @@ public class SarStandAttrDetailsController extends BaseController> getListData1(){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("ATTR_TYPE","file"); + List sarStandAttrDetails=sarStandAttrDetailsEOService.list(queryWrapper); + List sarStandAttrDetailsDtos = new ArrayList<>(); + for (SarStandAttrDetails sarStand:sarStandAttrDetails){ + SarStandAttrDetailsDto sarStandAttrDetailsDto = new SarStandAttrDetailsDto(); + BeanUtils.copyProperties(sarStand,sarStandAttrDetailsDto); + sarStandAttrDetailsDto.setLabel(sarStandAttrDetailsDto.getAttrName()); + sarStandAttrDetailsDto.setValue(sarStandAttrDetailsDto.getAttrField()); + sarStandAttrDetailsDtos.add(sarStandAttrDetailsDto); + } + return Result.success(sarStandAttrDetailsDtos); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/SarStandAttrDetailsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/SarStandAttrDetailsDto.java new file mode 100644 index 00000000..59289406 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/SarStandAttrDetailsDto.java @@ -0,0 +1,115 @@ +package com.adc.da.slrs.sarStandAttrDetails.entity; + +import com.adc.da.base.entity.BaseEntity; +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 java.util.Date; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-06-01 + */ +@Data +public class SarStandAttrDetailsDto { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") +// @TableId("ID") + private String id; + + @ApiModelProperty(value = "属性字段") +// @TableField("ATTR_FIELD") + private String attrField; + + private String value; + + @ApiModelProperty(value = "属性名称") +// @TableField("ATTR_NAME") + private String attrName; + + private String label; + + @ApiModelProperty(value = "类型（INPUT_STR字符串输入框,INPUT_NUM数字输入框,SELECT_OPTION下拉框，DATE_PICKER日期选择，FILE文件，TEXTAREA文本框）") +// @TableField("ATTR_TYPE") + private String attrType; + + @ApiModelProperty(value = "属性字段长度") +// @TableField("ATTR_LEN") + private Long attrLen; + + @ApiModelProperty(value = "展示顺序") +// @TableField("ORDER_NUM") + private Long orderNum; + + @ApiModelProperty(value = "是否可编辑(0是，1否)") +// @TableField("IS_EDIT") + private String isEdit; + +// @TableField("CREATION_USER") + private String creationUser; + + @ApiModelProperty(value = "是否有效") +// @TableField("VALID_FLAG") + private String validFlag; + + @ApiModelProperty(value = "创建时间") +// @TableField("CREATION_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") +// @TableField("MODIFY_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date modifyTime; + + @ApiModelProperty(value = "是否必填") +// @TableField("IS_MUST") + private String isMust; + + @ApiModelProperty(value = "是否展示") +// @TableField("IS_SHOW_IMP") + private String isShowImp; + + @ApiModelProperty(value = "展示区域") +// @TableField("SHOW_REGION_ID") + private String showRegionId; + + @ApiModelProperty(value = "下拉选项所用的值") +// @TableField("SEL_VAL") + private String selVal; + + @ApiModelProperty(value = "模块类型（STAND标准，LAWS政策）") +// @TableField("SAR_TYPE") + private String sarType; + + @ApiModelProperty(value = "是否作为检索条件") +// @TableField("IS_SEARCH") + private String isSearch; + + @ApiModelProperty(value = "是否预警") +// @TableField("IS_WARN") + private String isWarn; + + @ApiModelProperty(value = "是否检索字段") +// @TableField("IS_JANSUO") + private String isJansuo; + +// @TableField(exist = false) + private String attrValue; + +// @TableField(exist = false) + private String areaName; + +} From 83f36cc913912d452461e5d94b1499ac250884e8 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Tue, 6 Sep 2022 15:09:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandProjectLibraryServiceImpl.java | 14 +------------- 1 file changed, 1 insertion(+), 13 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 4e54c974..27bfb941 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 @@ -564,21 +564,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl list) { if(list!=null && !list.isEmpty()){ - for (StandProjectRelationDto relationDto : list){ - SarStandProjectLibrary sarStandProjectLibrary = sarStandProjectLibraryDao.selectById(relationDto.getProjectId()); - if ("G9".equals(sarStandProjectLibrary.getCurrentNode())){ - sarStandProjectLibraryDao.updateFlag(relationDto.getProjectId()); - }else if ("G8".equals(sarStandProjectLibrary.getCurrentNode())){ - sarStandProjectLibraryDao.updateFlag(relationDto.getProjectId()); - }else if ("G7".equals(sarStandProjectLibrary.getCurrentNode())){ - sarStandProjectLibraryDao.updateFlag(relationDto.getProjectId()); - }else if ("G4".equals(sarStandProjectLibrary.getCurrentNode())){ - sarStandProjectLibraryDao.updateFlag(relationDto.getProjectId()); - } - } StandProjectRelationDto standProjectRelationDto = list.get(0); if(standProjectRelationDto!=null && StringUtils.isNotBlank(standProjectRelationDto.getProjectId())){ -// sarStandProjectLibraryDao.updateFlag(standProjectRelationDto.getProjectId()); + sarStandProjectLibraryDao.updateFlag(standProjectRelationDto.getProjectId()); sarStandProjectLibraryDao.deleteByProjectId(standProjectRelationDto.getProjectId()); } sarStandProjectLibraryDao.batchInsert(list); From 8b82bfac9f6662a27842c013ebd545da7cf6b831 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 8 Sep 2022 13:25:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=99=A4=E4=BA=86=E9=9D=9E=E6=94=B9=E9=A1=B9=E7=9B=AE=E4=B8=8B?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryServiceImpl.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 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 27bfb941..34233545 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 @@ -460,9 +460,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl wrapper1 = new QueryWrapper<>(); - wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","TEXT_STATUS","STAND_TYPE","ISSUE_TIME","(select count(*) from sar_stand_unqualified " + - " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ","(select count(*) from sar_stand_unqualified" + - " where STAND_ID = r.stand_id and CLOSE_STATE = '2' ) as counts ", + wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","TEXT_STATUS","STAND_TYPE","ISSUE_TIME", + "(select count(*) from sar_stand_unqualified ssu " + + "inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" + + " where ssu.STAND_ID = r.stand_id and ssu.CLOSE_STATE = '1' and pn.id = '" + standId + "') as unCount ", + "(select count(*) from sar_stand_unqualified ssu " + + "inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" + + " where ssu.STAND_ID = r.stand_id and ssu.CLOSE_STATE = '2' and pn.id = '" + standId + "') as counts ", "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME ) from sar_stand_unqualified where " + " STAND_ID = r.stand_id and CLOSE_STATE = '1' AND PLAN_CLOSE_TIME is NOT NULL ) as endTimes "); wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'" + @@ -477,8 +481,12 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl Date: Thu, 8 Sep 2022 16:55:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=8C=E7=BB=93=E4=B9=8B=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=BD=92=E6=A1=A3=E6=9C=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E7=AC=A6=E5=90=88=EF=BC=8C=E4=B8=8D=E6=B6=89?= =?UTF-8?q?=E5=8F=8A=E6=B2=A1=E6=9C=89=E5=BD=92=E6=A1=A3=EF=BC=8C=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=A8=A1=E5=9D=97=E5=BD=92=E6=A1=A3?= =?UTF-8?q?=E6=B2=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/FeignClient/workFlowFeignClient.java | 4 ++-- .../SarStandProjectLibraryServiceImpl.java | 24 +++++++++++++++++++ .../entity/SarStandardsInfo.java | 8 +++++++ 3 files changed, 34 insertions(+), 2 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 ff88272a..581dd4d9 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 @@ -18,8 +18,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -//@FeignClient(value = "bat-wkflow-test") -@FeignClient(value = "bat-wkflow") +@FeignClient(value = "bat-wkflow-test") +//@FeignClient(value = "bat-wkflow") //@FeignClient(value = "shan6") public interface workFlowFeignClient { 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 34233545..99a64b24 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 @@ -464,6 +464,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl userIPage = new Page<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index a1d27dfd..80492274 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -158,6 +158,14 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private String endTimes; + @ApiModelProperty(value = "符合数量") + @TableField(exist = false) + private Long isCount; + + @ApiModelProperty(value = "不涉及数量") + @TableField(exist = false) + private Long isOverCount; + // 以下为非表中字段 @TableField(exist = false) From afdc003aa2c6f7bf9018d4ad552c7f2648bc652f Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 8 Sep 2022 18:49:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=85=88=E8=B7=91=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=81=87=E5=A6=82?= =?UTF-8?q?=E5=BD=92=E6=A1=A3A=E6=A0=87=E5=87=86=EF=BC=8C=E5=86=8D?= =?UTF-8?q?=E8=B7=91=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=EF=BC=8C=E5=81=87=E5=A6=82=E5=BD=92=E6=A1=A3B=E6=A0=87?= =?UTF-8?q?=E5=87=86=EF=BC=8C=E6=9F=A5=E7=9C=8B=E9=A1=B9=E7=9B=AE=E6=B8=85?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E5=AF=B9=E5=BA=94=E9=A1=B9=E7=9B=AE=E4=B8=8B?= =?UTF-8?q?=E7=9A=84A=E6=A0=87=E5=87=86=E8=A2=AB=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/FeignClient/workFlowFeignClient.java | 4 ++-- .../dao/SarStandProjectLibraryDao.java | 3 +++ .../impl/SarStandProjectLibraryServiceImpl.java | 8 +++++++- .../SarStandProjectLibraryMapper.xml | 10 ++++++++-- 4 files changed, 20 insertions(+), 5 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 581dd4d9..ff88272a 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 @@ -18,8 +18,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -@FeignClient(value = "bat-wkflow-test") -//@FeignClient(value = "bat-wkflow") +//@FeignClient(value = "bat-wkflow-test") +@FeignClient(value = "bat-wkflow") //@FeignClient(value = "shan6") public interface workFlowFeignClient { 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 70c7df9a..034aa33e 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 @@ -31,8 +31,11 @@ public interface SarStandProjectLibraryDao extends BaseMapper getAllStand(); void updateByProjectId(@Param("id")String id, @Param("version")String version); List updateByProjectIdBath(@Param("id")List id, @Param("version")String version); + void deleteByProjectId(@Param("projectId")String projectId); + void deleteByProjectIdAndStandId(@Param("projectId")String projectId,@Param("standId")String standId); + List selectListByids(@Param("ids") List ids); List queryProjectGroup(@Param("current")int current,@Param("size")int size,@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); Integer queryProjectGroupCount(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); 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 99a64b24..26ecbf36 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 @@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import com.mysql.cj.x.protobuf.MysqlxDatatypes; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; @@ -138,6 +139,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectGroup(int current,int size,SarStandProjectLibrary sarStandProjectLibrary) { + size = 10000; List sarStandProjectLibraries=sarStandProjectLibraryDao.queryProjectGroup(current,size,sarStandProjectLibrary); Integer total=sarStandProjectLibraryDao.queryProjectGroupCount(sarStandProjectLibrary); Page page=new Page<>(); @@ -599,7 +601,11 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl + + delete from sar_stand_project_relation where + project_id= #{projectId} + and stand_id = #{standId} + + update sar_stand_project_library @@ -420,8 +426,8 @@