fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
@@ -76,6 +76,7 @@ queryWrapper.like("complete_status", param.getCompleteStatus()); } queryWrapper.orderByDesc("id"); noticeInMapper.selectPage(page, queryWrapper); } @@ -270,7 +271,7 @@ if (StringUtils.isNotBlank(param.getCompleteStatus())) { queryWrapper.like("complete_status", param.getCompleteStatus()); } queryWrapper.orderByDesc("id"); noticeOutMapper.selectPage(page, queryWrapper); }
@@ -69,7 +69,7 @@ work.setDeptId(data.getDeptId()); work.setCompanyId(data.getCompanyId()); work.setUpdateTime(new Date()); work.setTitle("入库通知单审批"); work.setTitle(data.getName()+"-审批"); work.setConfId(conf.getId()); work.setStatus(WorkStatus.STATUS_30.getCode()); work.setReceiveTime(new Date()); @@ -114,7 +114,7 @@ work.setDeptId(data.getDeptId()); work.setCompanyId(data.getCompanyId()); work.setUpdateTime(new Date()); work.setTitle("出库通知单审批"); work.setTitle(data.getName()+"-审批"); work.setConfId(conf.getId()); work.setStatus(WorkStatus.STATUS_30.getCode()); work.setReceiveTime(new Date()); @@ -267,7 +267,7 @@ WorkNode nextNode = this.getNextNode(work.getNode(), conf); log.info("工单审批：{}，当前节点：{}，下一节点：{}", work.getTitle(), work.getNode(), nextNode); log.info("工单审批：{}，执行动作：{}，当前节点：{}，下一节点：{}", work.getTitle(), action, work.getNode(), nextNode); //通过操作 if ("pass".equals(action)) { @@ -280,6 +280,10 @@ work.setAssigneeId(process.getAssigneeId()); work.setNode(nextNode.getCode()); orderService.complete(work); }else{ work.setNode(nextNode.getCode()); work.setStatus(WorkStatus.STATUS_30.getCode()); orderService.updateData(work); } //增加审批记录 @@ -290,11 +294,30 @@ //拒绝操作 if ("refuse".equals(action)) { process.setAction("拒绝"); process.setNode(WorkNode.NODE_END.getCode()); process.setNode(work.getNode()); work.setStatus(WorkStatus.STATUS_60.getCode()); orderService.complete(work); //增加审批记录 orderProcessService.addData(process, true); return BaseResp.success(); } //异常处理 if ("error".equals(action)) { process.setAction("异常处理"); process.setNode(work.getNode()); work.setStatus(WorkStatus.STATUS_50.getCode()); // work.setAssigneeName(process.getAssigneeName()); // work.setAssigneeId(process.getAssigneeId()); orderService.complete(work); //增加审批记录 orderProcessService.addData(process, true);
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fzzy.igds.utils.ContextUtil; import com.fzzy.igds.utils.DateUtil; import com.fzzy.work.data.WorkNode; import com.fzzy.work.domain.WorkOrderProcess; import com.fzzy.work.mapper.WorkOrderProcessMapper; @@ -41,7 +42,7 @@ process.setId(ContextUtil.UUID()); process.setNode(WorkNode.NODE_END.getCode()); process.setRemark("流程结束"); process.setCreateTime(new Date()); process.setCreateTime(DateUtil.getNewByMinute(new Date(),1)); mapper.insert(process); } } fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
@@ -37,10 +37,6 @@ private WorkOrderMapper workOrderMapper; @Resource private InoutNoticeService noticeService; @Resource private InoutNoticeInMapper noticeInMapper; @Resource private InoutNoticeOutMapper noticeOutMapper; public void addData(WorkOrder data) { @@ -80,6 +76,7 @@ queryWrapper.lt("create_time", DateUtil.getCurZero(param.getEnd())); } queryWrapper.orderByDesc("id"); workOrderMapper.selectPage(page, queryWrapper); } @@ -180,8 +177,10 @@ selfTodo++; } if (null != work.getAssigneeId() && work.getAssigneeId().equals(user.getLoginName())) { if(!WorkNode.NODE_END.getCode().equals(work.getNode())){ selfTodo++; assignTodo++; } } if (DateUtil.isToday(work.getCreateTime())) { todayTodo++; @@ -204,11 +203,6 @@ queryWrapper.eq("company_id", user.getCompanyId()); //如果是个人工单，处理人为空或者为当前人 if (WorkOrderParam.SCOPE_SELF.equals(scope)) { queryWrapper.isNull("assignee_id").or().eq("assignee_id", user.getLoginName()); } //监管用户-查看所有库区和待办 if (Constant.USER_TYPE_10.equals(user.getUserType())) { if (WorkOrderParam.SCOPE_SELF.equals(scope)) { @@ -218,26 +212,32 @@ //库区用户，如果是公司用户可以查看公司下属所有库区，如果为当前库区只查询当前库区 if (Constant.USER_TYPE_30.equals(user.getUserType())) { if (WorkOrderParam.SCOPE_SELF.equals(scope)) { queryWrapper.eq("node", WorkNode.NODE1.getCode()); } if (ContextUtil.isDepotUser(user.getDeptId() + "")) { queryWrapper.eq("dept_id", user.getDeptId() + ""); } else { queryWrapper.likeRight("dept_id", user.getDeptId() + ""); } if (WorkOrderParam.SCOPE_SELF.equals(scope)) { queryWrapper.eq("node", WorkNode.NODE1.getCode()); } } //银行用户，根据合同查询银行下所有库区 if (Constant.USER_TYPE_20.equals(user.getUserType())) { //如果没有配置银行，设置一个不存在的银行号 if (StringUtils.isBlank(user.getUserData())) user.setUserData("9"); queryWrapper.eq("bank_id", user.getUserData()); if (WorkOrderParam.SCOPE_SELF.equals(scope)) { queryWrapper.eq("node", WorkNode.NODE3.getCode()); } } //如果是个人工单，处理人为空或者为当前人 if (WorkOrderParam.SCOPE_SELF.equals(scope)) { queryWrapper.isNull("assignee_id").or().eq("assignee_id", user.getLoginName()); } }
@@ -2,7 +2,6 @@ import com.bstek.dorado.annotation.DataProvider; import com.fzzy.igds.service.SysUserService; import com.fzzy.igds.utils.ContextUtil; import com.ruoyi.common.core.domain.entity.SysUser; import org.springframework.stereotype.Component;
@@ -108,14 +108,6 @@ <Property name="valueProperty">dictLabel</Property> </Property> </PropertyDef> <PropertyDef name="auditUser"> <Property></Property> <Property name="label">审核人</Property> </PropertyDef> <PropertyDef name="auditDate"> <Property name="dataType">DateTime</Property> <Property name="label">审批时间</Property> </PropertyDef> <PropertyDef name="completeStatus"> <Property></Property> <Property name="label">完成状态</Property> @@ -169,30 +161,6 @@ <Property name="valueProperty">name</Property> </Property> <Property name="visible">true</Property> </PropertyDef> <PropertyDef name="auditStatus"> <Property></Property> <Property name="label">审核状态</Property> <Property name="mapping"> <Property name="mapValues"> <Collection> <Entity> <Property name="name">监管审核</Property> <Property name="code">10</Property> </Entity> <Entity> <Property name="name">银行审核</Property> <Property name="code">20</Property> </Entity> <Entity> <Property name="name">已审核</Property> <Property name="code">30</Property> </Entity> </Collection> </Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> </PropertyDef> </DataType> </Model> fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
@@ -186,7 +186,7 @@ //汇总信息
 summaryCount = function(){
 view.get("#ajaxSummary").execute(function(result){
 console.log(result);
 //console.log(result);
 jQuery('#child-num1').text(result.selfTodo);
 jQuery('#child-num2').text(result.assignTodo);
 jQuery('#child-num3').text(result.todayTodo);
 @@ -237,9 +237,9 @@ var tabIndex = view.get("#tabMain.currentIndex");
 var cur = view.get("#dsMain.data:#");
 var dialog = view.get("#dialogMain");
 view.get('^btnTag').set('disabled',false);
 view.get('#btnTodo').set('disabled',false);
 if(1 == tabIndex){
 view.get('^btnTag').set('disabled',true);
 view.get('#btnTodo').set('disabled',true);
 }
 dialog.show();
 
 @@ -267,10 +267,12 @@ }
 view.get("#ajaxTodo").set('parameter',process).execute(function(result){
 if('200' != result.code){
 view.get('#dialogTodo').hide();
 $alert(result.message);
 }else{
 $alert("执行成功！");
 view.get('#dialogTodo').hide();
 view.get("#dialogMain").hide();
 query();
 }
 });
 @@ -722,38 +724,17 @@ </AutoForm> <ToolBar> <Fill/> <ToolBarButton> <ClientEvent name="onClick">var process = view.get("#dsProcess.data");
 process.set('action','pass')
 view.get("#dialogTodo").show();</ClientEvent> <Property name="caption">通过</Property> <Property name="width">80</Property> <ToolBarButton id="btnTodo"> <Property name="caption">工单审批</Property> <Property name="exClassName">btn1</Property> <Property name="iconClass">fa fa-check-circle</Property> <Property name="tags">btnTag</Property> </ToolBarButton> <ToolBarButton> <ClientEvent name="onClick">selectUser();</ClientEvent> <Property name="caption">转交</Property> <Property name="width">80</Property> <Property name="exClassName">btn2</Property> <Property name="iconClass">fa fa-check-circle</Property> <Property name="tags">btnTag</Property> </ToolBarButton> <ToolBarButton> <ClientEvent name="onClick">var process = view.get("#dsProcess.data");
 process.set('action','refuse')
 view.get("#dialogTodo").show();</ClientEvent> <Property name="caption">拒绝</Property> <Property name="width">80</Property> <Property name="exClassName">btn5</Property> <Property name="iconClass">fa fa-check-circle</Property> <Property name="tags">btnTag</Property> <Property name="menu">menus</Property> <Property name="width">120</Property> </ToolBarButton> <ToolBarButton> <ClientEvent name="onClick">view.get("#dialogMain").hide();</ClientEvent> <Property name="caption">关闭</Property> <Property name="width">80</Property> <Property name="width">120</Property> <Property name="exClassName">btn3</Property> <Property name="iconClass">fa fa-times-circle</Property> </ToolBarButton> @@ -891,5 +872,35 @@ <AjaxAction id="ajaxSummary"> <Property name="service">workOrderPR#pageSummary</Property> </AjaxAction> <Menu id="menus"> <MenuItem> <ClientEvent name="onClick">var process = view.get("#dsProcess.data");
 process.set('action','pass')
 view.get("#dialogTodo").show();</ClientEvent> <Property name="caption">审批通过</Property> <Property name="iconClass">fa fa-check</Property> </MenuItem> <MenuItem> <ClientEvent name="onClick">selectUser();</ClientEvent> <Property name="caption">转交处理</Property> <Property name="iconClass">fa fa-repeat</Property> </MenuItem> <MenuItem> <ClientEvent name="onClick">var process = view.get("#dsProcess.data");
 process.set('action','refuse')
 view.get("#dialogTodo").show();</ClientEvent> <Property name="caption">审批拒绝</Property> <Property name="iconClass">fa fa-times</Property> </MenuItem> <Separator/> <MenuItem> <ClientEvent name="onClick">var process = view.get("#dsProcess.data");
 process.set('action','error')
 view.get("#dialogTodo").show();</ClientEvent> <Property name="caption">异常处理</Property> <Property name="iconClass">fa fa-tags</Property> <Property name="tip">异常工单处理--直接流程结束</Property> </MenuItem> </Menu> </View> </ViewConfig>
