diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java deleted file mode 100644 index 1c5209a4..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.jero.modules.laws.enterprise.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.base.controller.JeroController; -import com.jero.common.util.MessageUtils; -import com.jero.common.api.vo.ResultCommon; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardReviewMeetingRecord; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail; -import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardReviewMeetingVo; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingRecordService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - - -/** - * @Description: 企标宣贯 - * @Author: jero-boot - * @Date: 2022-02-12 - * @Version: V1.0 - */ -@Api(tags = "企标评审会") -@RestController -@RequestMapping("/enterprise/reviewMeeting") -@Slf4j -public class EnterpriseStandardReviewMeetingController extends JeroController { - - @Resource - private EnterpriseStandardReviewMeetingRecordService esReviewMeetingService; - - /** - * 分页列表查询 - * - * @return - */ - @RequiresPermissions("enterpriseStandardLibrary:reviewMeeting:search") - @AutoLog(value = "企标评审会-分页列表查询") - @ApiOperation(value = "企标评审会-分页列表查询", notes = "企标评审会-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(ESQueryCommonDTO esReviewMeeting, - @RequestParam(name = "pageNo", defaultValue = "1") @ApiParam("页码") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") @ApiParam("页面显示数量") Integer pageSize) { - IPage pageList = esReviewMeetingService.queryPageList(esReviewMeeting, pageNo, pageSize); - return Result.OK(pageList); - } - - /** - * 评分详情 可以传“评审会的id”也可以传“企标编号” - * - * @return - */ - @RequiresPermissions("enterpriseStandardLibrary:reviewMeeting:reviewDetail") - @AutoLog(value = "企标评审会-评分详情") - @ApiOperation(value = "企标评审会-评分详情", notes = "企标评审会-评分详情") - @GetMapping(value = "/evaluateDetail/{id}") - public Result evaluateDetail(@PathVariable("id") @ApiParam("企标评审Id") String id) { - Map> resultMap = esReviewMeetingService.evaluateDetail(id); - return Result.OK(resultMap); - } - - /** - * 设置优质标准 - * - * @return - */ - @RequiresPermissions("enterpriseStandardLibrary:reviewMeeting:setQualityStandard") - @AutoLog(value = "企标评审会-设置优质标准") - @ApiOperation(value = "企标评审会-设置优质标准", notes = "企标评审会-设置优质标准") - @GetMapping(value = "/setQualityStandards") - public Result setQualityStandards(@RequestParam @ApiParam("标准编号") String standardNos) { - List standardNoList = Arrays.asList(standardNos.split(",")); - if (standardNoList.size() > 10) { - throw new JeroBootException(MessageUtils.getMessage(ResultCommon.RMR_SET_QUALITY_OVER_TEN)); - } - esReviewMeetingService.setQualityStandards(standardNoList); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java deleted file mode 100644 index 8f836728..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.jero.modules.laws.enterprise.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 企业标准评审会议记录 - * @Author: jero-boot - * @Date: 2023-09-06 - * @Version: V1.0 - */ -@Data -@TableName("laws_enterprise_standard_review_meeting_record") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_enterprise_standard_review_meeting_record对象", description="企业标准评审会议记录") -public class EnterpriseStandardReviewMeetingRecord implements Serializable { - - private static final long serialVersionUID = 7683452768786768312L; - - /**主键ID*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private String id; - - /**创建人*/ - @ApiModelProperty(value = "创建人") - private String createBy; - - /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private Date createTime; - - /**更新人*/ - @ApiModelProperty(value = "更新人") - private String updateBy; - - /**更新时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private String orgCode; - - /**企标Id*/ - @ApiModelProperty(value = "企标Id") - private String standardId; - - /**企标编号*/ - @ApiModelProperty(value = "企标计划Id") - private String planId; - - /**评审日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "评审日期") - private Date reviewDate; - - /**评审人*/ - @ApiModelProperty(value = "评审人") - private String reviewUser; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardRmrEvaluateDetail.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardRmrEvaluateDetail.java deleted file mode 100644 index 7784466b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardRmrEvaluateDetail.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.jero.modules.laws.enterprise.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: 企业标准RMR评价详情 - * @Author: jero-boot - * @Date: 2023-09-06 - * @Version: V1.0 - */ -@Data -@TableName("laws_enterprise_standard_rmr_evaluate_detail") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_enterprise_standard_rmr_evaluate_detail对象", description="企业标准RMR评价详情") -public class EnterpriseStandardRmrEvaluateDetail implements Serializable { - - private static final long serialVersionUID = 1897342976823769812L; - - /**主键ID*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键ID") - private String id; - - /**创建人*/ - @ApiModelProperty(value = "创建人") - private String createBy; - - /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private Date createTime; - - /**更新人*/ - @ApiModelProperty(value = "更新人") - private String updateBy; - - /**更新时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private String orgCode; - - /**企标编号*/ - @ApiModelProperty(value = "企标编号") - private String reviewMeetingId; - - /**评分项目*/ - @ApiModelProperty(value = "评分项目") - private String evaluateItem; - - /**评分分值*/ - @ApiModelProperty(value = "评分分值") - private String evaluateScore; - - /**评分人id*/ - @ApiModelProperty(value = "评分人id") - private String adjudicatorId; - - /**评分人名称*/ - @TableField(exist = false) - @ApiModelProperty(value = "评分人名称") - private String adjudicatorName; - - /**扣分理由*/ - @ApiModelProperty(value = "扣分理由") - private String deductionScoreReason; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardReviewMeetingRecordMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardReviewMeetingRecordMapper.java deleted file mode 100644 index f9cc16c3..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardReviewMeetingRecordMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.jero.modules.laws.enterprise.mapper; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardReviewMeetingRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail; -import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardReviewMeetingVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_review_meeting_record】的数据库操作Mapper -* @createDate 2023-09-07 11:20:22 -* @Entity generator.entity.EnterpriseStandardReviewMeetingRecord -*/ -public interface EnterpriseStandardReviewMeetingRecordMapper extends BaseMapper { - - IPage page(IPage page, @Param("param") ESQueryCommonDTO esReviewMeeting); - - String getAvgScore(@Param("id") String id); - - String getAvgScoreByStandardNo(@Param("standardNumber") String standardNumber); - - List getScoreList(@Param("id") String rmrId); - - List getScoreListByStandardNo(@Param("standardNumber") String studentNumber); -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardRmrEvaluateDetailMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardRmrEvaluateDetailMapper.java deleted file mode 100644 index b325ea88..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardRmrEvaluateDetailMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jero.modules.laws.enterprise.mapper; - -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_rmr_evaluate_detail】的数据库操作Mapper -* @createDate 2023-09-07 11:20:25 -* @Entity generator.entity.EnterpriseStandardRmrEvaluateDetail -*/ -public interface EnterpriseStandardRmrEvaluateDetailMapper extends BaseMapper { - -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml deleted file mode 100644 index b942ad2b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRmrEvaluateDetailMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRmrEvaluateDetailMapper.xml deleted file mode 100644 index a9d36fc4..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRmrEvaluateDetailMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - id,create_by,create_time, - update_by,update_time,org_code, - evaluate_item,evaluate_score, - deduction_score_reason - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardReviewMeetingRecordService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardReviewMeetingRecordService.java deleted file mode 100644 index d93adf06..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardReviewMeetingRecordService.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.jero.modules.laws.enterprise.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardReviewMeetingRecord; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail; -import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardReviewMeetingVo; - -import java.util.List; -import java.util.Map; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_review_meeting_record】的数据库操作Service -* @createDate 2023-09-07 11:20:22 -*/ -public interface EnterpriseStandardReviewMeetingRecordService extends IService { - - /** - * 列表接口 - * @param esReviewMeeting - * @param pageNo - * @param pageSize - * @return - */ - IPage queryPageList(ESQueryCommonDTO esReviewMeeting, Integer pageNo, Integer pageSize); - - /** - * 评分详情接口 - * @param id - * @return - */ - Map> evaluateDetail(String id); - - /** - * 企标详情-企标评价 - * @param standardNumber - * @return - */ - Map> evaluateDetailByStandardNo(String standardNumber); - - - /** - * 设置优质标准 - * @param standardNos - */ - void setQualityStandards(List standardNos); - - /** - * 评分详情接口 - * @param standardId - * @return - */ - Map> evaluateDetailForESInfo(String standardId); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardRmrEvaluateDetailService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardRmrEvaluateDetailService.java deleted file mode 100644 index ca78d2e5..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardRmrEvaluateDetailService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.jero.modules.laws.enterprise.service; - -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_rmr_evaluate_detail】的数据库操作Service -* @createDate 2023-09-07 11:20:25 -*/ -public interface EnterpriseStandardRmrEvaluateDetailService extends IService { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java deleted file mode 100644 index c2e2621a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.jero.modules.laws.enterprise.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.constant.enums.YesOrNoEnum; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.api.ISysBaseAPI; -import com.jero.common.system.vo.DictModel; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardReviewMeetingRecord; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail; -import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardReviewMeetingVo; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingRecordService; -import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardReviewMeetingRecordMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_review_meeting_record】的数据库操作Service实现 -* @createDate 2023-09-07 11:20:22 -*/ -@Service -@Transactional(rollbackFor = JeroBootException.class) -@Slf4j -public class EnterpriseStandardReviewMeetingRecordServiceImpl extends ServiceImpl - implements EnterpriseStandardReviewMeetingRecordService { - - @Resource - private EnterpriseStandardReviewMeetingRecordMapper esReviewMeetingMapper; - - @Resource - private EnterpriseStandardPlanService esPlanService; - - @Resource - private EnterpriseStandardReviewMeetingRecordService esReviewMeetingService; - - @Override - public IPage queryPageList(ESQueryCommonDTO esReviewMeeting, Integer pageNo, Integer pageSize) { - IPage page = new Page<>(pageNo, pageSize); - esReviewMeetingMapper.page(page, esReviewMeeting); - return page; - } - - @Override - public Map> evaluateDetail(String rmrId) { - List scoreList = esReviewMeetingMapper.getScoreList(rmrId); - Map> scoreMap = scoreList.stream().collect(Collectors.groupingBy(EnterpriseStandardRmrEvaluateDetail::getAdjudicatorName)); - - String avgScore = esReviewMeetingMapper.getAvgScore(rmrId); - Map> resultMap = new LinkedHashMap<>(); - resultMap.put(avgScore, null); - resultMap.putAll(scoreMap); - return resultMap; - } - - @Override - public Map> evaluateDetailByStandardNo(String standardNumber) { - List scoreList = esReviewMeetingMapper.getScoreListByStandardNo(standardNumber); - Map> scoreMap = scoreList.stream().collect(Collectors.groupingBy(EnterpriseStandardRmrEvaluateDetail::getAdjudicatorName)); - - String avgScore = esReviewMeetingMapper.getAvgScoreByStandardNo(standardNumber); - Map> resultMap = new LinkedHashMap<>(); - resultMap.put(avgScore, null); - resultMap.putAll(scoreMap); - return resultMap; - } - - @Override - public void setQualityStandards(List standardNos) { - LambdaUpdateWrapper espWrapper = new LambdaUpdateWrapper<>(); - espWrapper.in(EnterpriseStandardPlan::getNewEnStandardNo, standardNos).set(EnterpriseStandardPlan::getQualityFlag, YesOrNoEnum.YES.getValue()); - // 设置为优质标准 - esPlanService.update(espWrapper); - } - - @Override - public Map> evaluateDetailForESInfo(String standardId) { - LambdaQueryWrapper reviewMeetingRecordLambdaQueryWrapper = new LambdaQueryWrapper<>(); - reviewMeetingRecordLambdaQueryWrapper.eq(EnterpriseStandardReviewMeetingRecord::getStandardId, standardId); - EnterpriseStandardReviewMeetingRecord one = esReviewMeetingService.getOne(reviewMeetingRecordLambdaQueryWrapper); - if (one != null) { - return this.evaluateDetail(one.getId()); - } else { - return new LinkedHashMap<>(); - } - } -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRmrEvaluateDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRmrEvaluateDetailServiceImpl.java deleted file mode 100644 index 1b23d7ca..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRmrEvaluateDetailServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.jero.modules.laws.enterprise.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardRmrEvaluateDetailService; -import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardRmrEvaluateDetailMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_rmr_evaluate_detail】的数据库操作Service实现 -* @createDate 2023-09-07 11:20:25 -*/ -@Service -@Transactional(rollbackFor = JeroBootException.class) -@Slf4j -public class EnterpriseStandardRmrEvaluateDetailServiceImpl extends ServiceImpl - implements EnterpriseStandardRmrEvaluateDetailService{ - -} - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index 5fef4951..9e5bf8e7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -11,8 +11,6 @@ import com.jero.common.util.MessageUtils; import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.service.ILawsCommonService; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail; -import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingRecordService; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.laws.standard.service.ILawsReplacedStandardService; import com.jero.modules.personal.service.ILawsStandardCollectionService; @@ -51,9 +49,6 @@ public class LawsEnterpriseController { @Autowired private ILawsStandardCollectionService lawsStandardCollectionService; - @Resource - private EnterpriseStandardReviewMeetingRecordService esReviewMeetingService; - @Resource private ISarFileSplitInfoService splitInfoService; @@ -207,20 +202,6 @@ public class LawsEnterpriseController { return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } - /** - * 企标评价 - * - * @return - */ - @AutoLog(value = "企业法规标准-企标评价") - @ApiOperation(value = "企业法规标准-企标评价", notes = "企业法规标准-企标评价") - @GetMapping(value = "/evaluateDetail/{standardNumber}") - @ApiOperationSupport(order = 14) - public Result evaluateDetail(@PathVariable("standardNumber") @ApiParam("标准编号") String standardNumber) { - Map> resultMap = esReviewMeetingService.evaluateDetailByStandardNo(standardNumber); - return Result.OK(resultMap); - } - @AutoLog(value = "企业法规标准-导出") @ApiOperation(value="企业法规标准-导出", notes="企业法规标准-导出") @PostMapping("/exportData") @@ -266,18 +247,4 @@ public class LawsEnterpriseController { } return Result.OK(); } - - /** - * 企标详情-评分详情 - * - * @return - */ - @AutoLog(value = "企业法规标准-评分详情") - @ApiOperation(value = "企业法规标准-评分详情", notes = "企业法规标准-评分详情") - @GetMapping(value = "/evaluateDetailForESInfo/{standardId}") - @ApiOperationSupport(order = 19) - public Result evaluateDetailForESInfo(@PathVariable("standardId") @ApiParam("标准Id") String standardId) { - Map> resultMap = esReviewMeetingService.evaluateDetailForESInfo(standardId); - return Result.OK(resultMap); - } }