Merge remote-tracking branch 'origin/master'

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java

@@ -120,8 +120,10 @@ public class AdGroupSystemApplyService extends MybatisBaseService<AdGroupSystemA
         AdGroupSystemApplyVo.setOrgSidPath(orgSidPath);
         AdGroupSystemApplyVo.setCreateBySid(oaForm.getCreateBySid());
         BeanUtil.copyProperties(AdGroupSystemApply, AdGroupSystemApplyVo);
-        List<String> files = oaAppendixService.selectByLinkSid(sid);
+        List<String> files = oaAppendixService.selectByLinkSid(AdGroupSystemApplyVo.getSid(), "图片");
+        List<String> appes = oaAppendixService.selectByLinkSid(AdGroupSystemApplyVo.getSid(), "文件");
         AdGroupSystemApplyVo.setFiles(files);
+        AdGroupSystemApplyVo.setAppes(appes);
         AdGroupSystemApplyVo.setSid(sid);
         String approverSid = AdGroupSystemApply.getApproversSid();
         String approverName = AdGroupSystemApply.getApproversName();
@@ -132,6 +134,7 @@ public class AdGroupSystemApplyService extends MybatisBaseService<AdGroupSystemA
             FormCommon formCommon = FormCommon.of(approversSid.get(i), approversName.get(i));
             approverss.add(formCommon);
         }
+        AdGroupSystemApplyVo.setApprovers(approverss);
         String roleSids = getRoleSids();
         AdGroupSystemApplyVo.setRoleSids(roleSids);
         return rb.success().setData(AdGroupSystemApplyVo);
@@ -209,7 +212,7 @@ public class AdGroupSystemApplyService extends MybatisBaseService<AdGroupSystemA
         ResultBean rb = ResultBean.fireFail();
         ResultBean<String> stringResultBean = saveOrUpdateDto(dto);
         if (!stringResultBean.getSuccess()) {
-            return rb.setMsg(stringResultBean.getData());
+            return rb.setMsg(stringResultBean.getMsg());
         }
         String businessSid = stringResultBean.getData();
         SubmitDto submitDto = new SubmitDto();
@@ -294,8 +297,8 @@ public class AdGroupSystemApplyService extends MybatisBaseService<AdGroupSystemA
         appMap.put("recallUrl", "oa/v1/oaform/revokeProcess");
         appMap.put("signUrl", "oa/v1/oaform/delegate");
         appMap.put("transferUrl", "oa/v1/oaform/assignTask");*/
-        appMap.put(OaFormUrlEnum.GROUPSYSTEM_EDIT.getType(), OaFormUrlEnum.GROUPSYSTEM_EDIT.getUrl() + sid);
+        appMap.put(OaFormUrlEnum.GROUPSYSTEM_EDIT.getType(), OaFormUrlEnum.GROUPSYSTEM_EDIT.getUrl() + "?sid=" + sid);
-        appMap.put(OaFormUrlEnum.GROUPSYSTEM_DETAIL.getType(), OaFormUrlEnum.GROUPSYSTEM_DETAIL.getUrl() + sid);
+        appMap.put(OaFormUrlEnum.GROUPSYSTEM_DETAIL.getType(), OaFormUrlEnum.GROUPSYSTEM_DETAIL.getUrl() + "?sid=" + sid);
         appMap.put(OaFormUrlEnum.GROUPSYSTEM_FLOWOPERATEURL.getType(), OaFormUrlEnum.GROUPSYSTEM_FLOWOPERATEURL.getUrl());
         appMap.put(OaFormUrlEnum.GROUPSYSTEM_AGREEURL.getType(), OaFormUrlEnum.GROUPSYSTEM_AGREEURL.getUrl());
         appMap.put(OaFormUrlEnum.STOPURL.getType(), OaFormUrlEnum.STOPURL.getUrl());

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java

@@ -89,7 +89,7 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
         // 创建OA表单对象
         OaForm oaForm = new OaForm();
         // 将DTO中部分属性复制到oaForm中，忽略不需要的字段（如billNo, orgSidPath）
-        BeanUtil.copyProperties(dto, oaForm, "billNo", "orgSidPath");
+        BeanUtil.copyProperties(dto, oaForm, "billNo", "orgSidPath", "title", "remarks");
         try {
             String orgSidPath = dto.getOrgSidPath();
             // 获取组织信息，根据orgSidPath字段调用外部服务
@@ -213,7 +213,7 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
         if (!businessVariablesResultBean.getSuccess()) {
             return rb.setMsg(businessVariablesResultBean.getMsg());
         }
-        BeanUtil.copyProperties(businessVariablesResultBean.getData(), bv, "taskDefKey", "taskId");
+        BeanUtil.copyProperties(businessVariablesResultBean.getData(), bv, "taskDefKey", "taskId", "comment");
         bv.setInstanceId(oaForm.getProcInstId());
         if (oaForm.getTaskId().contains(bv.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flow3Feign.handleProsess(bv);

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormUrlEnum.java

@@ -34,11 +34,11 @@ public enum OaFormUrlEnum {
     /**
      * 集团制度会签详情
      */
-    GROUPSYSTEM_DETAIL(InnerEnum.rejectUrl.printValue(), "approval/#/pages/oa/DetailGroupSystemApplyActivity"),
+    GROUPSYSTEM_DETAIL(InnerEnum.detailUrl.printValue(), "approval/#/pages/oa/DetailGroupSystemApplyActivity"),
     /**
      * 集团制度会签修改
      */
-    GROUPSYSTEM_EDIT(InnerEnum.rejectUrl.printValue(), "approval/#/pages/oa/EditGroupSystemApplyActivity"),
+    GROUPSYSTEM_EDIT(InnerEnum.editUrl.printValue(), "approval/#/pages/oa/EditGroupSystemApplyActivity"),
 
     /**
      * 获取操作标题接口地址