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 @@ + + + + + +