fix(jczs):添加生产单位类型支持

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/java/com/yeejoin/amos/boot/module/jczs/api/dto/TzBaseEnterpriseInfoDto.java

@@ -320,4 +320,9 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 	 */
 	@ApiModelProperty(value = "创建时间")
 	protected Date createDateEnd;
+
+	/**
+	 * 单位类型集合
+	 */
+	private List<String> unitTypeList;
 }

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -116,6 +116,13 @@
 					test="tzBaseEnterpriseInfoDto.useUnit!=null and tzBaseEnterpriseInfoDto.useUnit!='' ">
 				AND use_unit LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.useUnit},'%')
 			</if>
+			<if test="tzBaseEnterpriseInfoDto.unitTypeList != null and !tzBaseEnterpriseInfoDto.unitTypeList.isEmpty()">
+				AND (
+				<foreach collection="tzBaseEnterpriseInfoDto.unitTypeList" item="unit" separator=" OR ">
+					FIND_IN_SET(#{unit}, REPLACE(unit_type, '#', ','))
+				</foreach>
+				)
+			</if>
 			<if
 					test="tzBaseEnterpriseInfoDto.useUnitCertificate!=null and tzBaseEnterpriseInfoDto.useUnitCertificate!='' ">
 				AND use_unit_certificate = #{tzBaseEnterpriseInfoDto.useUnitCertificate}

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/java/com/yeejoin/amos/boot/module/jczs/biz/controller/TzBaseEnterpriseInfoController.java

@@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 企业数据信息
@@ -211,6 +212,15 @@ public class TzBaseEnterpriseInfoController {
             } catch (Exception e) {
             }
         }
+        tzBaseEnterpriseInfoDto.setUnitTypeList(
+                Optional.ofNullable((String) map.get("unitTypeList"))
+                        .filter(ObjectUtils::isNotEmpty)
+                        .map(s -> Arrays.stream(s.split(","))
+                                .map(String::trim)
+                                .filter(ObjectUtils::isNotEmpty)
+                                .collect(Collectors.toList()))
+                        .orElse(Collections.emptyList())
+        );
         return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.page(pageParam, tzBaseEnterpriseInfoDto, sort));
     }