| fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SysUserService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/DateUtil.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fzzy-igdss-view/src/main/java/com/fzzy/igds/CommonPR.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fzzy-igdss-view/src/main/java/models/core.model.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SysUserService.java
@@ -1,5 +1,6 @@ package com.fzzy.igds.service; import com.fzzy.igds.constant.Constant; import com.fzzy.igds.utils.ContextUtil; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.StringUtils; @@ -44,4 +45,34 @@ public SysUser getUserByLoginName(String loginName) { return userMapper.selectUserByLoginName(loginName); } /** * æ ¹æ®å½åç»å½äººçç±»åè·åç¨æ·å表 * @return */ public List<SysUser> listUserByCurUserType() { SysUser user = ContextUtil.getLoginUser(); SysUser param = new SysUser(); param.setCompanyId(user.getCompanyId()); param.setUserType(user.getUserType()); //çç®¡ç¨æ·ï¼è·åçç®¡ç¨æ·å表 if (Constant.USER_TYPE_10.equals(user.getUserType())) { // } //åºåºç¨æ·ï¼å¦ææ¯å ¬å¸ç¨æ·å¯ä»¥æ¥çå ¬å¸ä¸å±ææåºåºï¼å¦æä¸ºå½ååºåºåªæ¥è¯¢å½ååºåº if (Constant.USER_TYPE_30.equals(user.getUserType())) { param.setDeptId(user.getDeptId()); } //é¶è¡ç¨æ·ï¼æ ¹æ®ååæ¥è¯¢é¶è¡ä¸ææåºåº if (Constant.USER_TYPE_20.equals(user.getUserType())) { if (StringUtils.isBlank(user.getUserData())) user.setUserData("1"); param.setUserData(user.getUserData()); } return userMapper.selectUserList(param); } } fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/DateUtil.java
@@ -2,6 +2,8 @@ import org.apache.commons.lang3.time.DateUtils; import java.time.LocalDate; import java.time.ZoneId; import java.util.Calendar; import java.util.Date; @@ -245,9 +247,22 @@ cal.set(Calendar.MILLISECOND, 0); return (cal.getTimeInMillis() - System.currentTimeMillis()) / 1000; } public static boolean isToday(Date date) { if (date == null) { return false; } LocalDate today = LocalDate.now(); LocalDate targetDate = date.toInstant() .atZone(ZoneId.systemDefault()) .toLocalDate(); return today.equals(targetDate); } public static void main(String[] args) { System.out.println(getMinute(new Date())); } } fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java
@@ -11,6 +11,7 @@ import com.fzzy.work.domain.WorkOrder; import com.fzzy.work.domain.WorkOrderConf; import com.fzzy.work.domain.WorkOrderProcess; import com.ruoyi.common.core.domain.entity.SysUser; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -184,6 +185,15 @@ return BaseResp.error("å½åå·¥åå·²å¤çï¼è¯·å·æ°é¡µé¢éè¯ï¼ï¼"); } //夿æ¯ä¸æ¯æå®å¤ç人 SysUser user = ContextUtil.getLoginUser(); if (StringUtils.isNotEmpty(work.getAssigneeId())) { if (!work.getAssigneeId().equals(user.getLoginName())) { return BaseResp.error("å½åå·¥åå·²åé å ¶ä»äººå¤çï¼è¯·å¿å¤ç"); } } String curNode = process.getNode(); //è·åå¤ç人 if (!curNode.equals(work.getNode())) { @@ -194,12 +204,13 @@ WorkOrderConf conf = confService.selectById(work.getConfId()); if (null == conf) return BaseResp.error("å½åå·¥åæªé ç½®æµç¨"); //æ·»å è®°å½ process.setId(ContextUtil.UUID()); process.setCreateTime(new Date()); process.setOrderId(work.getId()); process.setAssigneeName(ContextUtil.getLoginUserName()); process.setAssigneeId(ContextUtil.getLoginName()); process.setAssigneeName(user.getUserName()); process.setAssigneeId(user.getLoginName()); WorkNode nextNode = this.getNextNode(work.getNode(), conf); @@ -209,7 +220,6 @@ if ("pass".equals(action)) { process.setAction("éè¿"); process.setNode(work.getNode()); //ç»æå¤æï¼å¦ææ¯ç»æèç¹ï¼åç»æå·¥å if (WorkNode.NODE_END.getCode().equals(nextNode.getCode())) { work.setStatus(WorkStatus.STATUS_50.getCode()); @@ -218,20 +228,47 @@ work.setNode(nextNode.getCode()); orderService.complete(work); } //å¢å 审æ¹è®°å½ orderProcessService.addData(process, WorkNode.NODE_END.equals(nextNode)); return BaseResp.success(); } //æç»æä½ if ("refuse".equals(action)) { process.setAction("æç»"); process.setNode(WorkNode.NODE_END.getCode()); work.setStatus(WorkStatus.STATUS_60.getCode()); orderService.complete(work); } //å¢å 审æ¹è®°å½ orderProcessService.addData(process,nextNode.equals(WorkNode.NODE_END)); orderProcessService.addData(process, true); return BaseResp.success(); } //转交æè ææ´¾æä½ if ("transfer".equals(action)) { if (StringUtils.isEmpty(process.getAssigneeName())) { return BaseResp.error("è¯·éæ©å¤ç人"); } process.setAction("转交/ææ´¾"); process.setNode(work.getNode()); String info = user.getUserName() + "转交ç»" + process.getAssigneeName() + "å¤çï¼å¤ç建议ï¼" + process.getRemark(); process.setRemark(info); //æ´æ°å¤ç人 work.setAssigneeId(process.getAssigneeId()); work.setAssigneeName(process.getAssigneeName()); orderService.updateData(work); orderProcessService.addData(process, false); return BaseResp.success(); } return BaseResp.error("ç³»ç»æ²¡æè¯å«å°æä½å¨ä½ï¼æªæ§è¡ç¸å ³æµç¨å®¡æ¹"); } } fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
@@ -17,11 +17,10 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.*; import javax.annotation.Resource; @@ -30,6 +29,7 @@ * @Author: Andy.jia * @Date: 2025/12/19 */ @Slf4j @Service public class WorkOrderService { @Resource @@ -59,43 +59,12 @@ //è·åå½åç»å½äºº SysUser user = ContextUtil.getLoginUser(); QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("company_id", user.getCompanyId()); String scope = param.getScope(); if (StringUtils.isEmpty(scope)) scope = WorkOrderParam.SCOPE_SELF; //çç®¡ç¨æ·-æ¥çææåºåºåå¾ å if (Constant.USER_TYPE_10.equals(user.getUserType())) { if (WorkOrderParam.SCOPE_SELF.equals(scope)) { queryWrapper.eq("node", WorkNode.NODE2.getCode()); } } //åºåºç¨æ·ï¼å¦ææ¯å ¬å¸ç¨æ·å¯ä»¥æ¥çå ¬å¸ä¸å±ææåºåºï¼å¦æä¸ºå½ååºåºåªæ¥è¯¢å½ååºåº if (Constant.USER_TYPE_30.equals(user.getUserType())) { 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()); } } //æ´æ°æ¥è¯¢æ¡ä»¶ this.updateQueryWrapper(queryWrapper, user, scope); queryWrapper.eq(null != param.getDeptId(), "dept_id", param.getDeptId()); queryWrapper.like(null != param.getName(), "title", param.getName()); @@ -156,22 +125,116 @@ } /** * è·åç¨æ·å¾ å¤ç工忰 * @param status * @param userId * è·åå½åç¨æ·å¾ åå·¥åï¼æ ¹æ®ç¨æ·ç±»åæè 没ææå®å¤ç人æè æå®ä»»å¡å¤ç人ç工忰é * @param user * @return */ public Integer getNumByUser(String status, String userId) { public Integer getTodoNumByUser(SysUser user) { QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<>(); if (StringUtils.isBlank(userId) || StringUtils.isBlank(status)) { return 0; } queryWrapper.eq("assignee_id", userId); queryWrapper.eq("status", status); this.updateQueryWrapper(queryWrapper, user, WorkOrderParam.SCOPE_SELF); return workOrderMapper.selectCount(queryWrapper); } /** * è·å页颿±æ»ç»è®¡ï¼æçå¾ åå·¥åï¼æçææ´¾å·¥åï¼ä»æ¥å¾ åå·¥åï¼æ»å¾ åå·¥å * * æ¥è¯¢ææçå¾ åå·¥åï¼ç¶åè¿è¡æ±æ»ç»è®¡ * @return */ public Map<String, String> pageSummary() { Map<String, String> result = new HashMap<>(); //æçå¾ åå·¥å result.put("selfTodo", "0"); //æçææ´¾å·¥å result.put("assignTodo", "0"); //仿¥å¾ åå·¥å result.put("todayTodo", "0"); //æ»å¾ å工忰é result.put("sumTodo", "0"); //è·åæ»å¾ åå·¥å SysUser user = ContextUtil.getLoginUser(); QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<>(); String scope = WorkOrderParam.SCOPE_SELF; this.updateQueryWrapper(queryWrapper, user, scope); //è·åææçå·¥å List<WorkOrder> list = workOrderMapper.selectList(queryWrapper); if (null == list || list.isEmpty()) { log.info("---------工忱æ»ç»æ---------{}", result); return result; } int selfTodo = 0, assignTodo = 0, todayTodo = 0, sumTodo = list.size(); for (WorkOrder work : list) { if (null == work.getAssigneeId()) { selfTodo++; } if (null != work.getAssigneeId() && work.getAssigneeId().equals(user.getLoginName())) { selfTodo++; assignTodo++; } if (DateUtil.isToday(work.getCreateTime())) { todayTodo++; } } //æçå¾ åå·¥å result.put("selfTodo", selfTodo + ""); //æçææ´¾å·¥å result.put("assignTodo", assignTodo + ""); //仿¥å¾ åå·¥å result.put("todayTodo", todayTodo + ""); //æ»å¾ å工忰é result.put("sumTodo", sumTodo + ""); log.info("---------工忱æ»ç»æ---------{}", result); return result; } private void updateQueryWrapper(QueryWrapper<WorkOrder> queryWrapper, SysUser user, String scope) { 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)) { queryWrapper.eq("node", WorkNode.NODE2.getCode()); } } //åºåºç¨æ·ï¼å¦ææ¯å ¬å¸ç¨æ·å¯ä»¥æ¥çå ¬å¸ä¸å±ææåºåºï¼å¦æä¸ºå½ååºåºåªæ¥è¯¢å½ååºåº if (Constant.USER_TYPE_30.equals(user.getUserType())) { 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()); } } } @@ -196,4 +259,9 @@ } public void updateData(WorkOrder work) { workOrderMapper.updateById(work); } } fzzy-igdss-view/src/main/java/com/fzzy/igds/CommonPR.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,32 @@ package com.fzzy.igds; 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; import javax.annotation.Resource; import java.util.List; /** * @Desc: éç¨PR管çå±ï¼å¦ç¨ç¨æ·ä¿¡æ¯ç®¡ç * @Author: Andy.jia * @Date: 2026/1/17 */ @Component public class CommonPR { @Resource private SysUserService userService; /** * commonPR#listUserByCurUserType * æ ¹æ®å½åç»å½äººçç±»åè·åç¨æ·å表 * @return ç¨æ·å表 */ @DataProvider public List<SysUser> listUserByCurUserType(){ return userService.listUserByCurUserType(); } } fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
@@ -151,6 +151,7 @@ </PropertyDef> <PropertyDef name="remark"> <Property></Property> <Property name="label">审æ¹å»ºè®®</Property> </PropertyDef> <PropertyDef name="id"> <Property></Property> @@ -182,13 +183,26 @@ }
 view.get("#dsMain").set("parameter",param).flushAsync();
 }
 //æ±æ»ä¿¡æ¯
 summaryCount = function(){
 view.get("#ajaxSummary").execute(function(result){
 console.log(result);
 jQuery('#child-num1').text(result.selfTodo);
 jQuery('#child-num2').text(result.assignTodo);
 jQuery('#child-num3').text(result.todayTodo);
 jQuery('#child-num4').text(result.sumTodo);
 });
 }
 
 summaryCount();
 
 query();
 
 //å®£ä¼ æä½
 renderCell1 = function(arg,self){
 var tabIndex = view.get("#tabMain.currentIndex");
 var data = arg.data;
 var htm = "<a onClick='audit()' class='a-btn1'>ææ´¾</a>&nbsp;|&nbsp;<a onClick='showDetail()' class='a-btn2'>详ç»</a>";
 var htm = "<a onClick='selectUser()' class='a-btn1'>ææ´¾</a>&nbsp;|&nbsp;<a onClick='showDetail()' class='a-btn2'>详ç»</a>";
 if(1 == tabIndex){
 htm = "<a onClick='showDetail()' class='a-btn2'>详ç»</a>";
 }
 @@ -218,18 +232,14 @@ arg.dom.innerHTML = htm;
 }
 
 //ç¹å»å®¡æ ¸
 audit = function(){
 
 }
 //ç¹å»è¯¦ç»
 showDetail = function(){
 var tabIndex = view.get("#tabMain.currentIndex");
 var cur = view.get("#dsMain.data:#");
 var dialog = view.get("#dialogMain");
 view.get('^btnTag').set('visible',true);
 view.get('^btnTag').set('disabled',false);
 if(1 == tabIndex){
 view.get('^btnTag').set('visible',false);
 view.get('^btnTag').set('disabled',true);
 }
 dialog.show();
 
 @@ -269,7 +279,15 @@ var process = view.get("#dsProcess.data");
 process.set("action",null);
 process.set('remark',null);
 process.set('assigneeId',null);
 process.set('assigneeName',null);
 view.get('#dialogTodo').hide();
 view.get('#dialogSelectUser').hide();
 }
 selectUser = function(){
 var process = view.get("#dsProcess.data");
 process.set('action','transfer')
 view.get("#dialogSelectUser").show();
 }
 </ClientEvent> <Property name="packages">font-awesome,css-common</Property> @@ -380,32 +398,32 @@ 
 <div class="child">
 <div class="console-link-block">
 <div class="console-link-block-num">0</div>
 <div class="console-link-block-text">仿¥å·¥åç»è®¡</div>
 <div class="console-link-block-num" id="child-num1">0</div>
 <div class="console-link-block-text">æçå¾ åå·¥å</div>
 <img class="console-icon" src="/img/icon-wj.png">
 </div>
 </div>
 
 <div class="child">
 <div class="console-link-block bg2">
 <div class="console-link-block-num">0</div>
 <div class="console-link-block-text">仿¥å¾ 宿工å</div>
 <div class="console-link-block-num" id="child-num2">0</div>
 <div class="console-link-block-text">æçææ´¾å·¥å</div>
 <img class="console-icon" src="/img/icon-wj2.png">
 </div>
 </div>
 
 <div class="child">
 <div class="console-link-block bg3">
 <div class="console-link-block-num">0</div>
 <div class="console-link-block-text">æ»å·¥åç»è®¡</div>
 <div class="console-link-block-num" id="child-num3">0</div>
 <div class="console-link-block-text">仿¥å·¥å</div>
 <img class="console-icon" src="/img/icon-tj.png">
 </div>
 </div>
 
 <div class="child">
 <div class="console-link-block bg4">
 <div class="console-link-block-num">0</div>
 <div class="console-link-block-text">æ»æªå®æå·¥å</div>
 <div class="console-link-block bg5">
 <div class="console-link-block-num" id="child-num4">0</div>
 <div class="console-link-block-text">æ»å¾ åå·¥å</div>
 <img class="console-icon" src="/img/icon-tj2.png">
 </div>
 </div>
 @@ -421,7 +439,7 @@ <Property name="margin-top">10px</Property> </Property> <AutoForm> <Property name="cols">*,*,*,*,90,90</Property> <Property name="cols">*,300,300,90,90,*</Property> <Property name="dataSet">dsQuery</Property> <Property name="labelAlign">right</Property> <Property name="labelWidth">100</Property> @@ -429,11 +447,6 @@ <Property name="name">deptId</Property> <Property name="property">deptId</Property> <Property name="trigger">autoMappingDropDown2</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">name</Property> <Property name="property">name</Property> <Editor/> </AutoFormElement> <AutoFormElement> @@ -720,6 +733,7 @@ <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> @@ -810,5 +824,72 @@ <Property name="service">workOrderPR#todo</Property> <Property name="executingMessage">å¤çä¸â¦â¦</Property> </AjaxAction> <DataSet id="dsSysUser"> <Property name="dataType">[dtSysUser]</Property> <Property name="dataProvider">commonPR#listUserByCurUserType</Property> </DataSet> <DataSetDropDown id="selectUser"> <Property name="dataSet">dsSysUser</Property> <Property name="property">userName</Property> <Property name="assignmentMap">assigneeId=loginName,assigneeName=userName</Property> </DataSetDropDown> <Dialog id="dialogSelectUser"> <Property name="width">600</Property> <Property name="caption">æå®/转让å¤ç人</Property> <Property name="closeable">false</Property> <Property name="iconClass">fa fa-bookmark</Property> <Buttons> <Button> <ClientEvent name="onClick">todo();</ClientEvent> <Property name="caption">ç¡®å®</Property> <Property name="iconClass">fa fa-check</Property> <Property name="exClassName">btn1</Property> <Property name="width">90</Property> </Button> <Button> <ClientEvent name="onClick">cancelTodo();</ClientEvent> <Property name="caption">åæ¶</Property> <Property name="iconClass">fa fa-times</Property> <Property name="exClassName">btn3</Property> <Property name="width">90</Property> </Button> </Buttons> <Children> <Container> <AutoForm> <Property name="cols">*</Property> <Property name="dataSet">dsProcess</Property> <Property name="labelAlign">right</Property> <Property name="labelWidth">100</Property> <AutoFormElement> <Property name="name">assigneeName</Property> <Property name="property">assigneeName</Property> <Property name="trigger">selectUser</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">remark</Property> <Property name="property">remark</Property> <Editor> <TextArea> <Property name="blankText">-- å¡«å审æ¹å»ºè®® --</Property> <Property name="height">100</Property> </TextArea> </Editor> </AutoFormElement> <AutoFormElement> <Property name="name">assigneeId</Property> <Property name="property">assigneeId</Property> <Property name="visible">false</Property> <Editor/> </AutoFormElement> </AutoForm> </Container> </Children> <Tools/> </Dialog> <AjaxAction id="ajaxSummary"> <Property name="service">workOrderPR#pageSummary</Property> </AjaxAction> </View> </ViewConfig> fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; import javax.annotation.Resource; @@ -62,6 +63,16 @@ /** * workOrderPR#pageSummary * 工忱æ»ç»è®¡ */ @Expose public Map<String,String> pageSummary() { return workOrderService.pageSummary(); } /** * å·¥åç¶æ * ${dorado.getDataProvider("workOrderPR#triggerStatus").getResult()} * fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -2020,4 +2020,31 @@ <Property name="label">é¸ç°å¾</Property> </PropertyDef> </DataType> <DataType name="dtSysUser"> <Property name="creationType">com.ruoyi.common.core.domain.entity.SysUser</Property> <PropertyDef name="companyId"> <Property/> </PropertyDef> <PropertyDef name="userId"> <Property name="dataType">Long</Property> </PropertyDef> <PropertyDef name="deptId"> <Property name="dataType">Long</Property> </PropertyDef> <PropertyDef name="parentId"> <Property name="dataType">Long</Property> </PropertyDef> <PropertyDef name="roleId"> <Property name="dataType">Long</Property> </PropertyDef> <PropertyDef name="loginName"> <Property/> </PropertyDef> <PropertyDef name="userName"> <Property/> </PropertyDef> <PropertyDef name="userType"> <Property/> </PropertyDef> </DataType> </Model> fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
@@ -244,7 +244,7 @@ MainData mainData = new MainData(); //å¾ å工忰 Integer orderNum = workOrderService.getNumByUser(WorkStatus.STATUS_30.getCode(), user.getLoginName()); Integer orderNum = workOrderService.getTodoNumByUser(user); mainData.setOrderNum(orderNum); //ç»è®¡åºå ¥åºä¿¡æ¯