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

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

@@ -57,51 +57,54 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "民族")
     private String nation;
 
-//    @ExplicitConstraint(indexNum = 7, sourceClass = RoleNameExplicitConstraint.class, method = "getAdministrativeDivisions") //固定下拉内容
-    @ExcelProperty(value = "籍贯", index = 7)
-    @ApiModelProperty(value = "籍贯")
-    private String nativePlace;
 
-    @ExplicitConstraint(indexNum = 8, sourceClass = CommonExplicitConstraint.class, method = "getPoliticalOutlook") //固定下拉内容
-    @ExcelProperty(value = "政治面貌", index = 8)
+    @ExplicitConstraint(indexNum = 7, sourceClass = CommonExplicitConstraint.class, method = "getPoliticalOutlook") //固定下拉内容
+    @ExcelProperty(value = "政治面貌", index = 7)
     @ApiModelProperty(value = "政治面貌")
     private String politicalOutlook;
 
-//    @ExplicitConstraint(indexNum = 9, sourceClass = RoleNameExplicitConstraint.class, method = "getAdministrativeDivisions") //固定下拉内容
+    @ExplicitConstraint(indexNum = 8, sourceClass = CommonExplicitConstraint.class, method = "getCitys") //固定下拉内容
+    @ExcelProperty(value = "籍贯", index = 8)
+    @ApiModelProperty(value = "籍贯")
+    private String nativePlace;
 
-    @ExplicitConstraint(indexNum = 9,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
-    @ApiModelProperty(value = "现居住地")
-    @ExcelProperty(value = "现居住地", index = 9)
-    private String residence;
+//    @ExplicitConstraint(indexNum = 9, sourceClass = RoleNameExplicitConstraint.class, method = "getAdministrativeDivisions") //固定下拉内容
 
-    @ExcelProperty(value = "籍贯/户口所在地详细地址", index = 17)
+    @ExcelProperty(value = "籍贯/户口所在地详细地址", index = 9)
     @ApiModelProperty(value = "籍贯/户口所在地详细地址")
     private String nativePlaceVal;
 
-    @ExplicitConstraint(indexNum =10,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
+    @ExplicitConstraint(indexNum = 10,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
+    @ApiModelProperty(value = "现居住地")
     @ExcelProperty(value = "现居住地", index = 10)
+    private String residence;
+
+
+
+    @ExplicitConstraint(indexNum =11,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
+    @ExcelProperty(value = "现居住地", index = 11)
     @ApiModelProperty(value = "居住地详情")
     private String residenceDetails;
 
-    @ExcelProperty(value = "现居住地详细地址", index = 18)
+    @ExcelProperty(value = "现居住地详细地址", index = 12)
     @ApiModelProperty(value = "现居住地详细地址")
     private String residenceDetailVal;
 
-    @ExcelProperty(value = "办公电话", index = 11)
+    @ExcelProperty(value = "办公电话", index = 13)
     @ApiModelProperty(value = "办公电话")
     private String officePhone;
 
-    @ExcelProperty(value = "移动电话", index = 12)
+    @ExcelProperty(value = "移动电话", index = 14)
     @ApiModelProperty(value = "移动电话")
     private String mobilePhone;
 
-    @ExplicitConstraint(type = "XLLX", indexNum = 13, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "最高学历", index = 13)
+    @ExplicitConstraint(type = "XLLX", indexNum = 15, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "最高学历", index = 15)
     @ApiModelProperty(value = "最高学历")
     private String highestEducation;
 
-    @ExplicitConstraint(type = "GWMC", indexNum = 14, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "岗位名称", index = 14)
+    @ExplicitConstraint(type = "GWMC", indexNum = 16, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "岗位名称", index = 16)
     @ApiModelProperty(value = "岗位名称")
     private String jobs;
 
@@ -109,8 +112,8 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "岗位名称code")
     private String jobsCode;
 
-    @ExplicitConstraint(type = "ZJLY", indexNum = 15, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "消防专家领域", index = 15)
+    @ExplicitConstraint(type = "ZJLY", indexNum = 17, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消防专家领域", index = 17)
     @ApiModelProperty(value = "消防专家领域")
     private String expert;
 
@@ -144,7 +147,7 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "消防机构name")
     private Long fireTeamName;
 
-    @ExcelProperty(value = "备注", index = 16)
+    @ExcelProperty(value = "备注", index = 18)
     @ApiModelProperty(value = "备注")
     private String note;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertCalledMapper.java

@@ -49,6 +49,11 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
                                     String data,
                                     String lift);
 
+    int selectAllCount(Integer alertStatus,
+                       String alertTypeCode ,
+                       String alertSourceCode,
+                       String startTime,
+                       String endTime);
 
     Integer AlertCalledcount(@Param("alertStatus")int alertStatus);
 

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

@@ -146,6 +146,28 @@
         </where>
     </select>
 
+    <select id="selectAllCount" resultType="int">
+        SELECT
+        COUNT(*)
+        FROM
+        jc_alert_called
+        <where>
+            is_delete = 0
+            <if test="alertStatus!= null ">
+                and alert_status = #{alertStatus}
+            </if>
+            <if test="startTime!= null and endTime != null">
+                and call_time between #{startTime} and #{endTime}
+            </if>
+            <if test="alertTypeCode!= null ">
+                and alarm_type_code = #{alertTypeCode}
+            </if>
+            <if test="alertSourceCode!= null ">
+                and alert_source_code = #{alertSourceCode}
+            </if>
+        </where>
+    </select>
+
 
     <select id="AlertCalledcountTime" resultType="Integer">
 

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

@@ -7,6 +7,7 @@ import java.util.stream.Collectors;
 
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.KeySiteServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.api.entity.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -45,11 +46,6 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.ControllerDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ControllerEquipDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerData;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertLocationLog;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.jcs.api.enums.ControllerTypeEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.DutyInfoEnum;
@@ -95,6 +91,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
     FirefightersServiceImpl firefightersService;
     @Autowired
     KeySiteServiceImpl keySiteService;
+    @Autowired
+    AlertSubmittedServiceImpl alertSubmittedService;
 
     @Autowired
     private AlertLocationLogServiceImpl alertLocationLogService;
@@ -186,7 +184,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
         List<AlertCalled> list = alertCalledMapper.selectAllPage(pageBean.getCurrent(), pageBean.getSize(), alertStatus, alertTypeCode, alertSourceCode, startTime, endTime,data,lift);
         IPage<AlertCalled> iPage = new Page<>();
         iPage.setRecords(list);
-        iPage.setTotal(list.size());
+        iPage.setTotal(alertCalledMapper.selectAllCount(alertStatus, alertTypeCode, alertSourceCode, startTime, endTime));
         return iPage;
         /* bug2407 表头筛选失效 补充条件方法 XML中添加了排序条件判断  data代表排序条件 lift 升降序 陈召 2021-09-03 结束*/
     }