收藏列表区分标准状态字段值
This commit is contained in:
+9
@@ -13,6 +13,7 @@ import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
|
|||||||
import com.jero.modules.personal.entity.LawsStandardCollection;
|
import com.jero.modules.personal.entity.LawsStandardCollection;
|
||||||
import com.jero.modules.personal.mapper.LawsStandardCollectionMapper;
|
import com.jero.modules.personal.mapper.LawsStandardCollectionMapper;
|
||||||
import com.jero.modules.personal.service.ILawsStandardCollectionService;
|
import com.jero.modules.personal.service.ILawsStandardCollectionService;
|
||||||
|
import com.jero.modules.system.service.ISysDictService;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -44,6 +45,8 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
|
|||||||
private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准
|
private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准
|
||||||
@Autowired
|
@Autowired
|
||||||
private ILawsEnterpriseStandardService ILawsEnterpriseStandardService; //企业标准
|
private ILawsEnterpriseStandardService ILawsEnterpriseStandardService; //企业标准
|
||||||
|
@Autowired
|
||||||
|
private ISysDictService sysDictService;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -72,6 +75,8 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
|
|||||||
collection.setNewModelImplementationDate(standard.getNewModelImplementationDate());
|
collection.setNewModelImplementationDate(standard.getNewModelImplementationDate());
|
||||||
collection.setOnTheProductionDate(standard.getOnTheProductionDate());
|
collection.setOnTheProductionDate(standard.getOnTheProductionDate());
|
||||||
collection.setReleaseDate(standard.getReleaseDate());
|
collection.setReleaseDate(standard.getReleaseDate());
|
||||||
|
String standard_state = sysDictService.queryDictTextByKey("standard_state", standard.getStandardState());
|
||||||
|
collection.setStandardState(standard_state);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (CommonConstant.STANDARD_SOURCE_2.equals(source)){
|
if (CommonConstant.STANDARD_SOURCE_2.equals(source)){
|
||||||
@@ -81,6 +86,8 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
|
|||||||
collection.setNewModelImplementationDate(standard.getNewModelImplementationDate());
|
collection.setNewModelImplementationDate(standard.getNewModelImplementationDate());
|
||||||
collection.setOnTheProductionDate(standard.getOnTheProductionDate());
|
collection.setOnTheProductionDate(standard.getOnTheProductionDate());
|
||||||
collection.setReleaseDate(standard.getReleaseDate());
|
collection.setReleaseDate(standard.getReleaseDate());
|
||||||
|
String standard_state = sysDictService.queryDictTextByKey("standard_state", standard.getStandardState());
|
||||||
|
collection.setStandardState(standard_state);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (CommonConstant.STANDARD_SOURCE_3.equals(source)){
|
if (CommonConstant.STANDARD_SOURCE_3.equals(source)){
|
||||||
@@ -88,6 +95,8 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
|
|||||||
LawsEnterpriseStandard standard = ILawsEnterpriseStandardService.getById(standardId);
|
LawsEnterpriseStandard standard = ILawsEnterpriseStandardService.getById(standardId);
|
||||||
if (standard != null){
|
if (standard != null){
|
||||||
collection.setReleaseDate(standard.getReleaseDate());
|
collection.setReleaseDate(standard.getReleaseDate());
|
||||||
|
String standard_state = sysDictService.queryDictTextByKey("es_status", String.valueOf(standard.getStandardState()));
|
||||||
|
collection.setStandardState(standard_state);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user