Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/OrgEnum.java

@@ -18,7 +18,7 @@ public enum OrgEnum {
     建设单位("CONSTRUCTION","249","建设单位",1),
     安装单位("INSTALL","250","安装单位",1),
     设计单位("DESIGN","251","设计单位",1),
-    监察单位("SUPERVISION","252","监察单位",1),
+    监察部门("SUPERVISION","252","监察部门",1),
     监检机构("MONITORING","253","监检机构",1);
 
     private String key;

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/WorkHistoryMapper.xml

@@ -23,6 +23,9 @@
             <if test="tzUgpWorkHistory.endDate!='' and tzUgpWorkHistory.endDate!=null">
                 and wh.end_date like concat("%",#{tzUgpWorkHistory.endDate},"%")
             </if>
+            <if test="tzUgpWorkHistory.sequenceNbr!='' and tzUgpWorkHistory.sequenceNbr!=null">
+                and wh.sequence_nbr = #{tzUgpWorkHistory.sequenceNbr}
+            </if>
         </where>
     </select>
 </mapper>