ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(征求意见): 详情完善

Browse Source
This commit is contained in:
yjz
2023-12-05 15:00:39 +08:00
parent 73b8de934a
commit e916899779
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java
+2 -2
View File
@@ -112,8 +112,8 @@ public class ProcessFbStandardConsultation implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private java.lang.String standardNameNumber; private java.lang.String standardNameNumber;
/**收藏标准来源(1国内、2海外、3企标)*/ /**收准来源(1国内、2海外、3企标)*/
@ApiModelProperty(value = "收藏标准来源(1国内、2海外、3企标)") @ApiModelProperty(value = "标准来源(1国内、2海外、3企标)")
@TableField(exist = false) @TableField(exist = false)
private String source; private String source;
laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java
+10 -10
View File
@@ -13,9 +13,9 @@ import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultati
import com.jero.modules.laws.consultation.service.IConsultationService; import com.jero.modules.laws.consultation.service.IConsultationService;
import com.jero.modules.laws.consultation.vo.ProcessFbConsultationListVO; import com.jero.modules.laws.consultation.vo.ProcessFbConsultationListVO;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsOverseasStandard; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.entity.SysDepart;
@@ -52,20 +52,20 @@ public class ConsultationServiceImpl implements IConsultationService {
private final IProcessFbStandardConsultationService processFbStandardConsultationService; private final IProcessFbStandardConsultationService processFbStandardConsultationService;
private final IProcessFbConsultationListService processFbConsultationListService; private final IProcessFbConsultationListService processFbConsultationListService;
private final ILawsDomesticStandardService lawsDomesticStandardService; private final ILawsDomesticStandardService lawsDomesticStandardService;
private final ILawsOverseasStandardService lawsOverseasStandardService; private final ILawsEnterpriseStandardService lawsEnterpriseStandardService;
private final ISysDepartService sysDepartService; private final ISysDepartService sysDepartService;
private final IOSSFileService ossFileService; private final IOSSFileService ossFileService;
public ConsultationServiceImpl(IProcessFbStandardConsultationService processFbStandardConsultationService, public ConsultationServiceImpl(IProcessFbStandardConsultationService processFbStandardConsultationService,
IProcessFbConsultationListService processFbConsultationListService, IProcessFbConsultationListService processFbConsultationListService,
ILawsDomesticStandardService lawsDomesticStandardService, ILawsDomesticStandardService lawsDomesticStandardService,
ILawsOverseasStandardService lawsOverseasStandardService, ILawsEnterpriseStandardService lawsEnterpriseStandardService,
ISysDepartService sysDepartService, ISysDepartService sysDepartService,
IOSSFileService ossFileService) { IOSSFileService ossFileService) {
this.processFbStandardConsultationService = processFbStandardConsultationService; this.processFbStandardConsultationService = processFbStandardConsultationService;
this.processFbConsultationListService = processFbConsultationListService; this.processFbConsultationListService = processFbConsultationListService;
this.lawsDomesticStandardService = lawsDomesticStandardService; this.lawsDomesticStandardService = lawsDomesticStandardService;
this.lawsOverseasStandardService = lawsOverseasStandardService; this.lawsEnterpriseStandardService = lawsEnterpriseStandardService;
this.sysDepartService = sysDepartService; this.sysDepartService = sysDepartService;
this.ossFileService = ossFileService; this.ossFileService = ossFileService;
} }
@@ -96,14 +96,14 @@ public class ConsultationServiceImpl implements IConsultationService {
// 国标 // 国标
LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.getById(StandardConsultation.getStandardId()); LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.getById(StandardConsultation.getStandardId());
// 海外 // 企标
LawsOverseasStandard lawsOverseasStandard = lawsOverseasStandardService.getById(StandardConsultation.getStandardId()); LawsEnterpriseStandard lawsEnterpriseStandard = lawsEnterpriseStandardService.getById(StandardConsultation.getStandardId());
if (!Objects.isNull(lawsDomesticStandard)){ if (!Objects.isNull(lawsDomesticStandard)){
standardName = lawsDomesticStandard.getStandardName(); standardName = lawsDomesticStandard.getStandardName();
StandardConsultation.setSource("1"); StandardConsultation.setSource("1");
}else if (!Objects.isNull(lawsOverseasStandard)){ }else if (!Objects.isNull(lawsEnterpriseStandard)){
standardName = lawsOverseasStandard.getStandardName(); standardName = lawsEnterpriseStandard.getStandardName();
StandardConsultation.setSource("2"); StandardConsultation.setSource("3");
} }
StandardConsultation.setStandardNameNumber(StandardConsultation.getStandardNumber() + " " + standardName); StandardConsultation.setStandardNameNumber(StandardConsultation.getStandardNumber() + " " + standardName);