修改任务审批接口

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java

@@ -45,6 +45,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.ObjectUtils;
 import org.flowable.bpmn.constants.BpmnXMLConstants;
 import org.flowable.bpmn.model.*;
 import org.flowable.bpmn.model.Process;
@@ -457,38 +458,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             if (taskVO.getApprovd()) {
                 //进入下一个节点
                 taskService.complete(task.getId(), variables);
-                //判断是否存在表单二次提交
-                if (StringUtils.isNotBlank(taskVO.getDocumentation()) && taskVO.getDocumentation().equals(SystemConstantsOa.OA_TASK_COMPLETE_FORM)) {
-                    //获取流程类型
-                    String category = processDefinition.getCategory();
-                    if (StringUtils.isNotBlank(category)) {
-                        Category categoryDto = this.categoryService.getCategory(category);
-                        //解析页面请求，并持久化
-                        IFormCustomService iFormCustomService = SpringUtils.getBean(categoryDto.getServicename());
-
-                        //TODO 如果更新失败，需要撤销流程
-                        if (null == iFormCustomService.editForm(request, taskVO.getFormid())) {
-                            //撤销审批
-
-                        }
-                    }
-                }
-                //判断是否存在表单三次提交
-                if (StringUtils.isNotBlank(taskVO.getDocumentation()) && taskVO.getDocumentation().equals(SystemConstantsOa.OA_TASK_COMPLETE_THREE_FORM)) {
-                    //获取流程类型
-                    String category = processDefinition.getCategory();
-                    if (StringUtils.isNotBlank(category)) {
-                        Category categoryDto = this.categoryService.getCategory(category);
-                        //解析页面请求，并持久化
-                        IFormCustomService iFormCustomService = SpringUtils.getBean(categoryDto.getServicename());
-
-                        //TODO 如果更新失败，需要撤销流程
-                        if (null == iFormCustomService.editForm(request, taskVO.getFormid())) {
-                            //撤销审批
-
-                        }
-                    }
-                }
                 updateAssignee(task.getProcessInstanceId(), task.getProcessDefinitionId(), processDefinition);
                 String category = processDefinition.getCategory();
                 Category categoryDto = this.categoryService.getCategory(category);
@@ -499,14 +468,16 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 if (null != taskList && !taskList.isEmpty()) {
                     taskData = taskList.get(0);
                 }
-                //判断节点上的描述字段，是否伟finale_judgment,如果是，记录到终审表中，如果终审表已经存在，不再重复记录
+                if (ObjectUtils.isEmpty(taskData)) {
-                if (null != taskData && StringUtils.isNotBlank(taskData.getDescription()) && taskData.getDescription().equals(SystemConstantsOa.OA_TASK_COMPLETE_FINALE_FORM)) {
-                    User user = userService.findByLoginname(formData.getAssignee());
-                    userFinalService.save(user.getId().toString(), taskVO.getFormid());
                     model.setFinishtime(System.currentTimeMillis());
                     model.setStates(SystemConstantsOa.OA_STATUS_TYPE_END);
                     ocrTaskchildPictureService.updateById(model);
                 } else {
+                    //判断节点上的描述字段，是否伟finale_judgment,如果是，记录到终审表中，如果终审表已经存在，不再重复记录
+                    if (StringUtils.isNotBlank(taskData.getDescription()) && taskData.getDescription().equals(SystemConstantsOa.OA_TASK_COMPLETE_FINALE_FORM)) {
+                        User user = userService.findByLoginname(formData.getAssignee());
+                        userFinalService.save(user.getId().toString(), taskVO.getFormid());
+                    }
                     OcrTaskchildPicture childPicture = ocrTaskchildPictureService.getById(Long.parseLong(taskVO.getFormid()));
                     UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
                     cn.jyjz.xiaoyao.common.base.vo.User byLoginname = userTokenService.findByLoginname(childPicture.getAssignee());
@@ -541,7 +512,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 //3、修改业务表状态
                 //判断业务key是否存在
                 if (StringUtils.isNotBlank(businesskey)) {
-
                     String assignee = "";
                     BpmnModel bpmnModel = repositoryService.getBpmnModel(task.getProcessDefinitionId());
                     //传节点定义key获取当前节点

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java

@@ -342,7 +342,9 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
     @TableField(value = "submit_date_timestamp")
     private Long submitDateTimestamp;
 
-
+    @ApiModelProperty(value = "任务状态")
+    @TableField(exist = false)
+    private Integer states;
     @ApiModelProperty(value = "可疑文件夹 0:不在，1：在")
     @Schema(description = "可疑文件夹 0:不在，1：在")
     @TableField(value = "suspiciousfile")

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml

@@ -65,6 +65,8 @@
 		<result column="field17" property="field17" jdbcType="VARCHAR"/>
 		<result column="field18" property="field18" jdbcType="VARCHAR"/>
 		<result column="suspiciousfile" property="suspiciousfile" jdbcType="INTEGER"/>
+		<result column="states" property="states" jdbcType="INTEGER"/>
+
 		<association property="pictureInfo" javaType="cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo">
 			<result column="pictureid" property="pictureId"/>
 			<result column="img_size" property="imgSize"/>
@@ -218,10 +220,11 @@
 	</sql>
 
 	<select id="getPackagePictureInfo" resultMap="BaseResultMap">
-        SELECT t2.*,t3.*
+        SELECT t2.*,t3.*,t4.STATES
         FROM ocr_check_duplicate_result t1
                  LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID
 		left join ocr_picture_info t3 on t2.ID=t3.picture_id
+		left join ocr_taskchild_picture t4 on t2.ID=t4.PICTUREID
         where t1.check_duplicate_id = #{packageId}
 		<if test="pictureId != null and pictureId != ''">
 			and t1.picture_id = #{pictureId}