FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_3

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-12-15 10:41:51 +08:00
parent bb5cd0a360 ebd5c94057
commit e35990d25f
25 changed files with 220 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+4
View File
@@ -4,6 +4,7 @@ import com.adc.da.common.*;
import com.adc.da.common.Category;
import com.adc.da.common.Page;
import com.adc.da.workFlow.entity.BusProcessEvaluationHis;
import com.adc.da.workFlow.entity.BusProcessModelHis;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,6 +19,9 @@ import java.util.Set;
//@FeignClient(value = "shan6")
public interface workFlowFeignClient {
@RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOne",method = RequestMethod.GET)
BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId);
@RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisList",method = RequestMethod.GET)
List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid);
adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
+6
View File
@@ -9,6 +9,7 @@ import com.adc.da.common.Page;
import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.service.IUserEOService;
import com.adc.da.workFlow.entity.BusProcessEvaluationHis;
import com.adc.da.workFlow.entity.BusProcessModelHis;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestBody;
@@ -26,6 +27,11 @@ public class workFlowFeignClientImpl {
@Autowired
private IUserEOService userEOService;
public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){
BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOne(pid,taskId);
return stringWrapper;
}
public List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid){
List<BusProcessEvaluationHis> stringWrapper = workFlowFeignClient.evaluationHisList(pid);
return stringWrapper;
adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
+1 -1
View File
@@ -16,7 +16,7 @@ public class ActDefineStartMap {
Map<String,String> map = new TreeMap<>();
map.put("1","standardLibraryWkflow");
map.put("2","standardSurveyWorkFlow");
map.put("3","standardCommentProcessWorkFlow");
map.put("3","StandAskForOpinion");
map.put("4","standardregulatoryinventory");
map.put("5","projectEvaluationProcess");
map.put("6","Projectcomplianceassessment");
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+7 -4
View File
@@ -17,10 +17,7 @@ import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.service.IUserEOService;
import com.adc.da.util.LoginUserUtil;
import com.adc.da.workFlow.dao.ExportExcelMapper;
import com.adc.da.workFlow.entity.BusProcessEvaluationHis;
import com.adc.da.workFlow.entity.ExportExcel;
import com.adc.da.workFlow.entity.ExportExcelEO;
import com.adc.da.workFlow.entity.ProcessDetailExport;
import com.adc.da.workFlow.entity.*;
import com.adc.da.workFlow.service.WorkFlowService;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
@@ -50,6 +47,12 @@ public class WorkFlowController {
// @Autowired
// private ExportExcelMapper exportExcelMapper;
@ApiOperation(value = "查询在线编辑流程当前节点编辑对象")
@GetMapping("/processModelHisOne")
public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){
return workFlowFeignClient.processModelHisOne(pid,taskId);
}
@ApiOperation(value = "查询流程父节点所有评分")
@GetMapping("/evaluationHisList")
public List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid){
adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java
+12
View File
@@ -70,9 +70,21 @@ public class BusProcessEvaluationHis implements Serializable {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private String updateTime;
@ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑")
@TableField("EDIT_STATUS")
private String editStatus;
@ApiModelProperty(value = "onlyOffice 编辑文件存储路径")
@TableField("EDIT_FILE_PATH")
private String editFilePath;
@ApiModelProperty(value = "逻辑状态")
@TableField("FLAG")
private String flag;
@ApiModelProperty(value = "onlyOffice 访问编辑文件全路径")
@TableField(exist = false)
private String downLoadUrl;
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java
+88
View File
@@ -0,0 +1,88 @@
package com.adc.da.workFlow.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* <p>
* 流程模块历史表
* </p>
*
* @author super_liu
* @since 2021-09-17
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="BusProcessModelHis对象", description="流程模块历史表")
public class BusProcessModelHis implements Serializable {
private static final long serialVersionUID=1L;
@ApiModelProperty(value = "主键")
@TableId(value = "ID", type = IdType.UUID)
private String id;
@ApiModelProperty(value = "标准id")
@TableField("STAND_ID")
private String standId;
@ApiModelProperty(value = "处理人")
@TableField("USER_ID")
private String userId;
@ApiModelProperty(value = "信息")
@TableField("MESG")
private String mesg;
@ApiModelProperty(value = "节点信息")
@TableField("TASK_INFO")
private String taskInfo;
@ApiModelProperty(value = "任务id")
@TableField("TASK_ID")
private String taskId;
@ApiModelProperty(value = "流程实例id")
@TableField("P_ID")
private String pId;
@ApiModelProperty(value = "流程名称")
@TableField("PRC_NAME")
private String prcName;
@ApiModelProperty(value = "创建时间")
@TableField("CREATE_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private String createTime;
@ApiModelProperty(value = "更新时间")
@TableField("UPDATE_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private String updateTime;
@ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑")
@TableField("EDIT_STATUS")
private String editStatus;
@ApiModelProperty(value = "onlyOffice 编辑文件存储路径")
@TableField("EDIT_FILE_PATH")
private String editFilePath;
@ApiModelProperty(value = "逻辑状态")
@TableField("FLAG")
private String flag;
@ApiModelProperty(value = "onlyOffice 访问编辑文件全路径")
@TableField(exist = false)
private String downLoadUrl;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java
+4 -4
View File
@@ -77,13 +77,13 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService {
queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","WEB_FILE");
List<SarStandFileEO> sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper);
//开耀这地方我把selectOne改成了批量因为 查单个数据里面出了问题你看看给改一下
sarStandFileEOS.forEach(item->{
QueryWrapper<SarStandFileEO> wrapper = new QueryWrapper<>();
wrapper.eq("ORI_ATT_ID",item.getOriAttId())
.eq("USE_MODEL","SOURCE_FILE");
SarStandFileEO sarStandFileEO = sarStandFileEODao.selectOne(wrapper);
item.setFileOldName(sarStandFileEO.getFileName());
.eq("USE_MODEL","SOURCE_FILE").orderByDesc("CREATION_TIME");
List<SarStandFileEO> sarStandFileEO = sarStandFileEODao.selectList(wrapper);
item.setFileOldName(sarStandFileEO.get(0).getFileOldName());
});
return sarStandFileEOS;
adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java
+3 -3
View File
@@ -54,11 +54,11 @@ public class WgDeptShow extends BaseEntity {
@ApiModelProperty(value = "中文名")
private String name;
@ApiModelProperty(value = "单位")
@ApiModelProperty(value = "单位名称")
private String unit;
@ApiModelProperty(value = "单位名称")
private String unitName;
@ApiModelProperty(value = "单位")
private String unitId;
@ApiModelProperty(value = "电话")
private String phone;
adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java
+3 -3
View File
@@ -48,11 +48,11 @@ public class WgNetInfoDTO extends BaseEntity {
@ApiModelProperty(value = "中文名")
private String name;
@ApiModelProperty(value = "单位")
@ApiModelProperty(value = "单位名称")
private String unit;
@ApiModelProperty(value = "单位名称")
private String unitName;
@ApiModelProperty(value = "单位")
private String unitId;
@ApiModelProperty(value = "电话")
private String phone;
adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java
+26 -4
View File
@@ -23,6 +23,7 @@ import com.adc.da.slrs.wgWorkGroup.dao.WgWorkGroupDao;
import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO;
import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO;
import com.adc.da.slrs.wgWorkGroup.service.IWgWorkGroupService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -333,15 +334,21 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> {
WgDept wgDept=new WgDept();
BeanUtils.copyProperties(wgDeptShow,wgDept);
if (null==wgDept.getWgId()){
wgDept.setWgId(wgWorkGroupShowDTO.getId());
}
wgDepts.add(wgDept);
});
flag = wgDeptService.saveOrUpdateBatch(wgDepts);
}
if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) {
List<String> removeMeet = new ArrayList<>();
List<WgMeetingUserRelation> wgMeetingUserRelations = new ArrayList<>();
wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> {
if (null==wgMeetingInfo.getId()){
wgMeetingInfo.setId(String.valueOf(UUID.randomUUID()));
wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId());
}
wgMeetingInfo.getMeetingPeople().forEach(s -> {
WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation();
wgMeetingUserRelation.setUserId(s);
@@ -350,27 +357,42 @@ public class WgWorkGroupServiceImpl extends ServiceImpl<WgWorkGroupDao, WgWorkGr
});
removeMeet.add(wgMeetingInfo.getId());
});
flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos());
if (!removeMeet.isEmpty()) {
wgMeetingUserRelationService.removeByIds(removeMeet);
wgMeetingUserRelationService.saveBatch(wgMeetingUserRelations);
}
flag = wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos());
}
if (null != wgWorkGroupShowDTO.getWgNetInfos() && wgWorkGroupShowDTO.getWgNetInfos().size() > 0) {
List<WgNetInfo> wgNetInfos = new ArrayList<>();
wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> {
WgNetInfo wgNetInfo = new WgNetInfo();
BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo);
if (null==wgNetInfo.getWgId()){
wgNetInfo.setWgId(wgWorkGroupShowDTO.getId());
}
wgNetInfos.add(wgNetInfo);
});
flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos);
}
if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) {
if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()){
wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> {
if (null==wgPayInfo.getWgId()){
wgPayInfo.setWgId(wgWorkGroupShowDTO.getId());
}
});
}
flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos());
}
if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) {
if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()){
wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> {
if (null==wgStandorpolicyInfo.getWgId()){
wgStandorpolicyInfo.setWgId(wgWorkGroupShowDTO.getId());
}
});
}
flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos());
}
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
+1 -1
View File
@@ -16,7 +16,7 @@
left join ts_user on sar_public_idea_all.user_id=ts_user.USID
WHERE
sar_public_idea_all.idea_id = #{ideaId}
LIMIT ${(page-1)*size},${page*size}
LIMIT ${(page-1)*size},${size}
</select>
<select id="getAllDataByIdeaCount" resultType="java.lang.Integer">
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+2 -2
View File
@@ -168,7 +168,7 @@
</if>
</if>
limit ${(page-1)*size},${page*size}
limit ${(page-1)*size},${size}
</select>
<select id="selectPagessolostar" resultType="java.lang.String">
@@ -256,7 +256,7 @@
</if>
</if>
)
limit ${(page-1)*size},${page*size}
limit ${(page-1)*size},${size}
</select>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
+2 -1
View File
@@ -61,7 +61,7 @@
c.*
FROM
(
SELECT b.*,sar_standards_info.STAND_TYPE as standType FROM (
SELECT b.*,sar_standards_info.STAND_TYPE as standType , ts_user.UNAME as dutyEngineerName , ts_user.INSTITUTION_NAME as responsibleUnit FROM (
SELECT (@i:=@i+1) as rows,sar_stand_unqualified.* FROM
sar_stand_unqualified,(SELECT @i:=0)j
WHERE
@@ -83,6 +83,7 @@
limit #{start},#{end}
)b
left join sar_standards_info on b.STAND_ID = sar_standards_info.id
left join ts_user on ts_user.USID = b.DUTY_ENGINEER
)c
ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows
</select>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml
+1 -1
View File
@@ -59,7 +59,7 @@
AND specific_item like concat(concat('%',#{specificItem}),'%')
</if>
ORDER BY STAND_ID, specific_item
LIMIT ${(current-1)*size},${current*size}
LIMIT ${(current-1)*size},${size}
) c ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED) ,rows
</select>
<select id="getAllDatasCout" resultType="java.lang.Integer">
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
+1 -1
View File
@@ -33,7 +33,7 @@
</if>
ORDER BY
PRODUCT_NAME ASC
limit ${(page-1)*pageSize},${page*pageSize}
limit ${(page-1)*pageSize},${pageSize}
</select>
<select id="selectPagesCount"
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+1 -1
View File
@@ -759,7 +759,7 @@
SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ',''))
<if test="mark == 996">
or (stand_name like concat(concat('%',#{page.standNumber}),'%'))
or (trim(replace(stand_name,' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) )
</if>
)
<!-- and SAR_STANDARDS_INFO.STAND_YEAR = ''-->
adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml
+2 -2
View File
@@ -12,8 +12,8 @@
</select>
<select id="researchAllDatas" resultType="com.adc.da.slrs.wgDept.entity.WgDeptShow">
select wg_dept.* ,ts_user.UNAME as name ,wg_dept.PHONE as phone ,wg_dept.EMAIL as email,ts_user.INSTITUTION_ID as deptId
,ts_user.INSTITUTION_NAME as deptName ,ts_institution.name as unitName , ts_institution.id as unit
select wg_dept.* ,concat(ts_user.UNAME,concat('(',concat(ts_user.USID,')'))) as name ,wg_dept.PHONE as phone ,wg_dept.EMAIL as email,ts_user.INSTITUTION_ID as deptId
,ts_user.INSTITUTION_NAME as deptName ,ts_institution.name as unit , ts_institution.id as unitId
from wg_dept
left join ts_user on ts_user.ACCOUNT = wg_dept.dept_people_id
left join wg_work_group on wg_work_group.id = wg_dept.wg_id
adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingUserRelation/WgMeetingUserRelationMapper.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<select id="getMeetingAllPeoples"
resultType="com.adc.da.slrs.wgMeetingUserRelation.entity.WgMeetingUserRelationShow">
select wg_meeting_user_relation.*,ts_user.UNAME as name from wg_meeting_user_relation
select wg_meeting_user_relation.*,concat(ts_user.UNAME,concat('(',concat(ts_user.USID,')'))) as name from wg_meeting_user_relation
left join ts_user on ts_user.ACCOUNT = wg_meeting_user_relation.user_id
left join wg_meeting_info on wg_meeting_info.id = wg_meeting_user_relation.meeting_id
left join wg_work_group on wg_work_group.id = wg_meeting_info.wg_id
adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml
+3 -2
View File
@@ -11,11 +11,12 @@
</select>
<select id="researchAllDatas" resultType="com.adc.da.slrs.wgNetInfo.entity.WgNetInfoDTO">
select wg_net_info.net_id,ts_user.UNAME as name ,wg_net_info.PHONE as phone, wg_net_info.EMAIL as email
,wg_net_info.id,wg_net_info.wg_id , wg_net_info.join_id
select wg_net_info.net_id,concat(ts_user.UNAME,concat('(',concat(ts_user.USID,')'))) as name ,wg_net_info.PHONE as phone, wg_net_info.EMAIL as email
,wg_net_info.id,wg_net_info.wg_id , wg_net_info.join_id ,ts_institution.name as unit , ts_institution.id as unitId
from wg_net_info
left join ts_user on ts_user.ACCOUNT = wg_net_info.net_id
left join wg_work_group on wg_work_group.id = wg_net_info.wg_id
left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID)
where wg_work_group.type = #{type}
</select>
adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
+11
View File
@@ -9,6 +9,7 @@ import com.adc.da.http.Result;
import com.adc.da.sys.constant.ValidFlagEnum;
import com.adc.da.sys.entity.RoleEO;
import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.entity.UserPhoneDTO;
import com.adc.da.sys.page.UserEOPage;
import com.adc.da.sys.service.IOrgEOService;
import com.adc.da.sys.service.IRoleEOService;
@@ -66,6 +67,16 @@ public class UserEOController extends BaseController<UserEO> {
return Result.success(userVO);
}
@ApiOperation(value = "|UserEO|详情")
@GetMapping("/getUserByPhone")
// @RequiresPermissions("sys:user:get")
public ResponseMessage<List<UserPhoneDTO>> getUserByName(@RequestParam(required = false,value = "name")String name,@RequestParam("page")Integer page){
List<UserPhoneDTO> userPhoneDTOS=userEOService.getUserByName(name,page);
return Result.success(userPhoneDTOS);
}
@ApiOperation(value = "|UserEO|详情接口")
@GetMapping("/getById")
public ResponseMessage<UserVO> getByIdFeignClient(String id) throws Exception {
adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java
+3
View File
@@ -2,6 +2,7 @@ package com.adc.da.sys.dao;
import com.adc.da.base.page.BasePage;
import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.entity.UserPhoneDTO;
import com.adc.da.sys.page.RoleUserEOPage;
import com.adc.da.sys.page.UserEOPage;
import com.adc.da.sys.vo.RoleUserVO;
@@ -171,5 +172,7 @@ public interface UserEODao extends BaseMapper<UserEO> {
public UserEO getUserEOByAccountNotDeleted(String account);
//手机端接口 只查人
List<UserPhoneDTO> getUserByName(@Param("name") String name,@Param("page")Integer page);
}
adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java
+15
View File
@@ -0,0 +1,15 @@
package com.adc.da.sys.entity;
import lombok.Data;
@Data
public class UserPhoneDTO {
private String usId;
private String userName;
private Integer total;
}
adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java
+4
View File
@@ -3,6 +3,7 @@ package com.adc.da.sys.service;
import com.adc.da.base.page.BasePage;
import com.adc.da.http.ResponseMessage;
import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.entity.UserPhoneDTO;
import com.adc.da.sys.page.RoleUserEOPage;
import com.adc.da.sys.page.UserEOPage;
import com.adc.da.sys.vo.RoleUserVO;
@@ -75,5 +76,8 @@ public interface IUserEOService extends IService<UserEO> {
public UserEO getUserByLoginNameNotDeleted(String userName);
//手机端接口 只查人
List<UserPhoneDTO> getUserByName(String name,Integer page);
}
adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java
+6 -4
View File
@@ -8,10 +8,7 @@ import com.adc.da.sys.constant.ValidFlagEnum;
import com.adc.da.sys.dao.OrgEODao;
import com.adc.da.sys.dao.UserEODao;
import com.adc.da.sys.dao.UserInfoEODao;
import com.adc.da.sys.entity.OrgEO;
import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.entity.UserInfoEO;
import com.adc.da.sys.entity.UserOrgEO;
import com.adc.da.sys.entity.*;
import com.adc.da.sys.page.RoleUserEOPage;
import com.adc.da.sys.page.UserEOPage;
import com.adc.da.sys.service.IOrgEOService;
@@ -514,4 +511,9 @@ public class UserEOServiceImpl extends ServiceImpl<UserEODao, UserEO> implements
return userEO;
}
@Override
public List<UserPhoneDTO> getUserByName(String name,Integer page) {
return this.baseMapper.getUserByName(name,page);
}
}
adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
+13
View File
@@ -793,4 +793,17 @@
</if>
</select>
<select id="getUserByName" resultType="com.adc.da.sys.entity.UserPhoneDTO">
select USID as usId ,concat( UNAME,concat(concat('(',ts_user.USID),')')) as userName ,
(select count(USID) from ts_user ) as total
from ts_user
where 1=1
<if test="name != null and name != '' ">
and ts_user.UNAME like concat(concat('%',#{name}),'%') or
ts_user.USID like concat(concat('%',#{name}),'%')
</if>
ORDER BY ts_user.USID
limit ${(page-1)*20},${20}
</select>
</mapper>