合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!36

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -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);
 }

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<BusProcessModelHis> selectOnlineFile(@RequestParam("taskId") String taskId) {
+        return workFlowFeignClient.selectOnlineFile(taskId);
+    }
 }

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<BusProcessModelHis> selectOnlineFile(@RequestParam("taskId") String taskId) {
+        return workFlowFeignClient.selectOnlineFile(taskId);
+    }
+
 }

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 访问编辑文件全路径")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -2782,7 +2782,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                          countSuccess++;
                      }
                  }catch (Exception e){
-                     return Result.error("导入失败，请查看导入的数据是否有问题");
+                     return Result.error("导入失败，请查看导入的数据是否有问题或导入的企标标号或企标名称重复");
                  }
 
                  String msg = "成功导入" + countSuccess + "条";
@@ -2887,19 +2887,19 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
 //            sarBussionessStand.setStandCode(standCode);
 //            // 根据标准号判断数据是否已存在
 //            //2021年4月9日 此处检查当前是否存在standId
-//            QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
+            QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
-//            queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
+            queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
-//                    .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
+                    .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
-//            List<SarBussionessStand> list = iSarBussionessStandService.list(queryWrapper);
+            List<SarBussionessStand> list = iSarBussionessStandService.list(queryWrapper);
-//            Integer valIdFlag = 0;
+            Integer valIdFlag = 0;
-//            for (SarBussionessStand stand :list){
+            for (SarBussionessStand stand :list){
-//                if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
+                if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
-//                    valIdFlag = stand.getValidFlag();
+                    valIdFlag = stand.getValidFlag();
-//                    if (valIdFlag == 0){
+                    if (valIdFlag == 0){
-//                        throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
+                        throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
-//                    }
+                    }
-//                }
+                }
-//            }
+            }
 
             //此处判断是否是带入的标准
             if(StringUtils.isNotBlank(sarBussionessStand.getId())) {

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<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());
+           for (DicTypeEO dic : arrayList){
-            if(dicTypeEO!=null){
+               if(StringUtils.isNotBlank(data.getFileType())){
-                //data.setFileTypeShow(dicTypeEO.get(0).getDicTypeName());
+                   if(data.getFileType().equals(dic.getDicTypeCode())){
-            }
+                       data.setFileTypeShow(dic.getDicTypeName());
+                   }
+               }
+           }
         }
         return rows;
     }

adc-da-sys/src/main/java/com/adc/da/sys/dao/DicEODao.java

@@ -47,4 +47,5 @@ public interface DicEODao extends BaseMapper<DictionaryEO> {
 
 	public List<DictionaryEO> queryByList(DictionaryEOPage page);
 
+	List<DictionaryEO> selectbyInfo(String info);
 }

adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java

@@ -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);
 }

adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml

@@ -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>

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