From f999a8fd778709a0df8448c91e457076073ed8af Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 24 Dec 2021 17:07:29 +0800 Subject: [PATCH 01/40] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=B1=E6=95=88bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rStandardComplianceProductAssessMapper.xml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml index 2bad2b79..2d87fea1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml @@ -17,6 +17,12 @@ WHERE sar_stand_project_library.project_number in ( SELECT product_id FROM sar_standard_compliance_product_assess WHERE STAND_ID=#{product.standId}) AND CLOSE_STATE = '1' + + and product_name like concat(concat('%',#{product.productName}),'%') + + + and project_number like concat(concat('%',#{product.productId}),'%') + group by PRODUCT_NAME, sar_stand_project_library.project_group, @@ -25,12 +31,6 @@ sar_stand_project_library.project_number, sar_stand_project_library.id, ts_user.UNAME - - and product_name like concat(concat('%',#{product.productName}),'%') - - - and project_number like concat(concat('%',#{product.productId}),'%') - ORDER BY PRODUCT_NAME ASC limit ${(page-1)*pageSize},${pageSize} @@ -46,6 +46,12 @@ WHERE sar_stand_project_library.project_number in (SELECT product_id FROM sar_standard_compliance_product_assess WHERE STAND_ID=#{product.standId}) AND CLOSE_STATE = '1' + + and product_name like concat(concat('%',#{product.productName}),'%') + + + and project_number like concat(concat('%',#{product.productId}),'%') + group by PRODUCT_NAME, sar_stand_project_library.project_group, @@ -54,12 +60,6 @@ sar_stand_project_library.project_number, sar_stand_project_library.id, ts_user.UNAME - - and product_name like concat(concat('%',#{product.productName}),'%') - - - and project_number like concat(concat('%',#{product.productId}),'%') - ORDER BY PRODUCT_NAME ASC From c7b0affb8759a87f71790fea7519d54e651e99d3 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sat, 25 Dec 2021 16:47:50 +0800 Subject: [PATCH 02/40] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=BA=93=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=E5=8F=8A=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EsMatingRelationController.java | 23 ++++ .../dao/EsMatingRelationDao.java | 21 ++++ .../entity/EsMatingRelation.java | 49 +++++++++ .../service/IEsMatingRelationService.java | 16 +++ .../impl/EsMatingRelationServiceImpl.java | 20 ++++ .../controller/EsRevisePlanController.java | 2 +- .../esRevisePlan/entity/EsRevisePlan.java | 27 +++++ .../service/impl/EsRevisePlanServiceImpl.java | 27 +++++ .../controller/EsStandRelationController.java | 23 ++++ .../dao/EsStandRelationDao.java | 19 ++++ .../entity/EsStandRelation.java | 62 +++++++++++ .../service/IEsStandRelationService.java | 16 +++ .../impl/EsStandRelationServiceImpl.java | 20 ++++ .../EsMatingRelationMapper.xml | 18 +++ .../esRevisePlan/EsRevisePlanMapper.xml | 104 +++++++++++++++++- .../esStandRelation/EsStandRelationMapper.xml | 19 ++++ 16 files changed, 461 insertions(+), 5 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/controller/EsMatingRelationController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/dao/EsMatingRelationDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/entity/EsMatingRelation.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/service/IEsMatingRelationService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/service/impl/EsMatingRelationServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/controller/EsStandRelationController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/dao/EsStandRelationDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/service/IEsStandRelationService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/service/impl/EsStandRelationServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/esMatingRelation/EsMatingRelationMapper.xml create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/controller/EsMatingRelationController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/controller/EsMatingRelationController.java new file mode 100644 index 00000000..1a721538 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/controller/EsMatingRelationController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.esMatingRelation.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.esMatingRelation.entity.EsMatingRelation; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 前端控制器 + *

+* +* @author yzh +* @since 2021-12-24 +*/ +@RestController +@Api(description = "|EsMatingRelation|") +@RequestMapping("/esMatingRelation/es-mating-relation") +public class EsMatingRelationController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/dao/EsMatingRelationDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/dao/EsMatingRelationDao.java new file mode 100644 index 00000000..2c89740a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/dao/EsMatingRelationDao.java @@ -0,0 +1,21 @@ +package com.adc.da.slrs.esMatingRelation.dao; + +import com.adc.da.slrs.esMatingRelation.entity.EsMatingRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author yzh + * @since 2021-12-24 + */ +public interface EsMatingRelationDao extends BaseMapper { + + List getDatas(@Param("id") String id); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/entity/EsMatingRelation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/entity/EsMatingRelation.java new file mode 100644 index 00000000..da0b6092 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/entity/EsMatingRelation.java @@ -0,0 +1,49 @@ +package com.adc.da.slrs.esMatingRelation.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * + *

+ * + * @author yzh + * @since 2021-12-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="EsMatingRelation对象", description="") +public class EsMatingRelation extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableField("id") + private String id; + + @ApiModelProperty(value = "计划id") + @TableField("es_id") + private String esId; + + @ApiModelProperty(value = "标准id") + @TableField("stand_id") + private String standId; + + @ApiModelProperty(value = "标准类型") + @TableField("stand_type") + private String standType; + + @TableField(exist = false) + private String standNumber; + + @TableField(exist = false) + private String standName; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/service/IEsMatingRelationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/service/IEsMatingRelationService.java new file mode 100644 index 00000000..96d5c316 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/service/IEsMatingRelationService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.esMatingRelation.service; + +import com.adc.da.slrs.esMatingRelation.entity.EsMatingRelation; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author yzh + * @since 2021-12-24 + */ +public interface IEsMatingRelationService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/service/impl/EsMatingRelationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/service/impl/EsMatingRelationServiceImpl.java new file mode 100644 index 00000000..a51551c0 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esMatingRelation/service/impl/EsMatingRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.esMatingRelation.service.impl; + +import com.adc.da.slrs.esMatingRelation.entity.EsMatingRelation; +import com.adc.da.slrs.esMatingRelation.dao.EsMatingRelationDao; +import com.adc.da.slrs.esMatingRelation.service.IEsMatingRelationService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author yzh + * @since 2021-12-24 + */ +@Service +public class EsMatingRelationServiceImpl extends ServiceImpl implements IEsMatingRelationService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index d327ee5d..5b6ecc54 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -53,7 +53,7 @@ public class EsRevisePlanController extends BaseController { return Result.success(iEsRevisePlanService.getOnePlan(id)); } - +//----------------回来改----------------------上面的------ @ApiOperation(value = "获取是否存在重复名企标名称接口") @GetMapping("/getDataByName") public ResponseMessage getDataByName(EsRevisePlan esRevisePlan){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 74b61551..26f8a511 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -1,8 +1,11 @@ package com.adc.da.slrs.esRevisePlan.entity; import java.util.Date; +import java.util.List; import com.adc.da.base.page.BasePage; +import com.adc.da.slrs.esMatingRelation.entity.EsMatingRelation; +import com.adc.da.slrs.esStandRelation.entity.EsStandRelation; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -73,6 +76,30 @@ public class EsRevisePlan extends BasePage { @ApiModelProperty(value = "起草责任单位ID") private String unitName; +// @ApiModelProperty(value = "引用标准json") +// private String rsJson; +// @ApiModelProperty(value = "配套标准json") +// private String ptJson; + @ApiModelProperty(value = "引入企业标准json(标准id)") + private String rqbJson; + @ApiModelProperty(value = "引入企业标准json(标准id)") + private String rqbName; + @ApiModelProperty(value = "引入企业标准json(标准id)") + private String rqbCode; + @ApiModelProperty(value = "体系结构树（找到表直接json处理掉，存储方式是逗号拼接）") + private String tsJson; + @ApiModelProperty(value = "体系结构树（找到表直接json处理掉，存储方式是逗号拼接）") + private String tsJsonName; + @ApiModelProperty(value = "标准范围") + private String area; + @ApiModelProperty(value = "标准范围") + private String areaName; + @ApiModelProperty(value = "标准范围") + private String qblb; + + private List esMatingRelations; + + private List esStandRelations; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index f5a1e950..fe2f8367 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -1,9 +1,14 @@ package com.adc.da.slrs.esRevisePlan.service.impl; +import com.adc.da.slrs.esMatingRelation.entity.EsMatingRelation; +import com.adc.da.slrs.esMatingRelation.service.IEsMatingRelationService; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; +import com.adc.da.slrs.esStandRelation.entity.EsStandRelation; +import com.adc.da.slrs.esStandRelation.service.IEsStandRelationService; import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,6 +30,10 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getAllPlans(EsRevisePlan esRevisePlan) { @@ -54,6 +63,8 @@ public class EsRevisePlanServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("es_id",id); + esMatingRelationService.remove(queryWrapper); + QueryWrapper queryWrapper1=new QueryWrapper<>(); + queryWrapper1.eq("es_id",id); + esStandRelationService.remove(queryWrapper1); return esRevisePlanDao.deleteOne(id); } @Override public int delPlans(String ids) { String[] str = ids.split(","); + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.in("es_id",str); + esMatingRelationService.remove(queryWrapper); + + QueryWrapper queryWrapper1=new QueryWrapper<>(); + queryWrapper1.in("es_id",str); + esStandRelationService.remove(queryWrapper1); + return esRevisePlanDao.deleteBatch(str); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/controller/EsStandRelationController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/controller/EsStandRelationController.java new file mode 100644 index 00000000..72909ddb --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/controller/EsStandRelationController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.esStandRelation.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.esStandRelation.entity.EsStandRelation; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 前端控制器 + *

+* +* @author yzh +* @since 2021-12-24 +*/ +@RestController +@Api(description = "|EsStandRelation|") +@RequestMapping("/esStandRelation/es-stand-relation") +public class EsStandRelationController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/dao/EsStandRelationDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/dao/EsStandRelationDao.java new file mode 100644 index 00000000..ecbf69b6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/dao/EsStandRelationDao.java @@ -0,0 +1,19 @@ +package com.adc.da.slrs.esStandRelation.dao; + +import com.adc.da.slrs.esStandRelation.entity.EsStandRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author yzh + * @since 2021-12-24 + */ +public interface EsStandRelationDao extends BaseMapper { + List getDatas(@Param("id")String id); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java new file mode 100644 index 00000000..e71f029a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java @@ -0,0 +1,62 @@ +package com.adc.da.slrs.esStandRelation.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.beans.factory.annotation.Autowired; + +/** + *

+ * + *

+ * + * @author yzh + * @since 2021-12-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="EsStandRelation对象", description="") +public class EsStandRelation extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableField("id") + private String id; + + @ApiModelProperty(value = "企标制修订计划") + @TableField("es_id") + private String esId; + + @ApiModelProperty(value = "是否引用标准") + @TableField("is_relate") + private String isRelate; + + @ApiModelProperty(value = "采用程度") + @TableField("use_level") + private String useLevel; + + @ApiModelProperty(value = "简述技术指标依据") + @TableField("technologic") + private String technologic; + + @ApiModelProperty(value = "采标id") + @TableField("stand_id") + private String standId; + + @ApiModelProperty(value = "标准类型") + @TableField("stand_type") + private String standType; + + @TableField(exist = false) + private String standNumber; + + @TableField(exist = false) + private String standName; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/service/IEsStandRelationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/service/IEsStandRelationService.java new file mode 100644 index 00000000..f7625e30 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/service/IEsStandRelationService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.esStandRelation.service; + +import com.adc.da.slrs.esStandRelation.entity.EsStandRelation; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author yzh + * @since 2021-12-24 + */ +public interface IEsStandRelationService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/service/impl/EsStandRelationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/service/impl/EsStandRelationServiceImpl.java new file mode 100644 index 00000000..70d05dbe --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/service/impl/EsStandRelationServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.esStandRelation.service.impl; + +import com.adc.da.slrs.esStandRelation.entity.EsStandRelation; +import com.adc.da.slrs.esStandRelation.dao.EsStandRelationDao; +import com.adc.da.slrs.esStandRelation.service.IEsStandRelationService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author yzh + * @since 2021-12-24 + */ +@Service +public class EsStandRelationServiceImpl extends ServiceImpl implements IEsStandRelationService { + +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esMatingRelation/EsMatingRelationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esMatingRelation/EsMatingRelationMapper.xml new file mode 100644 index 00000000..5650c148 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esMatingRelation/EsMatingRelationMapper.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index 0a26ccec..45d42f98 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -18,8 +18,37 @@ draft_time, release_time, unit, + rqb_json as rqbJson, + ts_json as tsJson, + area, + qblb, + (select sar_bussioness_stand.STAND_NAME from sar_bussioness_stand where sar_bussioness_stand.ID = rqb_json )as rqbName, + (select sar_bussioness_stand.STAND_CODE from sar_bussioness_stand where sar_bussioness_stand.ID = rqb_json )as rqbCode, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, + (SELECT GROUP_CONCAT(DICTIONARY_NAME) from ts_dictionary WHERE find_in_set(ts_dictionary.DICTIONARY_CODE,tsJson) ) as tsJsonName, + (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,res_person) ) as res_personName, + (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,wg_leader) ) as wg_leaderName + + + + id, + es_name, + plan_status, + revise_status, + drafter, + res_person, + wg_leader, + draft_time, + release_time, + unit, + rqb_json as rqbJson, + ts_json as tsJson, + area, + qblb, + (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, + (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, + (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,area) ) as areaName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,res_person) ) as res_personName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,wg_leader) ) as wg_leaderName @@ -34,6 +63,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -41,6 +95,12 @@ and es_name like concat('%',#{esName},'%') + + and area = #{area} + + + and qblb = #{qblb} + and plan_status = #{planStatus} @@ -75,14 +135,14 @@ - + select from es_revise_plan - + select from es_revise_plan @@ -127,6 +187,18 @@ unit = #{unit}, + + rqb_json=#{rqbJson} + + + ts_json=#{tsJson} + + + area=#{area} + + + qblb=#{qblb} + where id = #{id} @@ -164,6 +236,18 @@ unit, + + rqb_json, + + + ts_json, + + + area, + + + qblb, + values @@ -197,6 +281,18 @@ #{unit}, + + #{rqbJson}, + + + #{tsJson}, + + + #{area}, + + + #{qblb}, + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml new file mode 100644 index 00000000..870a74ae --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml @@ -0,0 +1,19 @@ + + + + + + From 78bd7e1bde7cf6f7ae5b1cb586f094926b042a72 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 27 Dec 2021 11:01:45 +0800 Subject: [PATCH 03/40] =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E6=95=B0=E6=8D=AE=20=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E5=8F=AA=E5=9C=A8=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=87=BA=E7=8E=B0=EF=BC=81=E5=B7=B2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListController.java | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 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 51315bbb..05aea921 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 @@ -11,6 +11,7 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListS import com.adc.da.sys.service.IDicTypeEOService; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -118,7 +119,7 @@ public class SarLawsAttrDetailedListController extends BaseController lawsIds=new ArrayList<>(); + SarFindDto sarFindDto=new SarFindDto(); + sarFindDto.setId(standExcelVo.getId()); + data.forEach(lawsDto -> {lawsIds.add(lawsDto.getId());}); + List list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto); + for (LawsDto lawsDto:data){ + 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()) && "null" != sarLawsAttrDetailedLists.get(0).getSsrq()) { + lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); + } + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getXcxssrq()) { + lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); + } + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getZccssrq()) { + lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq()); + } + if ("INLAND".equals(lawsDto.getStandType())) lawsDto.setStandType("INLAND_STAND"); + if ("FOREIGN".equals(lawsDto.getStandType())) lawsDto.setStandType("FOREIGN_STAND"); + + } + } //适用车型 Map map= iDicTypeEOService.getDicTypeListCode(); List> typeApplicable = (List>)map.get("ENERGYTYPES"); @@ -227,13 +256,13 @@ 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)); + list1.setSSRQ(list1.getSSRQ()); } if (list1.getZCCSSRQGJ()!=null){ - list1.setZCCSSRQGJ(list1.getZCCSSRQGJ().substring(0,10)); + list1.setZCCSSRQGJ(list1.getZCCSSRQGJ()); } if (list1.getXCXSSRQGJ()!=null){ - list1.setXCXSSRQGJ(list1.getXCXSSRQGJ().substring(0,10)); + list1.setXCXSSRQGJ(list1.getXCXSSRQGJ()); } if (StringUtils.isNotBlank(list1.getSYCPX()) && list1.getSYCPX().contains(",")){ From f2d8482eeb9e56059699bda6e7bcd39acc0ee963 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 27 Dec 2021 15:26:15 +0800 Subject: [PATCH 04/40] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java | 10 +++++----- .../service/impl/EsRevisePlanServiceImpl.java | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 26f8a511..6c95316b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -82,19 +82,19 @@ public class EsRevisePlan extends BasePage { // private String ptJson; @ApiModelProperty(value = "引入企业标准json(标准id)") private String rqbJson; - @ApiModelProperty(value = "引入企业标准json(标准id)") + @ApiModelProperty(value = "引入企业标准json(标准名称)") private String rqbName; - @ApiModelProperty(value = "引入企业标准json(标准id)") + @ApiModelProperty(value = "引入企业标准json(标准编号)") private String rqbCode; - @ApiModelProperty(value = "体系结构树（找到表直接json处理掉，存储方式是逗号拼接）") + @ApiModelProperty(value = "体系结构树（id存储方式是逗号拼接）") private String tsJson; - @ApiModelProperty(value = "体系结构树（找到表直接json处理掉，存储方式是逗号拼接）") + @ApiModelProperty(value = "体系结构树（名称逗号拼接展示）") private String tsJsonName; @ApiModelProperty(value = "标准范围") private String area; @ApiModelProperty(value = "标准范围") private String areaName; - @ApiModelProperty(value = "标准范围") + @ApiModelProperty(value = "企标类别") private String qblb; private List esMatingRelations; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index fe2f8367..68e545c5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -77,6 +77,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl { + esMatingRelation.setEsId(UUIDUtils.randomUUID(32)); + esMatingRelation.setEsId(esRevisePlan.getId()); + }); + esRevisePlan.getEsStandRelations().forEach(esStandRelation -> { + esStandRelation.setEsId(esRevisePlan.getId()); + esStandRelation.setId(UUIDUtils.randomUUID(32)); + }); esMatingRelationService.saveBatch(esRevisePlan.getEsMatingRelations()); esStandRelationService.saveBatch(esRevisePlan.getEsStandRelations()); return "操作成功"; From 840b426adc1b54a3a70530e59be7bb3e547c5404 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 27 Dec 2021 15:38:25 +0800 Subject: [PATCH 05/40] =?UTF-8?q?=E9=87=87=E6=A0=87=E7=A8=8B=E5=BA=A6?= =?UTF-8?q?=E8=BF=9E=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/esStandRelation/entity/EsStandRelation.java | 4 ++++ .../mybatis/mapper/esStandRelation/EsStandRelationMapper.xml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java index e71f029a..01922222 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java @@ -40,6 +40,10 @@ public class EsStandRelation extends BaseEntity { @TableField("use_level") private String useLevel; + @ApiModelProperty(value = "采用程度名称") + @TableField(exist = false) + private String useLevelName; + @ApiModelProperty(value = "简述技术指标依据") @TableField("technologic") private String technologic; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml index 870a74ae..5a2b1c6e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml @@ -5,9 +5,10 @@ From 5e8b70c41e27f5f6922f09897a39edc4b9cd35bc Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 27 Dec 2021 16:51:35 +0800 Subject: [PATCH 07/40] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=85=B3=E8=81=94=E4=B9=8B=E5=90=8E=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=20=E5=87=BA=E7=8E=B0=E5=A4=9A=E6=9D=A1=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=A0=87=E5=87=86=E6=8C=82=E8=BD=BD=20=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 836adab6..8470ad5b 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 @@ -3,7 +3,7 @@ + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml index 5a2b1c6e..d56fdac9 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml @@ -2,7 +2,7 @@ - select es_stand_relation.id , es_stand_relation.stand_id , es_stand_relation.stand_type,sar_standards_info.STAND_NAME as standName, concat(sar_standards_info.STAND_SORT,concat(' ',concat(concat(sar_standards_info.STAND_NUMBER,concat('-',sar_standards_info.STAND_YEAR))))) as standNumber, es_stand_relation.is_relate as isRelate,es_stand_relation.technologic,es_stand_relation.use_level as useLevel,ts_dictype.DIC_TYPE_NAME as useLevelName @@ -17,4 +17,10 @@ left join sar_bussioness_stand on es_stand_relation.stand_id = sar_bussioness_stand.ID where es_stand_relation.es_id=#{id} + From da0eda3020c6985766b99ea9da56cef09f11df8f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 28 Dec 2021 16:38:58 +0800 Subject: [PATCH 10/40] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E5=BA=93=20crud?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esRevisePlan/entity/EsRevisePlan.java | 20 +- .../service/impl/EsRevisePlanServiceImpl.java | 12 - .../esRevisePlan/EsRevisePlanMapper.xml | 277 +++++++++++++----- 3 files changed, 227 insertions(+), 82 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index e0eca02a..1717e0fc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -6,6 +6,7 @@ import java.util.List; import com.adc.da.base.page.BasePage; import com.adc.da.slrs.esMatingRelation.entity.EsMatingRelation; import com.adc.da.slrs.esStandRelation.entity.EsStandRelation; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -90,12 +91,25 @@ public class EsRevisePlan extends BasePage { private String area; @ApiModelProperty(value = "标准范围") private String areaName; + //企标类别 + private String standType; + @ApiModelProperty(value = "企标类别") - private String qblb; + private String esMatingRelations; + private String esStandRelations; + @ApiModelProperty(value = "是否引用标准") + @TableField("is_relate") + private String isRelate; - private List esMatingRelations; + @ApiModelProperty(value = "采用程度") + @TableField("use_level") + private String useLevel; - private List esStandRelations; + private String useLevelName; + + @ApiModelProperty(value = "简述技术指标依据") + @TableField("technologic") + private String technologic; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 68e545c5..2ed4273a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -63,8 +63,6 @@ public class EsRevisePlanServiceImpl extends ServiceImpl { - esMatingRelation.setEsId(UUIDUtils.randomUUID(32)); - esMatingRelation.setEsId(esRevisePlan.getId()); - }); - esRevisePlan.getEsStandRelations().forEach(esStandRelation -> { - esStandRelation.setEsId(esRevisePlan.getId()); - esStandRelation.setId(UUIDUtils.randomUUID(32)); - }); - esMatingRelationService.saveBatch(esRevisePlan.getEsMatingRelations()); - esStandRelationService.saveBatch(esRevisePlan.getEsStandRelations()); return "操作成功"; } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index 03bb4422..3758f7f8 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -26,32 +26,11 @@ (select sar_bussioness_stand.STAND_CODE from sar_bussioness_stand where sar_bussioness_stand.ID = rqb_json )as rqbCode, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, - (SELECT GROUP_CONCAT(DICTIONARY_NAME) from ts_dictionary WHERE find_in_set(ts_dictionary.DICTIONARY_CODE,tsJson) ) as tsJsonName, + (SELECT GROUP_CONCAT(sar_menu_standard.MENU_NAME) from sar_menu_standard WHERE find_in_set(sar_menu_standard.ID,es_revise_plan.ts_json) ) as tsJsonName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,res_person) ) as res_personName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,wg_leader) ) as wg_leaderName - - id, - es_name, - plan_status, - revise_status, - drafter, - res_person, - wg_leader, - draft_time, - release_time, - unit, - rqb_json as rqbJson, - ts_json as tsJson, - area, - qblb, - (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, - (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, - (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,area) ) as areaName, - (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,res_person) ) as res_personName, - (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,wg_leader) ) as wg_leaderName - @@ -66,9 +45,12 @@ - - - + + + + + + @@ -85,10 +67,13 @@ - - - - + + + + + + + @@ -98,9 +83,6 @@ and area = #{area} - - and qblb = #{qblb} - and plan_status = #{planStatus} @@ -136,33 +118,36 @@ - - + + @@ -241,16 +319,28 @@ unit = #{unit}, - rqb_json=#{rqbJson} + rqb_json=#{rqbJson}, - ts_json=#{tsJson} + ts_json=#{tsJson}, - area=#{area} + area=#{area}, - - qblb=#{qblb} + + es_mating_relations=#{esMatingRelations}, + + + es_stand_relations=#{esStandRelations}, + + + is_relate=#{isRelate}, + + + use_level=#{useLevel}, + + + technologic=#{technologic}, where id = #{id} @@ -298,8 +388,20 @@ area, - - qblb, + + es_mating_relations, + + + es_stand_relations, + + + is_relate, + + + use_level, + + + technologic, values @@ -343,8 +445,20 @@ #{area}, - - #{qblb}, + + #{esMatingRelations}, + + + #{esStandRelations}, + + + #{isRelate}, + + + #{useLevel}, + + + #{technologic}, @@ -361,10 +475,39 @@ From b63d82a43e2b8e94a5c18570279ef3c5071136de Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 29 Dec 2021 10:30:45 +0800 Subject: [PATCH 11/40] feat: There is no way the, buss plan add bussSort --- .../slrs/esRevisePlan/entity/EsRevisePlan.java | 4 ++++ .../mapper/esRevisePlan/EsRevisePlanMapper.xml | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 1717e0fc..743fe88f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -111,5 +111,9 @@ public class EsRevisePlan extends BasePage { @TableField("technologic") private String technologic; + @ApiModelProperty(value = "企标类别") + @TableField("buss_sort") + private String bussSort; + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index 3758f7f8..ac1f59f7 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -73,7 +73,8 @@ - + + @@ -137,6 +138,7 @@ es_revise_plan.is_relate, es_revise_plan.use_level, es_revise_plan.technologic, + es_revise_plan.buss_sort, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, @@ -204,6 +206,7 @@ es_revise_plan.is_relate, es_revise_plan.use_level, es_revise_plan.technologic, + es_revise_plan.buss_sort, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, @@ -271,6 +274,7 @@ es_revise_plan.is_relate, es_revise_plan.use_level, es_revise_plan.technologic, + es_revise_plan.buss_sort, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, @@ -342,6 +346,9 @@ technologic=#{technologic}, + + buss_sort=#{bussSort}, + where id = #{id} @@ -403,6 +410,9 @@ technologic, + + buss_sort, + values @@ -460,6 +470,9 @@ #{technologic}, + + #{bussSort}, + @@ -494,6 +507,7 @@ es_revise_plan.is_relate, es_revise_plan.use_level, es_revise_plan.technologic, + es_revise_plan.buss_sort, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, From 9ed5f88d1c2e763e31dde4e772bd6628f7cb2fde Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 29 Dec 2021 10:44:16 +0800 Subject: [PATCH 12/40] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=95=B0=E6=8D=AE=E6=B6=88=E5=A4=B1=20bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarStandItems/dao/SarStandItemsDao.java | 2 ++ .../service/impl/SarStandItemsServiceImpl.java | 6 +++++- .../mapper/SarStandItems/SarStandItemsMapper.xml | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 155b7cc1..1e19f4bf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -49,6 +49,8 @@ public interface SarStandItemsDao extends BaseMapper { int deleteByStandIdAndFileType(@Param("standId") String standId, @Param("fileType") String fileType); + int deleteByStandIdAndFileTypes(@Param("standId") String standId, @Param("fileType") String fileType,@Param("items")List strings); + Set selectClaimTypesByStandId(@Param("standId") String standId, @Param("fileType") String fileType, @Param("idList") String[] idList); Set selectSvppsByStandId(@Param("standId") String standId, @Param("fileType") String fileType, @Param("idList") String[] idList); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 5f0fadbb..c3672b64 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -169,7 +169,11 @@ public class SarStandItemsServiceImpl extends ServiceImpl sarStandItems) { if (null!=sarStandItems && sarStandItems.size()>0) { - sarStandItemsDao.deleteByStandIdAndFileType(sarStandItems.get(0).getStandId(), sarStandItems.get(0).getFileType()); + List strings=new ArrayList<>(); + sarStandItems.forEach(sarStandItems1 -> { + strings.add(sarStandItems1.getItemsNum()); + }); + sarStandItemsDao.deleteByStandIdAndFileTypes(sarStandItems.get(0).getStandId(), sarStandItems.get(0).getFileType(),strings); } boolean flag=this.saveBatch(sarStandItems); if (flag){ 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 e5dd9af8..34d1a0e1 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 @@ -655,6 +655,20 @@ + + delete from SAR_STAND_ITEMS + where stand_id = #{standId} + + and file_type = #{fileType} + + + and items_num in + + #{itemNum} + + + + delete from SAR_STAND_ITEMS where id in From 36ff1dd51034e2714f52b5ad9a68573fb8964480 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 29 Dec 2021 10:46:58 +0800 Subject: [PATCH 13/40] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=BA=93=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index ac1f59f7..74725ac4 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -51,6 +51,7 @@ + From f068dacc7f49e60f16df5d26874bb0cc86d096d4 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Wed, 29 Dec 2021 17:36:07 +0800 Subject: [PATCH 14/40] =?UTF-8?q?update:pcms=E8=BD=A6=E5=9E=8B=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=8E=A5=E6=94=B6=E5=88=B0=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E3=E4=B8=AA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandProjectLibrary.java | 9 +++++++++ .../service/impl/SarStandProjectLibraryServiceImpl.java | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java index e48e20e0..80663883 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java @@ -80,6 +80,15 @@ public class SarStandProjectLibrary extends BaseEntity { @TableField("detailed_list_version") private String detailedListVersion; + @ApiModelProperty(value = "管理主体名称") + private String managementHostName; + + @ApiModelProperty(value = "开发主体名称") + private String developmentHostName; + + @ApiModelProperty(value = "项目细分类名称") + private String categoryName; + //标准编号 @TableField(exist = false) 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 bed9d1ee..535219fa 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 @@ -86,7 +86,10 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl Date: Wed, 29 Dec 2021 17:54:07 +0800 Subject: [PATCH 15/40] feat: There is no way the, buss plan planStatusList --- .../com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java | 3 +++ .../service/impl/EsRevisePlanServiceImpl.java | 8 ++++++++ .../mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml | 7 +++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 743fe88f..9fb2b8e5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -115,5 +115,8 @@ public class EsRevisePlan extends BasePage { @TableField("buss_sort") private String bussSort; + @TableField(exist = false) + private List planStatusList; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 2ed4273a..20c70db4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -10,10 +10,14 @@ import com.adc.da.slrs.esStandRelation.service.IEsStandRelationService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; +import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -47,6 +51,10 @@ public class EsRevisePlanServiceImpl extends ServiceImpl queryAllPlans(EsRevisePlan esRevisePlan) { Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan); esRevisePlan.getPager().setRowCount(count); + if(StringUtils.isNotBlank(esRevisePlan.getPlanStatus())){ + List list= Arrays.stream(esRevisePlan.getPlanStatus().split(",")).map(String::trim).collect(Collectors.toList()); + esRevisePlan.setPlanStatusList(list); + } List esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan); return esRevisePlans; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index ac1f59f7..49d60d62 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -225,8 +225,11 @@ and area = #{area} - - and plan_status = #{planStatus} + + and plan_status in + + #{item} + and revise_status = #{reviseStatus} From d7cd2d9fae130e6dedbe0bcee12954eed43aa6be Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Wed, 29 Dec 2021 21:39:07 +0800 Subject: [PATCH 16/40] =?UTF-8?q?update:pcms=E8=BD=A6=E5=9E=8B=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=8E=A5=E6=94=B6=E5=88=B0=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E3=E4=B8=AA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 38 +++++++++++++++++++ .../entity/QuerySelectRspDTO.java | 17 +++++++++ .../SarStandProjectLibraryServiceImpl.java | 2 +- 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java 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 387b07a1..02888d99 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 @@ -6,6 +6,7 @@ import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto; import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibraryServiceImpl; +import com.adc.da.util.utils.StringUtils; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -305,4 +306,41 @@ public class SarStandProjectLibraryController extends BaseController list = sarStandProjectLibraryService.list(qw); + List managementHostList = new ArrayList<>(); + List developmentHostList = new ArrayList<>(); + List categoryList = new ArrayList<>(); + for(SarStandProjectLibrary sarStandProjectLibrary1 : list){ + if(!managementHostList.contains(sarStandProjectLibrary1.getManagementHostName())){ + managementHostList.add(sarStandProjectLibrary1.getManagementHostName()); + } + if(!developmentHostList.contains(sarStandProjectLibrary1.getDevelopmentHostName())){ + developmentHostList.add(sarStandProjectLibrary1.getDevelopmentHostName()); + } + if(!categoryList.contains(sarStandProjectLibrary1.getCategoryName())){ + categoryList.add(sarStandProjectLibrary1.getCategoryName()); + } + } + QuerySelectRspDTO querySelectRspDTO = QuerySelectRspDTO.builder() + .managementHostList(managementHostList) + .developmentHostList(developmentHostList) + .categoryList(categoryList) + .build(); + return Result.success(querySelectRspDTO); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java new file mode 100644 index 00000000..4c9a1e1d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java @@ -0,0 +1,17 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + +import lombok.Builder; +import lombok.Data; + +import java.util.List; + +@Data +@Builder +public class QuerySelectRspDTO { + + private List managementHostList; + + private List developmentHostList; + + private List categoryList; +} 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 535219fa..293ed9fd 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 @@ -82,7 +82,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl Date: Thu, 30 Dec 2021 14:27:25 +0800 Subject: [PATCH 17/40] feat: There is no way the, --- adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java | 2 +- adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index bca2139e..3ea60c6e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -133,7 +133,7 @@ public class SendBussMQService { saveMap.put("stand_year",infoEO.getStandYear()); saveMap.put("standNumber",infoEO.getStandCode()); saveMap.put("stand_code",infoEO.getStandCode()); - saveMap = dealNumberMsg(saveMap,infoEO,getCodeName); + saveMap = dealNumberMsg(saveMap,infoEO,infoEO.getStandSort()); saveMap.put("nameshow",infoEO.getStandName()); saveMap.put("stand_name",infoEO.getStandName()); saveMap.put("standEnName",infoEO.getStandEnName()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index 4cf2e4e8..e439dc21 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -107,7 +107,7 @@ public class SendStandMQService { } saveMap.put("standNumber",infoEO.getStandNumber()); saveMap.put("stand_number",infoEO.getStandNumber()); - saveMap = dealNumberMsg(saveMap,infoEO,getCodeName); + saveMap = dealNumberMsg(saveMap,infoEO,infoEO.getStandSort()); saveMap.put("standYear",infoEO.getStandYear()); saveMap.put("stand_year",infoEO.getStandYear()); saveMap.put("nameshow",infoEO.getStandName()); From 1a3d317c056d305c9e84537de089bb4fed4c9ba4 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 31 Dec 2021 03:49:23 +0800 Subject: [PATCH 18/40] feat: There is no way the, xxx --- .../service/ActSarItemsBussEOService.java | 2 ++ .../SarBussionessStandController.java | 14 ++++++++++++++ .../dao/SarBussionessStandDao.java | 2 ++ .../entity/SarBussionessStand.java | 12 ++++++++++++ .../service/ISarBussionessStandService.java | 2 ++ .../impl/SarBussionessStandServiceImpl.java | 5 +++++ .../mapper/esRevisePlan/EsRevisePlanMapper.xml | 18 +++++++++--------- .../SarBussionessStandMapper.xml | 10 ++++++++++ 8 files changed, 56 insertions(+), 9 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 047bfa43..b12e5a5c 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -408,6 +408,8 @@ public class ActSarItemsBussEOService { case "standName": sarBussionessStand.setStandName(valueStr); break; case "standEnName": sarBussionessStand.setStandEnName(valueStr); break; case "textStatusBuss": sarBussionessStand.setTextStatusBuss(valueStr); break; + case "reviseStatus": sarBussionessStand.setReviseStatus(valueStr); break; + case "standSn": sarBussionessStand.setStandSn(valueStr); break; case "issueTime": if (StringUtils.isNotBlank(valueStr)) { sarBussionessStand.setIssueTime(tTo(valueStr)); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 3270c493..2b43e214 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -70,6 +70,20 @@ public class SarBussionessStandController extends BaseController getStandInfoByReviseStatus(String reviseStatus) { + SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus); + return Result.success(result); + } + @ApiOperation(value = "|SarBussionessStandEO|删除") @PostMapping("deleteSarBussionessStand") //401问题2021-03-31暂时注释掉 liuhuiwen diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 0b7d0854..6129a753 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -22,6 +22,8 @@ import java.util.List; @Repository public interface SarBussionessStandDao extends BaseMapper { + SarBussionessStand getStandInfoByReviseStatus(String reviseStatus); + SarBussionessStand selectByPrimaryKey(String standId); List selectStandardsByStandNumber(SarBussionessStand sarBussionessStand); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java index 3f411919..7b663965 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java @@ -111,8 +111,20 @@ public class SarBussionessStand extends BaseEntity { @TableField("TEXT_STATUS_BUSS") private String textStatusBuss; + @ApiModelProperty(value = "计划库制定状态 0 默认 1 制定 2修订") + @TableField("REVISE_STATUS") + private String reviseStatus; + + @ApiModelProperty(value = "标准顺序号") + @TableField("STAND_SN") + private String standSn; + // 非表字段 + @TableField(exist = false) + private String newStandSn; + + @TableField(exist = false) @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private String firstPutTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 39fa8d65..efd61892 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -18,6 +18,8 @@ import java.util.List; */ public interface ISarBussionessStandService extends IService { + SarBussionessStand getStandInfoByReviseStatus(String reviseStatus); + void attrInfoDetails (SarBussionessStand row) throws Exception; ResponseMessage deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index c68dc1d7..9c2998f9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -145,6 +145,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception { SarBussionessStand sarStandardsInfoEO = new SarBussionessStand(); sarStandardsInfoEO.setValidFlag(1); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index 49d60d62..a6f35511 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -220,34 +220,34 @@ left join sar_bussioness_stand on sar_bussioness_stand.ID = es_revise_plan.rqb_json - and es_name like concat('%',#{esName},'%') + and es_revise_plan.es_name like concat('%',#{esName},'%') - and area = #{area} + and es_revise_plan.area = #{area} - and plan_status in + and es_revise_plan.plan_status in #{item} - and revise_status = #{reviseStatus} + and es_revise_plan.revise_status = #{reviseStatus} - and drafter = #{drafter} + and es_revise_plan.drafter = #{drafter} - and res_person = #{resPerson} + and es_revise_plan.res_person = #{resPerson} - and wg_leader = #{wgLeader} + and es_revise_plan.wg_leader = #{wgLeader} - and DATE_FORMAT(draft_time,'%Y-%m-%d')=DATE_FORMAT(#{draftTime},'%Y-%m-%d') + and DATE_FORMAT(es_revise_plan.draft_time,'%Y-%m-%d')=DATE_FORMAT(#{draftTime},'%Y-%m-%d') - and DATE_FORMAT(release_time,'%Y-%m-%d')=DATE_FORMAT(#{releaseTime},'%Y-%m-%d') + and DATE_FORMAT(es_revise_plan.release_time,'%Y-%m-%d')=DATE_FORMAT(#{releaseTime},'%Y-%m-%d') and (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) like concat('%',#{unit},'%') diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 982af830..bc5ebed9 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -170,6 +170,8 @@ stand_sort, stand_year, stand_number, + REVISE_STATUS, + STAND_SN, #{modifyTime, jdbcType=TIMESTAMP}, @@ -190,6 +192,8 @@ #{standSort, jdbcType=VARCHAR}, #{standYear, jdbcType=VARCHAR}, #{standNumber, jdbcType=VARCHAR}, + #{reviseStatus, jdbcType=VARCHAR}, + #{standSn, jdbcType=VARCHAR}, @@ -322,6 +326,12 @@ + + delete from SAR_BUSSIONESS_STAND From e17f8710b1716f0c111096d2de2e04faf1ef10fd Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 4 Jan 2022 14:14:08 +0800 Subject: [PATCH 19/40] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=A2=9C?= =?UTF-8?q?=E8=89=B2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WgWorkGroupController.java | 6 + .../slrs/wgWorkGroup/dao/WgWorkGroupDao.java | 2 + .../service/IWgWorkGroupService.java | 2 + .../service/impl/WgWorkGroupServiceImpl.java | 317 ++++++++++-------- .../wg_work_group/WgWorkGroupMapper.xml | 4 + 5 files changed, 190 insertions(+), 141 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java index e838fcd2..05bee0a3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java @@ -63,6 +63,12 @@ public class WgWorkGroupController extends BaseController { return wgWorkGroupService.updateData(wgWorkGroupShowDTO); } + @ApiOperation("修改工作组节点数据") + @PostMapping("/updateDataByWk") + public ResponseMessage updateDataByWk(@RequestBody WgWorkGroupShowDTO wgWorkGroupShowDTO){ + return wgWorkGroupService.updateDataByWk(wgWorkGroupShowDTO); + } + diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java index 12341a91..f15f4d5a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java @@ -26,4 +26,6 @@ public interface WgWorkGroupDao extends BaseMapper { List researchDownCheck(@Param(value = "data") String data,@Param(value = "status")String status); + List researchDatasCheck(@Param(value = "data") String data,@Param(value = "status")String status); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java index 29b3096b..e6f56e74 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java @@ -31,6 +31,8 @@ public interface IWgWorkGroupService extends IService { ResponseMessage updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO); + ResponseMessage updateDataByWk(WgWorkGroupShowDTO wgWorkGroupShowDTO); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java index 2525d233..e30304b5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java @@ -126,33 +126,33 @@ public class WgWorkGroupServiceImpl extends ServiceImpl wgStandorpolicyInfos= wgStandorpolicyInfoDao.researchDatas(); - Map map=new HashMap<>(); + List wgStandorpolicyInfos = wgStandorpolicyInfoDao.researchDatas(); + Map map = new HashMap<>(); wgStandorpolicyInfos.forEach(wgStandorpolicyInfo -> { - map.put(wgStandorpolicyInfo.getStandId()+"-"+wgStandorpolicyInfo.getWgId(),wgStandorpolicyInfo); + map.put(wgStandorpolicyInfo.getStandId() + "-" + wgStandorpolicyInfo.getWgId(), wgStandorpolicyInfo); }); - if (null!=wgWorkGroupDTO.getWgStandorpolicyInfos() && wgWorkGroupDTO.getWgStandorpolicyInfos().size()>0){ - List wgWorkGroups=new ArrayList<>(); + if (null != wgWorkGroupDTO.getWgStandorpolicyInfos() && wgWorkGroupDTO.getWgStandorpolicyInfos().size() > 0) { + List wgWorkGroups = new ArrayList<>(); wgWorkGroupDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { - WgWorkGroup wgWorkGroup=new WgWorkGroup(); - BeanUtils.copyProperties(wgWorkGroupDTO,wgWorkGroup); + WgWorkGroup wgWorkGroup = new WgWorkGroup(); + BeanUtils.copyProperties(wgWorkGroupDTO, wgWorkGroup); wgWorkGroup.setId(String.valueOf(UUID.randomUUID())); wgStandorpolicyInfo.setWgId(wgWorkGroup.getId()); - if (null==map.get(wgStandorpolicyInfo.getStandId()+"-"+wgWorkGroup.getPid())) { + if (null == map.get(wgStandorpolicyInfo.getStandId() + "-" + wgWorkGroup.getPid())) { wgWorkGroups.add(wgWorkGroup); } }); - if (wgWorkGroups.size()==0){ + if (wgWorkGroups.size() == 0) { return "政策已存在，请勿重复添加"; } - boolean flag=wgWorkGroupService.saveOrUpdateBatch(wgWorkGroups); - boolean flag1=wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupDTO.getWgStandorpolicyInfos()); - if (flag && flag1){ + boolean flag = wgWorkGroupService.saveOrUpdateBatch(wgWorkGroups); + boolean flag1 = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupDTO.getWgStandorpolicyInfos()); + if (flag && flag1) { return "添加成功"; - }else { + } else { return "添加失败"; } - }else { + } else { return "数据有误，请检查数据"; } } @@ -179,82 +179,82 @@ public class WgWorkGroupServiceImpl extends ServiceImpl wgMeetingUserRelations = wgMeetingUserRelationService.getMeetingAllPeoples(type); //处理数据 //part1 会议数据组装 提速第一步建造数据的map集合 - Map wgWorkGroupMap=new HashMap<>(); + Map wgWorkGroupMap = new HashMap<>(); wgWorkGroupShowDTOS.forEach(wgWorkGroupShowDTO -> { - wgWorkGroupMap.put(wgWorkGroupShowDTO.getId(),wgWorkGroupShowDTO); + wgWorkGroupMap.put(wgWorkGroupShowDTO.getId(), wgWorkGroupShowDTO); }); Map meetMap = new HashMap<>(); - if (null!=wgMeetingInfos && wgMeetingInfos.size()>0) { + if (null != wgMeetingInfos && wgMeetingInfos.size() > 0) { wgMeetingInfos.forEach(wgMeetingInfo -> { meetMap.put(wgMeetingInfo.getId(), wgMeetingInfo); }); } //组装会议数据 - if (null!=wgMeetingUserRelations && wgMeetingUserRelations.size()>0) { + if (null != wgMeetingUserRelations && wgMeetingUserRelations.size() > 0) { wgMeetingUserRelations.forEach(wgMeetingUserRelationShow -> { - if (null!=meetMap.get(wgMeetingUserRelationShow.getMeetingId()).getJoinMeetingPeopleInfo()) { + if (null != meetMap.get(wgMeetingUserRelationShow.getMeetingId()).getJoinMeetingPeopleInfo()) { meetMap.get(wgMeetingUserRelationShow.getMeetingId()).getJoinMeetingPeopleInfo().add(wgMeetingUserRelationShow); - }else { - List wgMeetingUserRelationShows=new ArrayList<>(); + } else { + List wgMeetingUserRelationShows = new ArrayList<>(); wgMeetingUserRelationShows.add(wgMeetingUserRelationShow); meetMap.get(wgMeetingUserRelationShow.getMeetingId()).setJoinMeetingPeopleInfo(wgMeetingUserRelationShows); } }); } //组装总数据 - if (null!=wgDeptShows && wgDeptShows.size()>0) { + if (null != wgDeptShows && wgDeptShows.size() > 0) { wgDeptShows.forEach(wgDeptShow -> { - if (null!=wgWorkGroupMap.get(wgDeptShow.getWgId()).getWgDepts()) { + if (null != wgWorkGroupMap.get(wgDeptShow.getWgId()).getWgDepts()) { wgWorkGroupMap.get(wgDeptShow.getWgId()).getWgDepts().add(wgDeptShow); - }else { + } else { List wgDepts = new ArrayList<>(); wgDepts.add(wgDeptShow); wgWorkGroupMap.get(wgDeptShow.getWgId()).setWgDepts(wgDepts); } }); } - if (null!=wgMeetingInfos && wgMeetingInfos.size()>0) { + if (null != wgMeetingInfos && wgMeetingInfos.size() > 0) { wgMeetingInfos.forEach(wgMeetingInfo -> { - if (null!=wgWorkGroupMap.get(wgMeetingInfo.getWgId()).getWgMeetingInfos()) { + if (null != wgWorkGroupMap.get(wgMeetingInfo.getWgId()).getWgMeetingInfos()) { wgWorkGroupMap.get(wgMeetingInfo.getWgId()).getWgMeetingInfos().add(meetMap.get(wgMeetingInfo.getId())); - }else { + } else { List wgMeetingInfos1 = new ArrayList<>(); wgMeetingInfos1.add(wgMeetingInfo); wgWorkGroupMap.get(wgMeetingInfo.getWgId()).setWgMeetingInfos(wgMeetingInfos1); } }); } - if (null!=wgNetInfoDTOS && wgNetInfoDTOS.size()>0) { + if (null != wgNetInfoDTOS && wgNetInfoDTOS.size() > 0) { wgNetInfoDTOS.forEach(wgNetInfoDTO -> { - if (null!=wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).getWgNetInfos()) { + if (null != wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).getWgNetInfos()) { wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).getWgNetInfos().add(wgNetInfoDTO); - }else { - List wgNetInfos=new ArrayList<>(); + } else { + List wgNetInfos = new ArrayList<>(); wgNetInfos.add(wgNetInfoDTO); wgWorkGroupMap.get(wgNetInfoDTO.getWgId()).setWgNetInfos(wgNetInfos); } }); } - if (null!=wgPayInfos && wgPayInfos.size()>0) { + if (null != wgPayInfos && wgPayInfos.size() > 0) { wgPayInfos.forEach(wgPayInfo -> { - if (null!=wgWorkGroupMap.get(wgPayInfo.getWgId()).getWgPayInfos()) { + if (null != wgWorkGroupMap.get(wgPayInfo.getWgId()).getWgPayInfos()) { wgWorkGroupMap.get(wgPayInfo.getWgId()).getWgPayInfos().add(wgPayInfo); - }else { - List wgPayInfos1=new ArrayList<>(); + } else { + List wgPayInfos1 = new ArrayList<>(); wgPayInfos1.add(wgPayInfo); wgWorkGroupMap.get(wgPayInfo.getWgId()).setWgPayInfos(wgPayInfos1); } }); } //处理标准政策数据 - if (null!=wgStandorpolicyInfos && wgStandorpolicyInfos.size()>0) { + if (null != wgStandorpolicyInfos && wgStandorpolicyInfos.size() > 0) { wgStandorpolicyInfos.forEach(wgStandorpolicyInfo -> { - if (null!=wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).getWgStandorpolicyInfos()) { + if (null != wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).getWgStandorpolicyInfos()) { wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).setName(wgStandorpolicyInfo.getName()); wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).getWgStandorpolicyInfos().add(wgStandorpolicyInfo); - }else { - List wgStandorpolicyInfos1=new ArrayList<>(); + } else { + List wgStandorpolicyInfos1 = new ArrayList<>(); wgStandorpolicyInfos1.add(wgStandorpolicyInfo); wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).setName(wgStandorpolicyInfo.getName()); wgWorkGroupMap.get(wgStandorpolicyInfo.getWgId()).setWgStandorpolicyInfos(wgStandorpolicyInfos1); @@ -262,27 +262,27 @@ public class WgWorkGroupServiceImpl extends ServiceImpl nums=new ArrayList<>(); - Map> map=new HashMap<>(); + List nums = new ArrayList<>(); + Map> map = new HashMap<>(); wgWorkGroupShowDTOS.forEach(wgWorkGroupShowDTO -> { - if (null!=map.get(Integer.valueOf(wgWorkGroupShowDTO.getLevel()))){ + if (null != map.get(Integer.valueOf(wgWorkGroupShowDTO.getLevel()))) { map.get(Integer.valueOf(wgWorkGroupShowDTO.getLevel())).add(wgWorkGroupShowDTO); - }else { + } else { List middle = new ArrayList<>(); middle.add(wgWorkGroupShowDTO); nums.add(Integer.valueOf(wgWorkGroupShowDTO.getLevel())); - map.put(Integer.valueOf(wgWorkGroupShowDTO.getLevel()),middle); + map.put(Integer.valueOf(wgWorkGroupShowDTO.getLevel()), middle); } }); //组装数据 - for (int i=nums.size()-1;i>0;i--){ + for (int i = nums.size() - 1; i > 0; i--) { int finalI = i; - map.get(i-1).forEach(wgWorkGroupShowDTO -> { + map.get(i - 1).forEach(wgWorkGroupShowDTO -> { map.get(finalI).forEach(wgWorkGroupShowDTO1 -> { - if (wgWorkGroupShowDTO.getId().equals(wgWorkGroupShowDTO1.getPid())){ - if (null!=wgWorkGroupShowDTO.getChildren()) { + if (wgWorkGroupShowDTO.getId().equals(wgWorkGroupShowDTO1.getPid())) { + if (null != wgWorkGroupShowDTO.getChildren()) { wgWorkGroupShowDTO.getChildren().add(wgWorkGroupShowDTO1); - }else { + } else { List children = new ArrayList<>(); children.add(wgWorkGroupShowDTO1); wgWorkGroupShowDTO.setChildren(children); @@ -322,104 +322,139 @@ public class WgWorkGroupServiceImpl extends ServiceImpl updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO) { - List wgWorkGroupShowDTOS = wgWorkGroupDao.researchDownCheck(wgWorkGroupShowDTO.getId(), "1"); + List wgWorkGroupShowDTOS = wgWorkGroupDao.researchDatasCheck(wgWorkGroupShowDTO.getId(), "0"); if (null != wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size() > 0) { return Result.error("工作组处在流程中，无法修改"); } else { - WgWorkGroup wgWorkGroup = new WgWorkGroup(); - BeanUtils.copyProperties(wgWorkGroupShowDTO, wgWorkGroup); - boolean flag = false; - flag = wgWorkGroupService.saveOrUpdate(wgWorkGroup); - if (null != wgWorkGroupShowDTO.getWgDepts() && wgWorkGroupShowDTO.getWgDepts().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(","))); - wgDeptService.removeByIds(strings); - } - List wgDepts=new ArrayList<>(); - wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> { - WgDept wgDept=new WgDept(); - BeanUtils.copyProperties(wgDeptShow,wgDept); - if (null==wgDept.getWgId()){ - wgDept.setWgId(wgWorkGroupShowDTO.getId()); - } - wgDepts.add(wgDept); - }); - flag = wgDeptService.saveOrUpdateBatch(wgDepts); - } - if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(","))); - wgDeptService.removeByIds(strings); - wgMeetingUserRelationService.removeByIds(strings); - } - List removeMeet = new ArrayList<>(); - List wgMeetingUserRelations = new ArrayList<>(); - wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> { - if (null==wgMeetingInfo.getId()){ - wgMeetingInfo.setId(String.valueOf(UUID.randomUUID())); - wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - wgMeetingInfo.getMeetingPeople().forEach(s -> { - WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation(); - wgMeetingUserRelation.setUserId(s); - wgMeetingUserRelation.setMeetingId(wgMeetingInfo.getId()); - wgMeetingUserRelations.add(wgMeetingUserRelation); - }); - removeMeet.add(wgMeetingInfo.getId()); - }); - flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos()); - if (!removeMeet.isEmpty()) { - wgMeetingUserRelationService.removeByIds(removeMeet); - wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations); - } - } - if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(","))); - wgNetInfoService.removeByIds(strings); - } - List wgNetInfos = new ArrayList<>(); - wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { - WgNetInfo wgNetInfo = new WgNetInfo(); - BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo); - if (null==wgNetInfo.getWgId()){ - wgNetInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - wgNetInfos.add(wgNetInfo); - }); - flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos); - } - if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) { - if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())){ - List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(","))); - wgPayInfoService.removeByIds(strings); - } - if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()){ - wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> { - if (null==wgPayInfo.getWgId()){ - wgPayInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - }); - } - flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos()); - } - if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { - if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()){ - wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { - if (null==wgStandorpolicyInfo.getWgId()){ - wgStandorpolicyInfo.setWgId(wgWorkGroupShowDTO.getId()); - } - }); - } - flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); - } + return dealAllDatas(wgWorkGroupShowDTO); + } + } - if (flag) { - return Result.success("更新成功"); - } else { - return Result.error("无法更新"); + @Override + public ResponseMessage updateDataByWk(WgWorkGroupShowDTO wgWorkGroupShowDTO) { + return dealAllDatas(wgWorkGroupShowDTO); + } + + private ResponseMessage dealAllDatas(WgWorkGroupShowDTO wgWorkGroupShowDTO) { + WgWorkGroup wgWorkGroup = new WgWorkGroup(); + BeanUtils.copyProperties(wgWorkGroupShowDTO, wgWorkGroup); + boolean flag = false; + flag = wgWorkGroupService.saveOrUpdate(wgWorkGroup); + saveBathDept(wgWorkGroupShowDTO, flag); + saveBathMeetingUserRelations(wgWorkGroupShowDTO, flag); + saveBathNetInfo(wgWorkGroupShowDTO, flag); + saveBathPayInfo(wgWorkGroupShowDTO, flag); + saveBathStandardPolicyInfo(wgWorkGroupShowDTO, flag); + + if (flag) { + return Result.success("更新成功"); + } else { + return Result.error("无法更新"); + } + } + + private boolean saveBathPayInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(","))); + wgPayInfoService.removeByIds(strings); + } + if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()) { + wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> { + if (null == wgPayInfo.getWgId()) { + wgPayInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } + flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos()); + } + return flag; + } + + private boolean saveBathNetInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(","))); + wgNetInfoService.removeByIds(strings); + } + List wgNetInfos = new ArrayList<>(); + wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { + WgNetInfo wgNetInfo = new WgNetInfo(); + BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo); + if (null == wgNetInfo.getWgId()) { + wgNetInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + wgNetInfos.add(wgNetInfo); + }); + flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos); + } + return flag; + } + + private boolean saveBathMeetingUserRelations(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(","))); + wgDeptService.removeByIds(strings); + wgMeetingUserRelationService.removeByIds(strings); + } + List removeMeet = new ArrayList<>(); + List wgMeetingUserRelations = new ArrayList<>(); + wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> { + if (null == wgMeetingInfo.getId()) { + wgMeetingInfo.setId(String.valueOf(UUID.randomUUID())); + wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + wgMeetingInfo.getMeetingPeople().forEach(s -> { + WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation(); + wgMeetingUserRelation.setUserId(s); + wgMeetingUserRelation.setMeetingId(wgMeetingInfo.getId()); + wgMeetingUserRelations.add(wgMeetingUserRelation); + }); + removeMeet.add(wgMeetingInfo.getId()); + }); + flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos()); + if (!removeMeet.isEmpty()) { + wgMeetingUserRelationService.removeByIds(removeMeet); + wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations); } } + return flag; + } + + private boolean saveBathDept(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + if (null != wgWorkGroupShowDTO.getWgDepts() && wgWorkGroupShowDTO.getWgDepts().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())) { + List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(","))); + wgDeptService.removeByIds(strings); + } + List wgDepts = new ArrayList<>(); + wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> { + WgDept wgDept = new WgDept(); + BeanUtils.copyProperties(wgDeptShow, wgDept); + if (null == wgDept.getWgId()) { + wgDept.setWgId(wgWorkGroupShowDTO.getId()); + } + wgDepts.add(wgDept); + }); + flag = wgDeptService.saveOrUpdateBatch(wgDepts); + } + return flag; + } + + + private boolean saveBathStandardPolicyInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { + if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()) { + wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { + if (null == wgStandorpolicyInfo.getWgId()) { + wgStandorpolicyInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } + flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); + } + return flag; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml index fde7c4e7..5c94098d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml @@ -45,6 +45,10 @@ select * from wg_work_group where wg_work_group.pid = #{data} and wg_work_group.status = #{status} + + From 0a287e59c7a3be305fec70d3f8fbd5fd711fc120 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 4 Jan 2022 15:44:18 +0800 Subject: [PATCH 20/40] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/wgNetInfo/entity/WgNetInfo.java | 8 +++ .../service/impl/WgWorkGroupServiceImpl.java | 54 ++++++++++++++----- .../mapper/wgNetInfo/WgNetInfoMapper.xml | 8 ++- 3 files changed, 52 insertions(+), 18 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java index 6ec1cf93..f671536f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java @@ -52,6 +52,14 @@ public class WgNetInfo extends BaseEntity { @TableField("email") private String email; + @ApiModelProperty(value = "联络人") + @TableField("name") + private String name; + + @ApiModelProperty(value = "单位") + @TableField("unit") + private String unit; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java index e30304b5..aeee43bc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java @@ -326,25 +326,25 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { return Result.error("工作组处在流程中，无法修改"); } else { - return dealAllDatas(wgWorkGroupShowDTO); + return dealAllDatas(wgWorkGroupShowDTO,"sys"); } } @Override public ResponseMessage updateDataByWk(WgWorkGroupShowDTO wgWorkGroupShowDTO) { - return dealAllDatas(wgWorkGroupShowDTO); + return dealAllDatas(wgWorkGroupShowDTO,"wk"); } - private ResponseMessage dealAllDatas(WgWorkGroupShowDTO wgWorkGroupShowDTO) { + private ResponseMessage dealAllDatas(WgWorkGroupShowDTO wgWorkGroupShowDTO,String part) { WgWorkGroup wgWorkGroup = new WgWorkGroup(); BeanUtils.copyProperties(wgWorkGroupShowDTO, wgWorkGroup); boolean flag = false; flag = wgWorkGroupService.saveOrUpdate(wgWorkGroup); - saveBathDept(wgWorkGroupShowDTO, flag); - saveBathMeetingUserRelations(wgWorkGroupShowDTO, flag); - saveBathNetInfo(wgWorkGroupShowDTO, flag); - saveBathPayInfo(wgWorkGroupShowDTO, flag); - saveBathStandardPolicyInfo(wgWorkGroupShowDTO, flag); + saveBathDept(wgWorkGroupShowDTO, flag,part); + saveBathMeetingUserRelations(wgWorkGroupShowDTO, flag,part); + saveBathNetInfo(wgWorkGroupShowDTO, flag,part); + saveBathPayInfo(wgWorkGroupShowDTO, flag,part); + saveBathStandardPolicyInfo(wgWorkGroupShowDTO, flag,part); if (flag) { return Result.success("更新成功"); @@ -353,7 +353,7 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())) { List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(","))); @@ -367,11 +367,15 @@ public class WgWorkGroupServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgPayInfoService.remove(queryWrapper); } return flag; } - private boolean saveBathNetInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + private boolean saveBathNetInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) { if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())) { List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(","))); @@ -387,11 +391,15 @@ public class WgWorkGroupServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgNetInfoService.remove(queryWrapper); } return flag; } - private boolean saveBathMeetingUserRelations(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + private boolean saveBathMeetingUserRelations(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())) { List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(","))); @@ -418,11 +426,23 @@ public class WgWorkGroupServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgMeetingInfoService.remove(queryWrapper); + List wgMeetingInfos=wgMeetingInfoService.list(queryWrapper); + List removeIds=new ArrayList<>(); + wgMeetingInfos.forEach(wgMeetingInfo -> { + removeIds.add(wgMeetingInfo.getId()); + }); + if (removeIds.size()>0) { + wgMeetingUserRelationService.removeByIds(removeIds); + } } return flag; } - private boolean saveBathDept(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + private boolean saveBathDept(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { if (null != wgWorkGroupShowDTO.getWgDepts() && wgWorkGroupShowDTO.getWgDepts().size() > 0) { if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())) { List strings = new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(","))); @@ -438,12 +458,16 @@ public class WgWorkGroupServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgDeptService.remove(queryWrapper); } return flag; } - private boolean saveBathStandardPolicyInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag) { + private boolean saveBathStandardPolicyInfo(WgWorkGroupShowDTO wgWorkGroupShowDTO, boolean flag,String part) { if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()) { wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { @@ -453,6 +477,10 @@ public class WgWorkGroupServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("wg_id",wgWorkGroupShowDTO.getId()); + wgStandorpolicyInfoService.remove(queryWrapper); } return flag; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml index 97768a6b..f7f5dd81 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml @@ -11,13 +11,11 @@ From d7c9a117b5ef1c4a4083bc051ea0da48724de80c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 5 Jan 2022 15:44:52 +0800 Subject: [PATCH 21/40] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/Impl/SarPublicIdeaServiceImpl.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java index 2a9b9275..28c53f45 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java @@ -47,11 +47,19 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl selectAllP(Integer p, Integer size, String category, String cname, Date start, Date end, String type) { QueryWrapper list = new QueryWrapper<>(); if ("1".equals(type)) { - list.like(StringUtils.isNotEmpty(category), "category", category) - .like(StringUtils.isNotEmpty(cname), "cid", cname) - .ge(start != null, "start_time", start) - .le(end != null, "end_time", end) - .orderByDesc("start_time"); + if (start!=null && end !=null){ + list.like(StringUtils.isNotEmpty(category), "category", category) + .like(StringUtils.isNotEmpty(cname), "cid", cname) + .ge(start != null, "start_time", start) + .le(end != null, "end_time", end) + .orderByDesc("start_time"); + }else { + list.like(StringUtils.isNotEmpty(category), "category", category) + .like(StringUtils.isNotEmpty(cname), "cid", cname) + .le(start != null, "start_time", start) + .ge(end != null, "end_time", end) + .orderByDesc("start_time"); + } } else { list.like(StringUtils.isNotEmpty(category), "category", category) .like(StringUtils.isNotEmpty(cname), "cname", cname) From 055b3a7fc5419cd3b710afe949c2b9f710c5cecf Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 5 Jan 2022 16:18:42 +0800 Subject: [PATCH 22/40] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=20=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarPublicIdeaAllController.java | 6 +++++- .../sarStandIdea/dao/SarPublicIdeaAllDao.java | 2 ++ .../sarStandIdea/SarPublicIdeaAllMapper.xml | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 7c8206fc..dbd56663 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -118,7 +118,11 @@ public class SarPublicIdeaAllController extends BaseController response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); List data=new ArrayList<>(); if (!StringUtils.isEmpty(cid)){ - data=sarPublicIdeaAllDao.getPublicAllIdea(cid,type); + if (null!=type) { + data = sarPublicIdeaAllDao.getPublicAllIdea(cid, type); + }else { + data = sarPublicIdeaAllDao.getPublicAllIdeaExport(cid,type); + } } List standExcel=new ArrayList<>(); List standExcel2=new ArrayList<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java index d361e5ee..2f4ffad1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java @@ -28,4 +28,6 @@ public interface SarPublicIdeaAllDao extends BaseMapper { Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId); List getPublicAllIdea(@Param("cid") String cid,@Param("type")String type); + + List getPublicAllIdeaExport(@Param("cid") String cid,@Param("type")String type); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index 7809c344..a9f5c8c2 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -46,4 +46,19 @@ ORDER BY part_code ASC + + From a956ea2526389bb268e97c0ba0a2324f4373b1f4 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 5 Jan 2022 17:53:15 +0800 Subject: [PATCH 23/40] feat: There is no way the, --- .../esRevisePlan/entity/EsRevisePlan.java | 4 ++++ .../controller/TsInstitutionController.java | 6 ++++++ .../sarInstitution/dao/TsInstitutionDao.java | 2 ++ .../service/ITsInstitutionService.java | 2 ++ .../impl/TsInstitutionServiceImpl.java | 7 +++++++ .../esRevisePlan/EsRevisePlanMapper.xml | 1 + .../sarInstitution/TsInstitutionMapper.xml | 20 +++++++++++++++++++ 7 files changed, 42 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 9fb2b8e5..e355d68a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -94,6 +94,10 @@ public class EsRevisePlan extends BasePage { //企标类别 private String standType; + // 标准编号 + private String standNum; + + @ApiModelProperty(value = "企标类别") private String esMatingRelations; private String esStandRelations; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index 606e6e98..9028d757 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -80,6 +80,12 @@ public class TsInstitutionController extends BaseController { return Result.success(); } + @ApiOperation("根据部门ID获取部门下所有用户") + @GetMapping("/getInstitutionIdToDept") + public List getInstitutionIdToDept(String institutionIds,String userName){ + return tsInstitutionService.getInstitutionIdToDept(institutionIds,userName); + } + @ApiOperation("获得下一级的部门和人员") @GetMapping("/getNext") public List getNext(String institutionId,String userName){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java index 619e6efd..c2565c52 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java @@ -29,6 +29,8 @@ public interface TsInstitutionDao extends BaseMapper { */ List selectNextUser(@Param("institutionId") String institutionId,@Param("userName") String userName); + List selectNextUsers(@Param("institutionIds") List institutionIds,@Param("userName") String userName); + List selectNextUserByIds(@Param("ids") List ids); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java index 892228b0..92409ed4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java @@ -37,6 +37,8 @@ public interface ITsInstitutionService extends IService { */ public List getNext(String institutionId,String userName); + public List getInstitutionIdToDept(String institutionIds,String userName); + public List getNextById(String ids); /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index 5f117ceb..d3e52881 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -200,6 +200,13 @@ public class TsInstitutionServiceImpl extends ServiceImpl getInstitutionIdToDept(String institutionIds,String userName){ + List strings=new ArrayList<>(Arrays.asList(institutionIds.split(","))); + List tsUsers=tsInstitutionDao.selectNextUsers(strings,userName); + return tsUsers; + } + /** * 通过部门id获得这个部门下的下一级部门 * @return diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index a6f35511..6128110c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -209,6 +209,7 @@ es_revise_plan.buss_sort, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, + sar_bussioness_stand.stand_number as standNum, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,area) ) as areaName, diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index 5e8f9d90..fdf3da7b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -35,6 +35,26 @@ WHERE parent_id=#{institutionId} + + + + - select from (select tmp_tb.* from (select from SAR_STAND_COMPARE_HIS From fbde67fd7ff673209f5276a05e535cef1e01e98c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 10 Jan 2022 17:27:09 +0800 Subject: [PATCH 36/40] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=86=85=E9=83=A8=E5=AF=BC=E5=87=BA=20bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/common/TableToExcel.java | 5 +++ .../SarItemsStandCompareHisEOController.java | 40 +++++++++++++++++++ .../SarBussionessStandMapper.xml | 2 +- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarItemsStandCompareHisEOController.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java index ff511b51..ad1dec71 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java @@ -39,6 +39,7 @@ public class TableToExcel { sheet.addMergedRegion(new CellRangeAddress(0,1,5,5)); sheet.addMergedRegion(new CellRangeAddress(0,1,6,6)); sheet.addMergedRegion(new CellRangeAddress(0,1,7,7)); + sheet.addMergedRegion(new CellRangeAddress(0,1,8,8)); //生成表头行 int j=0; @@ -75,6 +76,10 @@ public class TableToExcel { Cell nCell1 = neckRow.createCell(4); nCell1.setCellValue("修改理由"); } + if (null!=columnMap.get("cause")) { + Cell nCell1 = headRow.createCell(8); + nCell1.setCellValue("原因"); + } //从第三行开始填充数据 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarItemsStandCompareHisEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarItemsStandCompareHisEOController.java new file mode 100644 index 00000000..cacf6ca4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarItemsStandCompareHisEOController.java @@ -0,0 +1,40 @@ +package com.adc.da.slrs.standardSplit.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.slrs.standardSplit.dao.SarItemsCompareHisEODao; +import com.adc.da.slrs.standardSplit.entity.SarItemsCompareHisEO; +import com.adc.da.slrs.standardSplit.entity.SarStandItemsCompareHisEO; +import com.adc.da.slrs.standardSplit.entity.SarStandItemsCompareHisEOPage; +import com.adc.da.slrs.standardSplit.service.SarItemsCompareHisEOService; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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 java.util.*; +@RestController +@RequestMapping("/${restPath}/lawss/sarItemsCompareHis") +@Api(description = "|SarStandItemsCompareHisEO|") +public class SarItemsStandCompareHisEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(SarItemsStandCompareHisEOController.class); + + @Autowired + private SarItemsCompareHisEODao sarItemsCompareHisEOService; + + @ApiOperation(value = "|SarStandItemsCompareHisEO|分页查询") + @GetMapping("/page") + public ResponseMessage> page(SarStandItemsCompareHisEOPage page) throws Exception { + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("STAND_HIS_ID",page.getStandHisId()); + List rows = sarItemsCompareHisEOService.selectList(queryWrapper); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index bc5ebed9..396482be 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -55,7 +55,7 @@ stand_status, replaced_stand_num, replace_stand_num,put_time, - issue_time, stand_en_name, stand_name, stand_code,standStatusShow, + issue_time, stand_en_name, stand_name, stand_code,stand_status, SAR_BUSSIONESS_STAND.id From 596528bcbf49aaa627fb092050f3373c0c3ddd95 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 10 Jan 2022 18:10:09 +0800 Subject: [PATCH 37/40] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=A8=A1=E5=9D=97=E5=AF=BC=E5=87=BA=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E6=84=8F=E8=A7=81=E5=8A=9F=E8=83=BD=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarPublicIdeaAllController.java | 11 +++++++++++ .../adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java | 2 ++ .../da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java | 3 +++ .../mapper/sarStandIdea/SarPublicIdeaAllMapper.xml | 9 +++++---- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 82fb5ece..f1d5d28a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -84,6 +84,15 @@ public class SarPublicIdeaAllController extends BaseController } + + @ApiOperation(value = "增加意见") + @PostMapping("/saveBatchByWk") + public ResponseMessage saveBatchByWk(@RequestBody List sar){ + boolean flag=sarPublicIdeaAllImpl.saveOrUpdateBatch(sar); + return Result.success("200",flag); + + } + @ApiOperation(value = "删除意见") @GetMapping("/deleteStand") public ResponseMessage deleteStand(DelStandDto delStandDto){ @@ -136,6 +145,7 @@ public class SarPublicIdeaAllController extends BaseController .userName(sarPublicIdeaAll.getUserName()) .deptName(sarPublicIdeaAll.getDeptName()) .state(map.get(sarPublicIdeaAll.getState())) + .cause(sarPublicIdeaAll.getCause()) .build(); standExcel2.add(getExcelDto); }else { @@ -160,6 +170,7 @@ public class SarPublicIdeaAllController extends BaseController headList.add(Lists.newArrayList("提出人")); if ("1".equals(type)){ headList.add(Lists.newArrayList("处理意见")); + headList.add(Lists.newArrayList("原因")); } if ("1".equals(type)) { EasyExcel.write(response.getOutputStream(), GetExcelDto2.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java index 6d2b104d..fc79bf30 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java @@ -37,6 +37,8 @@ public class GetExcelDto2 { private String state; + private String cause; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java index 72cfc5f8..589fb322 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java @@ -75,4 +75,7 @@ public class SarPublicIdeaAll extends BaseEntity { @TableField("state") private String state; + @TableField("cause") + private String cause; + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index a9f5c8c2..a55a303a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -6,7 +6,7 @@ SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,ts_institution.name as department,sar_public_idea_all.old_text, sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name, sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid, - sar_public_idea_all.chapter_name as chapterName,sar_public_idea_all.wk_flag + sar_public_idea_all.chapter_name as chapterName,sar_public_idea_all.wk_flag,sar_public_idea_all.cause FROM sar_public_idea INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id left join ts_user on ts_user.USID = sar_public_idea_all.user_id @@ -17,7 +17,8 @@ From 914d2c3d067daa52728e8dd963f1dc54868e07bd Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 11 Jan 2022 11:08:14 +0800 Subject: [PATCH 40/40] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BC=9A=E5=90=8E?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E4=B8=80=E5=B0=8F=E6=97=B6=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/Timer/ProcessTimer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java index f37f251e..b050bba0 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java +++ b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java @@ -186,7 +186,8 @@ public class ProcessTimer { } } - @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行 +// @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行 + @Scheduled(cron = "0 0 * * * ？ ")//每天十点执行 // @Scheduled(cron = "*/40 * * * * ? ")//20s public void everyDayTenOlockScanSAM() { List busProcessNews=new ArrayList<>();