oaMendApply申请新增修改为与oaform表单关联的方法，重构新增修改方法

yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java

@@ -74,10 +74,8 @@ public class OaMendApplyRest {
 
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
-	public ResultBean save(@RequestBody OaMendApplyDto dto){
+	public ResultBean<String> save(@RequestBody OaMendApplyDto dto){
-		ResultBean rb = ResultBean.fireFail();
+		return oaMendApplyService.saveOrUpdateDto(dto);
-		oaMendApplyService.saveOrUpdateDto(dto);
-		return rb.success();
 	}
 
 	@ApiOperation("根据sid批量删除")

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

@@ -15,7 +15,7 @@ import java.util.Date;
 public class OaFormDto {
 
     private String sid;
-
+    private String createBySid;
     @ApiModelProperty("创建人")
     private String createByName;
     @ApiModelProperty("公司sid")

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Map;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -17,4 +19,6 @@ public interface OaFormMapper extends BaseMapper<OaForm> {
     OaFormDetailsVo fetchDetailsBySid(String sid);
 
     IPage<OaFormVo> selectPageVo(IPage<OaForm> page, @Param(Constants.WRAPPER) QueryWrapper<OaForm> qw);
+
+    int updateFlowFiled(Map<String, Object> map);
 }

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

@@ -15,4 +15,20 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <update id="updateFlowFiled">
+        UPDATE oa_form
+        SET nodeState=#{nodeState}
+        , nodeId=#{taskDefKey}
+        <if test="procDefId != null and procDefId != ''">
+            , procDefId=#{procDefId}
+        </if>
+        <if test="procInsId != null and procInsId != ''">
+            , procInstId=#{procInsId}
+        </if>
+        <if test="taskId != null and taskId != ''">
+            , taskId=#{taskId}
+        </if>
+        WHERE sid = #{sid}
+    </update>
 </mapper>

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

@@ -7,6 +7,7 @@ import com.yxt.anrui.oa.biz.oahireapply.OaHireApplyDetailsVo;
 import com.yxt.anrui.oa.biz.oaleaveapply.OaLeaveApply;
 import com.yxt.anrui.oa.biz.oaleaveapply.OaLeaveApplyQuery;
 import com.yxt.anrui.oa.biz.oaleaveapply.OaLeaveApplyVo;
+import com.yxt.anrui.oa.feign.flowable.flow.UpdateFlowFieldVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -16,6 +17,8 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -62,4 +65,8 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
         delBySids(sids);
         return rb.success();
     }
+
+    public int updateFlow(Map<String, Object> map) {
+        return baseMapper.updateFlowFiled(map);
+    }
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java

@@ -29,7 +29,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.anrui.oa.biz.oaform.OaForm;
 import com.yxt.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -53,32 +55,35 @@ import lombok.Data;
 public class OaMendApply extends OaForm {
     private static final long serialVersionUID = 1L;
     private String formSid;
-	@ApiModelProperty("单据编号")
+    @ApiModelProperty("补卡时间")
-    private String billNo; // 单据编号
+    private String time;
-	@ApiModelProperty("申请人")
+
-    private String createByName; // 申请人
+
-	@ApiModelProperty("申请部门sid")
+   /* @ApiModelProperty("单据编号")
-    private String deptSid; // 申请部门sid
+    private String billNo;
-	@ApiModelProperty("申请部门名称")
+    @ApiModelProperty("申请人")
-    private String deptName; // 申请部门名称
+    private String createByName;
-	@ApiModelProperty("补卡时间")
+    @ApiModelProperty("申请部门sid")
-    private String time; // 补卡时间
+    private String deptSid;
-	@ApiModelProperty("分公司sid")
+    @ApiModelProperty("申请部门名称")
-    private String useOrgSid; // 分公司sid
+    private String deptName;
-	@ApiModelProperty("分公司名称")
+
-    private String useOrgName; // 分公司名称
+    @ApiModelProperty("分公司sid")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private String useOrgSid;
-	@ApiModelProperty("办结日期")
+    @ApiModelProperty("分公司名称")
-    private Date finishTime; // 办结日期
+    private String useOrgName;
-	@ApiModelProperty("实例id")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private String procInstId; // 实例id
+    @ApiModelProperty("办结日期")
-	@ApiModelProperty("流程定义id")
+    private Date finishTime;
-    private String procDefId; // 流程定义id
+    @ApiModelProperty("实例id")
-	@ApiModelProperty("任务id")
+    private String procInstId;
-    private String taskId; // 任务id
+    @ApiModelProperty("流程定义id")
-	@ApiModelProperty("环节id")
+    private String procDefId;
-    private String nodeId; // 环节id
+    @ApiModelProperty("任务id")
-	@ApiModelProperty("流程状态")
+    private String taskId;
-    private String nodeState; // 流程状态
+    @ApiModelProperty("环节id")
+    private String nodeId;
+    @ApiModelProperty("流程状态")
+    private String nodeState;*/
 
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java

@@ -64,30 +64,30 @@ public class OaMendApplyDto implements Dto {
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("申请人")
-    private String createByName; // 申请人
+    private String createByName;
 	@ApiModelProperty("申请部门sid")
-    private String deptSid; // 申请部门sid
+    private String deptSid;
 	@ApiModelProperty("申请部门名称")
-    private String deptName; // 申请部门名称
+    private String deptName;
 	@ApiModelProperty("补卡时间")
-    private String time; // 补卡时间
+    private String time;
 	@ApiModelProperty("分公司sid")
-    private String useOrgSid; // 分公司sid
+    private String useOrgSid;
 	@ApiModelProperty("分公司名称")
-    private String useOrgName; // 分公司名称
+    private String useOrgName;
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("办结日期")
     private Date finishTime;
 	@ApiModelProperty("实例id")
-    private String procInstId; // 实例id
+    private String procInstId;
 	@ApiModelProperty("流程定义id")
-    private String procDefId; // 流程定义id
+    private String procDefId;
 	@ApiModelProperty("任务id")
-    private String taskId; // 任务id
+    private String taskId;
 	@ApiModelProperty("环节id")
-    private String nodeId; // 环节id
+    private String nodeId;
 	@ApiModelProperty("流程状态")
-    private String nodeState; // 流程状态
+    private String nodeState;
     @ApiModelProperty("图片")
     private List<String> files = new ArrayList<>();
 }