forked from integrated_whb/integrated_whb
修复安全环保检查bug
parent
387a31b276
commit
f5579e9856
|
@ -487,7 +487,7 @@ public class AppSafetyEnvironmentalController extends BaseController {
|
|||
}
|
||||
// 2、整理特殊数据
|
||||
// 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);
|
||||
nodes.stream()
|
||||
.filter(n -> "1".equals(n.getOrder()))
|
||||
|
|
|
@ -266,10 +266,12 @@
|
|||
|
||||
<select id="findByOutsourced" parameterType="pd" resultType="pd">
|
||||
select
|
||||
f.*
|
||||
f.*,
|
||||
u.UNITS_NAME
|
||||
from
|
||||
<include refid="tableName"></include> f
|
||||
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
|
||||
t.OUTSOURCED_ID = #{OUTSOURCED_ID}
|
||||
and t.ISDELETE = '0'
|
||||
|
|
Loading…
Reference in New Issue