FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
CD
2022-12-01 20:39:03 +08:00
parent 1372f306ea 546a839d12
commit e7faa9ad2a
8 changed files with 104 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+5
View File
@@ -456,4 +456,9 @@ public interface workFlowFeignClient {
@RequestMapping(value = "/bat-wkflow/delCG",method = RequestMethod.POST)
String delCG(@RequestParam("id") String id);
@RequestMapping(value = "/bat-wkflow/esTechRelation/setRelation",method = RequestMethod.POST)
void setRelation(@RequestParam("esPlanId")String esPlanId,@RequestParam("prcId") String prcId, @RequestParam("finish") String finish);
@RequestMapping(value = "/bat-wkflow/esTechRelation/getEsByWk",method = RequestMethod.GET)
String getEsByWk(@RequestParam("prcId")String prcId);
}
adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
+8
View File
@@ -400,4 +400,12 @@ public class workFlowFeignClientImpl {
public String delCG(@RequestParam("id") String id){
return workFlowFeignClient.delCG(id);
}
public void setRelation(@RequestParam("esPlanId")String esPlanId,@RequestParam("prcId") String prcId, @RequestParam("finish") String finish){
workFlowFeignClient.setRelation(esPlanId,prcId,finish);
}
public String getEsByWk(@RequestParam("prcId")String prcId) {
return workFlowFeignClient.getEsByWk(prcId);
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+6
View File
@@ -916,4 +916,10 @@ public class WorkFlowController {
}
@ApiOperation(value = "通过企标计划和技术标准起草关联表查询对应的计划id")
@GetMapping("/getEsByWk")
public String getEsByWk(@RequestParam("prcId")String prcId){
return workFlowFeignClient.getEsByWk(prcId);
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/enums/FlowFinishEnum.java
+31
View File
@@ -0,0 +1,31 @@
package com.adc.da.workFlow.enums;
public enum FlowFinishEnum {
FSLC_JSBZQC_START("正处于技术标准起草节点","0"),
FSLC_JSBZQC_FINISH("技术标准起草节点已结束","1"),
JSBZLC_FINISH("技术标准流程已结束","2");
FlowFinishEnum(String label, String value) {
this.label = label;
this.value = value;
}
String label;
String value;
public String getLabel() {
return label;
}
public void setLabel(String label) {
this.label = label;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+16 -7
View File
@@ -43,6 +43,7 @@ import com.adc.da.utils.util.InitStandAttrUtil;
import com.adc.da.utils.util.Utils;
import com.adc.da.workFlow.dao.ActSarItemsEODao;
import com.adc.da.workFlow.entity.BusProcessEvaluationHis;
import com.adc.da.workFlow.enums.FlowFinishEnum;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -235,23 +236,31 @@ public class ActSarItemsBussEOService {
qw.setEsName(standName);
qw.setBussSort(standSort);
List<EsRevisePlan> list = esRevisePlanDao.selectPageByName(qw);
String esPlanId = "";
if(!list.isEmpty()){
esRevisePlanDTO.setId(list.get(0).getId());
iEsRevisePlanService.updateById(esRevisePlanDTO);
//日志
String esName = list.get(0).getEsName();
String id = list.get(0).getId();
Date date = new Date();
String msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " "
if ("1".equals(reviewResults)) {
String esName = list.get(0).getEsName();
String id = list.get(0).getId();
Date date = new Date();
String msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " "
+"通过复审流程创建了《"+ esName +"》,其复审结果为修订。";
esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date));
esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date));
}
esPlanId = list.get(0).getId();
}else{
if("1".equals(reviewResults)) { // 修订时才生成企标计划
iEsRevisePlanService.addPlan(esRevisePlanDTO);
ResponseMessage<Object> objectResponseMessage = iEsRevisePlanService.addPlan(esRevisePlanDTO);
esPlanId = objectResponseMessage.getMessage();
}
}
if ("1".equals(reviewResults)) {
workFlowFeignClient.setRelation(esPlanId, String.valueOf(standMap.get("prcId")) , FlowFinishEnum.FSLC_JSBZQC_START.getValue());
}
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java
+8
View File
@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -89,5 +90,12 @@ public class ZlTreeController extends BaseController<ZlTree> {
}
@GetMapping("/queryTree")
@ApiOperation("根据树id判断树层级并查询对应的节点")
public ResponseMessage<ZlTree> queryTree(@Param("treeId") String treeId){
ZlTree zlTree = iZlTreeService.queryTree(treeId);
return Result.success(zlTree);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java
+6 -1
View File
@@ -45,5 +45,10 @@ public interface IZlTreeService extends IService<ZlTree> {
*/
int topping(String id);
/**
* 根据树id判断树层级并查询对应的节点
* @param treeId
* @return
*/
ZlTree queryTree(String treeId);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java
+24
View File
@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -130,4 +131,27 @@ public class ZlTreeServiceImpl extends ServiceImpl<ZlTreeDao, ZlTree> implements
public int topping(String id) {
return zlTreeDao.topping(id);
}
/**
* 根据树id判断树层级并查询对应的节点
* @param treeId
* @return
*/
@Override
public ZlTree queryTree(String treeId) {
ZlTree zlTree = zlTreeDao.selectById(treeId);
if (ObjectUtils.isNotEmpty(zlTree)) {
if (ObjectUtils.isNotEmpty(zlTree.getParentId())) {
ZlTree zlTreeParents = zlTreeDao.selectById(zlTree.getParentId());
if (ObjectUtils.isEmpty(zlTreeParents.getParentId())) {
return zlTree;
} else {
return zlTreeParents;
}
} else {
return zlTree;
}
}
return null;
}
}