合并分支 'dev_20230216' 到 'master'

Dev 20230216

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

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

@@ -490,4 +490,6 @@ public interface workFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/questionsAndAnswers",method = RequestMethod.GET)
     ResponseMessage<BusProcessNew> questionsAndAnswers(@RequestParam("askId") String askId, @RequestParam("answerer") String answerer);
+    @RequestMapping(value = "/bat-wkflow/deleteOATask",method = RequestMethod.GET)
+    String deleteOATask(@RequestParam("pId")  String pId);
 }

adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java

@@ -446,4 +446,8 @@ public class workFlowFeignClientImpl {
     public ResponseMessage<BusProcessNew> questionsAndAnswers(@RequestParam("askId") String askId,@RequestParam("answerer") String answerer) {
         return workFlowFeignClient.questionsAndAnswers(askId,answerer);
     }
+
+    public String deleteOATask(@RequestParam("pId")  String pId) {
+        return workFlowFeignClient.deleteOATask(pId);
+    }
 }

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

@@ -23,6 +23,8 @@ import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
 import com.adc.da.slrs.sarUser.entity.TsUser;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
 import com.adc.da.sys.common.EmailUtils;
+import com.adc.da.sys.dao.DicTypeEODao;
+import com.adc.da.sys.entity.DicTypeEO;
 import com.adc.da.sys.entity.UserEO;
 import com.adc.da.sys.service.IUserEOService;
 import com.adc.da.util.LoginUserUtil;
@@ -96,6 +98,9 @@ public class WorkFlowController {
     @Autowired
     private TsInstitutionDao tsInstitutionDao;
 
+    @Autowired
+    private DicTypeEODao dicTypeEODao;
+
 //    @Autowired
 //    private ExportExcelMapper exportExcelMapper;
 
@@ -1128,23 +1133,19 @@ public class WorkFlowController {
             qbfsForm.put("isRelate",data.getIsRelate());
             qbfsForm.put("useLevel",data.getUseLevel());
 
-            String useLevelNameStr = "";
             if(StringUtils.isNotBlank(data.getUseLevel())){
-                 String[] split = data.getUseLevel().split(",");
+                List<DicTypeEO> dicTypeEOS = dicTypeEODao.selectDic("VBERTFDGGF");
-                 List<String> asList = Arrays.asList(split);
+                if(!dicTypeEOS.isEmpty()) {
-                 for (String uid: asList){
+                    for (DicTypeEO dicInfo:dicTypeEOS) {
-                     TsUser byIdUseLevel = userService.getById(uid);
+                        if(data.getUseLevel().equals(dicInfo.getDicTypeCode())){
-                     if(StringUtils.isBlank(useLevelNameStr)){
+                            qbfsForm.put("useLevelName",dicInfo.getDicTypeName());
-                         useLevelNameStr = byIdUseLevel.getUname();
+                        }
-                     }else {
+                    }
-                         useLevelNameStr = useLevelNameStr+","+byIdUseLevel.getUname();
+                }
-                     }
+
-                 }
-            }
-            if(StringUtils.isNotBlank(useLevelNameStr)){
-                qbfsForm.put("useLevelName",useLevelNameStr);
             }
 
+
             qbfsForm.put("technologic",data.getTechnologic());
             qbfsForm.put("bussSort",data.getBussSort());
             qbfsForm.put("lxdName","");
@@ -1209,4 +1210,16 @@ public class WorkFlowController {
     public ResponseMessage<BusProcessNew> questionsAndAnswers(@RequestParam("askId") String askId,@RequestParam("answerer") String answerer) {
         return workFlowFeignClient.questionsAndAnswers(askId,answerer);
     }
+
+    @ApiOperation(value = "删除OA代办任务 pid")
+    @GetMapping("/deleteOATask")
+    public String deleteOATask(@RequestParam("pIds") String pIds) {
+        if(StringUtils.isNotBlank(pIds)){
+            String[] split = pIds.split(",");
+            for (String pId: split){
+                workFlowFeignClient.deleteOATask(pId);
+            }
+        }
+        return "1";
+    }
 }

adc-da-slrs/src/main/resources/mysql/interfaceLog.sql

@@ -0,0 +1,18 @@
+-- 福田  需要通过第三方调用的接口
+
+
+
+-- 2023-04-18
+-- 名称  通过pid删除OA待办任务
+-- 详情
+-- 路径 http://localhost:9090/api/lawss/activiti/deleteOATask
+-- 参数 String pIds (pIds 字符串拼接 逗号隔开)
+-- 类型 Get
+
+-- 2023-04-18
+-- 名称 调用此接口走流程
+-- 详情 手动数据库加入企标计划 调用此接口使其走流程
+-- 路径 http://localhost:9090/api/lawss/activiti/batchToDoTasks
+-- 参数 String json (字符串类型的json，需要包含ids，prcCreateUser（不能为空即可）) 以起草人为发起人
+-- 类型 Get
+