sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交

dev_xds
姜玉琦 2024-04-21 21:45:39 +08:00
parent 43800049e6
commit 472477e385
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java
View File

@ -226,7 +226,6 @@ public class FloweController extends BaseController {
FlowLabourInfo where = new FlowLabourInfo(); FlowLabourInfo where = new FlowLabourInfo();
if(deptId<=0){ if(deptId<=0){
if (SecurityUtils.isUserB()) { if (SecurityUtils.isUserB()) {
where.setNowRole(Convert.toStr(SecurityUtils.getRoleId()));
where.setPrjIds(getProjectIds()); where.setPrjIds(getProjectIds());
} }
} }

4
yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/impl/FlowLabourInfoServiceImpl.java
View File

@ -136,10 +136,6 @@ public class FlowLabourInfoServiceImpl implements IFlowLabourInfoService
*/ */
@Override @Override
public Map<String, Object> findFlowLabourGroupCountByApprove(FlowLabourInfo flowLabourInfo){ public Map<String, Object> findFlowLabourGroupCountByApprove(FlowLabourInfo flowLabourInfo){
if(Convert.toInt(flowLabourInfo.getNowRole())>4){
//这里总包只能审批自己单位数据
flowLabourInfo.setDeptId(Convert.toLong(flowLabourInfo.getNowDept()));
}
List<Map<String, Object>> list = flowLabourInfoMapper.findGroupCountByApprove(flowLabourInfo); List<Map<String, Object>> list = flowLabourInfoMapper.findGroupCountByApprove(flowLabourInfo);
int db=0,yb=0; int db=0,yb=0;
for(Map<String, Object> map:list){ for(Map<String, Object> map:list){

1
yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml
View File

@ -92,7 +92,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.beginDate != null and params.beginDate != '' and params.endDate != null and params.endDate != ''"> and date(fl.create_time) between #{params.beginDate} and #{params.endDate}</if> <if test="params.beginDate != null and params.beginDate != '' and params.endDate != null and params.endDate != ''"> and date(fl.create_time) between #{params.beginDate} and #{params.endDate}</if>
<!-- 查询条件-项目部门 --> <!-- 查询条件-项目部门 -->
<if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if> <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="prjIds !=null and prjIds.size()>0"> <if test="prjIds !=null and prjIds.size()>0">
and spc.project_id in and spc.project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=","> <foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">