diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java index ac1bd5ae..1c490c3f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java @@ -15,6 +15,20 @@ public interface IProcessHandleService { **/ void startProcess(ProcessInfoVO processInfoVO); + /** + * @Author: liao + * @Date: 2023/11/6 11:56 + * @Description: 审批 + **/ + void approveTask(ProcessInfoVO processInfoVO, boolean pass); + + /** + * @Author: liao + * @Date: 2023/11/6 11:59 + * @Description: 判断是否存在任务 + **/ + void isTaskExist(String taskId); + /** * @Author: liao * @Date: 2023/11/3 10:45 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index 82ddac4a..9a5433d8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -65,6 +65,11 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl parameterMap = new HashMap<>(); parameterMap.put(FieldCommon.STANDARD_CLASS, processFbEntryChange.getStandardClass()); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index 137deb7f..4d75a967 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -9,6 +9,7 @@ import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.ProcessNodeLinkService; +import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.util.CurrentUserUtil; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.RepositoryService; @@ -17,6 +18,7 @@ import org.activiti.engine.TaskService; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -24,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Date; import java.util.Map; +import java.util.Objects; /** * @Author: liao @@ -84,6 +87,32 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { taskService.complete(taskId); } + /** + * @Author: liao + * @Date: 2023/11/6 11:56 + * @Description: 审批 + **/ + @Override + public void approveTask(ProcessInfoVO processInfoVO, boolean pass) { + + } + + /** + * @Author: liao + * @Date: 2023/11/6 12:00 + * @Description: 判断是否存在任务 + **/ + @Override + public void isTaskExist(String taskId) { + if (StringUtils.isBlank(taskId)) { + throw new JeroBootException(ResultCommon.EMPTY_COMMON, "taskId"); + } + Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); + if (Objects.isNull(task)) { + throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); + } + } + /** * @Author: liao * @Date: 2023/11/3 10:46 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 037a15a7..c5c88064 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -745,10 +745,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 添加更新记录 addUpdateRecord(fieldList, oldDataMap, recordBuffer, key, value); - // 如果value不为null和"",则拼接sql语句 - if (StringUtils.isNotBlank(value)) { - jointUpdateFieldAndValue(fieldList, updateBuilder, key, value, id, standardNumber); - } + // 拼接更新sql语句 + jointUpdateFieldAndValue(fieldList, updateBuilder, key, value, id, standardNumber); } // 操作数据库进行更新数据 lawsCommonMapper.commonEdit(tableName, updateBuilder.toString(), id);