1、优化采购模块数量不能为小数点问题2、新增客服巡查巡楼记录功能模块3、新增页面导出功能4、优化记录查询条件新增时间段查询条件5、其他界面性调整

xiaogang

2024-01-13 be1b426b7d765a546f4a26b60e80aa49a57079b9

 service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowActivitiInnerServiceSMOImpl.java

@@ -9,14 +9,17 @@
import com.java110.dto.audit.AuditMessageDto;
import com.java110.dto.oaWorkflow.OaWorkflowDataDto;
import com.java110.dto.oaWorkflow.OaWorkflowXmlDto;
import com.java110.dto.purchase.PurchaseApplyDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.oaWorkflow.WorkflowDto;
import com.java110.dto.audit.AuditUser;
import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowDataInnerServiceSMO;
import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.oaWorkflow.OaWorkflowDataPo;
import com.java110.po.purchase.PurchaseApplyPo;
import com.java110.utils.exception.SMOException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
@@ -77,6 +80,8 @@
    @Autowired
    private IOaWorkflowDataInnerServiceSMO oaWorkflowDataInnerServiceSMOImpl;

    @Autowired
    private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;

    /**
     * 启动流程
@@ -134,6 +139,17 @@
            if (tmp.getProcessInstanceId().equals(reqJson.getString("processInstanceId"))) {
                task = tmp;//获取当前流程实例，当前申请人的待办任务
                break;
            }
        }
        if (task == null) {
            PurchaseApplyDto purchaseApplyDto = new PurchaseApplyDto();
            purchaseApplyDto.setApplyOrderId(reqJson.getString("id"));
            List<PurchaseApplyDto> purchaseApplyList = purchaseApplyInnerServiceSMOImpl.queryPurchaseApplys(purchaseApplyDto);
            if (purchaseApplyList != null && purchaseApplyList.size() == 1) {
                PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
                purchaseApplyPo.setApplyOrderId(reqJson.getString("id"));
                purchaseApplyPo.setStatusCd("1");
                purchaseApplyInnerServiceSMOImpl.updatePurchaseApply(purchaseApplyPo);
            }
        }
        Assert.notNull(task, "未找到当前用户任务userId = " + reqJson.getString("createUserId"));
@@ -284,8 +300,8 @@
     *
     * @param user 用户信息{
     *             processDefinitionKeys:[],
     *
     * }
     *             <p>
     *             }
     */
    public List<JSONObject> getDefinitionKeysUserTasks(@RequestBody AuditUser user) {
        TaskService taskService = processEngine.getTaskService();
@@ -714,6 +730,30 @@

    }

    /**
     * 获取当前节点信息
     *
     * @param reqJson{ taskId:'',
     *                 startUserId:''
     *                 }
     * @return
     */
    public JSONObject getCurrentNodeTask(@RequestBody JSONObject reqJson) {
        JSONObject curNode = new JSONObject();
        TaskService taskService = processEngine.getTaskService();
        Task task = taskService.createTaskQuery().taskId(reqJson.getString("taskId")).singleResult();
        if (task == null) {
            throw new IllegalArgumentException("任务已处理");
        }
        BpmnModel bpmnModel = repositoryService.getBpmnModel(task.getProcessDefinitionId());

        FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(task.getTaskDefinitionKey());
        flowNode.getName();

        curNode.put("curTaskName", flowNode.getName());
        return curNode;
    }

    @Override
    public List<JSONObject> nextAllNodeTaskList(@RequestBody JSONObject reqJson) {
        List<JSONObject> tasks = new ArrayList<>();