bug 2928 导出数据修改为文字 2547 地址和事件名双关联 2952 设施分类匹配

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -34,14 +34,6 @@ public class WaterResourceDto extends BaseDto {
     private String address;
 
 
-    @ApiModelProperty(value = "经度")
-    @ExcelProperty(value = "经度", index = 44)
-    private Double longitude;
-
-    @ApiModelProperty(value = "纬度")
-    @ExcelProperty(value = "纬度", index = 45)
-    private Double latitude;
-
     @ExcelIgnore
     @ApiModelProperty(value = "资源类型（消火栓：hydrant、消防水鹤：crane、天然水源：natural、消防水池：pool）")
     private String resourceType;
@@ -321,7 +313,7 @@ public class WaterResourceDto extends BaseDto {
     private Long equipCategoryId;
     //  BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17
     @ApiModelProperty("设施分类名称")
-    @ExplicitConstraint(indexNum = 44, sourceClass = CommonExplicitConstraint.class, method = "getEquipCategory")
+    @ExplicitConstraint(indexNum = 42, sourceClass = CommonExplicitConstraint.class, method = "getEquipCategory")
     @ExcelProperty(value = "设施分类名称", index = 42)
     private String equipCategoryName;
 
@@ -332,4 +324,13 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty("维保周期")
     @ExcelProperty(value = "维保周期(月)", index = 43)
     private String maintenancePeriod;
+
+
+    @ApiModelProperty(value = "经度")
+    @ExcelProperty(value = "经度", index = 44)
+    private Double longitude;
+
+    @ApiModelProperty(value = "纬度")
+    @ExcelProperty(value = "纬度", index = 45)
+    private Double latitude;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -49,11 +49,9 @@
             and a.alert_status =1
         </if>
         <if test='par.address!=null and  par.address!="" '>
-            and a.address like CONCAT('%',#{par.address},'%')
-        </if>
-        <if test='par.alertType!=null and  par.alertType!="" '>
-            and a.alert_type like CONCAT('%',#{par.alertType},'%')
+            and a.address like CONCAT('%',#{par.address},'%') ||  a.alert_type like CONCAT('%',#{par.address},'%')
         </if>
+
         <if test='par.whether24!=false'>
             and a.call_time &gt;= (NOW() - interval 24 hour)
         </if>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -462,12 +462,12 @@ public class OrgUsrController extends BaseController {
      * @param
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/getAmosId", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getAmosId/{amosId}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "判断关联账户是否已关联", notes = "判断关联账户是否已关联")
-    public Object getAmosId( String amosId) {
+    public  ResponseModel<Object> getAmosId(@PathVariable String amosId) {
 
-        return iOrgUsrService.amosIdExist(amosId);
+        return ResponseHelper.buildResponse(iOrgUsrService.amosIdExist(amosId));
     }
 
 

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

@@ -13,6 +13,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -155,6 +158,8 @@ public class ExcelServiceImpl {
 	RescueEquipmentServiceImpl rescueEquipmentServiceImpl;
 	@Autowired
 	IOrgUsrService orgUsrServer;
+	@Autowired
+	DataDictionaryServiceImpl iDataDictionaryService;
 	
 	@Autowired
 	FirefightersPostServiceImpl iFirefightersPostService;
@@ -182,6 +187,18 @@ public class ExcelServiceImpl {
 			break;
 		case "XFZJ":
 			List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false);
+			QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("type","XLLX" );
+			List<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+			for (FireExpertsDto fireExpertsDto : fireExpertsDtoList) {
+				for (DataDictionary dataDictionary : list) {
+					if (fireExpertsDto.getHighestEducation() != null && !fireExpertsDto.getHighestEducation().equals("")) {
+						if (fireExpertsDto.getHighestEducation().equals(dataDictionary.getCode())) {
+							fireExpertsDto.setHighestEducation(dataDictionary.getName());
+						}
+					}
+				}
+			}
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireExpertsDtoList,
 					FireExpertsDto.class, dataSourcesImpl, false);
 			break;