DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[修改] 流程中心

Browse Source
This commit is contained in:
bupengxiang
2023-05-18 11:25:06 +08:00
parent 34790e5778
commit d9ca17ce3f
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
+3 -6
View File
@@ -22,23 +22,18 @@ import com.adc.da.util.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.enums.SqlMethod;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.TableInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.binding.MapperMethod;
import org.apache.ibatis.session.SqlSession;
import org.apache.poi.ss.formula.functions.T;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -144,6 +139,8 @@ public class UserEOServiceImpl implements IUserEoService {
userRoleEO.setRoleId(c);
userRoleEODao.insert(userRoleEO);
});
//保存用户部门关系表
userOrgEODao.deleteBatchByUserIds(Collections.singletonList(eo.getUsid()));
if (StringUtils.isNotEmpty(eo.getOrgId())){
String[] split = eo.getOrgId().split(",");
// 插入组织关联表 暂时用不上,页面不维护组织机构
adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
+2 -2
View File
@@ -5,8 +5,8 @@
<select id="list" parameterType="string" resultType="map">
select * from(select t1.USID,t1.ACCOUNT,t1.USNAME,t1.CELLPHONE_NUMBER,t1.EMAIL,t3.NAME ROLENAME,t3.id ROLEID,
date_format(t1.UPDATE_TIME,'%Y-%m-%d %H:%i:%S')CREATEDATE,
GROUP_CONCAT( DISTINCT org.ID ) as ORGID,
GROUP_CONCAT( DISTINCT org.LONG_NAME )as ORGNAME
GROUP_CONCAT( DISTINCT org.ID ORDER BY org.ID DESC ) as ORGID,
GROUP_CONCAT( DISTINCT org.LONG_NAME ORDER BY org.ID DESC )as ORGNAME
from
(
select * from TS_USER
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java
+3 -3
View File
@@ -1090,7 +1090,7 @@ public class TodoTaskController {
}
page.setList(list);
page.setCount(Long.valueOf(list.size()));
page.setCount(page1.getTotal());
page.setPageSize(taskCommonQuery.getSize());
page.setPageNo(taskCommonQuery.getCurrent());
} else {
@@ -1265,7 +1265,7 @@ public class TodoTaskController {
}
page.setList(list);
page.setCount(Long.valueOf(list.size()));
page.setCount(page1.getTotal());
page.setPageSize(taskCommonQuery.getSize());
page.setPageNo(taskCommonQuery.getCurrent());
} else {
@@ -1444,7 +1444,7 @@ public class TodoTaskController {
System.out.println("11111浪费时间为:" + endTime1);
page.setList(list);
page.setCount(Long.valueOf(list.size()));
page.setCount(page1.getTotal());
page.setPageSize(taskCommonQuery.getSize());
page.setPageNo(taskCommonQuery.getCurrent());
} else {