From 8e7e210d35c120f3a870bd6a0ae3bfd53019fdbd Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 17 Feb 2022 14:48:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=96=B0=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActSarItemsBussEOController.java | 11 +++ .../service/ActSarItemsBussEOService.java | 87 +++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java index 956a30b3..39f05ec2 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java @@ -23,6 +23,17 @@ public class ActSarItemsBussEOController extends BaseController { // private static final Logger logger = LoggerFactory.getLogger(AttFileEOController.class); + @ApiOperation(value = "|SarBussionessStand|企标复审入库流程") + @PostMapping("/processCreateFsBuss") + public ResponseMessage processCreateFsBuss(String infoJson) throws Exception { + if (StringUtils.isNotBlank(infoJson)) { + actSarItemsEOService.processCreateFsBuss(infoJson); + return Result.success("入库成功"); + } else { + return Result.error("传入数据json不能为空"); + } + } + @ApiOperation(value = "|SarBussionessStand|企标入库流程") @PostMapping("/processCreateBuss") public ResponseMessage processCreateBuss(String infoJson) throws Exception { diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index b6d73c45..2c238a02 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -10,10 +10,14 @@ import com.adc.da.slrs.SarCompResAssess.service.ISarCompResAssessService; import com.adc.da.slrs.SarCompStatusInfo.dao.SarCompStatusInfoDao; import com.adc.da.slrs.SarCompStatusInfo.entity.SarCompStatusInfo; import com.adc.da.slrs.SarFileSplitItems.service.ISarFileSplitItemsService; +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; +import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; +import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService; import com.adc.da.slrs.sarLawsAttrInfo.service.ISarLawsAttrInfoService; @@ -28,6 +32,7 @@ import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.util.UUIDUtils; +import com.adc.da.utils.util.DateUtil; import com.adc.da.utils.util.InitStandAttrUtil; import com.adc.da.utils.util.Utils; import com.adc.da.workFlow.dao.ActSarItemsEODao; @@ -36,6 +41,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -77,10 +83,91 @@ public class ActSarItemsBussEOService { @Autowired private ISarUpdLogService sarUpdLogEOService; + @Autowired + IEsRevisePlanService iEsRevisePlanService; + + @Autowired + private ISarBussionessStandStateService bussionessStandStateService; @Value("${elas.flag}") private boolean elasflag; + + public void processCreateFsBuss(String standJson) throws Exception { + Map standMap = new HashMap(); + standMap = JSONObject.parseObject(standJson); + if (standMap != null && !standMap.isEmpty()) { + String standId = String.valueOf(standMap.get("standId")); + String standCode = String.valueOf(standMap.get("standCode")); + String standSort = String.valueOf(standMap.get("standSort")); + String standName = String.valueOf(standMap.get("standName")); + String issueTime = String.valueOf(standMap.get("issueTime")); + String reviewTime = String.valueOf(standMap.get("reviewTime")); + String reviewResults = String.valueOf(standMap.get("reviewResults")); + + SarBussionessStandState state = new SarBussionessStandState(); + state.setStandId(standId); + state.setStandCode(standCode); + state.setStandName(standName); + state.setReviewResults(Integer.parseInt(reviewResults)); + if(DateUtil.printToDate(issueTime) != null){ + state.setIssueTime(issueTime); + } + state.setModifyTime(DateUtil.printDateAll(new Date())); + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("STAND_ID",standId); + List stateList = bussionessStandStateService.list(wrapper); + if(!stateList.isEmpty()){ + state.setId(stateList.get(0).getId()); + bussionessStandStateService.updateById(state); + }else { + if(DateUtil.printToDate(reviewTime) != null){ + state.setReviewTime(reviewTime); + } + state.setCreationTime(DateUtil.printDateAll(new Date())); + bussionessStandStateService.save(state); + } + + + if(StringUtils.isNotBlank(standSort) && !standSort.contains("Q/QCBFC")){ + String QCDWID = String.valueOf(standMap.get("QCDWID")); + String QCDW = String.valueOf(standMap.get("QCDW")); + String QCRBUSSID = String.valueOf(standMap.get("QCRBUSSID")); + String QCRBUSS = String.valueOf(standMap.get("QCRBUSS")); + String draftTime = String.valueOf(standMap.get("draftTime")); + String releaseTime = String.valueOf(standMap.get("releaseTime")); + String YYBZ = String.valueOf(standMap.get("YYBZ")); + String CYBZ = String.valueOf(standMap.get("CYBZ")); + String SYCXCLASS = String.valueOf(standMap.get("SYCXCLASS")); + String DTQBBHBUSS = String.valueOf(standMap.get("DTQBBHBUSS")); + String LXD = String.valueOf(standMap.get("LXD")); + + //立项 + EsRevisePlan esRevisePlanDTO=new EsRevisePlan(); + esRevisePlanDTO.setEsName(standName); + esRevisePlanDTO.setUnit(QCDWID); + esRevisePlanDTO.setUnitName(QCDW); + esRevisePlanDTO.setDrafter(QCRBUSSID); + esRevisePlanDTO.setDrafterName(QCRBUSS); + esRevisePlanDTO.setPlanStatus("0"); + esRevisePlanDTO.setReviseStatus("2"); + esRevisePlanDTO.setDraftTime(DateUtil.printToDate(draftTime)); + esRevisePlanDTO.setReleaseTime(DateUtil.printToDate(releaseTime)); + esRevisePlanDTO.setBussSort(standSort); + esRevisePlanDTO.setEsMatingRelations(YYBZ); + esRevisePlanDTO.setEsStandRelations(CYBZ); + esRevisePlanDTO.setUseLevel(CYBZ); + esRevisePlanDTO.setArea(SYCXCLASS); + esRevisePlanDTO.setRqbName(DTQBBHBUSS); + esRevisePlanDTO.setLxd(LXD); + iEsRevisePlanService.addPlan(esRevisePlanDTO); + } + + } + + + } + public void autoUpdIndex(String pid,String bussId){ List evaluationHisFilter = workFlowFeignClient.evaluationHisList(pid); List evaluationHis = new ArrayList<>();