Merge branch 'develop_dl_plan6_temp_merge_colony' of…

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DynamicFormInstanceMapper.java

@@ -128,7 +128,8 @@ public interface DynamicFormInstanceMapper extends BaseMapper<DynamicFormInstanc
 
     List<Map<String, Object>>  getDutyPersonByTeamIdAndCarIdone(
             String dutyDate,
-            String departmentName);
+            String departmentName,
+            String type);
 
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java

@@ -36,7 +36,7 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
                                              String state, String areasExpertise, String jobTitle, String bizOrgCode);
 
     List<FirefightersDto> queryById(@Param("gw") String[] gw, @Param("name") String name);
-    List<FirefightersDto> queryByIdone(@Param("gw") String[] gw, @Param("name") String name);
+    List<FirefightersDto> queryByIdone(@Param("gw") String[] gw, @Param("name") String name, @Param("type") String type);
 
 
     List<Map<String, String>> selectNormalFirePerson(String jobId);

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

@@ -421,7 +421,16 @@ FROM
 					cbd.instance_id
 			) ss
 		WHERE
-			ss.userId in ( select    cb_firefighters.org_usr_id	FROM  cb_firefighters where cb_firefighters.fire_team_id=#{departmentName}
+			ss.userId in ( select    cb_firefighters.org_usr_id	FROM  cb_firefighters
+	                      LEFT JOIN cb_fire_team f   on cb_firefighters.fire_team_id =f.sequence_nbr
+
+			where cb_firefighters.fire_team_id=#{departmentName}
+
+                <if test="type != null">
+                    and f.name !='消防支队'
+                </if>
+
+
 			 and cb_firefighters.org_usr_id is not null )
 	) hh
 LEFT JOIN cb_org_usr cou ON hh.userId = cou.sequence_nbr

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

@@ -241,8 +241,14 @@
         amos_user_id amosUserId
         FROM
         (select * from cb_firefighters fr  where is_delete = 0)  firefighters
+        LEFT JOIN cb_fire_team f   on fire_team_id =f.sequence_nbr
+
         WHERE
-        fire_team_id =#{name}
+           fire_team_id =#{name}
+        <if test="type != null">
+          and f.name !='消防支队'
+        </if>
+
         <if test="gw != null">
             And job_title_code In
             <foreach item="item" collection="gw" index="index" open="(" separator="," close=")">

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.component.rule.Label;
 import com.yeejoin.amos.component.rule.RuleFact;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 
  * <pre>
@@ -165,6 +170,16 @@ public class AlertCalledRo implements Serializable{
 @Label(value = "类型")
 private Integer category;
 
+
+ //新加新字段
+    @Label(value = "创建人")
+    protected String recUserName;
+
+    @Label(value = "更新时间")
+    private Date updateTime;
+    @Label(value = "接警时间")
+    private Date callTime;
+
 //
 //    /**
 //     * 其他

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

@@ -192,10 +192,10 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 	}
 
 
-	public List<FirefightersDto> queryByIdone(String[] gw,String name){
+	public List<FirefightersDto> queryByIdone(String[] gw,String name,	String type){
 
 
-		return firefightersMapper.queryByIdone(gw,name);
+		return firefightersMapper.queryByIdone(gw,name,type);
 	}
     /**
      * 获取指定岗位名称下的队伍人员电话号码信息

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

@@ -8,10 +8,12 @@ import java.util.Set;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.enums.RuleTypeEnum;
+import com.yeejoin.amos.component.rule.Label;
 import com.yeejoin.amos.component.rule.config.ClazzUtils;
 import com.yeejoin.amos.feign.rule.Rule;
 import com.yeejoin.amos.feign.rule.client.RuleClient;
 import com.yeejoin.amos.feign.rule.model.FactBaseModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -116,6 +118,13 @@ public class RuleAlertCalledService {
 		alertCalledRo.setTrappedNum(alertCalled.getTrappedNum() != null ? String.valueOf(alertCalled.getTrappedNum()) : "无");
 		alertCalledRo.setCompanyName(alertCalled.getCompanyName());
 
+		alertCalledRo.setRecUserName(alertCalled.getRecUserName());
+		alertCalledRo.setUpdateTime(alertCalled.getUpdateTime());
+		alertCalledRo.setCallTime(alertCalled.getCallTime());
+
+
+
+
 		List<AlertFormValue> alertFormValues = alertCalledVo.getAlertFormValue();
 
 		if (!ValidationUtil.isEmpty(alertFormValues))

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/param/LatentDangerNormalParam.java

@@ -64,5 +64,5 @@ public class LatentDangerNormalParam {
     private String bizType;
 
     //所属单位
-    private String bizOrgcode;
+    private String bizOrgCode;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java

@@ -247,7 +247,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
 
         //详情
         JSONObject js= new JSONObject();
-        js.put("bizOrgCode",latentDangerParam.getBizOrgcode());
+        js.put("bizOrgCode",latentDangerParam.getBizOrgCode());
         latentDangerBo.setBizInfo(js.toJSONString());
 
         latentDangerMapper.update(latentDangerBo);