Commit 743386d9 authored by 韩桐桐's avatar 韩桐桐

fix(统计):人员统计bug

parent b0cd42cc
...@@ -4,7 +4,6 @@ import lombok.Getter; ...@@ -4,7 +4,6 @@ import lombok.Getter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashMap;
import java.util.List; import java.util.List;
@Getter @Getter
...@@ -18,6 +17,8 @@ public enum UnitTypeEnum { ...@@ -18,6 +17,8 @@ public enum UnitTypeEnum {
AGWDW("安装改造维修单位","1234","1"), AGWDW("安装改造维修单位","1234","1"),
//使用单位 //使用单位
SYDW("使用单位","1232","2"), SYDW("使用单位","1232","2"),
//使用单位
GRZT("个人主体","6601","2"),
//充装单位 //充装单位
CZDW("充装单位","1231","3"), CZDW("充装单位","1231","3"),
//检验检测机构 //检验检测机构
......
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
WHERE WHERE
bi.unit_type IS NOT NULL bi.unit_type IS NOT NULL
AND tui.post IS NOT NULL AND tui.post IS NOT NULL
AND tui.is_delete = 'f'
<if test="unitTypeList != null and unitTypeList.size() > 0"> <if test="unitTypeList != null and unitTypeList.size() > 0">
AND AND
<foreach collection="unitTypeList" item="unitType" open="(" separator="OR" close=")"> <foreach collection="unitTypeList" item="unitType" open="(" separator="OR" close=")">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment