BUG 2500 2406 2123

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledDto.java

@@ -105,4 +105,7 @@ public class AlertCalledDto extends BaseDto{
     
     @ApiModelProperty(value = "响应级别字典code 为了过滤用（只有航空器故障有）")
     private String responseLevelCode;
+
+    @ApiModelProperty(value = "警情状态str")
+    private String alertStatusStr;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertCalled.java

@@ -120,4 +120,8 @@ public class AlertCalled extends BaseEntity {
     @TableField(exist=false)
     @ApiModelProperty(value = "警情来源多选 [逗号分隔]")
     private String alertSourceCodeStr;
+
+    @TableField(exist=false)
+    @ApiModelProperty(value = "警情状态str")
+    private String alertStatusStr;
 }

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.FireChemicalDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireChemical;
 import com.yeejoin.amos.boot.module.common.api.mapper.FireChemicalMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFireChemicalService;
-
 import org.springframework.stereotype.Service;
-
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import java.util.Arrays;
 import java.util.List;
 /**
 * 危化品服务实现类
@@ -33,7 +28,8 @@ public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChe
                 if("-1".equals(typeCode)) { // bug 2673 选择 -1 时候没有查出所有危化品处理 by kongfm
                         typeCode = null;
                 }
-           return this.queryForPage(page, "", false,casNo, formula, name,  typeCode, isDelete);
+                // BUG 2123 日常管理>辅助资源>危化品，危化品列表数据按创建时间倒序排列 by litw start
+           return this.queryForPage(page, "rec_date", 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/MaintenanceCompanyServiceImpl.java

@@ -207,6 +207,15 @@ public class MaintenanceCompanyServiceImpl
 		if (ObjectUtils.isEmpty(maintenanceCompany)) {
 			return false;
 		}
+		// 新增删除维保单位逻辑，BUG 2500 单位下有子单位或者人员时应无法直接删除. by litw  satrt
+		LambdaQueryWrapper<MaintenanceCompany> wrapperCompany = new LambdaQueryWrapper<MaintenanceCompany>();
+		wrapperCompany.eq(MaintenanceCompany::getParentId,sequenceNbr);
+	    int count  =	maintenanceCompanyMapper.selectCount(wrapperCompany);
+	    if(count > 0) {
+	    	throw new BadRequest("单位下有子单位或者人员,无法删除");
+		}
+
+	    // 新增删除维保单位逻辑，BUG 2500 单位下有子单位或者人员时应无法直接删除. by litw  end
 		maintenanceCompany.setIsDelete(true);
 		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<MaintenanceCompany>();
 		wrapper.eq(MaintenanceCompany::getSequenceNbr, sequenceNbr);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStatusEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -162,6 +163,15 @@ public class AlertCalledController extends BaseController {
         alertStatus 警情状态  alertTypeCode 报警类型code  alertSourceCode 警情来源code
         陈召 2021-08-21 开始*/
         IPage<AlertCalled> alertCalledIPage = iAlertCalledService.queryForCalledList(pageBean, alertStatus, alertTypeCode, alertSourceCode, startTime, endTime,sort);
+        /*  bug  2406   接警记录，列表缺少警情状态字段  by litw start*/
+        alertCalledIPage.getRecords().stream().forEach(e->{
+            if(e.getAlertStatus()) {
+                e.setAlertStatusStr(AlertStatusEnum.CLOSED.getName());
+            } else {
+                e.setAlertStatusStr(AlertStatusEnum.UNCLOSED.getName());
+            }
+        });
+        /*  bug  2406   接警记录，列表缺少警情状态字段  by litw end*/
         return ResponseHelper.buildResponse(alertCalledIPage);
         /* bug2408 筛选参数解析异常  修改筛选条件方法 陈召 2021-08-21 结束*/
         /* bug2407 表头筛选失效 补充条件方法 XML中添加了排序条件判断  data代表排序条件 lift 升降序 陈召 2021-09-03 结束*/