diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java index 1d23333a..89c98213 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java @@ -2,9 +2,18 @@ package com.jero.modules.projectLibrary.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.jero.common.constant.CommonConstant; +import com.jero.modules.laws.standard.entity.LawsDomesticStandard; +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; +import com.jero.modules.laws.standard.entity.LawsOverseasStandard; +import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; +import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; +import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet; import com.jero.modules.projectLibrary.mapper.LawsEvaluationNotMetMapper; import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService; +import io.swagger.annotations.ApiModelProperty; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; @@ -12,6 +21,8 @@ import java.util.List; import java.util.Date; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.query.QueryGenerator; + +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -26,8 +37,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @Service @Transactional(rollbackFor = JeroBootException.class) public class LawsEvaluationNotMetServiceImpl extends ServiceImpl implements ILawsEvaluationNotMetService { - - + //国内标准 + @Resource + private ILawsDomesticStandardService lawsDomesticStandardService; + //海外标准 + @Resource + private ILawsOverseasStandardService lawsOverseasStandardService; + //企业标准 + @Resource + private ILawsEnterpriseStandardService lawsEnterpriseStandardService; /** * 分页查询 * @@ -65,9 +83,42 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl