diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index f1ef1500..c67ed07e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -481,4 +481,6 @@ public interface workFlowFeignClient { List deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer); @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectAskId",method = RequestMethod.GET) String selectAskId(@RequestParam("taskId") String taskId); + @RequestMapping(value = "/bat-wkflow/busProcessModel/selectOnlineFile",method = RequestMethod.POST) + List selectOnlineFile(@RequestParam("taskId") String taskId); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 9b46d828..125e8ea5 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -434,4 +434,8 @@ public class workFlowFeignClientImpl { public String selectAskId(@RequestParam("taskId") String taskId) { return workFlowFeignClient.selectAskId(taskId); } + + public List selectOnlineFile(@RequestParam("taskId") String taskId) { + return workFlowFeignClient.selectOnlineFile(taskId); + } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 30cc6c3b..60587887 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -990,4 +990,10 @@ public class WorkFlowController { return workFlowFeignClient.selectAskId(taskId); } + @ApiOperation(value = "查找在线编辑文件") + @GetMapping("/selectOnlineFile") + public List selectOnlineFile(@RequestParam("taskId") String taskId) { + return workFlowFeignClient.selectOnlineFile(taskId); + } + } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java index 3435eca4..144dfb47 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java @@ -21,69 +21,42 @@ import java.io.Serializable; * @since 2021-09-17 */ @Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@ApiModel(value="BusProcessModelHis对象", description="流程模块历史表") public class BusProcessModelHis implements Serializable { private static final long serialVersionUID=1L; - @ApiModelProperty(value = "主键") - @TableId(value = "ID", type = IdType.UUID) private String id; - @ApiModelProperty(value = "标准id") - @TableField("STAND_ID") private String standId; - @ApiModelProperty(value = "处理人") - @TableField("USER_ID") private String userId; - @ApiModelProperty(value = "信息") - @TableField("MESG") private String mesg; - @ApiModelProperty(value = "节点信息") - @TableField("TASK_INFO") private String taskInfo; - @ApiModelProperty(value = "任务id") - @TableField("TASK_ID") private String taskId; - @ApiModelProperty(value = "流程实例id") - @TableField("P_ID") private String pId; - @ApiModelProperty(value = "流程名称") - @TableField("PRC_NAME") private String prcName; - @ApiModelProperty(value = "创建时间") - @TableField("CREATE_TIME") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private String createTime; - @ApiModelProperty(value = "更新时间") - @TableField("UPDATE_TIME") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private String updateTime; @ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑") - @TableField("EDIT_STATUS") private String editStatus; @ApiModelProperty(value = "onlyOffice 编辑文件存储路径") - @TableField("EDIT_FILE_PATH") private String editFilePath; @ApiModelProperty(value = "onlyOffice 编辑类型 node 节点编辑 count 汇总编辑") - @TableField("EDIT_TYPE") private String editType; @ApiModelProperty(value = "逻辑状态") - @TableField("FLAG") private String flag; @ApiModelProperty(value = "onlyOffice 访问编辑文件全路径") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index 04f87f35..0a2b0c06 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -15,11 +15,14 @@ import com.adc.da.common.ReadWordTable; import com.adc.da.slrs.standardSplit.entity.*; import com.adc.da.slrs.standardSplit.service.SarFileSplitInfoEOService; import com.adc.da.sys.common.SelectionResult; +import com.adc.da.sys.dao.DicEODao; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.sys.entity.DicTypeEO; +import com.adc.da.sys.entity.DictionaryEO; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.sys.util.LoginUserUtil; import com.adc.da.sys.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.ObjectUtils; @@ -97,7 +100,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService @Autowired private DicTypeEODao dicTypeEODao; @Autowired - private IDicTypeEOService dicTypeEOService; + private DicEODao dicEODao; @Override public List queryByPage(BasePage page) throws Exception{ @@ -743,11 +746,38 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } } + List arrayList = new ArrayList<>(); + List dictionaryEOS = dicEODao.selectbyInfo("lawsTextState"); + List dictionaryEOInfo = dicEODao.selectbyInfo("WBZTCLASS"); + List dictionaryEOSByInfo = dicEODao.selectbyInfo("TEXTSTATUSBUSS"); + if(!dictionaryEOS.isEmpty() && !dictionaryEOInfo.isEmpty() && !dictionaryEOSByInfo.isEmpty()){ + DictionaryEO dictionaryEO = dictionaryEOS.get(0); + DictionaryEO dictionaryEOYInfo = dictionaryEOInfo.get(0); + DictionaryEO dictionaryEOByInfo = dictionaryEOSByInfo.get(0); + + List dicTypeEOSi = dicTypeEODao.selectDic(dictionaryEO.getId()); + List dicTypeEOSt = dicTypeEODao.selectDic(dictionaryEOYInfo.getId()); + List dicTypeEOSy = dicTypeEODao.selectDic(dictionaryEOByInfo.getId()); + + for (DicTypeEO data: dicTypeEOSi){ + arrayList.add(data); + } + for (DicTypeEO data: dicTypeEOSt){ + arrayList.add(data); + } + for (DicTypeEO data: dicTypeEOSy){ + arrayList.add(data); + } + } + for (SarFileSplitInfoEO data : rows){ - List dicTypeEO = dicTypeEODao.selectPidByCode(data.getFileType()); - if(dicTypeEO!=null){ - //data.setFileTypeShow(dicTypeEO.get(0).getDicTypeName()); - } + for (DicTypeEO dic : arrayList){ + if(StringUtils.isNotBlank(data.getFileType())){ + if(data.getFileType().equals(dic.getDicTypeCode())){ + data.setFileTypeShow(dic.getDicTypeName()); + } + } + } } return rows; } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicEODao.java index 4697c837..eb4deec8 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicEODao.java @@ -47,4 +47,5 @@ public interface DicEODao extends BaseMapper { public List queryByList(DictionaryEOPage page); + List selectbyInfo(String info); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java index 2a62fec5..e45f277a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java @@ -90,4 +90,6 @@ public interface DicTypeEODao extends BaseMapper { List selectByPidInfo(@Param("pid") String pid); List selectPidByCode(@Param("fileType") String fileType); + + List selectDic(String id); } diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml index 35a53608..74e4b2af 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml @@ -640,4 +640,13 @@ WHERE DIC_TYPE_CODE = #{fileType} + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml index c8788318..efd36892 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml @@ -316,4 +316,8 @@ where SAR_STAND_ATTR_DETAILS.valid_flag =0 and TS_DICTIONARY.id=#{id} + +