wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

修复安全环保检查bug

pull/4/head
zhangqihang 2024-02-23 09:06:12 +08:00
parent 387a31b276
commit f5579e9856
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java
View File

@ -487,7 +487,7 @@ public class AppSafetyEnvironmentalController extends BaseController {
} }
// 2、整理特殊数据 // 2、整理特殊数据
// 2、1检查人将检查状态 // 2、1检查人将检查状态
if ("2,3,4".contains(safety.getString("order"))) { if ("1,2,3,4".contains(safety.getString("order"))) {
List<PageData> inspectors = inspectorService.listAll(condition); List<PageData> inspectors = inspectorService.listAll(condition);
nodes.stream() nodes.stream()
.filter(n -> "1".equals(n.getOrder())) .filter(n -> "1".equals(n.getOrder()))

4
src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
View File

@ -266,10 +266,12 @@
<select id="findByOutsourced" parameterType="pd" resultType="pd"> <select id="findByOutsourced" parameterType="pd" resultType="pd">
select select
f.* f.*,
u.UNITS_NAME
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
left join BUS_OUTSOURCED t on t.UNITS_PIC = f.PERSONNELMANAGEMENT_ID left join BUS_OUTSOURCED t on t.UNITS_PIC = f.PERSONNELMANAGEMENT_ID
left join bus_units u on f.UNITS_ID = u.UNITS_ID
where where
t.OUTSOURCED_ID = #{OUTSOURCED_ID} t.OUTSOURCED_ID = #{OUTSOURCED_ID}
and t.ISDELETE = '0' and t.ISDELETE = '0'