Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/KeySiteMapper.xml

@@ -133,22 +133,22 @@
 		c.use_nature_name as useNatureName
 		FROM cb_key_site c
 		where c.is_delete = FALSE
-		<if test="name != null and name != ''">
+		<if test="name != null and name != '' and name != 'null'">
 			AND c.`name` like concat('%',#{name}, '%')
 		</if>
 		<if test="buildingId != null and buildingId != -1">
 			AND c.`building_id`= #{buildingId}
 		</if>
-		<if test="fireEnduranceRate != null and fireEnduranceRate != ''">
+		<if test="fireEnduranceRate != null and fireEnduranceRate != '' and fireEnduranceRate != 'null'">
 			AND c.`fire_endurance_rate`= #{fireEnduranceRate}
 		</if>
-		<if test="useNature != null and useNature != ''">
+		<if test="useNature != null and useNature != '' and useNature != 'null'">
 			AND c.`use_nature`= #{useNature}
 		</if>
-		<if test="fireFacilitiesInfo != null and fireFacilitiesInfo != ''">
+		<if test="fireFacilitiesInfo != null and fireFacilitiesInfo != '' and fireFacilitiesInfo != 'null' ">
 			AND c.`fire_facilities_info`= #{fireFacilitiesInfo}
 		</if>
-		<if test="bizOrgCode != null and bizOrgCode!=''">
+		<if test="bizOrgCode != null and bizOrgCode!='' and bizOrgCode!='null' ">
 			AND c.`biz_org_code` like concat(#{bizOrgCode}, '%')
 		</if>
 	</select>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireChemicalServiceImpl.java

@@ -37,6 +37,18 @@ public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChe
          * 列表查询 示例
          */
         public List<FireChemicalDto> queryForFireChemicalList(@Condition(Operator.like) String casNo, @Condition(Operator.like)String formula, @Condition(Operator.like)String name, String typeCode,boolean isDelete)   {
+            if("null".equals(casNo)) {
+            	casNo =null;
+            }  
+            if("null".equals(formula)) {
+            	formula =null;
+            }  
+            if("name".equals(name)) {
+            	casNo =null;
+            }  
+            if("null".equals(typeCode)) {
+            	typeCode =null;
+            }  
         	return this.queryForList("" , false,casNo, formula, name,  typeCode, isDelete);
         }
         /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireExpertsServiceImpl.java

@@ -14,42 +14,47 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import java.util.List;
 
 /**
- * 服务实现类
- * 消防专家
+ * 服务实现类 消防专家
  *
  * @author system_generator
  * @date 2021-06-25
  */
 @Service
-public class FireExpertsServiceImpl extends BaseService<FireExpertsDto, FireExperts, FireExpertsMapper> implements IFireExpertsService {
+public class FireExpertsServiceImpl extends BaseService<FireExpertsDto, FireExperts, FireExpertsMapper>
+		implements IFireExpertsService {
 	/**
 	 * 分页查询
 	 */
 	@Override
 	public Page<FireExpertsDto> queryForFireExpertsPage1(Page<FireExpertsDto> page,
-                                                        @Condition(Operator.eq) Boolean isDelete,
-                                                        @Condition(Operator.like) String name,
+			@Condition(Operator.eq) Boolean isDelete, @Condition(Operator.like) String name,
 			@Condition(Operator.in) List<String> expertCode) {
 		// 消防专家按时间倒叙排列add rec_date 2021-09-08 by kongfm
 		return this.queryForPage(page, "rec_date", false, isDelete, name, expertCode);
 	}
+
 	/**
 	 * 分页查询
 	 */
 	@Override
 	public Page<FireExpertsDto> queryForFireExpertsPage(Page<FireExpertsDto> page,
-                                                        @Condition(Operator.eq) Boolean isDelete,
-                                                        @Condition(Operator.like) String name,
-                                                        @Condition(Operator.eq)String expertCode) {
+			@Condition(Operator.eq) Boolean isDelete, @Condition(Operator.like) String name,
+			@Condition(Operator.eq) String expertCode) {
 		// 消防专家按时间倒叙排列add rec_date 2021-09-08 by kongfm
 		return this.queryForPage(page, "rec_date", false, isDelete, name, expertCode);
 	}
+
 	/**
 	 * 列表查询 示例
 	 */
 	public List<FireExpertsDto> queryForFireExpertsList(@Condition(Operator.eq) Boolean isDelete,
-    		 @Condition(Operator.like) String name,
-             @Condition(Operator.eq) String expertCode) {
+			@Condition(Operator.like) String name, @Condition(Operator.eq) String expertCode) {
+		if ("null".equals(name)) {
+			name = null;
+		}
+		if ("null".equals(expertCode)) {
+			expertCode = null;
+		}
 		return this.queryForList("", false, isDelete, name, expertCode);
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireStationServiceImpl.java

@@ -70,6 +70,12 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
      * 列表查询 示例
      */
     public List<FireStationDto> queryForFireStationList(@Condition(Operator.eq) Boolean isDelete,@Condition(Operator.eq) Long bizCompanyId,@Condition(Operator.like) String name,@Condition(Operator.like) String bizOrgCode) {
+    	if ("null".equals(bizOrgCode)) {
+    		bizOrgCode = null;
+		}
+    	if ("null".equals(name)) {
+    		name = null;
+		}
     	return this.queryForList("", false, isDelete,bizCompanyId,name,bizOrgCode);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireTeamServiceImpl.java

@@ -278,10 +278,12 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
                     i.setCompany(fireTeam.getCompany());
                     i.setCompanyName(fireTeam.getCompanyName());
                     i.setCompanyCode(fireTeam.getCompanyCode());
+                    i.setIsDelete(false);
                     this.updateById(i);
                 });
             }
             /*如果修改的队伍有下级队伍，所属单位一起修改 2021-10-18 陈召 结束*/
+            fireTeam.setIsDelete(false);
             this.updateById(fireTeam);
         }
         return fireTeam;

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/LinkageUnitServiceImpl.java

@@ -307,6 +307,15 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 
 	@Override
 	public List<LinkageUnitDto> exportToExcel(String unitName,String linkageUnitTypeCode,String emergencyLinkageUnitCode) {
+		if ("null".equals(unitName)) {
+			unitName = null;
+		}
+		if ("null".equals(linkageUnitTypeCode)) {
+			linkageUnitTypeCode = null;
+		}
+		if ("null".equals(emergencyLinkageUnitCode)) {
+			emergencyLinkageUnitCode = null;
+		}
 		return linkageUnitMapper.exportToExcel(unitName,linkageUnitTypeCode,emergencyLinkageUnitCode );
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceServiceImpl.java

@@ -191,6 +191,15 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
      */
     public List<WaterResourceDto> exportToExcel(Boolean isDelete, String name,
                                                 String resourceType,String bizOrgCode ) {
+    	if ("null".equals(name)) {
+    		name = null;
+		}
+    	if ("null".equals(resourceType)) {
+    		resourceType = null;
+		}
+    	if ("null".equals(bizOrgCode)) {
+    		bizOrgCode = null;
+		}
         return waterResourceMapper.exportToExcel(isDelete, name, resourceType,bizOrgCode);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AircraftServiceImpl.java

@@ -33,6 +33,8 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import static org.hamcrest.CoreMatchers.nullValue;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -211,6 +213,15 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
      */
     public List<AircraftDto> queryAircraftDtoForList(@Condition(Operator.eq) Boolean isDelete, @Condition(Operator.like) String aircraftModel,
                                                      String engineTypeCode, String fuelTypeCode) {
+    	if("null".equals(aircraftModel)) {
+    		aircraftModel=null;
+    	}
+    	if("null".equals(engineTypeCode)) {
+    		engineTypeCode = null;
+    	}
+    	if("null".equals(fuelTypeCode)) {
+    		fuelTypeCode = null;
+    	}
         return this.queryForList("", false, isDelete,aircraftModel, engineTypeCode, fuelTypeCode);
     }