Merge remote-tracking branch 'origin/master'

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyDto.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Data
 public class HrHireApplyDto extends OaFormDto {
     private static final long serialVersionUID = 4255707952292859284L;
-    private String userSid;
+//    private String userSid;
     @ApiModelProperty("是否是财务")
     private String isFinanceKey;
     private String isFinanceValue;

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java

@@ -44,8 +44,8 @@ public class HrHireApplyService extends MybatisBaseService<HrHireApplyMapper, Hr
     public ResultBean<HrHireApplyVo> getSaveInit(String userSid, String orgPath) {
         ResultBean<HrHireApplyVo> rb = ResultBean.fireFail();
         HrHireApplyVo hrHireApplyVo = new HrHireApplyVo();
-        hrHireApplyVo.setUserSid(userSid);
-        hrHireApplyVo.setOrgPath(orgPath);
+        hrHireApplyVo.setCreateBySid(userSid);
+        hrHireApplyVo.setOrgSidPath(orgPath);
         return rb.success().setData(hrHireApplyVo);
     }
 
@@ -62,8 +62,8 @@ public class HrHireApplyService extends MybatisBaseService<HrHireApplyMapper, Hr
         //根据部门sid获取orgPath并赋值
         SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData();
         String orgSidPath = organizationVo.getOrgSidPath();
-        hrHireApplyVo.setOrgPath(orgSidPath);
-        hrHireApplyVo.setUserSid(oaForm.getCreateBySid());
+        hrHireApplyVo.setOrgSidPath(orgSidPath);
+        hrHireApplyVo.setCreateBySid(oaForm.getCreateBySid());
         BeanUtil.copyProperties(hrHireApply, hrHireApplyVo);
         FormCommon isFinanceObj = FormCommon.of(hrHireApply.getIsFinanceKey(), hrHireApply.getIsFinanceValue());
         hrHireApplyVo.setIsFinanceObj(isFinanceObj);
@@ -96,13 +96,13 @@ public class HrHireApplyService extends MybatisBaseService<HrHireApplyMapper, Hr
             BeanUtil.copyProperties(dto, entity, "sid");
             dto.setBillNo("ZPXQ");
             dto.setSid(entity.getSid());
-            dto.setCreateBySid(dto.getUserSid());
+            dto.setCreateBySid(dto.getCreateBySid());
             ResultBean<String> resultBean = oaFormService.saveOaForm(dto);
             if (!resultBean.getSuccess()) {
                 return rb;
             }
             entity.setFormSid(resultBean.getData());
-            entity.setCreateBySid(dto.getUserSid());
+            entity.setCreateBySid(dto.getCreateBySid());
             baseMapper.insert(entity);
             sid = entity.getSid();
         } else {

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java

@@ -17,8 +17,10 @@ import java.util.List;
 public class HrHireApplyVo {
 
     private String sid;
-    private String userSid;
-    private String orgPath;
+  /*  private String userSid;
+    private String orgPath;*/
+    private String orgSidPath;
+    private String createBySid;
     @ApiModelProperty("是否是财务")
     private FormCommon isFinanceObj;
     private String isFinanceKey;

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

@@ -20,7 +20,8 @@ public class OaFormDto implements Dto {
     @ApiModelProperty("创建人sid")
     private String createBySid;
     @ApiModelProperty("组织机构全路径")
-    private String orgPath;
+//    private String orgPath;
+    private String orgSidPath;
     @ApiModelProperty("申请单编号的字母")
     private String billNo;
     @ApiModelProperty("sid")

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

@@ -77,7 +77,7 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
         // 将DTO中部分属性复制到oaForm中，忽略不需要的字段（如billNo, orgSidPath）
         BeanUtil.copyProperties(dto, oaForm, "billNo", "orgPath");
         try {
-            String orgSidPath = dto.getOrgPath();
+            String orgSidPath = dto.getOrgSidPath();
             // 获取组织信息，根据orgSidPath字段调用外部服务
             OrgVo orgVo = sysOrganizationFeign.getOrgByPath(orgSidPath).getData();
             // 如果组织信息为空，返回失败信息
@@ -211,7 +211,8 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
             BeanUtil.copyProperties(ufVo, oaFormFlowDto);
             updateFlow(oaFormFlowDto);
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-
+                // 更新办结日期
+                updateClosingDate(businessSid);
             } else {
                 //极光推送
                 oaForm = fetchBySid(businessSid);
@@ -249,6 +250,12 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
         }
     }
 
+    private void updateClosingDate(String businessSid) {
+        OaForm oaForm = fetchBySid(businessSid);
+        oaForm.setFinishTime(new Date());
+        baseMapper.updateById(oaForm);
+    }
+
     /**
      * 获取上一环节
      *
@@ -431,6 +438,7 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
                 if (businessTaskId.equals(dto.getTaskId())) {
                     FlowTaskVo flowTaskVo = new FlowTaskVo();
                     BeanUtil.copyProperties(dto, flowTaskVo);
+                    flowTaskVo.setInstanceId(dto.getProcInsId());
                     ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
                     if (!resultBean.getSuccess()) {
                         return rb.setMsg(resultBean.getMsg());
@@ -503,33 +511,39 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
         if (r == 1) {
             //启动流程
             ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
-            UpdateFlowFieldVo ufVo = voResultBean.getData();
-            OaFormFlowDto oaFormFlowDto = new OaFormFlowDto();
-            BeanUtil.copyProperties(ufVo, oaFormFlowDto);
-            updateFlow(oaFormFlowDto);
-            try {
-                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-                        .setNameFormat("demo-pool-%d").build();
-                ExecutorService pool = new ThreadPoolExecutor(2, 100,
-                        0L, TimeUnit.MILLISECONDS,
-                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-                Future future1 = pool.submit(() -> {
-                    //极光推送
-                    MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
-                    MessageFlowVo messageFlowVo = new MessageFlowVo();
-                    BeanUtil.copyProperties(ufVo, messageFlowVo);
-                    messageFlowableQuery.setUfVo(messageFlowVo);
-                    messageFlowableQuery.setAppMap((Map<String, Object>) bv.getFormVariables().get("app"));
-                    messageFlowableQuery.setBusinessSid(dto.getBusinessSid());
-                    messageFlowableQuery.setModuleName(oaForm.getFormType());
-                    messageFlowableQuery.setMsgContent(oaForm.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-                    messageFlowableQuery.setMsgTitle(oaForm.getFormType());
-                    messageFeign.pushMessage(messageFlowableQuery);
-                });
-            } catch (Exception e) {
-                e.printStackTrace();
+            if (voResultBean.getSuccess()) {
+                UpdateFlowFieldVo ufVo = voResultBean.getData();
+                OaFormFlowDto oaFormFlowDto = new OaFormFlowDto();
+                BeanUtil.copyProperties(ufVo, oaFormFlowDto);
+                updateFlow(oaFormFlowDto);
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                            0L, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    Future future1 = pool.submit(() -> {
+                        //极光推送
+                        MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                        MessageFlowVo messageFlowVo = new MessageFlowVo();
+                        BeanUtil.copyProperties(ufVo, messageFlowVo);
+                        messageFlowableQuery.setUfVo(messageFlowVo);
+                        messageFlowableQuery.setAppMap((Map<String, Object>) bv.getFormVariables().get("app"));
+                        messageFlowableQuery.setBusinessSid(dto.getBusinessSid());
+                        messageFlowableQuery.setModuleName(oaForm.getFormType());
+                        messageFlowableQuery.setMsgContent(oaForm.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                        messageFlowableQuery.setMsgTitle(oaForm.getFormType());
+                        messageFeign.pushMessage(messageFlowableQuery);
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                return voResultBean;
+            } else {
+                return rb.setMsg(voResultBean.getMsg());
             }
-            return voResultBean;
+
+
         } else if (r == 2) {
             BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto();
             BeanUtil.copyProperties(bv, businessVariablesDto);