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

Compare commits

base: sxyanzhu:4c985bc9382af3c3330db04963c058a8bb442c76
Branches Tags
sxyanzhu:dev
sxyanzhu:dev_caq
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release
..
compare: sxyanzhu:fec95d36d4c950a3156166fd473942d22e1894ee
Branches Tags
sxyanzhu:dev
sxyanzhu:dev_caq
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release

No commits in common. "4c985bc9382af3c3330db04963c058a8bb442c76" and "fec95d36d4c950a3156166fd473942d22e1894ee" have entirely different histories.
4c985bc938 ... fec95d36d4

3 changed files with 2 additions and 7 deletions
Show Stats Expand all files Collapse all files

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

@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@RestController @RestController
@RequestMapping("/bgscreen/flow") @RequestMapping("/bgscreen/flow")
@ -221,10 +220,9 @@ public class FloweController extends BaseController {
* 根据条件查询劳资预警列表 * 根据条件查询劳资预警列表
* JiangYuQi * JiangYuQi
*/ */
@GetMapping("/findFlowLabourList") @PostMapping("/findFlowLabourList")
public TableDataInfo list(FlowLabourInfo flowLabourInfo) public TableDataInfo list(@RequestBody FlowLabourInfo flowLabourInfo)
{ {
startPage();
List<FlowLabourInfo> list = flowLabourInfoService.selectFlowLabourInfoList(flowLabourInfo); List<FlowLabourInfo> list = flowLabourInfoService.selectFlowLabourInfoList(flowLabourInfo);
return getDataTable(list); return getDataTable(list);
} }

1
yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/IFlowLabourInfoService.java
View File

@ -2,7 +2,6 @@ package com.yanzhu.jh.flow.service;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.yanzhu.jh.flow.domain.FlowLabourInfo; import com.yanzhu.jh.flow.domain.FlowLabourInfo;
import org.apache.xmlbeans.impl.xb.xsdschema.Public;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

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

@ -59,7 +59,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </if>
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17"'> and fl.approve_status in ('10','20','21','30','31','100') and sp.id in (select spui.project_id from sur_project_userinfo spui where spui.dept_id = #{nowDept} and spui.user_id=(select su.user_id from sys_user su where su.user_name=#{nowUser}) and spui.job_type='24' and spui.is_del=0)</if> <if test='nowRole == "15" or nowRole == "16" or nowRole == "17"'> and fl.approve_status in ('10','20','21','30','31','100') and sp.id in (select spui.project_id from sur_project_userinfo spui where spui.dept_id = #{nowDept} and spui.user_id=(select su.user_id from sys_user su where su.user_name=#{nowUser}) and spui.job_type='24' and spui.is_del=0)</if>
<if test='activeName == "jxz"'> <if test='activeName == "jxz"'>
<if test="nowRole == null"> and fl.approve_status &lt; 100</if>
<if test='nowRole == "4"'> and fl.approve_status in ('20','31')</if> <if test='nowRole == "4"'> and fl.approve_status in ('20','31')</if>
<!--监理单位/总包公司/分包单位查询当前关联数据--> <!--监理单位/总包公司/分包单位查询当前关联数据-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and fl.approve_status in ('10','21')</if> <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and fl.approve_status in ('10','21')</if>
@ -67,7 +66,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and fl.approve_status != '100' and fl.approve_status != '100'
</if> </if>
<if test='activeName == "ywc"'> <if test='activeName == "ywc"'>
<if test="nowRole == null"> and fl.approve_status = 100</if>
<if test='nowRole == "4"'> and fl.approve_status in ('21','30','100')</if> <if test='nowRole == "4"'> and fl.approve_status in ('21','30','100')</if>
<!--监理单位/总包公司/分包单位查询当前关联数据--> <!--监理单位/总包公司/分包单位查询当前关联数据-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and fl.approve_status in ('11','20','30','31','100')</if> <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and fl.approve_status in ('11','20','30','31','100')</if>