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

adc-da-activiti/src/main/java/com/adc/da/common/BusProcessName.java

@@ -56,4 +56,6 @@ public class BusProcessName implements Serializable {
     private String isEnd;
 
     private String taskBackAssignee;
+
+    private boolean showreceive;
 }

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

@@ -13,6 +13,7 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.common.Page;
 import com.adc.da.login.util.JwtUtils;
+import com.adc.da.slrs.StandardQA.service.Impl.SarAgenldAcceptButtonServiceImpl;
 import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao;
 import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
 import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanLogService;
@@ -83,6 +84,9 @@ public class WorkFlowController {
     @Autowired
     private IEsRevisePlanLogService esRevisePlanLogService;
 
+    @Autowired
+    private SarAgenldAcceptButtonServiceImpl sarAgenldAcceptButtonService;
+
 //    @Autowired
 //    private ExportExcelMapper exportExcelMapper;
 
@@ -259,6 +263,7 @@ public class WorkFlowController {
     @ApiOperation(value = "管控流程接收任务")
     @GetMapping("/acceptTack")
     public Integer acceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId) {
+        sarAgenldAcceptButtonService.add(taskId);
         return workFlowFeignClient.acceptTack(nowEsId,oaFlag,taskId);
     }
 
@@ -507,6 +512,16 @@ public class WorkFlowController {
             pageInfo.setCount(Long.valueOf(0));
             pageInfo.setPageSize(taskCommonQuery.getSize());
         }
+        for (BusProcessName data : pageInfo.getList()){
+            if(StringUtils.isNotBlank(data.getTaskIds())){
+                String s = sarAgenldAcceptButtonService.selectIsNot(data.getTaskIds());
+                if(s.equals("1")){
+                    data.setShowreceive(false);
+                }else {
+                    data.setShowreceive(true);
+                }
+            }
+        }
         return pageInfo;
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/SarAgenldAcceptButtonController.java

@@ -0,0 +1,30 @@
+package com.adc.da.slrs.StandardQA.controller;
+
+import com.adc.da.slrs.StandardQA.service.SarAgenldAcceptButtonService;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/${restPath}/lawss/SarAgenldAcceptButton")
+@Api(description = "|SarAgenldAcceptButton|")
+public class SarAgenldAcceptButtonController {
+
+    @Autowired
+    private SarAgenldAcceptButtonService sarAgenldAcceptButtonService;
+
+    @GetMapping("/selectIsNot")
+    public String selectIsNot(String pid){
+        return  sarAgenldAcceptButtonService.selectIsNot(pid);
+    }
+
+    @GetMapping("/add")
+    public ResponseMessage add(String id){
+        sarAgenldAcceptButtonService.add(id);
+        return Result.success();
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/SarAgenldAcceptButtonDao.java

@@ -0,0 +1,9 @@
+package com.adc.da.slrs.StandardQA.dao;
+
+import com.adc.da.slrs.StandardQA.entity.SarAgenldAcceptButton;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SarAgenldAcceptButtonDao extends BaseMapper<SarAgenldAcceptButton> {
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/SarAgenldAcceptButton.java

@@ -0,0 +1,43 @@
+package com.adc.da.slrs.StandardQA.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sar_agenld_accept_button")
+@ApiModel(value="SarAgenldAcceptButton对象", description="")
+@Data
+public class SarAgenldAcceptButton {
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "ID", type = IdType.UUID)
+    private String id;
+
+    @ApiModelProperty(value = "类型")
+    @TableField("TASK_ID")
+    private String taskId;
+
+    @ApiModelProperty(value = "类型")
+    @TableField("TYPE")
+    private String type;
+
+    @TableField("CREATE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @TableField("UPDATE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/Impl/SarAgenldAcceptButtonServiceImpl.java

@@ -0,0 +1,43 @@
+package com.adc.da.slrs.StandardQA.service.Impl;
+
+import com.adc.da.slrs.StandardQA.dao.SarAgenldAcceptButtonDao;
+import com.adc.da.slrs.StandardQA.entity.SarAgenldAcceptButton;
+import com.adc.da.slrs.StandardQA.service.SarAgenldAcceptButtonService;
+import com.adc.da.util.http.ResponseMessage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class SarAgenldAcceptButtonServiceImpl extends ServiceImpl<SarAgenldAcceptButtonDao, SarAgenldAcceptButton> implements SarAgenldAcceptButtonService {
+
+    @Autowired
+    private SarAgenldAcceptButtonDao sarAgenldAcceptButtonDao;
+
+    @Override
+    public String selectIsNot(String pid){
+         QueryWrapper<SarAgenldAcceptButton> objectQueryWrapper = new QueryWrapper<>();
+         objectQueryWrapper.eq("TASK_ID",pid);
+         List<SarAgenldAcceptButton> sarAgenldAcceptButtons = sarAgenldAcceptButtonDao.selectList(objectQueryWrapper);
+         if(!sarAgenldAcceptButtons.isEmpty()){
+             if(sarAgenldAcceptButtons.get(0).getType().equals("1")){
+                 return "1";
+             }
+         }
+        return "0";
+    }
+
+
+    public void add(String id) {
+        SarAgenldAcceptButton sarAgenldAcceptButton = new SarAgenldAcceptButton();
+        sarAgenldAcceptButton.setTaskId(id);
+        sarAgenldAcceptButton.setType("1");
+        sarAgenldAcceptButtonDao.insert(sarAgenldAcceptButton);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/SarAgenldAcceptButtonService.java

@@ -0,0 +1,10 @@
+package com.adc.da.slrs.StandardQA.service;
+
+import com.adc.da.util.http.ResponseMessage;
+
+public interface SarAgenldAcceptButtonService {
+
+    void add(String id);
+
+    String selectIsNot(String pid);
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java

@@ -17,8 +17,6 @@ import com.adc.da.slrs.standardSplit.service.SarFileSplitInfoEOService;
 import com.adc.da.sys.common.SelectionResult;
 import com.adc.da.sys.util.LoginUserUtil;
 import com.adc.da.sys.util.UUIDUtils;
-import com.adc.da.utils.util.InitStandAttrUtil;
-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;
@@ -37,7 +35,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import com.adc.da.common.SplitFilePragraTypeEnum;
 
@@ -184,8 +181,9 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
             String regex = "^[0-9]*$";
             for (IBodyElement element : elements) {
                 // 段落
+                XWPFParagraph p = null;
                 if (element instanceof XWPFParagraph) {
-                    XWPFParagraph p = (XWPFParagraph)element;
+                     p = (XWPFParagraph)element;
 
                     // 处理段落生成编号不识别问题
                     String paragraphString = p.getText();
@@ -660,8 +658,36 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
     }
 
     private void addItermsConditionsOfTable(SarFileSplitItemsEO message, List<SarFileSplitItemsValEO> itemsValList, XWPFTable table) throws IOException {
+        StringBuffer buffer = new StringBuffer();
         StringBuilder tabaleStringNew = new StringBuilder("");
         //将表格转为html字符串
+        int numberOfRows = table.getNumberOfRows();
+        for (int i = 0; i <numberOfRows ; i++) {
+             List<XWPFTableCell> tableCells = table.getRow(i).getTableCells();
+            for (int j = 0; j <tableCells.size() ; j++) {
+                 List<XWPFParagraph> paragraphs = tableCells.get(j).getParagraphs();
+                 for (XWPFParagraph data : paragraphs){
+                     for (XWPFRun xwrun : data.getRuns()) {
+                         VerticalAlign subscript = xwrun.getSubscript();
+                         String smalltext = xwrun.getText(0);
+                         if (ObjectUtils.isNotEmpty(smalltext)) {
+                             switch (subscript) {
+                                 case BASELINE:
+                                     xwrun.setText(smalltext);
+                                     break;
+                                 case SUBSCRIPT:
+                                     xwrun.setText("<span class=sub>" + smalltext + "</span>");
+                                     break;
+                                 case SUPERSCRIPT:
+                                     xwrun.setText("<span class=sup>" + smalltext + "</span>");
+                                     break;
+                             }
+                         }
+                     }
+                 }
+            }
+        }
+
         ReadWordTable readWordTable = new ReadWordTable();
         String tableStr = readWordTable.readTable(table);
         tabaleStringNew.append(tableStr);

adc-da-slrs/src/main/resources/mybatis/mapper/sarAgenIdAcceptButton/SarAgenIdAcceptButtonMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.StandardQA.dao.SarAgenldAcceptButtonDao">
+</mapper>