Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

2023-04-04 23:38:45 +08:00
parent 4f02559c1a c9708f03f5
commit 1bbc5df6c7
9 changed files with 63 additions and 32 deletions
@@ -481,4 +481,6 @@ public interface workFlowFeignClient {
    List<BusProcessNew> 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<BusProcessModelHis> selectOnlineFile(@RequestParam("taskId") String taskId);
 }
@@ -434,4 +434,8 @@ public class workFlowFeignClientImpl {
    public String selectAskId(@RequestParam("taskId") String taskId) {
        return workFlowFeignClient.selectAskId(taskId);
    }
+
+    public  List<BusProcessModelHis> selectOnlineFile(@RequestParam("taskId") String taskId) {
+        return workFlowFeignClient.selectOnlineFile(taskId);
+    }
 }
@@ -990,4 +990,10 @@ public class WorkFlowController {
        return workFlowFeignClient.selectAskId(taskId);
    }

+    @ApiOperation(value = "查找在线编辑文件")
+    @GetMapping("/selectOnlineFile")
+    public List<BusProcessModelHis> selectOnlineFile(@RequestParam("taskId") String taskId) {
+        return workFlowFeignClient.selectOnlineFile(taskId);
+    }
+
 }
@@ -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 访问编辑文件全路径")
@@ -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<SarFileSplitInfoEO> queryByPage(BasePage page) throws Exception{
@@ -743,11 +746,38 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
            }
        }

+        List<DicTypeEO> arrayList = new ArrayList<>();
+        List<DictionaryEO> dictionaryEOS = dicEODao.selectbyInfo("lawsTextState");
+        List<DictionaryEO> dictionaryEOInfo = dicEODao.selectbyInfo("WBZTCLASS");
+        List<DictionaryEO> 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<DicTypeEO> dicTypeEOSi = dicTypeEODao.selectDic(dictionaryEO.getId());
+             List<DicTypeEO> dicTypeEOSt = dicTypeEODao.selectDic(dictionaryEOYInfo.getId());
+             List<DicTypeEO> 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> 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;
    }
@@ -47,4 +47,5 @@ public interface DicEODao extends BaseMapper<DictionaryEO> {

 	public List<DictionaryEO> queryByList(DictionaryEOPage page);

+	List<DictionaryEO> selectbyInfo(String info);
 }
@@ -90,4 +90,6 @@ public interface DicTypeEODao extends BaseMapper<DicTypeEO> {
    List<DicTypeEO> selectByPidInfo(@Param("pid") String pid);

    List<DicTypeEO> selectPidByCode(@Param("fileType") String fileType);
+
+    List<DicTypeEO> selectDic(String id);
 }
@@ -640,4 +640,13 @@
        WHERE
            DIC_TYPE_CODE = #{fileType}
    </select>
+
+    <select id="selectDic"  resultType="com.adc.da.sys.entity.DicTypeEO">
+        SELECT
+            *
+        FROM
+            ts_dictype
+        WHERE
+            DIC_ID = #{id}
+    </select>
 </mapper>
@@ -316,4 +316,8 @@
 		where SAR_STAND_ATTR_DETAILS.valid_flag =0 and TS_DICTIONARY.id=#{id}
 	</select>

+	<select id="selectbyInfo" resultType="com.adc.da.sys.entity.DictionaryEO">
+			select  id from TS_DICTIONARY where DICTIONARY_CODE = #{info}
+	</select>
+
 </mapper>