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/mapper/OrgUsrMapper.java

@@ -19,7 +19,7 @@ import java.util.Map;
 public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     String selectUpUnitByParam(@Param("id")String biz_org_code);
     
-    int selectPersonListCount(Map<String, Object> map);
+    int selectPersonListCount(@Param("map")Map<String, Object> map);
 
     List<Map<String, Object>> selectPersonList(@Param("map")Map<String, Object> map);
 

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

@@ -57,18 +57,28 @@
                                      on u.sequence_nbr = g.instance_id
 
                                  where
-                                     u.biz_org_type = 'person'
+                                          u.biz_org_type = 'person'
                                    AND
-                                     u.is_delete = 0
-
-                                 GROUP BY
-                                     u.sequence_nbr ,
-                                     u.biz_org_name ,
-                                     u.biz_org_code
-                                 order by u.rec_date desc
-                             )a where a.sequenceNbr is not null
-
-    </select>
+                                        u.is_delete = 0
+                                        <if test="map.bizOrgName != null">
+                                            AND u.biz_org_name like concat('%',#{map.bizOrgName},'%')
+                                        </if>
+                                        <if test="map.personNumber!= null">
+                                            AND v.field_value like concat('%',#{map.personNumber},'%')
+                                        </if>
+                                        <if test="map.bizOrgCode != null and map.bizOrgCode != '-1'">
+                                            AND u.biz_org_code like concat(#{map.bizOrgCode}, '%')
+                                        </if>
+                                        GROUP BY
+                                        u.sequence_nbr ,
+                                        u.biz_org_name ,
+                                        u.biz_org_code
+                                        order by u.rec_date desc
+                                        )a where a.sequenceNbr is not null
+                                        <if test="map.fieldsValue != null">
+                                            <foreach collection="map.fieldsValue.keys" item="item">AND a.${item} = #{map.fieldsValue[${item}]}</foreach>
+                                        </if>
+                                </select>
 
     <!--机场单位人员按时间倒叙排列add order by u.rec_date desc 2021-09-08 by kongfm  -->
     <select id="selectPersonList" resultType="Map">

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

@@ -27,4 +27,19 @@ public class AlertCalledObjsDto extends BaseDto{
 
     @ApiModelProperty(value = "动态表单值")
     private List<AlertFormValue> alertFormValue;
+
+
+
+
+    public String getRemark() {
+         String value="";
+
+        for (AlertFormValue al : alertFormValue) {
+            if (al.getFieldCode() == "remark") {
+                value=al.getFieldValue();
+            }
+        }
+        return value;
+    }
+
 }

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

@@ -101,6 +101,12 @@ public class AlertCalled extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
+    @ApiModelProperty(value = "备注信息")
+    private String remark;
+
+
+
+
 
     /*bug 2408 接警记录，按警情状态和接警时间筛选功能失效 陈召 2021-09-22 开始*/
     @ApiModelProperty(value = "接警时间开始---用于列表过滤")

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

@@ -26,7 +26,7 @@
         a.call_time callTime,
         a.update_time  updateTime,
         a.rescue_grid rescueGrid,
-        CONCAT(a.alert_type,'  ',IFNULL((select  field_value from  jc_alert_form_value  where jc_alert_form_value.alert_called_id =a.sequence_nbr and jc_alert_form_value.field_code='remark'),"")) alertType,
+        CONCAT(a.alert_type,'  ',IFNULL(a.remark,"")) alertType,
         a.alert_type_code alarmTypeCode,
         a.unit_involved unitInvolved,
         a.trapped_num trappedNum,

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

@@ -441,7 +441,7 @@ public class AlertCalledController extends BaseController {
         AlarmGiveStatisticsDto dto = new AlarmGiveStatisticsDto();
         LambdaQueryWrapper<AlertCalled> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.isNull(AlertCalled::getFatherAlert);
-        queryWrapper.eq(AlertCalled::getAlertStatus, true);
+        queryWrapper.eq(AlertCalled::getAlertStatus, false);
         queryWrapper.eq(AlertCalled::getIsDelete, false);
         Integer alertNum = iAlertCalledService.getBaseMapper().selectCount(queryWrapper);
         dto.setAlarmNum(alertNum);

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

@@ -259,6 +259,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 		try {
 			// 警情基本信息
 			AlertCalled alertCalled = alertCalledObjsDto.getAlertCalled();
+			//主表增加备注字段
+
 			if (alertCalled.getAddress() != null) {
 				JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(alertCalled.getAddress());
 				alertCalled.setAddress(address.getString(BizConstant.ADDRESS));
@@ -292,6 +294,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				alertCalled.setAlarmType(AlertStageEnums.JQGB.getValue());
 				alertCalled.setAlarmTypeCode(AlertStageEnums.JQGB.getCode());
 				alertCalled.setUpdateTime(new Date());
+				alertCalled.setRemark(alertCalledObjsDto.getRemark());
 				this.save(alertCalled);
 
 				// 填充警情主键
@@ -309,6 +312,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				alertCalled.setAlertStage(AlertStageEnums.LLDP.getValue());
 				alertCalled.setAlarmType(AlertStageEnums.JQCB.getValue());
 				alertCalled.setAlarmTypeCode(AlertStageEnums.JQCB.getCode());
+				alertCalled.setRemark(alertCalledObjsDto.getRemark());
 				this.save(alertCalled);
 				// 填充警情主键
 				alertFormValuelist.stream().forEach(alertFormValue -> {

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -1990,5 +1990,16 @@
         </sql>
     </changeSet>
 
+
+<!--    <changeSet author="tw" id="2021-11-01-1">-->
+<!--        <preConditions onFail="MARK_RAN">-->
+<!--            <tableExists tableName="jc_alert_called"/>-->
+<!--        </preConditions>-->
+<!--        <comment>增加备注字段</comment>-->
+<!--        <sql>-->
+<!--            ALTER TABLE jc_alert_called ADD remark varchar(10000)  NULL COMMENT '备注'-->
+<!--        </sql>-->
+<!--    </changeSet>-->
+
         </databaseChangeLog>